ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Webserver project to remove DHCP IP configuration status notification.

Browse source
This commit is contained in:
Dean Camera 2011-05-26 10:50:22 +00:00
parent f0ff633962
commit edc4db41f4
8 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Projects/Webserver/Lib/DHCPClientApp.c
View file

@ -157,9 +157,6 @@ void DHCPClientApp_Callback(void)
uip_setnetmask((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.Netmask);
uip_setdraddr((uip_ipaddr_t*)&AppState->DHCPClient.DHCPOffer_Data.GatewayIP);
/* Indicate to the user that we now have a valid IP configuration */
HaveIPConfiguration = true;
AppState->DHCPClient.CurrentState = DHCP_STATE_AddressLeased;
}

2
Projects/Webserver/Lib/TELNETServerApp.c
View file

@ -146,7 +146,7 @@ static void TELNETServerApp_DisplayTCPConnections(void)
if (CurrConnection->tcpstateflags != UIP_CLOSED)
{
/* Add the current connection's details to the out buffer */
ResponseLen += sprintf_P(&AppData[ResponseLen], PSTR("%u) %02d.%02d.%02d.%02d (Local %u, Remote %u)\r\n"),
ResponseLen += sprintf_P(&AppData[ResponseLen], PSTR("%u) %d.%d.%d.%d (Local Port %u <=> Remote Port %u)\r\n"),
++ActiveConnCount,
CurrConnection->ripaddr.u8[0],
CurrConnection->ripaddr.u8[1],

8
Projects/Webserver/Lib/uIPManagement.c
View file

@ -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]);
@ -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. */

2
Projects/Webserver/Lib/uIPManagement.h
View file

@ -70,8 +70,6 @@
/* External Variables: */
extern struct uip_eth_addr MACAddress;
extern bool HaveIPConfiguration;
/* Function Prototypes: */
void uIPManagement_Init(void);
void uIPManagement_ManageNetwork(void);