Use HAL to read DEVICEID

Author: Yagoor

arch/cpu/nrf/dev/usb-arch.c

@@ -54,6 +54,7 @@
 
 #include "nrfx.h"
 #include "nrfx_power.h"
+#include "nrf_ficr.h"
 /*---------------------------------------------------------------------------*/
 extern void tusb_hal_nrf_power_event(uint32_t event);
 /*---------------------------------------------------------------------------*/
@@ -76,8 +77,8 @@ power_event_handler(nrfx_power_usb_evt_t event)
 void
 usb_arch_init(void)
 {
-  const uint16_t serial_num_high_bytes = (uint16_t)NRF_FICR->DEVICEADDR[1] | 0xC000; // The masking makes the address match the Random Static BLE address.
-  const uint32_t serial_num_low_bytes  = NRF_FICR->DEVICEADDR[0];
+  const uint16_t serial_num_high_bytes = nrf_ficr_deviceid_get(NRF_FICR, 1) | 0xC000;
+  const uint32_t serial_num_low_bytes  = nrf_ficr_deviceid_get(NRF_FICR, 0);
   const nrfx_power_config_t power_config = { 0 };
   const nrfx_power_usbevt_config_t power_usbevt_config = {
     .handler = power_event_handler

arch/cpu/nrf/sys/linkaddr-arch.c

@@ -48,6 +48,7 @@
 #include "linkaddr.h"
 
 #include "nrf.h"
+#include "nrf_ficr.h"
 
 #include "linkaddr-arch.h"
 
@@ -72,18 +73,9 @@ populate_link_address(void)
   device_address[0] = (NORDIC_SEMI_VENDOR_OUI) >> 16 & 0xFF;
   device_address[1] = (NORDIC_SEMI_VENDOR_OUI) >> 8 & 0xFF;
   device_address[2] = NORDIC_SEMI_VENDOR_OUI & 0xFF;
-#if defined(NRF_FICR)
-  device_address[3] = NRF_FICR->DEVICEADDR[1] & 0xFF;
-  device_address_low = NRF_FICR->DEVICEADDR[0];
-#elif defined(NRF_FICR_NS)
-  device_address[3] = NRF_FICR_NS->DEVICEADDR[1] & 0xFF;
-  device_address_low = NRF_FICR_NS->DEVICEADDR[0];
-#elif defined(NRF_FICR_S)
-  device_address[3] = 0;
-  device_address_low = 0;
-#else
-#error "NRF_FICR not supported?"
-#endif
+  device_address[3] = nrf_ficr_deviceid_get(NRF_FICR, 1) & 0xFF;
+  device_address_low = nrf_ficr_deviceid_get(NRF_FICR, 0);
+
   memcpy(&device_address[4], &device_address_low, sizeof(device_address_low));
 
   memcpy(&linkaddr_node_addr, &device_address[8 - LINKADDR_SIZE],