Fixed Set/Clear Feature requests directed to a non-configured endpoint not returning...

[pub/USBasp.git] / Demos / Device / Incomplete / Sideshow / Descriptors.c

diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c
index 647e0b4..8f36cae 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Descriptors.c
+++ b/Demos/Device/Incomplete/Sideshow/Descriptors.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
@@ -54,7 +54,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        \r
 USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =\r
 {\r
-       Config:\r
+       .Config =\r
                {\r
                        Header:                 {Size: sizeof(USB_Descriptor_Configuration_Header_t), Type: DTYPE_Configuration},\r
 \r
@@ -69,7 +69,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        MaxPowerConsumption:    USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
-       Interface:\r
+       .SSHOW_Interface =\r
                {\r
                        Header:                 {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},\r
 \r
@@ -85,7 +85,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        InterfaceStrIndex:      NO_DESCRIPTOR\r
                },\r
 \r
-       DataInEndpoint:\r
+       .SSHOW_DataInEndpoint =\r
                {\r
                        Header:                 {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
 \r
@@ -95,7 +95,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        PollingIntervalMS:      0x00\r
                },\r
 \r
-       DataOutEndpoint:\r
+       .SSHOW_DataOutEndpoint =\r
                {\r
                        Header:                 {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
 \r
@@ -192,11 +192,9 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
                                        Size    = pgm_read_byte(&SerialNumberString.Header.Size);\r
                                        break;\r
                                case 0xEE:\r
-                                       /* Great, another Microsoft-proprietary extention. String address 0xEE is used\r
-                                          by Windows for "OS Descriptors", which in this case allows us to indicate that\r
-                                          our device is Sideshow compatible. Most people would be happy using the normal\r
-                                          0xFF 0x?? 0x?? Class/Subclass/Protocol values like the USBIF intended. */\r
-                                          \r
+                                       /* A Microsoft-proprietary extention. String address 0xEE is used by Windows for\r
+                                          "OS Descriptors", which in this case allows us to indicate that our device is\r
+                                          Sideshow compatible regardless of VID/PID values. */\r
                                        Address = (void*)&OSDescriptorString;\r
                                        Size    = pgm_read_byte(&OSDescriptorString.Header.Size);\r
                                        break;\r