diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-08-29 13:21:14 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-08-29 13:21:14 +0000 |
| commit | b3c6599bb7ab8518c3a457579c538c6520e85b01 (patch) | |
| tree | 657388ca4083d6124dea9e017bd637732e20c6fa /Projects/XPLAINBridge | |
| parent | 263178fbb653703273ca3684f16de0ee185f0ae1 (diff) | |
| download | lufa-b3c6599bb7ab8518c3a457579c538c6520e85b01.tar.gz lufa-b3c6599bb7ab8518c3a457579c538c6520e85b01.tar.bz2 lufa-b3c6599bb7ab8518c3a457579c538c6520e85b01.zip | |
Remove remaining void* descriptor casts in the projects and demos that were not removed when the GetDescriptor callback function's signature was altered.
Diffstat (limited to 'Projects/XPLAINBridge')
| -rw-r--r-- | Projects/XPLAINBridge/AVRISPDescriptors.c | 18 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/AVRISPDescriptors.h | 2 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/USARTDescriptors.c | 16 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/USARTDescriptors.h | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.c b/Projects/XPLAINBridge/AVRISPDescriptors.c index c85f4561b..e8f9f8d88 100644 --- 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, - 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*)&AVRISP_DeviceDescriptor; + Address = &AVRISP_DeviceDescriptor; 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: - Address = (void*)&AVRISP_LanguageString; + Address = &AVRISP_LanguageString; 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: - Address = (void*)&AVRISP_ProductString; + Address = &AVRISP_ProductString; 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; } diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.h b/Projects/XPLAINBridge/AVRISPDescriptors.h index 970035138..edfb37dbe 100644 --- 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, - void** const DescriptorAddress); + const void** const DescriptorAddress); #endif diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 9871305b0..2baedd4ab 100644 --- 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, - 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*)&USART_DeviceDescriptor; + Address = &USART_DeviceDescriptor; 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: - Address = (void*)&USART_LanguageString; + Address = &USART_LanguageString; 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: - Address = (void*)&USART_ProductString; + Address = &USART_ProductString; Size = pgm_read_byte(&USART_ProductString.Header.Size); break; } diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h index 194dbe70a..10713556a 100644 --- 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, - void** const DescriptorAddress); + const void** const DescriptorAddress); #endif |