Changed the signature of the CALLBACK_USB_GetDescriptor() callback function so that...

[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 a5505ea..9a2f69c 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
@@ -288,37 +288,37 @@ USB_Descriptor_String_t PROGMEM ProductString =
  */
 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                                     const uint8_t wIndex,
-                                    void** const DescriptorAddress)
+                                    const void** const DescriptorAddress)
 {
        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: 
-                       Address = (void*)&DeviceDescriptor;
+                       Address = &DeviceDescriptor;
                        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: 
-                                       Address = (void*)&LanguageString;
+                                       Address = &LanguageString;
                                        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: 
-                                       Address = (void*)&ProductString;
+                                       Address = &ProductString;
                                        Size    = pgm_read_byte(&ProductString.Header.Size);
                                        break;
                        }
@@ -327,24 +327,24 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                case DTYPE_HID: 
                        if (!(wIndex))
                        {
-                               Address = (void*)&ConfigurationDescriptor.HID1_KeyboardHID;
+                               Address = &ConfigurationDescriptor.HID1_KeyboardHID;
                                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))
                        {
-                               Address = (void*)&KeyboardReport;
+                               Address = &KeyboardReport;
                                Size    = sizeof(KeyboardReport);
                        }
                        else
                        {                       
-                               Address = (void*)&MouseReport;
+                               Address = &MouseReport;
                                Size    = sizeof(MouseReport);
                        }