Fix up the incomplete Webserver project so that it integrates with the uIP stack...

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / DevChapter9.c

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index f02bb56..3118302 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.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,10 +36,16 @@
 #include "DevChapter9.h"\r
 \r
 uint8_t USB_ConfigurationNumber;\r
 #include "DevChapter9.h"\r
 \r
 uint8_t USB_ConfigurationNumber;\r

-bool    USB_RemoteWakeupEnabled;\r
+\r
+#if !defined(NO_DEVICE_SELF_POWER)\r

 bool    USB_CurrentlySelfPowered;\r
 bool    USB_CurrentlySelfPowered;\r

+#endif\r

 \r
 \r

-void USB_Device_ProcessControlPacket(void)\r
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
+bool    USB_RemoteWakeupEnabled;\r
+#endif\r
+\r
+void USB_Device_ProcessControlRequest(void)\r

 {\r
        bool     RequestHandled = false;\r
        uint8_t* RequestHeader  = (uint8_t*)&USB_ControlRequest;\r
 {\r
        bool     RequestHandled = false;\r
        uint8_t* RequestHeader  = (uint8_t*)&USB_ControlRequest;\r


@@ -62,7 +68,8 @@ void USB_Device_ProcessControlPacket(void)
                        break;\r
                case REQ_ClearFeature:\r
                case REQ_SetFeature:\r
                        break;\r
                case REQ_ClearFeature:\r
                case REQ_SetFeature:\r

-                       if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT))\r
+                       if ((bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE)) ||\r
+                           (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT)))\r

                        {\r
                                USB_Device_ClearSetFeature();\r
                                RequestHandled = true;\r
                        {\r
                                USB_Device_ClearSetFeature();\r
                                RequestHandled = true;\r


@@ -105,7 +112,7 @@ void USB_Device_ProcessControlPacket(void)
        }\r
 \r
        if (!(RequestHandled))\r
        }\r
 \r
        if (!(RequestHandled))\r

-         RAISE_EVENT(USB_UnhandledControlPacket);\r
+         EVENT_USB_Device_UnhandledControlRequest();\r

          \r
        if (Endpoint_IsSETUPReceived())\r
        {\r
          \r
        if (Endpoint_IsSETUPReceived())\r
        {\r


@@ -116,51 +123,84 @@ void USB_Device_ProcessControlPacket(void)
 \r
 static void USB_Device_SetAddress(void)\r
 {\r
 \r
 static void USB_Device_SetAddress(void)\r
 {\r

+       uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);\r
+\r

        Endpoint_ClearSETUP();\r
        \r
        Endpoint_ClearSETUP();\r
        \r

-       while (!(Endpoint_IsINReady()));\r
+       Endpoint_ClearStatusStage();\r

        \r
        \r

-       Endpoint_ClearIN();\r
-       \r
-       while (!(Endpoint_IsINReady()));\r
+       while (!(Endpoint_IsINReady()))\r
+       {\r
+               if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+                 return;\r
+       }\r
+\r
+       if (DeviceAddress)\r
+         USB_DeviceState = DEVICE_STATE_Addressed;\r

 \r
 \r

-       UDADDR = ((1 << ADDEN) | ((uint8_t)USB_ControlRequest.wValue & 0x7F));\r
+       UDADDR = ((1 << ADDEN) | DeviceAddress);\r

 \r
        return;\r
 }\r
 \r
 static void USB_Device_SetConfiguration(void)\r
 {\r
 \r
        return;\r
 }\r
 \r
 static void USB_Device_SetConfiguration(void)\r
 {\r

-       bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
-\r
-#if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r
-       if ((uint8_t)USB_ControlRequest.wValue > 1)\r
+#if defined(FIXED_NUM_CONFIGURATIONS)\r
+       if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)\r
+         return;\r

 #else\r
 #else\r

+       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+       uint8_t MemoryAddressSpace;\r
+       #endif\r
+       \r

        USB_Descriptor_Device_t* DevDescriptorPtr;\r
 \r
        USB_Descriptor_Device_t* DevDescriptorPtr;\r
 \r

-       if ((USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr) == NO_DESCRIPTOR) ||\r
+       if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr\r
+       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+                                      , &MemoryAddressSpace\r
+       #endif\r
+                                      ) == NO_DESCRIPTOR)\r
+       {\r
+               return;\r
+       }\r
+       \r

        #if defined(USE_RAM_DESCRIPTORS)\r
        #if defined(USE_RAM_DESCRIPTORS)\r

