* [PATCH BlueZ v3 0/2] Code handling for VOCS service
@ 2023-06-08 12:09 Nitin Jadhav
2023-06-08 12:09 ` [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS Nitin Jadhav
2023-06-08 12:09 ` [PATCH BlueZ v3 2/2] Make VOCS (Secondary) as an included service of VCS (Primary) Nitin Jadhav
0 siblings, 2 replies; 10+ messages in thread
From: Nitin Jadhav @ 2023-06-08 12:09 UTC (permalink / raw)
To: linux-bluetooth
Cc: devyani.godbole, mihai-octavian.urzica, silviu.barbulescu, nitin.jadhav
Hello Maintainers
This patch series handles code implementation for mandatory features of Volume Offset Control Service.
Implementation of following features have been handled in this patch series
- Volume Offset Control Service
- Volume Offset State Characteristic (Read, Notify)
- Audio Location Characteristic (Read)
- Volume Offset Control Point Characteristic (Write)
- Audio Output Description Characteristic (Read)
- Set Volume Offset
Reference Document:
- Code implementation is based on VOCS_v1.0.pdf
- Testing is done using PTS in reference to VOCS.TS.p1.pdf
- The verdict is PASS for all mandatory test cases.
Thank you in advance for your review.
Warm Regards
Nitin Jadhav
Nitin Jadhav (2):
Title: Added initial code for handling VOCS
Make VOCS (Secondary) as an included service of VCS (Primary)
lib/uuid.h | 5 +
src/shared/vcp.c | 563 ++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 566 insertions(+), 2 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS
2023-06-08 12:09 [PATCH BlueZ v3 0/2] Code handling for VOCS service Nitin Jadhav
@ 2023-06-08 12:09 ` Nitin Jadhav
2023-06-08 13:36 ` Code handling for VOCS service bluez.test.bot
2023-06-08 16:29 ` [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS Luiz Augusto von Dentz
2023-06-08 12:09 ` [PATCH BlueZ v3 2/2] Make VOCS (Secondary) as an included service of VCS (Primary) Nitin Jadhav
1 sibling, 2 replies; 10+ messages in thread
From: Nitin Jadhav @ 2023-06-08 12:09 UTC (permalink / raw)
To: linux-bluetooth
Cc: devyani.godbole, mihai-octavian.urzica, silviu.barbulescu, nitin.jadhav
Summary:
- This adds implementation for VOCS service and characteristics
- Implementation based on VOCS_v1.0.pdf specification
- Tested using PTS with reference to VOCS.TS.p1.pdf
---
v2: Corrected prefixs and cosmetic changes (Luiz Augusto von Dentz)
v3: Commit message modified and fixed long line length warning (Paul
Menzel)
---
lib/uuid.h | 5 +
src/shared/vcp.c | 547 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 552 insertions(+)
diff --git a/lib/uuid.h b/lib/uuid.h
index 5cdfedb4b..cd3b3655f 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -179,6 +179,11 @@ extern "C" {
#define VOL_CP_CHRC_UUID 0x2B7E
#define VOL_FLAG_CHRC_UUID 0x2B7F
+#define VOCS_STATE_CHAR_UUID 0x2B80
+#define VOCS_AUDIO_LOC_CHRC_UUID 0x2B81
+#define VOCS_CP_CHRC_UUID 0x2B82
+#define VOCS_AUDIO_OP_DESC_CHAR_UUID 0x2B83
+
#define GMCS_UUID 0x1849
#define MEDIA_PLAYER_NAME_CHRC_UUID 0x2b93
#define MEDIA_TRACK_CHNGD_CHRC_UUID 0x2b96
diff --git a/src/shared/vcp.c b/src/shared/vcp.c
index 5459cf892..aa75f498a 100644
--- a/src/shared/vcp.c
+++ b/src/shared/vcp.c
@@ -36,9 +36,40 @@
#define BT_ATT_ERROR_INVALID_CHANGE_COUNTER 0x80
#define BT_ATT_ERROR_OPCODE_NOT_SUPPORTED 0x81
+#define BT_VCP_NA 0x00000000
+#define BT_VCP_FRONT_LEFT 0x00000001
+#define BT_VCP_FRONT_RIGHT 0x00000002
+#define BT_VCP_FRONT_CENTER 0x00000004
+#define BT_VCP_LOW_FRQ_EFF_1 0x00000008
+#define BT_VCP_BACK_LEFT 0x00000010
+#define BT_VCP_BACK_RIGHT 0x00000020
+#define BT_VCP_FRONT_LEFT_CENTER 0x00000040
+#define BT_VCP_FRONT_RIGHT_CENTER 0x00000080
+#define BT_VCP_BACK_CENTER 0x00000100
+#define BT_VCP_LOW_FRQ_EFF_2 0x00000200
+#define BT_VCP_SIDE_LEFT 0x00000400
+#define BT_VCP_SIDE_RIGHT 0x00000800
+#define BT_VCP_TOP_FRONT_LEFT 0x00001000
+#define BT_VCP_TOP_FRONT_RIGHT 0x00002000
+#define BT_VCP_TOP_FRONT_CENTER 0x00004000
+#define BT_VCP_TOP_CENTER 0x00008000
+#define BT_VCP_TOP_BACK_LEFT 0x00010000
+#define BT_VCP_TOP_BACK_RIGHT 0x00020000
+#define BT_VCP_TOP_SIDE_LEFT 0x00040000
+#define BT_VCP_TOP_SIDE_RIGHT 0x00080000
+#define BT_VCP_TOP_BACK_CENTER 0x00100000
+#define BT_VCP_BOTTOM_FRONT_CENTER 0x00200000
+#define BT_VCP_BOTTOM_FRONT_LEFT 0x00400000
+#define BT_VCP_BOTTOM_FRONT_RIGHT 0x00800000
+#define BT_VCP_FRONT_LEFT_WIDE 0x01000000
+#define BT_VCP_FRONT_RIGHT_WIDE 0x02000000
+#define BT_VCP_LEFT_SURROUND 0x04000000
+#define BT_VCP_RIGHT_SURROUND 0x08000000
+
struct bt_vcp_db {
struct gatt_db *db;
struct bt_vcs *vcs;
+ struct bt_vocs *vocs;
};
typedef void (*vcp_func_t)(struct bt_vcp *vcp, bool success, uint8_t att_ecode,
@@ -57,11 +88,21 @@ struct bt_vcs_param {
uint8_t change_counter;
} __packed;
+struct bt_vocs_param {
+ uint8_t op;
+ uint8_t change_counter;
+} __packed;
+
struct bt_vcs_ab_vol {
uint8_t change_counter;
uint8_t vol_set;
} __packed;
+struct bt_vocs_set_vol_off {
+ uint8_t change_counter;
+ uint8_t set_vol_offset;
+} __packed;
+
struct bt_vcp_cb {
unsigned int id;
bt_vcp_func_t attached;
@@ -89,6 +130,10 @@ struct bt_vcp {
unsigned int vstate_id;
unsigned int vflag_id;
+ unsigned int state_id;
+ unsigned int audio_loc_id;
+ unsigned int ao_dec_id;
+
struct queue *notify;
struct queue *pending;
@@ -120,6 +165,27 @@ struct bt_vcs {
struct gatt_db_attribute *vf_ccc;
};
+/* Contains local bt_vcp_db */
+struct vol_offset_state {
+ uint16_t vol_offset;
+ uint8_t counter;
+} __packed;
+
+struct bt_vocs {
+ struct bt_vcp_db *vdb;
+ struct vol_offset_state *vostate;
+ uint32_t vocs_audio_loc;
+ char *vocs_ao_dec;
+ struct gatt_db_attribute *service;
+ struct gatt_db_attribute *vos;
+ struct gatt_db_attribute *vos_ccc;
+ struct gatt_db_attribute *voal;
+ struct gatt_db_attribute *voal_ccc;
+ struct gatt_db_attribute *vo_cp;
+ struct gatt_db_attribute *voaodec;
+ struct gatt_db_attribute *voaodec_ccc;
+};
+
static struct queue *vcp_db;
static struct queue *vcp_cbs;
static struct queue *sessions;
@@ -159,6 +225,17 @@ static struct vol_state *vdb_get_vstate(struct bt_vcp_db *vdb)
return NULL;
}
+static struct vol_offset_state *vdb_get_vostate(struct bt_vcp_db *vdb)
+{
+ if (!vdb->vocs)
+ return NULL;
+
+ if (vdb->vocs->vostate)
+ return vdb->vocs->vostate;
+
+ return NULL;
+}
+
static struct bt_vcs *vcp_get_vcs(struct bt_vcp *vcp)
{
if (!vcp)
@@ -173,6 +250,20 @@ static struct bt_vcs *vcp_get_vcs(struct bt_vcp *vcp)
return vcp->rdb->vcs;
}
+static struct bt_vocs *vcp_get_vocs(struct bt_vcp *vcp)
+{
+ if (!vcp)
+ return NULL;
+
+ if (vcp->rdb->vocs)
+ return vcp->rdb->vocs;
+
+ vcp->rdb->vocs = new0(struct bt_vocs, 1);
+ vcp->rdb->vocs->vdb = vcp->rdb;
+
+ return vcp->rdb->vocs;
+}
+
static void vcp_detached(void *data, void *user_data)
{
struct bt_vcp_cb *cb = data;
@@ -202,6 +293,7 @@ static void vcp_db_free(void *data)
gatt_db_unref(vdb->db);
free(vdb->vcs);
+ free(vdb->vocs);
free(vdb);
}
@@ -583,6 +675,45 @@ static uint8_t vcs_mute(struct bt_vcs *vcs, struct bt_vcp *vcp,
return 0;
}
+static uint8_t vocs_set_vol_offset(struct bt_vocs *vocs, struct bt_vcp *vcp,
+ struct iovec *iov)
+{
+ struct bt_vcp_db *vdb;
+ struct vol_offset_state *vstate;
+ struct bt_vocs_set_vol_off *req;
+
+ DBG(vcp, "Set Volume Offset");
+
+ vdb = vcp_get_vdb(vcp);
+ if (!vdb) {
+ DBG(vcp, "error: VDB not available");
+ return 0;
+ }
+
+ vstate = vdb_get_vostate(vdb);
+ if (!vstate) {
+ DBG(vcp, "error: VSTATE not available");
+ return 0;
+ }
+
+ req = iov_pull_mem(iov, sizeof(*req));
+ if (!req)
+ return 0;
+
+ if (req->change_counter != vstate->counter) {
+ DBG(vcp, "Change Counter Mismatch Volume not decremented!");
+ return BT_ATT_ERROR_INVALID_CHANGE_COUNTER;
+ }
+
+ vstate->vol_offset = req->set_vol_offset;
+ vstate->counter = -~vstate->counter; /*Increment Change Counter*/
+
+ gatt_db_attribute_notify(vdb->vocs->vos, (void *)vstate,
+ sizeof(struct vol_offset_state),
+ bt_vcp_get_att(vcp));
+ return 0;
+}
+
#define BT_VCS_REL_VOL_DOWN 0x00
#define BT_VCS_REL_VOL_UP 0x01
#define BT_VCS_UNMUTE_REL_VOL_DOWN 0x02
@@ -591,6 +722,8 @@ static uint8_t vcs_mute(struct bt_vcs *vcs, struct bt_vcp *vcp,
#define BT_VCS_UNMUTE 0x05
#define BT_VCS_MUTE 0x06
+#define BT_VOCS_SET_VOL_OFFSET 0x01
+
#define VCS_OP(_str, _op, _size, _func) \
{ \
.str = _str, \
@@ -623,6 +756,26 @@ struct vcs_op_handler {
{}
};
+#define VOCS_OP(_str, _op, _size, _func) \
+ { \
+ .str = _str, \
+ .op = _op, \
+ .size = _size, \
+ .func = _func, \
+ }
+
+struct vocs_op_handler {
+ const char *str;
+ uint8_t op;
+ size_t size;
+ uint8_t (*func)(struct bt_vocs *vocs, struct bt_vcp *vcp,
+ struct iovec *iov);
+} vocp_handlers[] = {
+ VOCS_OP("Set Volume Offset", BT_VOCS_SET_VOL_OFFSET,
+ sizeof(uint8_t), vocs_set_vol_offset),
+ {}
+};
+
static void vcs_cp_write(struct gatt_db_attribute *attrib,
unsigned int id, uint16_t offset,
const uint8_t *value, size_t len,
@@ -683,6 +836,66 @@ respond:
gatt_db_attribute_write_result(attrib, id, ret);
}
+static void vocs_cp_write(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ const uint8_t *value, size_t len,
+ uint8_t opcode, struct bt_att *att,
+ void *user_data)
+{
+ struct bt_vocs *vocs = user_data;
+ struct bt_vcp *vcp = vcp_get_session(att, vocs->vdb->db);
+ struct iovec iov = {
+ .iov_base = (void *) value,
+ .iov_len = len,
+ };
+ uint8_t *vcp_op;
+ struct vocs_op_handler *handler;
+ uint8_t ret = BT_ATT_ERROR_REQUEST_NOT_SUPPORTED;
+
+ DBG(vcp, "VOCP Control Point Write");
+
+ if (offset) {
+ DBG(vcp, "invalid offset %d", offset);
+ ret = BT_ATT_ERROR_INVALID_OFFSET;
+ goto respond;
+ }
+
+ if (len < sizeof(*vcp_op)) {
+ DBG(vcp, "invalid len %ld < %ld sizeof(*param)", len,
+ sizeof(*vcp_op));
+ ret = BT_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN;
+ goto respond;
+ }
+
+ vcp_op = iov_pull_mem(&iov, sizeof(*vcp_op));
+
+ for (handler = vocp_handlers; handler && handler->str; handler++) {
+ if (handler->op != *vcp_op)
+ continue;
+
+ if (iov.iov_len < handler->size) {
+ DBG(vcp, "invalid len %ld < %ld handler->size", len,
+ handler->size);
+ ret = BT_ATT_ERROR_OPCODE_NOT_SUPPORTED;
+ goto respond;
+ }
+
+ break;
+ }
+
+ if (handler && handler->str) {
+ DBG(vcp, "%s", handler->str);
+
+ ret = handler->func(vocs, vcp, &iov);
+ } else {
+ DBG(vcp, "Unknown opcode 0x%02x", *vcp_op);
+ ret = BT_ATT_ERROR_OPCODE_NOT_SUPPORTED;
+ }
+
+respond:
+ gatt_db_attribute_write_result(attrib, id, ret);
+}
+
static void vcs_state_read(struct gatt_db_attribute *attrib,
unsigned int id, uint16_t offset,
uint8_t opcode, struct bt_att *att,
@@ -698,6 +911,21 @@ static void vcs_state_read(struct gatt_db_attribute *attrib,
iov.iov_len);
}
+static void vocs_state_read(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ uint8_t opcode, struct bt_att *att,
+ void *user_data)
+{
+ struct bt_vocs *vocs = user_data;
+ struct iovec iov;
+
+ iov.iov_base = vocs->vostate;
+ iov.iov_len = sizeof(*vocs->vostate);
+
+ gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base,
+ iov.iov_len);
+}
+
static void vcs_flag_read(struct gatt_db_attribute *attrib,
unsigned int id, uint16_t offset,
uint8_t opcode, struct bt_att *att,
@@ -713,6 +941,36 @@ static void vcs_flag_read(struct gatt_db_attribute *attrib,
iov.iov_len);
}
+static void vocs_voal_read(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ uint8_t opcode, struct bt_att *att,
+ void *user_data)
+{
+ struct bt_vocs *vocs = user_data;
+ struct iovec iov;
+
+ iov.iov_base = &vocs->vocs_audio_loc;
+ iov.iov_len = sizeof(vocs->vocs_audio_loc);
+
+ gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base,
+ iov.iov_len);
+}
+
+static void vocs_voaodec_read(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ uint8_t opcode, struct bt_att *att,
+ void *user_data)
+{
+ struct bt_vocs *vocs = user_data;
+ struct iovec iov;
+
+ iov.iov_base = &vocs->vocs_ao_dec;
+ iov.iov_len = strlen(vocs->vocs_ao_dec);
+
+ gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base,
+ iov.iov_len);
+}
+
static struct bt_vcs *vcs_new(struct gatt_db *db)
{
struct bt_vcs *vcs;
@@ -771,6 +1029,74 @@ static struct bt_vcs *vcs_new(struct gatt_db *db)
return vcs;
}
+static struct bt_vocs *vocs_new(struct gatt_db *db)
+{
+ struct bt_vocs *vocs;
+ struct vol_offset_state *vostate;
+ bt_uuid_t uuid;
+
+ if (!db)
+ return NULL;
+
+ vocs = new0(struct bt_vocs, 1);
+
+ vostate = new0(struct vol_offset_state, 1);
+
+ vocs->vostate = vostate;
+ vocs->vocs_audio_loc = BT_VCP_FRONT_LEFT;
+ vocs->vocs_ao_dec = "Left Speaker";
+
+ /* Populate DB with VOCS attributes */
+ bt_uuid16_create(&uuid, VOL_OFFSET_CS_UUID);
+ vocs->service = gatt_db_add_service(db, &uuid, true, 9);
+
+ bt_uuid16_create(&uuid, VOCS_STATE_CHAR_UUID);
+ vocs->vos = gatt_db_service_add_characteristic(vocs->service,
+ &uuid,
+ BT_ATT_PERM_READ,
+ BT_GATT_CHRC_PROP_READ |
+ BT_GATT_CHRC_PROP_NOTIFY,
+ vocs_state_read, NULL,
+ vocs);
+
+ vocs->vos_ccc = gatt_db_service_add_ccc(vocs->service,
+ BT_ATT_PERM_READ | BT_ATT_PERM_WRITE);
+
+ bt_uuid16_create(&uuid, VOCS_AUDIO_LOC_CHRC_UUID);
+ vocs->voal = gatt_db_service_add_characteristic(vocs->service,
+ &uuid,
+ BT_ATT_PERM_READ,
+ BT_GATT_CHRC_PROP_READ |
+ BT_GATT_CHRC_PROP_NOTIFY,
+ vocs_voal_read, NULL,
+ vocs);
+
+ vocs->voal_ccc = gatt_db_service_add_ccc(vocs->service,
+ BT_ATT_PERM_READ | BT_ATT_PERM_WRITE);
+
+ bt_uuid16_create(&uuid, VOCS_CP_CHRC_UUID);
+ vocs->vo_cp = gatt_db_service_add_characteristic(vocs->service,
+ &uuid,
+ BT_ATT_PERM_WRITE,
+ BT_GATT_CHRC_PROP_WRITE,
+ NULL, vocs_cp_write,
+ vocs);
+
+ bt_uuid16_create(&uuid, VOCS_AUDIO_OP_DESC_CHAR_UUID);
+ vocs->voaodec = gatt_db_service_add_characteristic(vocs->service,
+ &uuid,
+ BT_ATT_PERM_READ,
+ BT_GATT_CHRC_PROP_READ |
+ BT_GATT_CHRC_PROP_NOTIFY,
+ vocs_voaodec_read, NULL,
+ vocs);
+
+ vocs->voaodec_ccc = gatt_db_service_add_ccc(vocs->service,
+ BT_ATT_PERM_READ | BT_ATT_PERM_WRITE);
+
+ return vocs;
+}
+
static struct bt_vcp_db *vcp_db_new(struct gatt_db *db)
{
struct bt_vcp_db *vdb;
@@ -787,6 +1113,9 @@ static struct bt_vcp_db *vcp_db_new(struct gatt_db *db)
vdb->vcs = vcs_new(db);
vdb->vcs->vdb = vdb;
+ vdb->vocs = vocs_new(db);
+ vdb->vocs->vdb = vdb;
+
queue_push_tail(vcp_db, vdb);
return vdb;
@@ -911,6 +1240,44 @@ static void vcp_vstate_notify(struct bt_vcp *vcp, uint16_t value_handle,
DBG(vcp, "Vol Counter 0x%x", vstate.counter);
}
+static void vcp_voffset_state_notify(struct bt_vcp *vcp, uint16_t value_handle,
+ const uint8_t *value, uint16_t length,
+ void *user_data)
+{
+ struct vol_offset_state vostate;
+
+ memcpy(&vostate, value, sizeof(struct vol_offset_state));
+
+ DBG(vcp, "Vol Offset 0x%x", vostate.vol_offset);
+ DBG(vcp, "Vol Offset Counter 0x%x", vostate.counter);
+}
+
+static void vcp_audio_loc_notify(struct bt_vcp *vcp, uint16_t value_handle,
+ const uint8_t *value, uint16_t length,
+ void *user_data)
+{
+ uint32_t *vocs_audio_loc_n = 0;
+
+ if (value != NULL)
+ memcpy(vocs_audio_loc_n, value, sizeof(uint32_t));
+
+ DBG(vcp, "VOCS Audio Location 0x%x", *vocs_audio_loc_n);
+}
+
+
+static void vcp_audio_descriptor_notify(struct bt_vcp *vcp,
+ uint16_t value_handle,
+ const uint8_t *value,
+ uint16_t length,
+ void *user_data)
+{
+ char vocs_audio_dec_n[256] = {'\0'};
+
+ memcpy(vocs_audio_dec_n, value, length);
+
+ DBG(vcp, "VOCS Audio Descriptor 0x%s", *vocs_audio_dec_n);
+}
+
static void vcp_vflag_notify(struct bt_vcp *vcp, uint16_t value_handle,
const uint8_t *value, uint16_t length,
void *user_data)
@@ -972,6 +1339,86 @@ static void read_vol_state(struct bt_vcp *vcp, bool success, uint8_t att_ecode,
DBG(vcp, "Vol Counter:%x", vs->counter);
}
+static void read_vol_offset_state(struct bt_vcp *vcp, bool success,
+ uint8_t att_ecode,
+ const uint8_t *value, uint16_t length,
+ void *user_data)
+{
+ struct vol_offset_state *vos;
+ struct iovec iov = {
+ .iov_base = (void *) value,
+ .iov_len = length,
+ };
+
+ if (!success) {
+ DBG(vcp, "Unable to read Vol Offset State: error 0x%02x",
+ att_ecode);
+ return;
+ }
+
+ vos = iov_pull_mem(&iov, sizeof(*vos));
+ if (!vos) {
+ DBG(vcp, "Unable to get Vol Offset State");
+ return;
+ }
+
+ DBG(vcp, "Vol Set:%x", vos->vol_offset);
+ DBG(vcp, "Vol Counter:%x", vos->counter);
+}
+
+static void read_vocs_audio_location(struct bt_vcp *vcp, bool success,
+ uint8_t att_ecode,
+ const uint8_t *value, uint16_t length,
+ void *user_data)
+{
+ uint32_t *vocs_audio_loc;
+ struct iovec iov = {
+ .iov_base = (void *) value,
+ .iov_len = length,
+ };
+
+ if (!success) {
+ DBG(vcp, "Unable to read VOCS Audio Location: error 0x%02x",
+ att_ecode);
+ return;
+ }
+
+ vocs_audio_loc = iov_pull_mem(&iov, sizeof(uint32_t));
+ if (!*vocs_audio_loc) {
+ DBG(vcp, "Unable to get VOCS Audio Location");
+ return;
+ }
+
+ DBG(vcp, "VOCS Audio Loc:%x", *vocs_audio_loc);
+}
+
+
+static void read_vocs_audio_descriptor(struct bt_vcp *vcp, bool success,
+ uint8_t att_ecode,
+ const uint8_t *value, uint16_t length,
+ void *user_data)
+{
+ char *vocs_ao_dec_r;
+ struct iovec iov = {
+ .iov_base = (void *) value,
+ .iov_len = length,
+ };
+
+ if (!success) {
+ DBG(vcp, "Unable to read VOCS Audio Descriptor: error 0x%02x",
+ att_ecode);
+ return;
+ }
+
+ vocs_ao_dec_r = iov_pull_mem(&iov, length);
+ if (!*vocs_ao_dec_r) {
+ DBG(vcp, "Unable to get VOCS Audio Descriptor");
+ return;
+ }
+
+ DBG(vcp, "VOCS Audio Descriptor:%s", *vocs_ao_dec_r);
+}
+
static void vcp_pending_destroy(void *data)
{
struct bt_vcp_pending *pending = data;
@@ -1128,6 +1575,90 @@ static void foreach_vcs_char(struct gatt_db_attribute *attr, void *user_data)
}
}
+static void foreach_vocs_char(struct gatt_db_attribute *attr, void *user_data)
+{
+ struct bt_vcp *vcp = user_data;
+ uint16_t value_handle;
+ bt_uuid_t uuid, uuid_vostate, uuid_audio_loc, uuid_vo_cp,
+ uuid_audio_op_decs;
+ struct bt_vocs *vocs;
+
+ if (!gatt_db_attribute_get_char_data(attr, NULL, &value_handle,
+ NULL, NULL, &uuid))
+ return;
+
+ bt_uuid16_create(&uuid_vostate, VOCS_STATE_CHAR_UUID);
+ bt_uuid16_create(&uuid_audio_loc, VOCS_AUDIO_LOC_CHRC_UUID);
+ bt_uuid16_create(&uuid_vo_cp, VOCS_CP_CHRC_UUID);
+ bt_uuid16_create(&uuid_audio_op_decs, VOCS_AUDIO_OP_DESC_CHAR_UUID);
+
+ if (!bt_uuid_cmp(&uuid, &uuid_vostate)) {
+ DBG(vcp, "VOCS Vol state found: handle 0x%04x", value_handle);
+
+ vocs = vcp_get_vocs(vcp);
+ if (!vocs || vocs->vos)
+ return;
+
+ vocs->vos = attr;
+
+ vcp_read_value(vcp, value_handle, read_vol_offset_state, vcp);
+
+ vcp->state_id = vcp_register_notify(vcp, value_handle,
+ vcp_voffset_state_notify, NULL);
+
+ return;
+ }
+
+ if (!bt_uuid_cmp(&uuid, &uuid_audio_loc)) {
+ DBG(vcp, "VOCS Volume Audio Location found: handle 0x%04x",
+ value_handle);
+
+ vocs = vcp_get_vocs(vcp);
+ if (!vocs || vocs->voal)
+ return;
+
+ vocs->voal = attr;
+
+ vcp_read_value(vcp, value_handle, read_vocs_audio_location,
+ vcp);
+
+ vcp->audio_loc_id = vcp_register_notify(vcp, value_handle,
+ vcp_audio_loc_notify, NULL);
+
+ return;
+ }
+
+ if (!bt_uuid_cmp(&uuid, &uuid_vo_cp)) {
+ DBG(vcp, "VOCS Volume CP found: handle 0x%04x", value_handle);
+
+ vocs = vcp_get_vocs(vcp);
+ if (!vocs || vocs->vo_cp)
+ return;
+
+ vocs->vo_cp = attr;
+
+ return;
+ }
+
+ if (!bt_uuid_cmp(&uuid, &uuid_audio_op_decs)) {
+ DBG(vcp, "VOCS Vol Audio Descriptor found: handle 0x%04x",
+ value_handle);
+
+ vocs = vcp_get_vocs(vcp);
+ if (!vocs || vocs->voaodec)
+ return;
+
+ vocs->voaodec = attr;
+
+ vcp_read_value(vcp, value_handle, read_vocs_audio_descriptor,
+ vcp);
+ vcp->ao_dec_id = vcp_register_notify(vcp, value_handle,
+ vcp_audio_descriptor_notify, NULL);
+
+ }
+
+}
+
static void foreach_vcs_service(struct gatt_db_attribute *attr,
void *user_data)
{
@@ -1141,6 +1672,19 @@ static void foreach_vcs_service(struct gatt_db_attribute *attr,
gatt_db_service_foreach_char(attr, foreach_vcs_char, vcp);
}
+static void foreach_vocs_service(struct gatt_db_attribute *attr,
+ void *user_data)
+{
+ struct bt_vcp *vcp = user_data;
+ struct bt_vocs *vocs = vcp_get_vocs(vcp);
+
+ vocs->service = attr;
+
+ gatt_db_service_set_claimed(attr, true);
+
+ gatt_db_service_foreach_char(attr, foreach_vocs_char, vcp);
+}
+
bool bt_vcp_attach(struct bt_vcp *vcp, struct bt_gatt_client *client)
{
bt_uuid_t uuid;
@@ -1163,6 +1707,9 @@ bool bt_vcp_attach(struct bt_vcp *vcp, struct bt_gatt_client *client)
bt_uuid16_create(&uuid, VCS_UUID);
gatt_db_foreach_service(vcp->ldb->db, &uuid, foreach_vcs_service, vcp);
+ bt_uuid16_create(&uuid, VOL_OFFSET_CS_UUID);
+ gatt_db_foreach_service(vcp->ldb->db, &uuid, foreach_vocs_service, vcp);
+
return true;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH BlueZ v3 2/2] Make VOCS (Secondary) as an included service of VCS (Primary)
2023-06-08 12:09 [PATCH BlueZ v3 0/2] Code handling for VOCS service Nitin Jadhav
2023-06-08 12:09 ` [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS Nitin Jadhav
@ 2023-06-08 12:09 ` Nitin Jadhav
1 sibling, 0 replies; 10+ messages in thread
From: Nitin Jadhav @ 2023-06-08 12:09 UTC (permalink / raw)
To: linux-bluetooth
Cc: devyani.godbole, mihai-octavian.urzica, silviu.barbulescu, nitin.jadhav
Fixed the following issue observed during PTS testing
- Specified Upper and Lower Limit for Volume offset
- Corrected the number of handles for VOCS
- VOCS is made as included service of VCS
(VOCS is secondary service and VSC is primary service)
---
v2: Cosmetic Changes (Bluez Test Bot)
v3: No change
---
src/shared/vcp.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/shared/vcp.c b/src/shared/vcp.c
index aa75f498a..e656615cc 100644
--- a/src/shared/vcp.c
+++ b/src/shared/vcp.c
@@ -32,9 +32,13 @@
#define VCP_STEP_SIZE 1
+#define VOCS_VOL_OFFSET_UPPER_LIMIT 255
+#define VOCS_VOL_OFFSET_LOWER_LIMIT -255
+
/* Apllication Error Code */
#define BT_ATT_ERROR_INVALID_CHANGE_COUNTER 0x80
#define BT_ATT_ERROR_OPCODE_NOT_SUPPORTED 0x81
+#define BT_ATT_ERROR_VALUE_OUT_OF_RANGE 0x82
#define BT_VCP_NA 0x00000000
#define BT_VCP_FRONT_LEFT 0x00000001
@@ -100,7 +104,7 @@ struct bt_vcs_ab_vol {
struct bt_vocs_set_vol_off {
uint8_t change_counter;
- uint8_t set_vol_offset;
+ int16_t set_vol_offset;
} __packed;
struct bt_vcp_cb {
@@ -167,7 +171,7 @@ struct bt_vcs {
/* Contains local bt_vcp_db */
struct vol_offset_state {
- uint16_t vol_offset;
+ int16_t vol_offset;
uint8_t counter;
} __packed;
@@ -705,6 +709,11 @@ static uint8_t vocs_set_vol_offset(struct bt_vocs *vocs, struct bt_vcp *vcp,
return BT_ATT_ERROR_INVALID_CHANGE_COUNTER;
}
+ if (req->set_vol_offset > VOCS_VOL_OFFSET_UPPER_LIMIT ||
+ req->set_vol_offset < VOCS_VOL_OFFSET_LOWER_LIMIT) {
+ DBG(vcp, "error: Value Out of Range");
+ return BT_ATT_ERROR_VALUE_OUT_OF_RANGE;
+ }
vstate->vol_offset = req->set_vol_offset;
vstate->counter = -~vstate->counter; /*Increment Change Counter*/
@@ -971,7 +980,7 @@ static void vocs_voaodec_read(struct gatt_db_attribute *attrib,
iov.iov_len);
}
-static struct bt_vcs *vcs_new(struct gatt_db *db)
+static struct bt_vcs *vcs_new(struct gatt_db *db, struct bt_vcp_db *vdb)
{
struct bt_vcs *vcs;
struct vol_state *vstate;
@@ -990,6 +999,8 @@ static struct bt_vcs *vcs_new(struct gatt_db *db)
/* Populate DB with VCS attributes */
bt_uuid16_create(&uuid, VCS_UUID);
vcs->service = gatt_db_add_service(db, &uuid, true, 9);
+ gatt_db_service_add_included(vcs->service, vdb->vocs->service);
+ gatt_db_service_set_active(vdb->vocs->service, true);
bt_uuid16_create(&uuid, VOL_STATE_CHRC_UUID);
vcs->vs = gatt_db_service_add_characteristic(vcs->service,
@@ -1048,7 +1059,8 @@ static struct bt_vocs *vocs_new(struct gatt_db *db)
/* Populate DB with VOCS attributes */
bt_uuid16_create(&uuid, VOL_OFFSET_CS_UUID);
- vocs->service = gatt_db_add_service(db, &uuid, true, 9);
+
+ vocs->service = gatt_db_add_service(db, &uuid, false, 12);
bt_uuid16_create(&uuid, VOCS_STATE_CHAR_UUID);
vocs->vos = gatt_db_service_add_characteristic(vocs->service,
@@ -1110,11 +1122,10 @@ static struct bt_vcp_db *vcp_db_new(struct gatt_db *db)
if (!vcp_db)
vcp_db = queue_new();
- vdb->vcs = vcs_new(db);
- vdb->vcs->vdb = vdb;
-
vdb->vocs = vocs_new(db);
vdb->vocs->vdb = vdb;
+ vdb->vcs = vcs_new(db, vdb);
+ vdb->vcs->vdb = vdb;
queue_push_tail(vcp_db, vdb);
--
2.34.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* RE: Code handling for VOCS service
2023-06-08 12:09 ` [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS Nitin Jadhav
@ 2023-06-08 13:36 ` bluez.test.bot
2023-06-08 16:30 ` Luiz Augusto von Dentz
2023-06-08 16:29 ` [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS Luiz Augusto von Dentz
1 sibling, 1 reply; 10+ messages in thread
From: bluez.test.bot @ 2023-06-08 13:36 UTC (permalink / raw)
To: linux-bluetooth, nitin.jadhav
[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=755311
---Test result---
Test Summary:
CheckPatch PASS 1.56 seconds
GitLint PASS 0.73 seconds
BuildEll PASS 27.18 seconds
BluezMake PASS 872.62 seconds
MakeCheck PASS 12.79 seconds
MakeDistcheck PASS 155.29 seconds
CheckValgrind PASS 255.44 seconds
CheckSmatch PASS 341.24 seconds
bluezmakeextell PASS 102.91 seconds
IncrementalBuild PASS 1436.49 seconds
ScanBuild WARNING 1046.77 seconds
Details
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:
src/shared/vcp.c:1273:3: warning: Null pointer passed to 1st parameter expecting 'nonnull'
memcpy(vocs_audio_loc_n, value, sizeof(uint32_t));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/vcp.c:1275:39: warning: Dereference of null pointer (loaded from variable 'vocs_audio_loc_n')
DBG(vcp, "VOCS Audio Location 0x%x", *vocs_audio_loc_n);
^~~~~~~~~~~~~~~~~
src/shared/vcp.c:31:57: note: expanded from macro 'DBG'
vcp_debug(_vcp, "%s:%s() " fmt, __FILE__, __func__, ## arg)
^~~
2 warnings generated.
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS
2023-06-08 12:09 ` [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS Nitin Jadhav
2023-06-08 13:36 ` Code handling for VOCS service bluez.test.bot
@ 2023-06-08 16:29 ` Luiz Augusto von Dentz
1 sibling, 0 replies; 10+ messages in thread
From: Luiz Augusto von Dentz @ 2023-06-08 16:29 UTC (permalink / raw)
To: Nitin Jadhav
Cc: linux-bluetooth, devyani.godbole, mihai-octavian.urzica,
silviu.barbulescu
Hi Nitin,
On Thu, Jun 8, 2023 at 5:24 AM Nitin Jadhav <nitin.jadhav@nxp.com> wrote:
>
> Summary:
> - This adds implementation for VOCS service and characteristics
> - Implementation based on VOCS_v1.0.pdf specification
> - Tested using PTS with reference to VOCS.TS.p1.pdf
> ---
Note, for the patch subject I usually recommend the following format:
<subdir/file>: <subject>, so in this case shared/vcp: Add initial code
for handling VOCS
> v2: Corrected prefixs and cosmetic changes (Luiz Augusto von Dentz)
> v3: Commit message modified and fixed long line length warning (Paul
> Menzel)
> ---
> lib/uuid.h | 5 +
> src/shared/vcp.c | 547 +++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 552 insertions(+)
>
> diff --git a/lib/uuid.h b/lib/uuid.h
> index 5cdfedb4b..cd3b3655f 100644
> --- a/lib/uuid.h
> +++ b/lib/uuid.h
> @@ -179,6 +179,11 @@ extern "C" {
> #define VOL_CP_CHRC_UUID 0x2B7E
> #define VOL_FLAG_CHRC_UUID 0x2B7F
>
> +#define VOCS_STATE_CHAR_UUID 0x2B80
> +#define VOCS_AUDIO_LOC_CHRC_UUID 0x2B81
> +#define VOCS_CP_CHRC_UUID 0x2B82
> +#define VOCS_AUDIO_OP_DESC_CHAR_UUID 0x2B83
> +
> #define GMCS_UUID 0x1849
> #define MEDIA_PLAYER_NAME_CHRC_UUID 0x2b93
> #define MEDIA_TRACK_CHNGD_CHRC_UUID 0x2b96
Split the uuid.h changes on its own patch.
> diff --git a/src/shared/vcp.c b/src/shared/vcp.c
> index 5459cf892..aa75f498a 100644
> --- a/src/shared/vcp.c
> +++ b/src/shared/vcp.c
> @@ -36,9 +36,40 @@
> #define BT_ATT_ERROR_INVALID_CHANGE_COUNTER 0x80
> #define BT_ATT_ERROR_OPCODE_NOT_SUPPORTED 0x81
>
> +#define BT_VCP_NA 0x00000000
> +#define BT_VCP_FRONT_LEFT 0x00000001
> +#define BT_VCP_FRONT_RIGHT 0x00000002
> +#define BT_VCP_FRONT_CENTER 0x00000004
> +#define BT_VCP_LOW_FRQ_EFF_1 0x00000008
> +#define BT_VCP_BACK_LEFT 0x00000010
> +#define BT_VCP_BACK_RIGHT 0x00000020
> +#define BT_VCP_FRONT_LEFT_CENTER 0x00000040
> +#define BT_VCP_FRONT_RIGHT_CENTER 0x00000080
> +#define BT_VCP_BACK_CENTER 0x00000100
> +#define BT_VCP_LOW_FRQ_EFF_2 0x00000200
> +#define BT_VCP_SIDE_LEFT 0x00000400
> +#define BT_VCP_SIDE_RIGHT 0x00000800
> +#define BT_VCP_TOP_FRONT_LEFT 0x00001000
> +#define BT_VCP_TOP_FRONT_RIGHT 0x00002000
> +#define BT_VCP_TOP_FRONT_CENTER 0x00004000
> +#define BT_VCP_TOP_CENTER 0x00008000
> +#define BT_VCP_TOP_BACK_LEFT 0x00010000
> +#define BT_VCP_TOP_BACK_RIGHT 0x00020000
> +#define BT_VCP_TOP_SIDE_LEFT 0x00040000
> +#define BT_VCP_TOP_SIDE_RIGHT 0x00080000
> +#define BT_VCP_TOP_BACK_CENTER 0x00100000
> +#define BT_VCP_BOTTOM_FRONT_CENTER 0x00200000
> +#define BT_VCP_BOTTOM_FRONT_LEFT 0x00400000
> +#define BT_VCP_BOTTOM_FRONT_RIGHT 0x00800000
> +#define BT_VCP_FRONT_LEFT_WIDE 0x01000000
> +#define BT_VCP_FRONT_RIGHT_WIDE 0x02000000
> +#define BT_VCP_LEFT_SURROUND 0x04000000
> +#define BT_VCP_RIGHT_SURROUND 0x08000000
You should probably use BIT macro to define the above values.
> struct bt_vcp_db {
> struct gatt_db *db;
> struct bt_vcs *vcs;
> + struct bt_vocs *vocs;
> };
>
> typedef void (*vcp_func_t)(struct bt_vcp *vcp, bool success, uint8_t att_ecode,
> @@ -57,11 +88,21 @@ struct bt_vcs_param {
> uint8_t change_counter;
> } __packed;
>
> +struct bt_vocs_param {
> + uint8_t op;
> + uint8_t change_counter;
> +} __packed;
> +
> struct bt_vcs_ab_vol {
> uint8_t change_counter;
> uint8_t vol_set;
> } __packed;
>
> +struct bt_vocs_set_vol_off {
> + uint8_t change_counter;
> + uint8_t set_vol_offset;
> +} __packed;
> +
> struct bt_vcp_cb {
> unsigned int id;
> bt_vcp_func_t attached;
> @@ -89,6 +130,10 @@ struct bt_vcp {
> unsigned int vstate_id;
> unsigned int vflag_id;
>
> + unsigned int state_id;
> + unsigned int audio_loc_id;
> + unsigned int ao_dec_id;
> +
> struct queue *notify;
> struct queue *pending;
>
> @@ -120,6 +165,27 @@ struct bt_vcs {
> struct gatt_db_attribute *vf_ccc;
> };
>
> +/* Contains local bt_vcp_db */
> +struct vol_offset_state {
> + uint16_t vol_offset;
> + uint8_t counter;
> +} __packed;
> +
> +struct bt_vocs {
> + struct bt_vcp_db *vdb;
> + struct vol_offset_state *vostate;
> + uint32_t vocs_audio_loc;
> + char *vocs_ao_dec;
> + struct gatt_db_attribute *service;
> + struct gatt_db_attribute *vos;
> + struct gatt_db_attribute *vos_ccc;
> + struct gatt_db_attribute *voal;
> + struct gatt_db_attribute *voal_ccc;
> + struct gatt_db_attribute *vo_cp;
> + struct gatt_db_attribute *voaodec;
> + struct gatt_db_attribute *voaodec_ccc;
> +};
> +
> static struct queue *vcp_db;
> static struct queue *vcp_cbs;
> static struct queue *sessions;
> @@ -159,6 +225,17 @@ static struct vol_state *vdb_get_vstate(struct bt_vcp_db *vdb)
> return NULL;
> }
>
> +static struct vol_offset_state *vdb_get_vostate(struct bt_vcp_db *vdb)
> +{
> + if (!vdb->vocs)
> + return NULL;
> +
> + if (vdb->vocs->vostate)
> + return vdb->vocs->vostate;
> +
> + return NULL;
> +}
> +
> static struct bt_vcs *vcp_get_vcs(struct bt_vcp *vcp)
> {
> if (!vcp)
> @@ -173,6 +250,20 @@ static struct bt_vcs *vcp_get_vcs(struct bt_vcp *vcp)
> return vcp->rdb->vcs;
> }
>
> +static struct bt_vocs *vcp_get_vocs(struct bt_vcp *vcp)
> +{
> + if (!vcp)
> + return NULL;
> +
> + if (vcp->rdb->vocs)
> + return vcp->rdb->vocs;
> +
> + vcp->rdb->vocs = new0(struct bt_vocs, 1);
> + vcp->rdb->vocs->vdb = vcp->rdb;
> +
> + return vcp->rdb->vocs;
> +}
> +
> static void vcp_detached(void *data, void *user_data)
> {
> struct bt_vcp_cb *cb = data;
> @@ -202,6 +293,7 @@ static void vcp_db_free(void *data)
> gatt_db_unref(vdb->db);
>
> free(vdb->vcs);
> + free(vdb->vocs);
> free(vdb);
> }
>
> @@ -583,6 +675,45 @@ static uint8_t vcs_mute(struct bt_vcs *vcs, struct bt_vcp *vcp,
> return 0;
> }
>
> +static uint8_t vocs_set_vol_offset(struct bt_vocs *vocs, struct bt_vcp *vcp,
> + struct iovec *iov)
> +{
> + struct bt_vcp_db *vdb;
> + struct vol_offset_state *vstate;
> + struct bt_vocs_set_vol_off *req;
> +
> + DBG(vcp, "Set Volume Offset");
> +
> + vdb = vcp_get_vdb(vcp);
> + if (!vdb) {
> + DBG(vcp, "error: VDB not available");
> + return 0;
> + }
> +
> + vstate = vdb_get_vostate(vdb);
> + if (!vstate) {
> + DBG(vcp, "error: VSTATE not available");
> + return 0;
> + }
> +
> + req = iov_pull_mem(iov, sizeof(*req));
> + if (!req)
> + return 0;
> +
> + if (req->change_counter != vstate->counter) {
> + DBG(vcp, "Change Counter Mismatch Volume not decremented!");
> + return BT_ATT_ERROR_INVALID_CHANGE_COUNTER;
> + }
> +
> + vstate->vol_offset = req->set_vol_offset;
> + vstate->counter = -~vstate->counter; /*Increment Change Counter*/
> +
> + gatt_db_attribute_notify(vdb->vocs->vos, (void *)vstate,
> + sizeof(struct vol_offset_state),
> + bt_vcp_get_att(vcp));
> + return 0;
> +}
> +
> #define BT_VCS_REL_VOL_DOWN 0x00
> #define BT_VCS_REL_VOL_UP 0x01
> #define BT_VCS_UNMUTE_REL_VOL_DOWN 0x02
> @@ -591,6 +722,8 @@ static uint8_t vcs_mute(struct bt_vcs *vcs, struct bt_vcp *vcp,
> #define BT_VCS_UNMUTE 0x05
> #define BT_VCS_MUTE 0x06
>
> +#define BT_VOCS_SET_VOL_OFFSET 0x01
> +
> #define VCS_OP(_str, _op, _size, _func) \
> { \
> .str = _str, \
> @@ -623,6 +756,26 @@ struct vcs_op_handler {
> {}
> };
>
> +#define VOCS_OP(_str, _op, _size, _func) \
> + { \
> + .str = _str, \
> + .op = _op, \
> + .size = _size, \
> + .func = _func, \
> + }
> +
> +struct vocs_op_handler {
> + const char *str;
> + uint8_t op;
> + size_t size;
> + uint8_t (*func)(struct bt_vocs *vocs, struct bt_vcp *vcp,
> + struct iovec *iov);
> +} vocp_handlers[] = {
> + VOCS_OP("Set Volume Offset", BT_VOCS_SET_VOL_OFFSET,
> + sizeof(uint8_t), vocs_set_vol_offset),
> + {}
> +};
> +
> static void vcs_cp_write(struct gatt_db_attribute *attrib,
> unsigned int id, uint16_t offset,
> const uint8_t *value, size_t len,
> @@ -683,6 +836,66 @@ respond:
> gatt_db_attribute_write_result(attrib, id, ret);
> }
>
> +static void vocs_cp_write(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + const uint8_t *value, size_t len,
> + uint8_t opcode, struct bt_att *att,
> + void *user_data)
> +{
> + struct bt_vocs *vocs = user_data;
> + struct bt_vcp *vcp = vcp_get_session(att, vocs->vdb->db);
> + struct iovec iov = {
> + .iov_base = (void *) value,
> + .iov_len = len,
> + };
> + uint8_t *vcp_op;
> + struct vocs_op_handler *handler;
> + uint8_t ret = BT_ATT_ERROR_REQUEST_NOT_SUPPORTED;
> +
> + DBG(vcp, "VOCP Control Point Write");
> +
> + if (offset) {
> + DBG(vcp, "invalid offset %d", offset);
> + ret = BT_ATT_ERROR_INVALID_OFFSET;
> + goto respond;
> + }
> +
> + if (len < sizeof(*vcp_op)) {
> + DBG(vcp, "invalid len %ld < %ld sizeof(*param)", len,
> + sizeof(*vcp_op));
> + ret = BT_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN;
> + goto respond;
> + }
> +
> + vcp_op = iov_pull_mem(&iov, sizeof(*vcp_op));
> +
> + for (handler = vocp_handlers; handler && handler->str; handler++) {
> + if (handler->op != *vcp_op)
> + continue;
> +
> + if (iov.iov_len < handler->size) {
> + DBG(vcp, "invalid len %ld < %ld handler->size", len,
> + handler->size);
> + ret = BT_ATT_ERROR_OPCODE_NOT_SUPPORTED;
> + goto respond;
> + }
> +
> + break;
> + }
> +
> + if (handler && handler->str) {
> + DBG(vcp, "%s", handler->str);
> +
> + ret = handler->func(vocs, vcp, &iov);
> + } else {
> + DBG(vcp, "Unknown opcode 0x%02x", *vcp_op);
> + ret = BT_ATT_ERROR_OPCODE_NOT_SUPPORTED;
> + }
> +
> +respond:
> + gatt_db_attribute_write_result(attrib, id, ret);
> +}
> +
> static void vcs_state_read(struct gatt_db_attribute *attrib,
> unsigned int id, uint16_t offset,
> uint8_t opcode, struct bt_att *att,
> @@ -698,6 +911,21 @@ static void vcs_state_read(struct gatt_db_attribute *attrib,
> iov.iov_len);
> }
>
> +static void vocs_state_read(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + uint8_t opcode, struct bt_att *att,
> + void *user_data)
> +{
> + struct bt_vocs *vocs = user_data;
> + struct iovec iov;
> +
> + iov.iov_base = vocs->vostate;
> + iov.iov_len = sizeof(*vocs->vostate);
> +
> + gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base,
> + iov.iov_len);
> +}
> +
> static void vcs_flag_read(struct gatt_db_attribute *attrib,
> unsigned int id, uint16_t offset,
> uint8_t opcode, struct bt_att *att,
> @@ -713,6 +941,36 @@ static void vcs_flag_read(struct gatt_db_attribute *attrib,
> iov.iov_len);
> }
>
> +static void vocs_voal_read(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + uint8_t opcode, struct bt_att *att,
> + void *user_data)
> +{
> + struct bt_vocs *vocs = user_data;
> + struct iovec iov;
> +
> + iov.iov_base = &vocs->vocs_audio_loc;
> + iov.iov_len = sizeof(vocs->vocs_audio_loc);
> +
> + gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base,
> + iov.iov_len);
> +}
> +
> +static void vocs_voaodec_read(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + uint8_t opcode, struct bt_att *att,
> + void *user_data)
> +{
> + struct bt_vocs *vocs = user_data;
> + struct iovec iov;
> +
> + iov.iov_base = &vocs->vocs_ao_dec;
> + iov.iov_len = strlen(vocs->vocs_ao_dec);
> +
> + gatt_db_attribute_read_result(attrib, id, 0, iov.iov_base,
> + iov.iov_len);
> +}
> +
> static struct bt_vcs *vcs_new(struct gatt_db *db)
> {
> struct bt_vcs *vcs;
> @@ -771,6 +1029,74 @@ static struct bt_vcs *vcs_new(struct gatt_db *db)
> return vcs;
> }
>
> +static struct bt_vocs *vocs_new(struct gatt_db *db)
> +{
> + struct bt_vocs *vocs;
> + struct vol_offset_state *vostate;
> + bt_uuid_t uuid;
> +
> + if (!db)
> + return NULL;
> +
> + vocs = new0(struct bt_vocs, 1);
> +
> + vostate = new0(struct vol_offset_state, 1);
> +
> + vocs->vostate = vostate;
> + vocs->vocs_audio_loc = BT_VCP_FRONT_LEFT;
> + vocs->vocs_ao_dec = "Left Speaker";
> +
> + /* Populate DB with VOCS attributes */
> + bt_uuid16_create(&uuid, VOL_OFFSET_CS_UUID);
> + vocs->service = gatt_db_add_service(db, &uuid, true, 9);
> +
> + bt_uuid16_create(&uuid, VOCS_STATE_CHAR_UUID);
> + vocs->vos = gatt_db_service_add_characteristic(vocs->service,
> + &uuid,
> + BT_ATT_PERM_READ,
> + BT_GATT_CHRC_PROP_READ |
> + BT_GATT_CHRC_PROP_NOTIFY,
> + vocs_state_read, NULL,
> + vocs);
> +
> + vocs->vos_ccc = gatt_db_service_add_ccc(vocs->service,
> + BT_ATT_PERM_READ | BT_ATT_PERM_WRITE);
> +
> + bt_uuid16_create(&uuid, VOCS_AUDIO_LOC_CHRC_UUID);
> + vocs->voal = gatt_db_service_add_characteristic(vocs->service,
> + &uuid,
> + BT_ATT_PERM_READ,
> + BT_GATT_CHRC_PROP_READ |
> + BT_GATT_CHRC_PROP_NOTIFY,
> + vocs_voal_read, NULL,
> + vocs);
> +
> + vocs->voal_ccc = gatt_db_service_add_ccc(vocs->service,
> + BT_ATT_PERM_READ | BT_ATT_PERM_WRITE);
> +
> + bt_uuid16_create(&uuid, VOCS_CP_CHRC_UUID);
> + vocs->vo_cp = gatt_db_service_add_characteristic(vocs->service,
> + &uuid,
> + BT_ATT_PERM_WRITE,
> + BT_GATT_CHRC_PROP_WRITE,
> + NULL, vocs_cp_write,
> + vocs);
> +
> + bt_uuid16_create(&uuid, VOCS_AUDIO_OP_DESC_CHAR_UUID);
> + vocs->voaodec = gatt_db_service_add_characteristic(vocs->service,
> + &uuid,
> + BT_ATT_PERM_READ,
> + BT_GATT_CHRC_PROP_READ |
> + BT_GATT_CHRC_PROP_NOTIFY,
> + vocs_voaodec_read, NULL,
> + vocs);
> +
> + vocs->voaodec_ccc = gatt_db_service_add_ccc(vocs->service,
> + BT_ATT_PERM_READ | BT_ATT_PERM_WRITE);
> +
> + return vocs;
> +}
> +
> static struct bt_vcp_db *vcp_db_new(struct gatt_db *db)
> {
> struct bt_vcp_db *vdb;
> @@ -787,6 +1113,9 @@ static struct bt_vcp_db *vcp_db_new(struct gatt_db *db)
> vdb->vcs = vcs_new(db);
> vdb->vcs->vdb = vdb;
>
> + vdb->vocs = vocs_new(db);
> + vdb->vocs->vdb = vdb;
> +
> queue_push_tail(vcp_db, vdb);
>
> return vdb;
> @@ -911,6 +1240,44 @@ static void vcp_vstate_notify(struct bt_vcp *vcp, uint16_t value_handle,
> DBG(vcp, "Vol Counter 0x%x", vstate.counter);
> }
>
> +static void vcp_voffset_state_notify(struct bt_vcp *vcp, uint16_t value_handle,
> + const uint8_t *value, uint16_t length,
> + void *user_data)
> +{
> + struct vol_offset_state vostate;
> +
> + memcpy(&vostate, value, sizeof(struct vol_offset_state));
> +
> + DBG(vcp, "Vol Offset 0x%x", vostate.vol_offset);
> + DBG(vcp, "Vol Offset Counter 0x%x", vostate.counter);
> +}
> +
> +static void vcp_audio_loc_notify(struct bt_vcp *vcp, uint16_t value_handle,
> + const uint8_t *value, uint16_t length,
> + void *user_data)
> +{
> + uint32_t *vocs_audio_loc_n = 0;
> +
> + if (value != NULL)
> + memcpy(vocs_audio_loc_n, value, sizeof(uint32_t));
> +
> + DBG(vcp, "VOCS Audio Location 0x%x", *vocs_audio_loc_n);
> +}
> +
> +
> +static void vcp_audio_descriptor_notify(struct bt_vcp *vcp,
> + uint16_t value_handle,
> + const uint8_t *value,
> + uint16_t length,
> + void *user_data)
> +{
> + char vocs_audio_dec_n[256] = {'\0'};
> +
> + memcpy(vocs_audio_dec_n, value, length);
> +
> + DBG(vcp, "VOCS Audio Descriptor 0x%s", *vocs_audio_dec_n);
> +}
> +
> static void vcp_vflag_notify(struct bt_vcp *vcp, uint16_t value_handle,
> const uint8_t *value, uint16_t length,
> void *user_data)
> @@ -972,6 +1339,86 @@ static void read_vol_state(struct bt_vcp *vcp, bool success, uint8_t att_ecode,
> DBG(vcp, "Vol Counter:%x", vs->counter);
> }
>
> +static void read_vol_offset_state(struct bt_vcp *vcp, bool success,
> + uint8_t att_ecode,
> + const uint8_t *value, uint16_t length,
> + void *user_data)
> +{
> + struct vol_offset_state *vos;
> + struct iovec iov = {
> + .iov_base = (void *) value,
> + .iov_len = length,
> + };
> +
> + if (!success) {
> + DBG(vcp, "Unable to read Vol Offset State: error 0x%02x",
> + att_ecode);
> + return;
> + }
> +
> + vos = iov_pull_mem(&iov, sizeof(*vos));
> + if (!vos) {
> + DBG(vcp, "Unable to get Vol Offset State");
> + return;
> + }
> +
> + DBG(vcp, "Vol Set:%x", vos->vol_offset);
> + DBG(vcp, "Vol Counter:%x", vos->counter);
> +}
> +
> +static void read_vocs_audio_location(struct bt_vcp *vcp, bool success,
> + uint8_t att_ecode,
> + const uint8_t *value, uint16_t length,
> + void *user_data)
> +{
> + uint32_t *vocs_audio_loc;
> + struct iovec iov = {
> + .iov_base = (void *) value,
> + .iov_len = length,
> + };
> +
> + if (!success) {
> + DBG(vcp, "Unable to read VOCS Audio Location: error 0x%02x",
> + att_ecode);
> + return;
> + }
> +
> + vocs_audio_loc = iov_pull_mem(&iov, sizeof(uint32_t));
> + if (!*vocs_audio_loc) {
> + DBG(vcp, "Unable to get VOCS Audio Location");
> + return;
> + }
> +
> + DBG(vcp, "VOCS Audio Loc:%x", *vocs_audio_loc);
> +}
> +
> +
> +static void read_vocs_audio_descriptor(struct bt_vcp *vcp, bool success,
> + uint8_t att_ecode,
> + const uint8_t *value, uint16_t length,
> + void *user_data)
> +{
> + char *vocs_ao_dec_r;
> + struct iovec iov = {
> + .iov_base = (void *) value,
> + .iov_len = length,
> + };
> +
> + if (!success) {
> + DBG(vcp, "Unable to read VOCS Audio Descriptor: error 0x%02x",
> + att_ecode);
> + return;
> + }
> +
> + vocs_ao_dec_r = iov_pull_mem(&iov, length);
> + if (!*vocs_ao_dec_r) {
> + DBG(vcp, "Unable to get VOCS Audio Descriptor");
> + return;
> + }
> +
> + DBG(vcp, "VOCS Audio Descriptor:%s", *vocs_ao_dec_r);
> +}
> +
> static void vcp_pending_destroy(void *data)
> {
> struct bt_vcp_pending *pending = data;
> @@ -1128,6 +1575,90 @@ static void foreach_vcs_char(struct gatt_db_attribute *attr, void *user_data)
> }
> }
>
> +static void foreach_vocs_char(struct gatt_db_attribute *attr, void *user_data)
> +{
> + struct bt_vcp *vcp = user_data;
> + uint16_t value_handle;
> + bt_uuid_t uuid, uuid_vostate, uuid_audio_loc, uuid_vo_cp,
> + uuid_audio_op_decs;
> + struct bt_vocs *vocs;
> +
> + if (!gatt_db_attribute_get_char_data(attr, NULL, &value_handle,
> + NULL, NULL, &uuid))
> + return;
> +
> + bt_uuid16_create(&uuid_vostate, VOCS_STATE_CHAR_UUID);
> + bt_uuid16_create(&uuid_audio_loc, VOCS_AUDIO_LOC_CHRC_UUID);
> + bt_uuid16_create(&uuid_vo_cp, VOCS_CP_CHRC_UUID);
> + bt_uuid16_create(&uuid_audio_op_decs, VOCS_AUDIO_OP_DESC_CHAR_UUID);
> +
> + if (!bt_uuid_cmp(&uuid, &uuid_vostate)) {
> + DBG(vcp, "VOCS Vol state found: handle 0x%04x", value_handle);
> +
> + vocs = vcp_get_vocs(vcp);
> + if (!vocs || vocs->vos)
> + return;
> +
> + vocs->vos = attr;
> +
> + vcp_read_value(vcp, value_handle, read_vol_offset_state, vcp);
> +
> + vcp->state_id = vcp_register_notify(vcp, value_handle,
> + vcp_voffset_state_notify, NULL);
> +
> + return;
> + }
> +
> + if (!bt_uuid_cmp(&uuid, &uuid_audio_loc)) {
> + DBG(vcp, "VOCS Volume Audio Location found: handle 0x%04x",
> + value_handle);
> +
> + vocs = vcp_get_vocs(vcp);
> + if (!vocs || vocs->voal)
> + return;
> +
> + vocs->voal = attr;
> +
> + vcp_read_value(vcp, value_handle, read_vocs_audio_location,
> + vcp);
> +
> + vcp->audio_loc_id = vcp_register_notify(vcp, value_handle,
> + vcp_audio_loc_notify, NULL);
> +
> + return;
> + }
> +
> + if (!bt_uuid_cmp(&uuid, &uuid_vo_cp)) {
> + DBG(vcp, "VOCS Volume CP found: handle 0x%04x", value_handle);
> +
> + vocs = vcp_get_vocs(vcp);
> + if (!vocs || vocs->vo_cp)
> + return;
> +
> + vocs->vo_cp = attr;
> +
> + return;
> + }
> +
> + if (!bt_uuid_cmp(&uuid, &uuid_audio_op_decs)) {
> + DBG(vcp, "VOCS Vol Audio Descriptor found: handle 0x%04x",
> + value_handle);
> +
> + vocs = vcp_get_vocs(vcp);
> + if (!vocs || vocs->voaodec)
> + return;
> +
> + vocs->voaodec = attr;
> +
> + vcp_read_value(vcp, value_handle, read_vocs_audio_descriptor,
> + vcp);
> + vcp->ao_dec_id = vcp_register_notify(vcp, value_handle,
> + vcp_audio_descriptor_notify, NULL);
> +
> + }
> +
> +}
> +
> static void foreach_vcs_service(struct gatt_db_attribute *attr,
> void *user_data)
> {
> @@ -1141,6 +1672,19 @@ static void foreach_vcs_service(struct gatt_db_attribute *attr,
> gatt_db_service_foreach_char(attr, foreach_vcs_char, vcp);
> }
>
> +static void foreach_vocs_service(struct gatt_db_attribute *attr,
> + void *user_data)
> +{
> + struct bt_vcp *vcp = user_data;
> + struct bt_vocs *vocs = vcp_get_vocs(vcp);
> +
> + vocs->service = attr;
> +
> + gatt_db_service_set_claimed(attr, true);
> +
> + gatt_db_service_foreach_char(attr, foreach_vocs_char, vcp);
> +}
> +
> bool bt_vcp_attach(struct bt_vcp *vcp, struct bt_gatt_client *client)
> {
> bt_uuid_t uuid;
> @@ -1163,6 +1707,9 @@ bool bt_vcp_attach(struct bt_vcp *vcp, struct bt_gatt_client *client)
> bt_uuid16_create(&uuid, VCS_UUID);
> gatt_db_foreach_service(vcp->ldb->db, &uuid, foreach_vcs_service, vcp);
>
> + bt_uuid16_create(&uuid, VOL_OFFSET_CS_UUID);
> + gatt_db_foreach_service(vcp->ldb->db, &uuid, foreach_vocs_service, vcp);
> +
> return true;
> }
>
> --
> 2.34.1
>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Code handling for VOCS service
2023-06-08 13:36 ` Code handling for VOCS service bluez.test.bot
@ 2023-06-08 16:30 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 10+ messages in thread
From: Luiz Augusto von Dentz @ 2023-06-08 16:30 UTC (permalink / raw)
To: linux-bluetooth; +Cc: nitin.jadhav
Hi Nitin,
On Thu, Jun 8, 2023 at 6:47 AM <bluez.test.bot@gmail.com> wrote:
>
> This is automated email and please do not reply to this email!
>
> Dear submitter,
>
> Thank you for submitting the patches to the linux bluetooth mailing list.
> This is a CI test results with your patch series:
> PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=755311
>
> ---Test result---
>
> Test Summary:
> CheckPatch PASS 1.56 seconds
> GitLint PASS 0.73 seconds
> BuildEll PASS 27.18 seconds
> BluezMake PASS 872.62 seconds
> MakeCheck PASS 12.79 seconds
> MakeDistcheck PASS 155.29 seconds
> CheckValgrind PASS 255.44 seconds
> CheckSmatch PASS 341.24 seconds
> bluezmakeextell PASS 102.91 seconds
> IncrementalBuild PASS 1436.49 seconds
> ScanBuild WARNING 1046.77 seconds
>
> Details
> ##############################
> Test: ScanBuild - WARNING
> Desc: Run Scan Build
> Output:
> src/shared/vcp.c:1273:3: warning: Null pointer passed to 1st parameter expecting 'nonnull'
> memcpy(vocs_audio_loc_n, value, sizeof(uint32_t));
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> src/shared/vcp.c:1275:39: warning: Dereference of null pointer (loaded from variable 'vocs_audio_loc_n')
> DBG(vcp, "VOCS Audio Location 0x%x", *vocs_audio_loc_n);
> ^~~~~~~~~~~~~~~~~
> src/shared/vcp.c:31:57: note: expanded from macro 'DBG'
> vcp_debug(_vcp, "%s:%s() " fmt, __FILE__, __func__, ## arg)
> ^~~
> 2 warnings generated.
Please have a look at these warnings.
>
>
> ---
> Regards,
> Linux Bluetooth
>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: Code handling for VOCS service
2023-06-12 13:32 [PATCH BlueZ v5 1/3] lib/uuid.h: Add VOCS characteristic uuid(s) Nitin Jadhav
@ 2023-06-12 15:34 ` bluez.test.bot
0 siblings, 0 replies; 10+ messages in thread
From: bluez.test.bot @ 2023-06-12 15:34 UTC (permalink / raw)
To: linux-bluetooth, nitin.jadhav
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=756305
---Test result---
Test Summary:
CheckPatch PASS 2.06 seconds
GitLint PASS 1.07 seconds
BuildEll PASS 27.19 seconds
BluezMake PASS 832.60 seconds
MakeCheck PASS 12.59 seconds
MakeDistcheck PASS 155.45 seconds
CheckValgrind PASS 255.24 seconds
CheckSmatch PASS 341.05 seconds
bluezmakeextell PASS 103.39 seconds
IncrementalBuild PASS 2068.15 seconds
ScanBuild PASS 1044.52 seconds
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: Code handling for VOCS service
2023-06-09 9:42 [PATCH BlueZ v4 1/3] lib/uuid.h: Add VOCS characteristic uuid(s) Nitin Jadhav
@ 2023-06-09 11:33 ` bluez.test.bot
0 siblings, 0 replies; 10+ messages in thread
From: bluez.test.bot @ 2023-06-09 11:33 UTC (permalink / raw)
To: linux-bluetooth, nitin.jadhav
[-- Attachment #1: Type: text/plain, Size: 3051 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=755637
---Test result---
Test Summary:
CheckPatch FAIL 1.80 seconds
GitLint FAIL 1.07 seconds
BuildEll PASS 26.82 seconds
BluezMake PASS 800.72 seconds
MakeCheck PASS 11.56 seconds
MakeDistcheck PASS 156.44 seconds
CheckValgrind PASS 251.76 seconds
CheckSmatch PASS 338.54 seconds
bluezmakeextell PASS 102.96 seconds
IncrementalBuild PASS 1994.60 seconds
ScanBuild WARNING 1038.67 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v4,2/3] shared/vcp: Add initial code for handling VOCS
WARNING:ONE_SEMICOLON: Statements terminations use 1 semicolon
#577: FILE: src/shared/vcp.c:1259:
+ uint32_t *vocs_audio_loc_n = malloc(sizeof(uint32_t));;
/github/workspace/src/src/13273599.patch total: 0 errors, 1 warnings, 677 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13273599.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[BlueZ,v4,3/3] shared/vcp.c: Make VOCS (Secondary) as an included service of VCS (Primary)
WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
1: T1 Title exceeds max length (90>80): "[BlueZ,v4,3/3] shared/vcp.c: Make VOCS (Secondary) as an included service of VCS (Primary)"
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:
src/shared/vcp.c:1275:2: warning: 5th function call argument is an uninitialized value
DBG(vcp, "VOCS Audio Location 0x%x", *vocs_audio_loc_n);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/vcp.c:31:2: note: expanded from macro 'DBG'
vcp_debug(_vcp, "%s:%s() " fmt, __FILE__, __func__, ## arg)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: Code handling for VOCS service
2023-06-07 12:13 [PATCH BlueZ v2 1/2] Added initial code for handling VOCS Nitin Jadhav
@ 2023-06-07 13:37 ` bluez.test.bot
0 siblings, 0 replies; 10+ messages in thread
From: bluez.test.bot @ 2023-06-07 13:37 UTC (permalink / raw)
To: linux-bluetooth, nitin.jadhav
[-- Attachment #1: Type: text/plain, Size: 3713 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=754867
---Test result---
Test Summary:
CheckPatch FAIL 1.74 seconds
GitLint PASS 0.72 seconds
BuildEll PASS 27.11 seconds
BluezMake PASS 863.57 seconds
MakeCheck PASS 12.34 seconds
MakeDistcheck PASS 154.02 seconds
CheckValgrind PASS 255.60 seconds
CheckSmatch PASS 340.33 seconds
bluezmakeextell PASS 102.67 seconds
IncrementalBuild PASS 1417.56 seconds
ScanBuild WARNING 1055.29 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v2,1/2] Added initial code for handling VOCS
WARNING:LONG_LINE: line length of 93 exceeds 80 columns
#596: FILE: src/shared/vcp.c:1268:
+ uint16_t value_handle, const uint8_t *value, uint16_t length,
WARNING:LONG_LINE: line length of 89 exceeds 80 columns
#614: FILE: src/shared/vcp.c:1340:
+ uint8_t att_ecode, const uint8_t *value, uint16_t length,
WARNING:LONG_LINE: line length of 85 exceeds 80 columns
#624: FILE: src/shared/vcp.c:1350:
+ DBG(vcp, "Unable to read Vol Offset State: error 0x%02x", att_ecode);
WARNING:LONG_LINE: line length of 89 exceeds 80 columns
#639: FILE: src/shared/vcp.c:1365:
+ uint8_t att_ecode, const uint8_t *value, uint16_t length,
WARNING:LONG_LINE: line length of 88 exceeds 80 columns
#649: FILE: src/shared/vcp.c:1375:
+ DBG(vcp, "Unable to read VOCS Audio Location: error 0x%02x", att_ecode);
WARNING:LONG_LINE: line length of 89 exceeds 80 columns
#664: FILE: src/shared/vcp.c:1390:
+ uint8_t att_ecode, const uint8_t *value, uint16_t length,
WARNING:LONG_LINE: line length of 85 exceeds 80 columns
#724: FILE: src/shared/vcp.c:1599:
+ vcp_voffset_state_notify, NULL);
WARNING:LONG_LINE: line length of 81 exceeds 80 columns
#739: FILE: src/shared/vcp.c:1614:
+ vcp_read_value(vcp, value_handle, read_vocs_audio_location, vcp);
WARNING:LONG_LINE: line length of 81 exceeds 80 columns
#742: FILE: src/shared/vcp.c:1617:
+ vcp_audio_loc_notify, NULL);
WARNING:LONG_LINE: line length of 83 exceeds 80 columns
#769: FILE: src/shared/vcp.c:1644:
+ vcp_read_value(vcp, value_handle, read_vocs_audio_descriptor, vcp);
WARNING:LONG_LINE: line length of 87 exceeds 80 columns
#771: FILE: src/shared/vcp.c:1646:
+ vcp_audio_descriptor_notify, NULL);
/github/workspace/src/src/13270609.patch total: 0 errors, 11 warnings, 676 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13270609.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:
src/shared/vcp.c:1272:2: warning: Null pointer passed to 1st parameter expecting 'nonnull'
memcpy(vocs_audio_loc_n, value, sizeof(uint32_t));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 10+ messages in thread
* RE: Code handling for VOCS service
2023-06-06 12:08 [PATCH BlueZ v1 1/2] Added initial code for handling VOCS NJNXP
@ 2023-06-06 13:31 ` bluez.test.bot
0 siblings, 0 replies; 10+ messages in thread
From: bluez.test.bot @ 2023-06-06 13:31 UTC (permalink / raw)
To: linux-bluetooth, nitin.jadhav
[-- Attachment #1: Type: text/plain, Size: 7499 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=754428
---Test result---
Test Summary:
CheckPatch FAIL 1.73 seconds
GitLint FAIL 0.91 seconds
BuildEll PASS 26.19 seconds
BluezMake PASS 755.55 seconds
MakeCheck PASS 11.55 seconds
MakeDistcheck PASS 152.47 seconds
CheckValgrind PASS 246.78 seconds
CheckSmatch PASS 330.82 seconds
bluezmakeextell PASS 99.84 seconds
IncrementalBuild PASS 1273.46 seconds
ScanBuild WARNING 986.70 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v1,1/2] Added initial code for handling VOCS
WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#97:
This commit handles the code implementation of VOCS service and characteristics
ERROR:TRAILING_WHITESPACE: trailing whitespace
#528: FILE: src/shared/vcp.c:1076:
+^I$
WARNING:LONG_LINE: line length of 82 exceeds 80 columns
#593: FILE: src/shared/vcp.c:1267:
+static void vcp_audio_descriptor_notify(struct bt_vcp *vcp, uint16_t value_handle,
WARNING:LONG_LINE: line length of 86 exceeds 80 columns
#611: FILE: src/shared/vcp.c:1339:
+static void read_vol_offset_state(struct bt_vcp *vcp, bool success, uint8_t att_ecode,
WARNING:LONG_LINE: line length of 85 exceeds 80 columns
#622: FILE: src/shared/vcp.c:1350:
+ DBG(vcp, "Unable to read Vol Offset State: error 0x%02x", att_ecode);
WARNING:LONG_LINE: line length of 89 exceeds 80 columns
#636: FILE: src/shared/vcp.c:1364:
+static void read_vocs_audio_location(struct bt_vcp *vcp, bool success, uint8_t att_ecode,
WARNING:LONG_LINE: line length of 88 exceeds 80 columns
#647: FILE: src/shared/vcp.c:1375:
+ DBG(vcp, "Unable to read VOCS Audio Location: error 0x%02x", att_ecode);
WARNING:LONG_LINE: line length of 91 exceeds 80 columns
#661: FILE: src/shared/vcp.c:1389:
+static void read_vocs_audio_descriptor(struct bt_vcp *vcp, bool success, uint8_t att_ecode,
WARNING:LONG_LINE: line length of 90 exceeds 80 columns
#672: FILE: src/shared/vcp.c:1400:
+ DBG(vcp, "Unable to read VOCS Audio Descriptor: error 0x%02x", att_ecode);
WARNING:LONG_LINE: line length of 85 exceeds 80 columns
#696: FILE: src/shared/vcp.c:1573:
+ bt_uuid_t uuid, uuid_vostate, uuid_audio_loc, uuid_vo_cp, uuid_audio_op_decs;
WARNING:LONG_LINE: line length of 85 exceeds 80 columns
#720: FILE: src/shared/vcp.c:1597:
+ vcp_voffset_state_notify, NULL);
WARNING:LONG_LINE: line length of 90 exceeds 80 columns
#726: FILE: src/shared/vcp.c:1603:
+ DBG(vcp, "VOCS Volume Audio Location found: handle 0x%04x", value_handle);
ERROR:TRAILING_WHITESPACE: trailing whitespace
#729: FILE: src/shared/vcp.c:1606:
+^I^Iif (!vocs || vocs->voal) $
WARNING:LONG_LINE: line length of 81 exceeds 80 columns
#734: FILE: src/shared/vcp.c:1611:
+ vcp_read_value(vcp, value_handle, read_vocs_audio_location, vcp);
WARNING:LONG_LINE: line length of 81 exceeds 80 columns
#737: FILE: src/shared/vcp.c:1614:
+ vcp_audio_loc_notify, NULL);
WARNING:LONG_LINE: line length of 89 exceeds 80 columns
#755: FILE: src/shared/vcp.c:1632:
+ DBG(vcp, "VOCS Vol Audio Descriptor found: handle 0x%04x", value_handle);
WARNING:LONG_LINE: line length of 83 exceeds 80 columns
#763: FILE: src/shared/vcp.c:1640:
+ vcp_read_value(vcp, value_handle, read_vocs_audio_descriptor, vcp);
WARNING:LONG_LINE: line length of 87 exceeds 80 columns
#765: FILE: src/shared/vcp.c:1642:
+ vcp_audio_descriptor_notify, NULL);
/github/workspace/src/src/13269044.patch total: 2 errors, 16 warnings, 672 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
NOTE: Whitespace errors detected.
You may wish to use scripts/cleanpatch or scripts/cleanfile
/github/workspace/src/src/13269044.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
[BlueZ,v1,2/2] Fixed the following issue observed during PTS testing for mandatory test cases - Specified Upper and Lower Limit for Volume offset - Corrected the number of handles for VOCS - VOCS is made as included service of VCS because VOCS is secondar
WARNING:LEADING_SPACE: please, no spaces at the start of a line
#137: FILE: src/shared/vcp.c:174:
+ int16_t vol_offset;$
WARNING:LEADING_SPACE: please, no spaces at the start of a line
#138: FILE: src/shared/vcp.c:175:
+ uint8_t counter;$
WARNING:LONG_LINE: line length of 116 exceeds 80 columns
#146: FILE: src/shared/vcp.c:712:
+ if(req->set_vol_offset > VOCS_VOL_OFFSET_UPPER_LIMIT || req->set_vol_offset < VOCS_VOL_OFFSET_LOWER_LIMIT) {
ERROR:SPACING: space required before the open parenthesis '('
#146: FILE: src/shared/vcp.c:712:
+ if(req->set_vol_offset > VOCS_VOL_OFFSET_UPPER_LIMIT || req->set_vol_offset < VOCS_VOL_OFFSET_LOWER_LIMIT) {
/github/workspace/src/src/13269045.patch total: 1 errors, 3 warnings, 79 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13269045.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[BlueZ,v1,2/2] Fixed the following issue observed during PTS testing for mandatory test cases - Specified Upper and Lower Limit for Volume offset - Corrected the number of handles for VOCS - VOCS is made as included service of VCS because VOCS is secondar
WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
1: T1 Title exceeds max length (255>80): "[BlueZ,v1,2/2] Fixed the following issue observed during PTS testing for mandatory test cases - Specified Upper and Lower Limit for Volume offset - Corrected the number of handles for VOCS - VOCS is made as included service of VCS because VOCS is secondar"
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:
src/shared/vcp.c:1271:2: warning: Null pointer passed to 1st parameter expecting 'nonnull'
memcpy(vocs_audio_loc_n, value, sizeof(uint32_t));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-06-12 15:34 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-08 12:09 [PATCH BlueZ v3 0/2] Code handling for VOCS service Nitin Jadhav
2023-06-08 12:09 ` [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS Nitin Jadhav
2023-06-08 13:36 ` Code handling for VOCS service bluez.test.bot
2023-06-08 16:30 ` Luiz Augusto von Dentz
2023-06-08 16:29 ` [PATCH BlueZ v3 1/2] Title: Added initial code for handling VOCS Luiz Augusto von Dentz
2023-06-08 12:09 ` [PATCH BlueZ v3 2/2] Make VOCS (Secondary) as an included service of VCS (Primary) Nitin Jadhav
-- strict thread matches above, loose matches on Subject: below --
2023-06-12 13:32 [PATCH BlueZ v5 1/3] lib/uuid.h: Add VOCS characteristic uuid(s) Nitin Jadhav
2023-06-12 15:34 ` Code handling for VOCS service bluez.test.bot
2023-06-09 9:42 [PATCH BlueZ v4 1/3] lib/uuid.h: Add VOCS characteristic uuid(s) Nitin Jadhav
2023-06-09 11:33 ` Code handling for VOCS service bluez.test.bot
2023-06-07 12:13 [PATCH BlueZ v2 1/2] Added initial code for handling VOCS Nitin Jadhav
2023-06-07 13:37 ` Code handling for VOCS service bluez.test.bot
2023-06-06 12:08 [PATCH BlueZ v1 1/2] Added initial code for handling VOCS NJNXP
2023-06-06 13:31 ` Code handling for VOCS service bluez.test.bot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.