Neaten Webserver project code.

diff --git a/Projects/Incomplete/Webserver/Lib/WebserverApp.c b/Projects/Incomplete/Webserver/Lib/WebserverApp.c
index 11acec4..6ac94d6 100644 (file)
--- a/Projects/Incomplete/Webserver/Lib/WebserverApp.c
+++ b/Projects/Incomplete/Webserver/Lib/WebserverApp.c
@@ -51,7 +51,6 @@ char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n"
                                "Server: LUFA RNDIS\r\n"\r
                                "Connection: close\r\n\r\n";\r
 \r
                                "Server: LUFA RNDIS\r\n"\r
                                "Connection: close\r\n\r\n";\r
 \r

-/****************************************************************************************/\r

 /** HTTP page to serve to the host when a HTTP request is made. This page is too long for a single response, thus it is automatically\r
  *  broken up into smaller blocks and sent as a series of packets each time the webserver application callback is run.\r
  */\r
 /** HTTP page to serve to the host when a HTTP request is made. This page is too long for a single response, thus it is automatically\r
  *  broken up into smaller blocks and sent as a series of packets each time the webserver application callback is run.\r
  */\r


@@ -75,7 +74,17 @@ char PROGMEM HTTPPage[]   =
                "       </body>"\r
                "</html>";\r
 \r
                "       </body>"\r
                "</html>";\r
 \r

-void WebserverAppCallback(void)\r
+/** Initialization function for the simple HTTP webserver. */\r
+void WebserverApp_Init(void)\r
+{\r
+       /* Listen on port 80 for HTTP connections from hosts */\r
+       uip_listen(HTONS(80));\r
+}\r
+\r
+/** uIP stack application callback for the simple HTTP webserver. This function must be called each time the\r
+ *  TCP/IP stack needs a TCP packet to be processed.\r
+ */\r
+void WebserverApp_Callback(void)\r

 {\r
        char*    AppDataPtr  = (char*)uip_appdata;\r
        uint16_t AppDataSize = 0;\r
 {\r
        char*    AppDataPtr  = (char*)uip_appdata;\r
        uint16_t AppDataSize = 0;\r


@@ -116,10 +125,12 @@ void WebserverAppCallback(void)
        }\r
        else if (BytesRemaining > MaxSegSize)\r
        {\r
        }\r
        else if (BytesRemaining > MaxSegSize)\r
        {\r

+               /* More bytes remaining to send than the maximum segment size, send next chunk */\r

                AppDataSize = MaxSegSize;\r
        }\r
        else\r
        {\r
                AppDataSize = MaxSegSize;\r
        }\r
        else\r
        {\r

+               /* Less bytes than the segment size remaining, send all remaining bytes in the one packet */\r

                AppDataSize = BytesRemaining;\r
        }\r
 \r
                AppDataSize = BytesRemaining;\r
        }\r
 \r

diff --git a/Projects/Incomplete/Webserver/Lib/WebserverApp.h b/Projects/Incomplete/Webserver/Lib/WebserverApp.h
index b2696b2..4d1d76c 100644 (file)
--- a/Projects/Incomplete/Webserver/Lib/WebserverApp.h
+++ b/Projects/Incomplete/Webserver/Lib/WebserverApp.h
@@ -45,6 +45,7 @@
                #include <uip.h>\r
 \r
        /* Function Prototypes: */\r
                #include <uip.h>\r
 \r
        /* Function Prototypes: */\r

-               void WebserverAppCallback(void);\r
+               void WebserverApp_Init(void);\r
+               void WebserverApp_Callback(void);\r

                \r
 #endif\r
                \r
 #endif\r

diff --git a/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h b/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h
index 00919f2..22bab81 100644 (file)
--- a/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h
+++ b/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h
@@ -14,7 +14,7 @@
                char*   SendPos;\r
        } uip_tcp_appstate_t;\r
 \r
                char*   SendPos;\r
        } uip_tcp_appstate_t;\r
 \r

-       #define UIP_APPCALL     WebserverAppCallback\r
+       #define UIP_APPCALL     WebserverApp_Callback\r

        void UIP_APPCALL(void);\r
 \r
 #endif /*__APPS_CONF_H__*/\r
        void UIP_APPCALL(void);\r
 \r
 #endif /*__APPS_CONF_H__*/\r

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

diff --git a/Projects/Incomplete/Webserver/Webserver.h b/Projects/Incomplete/Webserver/Webserver.h
index a2744b8..2d01d22 100644 (file)
--- a/Projects/Incomplete/Webserver/Webserver.h
+++ b/Projects/Incomplete/Webserver/Webserver.h
@@ -41,11 +41,9 @@
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
                #include <avr/power.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
                #include <avr/power.h>\r

-               #include <stdio.h>\r

 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Misc/TerminalCodes.h>\r
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Misc/TerminalCodes.h>\r

-               #include <LUFA/Drivers/Peripheral/SerialStream.h>\r

                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/USB/Class/RNDIS.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/USB/Class/RNDIS.h>\r

diff --git a/Projects/Incomplete/Webserver/makefile b/Projects/Incomplete/Webserver/makefile
index 1e464a0..d3b3667 100644 (file)
--- a/Projects/Incomplete/Webserver/makefile
+++ b/Projects/Incomplete/Webserver/makefile
@@ -123,8 +123,6 @@ LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          Lib/WebserverApp.c                                          \\r
 # List C source files here. (C dependencies are automatically generated.)\r
 SRC = $(TARGET).c                                                 \\r
          Lib/WebserverApp.c                                          \\r

-         $(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c         \\r
-         $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \\r

          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r