Minor documentation enhancements.

[pub/USBasp.git] / Demos / Device / LowLevel / KeyboardMouse / Descriptors.c

diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
index e09e3c8..642b8e9 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
@@ -131,7 +131,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
                
        .VendorID               = 0x03EB,
        .ProductID              = 0x204D,
                
        .VendorID               = 0x03EB,
        .ProductID              = 0x204D,

-       .ReleaseNumber          = 0x0000,
+       .ReleaseNumber          = VERSION_BCD(00.01),

                
        .ManufacturerStrIndex   = 0x01,
        .ProductStrIndex        = 0x02,
                
        .ManufacturerStrIndex   = 0x01,
        .ProductStrIndex        = 0x02,


@@ -286,37 +286,39 @@ USB_Descriptor_String_t PROGMEM ProductString =
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
  *  USB host.
  */
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
  *  USB host.
  */

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

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

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

 
        switch (DescriptorType)
        {
                case DTYPE_Device: 
 
        switch (DescriptorType)
        {
                case DTYPE_Device: 

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

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

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

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

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

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

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

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

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

                                        Size    = pgm_read_byte(&ProductString.Header.Size);
                                        break;
                        }
                                        Size    = pgm_read_byte(&ProductString.Header.Size);
                                        break;
                        }


@@ -325,24 +327,24 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
                case DTYPE_HID: 
                        if (!(wIndex))
                        {
                case DTYPE_HID: 
                        if (!(wIndex))
                        {

-                               Address = (void*)&ConfigurationDescriptor.HID1_KeyboardHID;
+                               Address = &ConfigurationDescriptor.HID1_KeyboardHID;

                                Size    = sizeof(USB_Descriptor_HID_t);
                        }
                        else
                        {
                                Size    = sizeof(USB_Descriptor_HID_t);
                        }
                        else
                        {

-                               Address = (void*)&ConfigurationDescriptor.HID2_MouseHID;
+                               Address = &ConfigurationDescriptor.HID2_MouseHID;

                                Size    = sizeof(USB_Descriptor_HID_t);                 
                        }
                        break;
                case DTYPE_Report: 
                        if (!(wIndex))
                        {
                                Size    = sizeof(USB_Descriptor_HID_t);                 
                        }
                        break;
                case DTYPE_Report: 
                        if (!(wIndex))
                        {

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

                                Size    = sizeof(KeyboardReport);
                        }
                        else
                        {                       
                                Size    = sizeof(KeyboardReport);
                        }
                        else
                        {                       

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

                                Size    = sizeof(MouseReport);
                        }
                        
                                Size    = sizeof(MouseReport);
                        }