Added new high level TWI packet read/write commands, altered behaviour of the TWI_Sta...

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / DeviceStandardReq.c

diff --git a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
index 7d7e48d..ffd949e 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
+++ b/LUFA/Drivers/USB/HighLevel/DeviceStandardReq.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   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
 
   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)
 }
 
 #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
 static void USB_Device_GetInternalSerialDescriptor(void)
 {
        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);

                }
        }
 
                }
        }