me/qmk_firmware
1
0
Fork 0
forked from mirror/qmk_firmware
Code Pull Requests Activity

Fixed incorrect CALLBACK_USB_GetDescriptor() wIndex parameter type (thanks to matlo).

Browse Source
This commit is contained in:
Dean Camera
2015-12-02 18:56:52 +11:00
parent f42a4f3a47
commit 92e9cb71e2
108 changed files with 112 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA/CodeTemplates/DeviceTemplate/Descriptors.c
View File

@@ -127,7 +127,7 @@ const USB_Descriptor_String_t ProductString =
* USB host.
*/
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex,
const uint16_t wIndex,
const void** const DescriptorAddress
#if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
, uint8_t* const DescriptorMemorySpace

2
LUFA/CodeTemplates/HostTemplate/HostApplication.c
View File

@@ -122,7 +122,7 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
* option is set, this is still required even in an application that uses host mode only.
*/
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex,
const uint16_t wIndex,
const void** const DescriptorAddress
#if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
, uint8_t* const DescriptorMemorySpace

5
LUFA/DoxygenPages/ChangeLog.txt
View File

@@ -7,7 +7,10 @@
/** \page Page_ChangeLog Project Changelog
*
* \section Sec_ChangeLogXXXXXX Version XXXXXX
* None.
* <b>Fixed:</b>
* - Core:
* - The CALLBACK_USB_GetDescriptor() callback function into the user application erroneously had a uint8_t type for the wIndex
* parameter, instead of uint16_t (thanks to Matlo)
*
* \section Sec_ChangeLog151115 Version 151115
* <b>New:</b>

3
LUFA/DoxygenPages/MigrationInformation.txt
View File

@@ -11,7 +11,8 @@
* areas relevant to making older projects compatible with the API changes of each new release.
*
* \section Sec_MigrationXXXXXX Version XXXXXX
* None.
* <b>Device Mode</b>
* - The \c CALLBACK_USB_GetDescriptor() callback function into the user application's \c wIndex parameter is now \c uint16_t, not \c uint8_t.
*
* \section Sec_Migration151115 Migrating from 140928 to 151115
* <b>Non-USB Library Components</b>

2
LUFA/Drivers/USB/Core/Device.h
View File

@@ -131,7 +131,7 @@
* \return Size in bytes of the descriptor if it exists, zero or \ref NO_DESCRIPTOR otherwise.
*/
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex,
const uint16_t wIndex,
const void** const DescriptorAddress
#if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)) && \
!(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))