Merge pull request #121 from NicoHood/internalserial

Allow user override of the USE_INTERNAL_SERIAL serial number string index (thanks to Nicohood).

diff --git a/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
index d3c979e..6b5c319 100644 (file)
--- a/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
+++ b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
@@ -113,7 +113,9 @@
                                 *  On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR and so will force the host to create a pseudo-serial
                                 *  number for the device.
                                 */
+                               #ifndef USE_INTERNAL_SERIAL
                                #define USE_INTERNAL_SERIAL            0xDC
+                               #endif
 
                                /** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller
                                 *  model.

diff --git a/LUFA/Drivers/USB/Core/UC3/Device_UC3.h b/LUFA/Drivers/USB/Core/UC3/Device_UC3.h
index 2abbfe0..dde7166 100644 (file)
--- a/LUFA/Drivers/USB/Core/UC3/Device_UC3.h
+++ b/LUFA/Drivers/USB/Core/UC3/Device_UC3.h
@@ -102,7 +102,9 @@
                                 *  On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR and so will force the host to create a pseudo-serial
                                 *  number for the device.
                                 */
+                               #ifndef USE_INTERNAL_SERIAL
                                #define USE_INTERNAL_SERIAL             0xDC
+                               #endif
 
                                /** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller
                                 *  model.

diff --git a/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
index 6b2ea60..526fae0 100644 (file)
--- a/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
+++ b/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
@@ -110,7 +110,9 @@
                                 *  On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR and so will force the host to create a pseudo-serial
                                 *  number for the device.
                                 */
+                               #ifndef USE_INTERNAL_SERIAL
                                #define USE_INTERNAL_SERIAL            0xDC
+                               #endif
 
                                /** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller
                                 *  model.