nimble/phy: nrf5x: Add Channel Sounding to PHY

Author: mkasenberg

babblesim/core/src/cmsis.c

@@ -78,3 +78,8 @@ void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector)
 {
 	systemVectors[(int32_t)IRQn + 16] = (void(*)(void))vector;
 }
+
+uint32_t NVIC_GetVector(IRQn_Type IRQn)
+{
+    return (uint32_t)systemVectors[(int32_t)IRQn + 16];
+}

nimble/controller/include/controller/ble_phy.h

@@ -60,13 +60,23 @@ struct os_mbuf;
 #define BLE_PHY_STATE_IDLE          (0)
 #define BLE_PHY_STATE_RX            (1)
 #define BLE_PHY_STATE_TX            (2)
+#if MYNEWT_VAL(BLE_CHANNEL_SOUNDING)
+#define BLE_PHY_STATE_TX_CS_TONE    (3)
+#define BLE_PHY_STATE_RX_CS_TONE    (4)
+#endif
 
 /* BLE PHY transitions */
 #define BLE_PHY_TRANSITION_NONE                (0)
 #define BLE_PHY_TRANSITION_TO_TX               (1)
 #define BLE_PHY_TRANSITION_TO_RX               (2)
 #define BLE_PHY_TRANSITION_TO_TX_ISO_SUBEVENT  (3)
 #define BLE_PHY_TRANSITION_TO_RX_ISO_SUBEVENT  (4)
+#if MYNEWT_VAL(BLE_CHANNEL_SOUNDING)
+#define BLE_PHY_TRANSITION_TO_TX_CS_SYNC       (5)
+#define BLE_PHY_TRANSITION_TO_RX_CS_SYNC       (6)
+#define BLE_PHY_TRANSITION_TO_TX_CS_TONE       (7)
+#define BLE_PHY_TRANSITION_TO_RX_CS_TONE       (8)
+#endif
 
 /* PHY error codes */
 #define BLE_PHY_ERR_RADIO_STATE     (1)
@@ -79,6 +89,39 @@ struct os_mbuf;
 /* Maximun PDU length. Includes LL header of 2 bytes and 255 bytes payload. */
 #define BLE_PHY_MAX_PDU_LEN         (257)
 
+#if MYNEWT_VAL(BLE_CHANNEL_SOUNDING)
+#define BLE_PHY_CS_TRANSM_MODE_SYNC    (0)
+#define BLE_PHY_CS_TRANSM_MODE_TONE    (2)
+
+#define BLE_PHY_CS_TONE_MODE_FM    (0)
+#define BLE_PHY_CS_TONE_MODE_PM    (1)
+
+struct ble_phy_cs_transmission {
+    struct ble_phy_cs_transmission *next;
+    uint32_t duration_usecs;
+    uint32_t aa;
+    uint16_t end_tifs;
+    uint8_t channel;
+    uint8_t mode;
+    uint8_t is_tx;
+    uint8_t tone_mode;
+};
+
+struct ble_phy_cs_sync_results {
+    uint32_t cputime;
+    uint32_t rem_us;
+    uint32_t rem_ns;
+    int16_t rssi;
+};
+
+struct ble_phy_cs_tone_results {
+    /* TODO */
+};
+
+/* Configure the PHY for CS subevent sequence */
+int ble_phy_cs_subevent_start(struct ble_phy_cs_transmission *transm, uint32_t cputime, uint8_t rem_usecs);
+#endif
+
 /* Wait for response timer */
 typedef void (*ble_phy_tx_end_func)(void *arg);
 

nimble/drivers/nrf5x/pkg.yml

@@ -43,3 +43,6 @@ pkg.source_files.'MCU_TARGET=="nRF5340_NET"':
 
 pkg.source_files.'MCU_TARGET=="nRF54L15"':
     - "src/nrf54l15/phy.c"
+
+pkg.source_files.'BLE_CHANNEL_SOUNDING':
+    - "src/ble_phy_cs.c"

nimble/drivers/nrf5x/src/ble_phy.c

@@ -68,21 +68,6 @@
 #endif
 #endif
 
