Fix up the incomplete Webserver project so that it integrates with the uIP stack...

[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 3f0976b..3118302 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\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
               \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
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -307,18 +307,19 @@ static void USB_Device_GetStatus(void)
 \r
        switch (USB_ControlRequest.bmRequestType)\r
        {\r
 \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
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):\r

-#if !defined(NO_DEVICE_SELF_POWER)\r
+       #if !defined(NO_DEVICE_SELF_POWER)\r

                        if (USB_CurrentlySelfPowered)\r
                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;\r
                        if (USB_CurrentlySelfPowered)\r
                          CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;\r

-#endif\r
+       #endif\r

 \r
 \r

-#if !defined(NO_DEVICE_REMOTE_WAKEUP)                  \r
+       #if !defined(NO_DEVICE_REMOTE_WAKEUP)                   \r

                        if (USB_RemoteWakeupEnabled)\r
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r
                        if (USB_RemoteWakeupEnabled)\r
                          CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;\r

-#endif\r
-\r
+       #endif\r

                        break;\r
                        break;\r

+#endif\r

 #if !defined(CONTROL_ONLY_DEVICE)\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):\r
                        Endpoint_SelectEndpoint(USB_ControlRequest.wIndex & 0xFF);\r
 #if !defined(CONTROL_ONLY_DEVICE)\r
                case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):\r
                        Endpoint_SelectEndpoint(USB_ControlRequest.wIndex & 0xFF);\r


@@ -345,15 +346,15 @@ static void USB_Device_ClearSetFeature(void)
 {      \r
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
        {\r
 {      \r
        switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)\r
        {\r

-               case REQREC_DEVICE:\r

 #if !defined(NO_DEVICE_REMOTE_WAKEUP)                  \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
                        else\r
                          return;\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
                        \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
 #if !defined(CONTROL_ONLY_DEVICE)\r
                case REQREC_ENDPOINT:\r
                        if ((uint8_t)USB_ControlRequest.wValue == FEATURE_ENDPOINT_HALT)\r


@@ -382,6 +383,8 @@ static void USB_Device_ClearSetFeature(void)
                        \r
                        break;\r
 #endif\r
                        \r
                        break;\r
 #endif\r

+               default:\r
+                       return;\r

        }\r
 \r
        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
        }\r
 \r
        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r