Change Host mode class driver Pipe configuration routines -- better to let the applic...

[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 44493e6..8de4bd6 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -28,7 +28,8 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

-#include "USBMode.h"\r
+#include "../HighLevel/USBMode.h"\r
+\r

 #if defined(USB_CAN_BE_DEVICE)\r
 \r
 #define  INCLUDE_FROM_DEVCHAPTER9_C\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
 #define  INCLUDE_FROM_DEVCHAPTER9_C\r


@@ -40,32 +41,35 @@ bool    USB_CurrentlySelfPowered;
 \r
 void USB_Device_ProcessControlPacket(void)\r
 {\r
 \r
 void USB_Device_ProcessControlPacket(void)\r
 {\r

-       uint8_t bmRequestType  = Endpoint_Read_Byte();\r
-       uint8_t bRequest       = Endpoint_Read_Byte();\r
-       bool    RequestHandled = false; \r
+       bool     RequestHandled = false;\r
+       uint8_t* RequestHeader  = (uint8_t*)&USB_ControlRequest;\r
+       \r
+       for (uint8_t RequestHeaderByte = 0; RequestHeaderByte < sizeof(USB_Request_Header_t); RequestHeaderByte++)\r
+         *(RequestHeader++) = Endpoint_Read_Byte();\r
+         \r
+       uint8_t bmRequestType = USB_ControlRequest.bmRequestType;\r

        \r
        \r

-       switch (bRequest)\r
+       switch (USB_ControlRequest.bRequest)\r

        {\r
                case REQ_GetStatus:\r
                        if ((bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE)) ||\r
                            (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT)))\r
                        {\r
        {\r
                case REQ_GetStatus:\r
                        if ((bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE)) ||\r
                            (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT)))\r
                        {\r

-                               USB_Device_GetStatus(bmRequestType);\r
+                               USB_Device_GetStatus();\r

                                RequestHandled = true;\r
                        }\r
 \r
                        break;\r
                                RequestHandled = true;\r
                        }\r
 \r
                        break;\r

-#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)\r

                case REQ_ClearFeature:\r
                case REQ_SetFeature:\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
                        {\r

-                               USB_Device_ClearSetFeature(bRequest, bmRequestType);\r
+                               USB_Device_ClearSetFeature();\r

                                RequestHandled = true;\r
                        }\r
 \r
                        break;\r
                                RequestHandled = true;\r
                        }\r
 \r
                        break;\r

-#endif\r

                case REQ_SetAddress:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE))\r
                        {\r
                case REQ_SetAddress:\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE))\r
                        {\r


@@ -102,147 +106,228 @@ void USB_Device_ProcessControlPacket(void)
        }\r
 \r
        if (!(RequestHandled))\r
        }\r
 \r
        if (!(RequestHandled))\r

-         RAISE_EVENT(USB_UnhandledControlPacket, bRequest, bmRequestType);\r
+         EVENT_USB_UnhandledControlPacket();\r

          \r
          \r

