Skip to content

Commit e2f85b1

Browse files
committed
Bluetooth: tests: Align with terms in v5.3 spec
Align with the new inclusive naming terms in the v5.3 spec in the Bluetooth tests. Signed-off-by: Carles Cufi <[email protected]>
1 parent b8770ac commit e2f85b1

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

tests/bluetooth/bsim_bt/edtt_ble_test_app/common/commands.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ enum commands_t {
7474
CMD_LE_CREATE_CONNECTION_RSP,
7575
CMD_LE_CREATE_CONNECTION_CANCEL_REQ,
7676
CMD_LE_CREATE_CONNECTION_CANCEL_RSP,
77-
CMD_LE_READ_WHITE_LIST_SIZE_REQ,
78-
CMD_LE_READ_WHITE_LIST_SIZE_RSP,
79-
CMD_LE_CLEAR_WHITE_LIST_REQ,
80-
CMD_LE_CLEAR_WHITE_LIST_RSP,
81-
CMD_LE_ADD_DEVICE_TO_WHITE_LIST_REQ,
82-
CMD_LE_ADD_DEVICE_TO_WHITE_LIST_RSP,
83-
CMD_LE_REMOVE_DEVICE_FROM_WHITE_LIST_REQ,
84-
CMD_LE_REMOVE_DEVICE_FROM_WHITE_LIST_RSP,
77+
CMD_LE_READ_FILTER_ACCEPT_LIST_SIZE_REQ,
78+
CMD_LE_READ_FILTER_ACCEPT_LIST_SIZE_RSP,
79+
CMD_LE_CLEAR_FILTER_ACCEPT_LIST_REQ,
80+
CMD_LE_CLEAR_FILTER_ACCEPT_LIST_RSP,
81+
CMD_LE_ADD_DEVICE_TO_FILTER_ACCEPT_LIST_REQ,
82+
CMD_LE_ADD_DEVICE_TO_FILTER_ACCEPT_LIST_RSP,
83+
CMD_LE_REMOVE_DEVICE_FROM_FILTER_ACCEPT_LIST_REQ,
84+
CMD_LE_REMOVE_DEVICE_FROM_FILTER_ACCEPT_LIST_RSP,
8585
CMD_LE_CONNECTION_UPDATE_REQ,
8686
CMD_LE_CONNECTION_UPDATE_RSP,
8787
CMD_LE_SET_HOST_CHANNEL_CLASSIFICATION_REQ,

tests/bluetooth/df/connection_cte_req/src/common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ void common_set_peer_features(uint16_t conn_handle, uint64_t features)
5757
conn->llcp_feature.features_peer = features;
5858
}
5959

60-
void common_set_slave_latency(uint16_t conn_handle, uint16_t slave_latency)
60+
void common_set_periph_latency(uint16_t conn_handle, uint16_t periph_latency)
6161
{
6262
struct ll_conn *conn;
6363

6464
conn = ll_conn_get(conn_handle);
6565
zassert_not_equal(conn, NULL, "Failed ll_conn instance for given handle");
6666

67-
conn->lll.latency = slave_latency;
67+
conn->lll.latency = periph_latency;
6868
}

tests/bluetooth/df/connection_cte_req/src/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
uint16_t common_create_connection(void);
88
void common_destroy_connection(uint16_t handle);
99
void common_set_peer_features(uint16_t conn_handle, uint64_t features);
10-
void common_set_slave_latency(uint16_t conn_handle, uint16_t slave_latency);
10+
void common_set_periph_latency(uint16_t conn_handle, uint16_t periph_latency);

tests/bluetooth/df/connection_cte_req/src/test_cte_req_enable.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ static struct ut_bt_df_conn_cte_request_data g_data;
2929

3030
/* Macros delivering common values for unit tests */
3131
#define CONN_HANDLE_INVALID (CONFIG_BT_MAX_CONN + 1)
32-
#define CONN_SLAVE_LATENCY 7 /* arbitrary latency value */
33-
#define REQUEST_INTERVAL_OK (CONN_SLAVE_LATENCY)
34-
#define REQUEST_INTERVAL_TOO_LOW (CONN_SLAVE_LATENCY - 1)
32+
#define CONN_PERIPH_LATENCY 7 /* arbitrary latency value */
33+
#define REQUEST_INTERVAL_OK (CONN_PERIPH_LATENCY)
34+
#define REQUEST_INTERVAL_TOO_LOW (CONN_PERIPH_LATENCY - 1)
3535

3636
/* CTE length is stored in 1 octet. If BT Core spec. extends the max value to UINT8_MAX
3737
* expected failures may not be checked. If storage size is increased, tests shall be updated.
@@ -173,7 +173,7 @@ static void cte_rx_param_setup(void)
173173
};
174174

175175
connection_setup();
176-
common_set_slave_latency(g_conn_handle, REQUEST_INTERVAL_TOO_LOW);
176+
common_set_periph_latency(g_conn_handle, REQUEST_INTERVAL_TOO_LOW);
177177

178178
send_set_conn_cte_rx_params(g_conn_handle, &cte_rx_params, true);
179179
}

0 commit comments

Comments
 (0)