X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3cba88e4c05d6a3c25ffa9c7185d41a84b7f72b1..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Projects/Webserver/Lib/uIPManagement.c?ds=inline diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c index 59045c06a..5e0a3082e 100644 --- a/Projects/Webserver/Lib/uIPManagement.c +++ b/Projects/Webserver/Lib/uIPManagement.c @@ -46,9 +46,6 @@ static struct timer ARPTimer; /** MAC address of the RNDIS device, when enumerated. */ struct uip_eth_addr MACAddress; -/** Indicates if an IP configuration has been set in the device. */ -bool HaveIPConfiguration; - /** Configures the uIP stack ready for network traffic processing. */ void uIPManagement_Init(void) @@ -76,7 +73,6 @@ void uIPManagement_Init(void) DHCPServerApp_Init(); #endif - HaveIPConfiguration = true; 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]); uip_ipaddr(&Netmask, DEVICE_NETMASK[0], DEVICE_NETMASK[1], DEVICE_NETMASK[2], DEVICE_NETMASK[3]); @@ -88,10 +84,8 @@ void uIPManagement_Init(void) else { #if defined(ENABLE_DHCP_CLIENT) - HaveIPConfiguration = false; DHCPClientApp_Init(); #else - HaveIPConfiguration = true; 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]); uip_ipaddr(&Netmask, DEVICE_NETMASK[0], DEVICE_NETMASK[1], DEVICE_NETMASK[2], DEVICE_NETMASK[3]); @@ -119,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(); @@ -170,7 +164,7 @@ 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 */ @@ -228,7 +222,7 @@ static void uIPManagement_ProcessIncomingPacket(void) } } - LEDs_SetAllLEDs(LEDMASK_USB_READY | ((HaveIPConfiguration) ? LEDMASK_UIP_READY_CONFIG : LEDMASK_UIP_READY_NOCONFIG)); + LEDs_SetAllLEDs(LEDMASK_USB_READY); } /** Manages the currently open network connections, including TCP and (if enabled) UDP. */