Minor documentation enhancements.

[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 d10bcc8..6860ac4 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Descriptors.c
+++ b/Demos/Device/Incomplete/Sideshow/Descriptors.c
@@ -34,7 +34,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
 {
        Header:                 {Size: sizeof(USB_Descriptor_Device_t), Type: DTYPE_Device},
                
 {
        Header:                 {Size: sizeof(USB_Descriptor_Device_t), Type: DTYPE_Device},
                

-       USBSpecification:       VERSION_BCD(02.00),
+       USBSpecification:       VERSION_BCD(01.10),

        Class:                  0x00,
        SubClass:               0x00,
        Protocol:               0x00,
        Class:                  0x00,
        SubClass:               0x00,
        Protocol:               0x00,


@@ -43,7 +43,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
                
        VendorID:               0x03EB,
        ProductID:              0x2040,
                
        VendorID:               0x03EB,
        ProductID:              0x2040,

-       ReleaseNumber:          0x0001,
+       ReleaseNumber:          VERSION_BCD(00.01),

                
        ManufacturerStrIndex:   0x01,
        ProductStrIndex:        0x02,
                
        ManufacturerStrIndex:   0x01,
        ProductStrIndex:        0x02,


@@ -213,8 +213,8 @@ uint16_t USB_GetOSFeatureDescriptor(const uint16_t wValue,
                                     const uint8_t wIndex,
                                     const void** const DescriptorAddress)
 {
                                     const uint8_t wIndex,
                                     const void** const DescriptorAddress)
 {

-       void*    Address = NULL;
-       uint16_t Size    = NO_DESCRIPTOR;
+       const void* Address = NULL;
+       uint16_t    Size    = NO_DESCRIPTOR;

 
        /* Check if a device level OS feature descriptor is being requested */
        if (wValue == 0x0000)
 
        /* Check if a device level OS feature descriptor is being requested */
        if (wValue == 0x0000)


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

-                       Address = (void*)&DevCompatIDs;
+                       Address = &DevCompatIDs;

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