mfulz_github/qmk_firmware
1
0
Fork 1
mirror of https://github.com/mfulz/qmk_firmware.git synced 2025-06-24 23:55:18 +02:00
Code Issues Projects Releases Wiki Activity

Remove internal USB_Device_NibbleToASCII() function in favour of manually inlined code to prevent compilation errors in -O0 optimisation level.

Browse Source
This commit is contained in:
Dean Camera 2010-11-21 10:16:44 +00:00
parent 3988639823
commit 55da77d85f
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
View File

@ -198,12 +198,6 @@ static void USB_Device_GetConfiguration(void)
} }
#if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR) #if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
static char USB_Device_NibbleToASCII(uint8_t Nibble)
{
Nibble &= 0x0F;
return (Nibble >= 10) ? (('A' - 10) + Nibble) : ('0' + Nibble);
}
static void USB_Device_GetInternalSerialDescriptor(void) static void USB_Device_GetInternalSerialDescriptor(void)
{ {
struct struct
@ -229,7 +223,10 @@ static void USB_Device_GetInternalSerialDescriptor(void)
SigReadAddress++; SigReadAddress++;
} }
SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte); SerialByte &= 0x0F;
SignatureDescriptor.UnicodeString[SerialCharNum] = (SerialByte >= 10) ?
(('A' - 10) + SerialByte) : ('0' + SerialByte);
} }
} }

1
LUFA/Drivers/USB/HighLevel/DeviceStandardReq.h
View File

@ -151,7 +151,6 @@
static void USB_Device_ClearSetFeature(void); static void USB_Device_ClearSetFeature(void);
#if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR) #if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
static char USB_Device_NibbleToASCII(uint8_t Nibble) ATTR_ALWAYS_INLINE;
static void USB_Device_GetInternalSerialDescriptor(void); static void USB_Device_GetInternalSerialDescriptor(void);
#endif #endif
#endif #endif