aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2018-02-18 17:49:50 +1100
committerDean Camera <dean@fourwalledcubicle.com>2018-02-18 17:49:50 +1100
commit417d34385c9568f04e4cbbf5cc2444981815fbe0 (patch)
tree84f346b4efdae17d6645708f07bce14dafe45277 /LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
parentb1e59da00b424e13f9c1c5abeec2b3cbe4227719 (diff)
downloadlufa-417d34385c9568f04e4cbbf5cc2444981815fbe0.tar.gz
lufa-417d34385c9568f04e4cbbf5cc2444981815fbe0.tar.bz2
lufa-417d34385c9568f04e4cbbf5cc2444981815fbe0.zip
Ensure USE_INTERNAL_SERIAL is set to NO_DESCRIPTOR if internal serial is disabled.
Diffstat (limited to 'LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h')
-rw-r--r--LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
index 526fae0c4..65b24a9ae 100644
--- a/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
+++ b/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
@@ -111,23 +111,24 @@
* number for the device.
*/
#ifndef USE_INTERNAL_SERIAL
- #define USE_INTERNAL_SERIAL 0xDC
+ #define USE_INTERNAL_SERIAL 0xDC
#endif
/** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller
* model.
*/
- #define INTERNAL_SERIAL_LENGTH_BITS (8 * (1 + (offsetof(NVM_PROD_SIGNATURES_t, COORDY1) - offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0))))
+ #define INTERNAL_SERIAL_LENGTH_BITS (8 * (1 + (offsetof(NVM_PROD_SIGNATURES_t, COORDY1) - offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0))))
/** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller
* model.
*/
- #define INTERNAL_SERIAL_START_ADDRESS offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0)
+ #define INTERNAL_SERIAL_START_ADDRESS offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0)
#else
- #define USE_INTERNAL_SERIAL NO_DESCRIPTOR
+ #undef USE_INTERNAL_SERIAL
+ #define USE_INTERNAL_SERIAL NO_DESCRIPTOR
- #define INTERNAL_SERIAL_LENGTH_BITS 0
- #define INTERNAL_SERIAL_START_ADDRESS 0
+ #define INTERNAL_SERIAL_LENGTH_BITS 0
+ #define INTERNAL_SERIAL_START_ADDRESS 0
#endif
/* Function Prototypes: */