X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/edc4db41f46f473fc0ba95fd03920d10aba1de4a..a5abb0eb3f368f0f090ebfd7f9fc22e94466f31e:/Projects/Webserver/Lib/uIPManagement.c?ds=sidebyside diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c index 8bc27afb7..eb42bf2b0 100644 --- a/Projects/Webserver/Lib/uIPManagement.c +++ b/Projects/Webserver/Lib/uIPManagement.c @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2011. + Copyright (C) Dean Camera, 2012. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2012 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -70,7 +70,7 @@ void uIPManagement_Init(void) MACAddress.addr[5] = SERVER_MAC_ADDRESS[5]; #if defined(ENABLE_DHCP_SERVER) - DHCPServerApp_Init(); + DHCPServerApp_Init(); #endif uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress; @@ -84,7 +84,7 @@ void uIPManagement_Init(void) else { #if defined(ENABLE_DHCP_CLIENT) - DHCPClientApp_Init(); + DHCPClientApp_Init(); #else uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress; uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS[0], DEVICE_IP_ADDRESS[1], DEVICE_IP_ADDRESS[2], DEVICE_IP_ADDRESS[3]); @@ -113,7 +113,7 @@ void uIPManagement_Init(void) */ void uIPManagement_ManageNetwork(void) { - if (((USB_CurrentMode == USB_MODE_Host) && (USB_HostState == HOST_STATE_Configured)) || + if (((USB_CurrentMode == USB_MODE_Host) && (USB_HostState == HOST_STATE_Configured)) || ((USB_CurrentMode == USB_MODE_Device) && (USB_DeviceState == DEVICE_STATE_Configured))) { uIPManagement_ProcessIncomingPacket(); @@ -164,13 +164,13 @@ void uIPManagement_UDPCallback(void) /** Processes Incoming packets to the server from the connected RNDIS device, creating responses as needed. */ static void uIPManagement_ProcessIncomingPacket(void) { - /* Determine which USB mode the system is currently initialised in */ + /* Determine which USB mode the system is currently initialized in */ if (USB_CurrentMode == USB_MODE_Device) { /* If no packet received, exit processing routine */ if (!(RNDIS_Device_IsPacketReceived(&Ethernet_RNDIS_Interface_Device))) return; - + LEDs_SetAllLEDs(LEDMASK_USB_BUSY); /* Read the Incoming packet straight into the UIP packet buffer */ @@ -181,13 +181,13 @@ static void uIPManagement_ProcessIncomingPacket(void) /* If no packet received, exit processing routine */ if (!(RNDIS_Host_IsPacketReceived(&Ethernet_RNDIS_Interface_Host))) return; - + LEDs_SetAllLEDs(LEDMASK_USB_BUSY); /* Read the Incoming packet straight into the UIP packet buffer */ RNDIS_Host_ReadPacket(&Ethernet_RNDIS_Interface_Host, uip_buf, &uip_len); } - + /* If the packet contains an Ethernet frame, process it */ if (uip_len > 0) {