-       if (Endpoint_IsSetupReceived())\r
+       if (Endpoint_IsSETUPReceived())\r

        {\r
                Endpoint_StallTransaction();\r
        {\r
                Endpoint_StallTransaction();\r

-               Endpoint_ClearSetupReceived();          \r
+               Endpoint_ClearSETUP();          \r

        }\r
 }\r
 \r
 static void USB_Device_SetAddress(void)\r
 {\r
        }\r
 }\r
 \r
 static void USB_Device_SetAddress(void)\r
 {\r

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

 \r
 \r

-       Endpoint_ClearSetupReceived();\r
+       Endpoint_ClearSETUP();\r

        \r
        \r

-       while (!(Endpoint_IsSetupINReady()));\r
+       Endpoint_ClearIN();\r

        \r
        \r

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

 \r
 \r

-       UDADDR = ((1 << ADDEN) | (wValue_LSB & 0x7F));\r
+       UDADDR = ((1 << ADDEN) | DeviceAddress);\r
+\r
+       if (DeviceAddress)\r
+         USB_DeviceState = DEVICE_STATE_Addressed;\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

-       uint8_t wValue_LSB        = Endpoint_Read_Byte();\r
-       bool    AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
+       bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r

 \r
 \r

-#if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r
-       if (wValue_LSB > 1)\r
+#if defined(TOTAL_NUM_CONFIGURATIONS)\r
+       if ((uint8_t)USB_ControlRequest.wValue > TOTAL_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

-           (wValue_LSB > 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

-           (wValue_LSB > 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

-           (wValue_LSB > 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
        }\r

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

        \r
        \r

-       Endpoint_ClearSetupReceived();\r
+       Endpoint_ClearSETUP();\r

 \r
 \r

-       USB_ConfigurationNumber = wValue_LSB;\r
+       USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;\r

 \r
 \r

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

 \r
 \r

-       if (!(AlreadyConfigured) && USB_ConfigurationNumber)\r
-         RAISE_EVENT(USB_DeviceEnumerationComplete);\r
+       if (USB_ConfigurationNumber)\r
+       {\r
+               USB_DeviceState = DEVICE_STATE_Configured;\r
+\r
+               if (!(AlreadyConfigured))\r
+                 EVENT_USB_DeviceEnumerationComplete();\r
+       }\r
+       else\r
+       {\r
+               USB_DeviceState = DEVICE_STATE_Addressed;\r
+       }\r

 \r
 \r

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

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

-       Endpoint_ClearSetupReceived();  \r
+       Endpoint_ClearSETUP();\r

 \r
        Endpoint_Write_Byte(USB_ConfigurationNumber);\r
        \r
 \r
        Endpoint_Write_Byte(USB_ConfigurationNumber);\r
        \r

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

 \r
 \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
-       Endpoint_ClearSetupOUT();\r
+       Endpoint_ClearOUT();\r

 }\r
 \r
 }\r
 \r

-static void USB_Device_GetDescriptor(void)\r
+#if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
+static void USB_Device_GetInternalSerialDescriptor(void)\r

 {\r
 {\r

-       uint16_t wValue  = Endpoint_Read_Word_LE();\r
-       uint16_t wIndex  = Endpoint_Read_Word_LE();\r
-       uint16_t wLength = Endpoint_Read_Word_LE();\r
-       \r
-       void*    DescriptorPointer;\r
-       uint16_t DescriptorSize;\r
-       \r
-       bool     SendZLP;\r
-       \r
-       if ((DescriptorSize = USB_GetDescriptor(wValue, wIndex, &DescriptorPointer)) == NO_DESCRIPTOR)\r
-         return;\r
-       \r
-       Endpoint_ClearSetupReceived();\r
-       \r
-       if (wLength > DescriptorSize)\r
-         wLength = DescriptorSize;\r
+       struct\r
+       {\r
+               USB_Descriptor_Header_t Header;\r
+               int16_t                 UnicodeString[12];\r
+       } SignatureDescriptor;\r

        \r
        \r

-       while (wLength)\r
+       uint8_t SigReadAddress  = 0x0E;         \r
+       bool    OddNibbleRead   = false;\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
+\r
+       for (uint8_t SerialCharNum = 0; SerialCharNum < 12; SerialCharNum++)\r

        {\r
        {\r

-               while (!(Endpoint_IsSetupINReady()))\r
+               uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);\r
+               \r
+               if (OddNibbleRead)\r

                {\r
                {\r

-                       if (Endpoint_IsSetupOUTReceived())\r
-                       {\r
-                               Endpoint_ClearSetupOUT();\r
-                               return;\r
-                       }               \r
+                       SerialByte >>= 4;\r
+                       SigReadAddress++;\r

                }\r
                }\r

-               \r
-               while (wLength && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
+               else\r

                {\r
                {\r

-                       #if defined(USE_RAM_DESCRIPTORS)\r
-                       Endpoint_Write_Byte(*((uint8_t*)DescriptorPointer++));\r
-                       #elif 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
-                       wLength--;\r
+                       SerialByte &= 0x0F;\r

                }\r
                \r
                }\r
                \r

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

        }\r
        \r
        }\r
        \r

-       if (SendZLP)\r
+       Endpoint_ClearSETUP();\r
+       Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));\r
+       Endpoint_ClearOUT();\r
+}\r
+#endif\r
+\r
+static void USB_Device_GetDescriptor(void)\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
+               USB_Device_GetInternalSerialDescriptor();\r
+               return;\r
+       }\r
+       #endif\r
+       \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_IsSetupINReady()));\r
-               Endpoint_ClearSetupIN();\r
+               return;\r

        }\r
        }\r

+       \r
+       Endpoint_ClearSETUP();\r

 \r
 \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
-       Endpoint_ClearSetupOUT();\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
+\r
+       Endpoint_ClearOUT();\r

 }\r
 \r
 }\r
 \r

