Make Low Level host demos use void pointers for the configuration descriptor, to...

[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 f9c52e6..bb6104f 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
-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
@@ -106,7 +106,7 @@ void USB_Device_ProcessControlPacket(void)
        }\r
 \r
        if (!(RequestHandled))\r
-         EVENT_USB_UnhandledControlPacket();\r
+         EVENT_USB_Device_UnhandledControlRequest();\r
          \r
        if (Endpoint_IsSETUPReceived())\r
        {\r
@@ -121,7 +121,7 @@ static void USB_Device_SetAddress(void)
 \r
        Endpoint_ClearSETUP();\r
        \r
-       Endpoint_ClearIN();\r
+       Endpoint_ClearStatusStage();\r
        \r
        while (!(Endpoint_IsINReady()))\r
        {\r
@@ -139,8 +139,6 @@ static void USB_Device_SetAddress(void)
 \r
 static void USB_Device_SetConfiguration(void)\r
 {\r
-       bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
-\r
 #if defined(FIXED_NUM_CONFIGURATIONS)\r
        if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)\r
          return;\r
@@ -192,21 +190,14 @@ static void USB_Device_SetConfiguration(void)
 \r
        USB_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;\r
 \r
-       Endpoint_ClearIN();\r
+       Endpoint_ClearStatusStage();\r
 \r
        if (USB_ConfigurationNumber)\r
-       {\r
-               USB_DeviceState = DEVICE_STATE_Configured;\r
-\r
-               if (!(AlreadyConfigured))\r
-                 EVENT_USB_DeviceEnumerationComplete();\r
-       }\r
+         USB_DeviceState = DEVICE_STATE_Configured;\r
        else\r
-       {\r
-               USB_DeviceState = DEVICE_STATE_Addressed;\r
-       }\r
+         USB_DeviceState = DEVICE_STATE_Addressed;\r
 \r
-       EVENT_USB_ConfigurationChanged();\r
+       EVENT_USB_Device_ConfigurationChanged();\r
 }\r
 \r
 void USB_Device_GetConfiguration(void)\r
@@ -214,16 +205,9 @@ void USB_Device_GetConfiguration(void)
        Endpoint_ClearSETUP();\r
 \r
        Endpoint_Write_Byte(USB_ConfigurationNumber);\r
-       \r
        Endpoint_ClearIN();\r
 \r
-       while (!(Endpoint_IsOUTReceived()))\r
-       {\r
-               if (USB_DeviceState == DEVICE_STATE_Unattached)\r
-                 return;       \r
-       }\r
-\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
@@ -241,15 +225,10 @@ static void USB_Device_GetInternalSerialDescriptor(void)
                int16_t                 UnicodeString[20];\r
        } SignatureDescriptor;\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
-       uint8_t  SigReadAddress     = 0x0E;\r
+       SignatureDescriptor.Header.Size  = sizeof(SignatureDescriptor);\r
+       SignatureDescriptor.Header.Type  = DTYPE_String;\r
+       \r
+       uint8_t  SigReadAddress = 0x0E;\r
 \r
        for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)\r
        {\r
@@ -265,7 +244,9 @@ static void USB_Device_GetInternalSerialDescriptor(void)
        }\r
        \r
        Endpoint_ClearSETUP();\r
+\r
        Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));\r
+\r
        Endpoint_ClearOUT();\r
 }\r
 #endif\r
@@ -333,7 +314,7 @@ static void USB_Device_GetStatus(void)
                        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
@@ -341,21 +322,16 @@ static void USB_Device_GetStatus(void)
 \r
                        break;\r
 #endif\r
+               default:\r
+                       return;\r
        }\r
 \r
        Endpoint_ClearSETUP();\r
 \r
        Endpoint_Write_Word_LE(CurrentStatus);\r
-\r
        Endpoint_ClearIN();\r
        \r
-       while (!(Endpoint_IsOUTReceived()))\r
-       {\r
-               if (USB_DeviceState == DEVICE_STATE_Unattached)\r
-                 return;       \r
-       }\r
-       \r
-       Endpoint_ClearOUT();\r
+       Endpoint_ClearStatusStage();\r
 }\r
 \r
 static void USB_Device_ClearSetFeature(void)\r
@@ -403,7 +379,7 @@ static void USB_Device_ClearSetFeature(void)
 \r
        Endpoint_ClearSETUP();\r
 \r
-       Endpoint_ClearIN();\r
+       Endpoint_ClearStatusStage();\r
 }\r
 \r
 #endif\r