projects
/
pub
/
lufa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Neaten Webserver project code.
[pub/lufa.git]
/
Projects
/
Incomplete
/
Webserver
/
Webserver.c
diff --git
a/Projects/Incomplete/Webserver/Webserver.c
b/Projects/Incomplete/Webserver/Webserver.c
index
c0ceeed
..
1bc658f
100644
(file)
--- a/
Projects/Incomplete/Webserver/Webserver.c
+++ b/
Projects/Incomplete/Webserver/Webserver.c
@@
-71,8
+71,6
@@
int main(void)
{
\r
SetupHardware();
\r
\r
{
\r
SetupHardware();
\r
\r
- puts_P(PSTR(ESC_FG_CYAN "RNDIS Host Demo running.\r\n" ESC_FG_WHITE));
\r
-
\r
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
\r
\r
for (;;)
\r
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
\r
\r
for (;;)
\r
@@
-88,7
+86,6
@@
int main(void)
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
\r
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
\r
{
\r
if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
\r
sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
\r
{
\r
- printf("Error Retrieving Configuration Descriptor.\r\n");
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
@@
-97,7
+94,6
@@
int main(void)
if (RNDIS_Host_ConfigurePipes(&Ethernet_RNDIS_Interface,
\r
ConfigDescriptorSize, ConfigDescriptorData) != RNDIS_ENUMERROR_NoError)
\r
{
\r
if (RNDIS_Host_ConfigurePipes(&Ethernet_RNDIS_Interface,
\r
ConfigDescriptorSize, ConfigDescriptorData) != RNDIS_ENUMERROR_NoError)
\r
{
\r
- printf("Attached Device Not a Valid RNDIS Class Device.\r\n");
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
@@
-105,7
+101,6
@@
int main(void)
\r
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
\r
{
\r
\r
if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
\r
{
\r
- printf("Error Setting Device Configuration.\r\n");
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
@@
-113,21
+108,15
@@
int main(void)
\r
if (RNDIS_Host_InitializeDevice(&Ethernet_RNDIS_Interface) != HOST_SENDCONTROL_Successful)
\r
{
\r
\r
if (RNDIS_Host_InitializeDevice(&Ethernet_RNDIS_Interface) != HOST_SENDCONTROL_Successful)
\r
{
\r
- printf("Error Initializing Device.\r\n");
\r
-
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
}
\r
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
}
\r
\r
- printf("Device Max Transfer Size: %lu bytes.\r\n", Ethernet_RNDIS_Interface.State.DeviceMaxPacketSize);
\r
-
\r
uint32_t PacketFilter = (REMOTE_NDIS_PACKET_DIRECTED | REMOTE_NDIS_PACKET_BROADCAST);
\r
if (RNDIS_Host_SetRNDISProperty(&Ethernet_RNDIS_Interface, OID_GEN_CURRENT_PACKET_FILTER,
\r
&PacketFilter, sizeof(PacketFilter)) != HOST_SENDCONTROL_Successful)
\r
{
\r
uint32_t PacketFilter = (REMOTE_NDIS_PACKET_DIRECTED | REMOTE_NDIS_PACKET_BROADCAST);
\r
if (RNDIS_Host_SetRNDISProperty(&Ethernet_RNDIS_Interface, OID_GEN_CURRENT_PACKET_FILTER,
\r
&PacketFilter, sizeof(PacketFilter)) != HOST_SENDCONTROL_Successful)
\r
{
\r
- printf("Error Setting Device Packet Filter.\r\n");
\r
-
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
@@
-137,22
+126,14
@@
int main(void)
if (RNDIS_Host_QueryRNDISProperty(&Ethernet_RNDIS_Interface, OID_802_3_CURRENT_ADDRESS,
\r
&MACAddress, sizeof(MACAddress)) != HOST_SENDCONTROL_Successful)
\r
{
\r
if (RNDIS_Host_QueryRNDISProperty(&Ethernet_RNDIS_Interface, OID_802_3_CURRENT_ADDRESS,
\r
&MACAddress, sizeof(MACAddress)) != HOST_SENDCONTROL_Successful)
\r
{
\r
- printf("Error Getting MAC Address.\r\n");
\r
-
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
}
\r
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;
\r
break;
\r
}
\r
\r
- printf("MAC Address: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\r\n",
\r
- MACAddress.addr[0], MACAddress.addr[1], MACAddress.addr[2],
\r
- MACAddress.addr[3], MACAddress.addr[4], MACAddress.addr[5]);
\r
-
\r
uip_setethaddr(MACAddress);
\r
\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);
\r
uip_setethaddr(MACAddress);
\r
\r
LEDs_SetAllLEDs(LEDMASK_USB_READY);
\r
-
\r
- printf("RNDIS Device Enumerated.\r\n");
\r
USB_HostState = HOST_STATE_Configured;
\r
break;
\r
case HOST_STATE_Configured:
\r
USB_HostState = HOST_STATE_Configured;
\r
break;
\r
case HOST_STATE_Configured:
\r
@@
-253,7
+234,6
@@
void SetupHardware(void)
clock_prescale_set(clock_div_1);
\r
\r
/* Hardware Initialization */
\r
clock_prescale_set(clock_div_1);
\r
\r
/* Hardware Initialization */
\r
- SerialStream_Init(9600, false);
\r
LEDs_Init();
\r
USB_Init();
\r
\r
LEDs_Init();
\r
USB_Init();
\r
\r
@@
-273,7
+253,7
@@
void SetupHardware(void)
uip_setdraddr(&GatewayIPAddress);
\r
\r
/* HTTP Webserver Initialization */
\r
uip_setdraddr(&GatewayIPAddress);
\r
\r
/* HTTP Webserver Initialization */
\r
-
uip_listen(HTONS(80)
);
\r
+
WebserverApp_Init(
);
\r
}
\r
\r
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
\r
}
\r
\r
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
\r
@@
-281,7
+261,6
@@
void SetupHardware(void)
*/
\r
void EVENT_USB_Host_DeviceAttached(void)
\r
{
\r
*/
\r
void EVENT_USB_Host_DeviceAttached(void)
\r
{
\r
- puts_P(PSTR("Device Attached.\r\n"));
\r
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
\r
}
\r
\r
LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
\r
}
\r
\r
@@
-290,7
+269,6
@@
void EVENT_USB_Host_DeviceAttached(void)
*/
\r
void EVENT_USB_Host_DeviceUnattached(void)
\r
{
\r
*/
\r
void EVENT_USB_Host_DeviceUnattached(void)
\r
{
\r
- puts_P(PSTR("\r\nDevice Unattached.\r\n"));
\r
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
\r
}
\r
\r
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
\r
}
\r
\r
@@
-307,9
+285,6
@@
void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
{
\r
USB_ShutDown();
\r
\r
{
\r
USB_ShutDown();
\r
\r
- printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
\r
- " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
\r
-
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
for(;;);
\r
}
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
for(;;);
\r
}
\r
@@
-319,10
+294,5
@@
void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
*/
\r
void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)
\r
{
\r
*/
\r
void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)
\r
{
\r
- printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"
\r
- " -- Error Code %d\r\n"
\r
- " -- Sub Error Code %d\r\n"
\r
- " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
\r
-
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
}
\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
\r
}
\r
projects / pub / lufa.git / blobdiff