[mynewt-nimble] branch master updated: nimble/phy/cmac: Move chip variant detection to core

[andk]

This is an automated email from the ASF dual-hosted git repository.

andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new b590fab9 nimble/phy/cmac: Move chip variant detection to core
b590fab9 is described below

commit b590fab9405115e5ff730f5fc17dd02f92e84531
Author: Andrzej Kaczmarek <andrzej.kaczma...@codecoup.pl>
AuthorDate: Tue Jun 20 13:50:40 2023 +0200

    nimble/phy/cmac: Move chip variant detection to core
    
    Chip variant detection does not work properly in ble_rf_init since it
    may be called when PD_SYS is disabled. We better do this in core on CMAC
    startup as PD_SYS is always enabled at that time.
---
 nimble/drivers/dialog_cmac/src/ble_rf.c | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/nimble/drivers/dialog_cmac/src/ble_rf.c 
b/nimble/drivers/dialog_cmac/src/ble_rf.c
index 32ae0634..f9756ec6 100644
--- a/nimble/drivers/dialog_cmac/src/ble_rf.c
+++ b/nimble/drivers/dialog_cmac/src/ble_rf.c
@@ -30,14 +30,6 @@
 #define RF_CALIBRATION_1        (0x02)
 #define RF_CALIBRATION_2        (0x04)
 
-enum chip_variant {
-    CHIP_VARIANT_TSMC,
-    CHIP_VARIANT_GF,
-    CHIP_VARIANT_UNKNOWN
-};
-
-static int g_chip_variant;
-
 static const int8_t g_ble_rf_power_lvls[] = {
     -18, -12, -8, -6, -3, -2, -1, 0, 1, 2, 3, 4, 4, 5, 6
 };
@@ -122,21 +114,6 @@ set_reg16_mask(uint32_t addr, uint16_t mask, uint16_t val)
     *reg = (*reg & (~mask)) | (val & mask);
 }
 
-static inline int 
-read_chip_variant(void)
-{
-    uint32_t chip_id1 = get_reg32_bits(0x50040200, 0xFF);
-
-    switch (chip_id1) {
-    case '2':
-        return CHIP_VARIANT_TSMC;
-    case '3':
-        return CHIP_VARIANT_GF;
-    default:
-        return CHIP_VARIANT_UNKNOWN;
-    }
-}
-
 static void
 delay_us(uint32_t delay_us)
 {
@@ -256,7 +233,7 @@ ble_rf_synth_is_enabled(void)
 static void
 ble_rf_synth_apply_recommended_settings(void)
 {
-    if (g_chip_variant == CHIP_VARIANT_GF) {
+    if (mcu_chip_variant_get() == MCU_CHIP_VARIANT_GF) {
         set_reg32_mask(0x40022034, 0x00000018, 0x0215807B);
     }
     set_reg32_mask(0x40022048, 0x0000000c, 0x000000d5);
@@ -361,7 +338,7 @@ ble_rf_calibration_1(void)
     set_reg32(0x40020000, 0x0f168820);
     set_reg32_bits(0x40022000, 0x00000001, 0);
     set_reg32_bits(0x4002101c, 0x00001e00, 0);
-    if (g_chip_variant == CHIP_VARIANT_TSMC) {
+    if (mcu_chip_variant_get() == MCU_CHIP_VARIANT_TSMC) {
         set_reg32_bits(0x4002001c, 0x0000003f, 47);
     } else {
         set_reg32_bits(0x4002001c, 0x0000003f, 44);
@@ -567,8 +544,7 @@ ble_rf_init(void)
     static bool done = false;
     uint32_t val;
 
-    g_chip_variant = read_chip_variant();
-    assert(g_chip_variant != CHIP_VARIANT_UNKNOWN);
+    assert(mcu_chip_variant_get());
 
     ble_rf_disable();