-           ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations))\r
+       if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)\r
+         return;\r

        #elif defined (USE_EEPROM_DESCRIPTORS)\r
        #elif defined (USE_EEPROM_DESCRIPTORS)\r

-           ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
+       if ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations))\r
+         return;\r
+       #elif defined (USE_FLASH_DESCRIPTORS)\r
+       if ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations))\r
+         return;\r

        #else\r
        #else\r

-           ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
-       #endif\r
-#endif\r
+       if (MemoryAddressSpace == MEMSPACE_FLASH)\r

        {\r
        {\r

-               return;\r
+               if (((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
+                 return;\r
+       }\r
+       else if (MemoryAddressSpace == MEMSPACE_EEPROM)\r
+       {\r
+               if (((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
+                 return;\r

        }\r
        }\r

+       else\r
+       {\r
+               if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)\r
+                 return;\r
+       }\r
+       #endif\r
+#endif\r

        \r
        Endpoint_ClearSETUP();\r
 \r
        USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;\r
 \r
        \r
        Endpoint_ClearSETUP();\r
 \r
        USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;\r
 \r

-       Endpoint_ClearIN();\r
+       Endpoint_ClearStatusStage();\r

 \r
 \r

-       if (!(AlreadyConfigured) && USB_ConfigurationNumber)\r
-         RAISE_EVENT(USB_DeviceEnumerationComplete);\r
+       USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r

 \r
 \r

-       RAISE_EVENT(USB_ConfigurationChanged);\r
+       EVENT_USB_Device_ConfigurationChanged();\r

 }\r
 \r
 void USB_Device_GetConfiguration(void)\r
 }\r
 \r
 void USB_Device_GetConfiguration(void)\r


@@ -168,66 +208,96 @@ void USB_Device_GetConfiguration(void)
        Endpoint_ClearSETUP();\r
 \r
        Endpoint_Write_Byte(USB_ConfigurationNumber);\r
        Endpoint_ClearSETUP();\r
 \r
        Endpoint_Write_Byte(USB_ConfigurationNumber);\r

-       \r

        Endpoint_ClearIN();\r
 \r
        Endpoint_ClearIN();\r
 \r

-       while (!(Endpoint_IsOUTReceived()));\r
+       Endpoint_ClearStatusStage();\r
+}\r
+\r
+#if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
+static char USB_Device_NibbleToASCII(uint8_t Nibble)\r
+{\r
+       Nibble = ((Nibble & 0x0F) + '0');\r
+       return (Nibble > '9') ? (Nibble + ('A' - '9' - 1)) : Nibble;\r
+}\r
+\r
+static void USB_Device_GetInternalSerialDescriptor(void)\r
+{\r
+       struct\r
+       {\r
+               USB_Descriptor_Header_t Header;\r
+               int16_t                 UnicodeString[20];\r
+       } SignatureDescriptor;\r
+\r
+       SignatureDescriptor.Header.Type = DTYPE_String;\r
+       SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);\r
+       \r
+       uint8_t SigReadAddress = 0x0E;\r
+\r
+       for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)\r
+       {\r
+               uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);\r
+               \r
+               if (SerialCharNum & 0x01)\r
+               {\r
+                       SerialByte >>= 4;\r
+                       SigReadAddress++;\r
+               }\r
+               \r
+               SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte);\r
+       }\r
+       \r
+       Endpoint_ClearSETUP();\r
+\r
+       Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));\r
+\r

        Endpoint_ClearOUT();\r
 }\r
        Endpoint_ClearOUT();\r
 }\r

