Minor fix and improvements (#69)

* fix: device presist data use proper uicr api

* fix: minor typo

* optim: uicr customer api support larger length

---------

Signed-off-by: Adam BZH <adam@onekey.so>

Author: 424778940z

app/device_config.c

@@ -28,11 +28,16 @@ deviceCfg_t* deviceConfig_p = NULL;
 // UICR 31 is used for battery profile flag
 uint32_t devicePresistence_get_battery_profile_flag(void)
 {
-    return NRF_UICR->CUSTOMER[31];
+    uint32_t flag = 0xFFFFFFFF;
+    uicr_get_customer(31 * sizeof(uint32_t), &flag, sizeof(uint32_t));
+    return flag;
 }
 bool devicePresistence_set_battery_profile_flag(uint32_t flag)
 {
-    return uicr_write((uint32_t)(&(NRF_UICR->CUSTOMER[31])), &flag, 1);
+    if ( !uicr_update_customer(31 * sizeof(uint32_t), &flag, sizeof(uint32_t)) )
+        return false;
+    NVIC_SystemReset();
+    return true; // should never reach here
 }
 
 // ======================
@@ -125,7 +130,7 @@ bool deviceCfg_keystore_restore_from_uicr(deviceCfg_keystore_t* keystore)
     if ( !is_uicr_keystore_valid )
         return false;
 
-    // if uicr copy invalid, no flag check, restore only
+    // if flash copy invalid, no flag check, restore only
     if ( is_uicr_keystore_valid && !is_flash_keystore_valid )
         memcpy(keystore, &keystore_uicr, sizeof(deviceCfg_keystore_t));
 

drivers/nrf_uicr.c

@@ -93,7 +93,7 @@ bool uicr_update_bootloader_addr(uint32_t bootloader_addr)
     return true; // remember to reboot !
 }
 
-bool uicr_update_customer(uint8_t offset, void* data, uint8_t len)
+bool uicr_update_customer(uint8_t offset, void* data, uint32_t len)
 {
     if ( (offset % sizeof(uint32_t)) != 0 || (len % sizeof(uint32_t)) != 0 )
         return false;
@@ -116,7 +116,7 @@ bool uicr_update_customer(uint8_t offset, void* data, uint8_t len)
     return true; // remember to reboot !
 }
 
-bool uicr_get_customer(uint8_t offset, void* data, uint8_t len)
+bool uicr_get_customer(uint8_t offset, void* data, uint32_t len)
 {
     if ( (offset % sizeof(uint32_t)) != 0 || (len % sizeof(uint32_t)) != 0 )
         return false;

drivers/nrf_uicr.h

@@ -14,7 +14,7 @@ bool uicr_check_blank(uint32_t addr, uint32_t len_word);
 bool uicr_write(uint32_t addr, void* data, uint32_t len_word);
 bool uicr_read(uint32_t addr, void* data, uint32_t len_word);
 bool uicr_update_bootloader_addr(uint32_t bootloader_addr);
-bool uicr_update_customer(uint8_t offset, void* data, uint8_t len);
-bool uicr_get_customer(uint8_t offset, void* data, uint8_t len);
+bool uicr_update_customer(uint8_t offset, void* data, uint32_t len);
+bool uicr_get_customer(uint8_t offset, void* data, uint32_t len);
 
 #endif //_NRF_UICR_

drivers/pmu/axp2101.c

@@ -46,7 +46,7 @@ static bool axp2101_config_battery_param(void)
     // battery param -> BROM
     uint32_t bat_flag = devicePresistence_get_battery_profile_flag();
     if (
-        bat_flag != AXP2101_BROM_VARIANT_JSEL && ///
+        bat_flag != AXP2101_BROM_VARIANT_JSEL && //
         bat_flag != AXP2101_BROM_VARIANT_STML    //
     )
     {