michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: CSIP: remove print_sirk

Browse source 
The print_sirk function that simply logs the SIRK has been removed,
as the SIRK is now directly accessible to the application via the
get_sirk function.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-01-12 14:15:15 +01:00 • committed by Anas Nashif
commit 25416b86e9
6 changed files with 0 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/connectivity/bluetooth/api/shell/cap.rst
View file

@ -27,7 +27,6 @@ register callbacks.
[rank <int>] [not-lockable] [sirk <data>] [rank <int>] [not-lockable] [sirk <data>]
lock :Lock the set lock :Lock the set
release :Release the set [force] release :Release the set [force]
print_sirk :Print the currently used SIRK
set_sirk :Set the currently used SIRK <sirk> set_sirk :Set the currently used SIRK <sirk>
get_sirk :Get the currently used SIRK get_sirk :Get the currently used SIRK
set_sirk_rsp :Set the response used in SIRK requests <accept, accept_enc, set_sirk_rsp :Set the response used in SIRK requests <accept, accept_enc,

1
doc/connectivity/bluetooth/api/shell/csip.rst
View file

@ -148,7 +148,6 @@ Using the Set Member
[rank <int>] [not-lockable] [sirk <data>] [rank <int>] [not-lockable] [sirk <data>]
lock :Lock the set lock :Lock the set
release :Release the set [force] release :Release the set [force]
print_sirk :Print the currently used SIRK
set_sirk :Set the currently used SIRK <sirk> set_sirk :Set the currently used SIRK <sirk>
get_sirk :Get the currently used SIRK get_sirk :Get the currently used SIRK
set_sirk_rsp :Set the response used in SIRK requests <accept, accept_enc, set_sirk_rsp :Set the response used in SIRK requests <accept, accept_enc,

7
include/zephyr/bluetooth/audio/csip.h
View file

@ -215,13 +215,6 @@ int bt_csip_set_member_set_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
int bt_csip_set_member_get_sirk(struct bt_csip_set_member_svc_inst *svc_inst, int bt_csip_set_member_get_sirk(struct bt_csip_set_member_svc_inst *svc_inst,
uint8_t sirk[BT_CSIP_SET_SIRK_SIZE]); uint8_t sirk[BT_CSIP_SET_SIRK_SIZE]);
/**
* @brief Print the SIRK to the debug output
*
* @param svc_inst Pointer to the Coordinated Set Identification Service.
*/
void bt_csip_set_member_print_sirk(const struct bt_csip_set_member_svc_inst *svc_inst);
/** /**
* @brief Generate the Resolvable Set Identifier (RSI) value. * @brief Generate the Resolvable Set Identifier (RSI) value.
* *

6
subsys/bluetooth/audio/csip_set_member.c
View file

@ -978,9 +978,3 @@ int bt_csip_set_member_lock(struct bt_csip_set_member_svc_inst *svc_inst,
return 0; return 0;
} }
} }
void bt_csip_set_member_print_sirk(const struct bt_csip_set_member_svc_inst *svc_inst)
{
LOG_HEXDUMP_DBG(&svc_inst->set_sirk, sizeof(svc_inst->set_sirk),
"Set SIRK");
}

11
subsys/bluetooth/audio/shell/cap_acceptor.c
View file

@ -174,14 +174,6 @@ static int cmd_cap_acceptor_init(const struct shell *sh, size_t argc,
return 0; return 0;
} }
static int cmd_cap_acceptor_print_sirk(const struct shell *sh, size_t argc,
char *argv[])
{
bt_csip_set_member_print_sirk(cap_csip_svc_inst);
return 0;
}
static int cmd_cap_acceptor_lock(const struct shell *sh, size_t argc, static int cmd_cap_acceptor_lock(const struct shell *sh, size_t argc,
char *argv[]) char *argv[])
{ {
@ -318,9 +310,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(cap_acceptor_cmds,
SHELL_CMD_ARG(release, NULL, SHELL_CMD_ARG(release, NULL,
"Release the set [force]", "Release the set [force]",
cmd_cap_acceptor_release, 1, 1), cmd_cap_acceptor_release, 1, 1),
SHELL_CMD_ARG(print_sirk, NULL,
"Print the currently used SIRK",
cmd_cap_acceptor_print_sirk, 1, 0),
SHELL_CMD_ARG(set_sirk, NULL, "Set the currently used SIRK <sirk>", SHELL_CMD_ARG(set_sirk, NULL, "Set the currently used SIRK <sirk>",
cmd_cap_acceptor_set_sirk, 2, 0), cmd_cap_acceptor_set_sirk, 2, 0),
SHELL_CMD_ARG(get_sirk, NULL, "Get the currently used SIRK", cmd_cap_acceptor_get_sirk, SHELL_CMD_ARG(get_sirk, NULL, "Get the currently used SIRK", cmd_cap_acceptor_get_sirk,

9
subsys/bluetooth/audio/shell/csip_set_member.c
View file

@ -157,13 +157,6 @@ static int cm_csip_set_member_register(const struct shell *sh, size_t argc, char
return 0; return 0;
} }
static int cm_csip_set_member_print_sirk(const struct shell *sh, size_t argc,
char *argv[])
{
bt_csip_set_member_print_sirk(svc_inst);
return 0;
}
static int cmd_csip_set_member_set_sirk(const struct shell *sh, size_t argc, char *argv[]) static int cmd_csip_set_member_set_sirk(const struct shell *sh, size_t argc, char *argv[])
{ {
uint8_t sirk[BT_CSIP_SET_SIRK_SIZE]; uint8_t sirk[BT_CSIP_SET_SIRK_SIZE];
@ -293,8 +286,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
cm_csip_set_member_register, 1, 4), cm_csip_set_member_register, 1, 4),
SHELL_CMD_ARG(lock, NULL, "Lock the set", cm_csip_set_member_lock, 1, 0), SHELL_CMD_ARG(lock, NULL, "Lock the set", cm_csip_set_member_lock, 1, 0),
SHELL_CMD_ARG(release, NULL, "Release the set [force]", cm_csip_set_member_release, 1, 1), SHELL_CMD_ARG(release, NULL, "Release the set [force]", cm_csip_set_member_release, 1, 1),
SHELL_CMD_ARG(print_sirk, NULL, "Print the currently used SIRK",
cm_csip_set_member_print_sirk, 1, 0),
SHELL_CMD_ARG(set_sirk, NULL, "Set the currently used SIRK <sirk>", SHELL_CMD_ARG(set_sirk, NULL, "Set the currently used SIRK <sirk>",
cmd_csip_set_member_set_sirk, 2, 0), cmd_csip_set_member_set_sirk, 2, 0),
SHELL_CMD_ARG(get_sirk, NULL, "Get the currently used SIRK", cmd_csip_set_member_get_sirk, SHELL_CMD_ARG(get_sirk, NULL, "Get the currently used SIRK", cmd_csip_set_member_get_sirk,