+#endif\r

 \r
 static void USB_Device_GetDescriptor(void)\r
 {\r
        void*    DescriptorPointer;\r
        uint16_t DescriptorSize;\r
        \r
 \r
 static void USB_Device_GetDescriptor(void)\r
 {\r
        void*    DescriptorPointer;\r
        uint16_t DescriptorSize;\r
        \r

-       if ((DescriptorSize = USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex, &DescriptorPointer)) == NO_DESCRIPTOR)\r
-         return;\r
-       \r
-       Endpoint_ClearSETUP();\r
-       \r
-       #if defined(USE_RAM_DESCRIPTORS)\r
-       Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);\r
-       #else\r
-       bool SendZLP;\r
-       \r
-       if (USB_ControlRequest.wLength > DescriptorSize)\r
-         USB_ControlRequest.wLength = DescriptorSize;\r
+       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+       uint8_t  DescriptorAddressSpace;\r
+       #endif\r

        \r
        \r

-       while (USB_ControlRequest.wLength)\r
+       #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
+       if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))\r

        {\r
        {\r

-               while (!(Endpoint_IsINReady()))\r
-               {\r
-                       if (Endpoint_IsOUTReceived())\r
-                       {\r
-                               Endpoint_ClearOUT();\r
-                               return;\r
-                       }               \r
-               }\r
-               \r
-               while (USB_ControlRequest.wLength && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
-               {\r
-                       #if defined (USE_EEPROM_DESCRIPTORS)\r
-                       Endpoint_Write_Byte(eeprom_read_byte(DescriptorPointer++));                     \r
-                       #else\r
-                       Endpoint_Write_Byte(pgm_read_byte(DescriptorPointer++));\r
-                       #endif\r
-                       \r
-                       USB_ControlRequest.wLength--;\r
-               }\r
-               \r
-               SendZLP = (Endpoint_BytesInEndpoint() == USB_ControlEndpointSize);\r
-               Endpoint_ClearIN();\r
+               USB_Device_GetInternalSerialDescriptor();\r
+               return;\r

        }\r
        }\r

+       #endif\r

        \r
        \r

-       if (SendZLP)\r
+       if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,\r
+                                                        &DescriptorPointer\r
+       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+                                                        , &DescriptorAddressSpace\r
+       #endif\r
+                                                                                                        )) == NO_DESCRIPTOR)\r

        {\r
        {\r

-               while (!(Endpoint_IsINReady()));\r
-               Endpoint_ClearIN();\r
+               return;\r

        }\r
        }\r

+       \r
+       Endpoint_ClearSETUP();\r

 \r
 \r

-       while (!(Endpoint_IsOUTReceived()));\r
+       #if defined(USE_RAM_DESCRIPTORS)\r
+       Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);\r
+       #elif defined(USE_EEPROM_DESCRIPTORS)\r
+       Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r
+       #elif defined(USE_FLASH_DESCRIPTORS)\r
+       Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);   \r
+       #else\r
+       if (DescriptorAddressSpace == MEMSPACE_FLASH)\r
+         Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize); \r
+       else if (DescriptorAddressSpace == MEMSPACE_EEPROM)\r
+         Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r
+       else\r
+         Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);  \r

        #endif\r
        #endif\r

-       \r
+\r

        Endpoint_ClearOUT();\r
 }\r
 \r
        Endpoint_ClearOUT();\r
 }\r
 \r


