Commit 417d3438 authored by Dean Camera's avatar Dean Camera
Browse files

Ensure USE_INTERNAL_SERIAL is set to NO_DESCRIPTOR if internal serial is disabled.

parent b1e59da0
......@@ -7,6 +7,10 @@
/** \page Page_ChangeLog Project Changelog
*
* \section Sec_ChangeLogXXXXXX Version XXXXXX
* <b>New:</b>
* - Core:
* - The USE_INTERNAL_SERIAL definition can now be overridden by the user to a custom string index (thanks to Nicohood)
*
* <b>Fixed:</b>
* - Core:
* - Fixed DeviceUsesOUTPipe flag not being set correctly in the HID host class driver (thanks to Wolfgang Schnerring)
......
......@@ -114,23 +114,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 80
#define INTERNAL_SERIAL_LENGTH_BITS 80
/** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller
* model.
*/
#define INTERNAL_SERIAL_START_ADDRESS 0x0E
#define INTERNAL_SERIAL_START_ADDRESS 0x0E
#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: */
......
......@@ -103,7 +103,7 @@
* 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
......@@ -116,6 +116,7 @@
*/
#define INTERNAL_SERIAL_START_ADDRESS 0x80800204
#else
#undef USE_INTERNAL_SERIAL
#define USE_INTERNAL_SERIAL NO_DESCRIPTOR
#define INTERNAL_SERIAL_LENGTH_BITS 0
......
......@@ -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: */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment