Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[pub/USBasp.git] / Demos / Device / LowLevel / RNDISEthernet / RNDISEthernet.c

diff --git a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
index b046f78..1b617dd 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -36,20 +36,33 @@
 \r
 #include "RNDISEthernet.h"\r
 \r
 \r
 #include "RNDISEthernet.h"\r
 \r

-/* Scheduler Task List */\r
-TASK_LIST\r
-{\r
-       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
-       { .Task = Ethernet_Task        , .TaskStatus = TASK_STOP },\r
-       { .Task = TCP_Task             , .TaskStatus = TASK_STOP },\r
-       { .Task = RNDIS_Task           , .TaskStatus = TASK_STOP },\r
-};\r
-\r

 /** Main program entry point. This routine configures the hardware required by the application, then\r
 /** Main program entry point. This routine configures the hardware required by the application, then\r

- *  starts the scheduler to run the USB management task.\r
+ *  enters a loop to run the application tasks in sequence.\r

  */\r
 int main(void)\r
 {\r
  */\r
 int main(void)\r
 {\r

+       SetupHardware();\r
+\r
+       /* Webserver Initialization */\r
+       TCP_Init();\r
+       Webserver_Init();\r
+\r
+       printf_P(PSTR("\r\n\r\n****** RNDIS Demo running. ******\r\n"));\r
+\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+       \r
+       for (;;)\r
+       {\r
+               Ethernet_Task();\r
+               TCP_Task();\r
+               RNDIS_Task();\r
+               USB_USBTask();\r
+       }\r
+}\r
+\r
+/** Configures the board hardware and chip peripherals for the demo's functionality. */\r
+void SetupHardware(void)\r
+{\r

        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r


@@ -60,85 +73,63 @@ int main(void)
        /* Hardware Initialization */\r
        LEDs_Init();\r
        SerialStream_Init(9600, false);\r
        /* Hardware Initialization */\r
        LEDs_Init();\r
        SerialStream_Init(9600, false);\r

-       \r
-       /* Webserver Initialization */\r
-       TCP_Init();\r
-       Webserver_Init();\r
-\r
-       printf_P(PSTR("\r\n\r\n****** RNDIS Demo running. ******\r\n"));\r
-\r
-       /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
-       \r
-       /* Initialize Scheduler so that it can be used */\r
-       Scheduler_Init();\r
-\r
-       /* Initialize USB Subsystem */\r

        USB_Init();\r
        USB_Init();\r

-\r
-       /* Scheduling - routine never returns, so put this last in the main function */\r
-       Scheduler_Start();\r

 }\r
 \r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r
 }\r
 \r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r

-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r

 {\r
 {\r

-       /* Start USB management task */\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
-\r

        /* Indicate USB enumerating */\r
        /* Indicate USB enumerating */\r

-       UpdateStatus(Status_USBEnumerating);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r

 }\r
 \r
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs and stops all the relevant tasks.\r
  */\r
 }\r
 \r
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs and stops all the relevant tasks.\r
  */\r

-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r

 {\r
 {\r

-       /* Stop running TCP/IP and USB management tasks */\r
-       Scheduler_SetTaskMode(RNDIS_Task, TASK_STOP);\r
-       Scheduler_SetTaskMode(Ethernet_Task, TASK_STOP);\r
-       Scheduler_SetTaskMode(TCP_Task, TASK_STOP);\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
-\r

        /* Indicate USB not ready */\r
        /* Indicate USB not ready */\r

-       UpdateStatus(Status_USBNotReady);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r

 }\r
 \r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration\r
  *  of the USB device after enumeration, and configures the RNDIS device endpoints and starts the relevant tasks.\r
  */\r
 }\r
 \r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration\r
  *  of the USB device after enumeration, and configures the RNDIS device endpoints and starts the relevant tasks.\r
  */\r

