aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2018-02-18 17:44:49 +1100
committerGitHub <noreply@github.com>2018-02-18 17:44:49 +1100
commitb1e59da00b424e13f9c1c5abeec2b3cbe4227719 (patch)
tree9814ad3e4ce923397cf5f7c2145f1edabd4ab5fa
parentd6a528f9a03fe338e30d93f306e0482612e02e3e (diff)
parente1cf5fc2a617e4b642f2eef6e6c32b751d5e9227 (diff)
downloadlufa-b1e59da00b424e13f9c1c5abeec2b3cbe4227719.tar.gz
lufa-b1e59da00b424e13f9c1c5abeec2b3cbe4227719.tar.bz2
lufa-b1e59da00b424e13f9c1c5abeec2b3cbe4227719.zip
Merge pull request #121 from NicoHood/internalserial
Allow user override of the USE_INTERNAL_SERIAL serial number string index (thanks to Nicohood).
-rw-r--r--LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h2
-rw-r--r--LUFA/Drivers/USB/Core/UC3/Device_UC3.h2
-rw-r--r--LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h2
3 files changed, 6 insertions, 0 deletions
diff --git a/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
index d3c979e48..6b5c3199f 100644
--- 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 2abbfe0ef..dde71665f 100644
--- 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 6b2ea6031..526fae0c4 100644
--- 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.