-static void USB_Device_GetStatus(const uint8_t bmRequestType)\r
+static void USB_Device_GetStatus(void)\r

 {\r
        uint8_t CurrentStatus = 0;\r
 \r
 {\r
        uint8_t CurrentStatus = 0;\r
 \r

-       Endpoint_Discard_Word();\r
-\r
-#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)\r
-       uint8_t wIndex_LSB = Endpoint_Read_Byte();\r
-#endif\r
-       \r
-       switch (bmRequestType)\r
+       switch (USB_ControlRequest.bmRequestType)\r

        {\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):\r
                        if (USB_CurrentlySelfPowered)\r
        {\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):\r
                        if (USB_CurrentlySelfPowered)\r


@@ -252,66 +337,79 @@ static void USB_Device_GetStatus(const uint8_t bmRequestType)
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r
                        \r
                        break;\r
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r
                        \r
                        break;\r

-#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)\r
+#if !defined(CONTROL_ONLY_DEVICE)\r

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

-                       Endpoint_SelectEndpoint(wIndex_LSB);\r
+                       Endpoint_SelectEndpoint((uint8_t)USB_ControlRequest.wIndex);\r

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

+                       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);                      \r
+\r

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

-       \r
-       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);                      \r
-       Endpoint_ClearSetupReceived();\r
+\r
+       Endpoint_ClearSETUP();\r
+\r

        Endpoint_Write_Word_LE(CurrentStatus);\r
 \r
        Endpoint_Write_Word_LE(CurrentStatus);\r
 \r

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

        \r
        \r

-       while (!(Endpoint_IsSetupOUTReceived()));\r
-       Endpoint_ClearSetupOUT();\r
+       Endpoint_ClearOUT();\r

 }\r
 \r
 }\r
 \r

-#if !defined(FEATURELESS_CONTROL_ONLY_DEVICE)\r
-static void USB_Device_ClearSetFeature(const uint8_t bRequest, const uint8_t bmRequestType)\r
-{\r
-       uint16_t wValue = Endpoint_Read_Word_LE();\r
-       uint16_t wIndex = Endpoint_Read_Word_LE();\r
-       \r
-       switch (bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
+static void USB_Device_ClearSetFeature(void)\r
+{      \r
+       switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r

        {\r
        {\r

+               case REQREC_DEVICE:\r
+                       if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)\r
+                         USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);\r
+                       else\r
+                         return;\r
+                       \r
+                       break;                  \r
+#if !defined(CONTROL_ONLY_DEVICE)\r

                case REQREC_ENDPOINT:\r
                case REQREC_ENDPOINT:\r

-                       if (wValue == FEATURE_ENDPOINT_HALT)\r
+                       if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)\r

                        {\r
                        {\r

-                               uint8_t EndpointIndex = (wIndex & ENDPOINT_EPNUM_MASK);\r
+                               uint8_t EndpointIndex = ((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);\r

                                \r
                                \r

-                               if (EndpointIndex != ENDPOINT_CONTROLEP)\r
-                               {\r
-                                       Endpoint_SelectEndpoint(EndpointIndex);\r
-\r
-                                       if (Endpoint_IsEnabled())\r
-                                       {                               \r
-                                               if (bRequest == REQ_ClearFeature)\r
-                                               {\r
-                                                       Endpoint_ClearStall();\r
-                                                       Endpoint_ResetFIFO(EndpointIndex);\r
-                                                       Endpoint_ResetDataToggle();\r
-                                               }\r
-                                               else\r
-                                               {\r
-                                                       Endpoint_StallTransaction();                                            \r
-                                               }\r
+                               if (EndpointIndex == ENDPOINT_CONTROLEP)\r
+                                 return;\r
+\r
+                               Endpoint_SelectEndpoint(EndpointIndex);\r
+\r
+                               if (Endpoint_IsEnabled())\r
+                               {                               \r
+                                       if (USB_ControlRequest.bRequest == REQ_ClearFeature)\r
+                                       {\r
+                                               Endpoint_ClearStall();\r
+                                               Endpoint_ResetFIFO(EndpointIndex);\r
+                                               Endpoint_ResetDataToggle();\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               Endpoint_StallTransaction();\r

                                        }\r
                                        }\r

-\r
-                                       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
-                                       Endpoint_ClearSetupReceived();\r
-                                       Endpoint_ClearSetupIN();\r

                                }\r
                        }\r
                        \r
                        break;\r
                                }\r
                        }\r
                        \r
                        break;\r

+#endif\r

        }\r
        }\r

+\r
+       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
+\r
+       Endpoint_ClearSETUP();\r
+\r
+       Endpoint_ClearIN();\r

 }\r
 }\r

-#endif\r

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