diff options
Diffstat (limited to 'src/atsam/chipid.c')
| -rw-r--r-- | src/atsam/chipid.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/atsam/chipid.c b/src/atsam/chipid.c index b4ab289c..dda4c5d0 100644 --- a/src/atsam/chipid.c +++ b/src/atsam/chipid.c @@ -5,6 +5,7 @@ // This file may be distributed under the terms of the GNU GPLv3 license. #include "generic/irq.h" // irq_disable +#include "generic/canserial.h" // canserial_set_uuid #include "generic/usb_cdc.h" // usb_fill_serial #include "generic/usbstd.h" // usb_string_descriptor #include "internal.h" // EFC0 @@ -61,7 +62,7 @@ read_chip_id(uint32_t *id) void chipid_init(void) { - if (!CONFIG_USB_SERIAL_NUMBER_CHIPID) + if (!CONFIG_USB_SERIAL_NUMBER_CHIPID && !CONFIG_CANBUS) return; uint32_t id[4]; @@ -69,6 +70,10 @@ chipid_init(void) read_chip_id(id); irq_enable(); - usb_fill_serial(&cdc_chipid.desc, ARRAY_SIZE(cdc_chipid.data), id); + if (CONFIG_USB_SERIAL_NUMBER_CHIPID) + usb_fill_serial(&cdc_chipid.desc, ARRAY_SIZE(cdc_chipid.data), id); + + if (CONFIG_CANBUS) + canserial_set_uuid((void*)id, CHIP_UID_LEN); } DECL_INIT(chipid_init); |