Make the StandaloneProgrammer project seamlessly read out drive contents from either...

[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 2318216..6e7b2c7 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -39,7 +39,7 @@ uint8_t USB_ConfigurationNumber;
 bool    USB_RemoteWakeupEnabled;\r
 bool    USB_CurrentlySelfPowered;\r
 \r
 bool    USB_RemoteWakeupEnabled;\r
 bool    USB_CurrentlySelfPowered;\r
 \r

-void USB_Device_ProcessControlPacket(void)\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


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

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

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


@@ -117,49 +117,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

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

        \r
        \r

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

 \r
 \r

-       UDADDR = ((1 << ADDEN) | ((uint8_t)USB_ControlRequest.wValue & 0x7F));\r
+       if (DeviceAddress)\r
+         USB_DeviceState = DEVICE_STATE_Addressed;\r
+\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 ((CALLBACK_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
-         EVENT_USB_DeviceEnumerationComplete();\r
+       USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r

 \r
 \r

-       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


@@ -167,59 +202,48 @@ 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_ClearOUT();\r
+       Endpoint_ClearStatusStage();\r

 }\r
 \r
 #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\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
 static void USB_Device_GetInternalSerialDescriptor(void)\r
 {\r
        struct\r
        {\r
                USB_Descriptor_Header_t Header;\r

-               int16_t                 UnicodeString[12];\r
+               int16_t                 UnicodeString[20];\r

        } SignatureDescriptor;\r
        } SignatureDescriptor;\r

-       \r
-       uint8_t SigReadAddress  = 0x0E;         \r
-       bool    OddNibbleRead   = false;\r

 \r
 \r

-       #if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)\r
-               SignatureDescriptor.Header.Size            = sizeof(SignatureDescriptor);\r
-               SignatureDescriptor.Header.Type            = DTYPE_String;\r
-       #else\r
-               SignatureDescriptor.Header.bLength         = sizeof(SignatureDescriptor);\r
-               SignatureDescriptor.Header.bDescriptorType = DTYPE_String;\r
-       #endif\r
+       SignatureDescriptor.Header.Type = DTYPE_String;\r
+       SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);\r
+       \r
+       uint8_t SigReadAddress = 0x0E;\r

 \r
 \r

-       for (uint8_t SerialCharNum = 0; SerialCharNum < 12; SerialCharNum++)\r
+       for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)\r

        {\r
                uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);\r
                \r
        {\r
                uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);\r
                \r

-               if (OddNibbleRead)\r
+               if (SerialCharNum & 0x01)\r

                {\r
                        SerialByte >>= 4;\r
                        SigReadAddress++;\r
                }\r
                {\r
                        SerialByte >>= 4;\r
                        SigReadAddress++;\r
                }\r

-               else\r
-               {\r
-                       SerialByte &= 0x0F;\r
-               }\r

                \r
                \r

-               OddNibbleRead = !(OddNibbleRead);\r
-\r
-               if (SerialByte < 0x0A)\r
-                 SerialByte += '0';\r
-               else\r
-                 SerialByte += ('A' - 0x0A);\r
-\r
-               SignatureDescriptor.UnicodeString[SerialCharNum] = SerialByte;\r
+               SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte);\r

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

+\r

        Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));\r
        Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));\r

+\r

        Endpoint_ClearOUT();\r
 }\r
 #endif\r
        Endpoint_ClearOUT();\r
 }\r
 #endif\r


@@ -229,6 +253,10 @@ static void USB_Device_GetDescriptor(void)
        void*    DescriptorPointer;\r
        uint16_t DescriptorSize;\r
        \r
        void*    DescriptorPointer;\r
        uint16_t DescriptorSize;\r
        \r

+       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+       uint8_t  DescriptorAddressSpace;\r
+       #endif\r
+       \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
        #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


@@ -238,7 +266,11 @@ static void USB_Device_GetDescriptor(void)
        #endif\r
        \r
        if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,\r
        #endif\r
        \r
        if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,\r

-                                                        &DescriptorPointer)) == NO_DESCRIPTOR)\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
                return;\r
        }\r
        {\r
                return;\r
        }\r


@@ -249,8 +281,15 @@ static void USB_Device_GetDescriptor(void)
        Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);\r
        #elif defined(USE_EEPROM_DESCRIPTORS)\r
        Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r
        Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);\r
        #elif defined(USE_EEPROM_DESCRIPTORS)\r
        Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r

-       #else\r
+       #elif defined(USE_FLASH_DESCRIPTORS)\r

        Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);   \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
 \r
        Endpoint_ClearOUT();\r
        #endif\r
 \r
        Endpoint_ClearOUT();\r


@@ -272,7 +311,7 @@ static void USB_Device_GetStatus(void)
                        break;\r
 #if !defined(CONTROL_ONLY_DEVICE)\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):\r
                        break;\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


@@ -280,16 +319,16 @@ 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
 \r
 static void USB_Device_ClearSetFeature(void)\r


@@ -316,16 +355,16 @@ 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
                                }\r
                        }\r
                        \r


@@ -337,7 +376,7 @@ static void USB_Device_ClearSetFeature(void)
 \r
        Endpoint_ClearSETUP();\r
 \r
 \r
        Endpoint_ClearSETUP();\r
 \r

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

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