-#ifdef NRF54L_SERIES
-#define RADIO_IRQn RADIO_0_IRQn
-#define RADIO_INTENCLR_ADDRESS_Msk RADIO_INTENCLR00_ADDRESS_Msk
-#define RADIO_INTENSET_DISABLED_Msk RADIO_INTENSET00_DISABLED_Msk
-#define RADIO_INTENCLR_DISABLED_Msk RADIO_INTENCLR00_DISABLED_Msk
-#define RADIO_INTENSET_END_Msk RADIO_INTENSET00_END_Msk
-#define RADIO_INTENCLR_END_Msk RADIO_INTENCLR00_END_Msk
-#define RADIO_INTENCLR_PHYEND_Msk RADIO_INTENCLR00_PHYEND_Msk
-#define RADIO_INTENSET_ADDRESS_Msk RADIO_INTENSET00_ADDRESS_Msk
-#endif
-
-#if BABBLESIM
-extern void tm_tick(void);
-#endif
-
 #include <controller/ble_ll_pdu.h>
 
 /*
@@ -113,57 +98,6 @@ extern void tm_tick(void);
 extern uint8_t g_nrf_num_irks;
 extern uint32_t g_nrf_irk_list[];
 
-/* To disable all radio interrupts */
-#ifdef NRF54L_SERIES
-#define NRF_RADIO_IRQ_MASK_ALL  (RADIO_INTENSET00_READY_Msk    | \
-                                 RADIO_INTENSET00_ADDRESS_Msk  | \
-                                 RADIO_INTENSET00_PAYLOAD_Msk  | \
-                                 RADIO_INTENSET00_END_Msk      | \
-                                 RADIO_INTENSET00_PHYEND_Msk   | \
-                                 RADIO_INTENSET00_DISABLED_Msk | \
-                                 RADIO_INTENSET00_DEVMATCH_Msk | \
-                                 RADIO_INTENSET00_DEVMISS_Msk  | \
-                                 RADIO_INTENSET00_BCMATCH_Msk  | \
-                                 RADIO_INTENSET00_CRCOK_Msk    | \
-                                 RADIO_INTENSET00_CRCERROR_Msk)
-#else
-#define NRF_RADIO_IRQ_MASK_ALL  (0x34FF)
-#endif
-/*
- * We configure the nrf with a 1 byte S0 field, 8 bit length field, and
- * zero bit S1 field. The preamble is 8 bits long.
- */
-#define NRF_LFLEN_BITS          (8)
-#define NRF_S0LEN               (1)
-#define NRF_S1LEN_BITS          (0)
-#define NRF_CILEN_BITS          (2)
-#define NRF_TERMLEN_BITS        (3)
-
-/* Maximum length of frames */
-#define NRF_MAXLEN              (255)
-#define NRF_BALEN               (3)     /* For base address of 3 bytes */
-
-/* NRF_RADIO->PCNF0 configuration values */
-#define NRF_PCNF0               (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) | \
-                                (RADIO_PCNF0_S1INCL_Include << RADIO_PCNF0_S1INCL_Pos) | \
-                                (NRF_S0LEN << RADIO_PCNF0_S0LEN_Pos) | \
-                                (NRF_S1LEN_BITS << RADIO_PCNF0_S1LEN_Pos)
-#define NRF_PCNF0_1M            (NRF_PCNF0) | \
-                                (RADIO_PCNF0_PLEN_8bit << RADIO_PCNF0_PLEN_Pos)
-#define NRF_PCNF0_2M            (NRF_PCNF0) | \
-                                (RADIO_PCNF0_PLEN_16bit << RADIO_PCNF0_PLEN_Pos)
-#define NRF_PCNF0_CODED         (NRF_PCNF0) | \
-                                (RADIO_PCNF0_PLEN_LongRange << RADIO_PCNF0_PLEN_Pos) | \
-                                (NRF_CILEN_BITS << RADIO_PCNF0_CILEN_Pos) | \
-                                (NRF_TERMLEN_BITS << RADIO_PCNF0_TERMLEN_Pos)
-
-#define PHY_TRANS_NONE  (0)
-#define PHY_TRANS_TO_TX (1)
-#define PHY_TRANS_TO_RX (2)
-
-#define PHY_TRANS_ANCHOR_START   (0)
-#define PHY_TRANS_ANCHOR_END     (1)
-
 /* BLE PHY data structure */
 struct ble_phy_obj
 {
@@ -232,56 +166,63 @@ static const uint16_t g_ble_phy_mode_pkt_start_off[BLE_PHY_NUM_MODE] = {
 
 #if BABBLESIM
 /* delay between EVENTS_READY and start of tx */
-static const uint8_t g_ble_phy_t_txdelay[BLE_PHY_NUM_MODE] = {
+const uint8_t g_ble_phy_t_txdelay[BLE_PHY_NUM_MODE] = {
+    [BLE_PHY_MODE_1M] = 1,
+    [BLE_PHY_MODE_2M] = 1,
+};
+/* delay between EVENTS_ADDRESS and txd access address  */
+const uint8_t g_ble_phy_t_txaddrdelay[BLE_PHY_NUM_MODE] = {
     [BLE_PHY_MODE_1M] = 1,
     [BLE_PHY_MODE_2M] = 1,
+    [BLE_PHY_MODE_CODED_125KBPS] = 1,
+    [BLE_PHY_MODE_CODED_500KBPS] = 1,
 };
 /* delay between EVENTS_END and end of txd packet */
-static const uint8_t g_ble_phy_t_txenddelay[BLE_PHY_NUM_MODE] = {
+const uint8_t g_ble_phy_t_txenddelay[BLE_PHY_NUM_MODE] = {
     [BLE_PHY_MODE_1M] = 1,
     [BLE_PHY_MODE_2M] = 1,
 };
 /* delay between rxd access address (w/ TERM1 for coded) and EVENTS_ADDRESS */
-static const uint8_t g_ble_phy_t_rxaddrdelay[BLE_PHY_NUM_MODE] = {
+const uint8_t g_ble_phy_t_rxaddrdelay[BLE_PHY_NUM_MODE] = {
     [BLE_PHY_MODE_1M] = 9,
     [BLE_PHY_MODE_2M] = 5,
 };
 /* delay between end of rxd packet and EVENTS_END */
-static const uint8_t g_ble_phy_t_rxenddelay[BLE_PHY_NUM_MODE] = {
+const uint8_t g_ble_phy_t_rxenddelay[BLE_PHY_NUM_MODE] = {
     [BLE_PHY_MODE_1M] = 9,
     [BLE_PHY_MODE_2M] = 5,
 };
 #elif defined(NRF54L_SERIES)
 /* delay between EVENTS_READY and start of tx */
-static const uint8_t g_ble_phy_t_txdelay[BLE_PHY_NUM_MODE] = {
+const uint8_t g_ble_phy_t_txdelay[BLE_PHY_NUM_MODE] = {
     [BLE_PHY_MODE_1M] = 2, /* ~1.6us */
     [BLE_PHY_MODE_2M] = 5,
     [BLE_PHY_MODE_CODED_125KBPS] = 5,
     [BLE_PHY_MODE_CODED_500KBPS] = 5
 };
 /* delay between EVENTS_ADDRESS and txd access address  */
-static const uint8_t g_ble_phy_t_txaddrdelay[BLE_PHY_NUM_MODE] = {
+const uint8_t g_ble_phy_t_txaddrdelay[BLE_PHY_NUM_MODE] = {
     [BLE_PHY_MODE_1M] = 3, /* ~3.2us */
     [BLE_PHY_MODE_2M] = 5,
     [BLE_PHY_MODE_CODED_125KBPS] = 17,
     [BLE_PHY_MODE_CODED_500KBPS] = 17
 };
 /* delay between EVENTS_END and end of txd packet */
-static const uint8_t g_ble_phy_t_txenddelay[BLE_PHY_NUM_MODE] = {
+const uint8_t g_ble_phy_t_txenddelay[BLE_PHY_NUM_MODE] = {
     [BLE_PHY_MODE_1M] = 2, /* ~2.3us */
     [BLE_PHY_MODE_2M] = 4,
     [BLE_PHY_MODE_CODED_125KBPS] = 9,
     [BLE_PHY_MODE_CODED_500KBPS] = 3
 };
 /* delay between rxd access address (w/ TERM1 for coded) and EVENTS_ADDRESS */
-static const uint8_t g_ble_phy_t_rxaddrdelay[BLE_PHY_NUM_MODE] = {
+const uint8_t g_ble_phy_t_rxaddrdelay[BLE_PHY_NUM_MODE] = {
     [BLE_PHY_MODE_1M] = 9, /* ~9.2us */
     [BLE_PHY_MODE_2M] = 2,
     [BLE_PHY_MODE_CODED_125KBPS] = 17,
     [BLE_PHY_MODE_CODED_500KBPS] = 17
 };
 /* delay between end of rxd packet and EVENTS_END */
-static const uint8_t g_ble_phy_t_rxenddelay[BLE_PHY_NUM_MODE] = {
+const uint8_t g_ble_phy_t_rxenddelay[BLE_PHY_NUM_MODE] = {
     [BLE_PHY_MODE_1M] = 9, /* ~9.1us */
     [BLE_PHY_MODE_2M] = 1,
     [BLE_PHY_MODE_CODED_125KBPS] = 27,
@@ -652,7 +593,7 @@ ble_phy_rxpdu_copy(uint8_t *dptr, struct os_mbuf *rxpdu)
  * disable states. We want to wait until that state is over before doing
  * anything to the radio
  */
-static void
+void
 nrf_wait_disabled(void)
 {
     uint32_t state;
@@ -677,7 +618,7 @@ nrf_wait_disabled(void)
  *
  *
  */
-static int
+int
 ble_phy_set_start_time(uint32_t cputime, uint8_t rem_us, bool tx)
 {
     uint32_t next_cc;
@@ -875,7 +816,7 @@ ble_phy_set_start_now(void)
     return 0;
 }
 
-static void
+void
 ble_phy_wfr_enable_at(uint32_t end_time)
 {
     /* wfr_secs is the time from rxen until timeout */
@@ -1114,7 +1055,7 @@ ble_phy_rx_xcvr_setup(void)
                                     RADIO_INTENSET_DISABLED_Msk);
 }
 
-static uint32_t
+uint32_t
 ble_phy_transition_anchor_get(uint8_t tifs_anchor, uint8_t phy_state, uint8_t phy_mode)
 {
     uint32_t time;