From 92e9cb71e290ea7e05d15f4761b8a07d786a8aa9 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 2 Dec 2015 18:56:52 +1100 Subject: Fixed incorrect CALLBACK_USB_GetDescriptor() wIndex parameter type (thanks to matlo). --- Projects/XPLAINBridge/USARTDescriptors.c | 2 +- Projects/XPLAINBridge/USARTDescriptors.h | 2 +- Projects/XPLAINBridge/XPLAINBridge.c | 2 +- Projects/XPLAINBridge/XPLAINBridge.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Projects/XPLAINBridge') diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index f1354a286..1478e2888 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.c @@ -197,7 +197,7 @@ const USB_Descriptor_String_t PROGMEM USART_ProductString = USB_STRING_DESCRIPTO * callback function in the main source file, to retrieve the device's descriptors when in USART bridge mode. */ uint16_t USART_GetDescriptor(const uint16_t wValue, - const uint8_t wIndex, + const uint16_t wIndex, const void** const DescriptorAddress, uint8_t* const DescriptorMemorySpace) { diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h index 3ea435791..81a55be16 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.h +++ b/Projects/XPLAINBridge/USARTDescriptors.h @@ -104,7 +104,7 @@ /* Function Prototypes: */ uint16_t USART_GetDescriptor(const uint16_t wValue, - const uint8_t wIndex, + const uint16_t wIndex, const void** const DescriptorAddress, uint8_t* const DescriptorMemorySpace); diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 9475b1fd9..173c19cb4 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -281,7 +281,7 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI * \return Length of the retrieved descriptor in bytes, or NO_DESCRIPTOR if the descriptor was not found */ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, - const uint8_t wIndex, + const uint16_t wIndex, const void** const DescriptorAddress, uint8_t* const DescriptorMemorySpace) { diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h index baed8b90f..0ce234f92 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.h +++ b/Projects/XPLAINBridge/XPLAINBridge.h @@ -95,7 +95,7 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo); uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, - const uint8_t wIndex, + const uint16_t wIndex, const void** const DescriptorAddress, uint8_t* const DescriptorMemorySpace) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4); -- cgit v1.2.3