Fix warning when not compiled for UID auto-selection mode.

[pub/USBasp.git] / Bootloaders / CDC / Descriptors.c

diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index 1aaf10b..092ee2f 100644 (file)
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -126,7 +126,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .Data                   = {0x00, 0x01}
                },      
 
                        .Data                   = {0x00, 0x01}
                },      
 

-       .CDC_ManagementEndpoint = 
+       .CDC_NotificationEndpoint = 

                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
                                                                                 
                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
                                                                                 


@@ -201,33 +201,35 @@ USB_Descriptor_String_t 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:
                        if (!(DescriptorNumber))
                        {
                        Size    = sizeof(USB_Descriptor_Configuration_t);
                        break;
                case DTYPE_String:
                        if (!(DescriptorNumber))
                        {

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

                                Size    = LanguageString.Header.Size;
                        }
                        else
                        {
                                Size    = LanguageString.Header.Size;
                        }
                        else
                        {

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

                                Size    = ProductString.Header.Size;
                        }
                        
                                Size    = ProductString.Header.Size;
                        }