This adds support to provide Audio Locations for BAP Sink and Source Endpoints
---
profiles/audio/media.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 1d98ac5a1a70..51e3ab65d12d 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -99,6 +99,7 @@ struct media_endpoint {
size_t size; /* Endpoint capabilities size */
uint8_t *metadata; /* Endpoint property metadata */
size_t metadata_size; /* Endpoint metadata size */
+ uint32_t location; /* Endpoint location */
guint hs_watch;
guint ag_watch;
guint watch;
@@ -1445,6 +1446,7 @@ media_endpoint_create(struct media_adapter *adapter,
int size,
uint8_t *metadata,
int metadata_size,
+ uint32_t location,
int *err)
{
struct media_endpoint *endpoint;
@@ -1460,6 +1462,7 @@ media_endpoint_create(struct media_adapter *adapter,
endpoint->cid = cid;
endpoint->vid = vid;
endpoint->delay_reporting = delay_reporting;
+ endpoint->location = location;
if (qos)
endpoint->qos = *qos;
@@ -1525,7 +1528,8 @@ static int parse_properties(DBusMessageIter *props, const char **uuid,
uint16_t *cid, uint16_t *vid,
struct bt_bap_pac_qos *qos,
uint8_t **capabilities, int *size,
- uint8_t **metadata, int *metadata_size)
+ uint8_t **metadata, int *metadata_size,
+ uint32_t *location)
{
gboolean has_uuid = FALSE;
gboolean has_codec = FALSE;
@@ -1609,6 +1613,10 @@ static int parse_properties(DBusMessageIter *props, const char **uuid,
if (var != DBUS_TYPE_UINT16)
return -EINVAL;
dbus_message_iter_get_basic(&value, &qos->ppd_max);
+ } else if (strcasecmp(key, "Location") == 0) {
+ if (var != DBUS_TYPE_UINT32)
+ return -EINVAL;
+ dbus_message_iter_get_basic(&value, location);
}
dbus_message_iter_next(props);
@@ -1633,6 +1641,7 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg,
int size = 0;
int metadata_size = 0;
int err;
+ uint32_t location;
sender = dbus_message_get_sender(msg);
@@ -1650,12 +1659,12 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg,
if (parse_properties(&props, &uuid, &delay_reporting, &codec, &cid,
&vid, &qos, &capabilities, &size, &metadata,
- &metadata_size) < 0)
+ &metadata_size, &location) < 0)
return btd_error_invalid_args(msg);
if (media_endpoint_create(adapter, sender, path, uuid, delay_reporting,
codec, cid, vid, &qos, capabilities,
- size, metadata, metadata_size,
+ size, metadata, metadata_size, location,
&err) == NULL) {
if (err == -EPROTONOSUPPORT)
return btd_error_not_supported(msg);
@@ -2688,6 +2697,7 @@ static void app_register_endpoint(void *data, void *user_data)
int size = 0;
uint8_t *metadata = NULL;
int metadata_size = 0;
+ uint32_t location;
DBusMessageIter iter, array;
struct media_endpoint *endpoint;
@@ -2748,6 +2758,13 @@ static void app_register_endpoint(void *data, void *user_data)
&metadata_size);
}
+ if (g_dbus_proxy_get_property(proxy, "Location", &iter)) {
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32)
+ goto fail;
+
+ dbus_message_iter_get_basic(&iter, &location);
+ }
+
/* Parse QoS preferences */
memset(&qos, 0, sizeof(qos));
if (g_dbus_proxy_get_property(proxy, "Framing", &iter)) {
@@ -2804,7 +2821,7 @@ static void app_register_endpoint(void *data, void *user_data)
vendor.cid, vendor.vid, &qos,
capabilities, size,
metadata, metadata_size,
- &app->err);
+ location, &app->err);
if (!endpoint) {
error("Unable to register endpoint %s:%s: %s", app->sender,
path, strerror(-app->err));
--
2.34.1
This adds support to provide Audio Locations for BAP Sink and Source Endpoints
---
profiles/audio/media.c | 2 +-
src/shared/bap.c | 56 ++++++++++++++++++++++++++++++++----------
src/shared/bap.h | 6 +++--
3 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 51e3ab65d12d..d063bbf11cf9 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1250,7 +1250,7 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type,
endpoint->pac = bt_bap_add_vendor_pac(db, name, type, endpoint->codec,
endpoint->cid, endpoint->vid, &endpoint->qos,
- &data, metadata);
+ &data, metadata, endpoint->location);
if (!endpoint->pac) {
error("Unable to create PAC");
free(metadata);
diff --git a/src/shared/bap.c b/src/shared/bap.c
index 925501c48d98..bee19039900f 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -190,6 +190,7 @@ struct bt_bap_pac {
uint8_t type;
struct bt_bap_codec codec;
struct bt_bap_pac_qos qos;
+ uint32_t location;
struct iovec *data;
struct iovec *metadata;
struct bt_bap_pac_ops *ops;
@@ -368,6 +369,14 @@ static void pac_foreach(void *data, void *user_data)
meta->len = 0;
}
+static void get_pac_loc(void *data, void *user_data)
+{
+ struct bt_bap_pac *pac = data;
+ uint32_t *location = user_data;
+
+ *location |= pac->location;
+}
+
static void pacs_sink_read(struct gatt_db_attribute *attrib,
unsigned int id, uint16_t offset,
uint8_t opcode, struct bt_att *att,
@@ -395,7 +404,15 @@ static void pacs_sink_loc_read(struct gatt_db_attribute *attrib,
void *user_data)
{
struct bt_pacs *pacs = user_data;
- uint32_t value = cpu_to_le32(pacs->sink_loc_value);
+ struct bt_bap_db *bdb = pacs->bdb;
+ uint32_t value;
+
+ queue_foreach(bdb->sinks, get_pac_loc, &pacs->sink_loc_value);
+ if (pacs->sink_loc_value)
+ value = cpu_to_le32(pacs->sink_loc_value);
+ else
+ /* Set default value */
+ value = cpu_to_le32(PACS_SNK_LOCATION);
gatt_db_attribute_read_result(attrib, id, 0, (void *) &value,
sizeof(value));
@@ -428,7 +445,15 @@ static void pacs_source_loc_read(struct gatt_db_attribute *attrib,
void *user_data)
{
struct bt_pacs *pacs = user_data;
- uint32_t value = cpu_to_le32(pacs->source_loc_value);
+ struct bt_bap_db *bdb = pacs->bdb;
+ uint32_t value;
+
+ queue_foreach(bdb->sources, get_pac_loc, &pacs->source_loc_value);
+ if (pacs->source_loc_value)
+ value = cpu_to_le32(pacs->source_loc_value);
+ else
+ /* Set default value */
+ value = cpu_to_le32(PACS_SRC_LOCATION);
gatt_db_attribute_read_result(attrib, id, 0, (void *) &value,
sizeof(value));
@@ -474,9 +499,8 @@ static struct bt_pacs *pacs_new(struct gatt_db *db)
pacs = new0(struct bt_pacs, 1);
- /* Set default values */
- pacs->sink_loc_value = PACS_SNK_LOCATION;
- pacs->source_loc_value = PACS_SRC_LOCATION;
+ pacs->sink_loc_value = 0;
+ pacs->source_loc_value = 0;
pacs->sink_context_value = PACS_SNK_CTXT;
pacs->source_context_value = PACS_SRC_CTXT;
pacs->supported_sink_context_value = PACS_SUPPORTED_SNK_CTXT;
@@ -2451,7 +2475,8 @@ static struct bt_bap_pac *bap_pac_new(struct bt_bap_db *bdb, const char *name,
struct bt_bap_codec *codec,
struct bt_bap_pac_qos *qos,
struct iovec *data,
- struct iovec *metadata)
+ struct iovec *metadata,
+ uint32_t location)
{
struct bt_bap_pac *pac;
@@ -2468,6 +2493,8 @@ static struct bt_bap_pac *bap_pac_new(struct bt_bap_db *bdb, const char *name,
if (qos)
pac->qos = *qos;
+ pac->location = location;
+
return pac;
}
@@ -2679,7 +2706,8 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
uint8_t id, uint16_t cid, uint16_t vid,
struct bt_bap_pac_qos *qos,
struct iovec *data,
- struct iovec *metadata)
+ struct iovec *metadata,
+ uint32_t location)
{
struct bt_bap_db *bdb;
struct bt_bap_pac *pac, *pac_broadcast_sink;
@@ -2699,7 +2727,8 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
codec.cid = cid;
codec.vid = vid;
- pac = bap_pac_new(bdb, name, type, &codec, qos, data, metadata);
+ pac = bap_pac_new(bdb, name, type, &codec, qos, data, metadata,
+ location);
switch (type) {
case BT_BAP_SINK:
@@ -2716,7 +2745,7 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
*/
pac_broadcast_sink = bap_pac_new(bdb, name,
BT_BAP_BCAST_SINK, &codec, qos,
- data, metadata);
+ data, metadata, 0);
bap_add_broadcast_sink(pac_broadcast_sink);
}
break;
@@ -2737,10 +2766,11 @@ struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
uint8_t type, uint8_t id,
struct bt_bap_pac_qos *qos,
struct iovec *data,
- struct iovec *metadata)
+ struct iovec *metadata,
+ uint32_t location)
{
return bt_bap_add_vendor_pac(db, name, type, id, 0x0000, 0x0000, qos,
- data, metadata);
+ data, metadata, location);
}
uint8_t bt_bap_pac_get_type(struct bt_bap_pac *pac)
@@ -3256,7 +3286,7 @@ static void bap_parse_pacs(struct bt_bap *bap, uint8_t type,
}
pac = bap_pac_new(bap->rdb, NULL, type, &p->codec, NULL, &data,
- &metadata);
+ &metadata, 0);
if (!pac)
continue;
@@ -5481,7 +5511,7 @@ bool bt_bap_new_bcast_source(struct bt_bap *bap, const char *name)
return true;
pac_broadcast_source = bap_pac_new(bap->rdb, name, BT_BAP_BCAST_SOURCE,
- NULL, NULL, NULL, NULL);
+ NULL, NULL, NULL, NULL, 0);
queue_push_tail(bap->rdb->broadcast_sources, pac_broadcast_source);
if (!pac_broadcast_source)
diff --git a/src/shared/bap.h b/src/shared/bap.h
index ebe4dbf7d858..10e82f35e547 100644
--- a/src/shared/bap.h
+++ b/src/shared/bap.h
@@ -141,13 +141,15 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
uint8_t id, uint16_t cid, uint16_t vid,
struct bt_bap_pac_qos *qos,
struct iovec *data,
- struct iovec *metadata);
+ struct iovec *metadata,
+ uint32_t location);
struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
uint8_t type, uint8_t id,
struct bt_bap_pac_qos *qos,
struct iovec *data,
- struct iovec *metadata);
+ struct iovec *metadata,
+ uint32_t location);
struct bt_bap_pac_ops {
int (*select)(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac,
--
2.34.1
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=793403
---Test result---
Test Summary:
CheckPatch FAIL 1.15 seconds
GitLint PASS 0.52 seconds
BuildEll PASS 27.89 seconds
BluezMake FAIL 768.89 seconds
MakeCheck FAIL 18.84 seconds
MakeDistcheck FAIL 137.38 seconds
CheckValgrind FAIL 181.25 seconds
CheckSmatch FAIL 151.00 seconds
bluezmakeextell FAIL 40.68 seconds
IncrementalBuild FAIL 1278.41 seconds
ScanBuild FAIL 654.06 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[1/2] profiles: Add support for Audio Locations
WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#66:
This adds support to provide Audio Locations for BAP Sink and Source Endpoints
/github/workspace/src/src/13422603.patch total: 0 errors, 1 warnings, 89 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/13422603.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.
[2/2] shared/bap: Add support for Audio Locations
WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#68:
This adds support to provide Audio Locations for BAP Sink and Source Endpoints
/github/workspace/src/src/13422604.patch total: 0 errors, 1 warnings, 161 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/13422604.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: BluezMake - FAIL
Desc: Build BlueZ
Output:
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12763:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12763 | int main(int argc, char *argv[])
| ^~~~
unit/test-avdtp.c: In function ‘main’:
unit/test-avdtp.c:766:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
766 | int main(int argc, char *argv[])
| ^~~~
unit/test-avrcp.c: In function ‘main’:
unit/test-avrcp.c:989:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
989 | int main(int argc, char *argv[])
| ^~~~
unit/test-bap.c: In function ‘test_client_config’:
unit/test-bap.c:376:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
376 | data->snk = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:382:16: error: too few arguments to function ‘bt_bap_add_pac’
382 | data->snk = bt_bap_add_pac(data->db, "test-bap-snk",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
unit/test-bap.c:390:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
390 | data->src = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:396:16: error: too few arguments to function ‘bt_bap_add_pac’
396 | data->src = bt_bap_add_pac(data->db, "test-bap-src",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
make[1]: *** [Makefile:7803: unit/test-bap.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4668: all] Error 2
##############################
Test: MakeCheck - FAIL
Desc: Run Bluez Make Check
Output:
unit/test-bap.c: In function ‘test_client_config’:
unit/test-bap.c:376:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
376 | data->snk = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:382:16: error: too few arguments to function ‘bt_bap_add_pac’
382 | data->snk = bt_bap_add_pac(data->db, "test-bap-snk",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
unit/test-bap.c:390:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
390 | data->src = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:396:16: error: too few arguments to function ‘bt_bap_add_pac’
396 | data->src = bt_bap_add_pac(data->db, "test-bap-src",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
make[1]: *** [Makefile:7803: unit/test-bap.o] Error 1
make: *** [Makefile:12125: check] Error 2
##############################
Test: MakeDistcheck - FAIL
Desc: Run Bluez Make Distcheck
Output:
../../unit/test-bap.c: In function ‘test_client_config’:
../../unit/test-bap.c:376:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
376 | data->snk = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from ../../unit/test-bap.c:32:
../../src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
../../unit/test-bap.c:382:16: error: too few arguments to function ‘bt_bap_add_pac’
382 | data->snk = bt_bap_add_pac(data->db, "test-bap-snk",
| ^~~~~~~~~~~~~~
In file included from ../../unit/test-bap.c:32:
../../src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
../../unit/test-bap.c:390:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
390 | data->src = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from ../../unit/test-bap.c:32:
../../src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
../../unit/test-bap.c:396:16: error: too few arguments to function ‘bt_bap_add_pac’
396 | data->src = bt_bap_add_pac(data->db, "test-bap-src",
| ^~~~~~~~~~~~~~
In file included from ../../unit/test-bap.c:32:
../../src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
make[4]: *** [Makefile:7803: unit/test-bap.o] Error 1
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [Makefile:11694: check-TESTS] Error 2
make[2]: *** [Makefile:12123: check-am] Error 2
make[1]: *** [Makefile:12125: check] Error 2
make: *** [Makefile:12046: distcheck] Error 1
##############################
Test: CheckValgrind - FAIL
Desc: Run Bluez Make Check with Valgrind
Output:
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12763:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12763 | int main(int argc, char *argv[])
| ^~~~
unit/test-bap.c: In function ‘test_client_config’:
unit/test-bap.c:376:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
376 | data->snk = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:382:16: error: too few arguments to function ‘bt_bap_add_pac’
382 | data->snk = bt_bap_add_pac(data->db, "test-bap-snk",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
unit/test-bap.c:390:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
390 | data->src = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:396:16: error: too few arguments to function ‘bt_bap_add_pac’
396 | data->src = bt_bap_add_pac(data->db, "test-bap-src",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
make[1]: *** [Makefile:7803: unit/test-bap.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:12125: check] Error 2
##############################
Test: CheckSmatch - FAIL
Desc: Run smatch tool with source
Output:
src/shared/crypto.c:271:21: warning: Variable length array is used.
src/shared/crypto.c:272:23: warning: Variable length array is used.
src/shared/gatt-helpers.c:768:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:830:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used.
src/shared/gatt-server.c:276:25: warning: Variable length array is used.
src/shared/gatt-server.c:619:25: warning: Variable length array is used.
src/shared/gatt-server.c:718:25: warning: Variable length array is used.
src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):
/usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function'
/usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction'
/usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction'
/usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction'
src/shared/crypto.c:271:21: warning: Variable length array is used.
src/shared/crypto.c:272:23: warning: Variable length array is used.
src/shared/gatt-helpers.c:768:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:830:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used.
src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used.
src/shared/gatt-server.c:276:25: warning: Variable length array is used.
src/shared/gatt-server.c:619:25: warning: Variable length array is used.
src/shared/gatt-server.c:718:25: warning: Variable length array is used.
src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h):
/usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function'
/usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction'
/usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction'
/usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction'
tools/mesh-cfgtest.c:1453:17: warning: unknown escape sequence: '\%'
tools/sco-tester.c: note: in included file:
./lib/bluetooth.h:216:15: warning: array of flexible structures
./lib/bluetooth.h:221:31: warning: array of flexible structures
tools/bneptest.c:634:39: warning: unknown escape sequence: '\%'
tools/seq2bseq.c:57:26: warning: Variable length array is used.
tools/obex-client-tool.c: note: in included file (through /usr/include/readline/readline.h):
/usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function'
/usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction'
/usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction'
/usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction'
android/avctp.c:505:34: warning: Variable length array is used.
android/avctp.c:556:34: warning: Variable length array is used.
unit/test-avrcp.c:373:26: warning: Variable length array is used.
unit/test-avrcp.c:398:26: warning: Variable length array is used.
unit/test-avrcp.c:414:24: warning: Variable length array is used.
android/avrcp-lib.c:1085:34: warning: Variable length array is used.
android/avrcp-lib.c:1583:34: warning: Variable length array is used.
android/avrcp-lib.c:1612:34: warning: Variable length array is used.
android/avrcp-lib.c:1638:34: warning: Variable length array is used.
unit/test-bap.c: In function ‘test_client_config’:
unit/test-bap.c:376:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
376 | data->snk = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:382:16: error: too few arguments to function ‘bt_bap_add_pac’
382 | data->snk = bt_bap_add_pac(data->db, "test-bap-snk",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
unit/test-bap.c:390:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
390 | data->src = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:396:16: error: too few arguments to function ‘bt_bap_add_pac’
396 | data->src = bt_bap_add_pac(data->db, "test-bap-src",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
make[1]: *** [Makefile:7803: unit/test-bap.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4668: all] Error 2
##############################
Test: bluezmakeextell - FAIL
Desc: Build Bluez with External ELL
Output:
unit/test-bap.c: In function ‘test_client_config’:
unit/test-bap.c:376:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
376 | data->snk = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:382:16: error: too few arguments to function ‘bt_bap_add_pac’
382 | data->snk = bt_bap_add_pac(data->db, "test-bap-snk",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
unit/test-bap.c:390:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
390 | data->src = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:396:16: error: too few arguments to function ‘bt_bap_add_pac’
396 | data->src = bt_bap_add_pac(data->db, "test-bap-src",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
make[1]: *** [Makefile:7803: unit/test-bap.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4668: all] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[2/2] shared/bap: Add support for Audio Locations
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12763:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12763 | int main(int argc, char *argv[])
| ^~~~
unit/test-avdtp.c: In function ‘main’:
unit/test-avdtp.c:766:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
766 | int main(int argc, char *argv[])
| ^~~~
unit/test-avrcp.c: In function ‘main’:
unit/test-avrcp.c:989:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
989 | int main(int argc, char *argv[])
| ^~~~
unit/test-bap.c: In function ‘test_client_config’:
unit/test-bap.c:376:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
376 | data->snk = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:382:16: error: too few arguments to function ‘bt_bap_add_pac’
382 | data->snk = bt_bap_add_pac(data->db, "test-bap-snk",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
unit/test-bap.c:390:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
390 | data->src = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:396:16: error: too few arguments to function ‘bt_bap_add_pac’
396 | data->src = bt_bap_add_pac(data->db, "test-bap-src",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
make[1]: *** [Makefile:7803: unit/test-bap.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4668: all] Error 2
##############################
Test: ScanBuild - FAIL
Desc: Run Scan Build
Output:
src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed
gatt_db_unregister(op->client->db, op->db_id);
^~~~~~~~~~
src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed
discovery_op_complete(op, false, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:993:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1099:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1291:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1356:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1631:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1636:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2140:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2148:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3237:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3259:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.
src/shared/shell.c:1228:13: warning: Access to field 'options' results in a dereference of a null pointer (loaded from variable 'opt')
if (c != opt->options[index - offset].val) {
^~~~~~~~~~~~
1 warning generated.
src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed
gatt_db_unregister(op->client->db, op->db_id);
^~~~~~~~~~
src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed
discovery_op_complete(op, false, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:993:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1099:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1291:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1356:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1631:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1636:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2140:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2148:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3237:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3259:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.
src/shared/shell.c:1228:13: warning: Access to field 'options' results in a dereference of a null pointer (loaded from variable 'opt')
if (c != opt->options[index - offset].val) {
^~~~~~~~~~~~
1 warning generated.
tools/hciattach.c:816:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 10)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:864:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 4)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:886:8: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 10)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:908:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 4)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:929:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 4)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/hciattach.c:973:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n'
if ((n = read_hci_event(fd, resp, 6)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
6 warnings generated.
src/oui.c:50:2: warning: Value stored to 'hwdb' is never read
hwdb = udev_hwdb_unref(hwdb);
^ ~~~~~~~~~~~~~~~~~~~~~
src/oui.c:53:2: warning: Value stored to 'udev' is never read
udev = udev_unref(udev);
^ ~~~~~~~~~~~~~~~~
2 warnings generated.
tools/hcidump.c:180:9: warning: Potential leak of memory pointed to by 'dp'
if (fds[i].fd == sock)
^~~
tools/hcidump.c:248:17: warning: Assigned value is garbage or undefined
dh->ts_sec = htobl(frm.ts.tv_sec);
^ ~~~~~~~~~~~~~~~~~~~~
tools/hcidump.c:326:9: warning: 1st function call argument is an uninitialized value
if (be32toh(dp.flags) & 0x02) {
^~~~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:341:20: warning: 1st function call argument is an uninitialized value
frm.data_len = be32toh(dp.len);
^~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:346:14: warning: 1st function call argument is an uninitialized value
opcode = be32toh(dp.flags) & 0xffff;
^~~~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:384:17: warning: Assigned value is garbage or undefined
frm.data_len = btohs(dh.len);
^ ~~~~~~~~~~~~~
tools/hcidump.c:394:11: warning: Assigned value is garbage or undefined
frm.len = frm.data_len;
^ ~~~~~~~~~~~~
tools/hcidump.c:398:9: warning: 1st function call argument is an uninitialized value
ts = be64toh(ph.ts);
^~~~~~~~~~~~~~
/usr/include/endian.h:51:22: note: expanded from macro 'be64toh'
# define be64toh(x) __bswap_64 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:403:13: warning: 1st function call argument is an uninitialized value
frm.in = be32toh(dp.flags) & 0x01;
^~~~~~~~~~~~~~~~~
/usr/include/endian.h:46:22: note: expanded from macro 'be32toh'
# define be32toh(x) __bswap_32 (x)
^~~~~~~~~~~~~~
tools/hcidump.c:408:11: warning: Assigned value is garbage or undefined
frm.in = dh.in;
^ ~~~~~
tools/hcidump.c:437:7: warning: Null pointer passed to 1st parameter expecting 'nonnull'
fd = open(file, open_flags, 0644);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
11 warnings generated.
tools/rfcomm.c:228:3: warning: Value stored to 'i' is never read
i = execvp(cmdargv[0], cmdargv);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:228:7: warning: Null pointer passed to 1st parameter expecting 'nonnull'
i = execvp(cmdargv[0], cmdargv);
^~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:348:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd'
if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:491:14: warning: Assigned value is garbage or undefined
req.channel = raddr.rc_channel;
^ ~~~~~~~~~~~~~~~~
tools/rfcomm.c:509:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd'
if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) {
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5 warnings generated.
src/sdp-xml.c:126:10: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
src/sdp-xml.c:300:11: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
src/sdp-xml.c:338:11: warning: Assigned value is garbage or undefined
buf[1] = data[i + 1];
^ ~~~~~~~~~~~
3 warnings generated.
tools/ciptool.c:350:7: warning: 5th function call argument is an uninitialized value
sk = do_connect(ctl, dev_id, &src, &dst, psm, (1 << CMTP_LOOPBACK));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
tools/sdptool.c:941:26: warning: Result of 'malloc' is converted to a pointer of type 'uint32_t', which is incompatible with sizeof operand type 'int'
uint32_t *value_int = malloc(sizeof(int));
~~~~~~~~~~ ^~~~~~ ~~~~~~~~~~~
tools/sdptool.c:980:4: warning: 1st function call argument is an uninitialized value
free(allocArray[i]);
^~~~~~~~~~~~~~~~~~~
tools/sdptool.c:3777:2: warning: Potential leak of memory pointed to by 'si.name'
return add_service(0, &si);
^~~~~~~~~~~~~~~~~~~~~~~~~~
tools/sdptool.c:4112:4: warning: Potential leak of memory pointed to by 'context.svc'
return -1;
^~~~~~~~~
4 warnings generated.
tools/avtest.c:224:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:234:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:243:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:257:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:264:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:271:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:278:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:289:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:293:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:302:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:306:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:315:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:322:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:344:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:348:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:357:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:361:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:374:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:378:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:385:4: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:395:4: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:559:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:567:3: warning: Value stored to 'len' is never read
len = write(sk, buf, invalid ? 2 : 3);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/avtest.c:581:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 4 + sizeof(media_transport));
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/avtest.c:594:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:604:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:616:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:631:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:643:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:652:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:659:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:695:2: warning: Value stored to 'len' is never read
len = write(sk, buf, AVCTP_HEADER_LENGTH + sizeof(play_pressed));
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32 warnings generated.
tools/btproxy.c:836:15: warning: Null pointer passed to 1st parameter expecting 'nonnull'
tcp_port = atoi(optarg);
^~~~~~~~~~~~
tools/btproxy.c:839:8: warning: Null pointer passed to 1st parameter expecting 'nonnull'
if (strlen(optarg) > 3 && !strncmp(optarg, "hci", 3))
^~~~~~~~~~~~~~
2 warnings generated.
tools/create-image.c:76:3: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
tools/create-image.c:84:3: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
tools/create-image.c:92:3: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
tools/create-image.c:105:2: warning: Value stored to 'fd' is never read
fd = -1;
^ ~~
4 warnings generated.
tools/btgatt-client.c:1597:2: warning: Value stored to 'argv' is never read
argv += optind;
^ ~~~~~~
1 warning generated.
tools/btgatt-server.c:1212:2: warning: Value stored to 'argv' is never read
argv -= optind;
^ ~~~~~~
1 warning generated.
tools/check-selftest.c:42:3: warning: Value stored to 'ptr' is never read
ptr = fgets(result, sizeof(result), fp);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
tools/gatt-service.c:294:2: warning: 2nd function call argument is an uninitialized value
chr_write(chr, value, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
tools/obex-server-tool.c:133:13: warning: Null pointer passed to 1st parameter expecting 'nonnull'
data->fd = open(name, O_WRONLY | O_CREAT | O_NOCTTY, 0600);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/obex-server-tool.c:192:13: warning: Null pointer passed to 1st parameter expecting 'nonnull'
data->fd = open(name, O_RDONLY | O_NOCTTY, 0);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 warnings generated.
tools/test-runner.c:945:2: warning: 2nd function call argument is an uninitialized value
printf("Running command %s\n", cmdname ? cmdname : argv[0]);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
tools/btpclientctl.c:402:3: warning: Value stored to 'bit' is never read
bit = 0;
^ ~
tools/btpclientctl.c:1655:2: warning: Null pointer passed to 2nd parameter expecting 'nonnull'
memcpy(cp->data, ad_data, ad_len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 warnings generated.
src/sdpd-request.c:211:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint16_t'
pElem = malloc(sizeof(uint16_t));
^~~~~~ ~~~~~~~~~~~~~~~~
src/sdpd-request.c:239:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint32_t'
pElem = malloc(sizeof(uint32_t));
^~~~~~ ~~~~~~~~~~~~~~~~
2 warnings generated.
android/avrcp-lib.c:1968:3: warning: 1st function call argument is an uninitialized value
g_free(text[i]);
^~~~~~~~~~~~~~~
1 warning generated.
unit/test-bap.c: In function ‘test_client_config’:
unit/test-bap.c:376:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
376 | data->snk = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:382:16: error: too few arguments to function ‘bt_bap_add_pac’
382 | data->snk = bt_bap_add_pac(data->db, "test-bap-snk",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
unit/test-bap.c:390:16: error: too few arguments to function ‘bt_bap_add_vendor_pac’
390 | data->src = bt_bap_add_vendor_pac(data->db,
| ^~~~~~~~~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:139:20: note: declared here
139 | struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
| ^~~~~~~~~~~~~~~~~~~~~
unit/test-bap.c:396:16: error: too few arguments to function ‘bt_bap_add_pac’
396 | data->src = bt_bap_add_pac(data->db, "test-bap-src",
| ^~~~~~~~~~~~~~
In file included from unit/test-bap.c:32:
./src/shared/bap.h:147:20: note: declared here
147 | struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
| ^~~~~~~~~~~~~~
make[1]: *** [Makefile:7803: unit/test-bap.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4668: all] Error 2
---
Regards,
Linux Bluetooth
Hi,
ma, 2023-10-16 kello 12:22 +0530, Kiran K kirjoitti:
> This adds support to provide Audio Locations for BAP Sink and Source Endpoints
> ---
> profiles/audio/media.c | 25 +++++++++++++++++++++----
> 1 file changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/profiles/audio/media.c b/profiles/audio/media.c
> index 1d98ac5a1a70..51e3ab65d12d 100644
> --- a/profiles/audio/media.c
> +++ b/profiles/audio/media.c
> @@ -99,6 +99,7 @@ struct media_endpoint {
> size_t size; /* Endpoint capabilities size */
> uint8_t *metadata; /* Endpoint property metadata */
> size_t metadata_size; /* Endpoint metadata size */
> + uint32_t location; /* Endpoint location */
> guint hs_watch;
> guint ag_watch;
> guint watch;
> @@ -1445,6 +1446,7 @@ media_endpoint_create(struct media_adapter *adapter,
> int size,
> uint8_t *metadata,
> int metadata_size,
> + uint32_t location,
> int *err)
> {
> struct media_endpoint *endpoint;
> @@ -1460,6 +1462,7 @@ media_endpoint_create(struct media_adapter *adapter,
> endpoint->cid = cid;
> endpoint->vid = vid;
> endpoint->delay_reporting = delay_reporting;
> + endpoint->location = location;
>
> if (qos)
> endpoint->qos = *qos;
> @@ -1525,7 +1528,8 @@ static int parse_properties(DBusMessageIter *props, const char **uuid,
> uint16_t *cid, uint16_t *vid,
> struct bt_bap_pac_qos *qos,
> uint8_t **capabilities, int *size,
> - uint8_t **metadata, int *metadata_size)
> + uint8_t **metadata, int *metadata_size,
> + uint32_t *location)
> {
> gboolean has_uuid = FALSE;
> gboolean has_codec = FALSE;
> @@ -1609,6 +1613,10 @@ static int parse_properties(DBusMessageIter *props, const char **uuid,
> if (var != DBUS_TYPE_UINT16)
> return -EINVAL;
> dbus_message_iter_get_basic(&value, &qos->ppd_max);
> + } else if (strcasecmp(key, "Location") == 0) {
This should be "Locations" to match the documented endpoint property
names. Maybe also the variable names.
The bitmap can contain multiple supported locations, the client will
selects in Config Codec which ones it wants.
> + if (var != DBUS_TYPE_UINT32)
> + return -EINVAL;
> + dbus_message_iter_get_basic(&value, location);
> }
>
> dbus_message_iter_next(props);
> @@ -1633,6 +1641,7 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg,
> int size = 0;
> int metadata_size = 0;
> int err;
> + uint32_t location;
>
> sender = dbus_message_get_sender(msg);
>
> @@ -1650,12 +1659,12 @@ static DBusMessage *register_endpoint(DBusConnection *conn, DBusMessage *msg,
>
> if (parse_properties(&props, &uuid, &delay_reporting, &codec, &cid,
> &vid, &qos, &capabilities, &size, &metadata,
> - &metadata_size) < 0)
> + &metadata_size, &location) < 0)
> return btd_error_invalid_args(msg);
>
> if (media_endpoint_create(adapter, sender, path, uuid, delay_reporting,
> codec, cid, vid, &qos, capabilities,
> - size, metadata, metadata_size,
> + size, metadata, metadata_size, location,
> &err) == NULL) {
> if (err == -EPROTONOSUPPORT)
> return btd_error_not_supported(msg);
> @@ -2688,6 +2697,7 @@ static void app_register_endpoint(void *data, void *user_data)
> int size = 0;
> uint8_t *metadata = NULL;
> int metadata_size = 0;
> + uint32_t location;
> DBusMessageIter iter, array;
> struct media_endpoint *endpoint;
>
> @@ -2748,6 +2758,13 @@ static void app_register_endpoint(void *data, void *user_data)
> &metadata_size);
> }
>
> + if (g_dbus_proxy_get_property(proxy, "Location", &iter)) {
Same here.
> + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32)
> + goto fail;
> +
> + dbus_message_iter_get_basic(&iter, &location);
> + }
> +
> /* Parse QoS preferences */
> memset(&qos, 0, sizeof(qos));
> if (g_dbus_proxy_get_property(proxy, "Framing", &iter)) {
> @@ -2804,7 +2821,7 @@ static void app_register_endpoint(void *data, void *user_data)
> vendor.cid, vendor.vid, &qos,
> capabilities, size,
> metadata, metadata_size,
> - &app->err);
> + location, &app->err);
> if (!endpoint) {
> error("Unable to register endpoint %s:%s: %s", app->sender,
> path, strerror(-app->err));
Hi Kiran,
On Sun, Oct 15, 2023 at 11:40 PM Kiran K <[email protected]> wrote:
>
> This adds support to provide Audio Locations for BAP Sink and Source Endpoints
> ---
> profiles/audio/media.c | 2 +-
> src/shared/bap.c | 56 ++++++++++++++++++++++++++++++++----------
> src/shared/bap.h | 6 +++--
> 3 files changed, 48 insertions(+), 16 deletions(-)
>
> diff --git a/profiles/audio/media.c b/profiles/audio/media.c
> index 51e3ab65d12d..d063bbf11cf9 100644
> --- a/profiles/audio/media.c
> +++ b/profiles/audio/media.c
> @@ -1250,7 +1250,7 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type,
>
> endpoint->pac = bt_bap_add_vendor_pac(db, name, type, endpoint->codec,
> endpoint->cid, endpoint->vid, &endpoint->qos,
> - &data, metadata);
> + &data, metadata, endpoint->location);
> if (!endpoint->pac) {
> error("Unable to create PAC");
> free(metadata);
> diff --git a/src/shared/bap.c b/src/shared/bap.c
> index 925501c48d98..bee19039900f 100644
> --- a/src/shared/bap.c
> +++ b/src/shared/bap.c
> @@ -190,6 +190,7 @@ struct bt_bap_pac {
> uint8_t type;
> struct bt_bap_codec codec;
> struct bt_bap_pac_qos qos;
> + uint32_t location;
> struct iovec *data;
> struct iovec *metadata;
> struct bt_bap_pac_ops *ops;
> @@ -368,6 +369,14 @@ static void pac_foreach(void *data, void *user_data)
> meta->len = 0;
> }
>
> +static void get_pac_loc(void *data, void *user_data)
> +{
> + struct bt_bap_pac *pac = data;
> + uint32_t *location = user_data;
> +
> + *location |= pac->location;
> +}
> +
> static void pacs_sink_read(struct gatt_db_attribute *attrib,
> unsigned int id, uint16_t offset,
> uint8_t opcode, struct bt_att *att,
> @@ -395,7 +404,15 @@ static void pacs_sink_loc_read(struct gatt_db_attribute *attrib,
> void *user_data)
> {
> struct bt_pacs *pacs = user_data;
> - uint32_t value = cpu_to_le32(pacs->sink_loc_value);
> + struct bt_bap_db *bdb = pacs->bdb;
> + uint32_t value;
> +
> + queue_foreach(bdb->sinks, get_pac_loc, &pacs->sink_loc_value);
> + if (pacs->sink_loc_value)
> + value = cpu_to_le32(pacs->sink_loc_value);
> + else
> + /* Set default value */
> + value = cpu_to_le32(PACS_SNK_LOCATION);
>
> gatt_db_attribute_read_result(attrib, id, 0, (void *) &value,
> sizeof(value));
> @@ -428,7 +445,15 @@ static void pacs_source_loc_read(struct gatt_db_attribute *attrib,
> void *user_data)
> {
> struct bt_pacs *pacs = user_data;
> - uint32_t value = cpu_to_le32(pacs->source_loc_value);
> + struct bt_bap_db *bdb = pacs->bdb;
> + uint32_t value;
> +
> + queue_foreach(bdb->sources, get_pac_loc, &pacs->source_loc_value);
> + if (pacs->source_loc_value)
> + value = cpu_to_le32(pacs->source_loc_value);
> + else
> + /* Set default value */
> + value = cpu_to_le32(PACS_SRC_LOCATION);
>
> gatt_db_attribute_read_result(attrib, id, 0, (void *) &value,
> sizeof(value));
> @@ -474,9 +499,8 @@ static struct bt_pacs *pacs_new(struct gatt_db *db)
>
> pacs = new0(struct bt_pacs, 1);
>
> - /* Set default values */
> - pacs->sink_loc_value = PACS_SNK_LOCATION;
> - pacs->source_loc_value = PACS_SRC_LOCATION;
> + pacs->sink_loc_value = 0;
> + pacs->source_loc_value = 0;
> pacs->sink_context_value = PACS_SNK_CTXT;
> pacs->source_context_value = PACS_SRC_CTXT;
> pacs->supported_sink_context_value = PACS_SUPPORTED_SNK_CTXT;
> @@ -2451,7 +2475,8 @@ static struct bt_bap_pac *bap_pac_new(struct bt_bap_db *bdb, const char *name,
> struct bt_bap_codec *codec,
> struct bt_bap_pac_qos *qos,
> struct iovec *data,
> - struct iovec *metadata)
> + struct iovec *metadata,
> + uint32_t location)
> {
> struct bt_bap_pac *pac;
>
> @@ -2468,6 +2493,8 @@ static struct bt_bap_pac *bap_pac_new(struct bt_bap_db *bdb, const char *name,
> if (qos)
> pac->qos = *qos;
>
> + pac->location = location;
> +
> return pac;
> }
>
> @@ -2679,7 +2706,8 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
> uint8_t id, uint16_t cid, uint16_t vid,
> struct bt_bap_pac_qos *qos,
> struct iovec *data,
> - struct iovec *metadata)
> + struct iovec *metadata,
> + uint32_t location)
> {
> struct bt_bap_db *bdb;
> struct bt_bap_pac *pac, *pac_broadcast_sink;
> @@ -2699,7 +2727,8 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
> codec.cid = cid;
> codec.vid = vid;
>
> - pac = bap_pac_new(bdb, name, type, &codec, qos, data, metadata);
> + pac = bap_pac_new(bdb, name, type, &codec, qos, data, metadata,
> + location);
>
> switch (type) {
> case BT_BAP_SINK:
> @@ -2716,7 +2745,7 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
> */
> pac_broadcast_sink = bap_pac_new(bdb, name,
> BT_BAP_BCAST_SINK, &codec, qos,
> - data, metadata);
> + data, metadata, 0);
> bap_add_broadcast_sink(pac_broadcast_sink);
> }
> break;
> @@ -2737,10 +2766,11 @@ struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
> uint8_t type, uint8_t id,
> struct bt_bap_pac_qos *qos,
> struct iovec *data,
> - struct iovec *metadata)
> + struct iovec *metadata,
> + uint32_t location)
> {
> return bt_bap_add_vendor_pac(db, name, type, id, 0x0000, 0x0000, qos,
> - data, metadata);
> + data, metadata, location);
> }
>
> uint8_t bt_bap_pac_get_type(struct bt_bap_pac *pac)
> @@ -3256,7 +3286,7 @@ static void bap_parse_pacs(struct bt_bap *bap, uint8_t type,
> }
>
> pac = bap_pac_new(bap->rdb, NULL, type, &p->codec, NULL, &data,
> - &metadata);
> + &metadata, 0);
> if (!pac)
> continue;
>
> @@ -5481,7 +5511,7 @@ bool bt_bap_new_bcast_source(struct bt_bap *bap, const char *name)
> return true;
>
> pac_broadcast_source = bap_pac_new(bap->rdb, name, BT_BAP_BCAST_SOURCE,
> - NULL, NULL, NULL, NULL);
> + NULL, NULL, NULL, NULL, 0);
> queue_push_tail(bap->rdb->broadcast_sources, pac_broadcast_source);
>
> if (!pac_broadcast_source)
> diff --git a/src/shared/bap.h b/src/shared/bap.h
> index ebe4dbf7d858..10e82f35e547 100644
> --- a/src/shared/bap.h
> +++ b/src/shared/bap.h
> @@ -141,13 +141,15 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
> uint8_t id, uint16_t cid, uint16_t vid,
> struct bt_bap_pac_qos *qos,
> struct iovec *data,
> - struct iovec *metadata);
> + struct iovec *metadata,
> + uint32_t location);
>
> struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
> uint8_t type, uint8_t id,
> struct bt_bap_pac_qos *qos,
> struct iovec *data,
> - struct iovec *metadata);
> + struct iovec *metadata,
> + uint32_t location);
If you change the API you will need to fix their users as well
otherwise it won't build and CI will fail.
> struct bt_bap_pac_ops {
> int (*select)(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac,
> --
> 2.34.1
--
Luiz Augusto von Dentz
Hi Luiz,
> > struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name,
> > uint8_t type, uint8_t id,
> > struct bt_bap_pac_qos *qos,
> > struct iovec *data,
> > - struct iovec *metadata);
> > + struct iovec *metadata,
> > + uint32_t location);
>
> If you change the API you will need to fix their users as well otherwise it
> won't build and CI will fail.
Agree. I also found later that location field is already part of qos structure. I would re-work to use the same instead of changing API and submit v2 patchset.
>
> > struct bt_bap_pac_ops {
> > int (*select)(struct bt_bap_pac *lpac, struct bt_bap_pac
> > *rpac,
> > --
> > 2.34.1
>
>
>
> --
> Luiz Augusto von Dentz
Thanks,
Kiran