michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Update terms in public API to spec v5.3

Browse source 
The Bluetooth Core Specification, version 5.3, has introduced multiple
changes to several widely-used terms in order to make them inclusive.
Update the public API to reflect this, excluding hci.h, which will be
done in a subsequent commit.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2021-09-14 12:28:45 +02:00 • committed by Johan Hedberg
commit 6de4747979
18 changed files with 152 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

42
subsys/bluetooth/shell/bt.c
View file

@ -904,7 +904,7 @@ static int cmd_scan(const struct shell *shell, size_t argc, char *argv[])
} else if (!strcmp(arg, "nodups")) {
options &= ~BT_LE_SCAN_OPT_FILTER_DUPLICATE;
} else if (!strcmp(arg, "wl")) {
options |= BT_LE_SCAN_OPT_FILTER_WHITELIST;
options |= BT_LE_SCAN_OPT_FILTER_ACCEPT_LIST;
} else if (!strcmp(arg, "coded")) {
options |= BT_LE_SCAN_OPT_CODED;
} else if (!strcmp(arg, "no-1m")) {
@ -1876,7 +1876,7 @@ static int cmd_connect_le(const struct shell *shell, size_t argc, char *argv[])
return 0;
}
#if !defined(CONFIG_BT_WHITELIST)
#if !defined(CONFIG_BT_FILTER_ACCEPT_LIST)
static int cmd_auto_conn(const struct shell *shell, size_t argc, char *argv[])
{
bt_addr_le_t addr;
@ -1901,7 +1901,7 @@ static int cmd_auto_conn(const struct shell *shell, size_t argc, char *argv[])
return 0;
}
#endif /* !defined(CONFIG_BT_WHITELIST) */
#endif /* !defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
#endif /* CONFIG_BT_CENTRAL */
static int cmd_disconnect(const struct shell *shell, size_t argc, char *argv[])
@ -1985,8 +1985,8 @@ static const char *get_conn_type_str(uint8_t type)
static const char *get_conn_role_str(uint8_t role)
{
switch (role) {
case BT_CONN_ROLE_MASTER: return "master";
case BT_CONN_ROLE_SLAVE: return "slave";
case BT_CONN_ROLE_CENTRAL: return "central";
case BT_CONN_ROLE_PERIPHERAL: return "peripheral";
default: return "Invalid";
}
}
@ -2440,10 +2440,10 @@ static int cmd_bonds(const struct shell *shell, size_t argc, char *argv[])
static const char *role_str(uint8_t role)
{
switch (role) {
case BT_CONN_ROLE_MASTER:
return "Master";
case BT_CONN_ROLE_SLAVE:
return "Slave";
case BT_CONN_ROLE_CENTRAL:
return "Central";
case BT_CONN_ROLE_PERIPHERAL:
return "Peripheral";
}
return "Unknown";
@ -2891,7 +2891,7 @@ static int cmd_auth_pairing_confirm(const struct shell *shell,
return 0;
}
#if defined(CONFIG_BT_WHITELIST)
#if defined(CONFIG_BT_FILTER_ACCEPT_LIST)
static int cmd_wl_add(const struct shell *shell, size_t argc, char *argv[])
{
bt_addr_le_t addr;
@ -2903,9 +2903,9 @@ static int cmd_wl_add(const struct shell *shell, size_t argc, char *argv[])
return err;
}
err = bt_le_whitelist_add(&addr);
err = bt_le_filter_accept_list_add(&addr);
if (err) {
shell_error(shell, "Add to whitelist failed (err %d)", err);
shell_error(shell, "Add to fa list failed (err %d)", err);
return err;
}
@ -2923,9 +2923,9 @@ static int cmd_wl_rem(const struct shell *shell, size_t argc, char *argv[])
return err;
}
err = bt_le_whitelist_rem(&addr);
err = bt_le_filter_accept_list_remove(&addr);
if (err) {
shell_error(shell, "Remove from whitelist failed (err %d)",
shell_error(shell, "Remove from fa list failed (err %d)",
err);
return err;
}
@ -2936,9 +2936,9 @@ static int cmd_wl_clear(const struct shell *shell, size_t argc, char *argv[])
{
int err;
err = bt_le_whitelist_clear();
err = bt_le_filter_accept_list_clear();
if (err) {
shell_error(shell, "Clearing whitelist failed (err %d)", err);
shell_error(shell, "Clearing fa list failed (err %d)", err);
return err;
}
@ -2990,7 +2990,7 @@ static int cmd_wl_connect(const struct shell *shell, size_t argc, char *argv[])
return 0;
}
#endif /* CONFIG_BT_CENTRAL */
#endif /* defined(CONFIG_BT_WHITELIST) */
#endif /* defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
#if defined(CONFIG_BT_FIXED_PASSKEY)
static int cmd_fixed_passkey(const struct shell *shell,
@ -3165,9 +3165,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
#if defined(CONFIG_BT_CENTRAL)
SHELL_CMD_ARG(connect, NULL, HELP_ADDR_LE EXT_ADV_SCAN_OPT,
cmd_connect_le, 3, 3),
#if !defined(CONFIG_BT_WHITELIST)
#if !defined(CONFIG_BT_FILTER_ACCEPT_LIST)
SHELL_CMD_ARG(auto-conn, NULL, HELP_ADDR_LE, cmd_auto_conn, 3, 0),
#endif /* !defined(CONFIG_BT_WHITELIST) */
#endif /* !defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
#endif /* CONFIG_BT_CENTRAL */
SHELL_CMD_ARG(disconnect, NULL, HELP_NONE, cmd_disconnect, 1, 2),
SHELL_CMD_ARG(select, NULL, HELP_ADDR_LE, cmd_select, 3, 0),
@ -3213,7 +3213,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
HELP_ADDR_LE" <oob rand> <oob confirm>",
cmd_oob_remote, 3, 2),
SHELL_CMD_ARG(oob-clear, NULL, HELP_NONE, cmd_oob_clear, 1, 0),
#if defined(CONFIG_BT_WHITELIST)
#if defined(CONFIG_BT_FILTER_ACCEPT_LIST)
SHELL_CMD_ARG(wl-add, NULL, HELP_ADDR_LE, cmd_wl_add, 3, 0),
SHELL_CMD_ARG(wl-rem, NULL, HELP_ADDR_LE, cmd_wl_rem, 3, 0),
SHELL_CMD_ARG(wl-clear, NULL, HELP_NONE, cmd_wl_clear, 1, 0),
@ -3222,7 +3222,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
SHELL_CMD_ARG(wl-connect, NULL, "<on, off>" EXT_ADV_SCAN_OPT,
cmd_wl_connect, 2, 3),
#endif /* CONFIG_BT_CENTRAL */
#endif /* defined(CONFIG_BT_WHITELIST) */
#endif /* defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
#if defined(CONFIG_BT_FIXED_PASSKEY)
SHELL_CMD_ARG(fixed-passkey, NULL, "[passkey]", cmd_fixed_passkey,
1, 1),