eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better algorithm to extract and convert the internal device serial number into a string descriptor (if present). 

Fix incorrect warning text when an unsuitable F_CLOCK value is given.
This commit is contained in:
Dean Camera 2010-10-24 12:25:34 +00:00
parent 5517f96e86
commit 8f3bee7d86
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,8 +211,8 @@ 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) static char USB_Device_NibbleToASCII(uint8_t Nibble)
{ {
Nibble = ((Nibble & 0x0F) + '0'); Nibble &= 0x0F;
return (Nibble > '9') ? (Nibble + ('A' - '9' - 1)) : Nibble; return (Nibble >= 10) ? (('A' - 10) + Nibble) : ('0' + Nibble);
} }
static void USB_Device_GetInternalSerialDescriptor(void) static void USB_Device_GetInternalSerialDescriptor(void)
@ -220,16 +220,16 @@ static void USB_Device_GetInternalSerialDescriptor(void)
struct struct
{ {
USB_Descriptor_Header_t Header; USB_Descriptor_Header_t Header;
int16_t UnicodeString[20]; wchar_t UnicodeString[20];
} SignatureDescriptor; } SignatureDescriptor;
SignatureDescriptor.Header.Type = DTYPE_String; SignatureDescriptor.Header.Type = DTYPE_String;
SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor); SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);
uint8_t SigReadAddress = 0x0E;
ATOMIC_BLOCK(ATOMIC_RESTORESTATE) ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
{ {
uint8_t SigReadAddress = 0x0E;
for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++) for (uint8_t SerialCharNum = 0; SerialCharNum < 20; SerialCharNum++)
{ {
uint8_t SerialByte = boot_signature_byte_get(SigReadAddress); uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);

2
LUFA/Drivers/USB/LowLevel/USBController.h
View File

@ -118,7 +118,7 @@
#endif #endif
#if !defined(USB_PLL_PSC) #if !defined(USB_PLL_PSC)
#error No PLL prescale value available for chosen F_CPU value and AVR model. #error No PLL prescale value available for chosen F_CLOCK value and AVR model.
#endif #endif
/* Public Interface - May be used in end-application: */ /* Public Interface - May be used in end-application: */