nimble/hci: Update Channel Sounding HCI

Blueooth 6.0. spec contains Optional_TX_SNR_Capability field as
a CS capability. Companion signal parameter was removed.

nimble/host/src/ble_cs.c

@@ -115,7 +115,6 @@ struct ble_cs_create_config_cp {
     uint8_t channel_selection_type;
     uint8_t ch3c_shape;
     uint8_t ch3c_jump;
-    uint8_t companion_signal_enable;
 } __attribute__((packed));
 
 struct ble_cs_remove_config_cp {
@@ -361,7 +360,7 @@ ble_cs_create_config(const struct ble_cs_create_config_cp *cmd)
     cp.channel_selection_type = cmd->channel_selection_type;
     cp.ch3c_shape = cmd->ch3c_shape;
     cp.ch3c_jump = cmd->ch3c_jump;
-    cp.companion_signal_enable = cmd->companion_signal_enable;
+    cp.reserved = 0x00;
 
     return ble_hs_hci_cmd_tx(BLE_HCI_OP(BLE_HCI_OGF_LE,
                                         BLE_HCI_OCF_LE_CS_CREATE_CONFIG),
@@ -531,8 +530,6 @@ ble_hs_hci_evt_le_cs_rd_rem_fae_complete(uint8_t subevent, const void *data,
     /* Ignore these as used only with #3c algorithm */
     cmd.ch3c_shape = 0x00;
     cmd.ch3c_jump = 0x00;
-    /* EDLC/ECLD attack protection not supported */
-    cmd.companion_signal_enable = 0x00;
 
     /* Create CS config */
     rc = ble_cs_create_config(&cmd);

nimble/include/nimble/hci_common.h

@@ -1178,6 +1178,7 @@ struct ble_hci_le_cs_rd_loc_supp_cap_rp {
     uint16_t optional_t_fcs_times_supported;
     uint16_t optional_t_pm_times_supported;
     uint8_t t_sw_time_supported;
+    uint8_t optional_tx_snr_capability;
 } __attribute__((packed));
 
 #define BLE_HCI_OCF_LE_CS_RD_REM_SUPP_CAP                (0x008A)
@@ -1207,6 +1208,7 @@ struct ble_hci_le_cs_wr_cached_rem_supp_cap_cp {
     uint16_t optional_t_fcs_times_supported;
     uint16_t optional_t_pm_times_supported;
     uint8_t t_sw_time_supported;
+    uint8_t optional_tx_snr_capability;
 } __attribute__((packed));
 struct ble_hci_le_cs_wr_cached_rem_supp_cap_rp {
     uint16_t conn_handle;
@@ -1261,7 +1263,7 @@ struct ble_hci_le_cs_create_config_cp {
     uint8_t channel_selection_type;
     uint8_t ch3c_shape;
     uint8_t ch3c_jump;
-    uint8_t companion_signal_enable;
+    uint8_t reserved;
 } __attribute__((packed));
 
 #define BLE_HCI_OCF_LE_CS_REMOVE_CONFIG                  (0x0091)
@@ -1322,7 +1324,7 @@ struct ble_hci_le_cs_test_cp {
     uint8_t t_pm_time;
     uint8_t t_sw_time;
     uint8_t tone_antenna_config_selection;
-    uint8_t companion_signal_enable;
+    uint8_t reserved;
     uint16_t drbg_nonce;
     uint16_t override_config;
     uint8_t override_parameters_length;
@@ -2215,6 +2217,7 @@ struct ble_hci_ev_le_subev_cs_rd_rem_supp_cap_complete {
     uint16_t optional_t_fcs_times_supported;
     uint16_t optional_t_pm_times_supported;
     uint8_t t_sw_time_supported;
+    uint8_t optional_tx_snr_capability;
 } __attribute__((packed));
 
 #define BLE_HCI_LE_SUBEV_CS_RD_REM_FAE_COMPLETE        (0x2D)
@@ -2253,7 +2256,7 @@ struct ble_hci_ev_le_subev_cs_config_complete {
     uint8_t channel_selection_type;
     uint8_t ch3c_shape;
     uint8_t ch3c_jump;
-    uint8_t companion_signal_enable;
+    uint8_t reserved;
     uint8_t t_ip1_time;
     uint8_t t_ip2_time;
     uint8_t t_fcs_time;
@@ -2363,6 +2366,7 @@ struct ble_hci_ev_le_subev_cs_test_end_complete {
 #define BLE_HCI_VER_BCS_5_2                 (11)
 #define BLE_HCI_VER_BCS_5_3                 (12)
 #define BLE_HCI_VER_BCS_5_4                 (13)
+#define BLE_HCI_VER_BCS_6_0                 (14)
 
 #define BLE_LMP_VER_BCS_1_0b                (0)
 #define BLE_LMP_VER_BCS_1_1                 (1)
@@ -2378,6 +2382,7 @@ struct ble_hci_ev_le_subev_cs_test_end_complete {
 #define BLE_LMP_VER_BCS_5_2                 (11)
 #define BLE_LMP_VER_BCS_5_3                 (12)
 #define BLE_LMP_VER_BCS_5_4                 (13)
+#define BLE_LMP_VER_BCS_6_0                 (14)
 
 /* selected HCI and LMP version */
 #if MYNEWT_VAL(BLE_VERSION) == 50
@@ -2395,6 +2400,9 @@ struct ble_hci_ev_le_subev_cs_test_end_complete {
 #elif MYNEWT_VAL(BLE_VERSION) == 54
 #define BLE_HCI_VER_BCS BLE_HCI_VER_BCS_5_4
 #define BLE_LMP_VER_BCS BLE_LMP_VER_BCS_5_4
+#elif MYNEWT_VAL(BLE_VERSION) == 60
+#define BLE_HCI_VER_BCS BLE_HCI_VER_BCS_6_0
+#define BLE_LMP_VER_BCS BLE_LMP_VER_BCS_6_0
 #endif
 
 #define BLE_HCI_DATA_HDR_SZ                 4

nimble/syscfg.yml

@@ -87,7 +87,7 @@ syscfg.defs:
             This allows to configure supported Bluetooth Core version. Some
             features may not be available if version is too low. Version is
             integer for easy comparison.
-        range: 50, 51, 52, 53, 54
+        range: 50, 51, 52, 53, 54, 60
         value: 50
     BLE_ISO:
         description: >