@@ -237,17 +307,22 @@ static void USB_Device_GetStatus(void)
 \r
        switch (USB_ControlRequest.bmRequestType)\r
        {\r
 \r
        switch (USB_ControlRequest.bmRequestType)\r
        {\r

+#if !defined(NO_DEVICE_SELF_POWER) || !defined(NO_DEVICE_REMOTE_WAKEUP)        \r

                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):\r

+       #if !defined(NO_DEVICE_SELF_POWER)\r

                        if (USB_CurrentlySelfPowered)\r
                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;\r
                        if (USB_CurrentlySelfPowered)\r
                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;\r

-                       \r
+       #endif\r
+\r
+       #if !defined(NO_DEVICE_REMOTE_WAKEUP)                   \r

                        if (USB_RemoteWakeupEnabled)\r
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r
                        if (USB_RemoteWakeupEnabled)\r
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r

-                       \r
+       #endif\r

                        break;\r
                        break;\r

+#endif\r

 #if !defined(CONTROL_ONLY_DEVICE)\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):\r
 #if !defined(CONTROL_ONLY_DEVICE)\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):\r

-                       Endpoint_SelectEndpoint((uint8_t)USB_ControlRequest.wIndex);\r
+                       Endpoint_SelectEndpoint(USB_ControlRequest.wIndex & 0xFF);\r

 \r
                        CurrentStatus = Endpoint_IsStalled();\r
 \r
 \r
                        CurrentStatus = Endpoint_IsStalled();\r
 \r


@@ -255,22 +330,23 @@ static void USB_Device_GetStatus(void)
 \r
                        break;\r
 #endif\r
 \r
                        break;\r
 #endif\r

+               default:\r
+                       return;\r

        }\r
 \r
        Endpoint_ClearSETUP();\r
 \r
        Endpoint_Write_Word_LE(CurrentStatus);\r
        }\r
 \r
        Endpoint_ClearSETUP();\r
 \r
        Endpoint_Write_Word_LE(CurrentStatus);\r

-\r

        Endpoint_ClearIN();\r
        \r
        Endpoint_ClearIN();\r
        \r

-       while (!(Endpoint_IsOUTReceived()));\r
-       Endpoint_ClearOUT();\r
+       Endpoint_ClearStatusStage();\r

 }\r
 \r
 static void USB_Device_ClearSetFeature(void)\r
 {      \r
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
        {\r
 }\r
 \r
 static void USB_Device_ClearSetFeature(void)\r
 {      \r
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
        {\r

+#if !defined(NO_DEVICE_REMOTE_WAKEUP)                  \r

                case REQREC_DEVICE:\r
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)\r
                          USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);\r
                case REQREC_DEVICE:\r
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)\r
                          USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);\r


@@ -278,6 +354,7 @@ static void USB_Device_ClearSetFeature(void)
                          return;\r
                        \r
                        break;                  \r
                          return;\r
                        \r
                        break;                  \r

+#endif\r

 #if !defined(CONTROL_ONLY_DEVICE)\r
                case REQREC_ENDPOINT:\r
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)\r
 #if !defined(CONTROL_ONLY_DEVICE)\r
                case REQREC_ENDPOINT:\r
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)\r


@@ -291,31 +368,30 @@ static void USB_Device_ClearSetFeature(void)
 \r
                                if (Endpoint_IsEnabled())\r
                                {                               \r
 \r
                                if (Endpoint_IsEnabled())\r
                                {                               \r

-                                       if (USB_ControlRequest.bRequest == REQ_ClearFeature)\r
+                                       if (USB_ControlRequest.bRequest == REQ_SetFeature)\r

                                        {\r
                                        {\r

-                                               Endpoint_ClearStall();\r
-                                               Endpoint_ResetFIFO(EndpointIndex);\r
-                                               Endpoint_ResetDataToggle();\r
+                                               Endpoint_StallTransaction();\r

                                        }\r
                                        else\r
                                        {\r
                                        }\r
                                        else\r
                                        {\r

-                                               Endpoint_StallTransaction();                                            \r
-                                       }\r
+                                               Endpoint_ClearStall();\r
+                                               Endpoint_ResetFIFO(EndpointIndex);\r
+                                               Endpoint_ResetDataToggle();\r
+                                       }                                       \r

                                }\r
                        }\r
                        \r
                        break;\r
 #endif\r
                                }\r
                        }\r
                        \r
                        break;\r
 #endif\r

+               default:\r
+                       return;\r

        }\r
 \r
        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r
        Endpoint_ClearSETUP();\r
 \r
        }\r
 \r
        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r
        Endpoint_ClearSETUP();\r
 \r

-       Endpoint_ClearIN();\r
-\r
-       while (!(Endpoint_IsOUTReceived()));\r
-       Endpoint_ClearOUT();\r
+       Endpoint_ClearStatusStage();\r

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