michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Specify MICP Mic Dev API

Browse source 
Modify the existing bt_micp API for the
MICP Microphone Device to be more specific
by adding mic_dev as an infix. This follows
the naming scheme used for the MICP microphone
controller (mic_ctlr).

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2022-06-21 18:21:49 +02:00 • committed by Carles Cufí
commit e95b640df6
12 changed files with 234 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

65
include/zephyr/bluetooth/audio/micp.h
View file

@ -26,11 +26,11 @@
extern "C" { extern "C" {
#endif #endif
#if defined(CONFIG_BT_MICP) #if defined(CONFIG_BT_MICP_MIC_DEV)
#define BT_MICP_AICS_CNT CONFIG_BT_MICP_AICS_INSTANCE_COUNT #define BT_MICP_MIC_DEV_AICS_CNT CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT
#else #else
#define BT_MICP_AICS_CNT 0 #define BT_MICP_MIC_DEV_AICS_CNT 0
#endif /* CONFIG_BT_MICP */ #endif /* CONFIG_BT_MICP_MIC_DEV */
/** Application error codes */ /** Application error codes */
#define BT_MICP_ERR_MUTE_DISABLED 0x80 #define BT_MICP_ERR_MUTE_DISABLED 0x80
@ -45,14 +45,14 @@ extern "C" {
struct bt_micp; struct bt_micp;
/** @brief Register parameters structure for Microphone Input Control Profile instance */ /** @brief Register parameters structure for Microphone Input Control Profile instance */
struct bt_micp_register_param { struct bt_micp_mic_dev_register_param {
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
/** Register parameter structure for Audio Input Control Services */ /** Register parameter structure for Audio Input Control Services */
struct bt_aics_register_param aics_param[BT_MICP_AICS_CNT]; struct bt_aics_register_param aics_param[BT_MICP_MIC_DEV_AICS_CNT];
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
/** Microphone Input Control Profile callback structure. */ /** Microphone Input Control Profile callback structure. */
struct bt_micp_cb *cb; struct bt_micp_mic_dev_cb *cb;
}; };
/** /**
@ -83,8 +83,8 @@ struct bt_micp_included {
* *
* @return 0 if success, errno on failure. * @return 0 if success, errno on failure.
*/ */
int bt_micp_register(struct bt_micp_register_param *param, int bt_micp_mic_dev_register(struct bt_micp_mic_dev_register_param *param,
struct bt_micp **micp); struct bt_micp **micp);
/** /**
* @brief Get Microphone Input Control Profile included services * @brief Get Microphone Input Control Profile included services
@ -93,32 +93,27 @@ int bt_micp_register(struct bt_micp_register_param *param,
* Microphone Input Control Profile included services instances, such as * Microphone Input Control Profile included services instances, such as
* pointers to the Audio Input Control Service instances. * pointers to the Audio Input Control Service instances.
* *
* Requires that @kconfig{CONFIG_BT_MICP_AICS} * Requires that @kconfig{CONFIG_BT_MICP_MIC_DEV_AICS}
* *
* @param micp Microphone Input Control Profile instance pointer. * @param micp Microphone Input Control Profile instance pointer.
* @param[out] included Pointer to store the result in. * @param[out] included Pointer to store the result in.
* *
* @return 0 if success, errno on failure. * @return 0 if success, errno on failure.
*/ */
int bt_micp_included_get(struct bt_micp *micp, int bt_micp_mic_dev_included_get(struct bt_micp *micp,
struct bt_micp_included *included); struct bt_micp_included *included);
/** struct bt_micp_mic_dev_cb {
* @brief Callback function for Microphone Input Control Profile mute. /**
* * @brief Callback function for Microphone Input Control Profile mute.
* Called when the value is read, *
* or if the value is changed by either the server or client. * Called when the value is read with bt_micp_mic_dev_mute_get(),
* * or if the value is changed by either the server or client.
* @param micp Microphone Input Control Profile instance pointer. *
* @param err Error value. 0 on success, GATT error or errno on fail. * @param micp Microphone Input Control Profile instance pointer.
* For notifications, this will always be 0. * @param mute The mute setting of the Microphone Input Control Profile instance.
* @param mute The mute setting of the Microphone Input Control Profile instance. */
*/ void (*mute)(struct bt_micp *micp, uint8_t mute);
typedef void (*bt_micp_mute_read_cb)(struct bt_micp *micp, int err,
uint8_t mute);
struct bt_micp_cb {
bt_micp_mute_read_cb mute;
}; };
/** /**
@ -128,7 +123,7 @@ struct bt_micp_cb {
* *
* @return 0 on success, GATT error value on fail. * @return 0 on success, GATT error value on fail.
*/ */
int bt_micp_unmute(struct bt_micp *micp); int bt_micp_mic_dev_unmute(struct bt_micp *micp);
/** /**
* @brief Mute the server. * @brief Mute the server.
@ -137,19 +132,19 @@ int bt_micp_unmute(struct bt_micp *micp);
* *
* @return 0 on success, GATT error value on fail. * @return 0 on success, GATT error value on fail.
*/ */
int bt_micp_mute(struct bt_micp *micp); int bt_micp_mic_dev_mute(struct bt_micp *micp);
/** /**
* @brief Disable the mute functionality. * @brief Disable the mute functionality.
* *
* Can be reenabled by called @ref bt_micp_mute or @ref bt_micp_unmute. * Can be reenabled by called @ref bt_micp_mic_dev_mute or @ref bt_micp_mic_dev_unmute.
* This can only be done as the server. * This can only be done as the server.
* *
* @param micp Microphone Input Control Profile instance pointer. * @param micp Microphone Input Control Profile instance pointer.
* *
* @return 0 on success, GATT error value on fail. * @return 0 on success, GATT error value on fail.
*/ */
int bt_micp_mute_disable(struct bt_micp *micp); int bt_micp_mic_dev_disable(struct bt_micp *micp);
/** /**
* @brief Read the mute state of a Microphone Input Control Profile instance. * @brief Read the mute state of a Microphone Input Control Profile instance.
@ -158,7 +153,7 @@ int bt_micp_mute_disable(struct bt_micp *micp);
* *
* @return 0 on success, GATT error value on fail. * @return 0 on success, GATT error value on fail.
*/ */
int bt_micp_mute_get(struct bt_micp *micp); int bt_micp_mic_dev_mute_get(struct bt_micp *micp);
struct bt_micp_mic_ctlr_cb { struct bt_micp_mic_ctlr_cb {
/** /**

2
subsys/bluetooth/audio/CMakeLists.txt
View file

@ -17,7 +17,7 @@ if (CONFIG_BT_VCS OR CONFIG_BT_VCS_CLIENT)
endif() endif()
zephyr_library_sources_ifdef(CONFIG_BT_VCS_CLIENT vcs_client.c) zephyr_library_sources_ifdef(CONFIG_BT_VCS_CLIENT vcs_client.c)
if (CONFIG_BT_MICP) if (CONFIG_BT_MICP_MIC_DEV)
zephyr_library_sources(micp_mic_dev.c) zephyr_library_sources(micp_mic_dev.c)
endif() endif()
zephyr_library_sources_ifdef(CONFIG_BT_MICP_MIC_CTLR micp_mic_ctlr.c) zephyr_library_sources_ifdef(CONFIG_BT_MICP_MIC_CTLR micp_mic_ctlr.c)

36
subsys/bluetooth/audio/Kconfig.micp
View file

@ -1,45 +1,47 @@
# Bluetooth Audio - Microphone Input Control Service options # Bluetooth Audio - Microphone Input Control Service options
# #
# Copyright (c) 2020 Bose Corporation # Copyright (c) 2020 Bose Corporation
# Copyright (c) 2020-2021 Nordic Semiconductor ASA # Copyright (c) 2020-2022 Nordic Semiconductor ASA
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
##################### Microphone Input Control Service ##################### ########### Microphone Input Control Profile Microphone Device ###########
config BT_MICP config BT_MICP_MIC_DEV
bool "Microphone Input Control Profile Support [EXPERIMENTAL]" bool "Microphone Input Control Profile Microphone Device Support [EXPERIMENTAL]"
select EXPERIMENTAL select EXPERIMENTAL
help help
This option enables support for Microphone Input Control Service. This option enables support for Microphone Input Control Profile
Microphone Device.
if BT_MICP if BT_MICP_MIC_DEV
config BT_MICP_AICS_INSTANCE_COUNT config BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT
int "Audio Input Control Service instance count for Microphone Input Control Service" int "Audio Input Control Service instance count for \
Microphone Input Control Service Microphone Device"
default 0 default 0
range 0 BT_AICS_MAX_INSTANCE_COUNT range 0 BT_AICS_MAX_INSTANCE_COUNT
help help
This option sets the number of instances of Audio Input Control This option sets the number of instances of Audio Input Control
Services for MICP. Services for Microphone Input Control Profile Microphone Device.
config BT_MICP_AICS config BT_MICP_MIC_DEV_AICS
bool # Hidden bool # Hidden
default y if BT_MICP_AICS_INSTANCE_COUNT > 0 default y if BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT > 0
help help
This hidden option makes it possible to easily check if AICS is This hidden option makes it possible to easily check if AICS is
enabled for MICP. enabled for Microphone Input Control Profile Microphone Device.
############# DEBUG ############# ############# DEBUG #############
config BT_DEBUG_MICP config BT_DEBUG_MICP_MIC_DEV
bool "Microphone Input Control Service debug" bool "Microphone Input Control Profile Microphone Device debug"
help help
Use this option to enable Microphone Input Control Service debug logs Use this option to enable Microphone Input Control Profile
for the Bluetooth Audio functionality. Microphone Device debug logs for the Bluetooth Audio functionality.
endif # BT_MICP endif # BT_MICP_MIC_DEV
########### Microphone Input Control Profile Microphone Controller ########### ########### Microphone Input Control Profile Microphone Controller ###########

12
subsys/bluetooth/audio/micp_internal.h
View file

@ -9,14 +9,14 @@
#include <zephyr/types.h> #include <zephyr/types.h>
#include <zephyr/bluetooth/gatt.h> #include <zephyr/bluetooth/gatt.h>
#if defined(CONFIG_BT_MICP) #if defined(CONFIG_BT_MICP_MIC_DEV)
struct bt_micp_server { struct bt_micp_server {
uint8_t mute; uint8_t mute;
struct bt_micp_cb *cb; struct bt_micp_mic_dev_cb *cb;
struct bt_gatt_service *service_p; struct bt_gatt_service *service_p;
struct bt_aics *aics_insts[CONFIG_BT_MICP_AICS_INSTANCE_COUNT]; struct bt_aics *aics_insts[CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT];
}; };
#endif /* CONFIG_BT_MICP */ #endif /* CONFIG_BT_MICP_MIC_DEV */
#if defined(CONFIG_BT_MICP_MIC_CTLR) #if defined(CONFIG_BT_MICP_MIC_CTLR)
struct bt_micp_mic_ctlr { struct bt_micp_mic_ctlr {
@ -42,9 +42,9 @@ struct bt_micp_mic_ctlr {
struct bt_micp { struct bt_micp {
bool client_instance; bool client_instance;
union { union {
#if defined(CONFIG_BT_MICP) #if defined(CONFIG_BT_MICP_MIC_DEV)
struct bt_micp_server srv; struct bt_micp_server srv;
#endif /* CONFIG_BT_MICP */ #endif /* CONFIG_BT_MICP_MIC_DEV */
#if defined(CONFIG_BT_MICP_MIC_CTLR) #if defined(CONFIG_BT_MICP_MIC_CTLR)
struct bt_micp_mic_ctlr cli; struct bt_micp_mic_ctlr cli;
#endif /* CONFIG_BT_MICP_MIC_CTLR */ #endif /* CONFIG_BT_MICP_MIC_CTLR */

40
subsys/bluetooth/audio/micp_mic_dev.c
View file

@ -21,7 +21,7 @@
#include "micp_internal.h" #include "micp_internal.h"
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_MICP) #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_MICP_MIC_DEV)
#define LOG_MODULE_NAME bt_micp #define LOG_MODULE_NAME bt_micp
#include "common/log.h" #include "common/log.h"
@ -75,7 +75,7 @@ static ssize_t write_mute(struct bt_conn *conn, const struct bt_gatt_attr *attr,
&micp_inst.srv.mute, sizeof(micp_inst.srv.mute)); &micp_inst.srv.mute, sizeof(micp_inst.srv.mute));
if (micp_inst.srv.cb != NULL && micp_inst.srv.cb->mute != NULL) { if (micp_inst.srv.cb != NULL && micp_inst.srv.cb->mute != NULL) {
micp_inst.srv.cb->mute(NULL, 0, micp_inst.srv.mute); micp_inst.srv.cb->mute(NULL, micp_inst.srv.mute);
} }
} }
@ -88,7 +88,7 @@ static ssize_t write_mute(struct bt_conn *conn, const struct bt_gatt_attr *attr,
#define BT_MICP_SERVICE_DEFINITION \ #define BT_MICP_SERVICE_DEFINITION \
BT_GATT_PRIMARY_SERVICE(BT_UUID_MICS), \ BT_GATT_PRIMARY_SERVICE(BT_UUID_MICS), \
AICS_INCLUDES(CONFIG_BT_MICP_AICS_INSTANCE_COUNT) \ AICS_INCLUDES(CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT) \
BT_GATT_CHARACTERISTIC(BT_UUID_MICS_MUTE, \ BT_GATT_CHARACTERISTIC(BT_UUID_MICS_MUTE, \
BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_NOTIFY, \ BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_NOTIFY, \
BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT, \ BT_GATT_PERM_READ_ENCRYPT | BT_GATT_PERM_WRITE_ENCRYPT, \
@ -98,13 +98,13 @@ static ssize_t write_mute(struct bt_conn *conn, const struct bt_gatt_attr *attr,
#define MICS_ATTR_COUNT \ #define MICS_ATTR_COUNT \
ARRAY_SIZE(((struct bt_gatt_attr []){ BT_MICP_SERVICE_DEFINITION })) ARRAY_SIZE(((struct bt_gatt_attr []){ BT_MICP_SERVICE_DEFINITION }))
#define MICS_INCL_COUNT (CONFIG_BT_MICP_AICS_INSTANCE_COUNT) #define MICS_INCL_COUNT (CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT)
static struct bt_gatt_attr mics_attrs[] = { BT_MICP_SERVICE_DEFINITION }; static struct bt_gatt_attr mics_attrs[] = { BT_MICP_SERVICE_DEFINITION };
static struct bt_gatt_service mics_svc; static struct bt_gatt_service mics_svc;
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
static int prepare_aics_inst(struct bt_micp_register_param *param) static int prepare_aics_inst(struct bt_micp_mic_dev_register_param *param)
{ {
int i; int i;
int j; int j;
@ -128,21 +128,21 @@ static int prepare_aics_inst(struct bt_micp_register_param *param)
mics_attrs[i].user_data = bt_aics_svc_decl_get(micp_inst.srv.aics_insts[j]); mics_attrs[i].user_data = bt_aics_svc_decl_get(micp_inst.srv.aics_insts[j]);
j++; j++;
if (j == CONFIG_BT_MICP_AICS_INSTANCE_COUNT) { if (j == CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT) {
break; break;
} }
} }
} }
__ASSERT(j == CONFIG_BT_MICP_AICS_INSTANCE_COUNT, __ASSERT(j == CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT,
"Invalid AICS instance count"); "Invalid AICS instance count");
return 0; return 0;
} }
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
/****************************** PUBLIC API ******************************/ /****************************** PUBLIC API ******************************/
int bt_micp_register(struct bt_micp_register_param *param, int bt_micp_mic_dev_register(struct bt_micp_mic_dev_register_param *param,
struct bt_micp **micp) struct bt_micp **micp)
{ {
int err; int err;
@ -155,14 +155,14 @@ int bt_micp_register(struct bt_micp_register_param *param,
__ASSERT(param, "MICS register parameter cannot be NULL"); __ASSERT(param, "MICS register parameter cannot be NULL");
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
err = prepare_aics_inst(param); err = prepare_aics_inst(param);
if (err != 0) { if (err != 0) {
BT_DBG("Failed to prepare AICS instances: %d", err); BT_DBG("Failed to prepare AICS instances: %d", err);
return err; return err;
} }
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
mics_svc = (struct bt_gatt_service)BT_GATT_SERVICE(mics_attrs); mics_svc = (struct bt_gatt_service)BT_GATT_SERVICE(mics_attrs);
micp_inst.srv.service_p = &mics_svc; micp_inst.srv.service_p = &mics_svc;
@ -180,7 +180,7 @@ int bt_micp_register(struct bt_micp_register_param *param,
return err; return err;
} }
int bt_micp_mute_disable(struct bt_micp *micp) int bt_micp_mic_dev_disable(struct bt_micp *micp)
{ {
uint8_t val = BT_MICP_MUTE_DISABLED; uint8_t val = BT_MICP_MUTE_DISABLED;
int err; int err;
@ -195,7 +195,7 @@ int bt_micp_mute_disable(struct bt_micp *micp)
return err > 0 ? 0 : err; return err > 0 ? 0 : err;
} }
int bt_micp_included_get(struct bt_micp *micp, int bt_micp_mic_dev_included_get(struct bt_micp *micp,
struct bt_micp_included *included) struct bt_micp_included *included)
{ {
CHECKIF(micp == NULL) { CHECKIF(micp == NULL) {
@ -208,15 +208,15 @@ int bt_micp_included_get(struct bt_micp *micp,
return -EINVAL; return -EINVAL;
} }
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
included->aics_cnt = ARRAY_SIZE(micp_inst.srv.aics_insts); included->aics_cnt = ARRAY_SIZE(micp_inst.srv.aics_insts);
included->aics = micp_inst.srv.aics_insts; included->aics = micp_inst.srv.aics_insts;
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
return 0; return 0;
} }
int bt_micp_unmute(struct bt_micp *micp) int bt_micp_mic_dev_unmute(struct bt_micp *micp)
{ {
const uint8_t val = BT_MICP_MUTE_UNMUTED; const uint8_t val = BT_MICP_MUTE_UNMUTED;
int err; int err;
@ -231,7 +231,7 @@ int bt_micp_unmute(struct bt_micp *micp)
return err > 0 ? 0 : err; return err > 0 ? 0 : err;
} }
int bt_micp_mute(struct bt_micp *micp) int bt_micp_mic_dev_mute(struct bt_micp *micp)
{ {
const uint8_t val = BT_MICP_MUTE_MUTED; const uint8_t val = BT_MICP_MUTE_MUTED;
int err; int err;
@ -246,7 +246,7 @@ int bt_micp_mute(struct bt_micp *micp)
return err > 0 ? 0 : err; return err > 0 ? 0 : err;
} }
int bt_micp_mute_get(struct bt_micp *micp) int bt_micp_mic_dev_mute_get(struct bt_micp *micp)
{ {
CHECKIF(micp == NULL) { CHECKIF(micp == NULL) {
BT_DBG("NULL micp pointer"); BT_DBG("NULL micp pointer");
@ -254,7 +254,7 @@ int bt_micp_mute_get(struct bt_micp *micp)
} }
if (micp_inst.srv.cb && micp_inst.srv.cb->mute) { if (micp_inst.srv.cb && micp_inst.srv.cb->mute) {
micp_inst.srv.cb->mute(NULL, 0, micp_inst.srv.mute); micp_inst.srv.cb->mute(NULL, micp_inst.srv.mute);
} }
return 0; return 0;

2
subsys/bluetooth/shell/CMakeLists.txt
View file

@ -34,7 +34,7 @@ zephyr_library_sources_ifdef(
vcs_client.c vcs_client.c
) )
zephyr_library_sources_ifdef( zephyr_library_sources_ifdef(
CONFIG_BT_MICP CONFIG_BT_MICP_MIC_DEV
micp_mic_dev.c micp_mic_dev.c
) )
zephyr_library_sources_ifdef( zephyr_library_sources_ifdef(

220
subsys/bluetooth/shell/micp_mic_dev.c
View file

@ -18,24 +18,20 @@
static struct bt_micp *micp; static struct bt_micp *micp;
static void micp_mute_cb(struct bt_micp *micp, int err, uint8_t mute) static void micp_mic_dev_mute_cb(struct bt_micp *micp, uint8_t mute)
{ {
if (err != 0) { shell_print(ctx_shell, "Mute value %u", mute);
shell_error(ctx_shell, "Mute get failed (%d)", err);
} else {
shell_print(ctx_shell, "Mute value %u", mute);
}
} }
static struct bt_micp_cb micp_cbs = { static struct bt_micp_mic_dev_cb micp_mic_dev_cbs = {
.mute = micp_mute_cb, .mute = micp_mic_dev_mute_cb,
}; };
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
static struct bt_micp_included micp_included; static struct bt_micp_included micp_included;
static void micp_aics_state_cb(struct bt_aics *inst, int err, int8_t gain, static void micp_mic_dev_aics_state_cb(struct bt_aics *inst, int err,
uint8_t mute, uint8_t mode) int8_t gain, uint8_t mute, uint8_t mode)
{ {
if (err != 0) { if (err != 0) {
shell_error(ctx_shell, "AICS state get failed (%d) for " shell_error(ctx_shell, "AICS state get failed (%d) for "
@ -46,9 +42,9 @@ static void micp_aics_state_cb(struct bt_aics *inst, int err, int8_t gain,
} }
} }
static void micp_aics_gain_setting_cb(struct bt_aics *inst, int err, static void micp_mic_dev_aics_gain_setting_cb(struct bt_aics *inst, int err,
uint8_t units, int8_t minimum, uint8_t units, int8_t minimum,
int8_t maximum) int8_t maximum)
{ {
if (err != 0) { if (err != 0) {
shell_error(ctx_shell, "AICS gain settings get failed (%d) for " shell_error(ctx_shell, "AICS gain settings get failed (%d) for "
@ -60,8 +56,8 @@ static void micp_aics_gain_setting_cb(struct bt_aics *inst, int err,
} }
} }
static void micp_aics_input_type_cb(struct bt_aics *inst, int err, static void micp_mic_dev_aics_input_type_cb(struct bt_aics *inst, int err,
uint8_t input_type) uint8_t input_type)
{ {
if (err != 0) { if (err != 0) {
shell_error(ctx_shell, "AICS input type get failed (%d) for " shell_error(ctx_shell, "AICS input type get failed (%d) for "
@ -72,7 +68,8 @@ static void micp_aics_input_type_cb(struct bt_aics *inst, int err,
} }
} }
static void micp_aics_status_cb(struct bt_aics *inst, int err, bool active) static void micp_mic_dev_aics_status_cb(struct bt_aics *inst, int err,
bool active)
{ {
if (err != 0) { if (err != 0) {
shell_error(ctx_shell, "AICS status get failed (%d) for " shell_error(ctx_shell, "AICS status get failed (%d) for "
@ -83,8 +80,8 @@ static void micp_aics_status_cb(struct bt_aics *inst, int err, bool active)
} }
} }
static void micp_aics_description_cb(struct bt_aics *inst, int err, static void micp_mic_dev_aics_description_cb(struct bt_aics *inst, int err,
char *description) char *description)
{ {
if (err != 0) { if (err != 0) {
shell_error(ctx_shell, "AICS description get failed (%d) for " shell_error(ctx_shell, "AICS description get failed (%d) for "
@ -96,18 +93,19 @@ static void micp_aics_description_cb(struct bt_aics *inst, int err,
} }
static struct bt_aics_cb aics_cb = { static struct bt_aics_cb aics_cb = {
.state = micp_aics_state_cb, .state = micp_mic_dev_aics_state_cb,
.gain_setting = micp_aics_gain_setting_cb, .gain_setting = micp_mic_dev_aics_gain_setting_cb,
.type = micp_aics_input_type_cb, .type = micp_mic_dev_aics_input_type_cb,
.status = micp_aics_status_cb, .status = micp_mic_dev_aics_status_cb,
.description = micp_aics_description_cb, .description = micp_mic_dev_aics_description_cb,
}; };
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
static int cmd_micp_param(const struct shell *sh, size_t argc, char **argv) static int cmd_micp_mic_dev_param(const struct shell *sh, size_t argc,
char **argv)
{ {
int result; int result;
struct bt_micp_register_param micp_param; struct bt_micp_mic_dev_register_param micp_param;
if (ctx_shell == NULL) { if (ctx_shell == NULL) {
ctx_shell = sh; ctx_shell = sh;
@ -115,8 +113,8 @@ static int cmd_micp_param(const struct shell *sh, size_t argc, char **argv)
(void)memset(&micp_param, 0, sizeof(micp_param)); (void)memset(&micp_param, 0, sizeof(micp_param));
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
char input_desc[CONFIG_BT_MICP_AICS_INSTANCE_COUNT][16]; char input_desc[CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT][16];
for (int i = 0; i < ARRAY_SIZE(micp_param.aics_param); i++) { for (int i = 0; i < ARRAY_SIZE(micp_param.aics_param); i++) {
micp_param.aics_param[i].desc_writable = true; micp_param.aics_param[i].desc_writable = true;
@ -131,11 +129,11 @@ static int cmd_micp_param(const struct shell *sh, size_t argc, char **argv)
micp_param.aics_param[i].max_gain = 100; micp_param.aics_param[i].max_gain = 100;
micp_param.aics_param[i].cb = &aics_cb; micp_param.aics_param[i].cb = &aics_cb;
} }
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
micp_param.cb = &micp_cbs; micp_param.cb = &micp_mic_dev_cbs;
result = bt_micp_register(&micp_param, &micp); result = bt_micp_mic_dev_register(&micp_param, &micp);
if (result != 0) { if (result != 0) {
shell_error(sh, "MICP register failed: %d", result); shell_error(sh, "MICP register failed: %d", result);
return result; return result;
@ -143,19 +141,20 @@ static int cmd_micp_param(const struct shell *sh, size_t argc, char **argv)
shell_print(sh, "MICP initialized: %d", result); shell_print(sh, "MICP initialized: %d", result);
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
result = bt_micp_included_get(NULL, &micp_included); result = bt_micp_mic_dev_included_get(NULL, &micp_included);
if (result != 0) { if (result != 0) {
shell_error(sh, "MICP get failed: %d", result); shell_error(sh, "MICP get failed: %d", result);
} }
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
return result; return result;
} }
static int cmd_micp_mute_get(const struct shell *sh, size_t argc, char **argv) static int cmd_micp_mic_dev_mute_get(const struct shell *sh, size_t argc,
char **argv)
{ {
int result = bt_micp_mute_get(NULL); int result = bt_micp_mic_dev_mute_get(NULL);
if (result != 0) { if (result != 0) {
shell_error(sh, "Fail: %d", result); shell_error(sh, "Fail: %d", result);
@ -164,32 +163,10 @@ static int cmd_micp_mute_get(const struct shell *sh, size_t argc, char **argv)
return result; return result;
} }
static int cmd_micp_mute(const struct shell *sh, size_t argc, char **argv) static int cmd_micp_mic_dev_mute(const struct shell *sh, size_t argc,
{
int result = bt_micp_mute(NULL);
if (result != 0) {
shell_error(sh, "Fail: %d", result);
}
return result;
}
static int cmd_micp_unmute(const struct shell *sh, size_t argc, char **argv)
{
int result = bt_micp_unmute(NULL);
if (result != 0) {
shell_error(sh, "Fail: %d", result);
}
return result;
}
static int cmd_micp_mute_disable(const struct shell *sh, size_t argc,
char **argv) char **argv)
{ {
int result = bt_micp_mute_disable(micp); int result = bt_micp_mic_dev_mute(NULL);
if (result != 0) { if (result != 0) {
shell_error(sh, "Fail: %d", result); shell_error(sh, "Fail: %d", result);
@ -198,9 +175,33 @@ static int cmd_micp_mute_disable(const struct shell *sh, size_t argc,
return result; return result;
} }
#if defined(CONFIG_BT_MICP_AICS) static int cmd_micp_mic_dev_unmute(const struct shell *sh, size_t argc,
static int cmd_micp_aics_deactivate(const struct shell *sh, size_t argc, char **argv)
char **argv) {
int result = bt_micp_mic_dev_unmute(NULL);
if (result != 0) {
shell_error(sh, "Fail: %d", result);
}
return result;
}
static int cmd_micp_mic_dev_mute_disable(const struct shell *sh, size_t argc,
char **argv)
{
int result = bt_micp_mic_dev_disable(micp);
if (result != 0) {
shell_error(sh, "Fail: %d", result);
}
return result;
}
#if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
static int cmd_micp_mic_dev_aics_deactivate(const struct shell *sh, size_t argc,
char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -219,8 +220,8 @@ static int cmd_micp_aics_deactivate(const struct shell *sh, size_t argc,
return result; return result;
} }
static int cmd_micp_aics_activate(const struct shell *sh, size_t argc, static int cmd_micp_mic_dev_aics_activate(const struct shell *sh, size_t argc,
char **argv) char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -239,8 +240,8 @@ static int cmd_micp_aics_activate(const struct shell *sh, size_t argc,
return result; return result;
} }
static int cmd_micp_aics_input_state_get(const struct shell *sh, size_t argc, static int cmd_micp_mic_dev_aics_input_state_get(const struct shell *sh,
char **argv) size_t argc, char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -259,8 +260,8 @@ static int cmd_micp_aics_input_state_get(const struct shell *sh, size_t argc,
return result; return result;
} }
static int cmd_micp_aics_gain_setting_get(const struct shell *sh, size_t argc, static int cmd_micp_mic_dev_aics_gain_setting_get(const struct shell *sh,
char **argv) size_t argc, char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -279,8 +280,8 @@ static int cmd_micp_aics_gain_setting_get(const struct shell *sh, size_t argc,
return result; return result;
} }
static int cmd_micp_aics_input_type_get(const struct shell *sh, size_t argc, static int cmd_micp_mic_dev_aics_input_type_get(const struct shell *sh,
char **argv) size_t argc, char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -299,8 +300,8 @@ static int cmd_micp_aics_input_type_get(const struct shell *sh, size_t argc,
return result; return result;
} }
static int cmd_micp_aics_input_status_get(const struct shell *sh, size_t argc, static int cmd_micp_mic_dev_aics_input_status_get(const struct shell *sh,
char **argv) size_t argc, char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -319,8 +320,8 @@ static int cmd_micp_aics_input_status_get(const struct shell *sh, size_t argc,
return result; return result;
} }
static int cmd_micp_aics_input_unmute(const struct shell *sh, size_t argc, static int cmd_micp_mic_dev_aics_input_unmute(const struct shell *sh,
char **argv) size_t argc, char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -339,8 +340,8 @@ static int cmd_micp_aics_input_unmute(const struct shell *sh, size_t argc,
return result; return result;
} }
static int cmd_micp_aics_input_mute(const struct shell *sh, size_t argc, static int cmd_micp_mic_dev_aics_input_mute(const struct shell *sh, size_t argc,
char **argv) char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -359,8 +360,8 @@ static int cmd_micp_aics_input_mute(const struct shell *sh, size_t argc,
return result; return result;
} }
static int cmd_micp_aics_manual_input_gain_set(const struct shell *sh, static int cmd_micp_mic_dev_aics_manual_input_gain_set(const struct shell *sh,
size_t argc, char **argv) size_t argc, char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -379,8 +380,9 @@ static int cmd_micp_aics_manual_input_gain_set(const struct shell *sh,
return result; return result;
} }
static int cmd_micp_aics_automatic_input_gain_set(const struct shell *sh, static int cmd_micp_mic_dev_aics_automatic_input_gain_set(const struct shell *sh,
size_t argc, char **argv) size_t argc,
char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -399,8 +401,8 @@ static int cmd_micp_aics_automatic_input_gain_set(const struct shell *sh,
return result; return result;
} }
static int cmd_micp_aics_gain_set(const struct shell *sh, size_t argc, static int cmd_micp_mic_dev_aics_gain_set(const struct shell *sh, size_t argc,
char **argv) char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -426,8 +428,8 @@ static int cmd_micp_aics_gain_set(const struct shell *sh, size_t argc,
return result; return result;
} }
static int cmd_micp_aics_input_description_get(const struct shell *sh, static int cmd_micp_mic_dev_aics_input_description_get(const struct shell *sh,
size_t argc, char **argv) size_t argc, char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -446,8 +448,8 @@ static int cmd_micp_aics_input_description_get(const struct shell *sh,
return result; return result;
} }
static int cmd_micp_aics_input_description_set(const struct shell *sh, static int cmd_micp_mic_dev_aics_input_description_set(const struct shell *sh,
size_t argc, char **argv) size_t argc, char **argv)
{ {
int result; int result;
int index = strtol(argv[1], NULL, 0); int index = strtol(argv[1], NULL, 0);
@ -467,7 +469,7 @@ static int cmd_micp_aics_input_description_set(const struct shell *sh,
return result; return result;
} }
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
static int cmd_micp(const struct shell *sh, size_t argc, char **argv) static int cmd_micp(const struct shell *sh, size_t argc, char **argv)
{ {
@ -484,65 +486,65 @@ static int cmd_micp(const struct shell *sh, size_t argc, char **argv)
SHELL_STATIC_SUBCMD_SET_CREATE(micp_cmds, SHELL_STATIC_SUBCMD_SET_CREATE(micp_cmds,
SHELL_CMD_ARG(init, NULL, SHELL_CMD_ARG(init, NULL,
"Initialize the service and register callbacks", "Initialize the service and register callbacks",
cmd_micp_param, 1, 0), cmd_micp_mic_dev_param, 1, 0),
SHELL_CMD_ARG(mute_get, NULL, SHELL_CMD_ARG(mute_get, NULL,
"Get the mute state", "Get the mute state",
cmd_micp_mute_get, 1, 0), cmd_micp_mic_dev_mute_get, 1, 0),
SHELL_CMD_ARG(mute, NULL, SHELL_CMD_ARG(mute, NULL,
"Mute the MICP server", "Mute the MICP server",
cmd_micp_mute, 1, 0), cmd_micp_mic_dev_mute, 1, 0),
SHELL_CMD_ARG(unmute, NULL, SHELL_CMD_ARG(unmute, NULL,
"Unmute the MICP server", "Unmute the MICP server",
cmd_micp_unmute, 1, 0), cmd_micp_mic_dev_unmute, 1, 0),
SHELL_CMD_ARG(mute_disable, NULL, SHELL_CMD_ARG(mute_disable, NULL,
"Disable the MICP mute", "Disable the MICP mute",
cmd_micp_mute_disable, 1, 0), cmd_micp_mic_dev_mute_disable, 1, 0),
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
SHELL_CMD_ARG(aics_deactivate, NULL, SHELL_CMD_ARG(aics_deactivate, NULL,
"Deactivates a AICS instance <inst_index>", "Deactivates a AICS instance <inst_index>",
cmd_micp_aics_deactivate, 2, 0), cmd_micp_mic_dev_aics_deactivate, 2, 0),
SHELL_CMD_ARG(aics_activate, NULL, SHELL_CMD_ARG(aics_activate, NULL,
"Activates a AICS instance <inst_index>", "Activates a AICS instance <inst_index>",
cmd_micp_aics_activate, 2, 0), cmd_micp_mic_dev_aics_activate, 2, 0),
SHELL_CMD_ARG(aics_input_state_get, NULL, SHELL_CMD_ARG(aics_input_state_get, NULL,
"Get the input state of a AICS instance <inst_index>", "Get the input state of a AICS instance <inst_index>",
cmd_micp_aics_input_state_get, 2, 0), cmd_micp_mic_dev_aics_input_state_get, 2, 0),
SHELL_CMD_ARG(aics_gain_setting_get, NULL, SHELL_CMD_ARG(aics_gain_setting_get, NULL,
"Get the gain settings of a AICS instance <inst_index>", "Get the gain settings of a AICS instance <inst_index>",
cmd_micp_aics_gain_setting_get, 2, 0), cmd_micp_mic_dev_aics_gain_setting_get, 2, 0),
SHELL_CMD_ARG(aics_input_type_get, NULL, SHELL_CMD_ARG(aics_input_type_get, NULL,
"Get the input type of a AICS instance <inst_index>", "Get the input type of a AICS instance <inst_index>",
cmd_micp_aics_input_type_get, 2, 0), cmd_micp_mic_dev_aics_input_type_get, 2, 0),
SHELL_CMD_ARG(aics_input_status_get, NULL, SHELL_CMD_ARG(aics_input_status_get, NULL,
"Get the input status of a AICS instance <inst_index>", "Get the input status of a AICS instance <inst_index>",
cmd_micp_aics_input_status_get, 2, 0), cmd_micp_mic_dev_aics_input_status_get, 2, 0),
SHELL_CMD_ARG(aics_input_unmute, NULL, SHELL_CMD_ARG(aics_input_unmute, NULL,
"Unmute the input of a AICS instance <inst_index>", "Unmute the input of a AICS instance <inst_index>",
cmd_micp_aics_input_unmute, 2, 0), cmd_micp_mic_dev_aics_input_unmute, 2, 0),
SHELL_CMD_ARG(aics_input_mute, NULL, SHELL_CMD_ARG(aics_input_mute, NULL,
"Mute the input of a AICS instance <inst_index>", "Mute the input of a AICS instance <inst_index>",
cmd_micp_aics_input_mute, 2, 0), cmd_micp_mic_dev_aics_input_mute, 2, 0),
SHELL_CMD_ARG(aics_manual_input_gain_set, NULL, SHELL_CMD_ARG(aics_manual_input_gain_set, NULL,
"Set the gain mode of a AICS instance to manual " "Set the gain mode of a AICS instance to manual "
"<inst_index>", "<inst_index>",
cmd_micp_aics_manual_input_gain_set, 2, 0), cmd_micp_mic_dev_aics_manual_input_gain_set, 2, 0),
SHELL_CMD_ARG(aics_automatic_input_gain_set, NULL, SHELL_CMD_ARG(aics_automatic_input_gain_set, NULL,
"Set the gain mode of a AICS instance to automatic " "Set the gain mode of a AICS instance to automatic "
"<inst_index>", "<inst_index>",
cmd_micp_aics_automatic_input_gain_set, 2, 0), cmd_micp_mic_dev_aics_automatic_input_gain_set, 2, 0),
SHELL_CMD_ARG(aics_gain_set, NULL, SHELL_CMD_ARG(aics_gain_set, NULL,
"Set the gain in dB of a AICS instance <inst_index> " "Set the gain in dB of a AICS instance <inst_index> "
"<gain (-128 to 127)>", "<gain (-128 to 127)>",
cmd_micp_aics_gain_set, 3, 0), cmd_micp_mic_dev_aics_gain_set, 3, 0),
SHELL_CMD_ARG(aics_input_description_get, NULL, SHELL_CMD_ARG(aics_input_description_get, NULL,
"Get the input description of a AICS instance " "Get the input description of a AICS instance "
"<inst_index>", "<inst_index>",
cmd_micp_aics_input_description_get, 2, 0), cmd_micp_mic_dev_aics_input_description_get, 2, 0),
SHELL_CMD_ARG(aics_input_description_set, NULL, SHELL_CMD_ARG(aics_input_description_set, NULL,
"Set the input description of a AICS instance " "Set the input description of a AICS instance "
"<inst_index> <description>", "<inst_index> <description>",
cmd_micp_aics_input_description_set, 3, 0), cmd_micp_mic_dev_aics_input_description_set, 3, 0),
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
SHELL_SUBCMD_SET_END SHELL_SUBCMD_SET_END
); );

6
tests/bluetooth/bsim_bt/bsim_test_audio/prj.conf
View file

@ -47,8 +47,8 @@ CONFIG_BT_VCS_CLIENT=y
CONFIG_BT_VCS_CLIENT_MAX_VOCS_INST=2 CONFIG_BT_VCS_CLIENT_MAX_VOCS_INST=2
CONFIG_BT_VCS_CLIENT_MAX_AICS_INST=2 CONFIG_BT_VCS_CLIENT_MAX_AICS_INST=2
CONFIG_BT_MICP=y CONFIG_BT_MICP_MIC_DEV=y
CONFIG_BT_MICP_AICS_INSTANCE_COUNT=2 CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT=2
CONFIG_BT_MICP_MIC_CTLR=y CONFIG_BT_MICP_MIC_CTLR=y
CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=2 CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=2
@ -108,7 +108,7 @@ CONFIG_BT_DEBUG_AICS=y
CONFIG_BT_DEBUG_AICS_CLIENT=y CONFIG_BT_DEBUG_AICS_CLIENT=y
CONFIG_BT_DEBUG_VOCS=y CONFIG_BT_DEBUG_VOCS=y
CONFIG_BT_DEBUG_VOCS_CLIENT=y CONFIG_BT_DEBUG_VOCS_CLIENT=y
CONFIG_BT_DEBUG_MICP=y CONFIG_BT_DEBUG_MICP_MIC_DEV=y
CONFIG_BT_DEBUG_MICP_MIC_CTLR=y CONFIG_BT_DEBUG_MICP_MIC_CTLR=y
CONFIG_BT_DEBUG_MPL=y CONFIG_BT_DEBUG_MPL=y
CONFIG_BT_DEBUG_TBS=y CONFIG_BT_DEBUG_TBS=y

67
tests/bluetooth/bsim_bt/bsim_test_audio/src/micp_mic_dev_test.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifdef CONFIG_BT_MICP #ifdef CONFIG_BT_MICP_MIC_DEV
#include <zephyr/bluetooth/audio/micp.h> #include <zephyr/bluetooth/audio/micp.h>
#include "common.h" #include "common.h"
@ -32,22 +32,17 @@ static char g_aics_desc[AICS_DESC_SIZE];
static volatile bool g_cb; static volatile bool g_cb;
static bool g_is_connected; static bool g_is_connected;
static void micp_mute_cb(struct bt_micp *micp, int err, uint8_t mute) static void micp_mute_cb(struct bt_micp *micp, uint8_t mute)
{ {
if (err != 0) {
FAIL("MICP mute cb err (%d)", err);
return;
}
g_mute = mute; g_mute = mute;
g_cb = true; g_cb = true;
} }
static struct bt_micp_cb micp_cb = { static struct bt_micp_mic_dev_cb micp_cb = {
.mute = micp_mute_cb, .mute = micp_mute_cb,
}; };
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
static void aics_state_cb(struct bt_aics *inst, int err, int8_t gain, static void aics_state_cb(struct bt_aics *inst, int err, int8_t gain,
uint8_t mute, uint8_t mode) uint8_t mute, uint8_t mode)
{ {
@ -120,7 +115,7 @@ static struct bt_aics_cb aics_cb = {
.status = aics_status_cb, .status = aics_status_cb,
.description = aics_description_cb .description = aics_description_cb
}; };
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
static void connected(struct bt_conn *conn, uint8_t err) static void connected(struct bt_conn *conn, uint8_t err)
{ {
@ -297,10 +292,10 @@ static int test_aics_server_only(void)
return 0; return 0;
} }
static void test_server_only(void) static void test_mic_dev_only(void)
{ {
int err; int err;
struct bt_micp_register_param micp_param; struct bt_micp_mic_dev_register_param micp_param;
uint8_t expected_mute; uint8_t expected_mute;
err = bt_enable(NULL); err = bt_enable(NULL);
@ -313,8 +308,8 @@ static void test_server_only(void)
(void)memset(&micp_param, 0, sizeof(micp_param)); (void)memset(&micp_param, 0, sizeof(micp_param));
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
char input_desc[CONFIG_BT_MICP_AICS_INSTANCE_COUNT][16]; char input_desc[CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT][16];
for (int i = 0; i < ARRAY_SIZE(micp_param.aics_param); i++) { for (int i = 0; i < ARRAY_SIZE(micp_param.aics_param); i++) {
micp_param.aics_param[i].desc_writable = true; micp_param.aics_param[i].desc_writable = true;
@ -328,18 +323,18 @@ static void test_server_only(void)
micp_param.aics_param[i].max_gain = 100; micp_param.aics_param[i].max_gain = 100;
micp_param.aics_param[i].cb = &aics_cb; micp_param.aics_param[i].cb = &aics_cb;
} }
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
micp_param.cb = &micp_cb; micp_param.cb = &micp_cb;
err = bt_micp_register(&micp_param, &micp); err = bt_micp_mic_dev_register(&micp_param, &micp);
if (err != 0) { if (err != 0) {
FAIL("MICP init failed (err %d)\n", err); FAIL("MICP init failed (err %d)\n", err);
return; return;
} }
if (IS_ENABLED(CONFIG_BT_MICP_AICS)) { if (IS_ENABLED(CONFIG_BT_MICP_MIC_DEV_AICS)) {
err = bt_micp_included_get(micp, &micp_included); err = bt_micp_mic_dev_included_get(micp, &micp_included);
if (err != 0) { if (err != 0) {
FAIL("MICP get failed (err %d)\n", err); FAIL("MICP get failed (err %d)\n", err);
return; return;
@ -350,7 +345,7 @@ static void test_server_only(void)
printk("Getting MICP mute\n"); printk("Getting MICP mute\n");
g_cb = false; g_cb = false;
err = bt_micp_mute_get(micp); err = bt_micp_mic_dev_mute_get(micp);
if (err != 0) { if (err != 0) {
FAIL("Could not get MICP mute (err %d)\n", err); FAIL("Could not get MICP mute (err %d)\n", err);
return; return;
@ -360,7 +355,7 @@ static void test_server_only(void)
printk("Setting MICP mute\n"); printk("Setting MICP mute\n");
expected_mute = BT_MICP_MUTE_MUTED; expected_mute = BT_MICP_MUTE_MUTED;
err = bt_micp_mute(micp); err = bt_micp_mic_dev_mute(micp);
if (err != 0) { if (err != 0) {
FAIL("MICP mute failed (err %d)\n", err); FAIL("MICP mute failed (err %d)\n", err);
return; return;
@ -370,7 +365,7 @@ static void test_server_only(void)
printk("Setting MICP unmute\n"); printk("Setting MICP unmute\n");
expected_mute = BT_MICP_MUTE_UNMUTED; expected_mute = BT_MICP_MUTE_UNMUTED;
err = bt_micp_unmute(micp); err = bt_micp_mic_dev_unmute(micp);
if (err != 0) { if (err != 0) {
FAIL("MICP unmute failed (err %d)\n", err); FAIL("MICP unmute failed (err %d)\n", err);
return; return;
@ -380,7 +375,7 @@ static void test_server_only(void)
printk("Setting MICP disable\n"); printk("Setting MICP disable\n");
expected_mute = BT_MICP_MUTE_DISABLED; expected_mute = BT_MICP_MUTE_DISABLED;
err = bt_micp_mute_disable(micp); err = bt_micp_mic_dev_disable(micp);
if (err != 0) { if (err != 0) {
FAIL("MICP disable failed (err %d)\n", err); FAIL("MICP disable failed (err %d)\n", err);
return; return;
@ -388,19 +383,19 @@ static void test_server_only(void)
WAIT_FOR_COND(expected_mute == g_mute); WAIT_FOR_COND(expected_mute == g_mute);
printk("MICP disable set\n"); printk("MICP disable set\n");
if (CONFIG_BT_MICP_AICS_INSTANCE_COUNT > 0) { if (CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT > 0) {
if (test_aics_server_only()) { if (test_aics_server_only()) {
return; return;
} }
} }
PASS("MICP passed\n"); PASS("MICP mic_dev passed\n");
} }
static void test_main(void) static void test_main(void)
{ {
int err; int err;
struct bt_micp_register_param micp_param; struct bt_micp_mic_dev_register_param micp_param;
err = bt_enable(NULL); err = bt_enable(NULL);
if (err != 0) { if (err != 0) {
@ -412,8 +407,8 @@ static void test_main(void)
(void)memset(&micp_param, 0, sizeof(micp_param)); (void)memset(&micp_param, 0, sizeof(micp_param));
#if defined(CONFIG_BT_MICP_AICS) #if defined(CONFIG_BT_MICP_MIC_DEV_AICS)
char input_desc[CONFIG_BT_MICP_AICS_INSTANCE_COUNT][16]; char input_desc[CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT][16];
for (int i = 0; i < ARRAY_SIZE(micp_param.aics_param); i++) { for (int i = 0; i < ARRAY_SIZE(micp_param.aics_param); i++) {
micp_param.aics_param[i].desc_writable = true; micp_param.aics_param[i].desc_writable = true;
@ -428,18 +423,18 @@ static void test_main(void)
micp_param.aics_param[i].max_gain = 100; micp_param.aics_param[i].max_gain = 100;
micp_param.aics_param[i].cb = &aics_cb; micp_param.aics_param[i].cb = &aics_cb;
} }
#endif /* CONFIG_BT_MICP_AICS */ #endif /* CONFIG_BT_MICP_MIC_DEV_AICS */
micp_param.cb = &micp_cb; micp_param.cb = &micp_cb;
err = bt_micp_register(&micp_param, &micp); err = bt_micp_mic_dev_register(&micp_param, &micp);
if (err != 0) { if (err != 0) {
FAIL("MICP init failed (err %d)\n", err); FAIL("MICP init failed (err %d)\n", err);
return; return;
} }
if (IS_ENABLED(CONFIG_BT_MICP_AICS)) { if (IS_ENABLED(CONFIG_BT_MICP_MIC_DEV_AICS)) {
err = bt_micp_included_get(micp, &micp_included); err = bt_micp_mic_dev_included_get(micp, &micp_included);
if (err != 0) { if (err != 0) {
FAIL("MICP get failed (err %d)\n", err); FAIL("MICP get failed (err %d)\n", err);
return; return;
@ -458,18 +453,18 @@ static void test_main(void)
WAIT_FOR_COND(g_is_connected); WAIT_FOR_COND(g_is_connected);
PASS("MICP passed\n"); PASS("MICP mic_dev passed\n");
} }
static const struct bst_test_instance test_micp[] = { static const struct bst_test_instance test_micp[] = {
{ {
.test_id = "micp_server_only", .test_id = "micp_mic_dev_only",
.test_post_init_f = test_init, .test_post_init_f = test_init,
.test_tick_f = test_tick, .test_tick_f = test_tick,
.test_main_f = test_server_only .test_main_f = test_mic_dev_only
}, },
{ {
.test_id = "micp", .test_id = "micp_mic_dev",
.test_post_init_f = test_init, .test_post_init_f = test_init,
.test_tick_f = test_tick, .test_tick_f = test_tick,
.test_main_f = test_main .test_main_f = test_main
@ -487,4 +482,4 @@ struct bst_test_list *test_micp_install(struct bst_test_list *tests)
return tests; return tests;
} }
#endif /* CONFIG_BT_MICP */ #endif /* CONFIG_BT_MICP_MIC_DEV */

8
tests/bluetooth/bsim_bt/bsim_test_audio/test_scripts/micp.sh
View file

@ -24,10 +24,10 @@ BOARD="${BOARD:-nrf52_bsim}"
cd ${BSIM_OUT_PATH}/bin cd ${BSIM_OUT_PATH}/bin
printf "\n\n======== Running MICP Server Only (API) test =========\n\n" printf "\n\n==== Running MICP Microphone Device Only (API) test ====n\n"
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=micp_server_only -rs=23 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=micp_mic_dev_only -rs=23
# Simulation time should be larger than the WAIT_TIME in common.h # Simulation time should be larger than the WAIT_TIME in common.h
Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \ Execute ./bs_2G4_phy_v1 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} \
@ -37,10 +37,10 @@ for PROCESS_ID in $PROCESS_IDS; do
wait $PROCESS_ID || let "EXIT_CODE=$?" wait $PROCESS_ID || let "EXIT_CODE=$?"
done done
printf "\n\n======== Running MICP and MICP client test =========\n\n" printf "\n\n==== Running MICP Microphone Device and MICP Microphone Controller test ====n\n"
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=micp -rs=23 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=0 -testid=micp_mic_dev -rs=23
Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \ Execute ./bs_${BOARD}_tests_bluetooth_bsim_bt_bsim_test_audio_prj_conf \
-v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=micp_mic_ctlr -rs=46 -v=${VERBOSITY_LEVEL} -s=${SIMULATION_ID} -d=1 -testid=micp_mic_ctlr -rs=46

4
tests/bluetooth/shell/audio.conf
View file

@ -54,8 +54,8 @@ CONFIG_BT_VCS_CLIENT=y
CONFIG_BT_VCS_CLIENT_MAX_VOCS_INST=1 CONFIG_BT_VCS_CLIENT_MAX_VOCS_INST=1
CONFIG_BT_VCS_CLIENT_MAX_AICS_INST=1 CONFIG_BT_VCS_CLIENT_MAX_AICS_INST=1
CONFIG_BT_MICP=y CONFIG_BT_MICP_MIC_DEV=y
CONFIG_BT_MICP_AICS_INSTANCE_COUNT=1 CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT=1
CONFIG_BT_MICP_MIC_CTLR=y CONFIG_BT_MICP_MIC_CTLR=y
CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=1 CONFIG_BT_MICP_MIC_CTLR_MAX_AICS_INST=1

12
tests/bluetooth/shell/testcase.yaml
View file

@ -58,7 +58,7 @@ tests:
extra_configs: extra_configs:
- CONFIG_BT_AICS_MAX_INSTANCE_COUNT=0 - CONFIG_BT_AICS_MAX_INSTANCE_COUNT=0
- CONFIG_BT_VCS_AICS_INSTANCE_COUNT=0 - CONFIG_BT_VCS_AICS_INSTANCE_COUNT=0
- CONFIG_BT_MICP_AICS_INSTANCE_COUNT=0 - CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT=0
tags: bluetooth tags: bluetooth
bluetooth.shell.audio.no_aics_vocs: bluetooth.shell.audio.no_aics_vocs:
extra_args: CONF_FILE="audio.conf" extra_args: CONF_FILE="audio.conf"
@ -69,7 +69,7 @@ tests:
- CONFIG_BT_VCS_VOCS_INSTANCE_COUNT=0 - CONFIG_BT_VCS_VOCS_INSTANCE_COUNT=0
- CONFIG_BT_AICS_MAX_INSTANCE_COUNT=0 - CONFIG_BT_AICS_MAX_INSTANCE_COUNT=0
- CONFIG_BT_VCS_AICS_INSTANCE_COUNT=0 - CONFIG_BT_VCS_AICS_INSTANCE_COUNT=0
- CONFIG_BT_MICP_AICS_INSTANCE_COUNT=0 - CONFIG_BT_MICP_MIC_DEV_AICS_INSTANCE_COUNT=0
tags: bluetooth tags: bluetooth
bluetooth.shell.audio.no_vcs_client: bluetooth.shell.audio.no_vcs_client:
extra_args: CONF_FILE="audio.conf" extra_args: CONF_FILE="audio.conf"
@ -100,12 +100,12 @@ tests:
extra_configs: extra_configs:
- CONFIG_BT_VCS_CLIENT_MAX_VOCS_INST=0 - CONFIG_BT_VCS_CLIENT_MAX_VOCS_INST=0
tags: bluetooth tags: bluetooth
bluetooth.shell.audio.no_micp: bluetooth.shell.audio.no_micp_mic_dev:
extra_args: CONF_FILE="audio.conf" extra_args: CONF_FILE="audio.conf"
build_only: true build_only: true
platform_allow: native_posix platform_allow: native_posix
extra_configs: extra_configs:
- CONFIG_BT_MICP=n - CONFIG_BT_MICP_MIC_DEV=n
tags: bluetooth tags: bluetooth
bluetooth.shell.audio.no_micp_mic_ctlr: bluetooth.shell.audio.no_micp_mic_ctlr:
extra_args: CONF_FILE="audio.conf" extra_args: CONF_FILE="audio.conf"
@ -114,12 +114,12 @@ tests:
extra_configs: extra_configs:
- CONFIG_BT_MICP_MIC_CTLR=n - CONFIG_BT_MICP_MIC_CTLR=n
tags: bluetooth tags: bluetooth
bluetooth.shell.audio.no_micp_micp_mic_ctlr: bluetooth.shell.audio.no_micp_mic_dev_micp_mic_ctlr:
extra_args: CONF_FILE="audio.conf" extra_args: CONF_FILE="audio.conf"
build_only: true build_only: true
platform_allow: native_posix platform_allow: native_posix
extra_configs: extra_configs:
- CONFIG_BT_MICP=n - CONFIG_BT_MICP_MIC_DEV=n
- CONFIG_BT_MICP_MIC_CTLR=n - CONFIG_BT_MICP_MIC_CTLR=n
tags: bluetooth tags: bluetooth
bluetooth.shell.audio.micp_mic_ctlr_no_aics_client: bluetooth.shell.audio.micp_mic_ctlr_no_aics_client: