nimble/ll: Add a workaround to debug Channel Sounding on bsim

Limit Channel Sounding channels to 0-39 for bsim.Babblesim does not
support the required range of channels, so to debug on bsim let's
just truncate value to supported value range.

CS_SYNC packet does not contain a header nor CRC, but on bsim we can
not skip those. Let's include this overhead in step duration.

Author: mkasenberg

nimble/controller/src/ble_ll_cs_proc.c

@@ -74,6 +74,9 @@ struct ble_ll_cs_sm *g_ble_ll_cs_sm_current;
 /* The requency measurement period in µs */
 #define T_FM (80)
 
+/* Complement to full byte (4 bits) + header (16 bits) + CRC (24 bits) */
+#define BSIM_PACKET_OVERHEAD 4 + 16 + 24;
+
 static struct ble_ll_cs_aci aci_table[] = {
     {1, 1, 1}, {2, 2, 1}, {3, 3, 1}, {4, 4, 1},
     {2, 1, 2}, {3, 1, 3}, {4, 1, 4}, {4, 2, 2}
@@ -660,6 +663,14 @@ ble_ll_cs_proc_calculate_timing(struct ble_ll_cs_sm *cssm)
 
     cssm->procedure_interval_usecs = params->procedure_interval * cssm->connsm->conn_itvl *
                                      BLE_LL_CONN_ITVL_USECS;
+
+#if BABBLESIM
+    cssm->mode_duration_usecs[BLE_LL_CS_MODE0] += BSIM_PACKET_OVERHEAD;
+    cssm->mode_duration_usecs[BLE_LL_CS_MODE1] += BSIM_PACKET_OVERHEAD;
+    cssm->mode_duration_usecs[BLE_LL_CS_MODE2] += BSIM_PACKET_OVERHEAD;
+    cssm->mode_duration_usecs[BLE_LL_CS_MODE3] += BSIM_PACKET_OVERHEAD;
+#endif
+
     return 0;
 }
 
@@ -669,6 +680,10 @@ ble_ll_cs_proc_step_state_duration_get(uint8_t state, uint8_t mode,
 {
     uint32_t duration = 0;
 
+#if BABBLESIM
+    t_sy += BSIM_PACKET_OVERHEAD;
+#endif
+
     switch (state) {
     case STEP_STATE_CS_SYNC_I:
     case STEP_STATE_CS_SYNC_R:
@@ -856,6 +871,12 @@ ble_ll_cs_proc_sched_cb_get(uint8_t role, uint8_t step_state)
         BLE_LL_ASSERT(0);
     }
 
+#if BABBLESIM
+    if (cb == ble_ll_cs_tone_tx_start || cb == ble_ll_cs_tone_rx_start) {
+        cb = ble_ll_cs_proc_skip_txrx;
+    }
+#endif
+
     return cb;
 }
 

nimble/drivers/nrf5x/src/ble_phy.c

@@ -70,6 +70,11 @@
 
 #if BABBLESIM
 extern void tm_tick(void);
+#undef RADIO_STATE_STATE_Tx
+#undef RADIO_STATE_STATE_TxDisable
+#define RADIO_STATE_STATE_TxStarting (11UL) /* An additional state used in bsim */
+#define RADIO_STATE_STATE_Tx (12UL) /* RADIO is in the TX state */
+#define RADIO_STATE_STATE_TxDisable (13UL) /* RADIO is in the TXDISABLED state */
 #endif
 
 #include <controller/ble_ll_pdu.h>