Remove remaining void* descriptor casts in the projects and demos that were not remov...

diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c
index d10bcc8..8f4c7c5 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Descriptors.c
+++ b/Demos/Device/Incomplete/Sideshow/Descriptors.c
@@ -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);
                }
        }

diff --git a/Demos/Device/Incomplete/Sideshow/Sideshow.c b/Demos/Device/Incomplete/Sideshow/Sideshow.c
index 644e957..8b2842b 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Sideshow.c
+++ b/Demos/Device/Incomplete/Sideshow/Sideshow.c
@@ -114,9 +114,10 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                case REQ_GetOSFeatureDescriptor:
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE))
                        {
                case REQ_GetOSFeatureDescriptor:
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE))
                        {

-                               void*    DescriptorPointer;
-                               uint16_t DescriptorSize = USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
-                                                                                    &DescriptorPointer);
+                               const void* DescriptorPointer;
+                               uint16_t    DescriptorSize = USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue,
+                                                                                       USB_ControlRequest.wIndex,
+                                                                                       &DescriptorPointer);

 
                                if (DescriptorSize == NO_DESCRIPTOR)
                                  return;
 
                                if (DescriptorSize == NO_DESCRIPTOR)
                                  return;

diff --git a/Demos/Device/LowLevel/Mouse/Descriptors.c b/Demos/Device/LowLevel/Mouse/Descriptors.c
index 66fdde1..70538fe 100644 (file)
--- a/Demos/Device/LowLevel/Mouse/Descriptors.c
+++ b/Demos/Device/LowLevel/Mouse/Descriptors.c
@@ -238,11 +238,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                        
                        break;
                case DTYPE_HID: 
                        
                        break;
                case DTYPE_HID: 

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

                        Size    = sizeof(USB_Descriptor_HID_t);
                        break;
                case DTYPE_Report: 
                        Size    = sizeof(USB_Descriptor_HID_t);
                        break;
                case DTYPE_Report: 

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

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

diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.c b/Projects/XPLAINBridge/AVRISPDescriptors.c
index c85f456..e8f9f8d 100644 (file)
--- a/Projects/XPLAINBridge/AVRISPDescriptors.c
+++ b/Projects/XPLAINBridge/AVRISPDescriptors.c
@@ -174,41 +174,41 @@ USB_Descriptor_String_t PROGMEM AVRISP_SerialString =
  */
 uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
                               const uint8_t wIndex,
  */
 uint16_t AVRISP_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);
 
 {
        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*)&AVRISP_DeviceDescriptor;
+                       Address = &AVRISP_DeviceDescriptor;

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

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

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

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

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

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

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

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

                                        Size    = pgm_read_byte(&AVRISP_ProductString.Header.Size);
                                        break;
                                case 0x03:
                                        Size    = pgm_read_byte(&AVRISP_ProductString.Header.Size);
                                        break;
                                case 0x03:

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

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

diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.h b/Projects/XPLAINBridge/AVRISPDescriptors.h
index 9700351..edfb37d 100644 (file)
--- a/Projects/XPLAINBridge/AVRISPDescriptors.h
+++ b/Projects/XPLAINBridge/AVRISPDescriptors.h
@@ -75,6 +75,6 @@
        /* Function Prototypes: */
                uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
                                              const uint8_t wIndex,
        /* Function Prototypes: */
                uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
                                              const uint8_t wIndex,

-                                             void** const DescriptorAddress);
+                                             const void** const DescriptorAddress);

 
 #endif
 
 #endif

diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c
index 9871305..2baedd4 100644 (file)
--- a/Projects/XPLAINBridge/USARTDescriptors.c
+++ b/Projects/XPLAINBridge/USARTDescriptors.c
@@ -223,37 +223,37 @@ USB_Descriptor_String_t PROGMEM USART_ProductString =
  */
 uint16_t USART_GetDescriptor(const uint16_t wValue,
                              const uint8_t wIndex,
  */
 uint16_t USART_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);
 
 {
        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*)&USART_DeviceDescriptor;
+                       Address = &USART_DeviceDescriptor;

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

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

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

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

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

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

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

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

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

diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h
index 194dbe7..1071355 100644 (file)
--- a/Projects/XPLAINBridge/USARTDescriptors.h
+++ b/Projects/XPLAINBridge/USARTDescriptors.h
@@ -79,6 +79,6 @@
        /* Function Prototypes: */
                uint16_t USART_GetDescriptor(const uint16_t wValue,
                                             const uint8_t wIndex,
        /* Function Prototypes: */
                uint16_t USART_GetDescriptor(const uint16_t wValue,
                                             const uint8_t wIndex,

-                                            void** const DescriptorAddress);
+                                            const void** const DescriptorAddress);

 
 #endif
 
 #endif