diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2022-06-12 11:55:46 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2022-06-16 11:03:48 -0400 |
| commit | fc7838855f886383917076cee87b13938d8bbe40 (patch) | |
| tree | 4266addc37bb5ebc80dd0da654fa8a79c371e34b /src/stm32/chipid.c | |
| parent | 3f7d05dd18469927dff1cf5a7d35d67ec9fd7cdc (diff) | |
| download | kutter-fc7838855f886383917076cee87b13938d8bbe40.tar.gz kutter-fc7838855f886383917076cee87b13938d8bbe40.tar.xz kutter-fc7838855f886383917076cee87b13938d8bbe40.zip | |
canbus: Move canbus uuid calculation to canbus.c
Move the uuid hash calculation to canbus.c and call canbus_set_uuid()
from src/stm32/chipid.c . This simplifies the low-level canbus
hardware code.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/stm32/chipid.c')
| -rw-r--r-- | src/stm32/chipid.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/stm32/chipid.c b/src/stm32/chipid.c index 73e27503..03517739 100644 --- a/src/stm32/chipid.c +++ b/src/stm32/chipid.c @@ -4,6 +4,7 @@ // // This file may be distributed under the terms of the GNU GPLv3 license. +#include "generic/canbus.h" // canbus_set_uuid #include "generic/usb_cdc.h" // usb_fill_serial #include "generic/usbstd.h" // usb_string_descriptor #include "internal.h" // UID_BASE @@ -25,9 +26,10 @@ usbserial_get_serialid(void) void chipid_init(void) { - if (!CONFIG_USB_SERIAL_NUMBER_CHIPID) - return; - usb_fill_serial(&cdc_chipid.desc, ARRAY_SIZE(cdc_chipid.data) - , (void*)UID_BASE); + if (CONFIG_USB_SERIAL_NUMBER_CHIPID) + usb_fill_serial(&cdc_chipid.desc, ARRAY_SIZE(cdc_chipid.data) + , (void*)UID_BASE); + if (CONFIG_CANSERIAL) + canbus_set_uuid((void*)UID_BASE, CHIP_UID_LEN); } DECL_INIT(chipid_init); |