michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Use bt_vcp_vol_ctlr instead of bt_vcp

Browse source 
Use the `bt_vcp_vol_ctlr` opaque type instead of the more
generic `bt_vcp`.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2022-10-10 15:00:39 +02:00 • committed by Carles Cufí
commit bbc85e0b2c
5 changed files with 413 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

41
subsys/bluetooth/audio/vcp_internal.h
View file

@ -36,45 +36,4 @@ struct vcs_control_vol {
uint8_t volume;
} __packed;
#if defined(CONFIG_BT_VCP_VOL_CTLR)
struct bt_vcp_vol_ctlr {
struct vcs_state state;
uint8_t flags;
uint16_t start_handle;
uint16_t end_handle;
uint16_t state_handle;
uint16_t control_handle;
uint16_t flag_handle;
struct bt_gatt_subscribe_params state_sub_params;
struct bt_gatt_discover_params state_sub_disc_params;
struct bt_gatt_subscribe_params flag_sub_params;
struct bt_gatt_discover_params flag_sub_disc_params;
bool cp_retried;
bool busy;
struct vcs_control_vol cp_val;
struct bt_gatt_write_params write_params;
struct bt_gatt_read_params read_params;
struct bt_gatt_discover_params discover_params;
struct bt_uuid_16 uuid;
struct bt_conn *conn;
uint8_t vocs_inst_cnt;
struct bt_vocs *vocs[CONFIG_BT_VCP_VOL_CTLR_MAX_VOCS_INST];
uint8_t aics_inst_cnt;
struct bt_aics *aics[CONFIG_BT_VCP_VOL_CTLR_MAX_AICS_INST];
};
#endif /* CONFIG_BT_VCP_VOL_CTLR */
/* Struct used as a common type for the api */
struct bt_vcp {
bool client_instance;
union {
#if defined(CONFIG_BT_VCP_VOL_CTLR)
struct bt_vcp_vol_ctlr cli;
#endif /* CONFIG_BT_VCP_VOL_CTLR */
};
};
#endif /* ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_VCP_INTERNAL_*/

564
subsys/bluetooth/audio/vcp_vol_ctlr.c
View file

File diff suppressed because it is too large Load diff

52
subsys/bluetooth/shell/vcp_vol_ctlr.c
View file

