Commit for the 090810 release.

[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 5691d45..275892b 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Descriptors.c
+++ b/Demos/Device/Incomplete/Sideshow/Descriptors.c
@@ -42,7 +42,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        Endpoint0Size:          8,\r
                \r
        VendorID:               0x03EB,\r
        Endpoint0Size:          8,\r
                \r
        VendorID:               0x03EB,\r

-       ProductID:              0xDC03,\r
+       ProductID:              0x2060,\r

        ReleaseNumber:          0x0000,\r
                \r
        ManufacturerStrIndex:   0x01,\r
        ReleaseNumber:          0x0000,\r
                \r
        ManufacturerStrIndex:   0x01,\r


@@ -154,7 +154,7 @@ USB_OSCompatibleIDDescriptor_t PROGMEM DevCompatIDs =
                                 SubCompatibleID: "UNIV1"}\r
 };\r
 \r
                                 SubCompatibleID: "UNIV1"}\r
 };\r
 \r

-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r

 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r
 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r


@@ -165,30 +165,30 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r

-                       Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
+                       Address = (void*)&DeviceDescriptor;\r

                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration:\r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration:\r

-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
+                       Address = (void*)&ConfigurationDescriptor;\r

                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String:\r
                        switch (DescriptorNumber)\r
                        {\r
                                case 0x00:\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String:\r
                        switch (DescriptorNumber)\r
                        {\r
                                case 0x00:\r

-                                       Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+                                       Address = (void*)&LanguageString;\r

                                        Size    = pgm_read_byte(&LanguageString.Header.Size);\r
                                        break;\r
                                case 0x01:\r
                                        Size    = pgm_read_byte(&LanguageString.Header.Size);\r
                                        break;\r
                                case 0x01:\r

-                                       Address = DESCRIPTOR_ADDRESS(ManufacturerString);\r
+                                       Address = (void*)&ManufacturerString;\r

                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);\r
                                        break;\r
                                case 0x02:\r
                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);\r
                                        break;\r
                                case 0x02:\r

-                                       Address = DESCRIPTOR_ADDRESS(ProductString);\r
+                                       Address = (void*)&ProductString;\r

                                        Size    = pgm_read_byte(&ProductString.Header.Size);\r
                                        break;\r
                                case 0x03:\r
                                        Size    = pgm_read_byte(&ProductString.Header.Size);\r
                                        break;\r
                                case 0x03:\r

-                                       Address = DESCRIPTOR_ADDRESS(SerialNumberString);\r
+                                       Address = (void*)&SerialNumberString;\r

                                        Size    = pgm_read_byte(&SerialNumberString.Header.Size);\r
                                        break;\r
                                case 0xEE:\r
                                        Size    = pgm_read_byte(&SerialNumberString.Header.Size);\r
                                        break;\r
                                case 0xEE:\r


@@ -197,7 +197,7 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
                                           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
                                           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

-                                       Address = DESCRIPTOR_ADDRESS(OSDescriptorString);\r
+                                       Address = (void*)&OSDescriptorString;\r

                                        Size    = pgm_read_byte(&OSDescriptorString.Header.Size);\r
                                        break;\r
                        }\r
                                        Size    = pgm_read_byte(&OSDescriptorString.Header.Size);\r
                                        break;\r
                        }\r


@@ -221,7 +221,7 @@ bool USB_GetOSFeatureDescriptor(const uint16_t wValue, const uint8_t wIndex,
                /* Only the Extended Device Compatibility descriptor is supported */\r
                if (wIndex == EXTENDED_COMPAT_ID_DESCRIPTOR)\r
                {\r
                /* Only the Extended Device Compatibility descriptor is supported */\r
                if (wIndex == EXTENDED_COMPAT_ID_DESCRIPTOR)\r
                {\r

-                       Address = DESCRIPTOR_ADDRESS(DevCompatIDs);\r
+                       Address = (void*)&DevCompatIDs;\r

                        Size    = sizeof(USB_OSCompatibleIDDescriptor_t);\r
                }\r
        }\r
                        Size    = sizeof(USB_OSCompatibleIDDescriptor_t);\r
                }\r
        }\r