Skip to content

Commit 3feb137

Browse files
olivier-le-sagekartben
olivier-le-sage
authored and
kartben
committed
bluetooth: host: simplify enums for SNR control
It works the same on both sides, so there's no point having two of these. Signed-off-by: Olivier Lesage <[email protected]>
1 parent 6160ff2 commit 3feb137

File tree

5 files changed

+26
-43
lines changed

5 files changed

+26
-43
lines changed

‎include/zephyr/bluetooth/cs.h

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -88,24 +88,14 @@ enum bt_le_cs_test_cs_sync_antenna_selection {
8888
BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
8989
};
9090

91-
/** CS Test Initiator SNR control options */
92-
enum bt_le_cs_initiator_snr_control {
93-
BT_LE_CS_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_18,
94-
BT_LE_CS_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_21,
95-
BT_LE_CS_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_24,
96-
BT_LE_CS_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_27,
97-
BT_LE_CS_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_30,
98-
BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED,
99-
};
100-
101-
/** CS Test Reflector SNR control options */
102-
enum bt_le_cs_reflector_snr_control {
103-
BT_LE_CS_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18,
104-
BT_LE_CS_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_21,
105-
BT_LE_CS_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_24,
106-
BT_LE_CS_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_27,
107-
BT_LE_CS_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_30,
108-
BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED,
91+
/** CS SNR control options */
92+
enum bt_le_cs_snr_control {
93+
BT_LE_CS_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_SNR_18,
94+
BT_LE_CS_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_SNR_21,
95+
BT_LE_CS_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_SNR_24,
96+
BT_LE_CS_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_SNR_27,
97+
BT_LE_CS_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_SNR_30,
98+
BT_LE_CS_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_SNR_NOT_USED,
10999
};
110100

111101
/** CS Test Override 3 T_PM Tone Extension */
@@ -364,9 +354,9 @@ struct bt_le_cs_test_param {
364354
*/
365355
enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection;
366356
/** Initiator SNR control options */
367-
enum bt_le_cs_initiator_snr_control initiator_snr_control;
357+
enum bt_le_cs_snr_control initiator_snr_control;
368358
/** Reflector SNR control options */
369-
enum bt_le_cs_reflector_snr_control reflector_snr_control;
359+
enum bt_le_cs_snr_control reflector_snr_control;
370360
/** Determines octets 14 and 15 of the initial value of the DRBG nonce. */
371361
uint16_t drbg_nonce;
372362

@@ -803,10 +793,10 @@ struct bt_le_cs_set_procedure_parameters_param {
803793
uint8_t preferred_peer_antenna;
804794

805795
/* Initiator SNR control adjustment */
806-
enum bt_le_cs_initiator_snr_control snr_control_initiator;
796+
enum bt_le_cs_snr_control snr_control_initiator;
807797

808798
/* Reflector SNR control adjustment */
809-
enum bt_le_cs_reflector_snr_control snr_control_reflector;
799+
enum bt_le_cs_snr_control snr_control_reflector;
810800
};
811801

812802
/** @brief CS Set Procedure Parameters

‎include/zephyr/bluetooth/hci_types.h

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2578,19 +2578,12 @@ struct bt_hci_cp_le_procedure_enable {
25782578
#define BT_HCI_OP_LE_CS_ACI_6 0x6
25792579
#define BT_HCI_OP_LE_CS_ACI_7 0x7
25802580

2581-
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_18 0x0
2582-
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_21 0x1
2583-
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_24 0x2
2584-
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_27 0x3
2585-
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_30 0x4
2586-
#define BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED 0xFF
2587-
2588-
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_18 0x0
2589-
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_21 0x1
2590-
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_24 0x2
2591-
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_27 0x3
2592-
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_30 0x4
2593-
#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED 0xFF
2581+
#define BT_HCI_OP_LE_CS_SNR_18 0x0
2582+
#define BT_HCI_OP_LE_CS_SNR_21 0x1
2583+
#define BT_HCI_OP_LE_CS_SNR_24 0x2
2584+
#define BT_HCI_OP_LE_CS_SNR_27 0x3
2585+
#define BT_HCI_OP_LE_CS_SNR_30 0x4
2586+
#define BT_HCI_OP_LE_CS_SNR_NOT_USED 0xFF
25942587

25952588
#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK BIT(0)
25962589
#define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK BIT(2)

‎samples/bluetooth/channel_sounding/include/cs_test_params.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ static struct bt_le_cs_test_param test_params_get(enum bt_conn_le_cs_role role)
3333
params.t_sw_time = 0;
3434
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
3535

36-
params.initiator_snr_control = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED;
37-
params.reflector_snr_control = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED;
36+
params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
37+
params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
3838

3939
params.drbg_nonce = 0x1234;
4040

‎samples/bluetooth/channel_sounding/src/connected_cs_initiator.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,8 @@ int main(void)
333333
.phy = BT_LE_CS_PROCEDURE_PHY_1M,
334334
.tx_power_delta = 0x80,
335335
.preferred_peer_antenna = BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1,
336-
.snr_control_initiator = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED,
337-
.snr_control_reflector = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED,
336+
.snr_control_initiator = BT_LE_CS_SNR_CONTROL_NOT_USED,
337+
.snr_control_reflector = BT_LE_CS_SNR_CONTROL_NOT_USED,
338338
};
339339

340340
err = bt_le_cs_set_procedure_parameters(connection, &procedure_params);

‎subsys/bluetooth/host/shell/cs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
220220
params.t_pm_time = 20;
221221
params.t_sw_time = 0;
222222
params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
223-
params.initiator_snr_control = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED;
224-
params.reflector_snr_control = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED;
223+
params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
224+
params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
225225
params.drbg_nonce = 0x1234;
226226
params.override_config = 0;
227227
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
641641
params.phy = 0x01;
642642
params.tx_power_delta = 0x80;
643643
params.preferred_peer_antenna = 1;
644-
params.snr_control_initiator = BT_LE_CS_INITIATOR_SNR_CONTROL_18dB;
645-
params.snr_control_reflector = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18;
644+
params.snr_control_initiator = BT_LE_CS_SNR_CONTROL_18dB;
645+
params.snr_control_reflector = BT_LE_CS_SNR_CONTROL_18dB;
646646

647647
err = bt_le_cs_set_procedure_parameters(default_conn, &params);
648648

0 commit comments

Comments
 (0)