@ -15,11 +15,11 @@
#include "bt.h"
static struct bt_vcp *vcp;
static struct bt_vcp_vol_ctlr *vol_ctlr;
static struct bt_vcp_included vcp_included;
static void vcs_discover_cb(struct bt_vcp *vcp, int err, uint8_t vocs_count,
uint8_t aics_count)
static void vcs_discover_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err,
uint8_t vocs_count, uint8_t aics_count)
{
if (err != 0) {
shell_error(ctx_shell, "VCP discover failed (%d)", err);
@ -27,13 +27,13 @@ static void vcs_discover_cb(struct bt_vcp *vcp, int err, uint8_t vocs_count,
shell_print(ctx_shell, "VCP discover done with %u AICS",
aics_count);
if (bt_vcp_vol_ctlr_included_get(vcp, &vcp_included)) {
if (bt_vcp_vol_ctlr_included_get(vol_ctlr, &vcp_included)) {
shell_error(ctx_shell, "Could not get VCP context");
}
}
}
static void vcs_vol_down_cb(struct bt_vcp *vcp, int err)
static void vcs_vol_down_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
{
if (err != 0) {
shell_error(ctx_shell, "VCP vol_down failed (%d)", err);
@ -42,7 +42,7 @@ static void vcs_vol_down_cb(struct bt_vcp *vcp, int err)
}
}
static void vcs_vol_up_cb(struct bt_vcp *vcp, int err)
static void vcs_vol_up_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
{
if (err != 0) {
shell_error(ctx_shell, "VCP vol_up failed (%d)", err);
@ -51,7 +51,7 @@ static void vcs_vol_up_cb(struct bt_vcp *vcp, int err)
}
}
static void vcs_mute_cb(struct bt_vcp *vcp, int err)
static void vcs_mute_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
{
if (err != 0) {
shell_error(ctx_shell, "VCP mute failed (%d)", err);
@ -60,7 +60,7 @@ static void vcs_mute_cb(struct bt_vcp *vcp, int err)
}
}
static void vcs_unmute_cb(struct bt_vcp *vcp, int err)
static void vcs_unmute_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
{
if (err != 0) {
shell_error(ctx_shell, "VCP unmute failed (%d)", err);
@ -69,7 +69,7 @@ static void vcs_unmute_cb(struct bt_vcp *vcp, int err)
}
}
static void vcs_vol_down_unmute_cb(struct bt_vcp *vcp, int err)
static void vcs_vol_down_unmute_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
{
if (err != 0) {
shell_error(ctx_shell, "VCP vol_down_unmute failed (%d)", err);
@ -78,7 +78,7 @@ static void vcs_vol_down_unmute_cb(struct bt_vcp *vcp, int err)
}
}
static void vcs_vol_up_unmute_cb(struct bt_vcp *vcp, int err)
static void vcs_vol_up_unmute_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
{
if (err != 0) {
shell_error(ctx_shell, "VCP vol_up_unmute failed (%d)", err);
@ -87,7 +87,7 @@ static void vcs_vol_up_unmute_cb(struct bt_vcp *vcp, int err)
}
}
static void vcs_vol_set_cb(struct bt_vcp *vcp, int err)
static void vcs_vol_set_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err)
{
if (err != 0) {
shell_error(ctx_shell, "VCP vol_set failed (%d)", err);
@ -96,8 +96,8 @@ static void vcs_vol_set_cb(struct bt_vcp *vcp, int err)
}
}
static void vcs_state_cb(struct bt_vcp *vcp, int err, uint8_t volume,
uint8_t mute)
static void vcs_state_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err,
uint8_t volume, uint8_t mute)
{
if (err != 0) {
shell_error(ctx_shell, "VCP state get failed (%d)", err);
@ -106,7 +106,8 @@ static void vcs_state_cb(struct bt_vcp *vcp, int err, uint8_t volume,
}
}
static void vcs_flags_cb(struct bt_vcp *vcp, int err, uint8_t flags)
static void vcs_flags_cb(struct bt_vcp_vol_ctlr *vol_ctlr, int err,
uint8_t flags)
{
if (err != 0) {
shell_error(ctx_shell, "VCP flags get failed (%d)", err);
@ -342,7 +343,7 @@ static int cmd_vcp_vol_ctlr_discover(const struct shell *sh, size_t argc,
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_discover(default_conn, &vcp);
result = bt_vcp_vol_ctlr_discover(default_conn, &vol_ctlr);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}
@ -360,7 +361,7 @@ static int cmd_vcp_vol_ctlr_state_get(const struct shell *sh, size_t argc,
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_read_state(vcp);
result = bt_vcp_vol_ctlr_read_state(vol_ctlr);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}
@ -378,7 +379,7 @@ static int cmd_vcp_vol_ctlr_flags_get(const struct shell *sh, size_t argc,
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_read_flags(vcp);
result = bt_vcp_vol_ctlr_read_flags(vol_ctlr);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}
@ -396,7 +397,7 @@ static int cmd_vcp_vol_ctlr_volume_down(const struct shell *sh, size_t argc,
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_vol_down(vcp);
result = bt_vcp_vol_ctlr_vol_down(vol_ctlr);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}
@ -415,7 +416,7 @@ static int cmd_vcp_vol_ctlr_volume_up(const struct shell *sh, size_t argc,
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_vol_up(vcp);
result = bt_vcp_vol_ctlr_vol_up(vol_ctlr);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}
@ -433,7 +434,7 @@ static int cmd_vcp_vol_ctlr_unmute_volume_down(const struct shell *sh,
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_unmute_vol_down(vcp);
result = bt_vcp_vol_ctlr_unmute_vol_down(vol_ctlr);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}
@ -451,7 +452,7 @@ static int cmd_vcp_vol_ctlr_unmute_volume_up(const struct shell *sh,
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_unmute_vol_up(vcp);
result = bt_vcp_vol_ctlr_unmute_vol_up(vol_ctlr);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}
@ -476,7 +477,7 @@ static int cmd_vcp_vol_ctlr_volume_set(const struct shell *sh, size_t argc,
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_set_vol(vcp, volume);
result = bt_vcp_vol_ctlr_set_vol(vol_ctlr, volume);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}
@ -495,7 +496,7 @@ static int cmd_vcp_vol_ctlr_unmute(const struct shell *sh, size_t argc,
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_unmute(vcp);
result = bt_vcp_vol_ctlr_unmute(vol_ctlr);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}
@ -503,7 +504,8 @@ static int cmd_vcp_vol_ctlr_unmute(const struct shell *sh, size_t argc,
return result;
}
static int cmd_vcp_vol_ctlr_mute(const struct shell *sh, size_t argc, char **argv)
static int cmd_vcp_vol_ctlr_mute(const struct shell *sh, size_t argc,
char **argv)
{
int result;
@ -512,7 +514,7 @@ static int cmd_vcp_vol_ctlr_mute(const struct shell *sh, size_t argc, char **arg
return -ENOEXEC;
}
result = bt_vcp_vol_ctlr_mute(vcp);
result = bt_vcp_vol_ctlr_mute(vol_ctlr);
if (result != 0) {
shell_print(sh, "Fail: %d", result);
}