michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: host: simplify enums for SNR control

Browse source 
It works the same on both sides, so there's no point having two of
these.

Signed-off-by: Olivier Lesage <olivier.lesage@nordicsemi.no>
This commit is contained in:
Olivier Lesage 2024-12-02 10:54:00 +01:00 • committed by Benjamin Cabé
commit 3feb1378d6
5 changed files with 26 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

34
include/zephyr/bluetooth/cs.h
View file

@ -88,24 +88,14 @@ enum bt_le_cs_test_cs_sync_antenna_selection {
BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR, BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
}; };
/** CS Test Initiator SNR control options */ /** CS SNR control options */
enum bt_le_cs_initiator_snr_control { enum bt_le_cs_snr_control {
BT_LE_CS_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_18, BT_LE_CS_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_SNR_18,
BT_LE_CS_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_21, BT_LE_CS_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_SNR_21,
BT_LE_CS_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_24, BT_LE_CS_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_SNR_24,
BT_LE_CS_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_27, BT_LE_CS_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_SNR_27,
BT_LE_CS_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_30, BT_LE_CS_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_SNR_30,
BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED, BT_LE_CS_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_SNR_NOT_USED,
};
/** CS Test Reflector SNR control options */
enum bt_le_cs_reflector_snr_control {
BT_LE_CS_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18,
BT_LE_CS_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_21,
BT_LE_CS_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_24,
BT_LE_CS_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_27,
BT_LE_CS_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_30,
BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED,
}; };
/** CS Test Override 3 T_PM Tone Extension */ /** CS Test Override 3 T_PM Tone Extension */
@ -364,9 +354,9 @@ struct bt_le_cs_test_param {
*/ */
enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection; enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection;
/** Initiator SNR control options */ /** Initiator SNR control options */
enum bt_le_cs_initiator_snr_control initiator_snr_control; enum bt_le_cs_snr_control initiator_snr_control;
/** Reflector SNR control options */ /** Reflector SNR control options */
enum bt_le_cs_reflector_snr_control reflector_snr_control; enum bt_le_cs_snr_control reflector_snr_control;
/** Determines octets 14 and 15 of the initial value of the DRBG nonce. */ /** Determines octets 14 and 15 of the initial value of the DRBG nonce. */
uint16_t drbg_nonce; uint16_t drbg_nonce;
@ -803,10 +793,10 @@ struct bt_le_cs_set_procedure_parameters_param {
uint8_t preferred_peer_antenna; uint8_t preferred_peer_antenna;
/* Initiator SNR control adjustment */ /* Initiator SNR control adjustment */
enum bt_le_cs_initiator_snr_control snr_control_initiator; enum bt_le_cs_snr_control snr_control_initiator;
/* Reflector SNR control adjustment */ /* Reflector SNR control adjustment */
enum bt_le_cs_reflector_snr_control snr_control_reflector; enum bt_le_cs_snr_control snr_control_reflector;
}; };
/** @brief CS Set Procedure Parameters /** @brief CS Set Procedure Parameters

19
include/zephyr/bluetooth/hci_types.h
View file

@ -2578,19 +2578,12 @@ struct bt_hci_cp_le_procedure_enable {
#define BT_HCI_OP_LE_CS_ACI_6 0x6 #define BT_HCI_OP_LE_CS_ACI_6 0x6
#define BT_HCI_OP_LE_CS_ACI_7 0x7 #define BT_HCI_OP_LE_CS_ACI_7 0x7
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_18 0x0 #define BT_HCI_OP_LE_CS_SNR_18 0x0
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_21 0x1 #define BT_HCI_OP_LE_CS_SNR_21 0x1
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_24 0x2 #define BT_HCI_OP_LE_CS_SNR_24 0x2
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_27 0x3 #define BT_HCI_OP_LE_CS_SNR_27 0x3
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_30 0x4 #define BT_HCI_OP_LE_CS_SNR_30 0x4
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED 0xFF #define BT_HCI_OP_LE_CS_SNR_NOT_USED 0xFF
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_18 0x0
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_21 0x1
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_24 0x2
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_27 0x3
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_30 0x4
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED 0xFF
#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK BIT(0) #define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK BIT(0)
#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK BIT(2) #define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK BIT(2)

4
samples/bluetooth/channel_sounding/include/cs_test_params.h
View file

@ -33,8 +33,8 @@ static struct bt_le_cs_test_param test_params_get(enum bt_conn_le_cs_role role)
params.t_sw_time = 0; params.t_sw_time = 0;
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE; params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
params.initiator_snr_control = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED; params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
params.reflector_snr_control = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED; params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
params.drbg_nonce = 0x1234; params.drbg_nonce = 0x1234;

4
samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
View file

@ -333,8 +333,8 @@ int main(void)
.phy = BT_LE_CS_PROCEDURE_PHY_1M, .phy = BT_LE_CS_PROCEDURE_PHY_1M,
.tx_power_delta = 0x80, .tx_power_delta = 0x80,
.preferred_peer_antenna = BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1, .preferred_peer_antenna = BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1,
.snr_control_initiator = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED, .snr_control_initiator = BT_LE_CS_SNR_CONTROL_NOT_USED,
.snr_control_reflector = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED, .snr_control_reflector = BT_LE_CS_SNR_CONTROL_NOT_USED,
}; };
err = bt_le_cs_set_procedure_parameters(connection, &procedure_params); err = bt_le_cs_set_procedure_parameters(connection, &procedure_params);

8
subsys/bluetooth/host/shell/cs.c
View file

@ -220,8 +220,8 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
params.t_pm_time = 20; params.t_pm_time = 20;
params.t_sw_time = 0; params.t_sw_time = 0;
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE; params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
params.initiator_snr_control = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED; params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
params.reflector_snr_control = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED; params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
params.drbg_nonce = 0x1234; params.drbg_nonce = 0x1234;
params.override_config = 0; params.override_config = 0;
params.override_config_0.channel_map_repetition = 1; params.override_config_0.channel_map_repetition = 1;
@ -641,8 +641,8 @@ static int cmd_set_procedure_parameters(const struct shell *sh, size_t argc, cha
params.phy = 0x01; params.phy = 0x01;
params.tx_power_delta = 0x80; params.tx_power_delta = 0x80;
params.preferred_peer_antenna = 1; params.preferred_peer_antenna = 1;
params.snr_control_initiator = BT_LE_CS_INITIATOR_SNR_CONTROL_18dB; params.snr_control_initiator = BT_LE_CS_SNR_CONTROL_18dB;
params.snr_control_reflector = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18; params.snr_control_reflector = BT_LE_CS_SNR_CONTROL_18dB;
err = bt_le_cs_set_procedure_parameters(default_conn, &params); err = bt_le_cs_set_procedure_parameters(default_conn, &params);