projects / pub / lufa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added new NO_DEVICE_SELF_POWER and NO_DEVICE_REMOTE_WAKEUP compile time options.
[pub/lufa.git] / LUFA / Drivers / USB / LowLevel / DevChapter9.c
diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 8de4bd6..3f0976b 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -36,10 +36,16 @@
 #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
+#endif\r
+\r
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)\r
+bool    USB_RemoteWakeupEnabled;\r
+#endif\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 +112,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 +127,7 @@ static void USB_Device_SetAddress(void)
 \r
        Endpoint_ClearSETUP();\r
        \r
-       Endpoint_ClearIN();\r
+       Endpoint_ClearStatusStage();\r
        \r
        while (!(Endpoint_IsINReady()))\r
        {\r
@@ -129,20 +135,18 @@ static void USB_Device_SetAddress(void)
                  return;\r
        }\r
 \r
-       UDADDR = ((1 << ADDEN) | DeviceAddress);\r
-\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
-       bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
-\r
-#if defined(TOTAL_NUM_CONFIGURATIONS)\r
-       if ((uint8_t)USB_ControlRequest.wValue > TOTAL_NUM_CONFIGURATIONS)\r
+#if defined(FIXED_NUM_CONFIGURATIONS)\r
+       if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)\r
          return;\r
 #else\r
        #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
@@ -192,21 +196,11 @@ 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
+       USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r
 \r
-               if (!(AlreadyConfigured))\r
-                 EVENT_USB_DeviceEnumerationComplete();\r
-       }\r
-       else\r
-       {\r
-               USB_DeviceState = DEVICE_STATE_Addressed;\r
-       }\r
-\r
-       EVENT_USB_ConfigurationChanged();\r
+       EVENT_USB_Device_ConfigurationChanged();\r
 }\r
 \r
 void USB_Device_GetConfiguration(void)\r
@@ -214,64 +208,48 @@ 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
+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[12];\r
+               int16_t                 UnicodeString[20];\r
        } SignatureDescriptor;\r
-       \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
+       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 < 12; SerialCharNum++)\r
+       for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)\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
-               else\r
-               {\r
-                       SerialByte &= 0x0F;\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
        Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));\r
+\r
        Endpoint_ClearOUT();\r
 }\r
 #endif\r
@@ -330,16 +308,20 @@ static void USB_Device_GetStatus(void)
        switch (USB_ControlRequest.bmRequestType)\r
        {\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
-                       \r
+#endif\r
+\r
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)                  \r
                        if (USB_RemoteWakeupEnabled)\r
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r
-                       \r
+#endif\r
+\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
@@ -347,21 +329,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
@@ -369,10 +346,12 @@ static void USB_Device_ClearSetFeature(void)
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
        {\r
                case REQREC_DEVICE:\r
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)                  \r
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)\r
                          USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);\r
                        else\r
                          return;\r
+#endif\r
                        \r
                        break;                  \r
 #if !defined(CONTROL_ONLY_DEVICE)\r
@@ -388,16 +367,16 @@ static void USB_Device_ClearSetFeature(void)
 \r
                                if (Endpoint_IsEnabled())\r
                                {                               \r
-                                       if (USB_ControlRequest.bRequest == REQ_ClearFeature)\r
+                                       if (USB_ControlRequest.bRequest == REQ_SetFeature)\r
                                        {\r
-                                               Endpoint_ClearStall();\r
-                                               Endpoint_ResetFIFO(EndpointIndex);\r
-                                               Endpoint_ResetDataToggle();\r
+                                               Endpoint_StallTransaction();\r
                                        }\r
                                        else\r
                                        {\r
-                                               Endpoint_StallTransaction();\r
-                                       }\r
+                                               Endpoint_ClearStall();\r
+                                               Endpoint_ResetFIFO(EndpointIndex);\r
+                                               Endpoint_ResetDataToggle();\r
+                                       }                                       \r
                                }\r
                        }\r
                        \r
@@ -409,7 +388,7 @@ static void USB_Device_ClearSetFeature(void)
 \r
        Endpoint_ClearSETUP();\r
 \r
-       Endpoint_ClearIN();\r
+       Endpoint_ClearStatusStage();\r
 }\r
 \r
 #endif\r
Lightweight USB Framework for AVRs