Commit b3c6599b authored by Dean Camera's avatar Dean Camera
Browse files

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

Remove remaining void* descriptor casts in the projects and demos that were not removed when the GetDescriptor callback function's signature was altered.
parent 263178fb
...@@ -213,8 +213,8 @@ uint16_t USB_GetOSFeatureDescriptor(const uint16_t wValue, ...@@ -213,8 +213,8 @@ uint16_t USB_GetOSFeatureDescriptor(const uint16_t wValue,
const uint8_t wIndex, const uint8_t wIndex,
const void** const DescriptorAddress) const void** const DescriptorAddress)
{ {
void* Address = NULL; const void* Address = NULL;
uint16_t Size = NO_DESCRIPTOR; uint16_t Size = NO_DESCRIPTOR;
/* Check if a device level OS feature descriptor is being requested */ /* Check if a device level OS feature descriptor is being requested */
if (wValue == 0x0000) if (wValue == 0x0000)
...@@ -222,7 +222,7 @@ uint16_t USB_GetOSFeatureDescriptor(const uint16_t wValue, ...@@ -222,7 +222,7 @@ uint16_t USB_GetOSFeatureDescriptor(const uint16_t wValue,
/* Only the Extended Device Compatibility descriptor is supported */ /* Only the Extended Device Compatibility descriptor is supported */
if (wIndex == EXTENDED_COMPAT_ID_DESCRIPTOR) if (wIndex == EXTENDED_COMPAT_ID_DESCRIPTOR)
{ {
Address = (void*)&DevCompatIDs; Address = &DevCompatIDs;
Size = sizeof(USB_OSCompatibleIDDescriptor_t); Size = sizeof(USB_OSCompatibleIDDescriptor_t);
} }
} }
......
...@@ -114,9 +114,10 @@ void EVENT_USB_Device_UnhandledControlRequest(void) ...@@ -114,9 +114,10 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
case REQ_GetOSFeatureDescriptor: case REQ_GetOSFeatureDescriptor:
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE)) if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE))
{ {
void* DescriptorPointer; const void* DescriptorPointer;
uint16_t DescriptorSize = USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex, uint16_t DescriptorSize = USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue,
&DescriptorPointer); USB_ControlRequest.wIndex,
&DescriptorPointer);
if (DescriptorSize == NO_DESCRIPTOR) if (DescriptorSize == NO_DESCRIPTOR)
return; return;
......
...@@ -238,11 +238,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, ...@@ -238,11 +238,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
break; break;
case DTYPE_HID: case DTYPE_HID:
Address = (void*)&ConfigurationDescriptor.HID_MouseHID; Address = &ConfigurationDescriptor.HID_MouseHID;
Size = sizeof(USB_Descriptor_HID_t); Size = sizeof(USB_Descriptor_HID_t);
break; break;
case DTYPE_Report: case DTYPE_Report:
Address = (void*)&MouseReport; Address = &MouseReport;
Size = sizeof(MouseReport); Size = sizeof(MouseReport);
break; break;
} }
......
...@@ -174,41 +174,41 @@ USB_Descriptor_String_t PROGMEM AVRISP_SerialString = ...@@ -174,41 +174,41 @@ USB_Descriptor_String_t PROGMEM AVRISP_SerialString =
*/ */
uint16_t AVRISP_GetDescriptor(const uint16_t wValue, uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex, const uint8_t wIndex,
void** const DescriptorAddress) const void** const DescriptorAddress)
{ {
const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorNumber = (wValue & 0xFF); const uint8_t DescriptorNumber = (wValue & 0xFF);
void* Address = NULL; const void* Address = NULL;
uint16_t Size = NO_DESCRIPTOR; uint16_t Size = NO_DESCRIPTOR;
switch (DescriptorType) switch (DescriptorType)
{ {
case DTYPE_Device: case DTYPE_Device:
Address = (void*)&AVRISP_DeviceDescriptor; Address = &AVRISP_DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t); Size = sizeof(USB_Descriptor_Device_t);
break; break;
case DTYPE_Configuration: case DTYPE_Configuration:
Address = (void*)&AVRISP_ConfigurationDescriptor; Address = &AVRISP_ConfigurationDescriptor;
Size = sizeof(AVRISP_USB_Descriptor_Configuration_t); Size = sizeof(AVRISP_USB_Descriptor_Configuration_t);
break; break;
case DTYPE_String: case DTYPE_String:
switch (DescriptorNumber) switch (DescriptorNumber)
{ {
case 0x00: case 0x00:
Address = (void*)&AVRISP_LanguageString; Address = &AVRISP_LanguageString;
Size = pgm_read_byte(&AVRISP_LanguageString.Header.Size); Size = pgm_read_byte(&AVRISP_LanguageString.Header.Size);
break; break;
case 0x01: case 0x01:
Address = (void*)&AVRISP_ManufacturerString; Address = &AVRISP_ManufacturerString;
Size = pgm_read_byte(&AVRISP_ManufacturerString.Header.Size); Size = pgm_read_byte(&AVRISP_ManufacturerString.Header.Size);
break; break;
case 0x02: case 0x02:
Address = (void*)&AVRISP_ProductString; Address = &AVRISP_ProductString;
Size = pgm_read_byte(&AVRISP_ProductString.Header.Size); Size = pgm_read_byte(&AVRISP_ProductString.Header.Size);
break; break;
case 0x03: case 0x03:
Address = (void*)&AVRISP_SerialString; Address = &AVRISP_SerialString;
Size = pgm_read_byte(&AVRISP_SerialString.Header.Size); Size = pgm_read_byte(&AVRISP_SerialString.Header.Size);
break; break;
} }
......
...@@ -75,6 +75,6 @@ ...@@ -75,6 +75,6 @@
/* Function Prototypes: */ /* Function Prototypes: */
uint16_t AVRISP_GetDescriptor(const uint16_t wValue, uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex, const uint8_t wIndex,
void** const DescriptorAddress); const void** const DescriptorAddress);
#endif #endif
...@@ -223,37 +223,37 @@ USB_Descriptor_String_t PROGMEM USART_ProductString = ...@@ -223,37 +223,37 @@ USB_Descriptor_String_t PROGMEM USART_ProductString =
*/ */
uint16_t USART_GetDescriptor(const uint16_t wValue, uint16_t USART_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex, const uint8_t wIndex,
void** const DescriptorAddress) const void** const DescriptorAddress)
{ {
const uint8_t DescriptorType = (wValue >> 8); const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorNumber = (wValue & 0xFF); const uint8_t DescriptorNumber = (wValue & 0xFF);
void* Address = NULL; const void* Address = NULL;
uint16_t Size = NO_DESCRIPTOR; uint16_t Size = NO_DESCRIPTOR;
switch (DescriptorType) switch (DescriptorType)
{ {
case DTYPE_Device: case DTYPE_Device:
Address = (void*)&USART_DeviceDescriptor; Address = &USART_DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t); Size = sizeof(USB_Descriptor_Device_t);
break; break;
case DTYPE_Configuration: case DTYPE_Configuration:
Address = (void*)&USART_ConfigurationDescriptor; Address = &USART_ConfigurationDescriptor;
Size = sizeof(USART_USB_Descriptor_Configuration_t); Size = sizeof(USART_USB_Descriptor_Configuration_t);
break; break;
case DTYPE_String: case DTYPE_String:
switch (DescriptorNumber) switch (DescriptorNumber)
{ {
case 0x00: case 0x00:
Address = (void*)&USART_LanguageString; Address = &USART_LanguageString;
Size = pgm_read_byte(&USART_LanguageString.Header.Size); Size = pgm_read_byte(&USART_LanguageString.Header.Size);
break; break;
case 0x01: case 0x01:
Address = (void*)&USART_ManufacturerString; Address = &USART_ManufacturerString;
Size = pgm_read_byte(&USART_ManufacturerString.Header.Size); Size = pgm_read_byte(&USART_ManufacturerString.Header.Size);
break; break;
case 0x02: case 0x02:
Address = (void*)&USART_ProductString; Address = &USART_ProductString;
Size = pgm_read_byte(&USART_ProductString.Header.Size); Size = pgm_read_byte(&USART_ProductString.Header.Size);
break; break;
} }
......
...@@ -79,6 +79,6 @@ ...@@ -79,6 +79,6 @@
/* Function Prototypes: */ /* Function Prototypes: */
uint16_t USART_GetDescriptor(const uint16_t wValue, uint16_t USART_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex, const uint8_t wIndex,
void** const DescriptorAddress); const void** const DescriptorAddress);
#endif #endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment