aboutsummaryrefslogtreecommitdiff
path: root/Bootloaders/CDC/Descriptors.c
diff options
context:
space:
mode:
authorDean Camera <[email protected]>2010-08-24 13:02:38 +0000
committerDean Camera <[email protected]>2010-08-24 13:02:38 +0000
commit092f82e06fc64436fd957b4b6b8d5ce33532efae (patch)
tree3060a52e5f3e3a3486e7d2bd272cfc8e7ab58190 /Bootloaders/CDC/Descriptors.c
parented8ad18f26ef36a7c0cafd3aac1f672a06d14f76 (diff)
downloadqmk_firmware-092f82e06fc64436fd957b4b6b8d5ce33532efae.tar.gz
qmk_firmware-092f82e06fc64436fd957b4b6b8d5ce33532efae.zip
Changed the signature of the CALLBACK_USB_GetDescriptor() callback function so that the descriptor pointer is const, to remove the need for extra casting inside the callback (thanks to Jonathan Kollasch).
Diffstat (limited to 'Bootloaders/CDC/Descriptors.c')
-rw-r--r--Bootloaders/CDC/Descriptors.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index e808fcfe1e..092ee2f8dc 100644
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -203,33 +203,33 @@ USB_Descriptor_String_t 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:
if (!(DescriptorNumber))
{
- Address = (void*)&LanguageString;
+ Address = &LanguageString;
Size = LanguageString.Header.Size;
}
else
{
- Address = (void*)&ProductString;
+ Address = &ProductString;
Size = ProductString.Header.Size;
}