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 /Demos/Device/Incomplete | |
| 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 'Demos/Device/Incomplete')
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/Descriptors.c | 6 | ||||
| -rw-r--r-- | Demos/Device/Incomplete/Sideshow/Sideshow.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c index d10bcc8ab..8f4c7c532 100644 --- 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) { - 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) @@ -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) { - Address = (void*)&DevCompatIDs; + Address = &DevCompatIDs; Size = sizeof(USB_OSCompatibleIDDescriptor_t); } } diff --git a/Demos/Device/Incomplete/Sideshow/Sideshow.c b/Demos/Device/Incomplete/Sideshow/Sideshow.c index 644e957fd..8b2842bdf 100644 --- 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)) { - 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; |