X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/fb76acb0844a2528c32610455a8c7cd5266f3027..cae0fa73d70f82820bd8d71c4d60b6aff8ccf3cb:/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c diff --git a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c index 7d7e48d9b..ffd949ed3 100644 --- a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c +++ b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2010. + Copyright (C) Dean Camera, 2011. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -198,12 +198,6 @@ static void USB_Device_GetConfiguration(void) } #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) { struct @@ -229,7 +223,10 @@ static void USB_Device_GetInternalSerialDescriptor(void) SigReadAddress++; } - SignatureDescriptor.UnicodeString[SerialCharNum] = USB_Device_NibbleToASCII(SerialByte); + SerialByte &= 0x0F; + + SignatureDescriptor.UnicodeString[SerialCharNum] = (SerialByte >= 10) ? + (('A' - 10) + SerialByte) : ('0' + SerialByte); } }