Make SPI and USART peripheral dispatch driver headers in preparation for a set of...

[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 89c4e29..7d9e815 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -28,16 +28,23 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "../HighLevel/USBMode.h"\r
 \r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
-#define  INCLUDE_FROM_DEVCHAPTER9_C\r
+#define  __INCLUDE_FROM_DEVCHAPTER9_C\r
 #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_ProcessControlRequest(void)\r
 {\r
@@ -129,11 +136,11 @@ 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
@@ -192,10 +199,7 @@ static void USB_Device_SetConfiguration(void)
 \r
        Endpoint_ClearStatusStage();\r
 \r
-       if (USB_ConfigurationNumber)\r
-         USB_DeviceState = DEVICE_STATE_Configured;\r
-       else\r
-         USB_DeviceState = DEVICE_STATE_Addressed;\r
+       USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;\r
 \r
        EVENT_USB_Device_ConfigurationChanged();\r
 }\r
@@ -225,10 +229,10 @@ static void USB_Device_GetInternalSerialDescriptor(void)
                int16_t                 UnicodeString[20];\r
        } SignatureDescriptor;\r
 \r
-       SignatureDescriptor.Header.Size  = sizeof(SignatureDescriptor);\r
-       SignatureDescriptor.Header.Type  = DTYPE_String;\r
+       SignatureDescriptor.Header.Type = DTYPE_String;\r
+       SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);\r
        \r
-       uint8_t  SigReadAddress     = 0x0E;\r
+       uint8_t SigReadAddress = 0x0E;\r
 \r
        for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)\r
        {\r
@@ -304,17 +308,22 @@ static void USB_Device_GetStatus(void)
 \r
        switch (USB_ControlRequest.bmRequestType)\r
        {\r
+#if !defined(NO_DEVICE_SELF_POWER) || !defined(NO_DEVICE_REMOTE_WAKEUP)        \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
                        break;\r
+#endif\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
@@ -338,6 +347,7 @@ static void USB_Device_ClearSetFeature(void)
 {      \r
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
        {\r
+#if !defined(NO_DEVICE_REMOTE_WAKEUP)                  \r
                case REQREC_DEVICE:\r
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_REMOTE_WAKEUP)\r
                          USB_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);\r
@@ -345,6 +355,7 @@ static void USB_Device_ClearSetFeature(void)
                          return;\r
                        \r
                        break;                  \r
+#endif\r
 #if !defined(CONTROL_ONLY_DEVICE)\r
                case REQREC_ENDPOINT:\r
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)\r
@@ -358,21 +369,23 @@ 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
                        break;\r
 #endif\r
+               default:\r
+                       return;\r
        }\r
 \r
        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r