-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r

 {\r
 {\r

-       /* Setup CDC Notification, Rx and Tx Endpoints */\r
-       Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK,\r
-                                      ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
-\r
-       Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK,\r
-                                      ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
+       /* Indicate USB connected and ready */\r
+       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

 \r
 \r

-       Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,\r
-                                      ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
+       /* Setup CDC Notification, Rx and Tx Endpoints */\r
+       if (!(Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK,\r
+                                            ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE,\r
+                                        ENDPOINT_BANK_SINGLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }                                                          \r

 \r
 \r

-       /* Indicate USB connected and ready */\r
-       UpdateStatus(Status_USBReady);\r
+       if (!(Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK,\r
+                                            ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE,\r
+                                        ENDPOINT_BANK_SINGLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }\r

 \r
 \r

-       /* Start TCP/IP tasks */\r
-       Scheduler_SetTaskMode(RNDIS_Task, TASK_RUN);\r
-       Scheduler_SetTaskMode(Ethernet_Task, TASK_RUN);\r
-       Scheduler_SetTaskMode(TCP_Task, TASK_RUN);\r
+       if (!(Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,\r
+                                            ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE,\r
+                                        ENDPOINT_BANK_SINGLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }\r

 }\r
 \r
 }\r
 \r

-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific\r

  *  control requests that are not handled internally by the USB library (including the RNDIS control commands,\r
  *  which set up the USB RNDIS network adapter), so that they can be handled appropriately for the application.\r
  */\r
  *  control requests that are not handled internally by the USB library (including the RNDIS control commands,\r
  *  which set up the USB RNDIS network adapter), so that they can be handled appropriately for the application.\r
  */\r

-void EVENT_USB_UnhandledControlPacket(void)\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r

 {\r
        /* Process RNDIS class commands */\r
        switch (USB_ControlRequest.bRequest)\r
 {\r
        /* Process RNDIS class commands */\r
        switch (USB_ControlRequest.bRequest)\r


@@ -188,41 +179,11 @@ void EVENT_USB_UnhandledControlPacket(void)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r
- *  log to a serial port, or anything else that is suitable for status updates.\r
- *\r
- *  \param CurrentStatus  Current status of the system, from the RNDISEthernet_StatusCodes_t enum\r
- */\r
-void UpdateStatus(uint8_t CurrentStatus)\r
-{\r
-       uint8_t LEDMask = LEDS_NO_LEDS;\r
-       \r
-       /* Set the LED mask to the appropriate LED mask based on the given status code */\r
-       switch (CurrentStatus)\r
-       {\r
-               case Status_USBNotReady:\r
-                       LEDMask = (LEDS_LED1);\r
-                       break;\r
-               case Status_USBEnumerating:\r
-                       LEDMask = (LEDS_LED1 | LEDS_LED2);\r
-                       break;\r
-               case Status_USBReady:\r
-                       LEDMask = (LEDS_LED2 | LEDS_LED4);\r
-                       break;\r
-               case Status_ProcessingEthernetFrame:\r
-                       LEDMask = (LEDS_LED2 | LEDS_LED3);\r
-                       break;          \r
-       }\r
-       \r
-       /* Set the board LEDs to the new LED mask */\r
-       LEDs_SetAllLEDs(LEDMask);\r
-}\r
-\r

 /** Task to manage the sending and receiving of encapsulated RNDIS data and notifications. This removes the RNDIS\r
  *  wrapper from received Ethernet frames and places them in the FrameIN global buffer, or adds the RNDIS wrapper\r
  *  to a frame in the FrameOUT global before sending the buffer contents to the host.\r
  */\r
 /** Task to manage the sending and receiving of encapsulated RNDIS data and notifications. This removes the RNDIS\r
  *  wrapper from received Ethernet frames and places them in the FrameIN global buffer, or adds the RNDIS wrapper\r
  *  to a frame in the FrameOUT global before sending the buffer contents to the host.\r
  */\r

-TASK(RNDIS_Task)\r
+void RNDIS_Task(void)\r

 {\r
        /* Select the notification endpoint */\r
        Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
 {\r
        /* Select the notification endpoint */\r
        Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r


@@ -253,7 +214,7 @@ TASK(RNDIS_Task)
        if ((CurrRNDISState == RNDIS_Data_Initialized) && !(MessageHeader->MessageLength))\r
        {\r
                /* Create a new packet header for reading/writing */\r
        if ((CurrRNDISState == RNDIS_Data_Initialized) && !(MessageHeader->MessageLength))\r
        {\r
                /* Create a new packet header for reading/writing */\r

-               RNDIS_PACKET_MSG_t RNDISPacketHeader;\r
+               RNDIS_Packet_Message_t RNDISPacketHeader;\r

 \r
                /* Select the data OUT endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
 \r
                /* Select the data OUT endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r


@@ -262,7 +223,7 @@ TASK(RNDIS_Task)
                if (Endpoint_IsOUTReceived() && !(FrameIN.FrameInBuffer))\r
                {\r
                        /* Read in the packet message header */\r
                if (Endpoint_IsOUTReceived() && !(FrameIN.FrameInBuffer))\r
                {\r
                        /* Read in the packet message header */\r

-                       Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t));\r
+                       Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t));\r

 \r
                        /* Stall the request if the data is too large */\r
                        if (RNDISPacketHeader.DataLength > ETHERNET_FRAME_SIZE_MAX)\r
 \r
                        /* Stall the request if the data is too large */\r
                        if (RNDISPacketHeader.DataLength > ETHERNET_FRAME_SIZE_MAX)\r


@@ -291,16 +252,16 @@ TASK(RNDIS_Task)
                if (Endpoint_IsINReady() && FrameOUT.FrameInBuffer)\r
                {\r
                        /* Clear the packet header with all 0s so that the relevant fields can be filled */\r
                if (Endpoint_IsINReady() && FrameOUT.FrameInBuffer)\r
                {\r
                        /* Clear the packet header with all 0s so that the relevant fields can be filled */\r

-                       memset(&RNDISPacketHeader, 0, sizeof(RNDIS_PACKET_MSG_t));\r
+                       memset(&RNDISPacketHeader, 0, sizeof(RNDIS_Packet_Message_t));\r

 \r
                        /* Construct the required packet header fields in the buffer */\r
                        RNDISPacketHeader.MessageType   = REMOTE_NDIS_PACKET_MSG;\r
 \r
                        /* Construct the required packet header fields in the buffer */\r
                        RNDISPacketHeader.MessageType   = REMOTE_NDIS_PACKET_MSG;\r

-                       RNDISPacketHeader.MessageLength = (sizeof(RNDIS_PACKET_MSG_t) + FrameOUT.FrameLength);\r
-                       RNDISPacketHeader.DataOffset    = (sizeof(RNDIS_PACKET_MSG_t) - sizeof(RNDIS_Message_Header_t));\r
+                       RNDISPacketHeader.MessageLength = (sizeof(RNDIS_Packet_Message_t) + FrameOUT.FrameLength);\r
+                       RNDISPacketHeader.DataOffset    = (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t));\r

                        RNDISPacketHeader.DataLength    = FrameOUT.FrameLength;\r
 \r
                        /* Send the packet header to the host */\r
                        RNDISPacketHeader.DataLength    = FrameOUT.FrameLength;\r
 \r
                        /* Send the packet header to the host */\r

-                       Endpoint_Write_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t));\r
+                       Endpoint_Write_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t));\r

 \r
                        /* Send the Ethernet frame data to the host */\r
                        Endpoint_Write_Stream_LE(FrameOUT.FrameData, RNDISPacketHeader.DataLength);\r
 \r
                        /* Send the Ethernet frame data to the host */\r
                        Endpoint_Write_Stream_LE(FrameOUT.FrameData, RNDISPacketHeader.DataLength);\r


@@ -317,22 +278,26 @@ TASK(RNDIS_Task)
 /** Ethernet frame processing task. This task checks to see if a frame has been received, and if so hands off the processing\r
  *  of the frame to the Ethernet processing routines.\r
  */\r
 /** Ethernet frame processing task. This task checks to see if a frame has been received, and if so hands off the processing\r
  *  of the frame to the Ethernet processing routines.\r
  */\r

-TASK(Ethernet_Task)\r
+void Ethernet_Task(void)\r

 {\r
        /* Task for Ethernet processing. Incoming ethernet frames are loaded into the FrameIN structure, and\r
           outgoing frames should be loaded into the FrameOUT structure. Both structures can only hold a single\r
           Ethernet frame at a time, so the FrameInBuffer bool is used to indicate when the buffers contain data. */\r
 \r
 {\r
        /* Task for Ethernet processing. Incoming ethernet frames are loaded into the FrameIN structure, and\r
           outgoing frames should be loaded into the FrameOUT structure. Both structures can only hold a single\r
           Ethernet frame at a time, so the FrameInBuffer bool is used to indicate when the buffers contain data. */\r
 \r

+       /* Device must be connected and configured for the task to run */\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         return;\r
+\r

        /* Check if a frame has been written to the IN frame buffer */\r
        if (FrameIN.FrameInBuffer)\r
        {\r
                /* Indicate packet processing started */\r
        /* Check if a frame has been written to the IN frame buffer */\r
        if (FrameIN.FrameInBuffer)\r
        {\r
                /* Indicate packet processing started */\r

-               UpdateStatus(Status_ProcessingEthernetFrame);\r
+               LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r

 \r
                /* Process the ethernet frame - replace this with your own Ethernet handler code as desired */\r
                Ethernet_ProcessPacket();\r
 \r
                /* Indicate packet processing complete */\r
 \r
                /* Process the ethernet frame - replace this with your own Ethernet handler code as desired */\r
                Ethernet_ProcessPacket();\r
 \r
                /* Indicate packet processing complete */\r

-               UpdateStatus(Status_USBReady);\r
+               LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

        }\r
 }\r
        }\r
 }\r