mirror/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-09-10 17:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge in latest trunk.

Browse Source
This commit is contained in:
Dean Camera
2012-05-20 17:16:21 +00:00
parent 28967ef2e8 5833b27f80
commit 5f709e281e
18 changed files with 115 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Projects/XPLAINBridge/USARTDescriptors.c
View File

@@ -213,7 +213,8 @@ const USB_Descriptor_String_t PROGMEM USART_ProductString =
*/
uint16_t USART_GetDescriptor(const uint16_t wValue,
const uint8_t wIndex,
const void** const DescriptorAddress)
const void** const DescriptorAddress,
uint8_t* const DescriptorMemorySpace)
{
const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorNumber = (wValue & 0xFF);
@@ -221,6 +222,8 @@ uint16_t USART_GetDescriptor(const uint16_t wValue,
const void* Address = NULL;
uint16_t Size = NO_DESCRIPTOR;
*DescriptorMemorySpace = MEMSPACE_FLASH;
switch (DescriptorType)
{
case DTYPE_Device: