Oops - restore deleted MissileLauncher project, fix all spelling errors for "missile...

[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 bf1cb6c..829bd13 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -62,7 +62,8 @@ void USB_Device_ProcessControlPacket(void)
                        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
@@ -105,7 +106,7 @@ void USB_Device_ProcessControlPacket(void)
        }\r
 \r
        if (!(RequestHandled))\r
-         RAISE_EVENT(USB_UnhandledControlPacket);\r
+         EVENT_USB_UnhandledControlPacket();\r
          \r
        if (Endpoint_IsSETUPReceived())\r
        {\r
@@ -118,8 +119,6 @@ static void USB_Device_SetAddress(void)
 {\r
        Endpoint_ClearSETUP();\r
        \r
-       while (!(Endpoint_IsINReady()));\r
-       \r
        Endpoint_ClearIN();\r
        \r
        while (!(Endpoint_IsINReady()));\r
@@ -131,14 +130,14 @@ static void USB_Device_SetAddress(void)
 \r
 static void USB_Device_SetConfiguration(void)\r
 {\r
-       bool    AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
+       bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
 \r
 #if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r
        if ((uint8_t)USB_ControlRequest.wValue > 1)\r
 #else\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) == NO_DESCRIPTOR) ||\r
        #if defined(USE_RAM_DESCRIPTORS)\r
            ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations))\r
        #elif defined (USE_EEPROM_DESCRIPTORS)\r
@@ -158,14 +157,14 @@ static void USB_Device_SetConfiguration(void)
        Endpoint_ClearIN();\r
 \r
        if (!(AlreadyConfigured) && USB_ConfigurationNumber)\r
-         RAISE_EVENT(USB_DeviceEnumerationComplete);\r
+         EVENT_USB_DeviceEnumerationComplete();\r
 \r
-       RAISE_EVENT(USB_ConfigurationChanged);\r
+       EVENT_USB_ConfigurationChanged();\r
 }\r
 \r
 void USB_Device_GetConfiguration(void)\r
 {\r
-       Endpoint_ClearSETUP();  \r
+       Endpoint_ClearSETUP();\r
 \r
        Endpoint_Write_Byte(USB_ConfigurationNumber);\r
        \r
@@ -180,15 +179,18 @@ static void USB_Device_GetDescriptor(void)
        void*    DescriptorPointer;\r
        uint16_t DescriptorSize;\r
        \r
-       if ((DescriptorSize = USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex, &DescriptorPointer)) == NO_DESCRIPTOR)\r
-         return;\r
+       if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,\r
+                                                        &DescriptorPointer)) == NO_DESCRIPTOR)\r
+       {\r
+               return;\r
+       }\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
+       bool SendZLP;\r
        \r
        if (USB_ControlRequest.wLength > DescriptorSize)\r
          USB_ControlRequest.wLength = DescriptorSize;\r
@@ -207,7 +209,7 @@ static void USB_Device_GetDescriptor(void)
                while (USB_ControlRequest.wLength && (Endpoint_BytesInEndpoint() < USB_ControlEndpointSize))\r
                {\r
                        #if defined (USE_EEPROM_DESCRIPTORS)\r
-                       Endpoint_Write_Byte(eeprom_read_byte(DescriptorPointer++));                     \r
+                       Endpoint_Write_Byte(eeprom_read_byte(DescriptorPointer++));             \r
                        #else\r
                        Endpoint_Write_Byte(pgm_read_byte(DescriptorPointer++));\r
                        #endif\r
@@ -274,6 +276,8 @@ static void USB_Device_ClearSetFeature(void)
                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
@@ -282,33 +286,35 @@ static void USB_Device_ClearSetFeature(void)
                        {\r
                                uint8_t EndpointIndex = ((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);\r
                                \r
-                               if (EndpointIndex != ENDPOINT_CONTROLEP)\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
+                               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
-                                       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
-                                       Endpoint_ClearSETUP();\r
-                                       Endpoint_ClearIN();\r
                                }\r
                        }\r
                        \r
                        break;\r
 #endif\r
        }\r
+\r
+       Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
+\r
+       Endpoint_ClearSETUP();\r
+\r
+       Endpoint_ClearIN();\r
 }\r
 \r
 #endif\r