Hi folks,
I've written an implementation of the Android specification for
streaming to hearing aids over Bluetooth LE, ASHA[1]. This predates the
LE audio specification, and has been supported in hearing aids for a
while now, so I think this is worth supporting as these devices should
continue to be in use for several years.
I've reused the MediaEndpoint1 and MediaTransport1 interfaces at Luiz'
suggestion. The flow is slightly different from A2DP and LE Audio in
that there isn't really a negotiation step, so the endpoint and
transport are both available on connection.
Also included is a script to stream arbitrary audio to an ASHA device,
which is handy for making sure that the implementation does work. I have
tested this against a reference implementation on an onsemi RSL10 board.
The current implementation is written with a single device in mind. My
plan is to take this to completion along with a PipeWire implementation
to expose a single device for playback, and then do a second pass to
support a pair of devices.
Cheers,
Arun
[1] https://source.android.com/docs/core/connect/bluetooth/asha
Arun Raghavan (5):
profiles: Add initial code for an ASHA plugin
asha: Implement volume on transport
test: Add a script to test ASHA
gitignore: Add compile_commands.json
gitignore: Add __pycache__
.gitignore | 3 +
Makefile.plugins | 5 +
configure.ac | 4 +
lib/uuid.h | 3 +
profiles/audio/asha.c | 835 +++++++++++++++++++++++++++++++++++++
profiles/audio/asha.h | 38 ++
profiles/audio/media.c | 28 ++
profiles/audio/media.h | 2 +
profiles/audio/transport.c | 173 +++++++-
test/simple-asha | 158 +++++++
10 files changed, 1247 insertions(+), 2 deletions(-)
create mode 100644 profiles/audio/asha.c
create mode 100644 profiles/audio/asha.h
create mode 100755 test/simple-asha
--
2.45.0
This implements the server role for the Audio Streaming for Hearing Aid
specification[1].
The implementation registers a remote endpoint using a subset of the
MediaEndpoint1 interface, without any mechanism for setting/selecting a
configuration, as this is all static in the spec for now. Also exposed
on connection is a MediaTransport1 object, which can be used to obtain
an fd to stream to the device.
[1] https://source.android.com/docs/core/connect/bluetooth/asha
---
Makefile.plugins | 5 +
configure.ac | 4 +
lib/uuid.h | 3 +
profiles/audio/asha.c | 761 +++++++++++++++++++++++++++++++++++++
profiles/audio/asha.h | 34 ++
profiles/audio/media.c | 28 ++
profiles/audio/media.h | 2 +
profiles/audio/transport.c | 147 ++++++-
8 files changed, 982 insertions(+), 2 deletions(-)
create mode 100644 profiles/audio/asha.c
create mode 100644 profiles/audio/asha.h
diff --git a/Makefile.plugins b/Makefile.plugins
index 4aa2c9c92..e196e1d2e 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -147,3 +147,8 @@ if CSIP
builtin_modules += csip
builtin_sources += profiles/audio/csip.c
endif
+
+if ASHA
+builtin_modules += asha
+builtin_sources += profiles/audio/asha.c
+endif
diff --git a/configure.ac b/configure.ac
index 9dea70ddc..826b34518 100644
--- a/configure.ac
+++ b/configure.ac
@@ -216,6 +216,10 @@ AC_ARG_ENABLE(csip, AS_HELP_STRING([--disable-csip],
[disable CSIP profile]), [enable_csip=${enableval}])
AM_CONDITIONAL(CSIP, test "${enable_csip}" != "no")
+AC_ARG_ENABLE(asha, AS_HELP_STRING([--disable-asha],
+ [disable ASHA support]), [enable_asha=${enableval}])
+AM_CONDITIONAL(ASHA, test "${enable_asha}" != "no")
+
AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools],
[disable Bluetooth tools]), [enable_tools=${enableval}])
AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
diff --git a/lib/uuid.h b/lib/uuid.h
index 8404b287e..479986f06 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -163,6 +163,9 @@ extern "C" {
#define BAA_SERVICE 0x1851
#define BAA_SERVICE_UUID "00001851-0000-1000-8000-00805f9b34fb"
+#define ASHA_SERVICE 0xFDF0
+#define ASHA_PROFILE_UUID "0000FDF0-0000-1000-8000-00805f9b34fb"
+
#define PAC_CONTEXT 0x2bcd
#define PAC_SUPPORTED_CONTEXT 0x2bce
diff --git a/profiles/audio/asha.c b/profiles/audio/asha.c
new file mode 100644
index 000000000..c6769038f
--- /dev/null
+++ b/profiles/audio/asha.c
@@ -0,0 +1,761 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2024 Asymptotic Inc.
+ *
+ * Author: Arun Raghavan <[email protected]>
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+
+#include <dbus/dbus.h>
+#include <glib.h>
+
+#include "gdbus/gdbus.h"
+#include "lib/bluetooth.h"
+#include "lib/uuid.h"
+
+#include "src/dbus-common.h"
+#include "src/adapter.h"
+#include "src/device.h"
+#include "src/log.h"
+#include "src/plugin.h"
+#include "src/profile.h"
+#include "src/service.h"
+#include "src/shared/att.h"
+#include "src/shared/gatt-client.h"
+#include "src/shared/gatt-db.h"
+#include "src/shared/util.h"
+
+#include "profiles/audio/media.h"
+#include "profiles/audio/transport.h"
+
+#include "asha.h"
+#include "l2cap.h"
+
+/* We use strings instead of uint128_t to maintain readability */
+#define ASHA_CHRC_READ_ONLY_PROPERTIES_UUID "6333651e-c481-4a3e-9169-7c902aad37bb"
+#define ASHA_CHRC_AUDIO_CONTROL_POINT_UUID "f0d4de7e-4a88-476c-9d9f-1937b0996cc0"
+#define ASHA_CHRC_AUDIO_STATUS_UUID "38663f1a-e711-4cac-b641-326b56404837"
+#define ASHA_CHRC_VOLUME_UUID "00e4ca9e-ab14-41e4-8823-f9e70c7e91df"
+#define ASHA_CHRC_LE_PSM_OUT_UUID "2d410339-82b6-42aa-b34e-e2e01df8cc1a"
+
+#define MEDIA_ENDPOINT_INTERFACE "org.bluez.MediaEndpoint1"
+
+// 1 sequence number, 4 for L2CAP header, 2 for SDU, and then 20ms of G.722
+#define ASHA_MTU 167
+
+struct asha_device {
+ struct btd_device *device;
+ struct bt_gatt_client *client;
+ struct gatt_db *db;
+ struct gatt_db_attribute *attr;
+ uint16_t acp_handle;
+ unsigned int notify_id;
+
+ uint16_t psm;
+ bool right_side;
+ bool binaural;
+ bool csis_supported;
+ bool coc_streaming_supported;
+ uint8_t hisyncid[8];
+ uint16_t render_delay;
+ uint16_t codec_ids;
+
+ struct media_transport *transport;
+ int fd;
+ asha_state_t state;
+ asha_cb_t cb;
+ void *cb_user_data;
+ int resume_id;
+};
+
+static struct asha_device *asha_device_new(void)
+{
+ struct asha_device *asha;
+
+ asha = new0(struct asha_device, 1);
+
+ return asha;
+}
+
+static void asha_device_reset(struct asha_device *asha)
+{
+ if (asha->notify_id)
+ bt_gatt_client_unregister_notify(asha->client,
+ asha->notify_id);
+
+ gatt_db_unref(asha->db);
+ asha->db = NULL;
+
+ bt_gatt_client_unref(asha->client);
+ asha->client = NULL;
+
+ asha->psm = 0;
+}
+
+static void asha_state_reset(struct asha_device *asha)
+{
+ close(asha->fd);
+ asha->fd = -1;
+
+ asha->state = ASHA_STOPPED;
+ asha->resume_id = 0;
+
+ asha->cb = NULL;
+ asha->cb_user_data = NULL;
+}
+
+static void asha_device_free(struct asha_device *asha)
+{
+ gatt_db_unref(asha->db);
+ bt_gatt_client_unref(asha->client);
+ free(asha);
+}
+
+uint16_t asha_device_get_render_delay(struct asha_device *asha)
+{
+ return asha->render_delay;
+}
+
+asha_state_t asha_device_get_state(struct asha_device *asha)
+{
+ return asha->state;
+}
+
+int asha_device_get_fd(struct asha_device *asha)
+{
+ return asha->fd;
+}
+
+uint16_t asha_device_get_mtu(struct asha_device *asha)
+{
+ return ASHA_MTU;
+}
+
+static int asha_connect_socket(struct asha_device *asha)
+{
+ int fd = 0, err, ret = 0;
+ struct sockaddr_l2 addr = { 0, };
+ struct l2cap_options opts;
+
+ fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
+ if (fd < 0) {
+ error("Could not open L2CAP CoC socket: %s", strerror(errno));
+ goto error;
+ }
+
+ addr.l2_family = AF_BLUETOOTH;
+ addr.l2_bdaddr_type = BDADDR_LE_PUBLIC;
+
+ // We need to bind before connect to work around getting the wrong addr
+ // type on older(?) kernels
+ err = bind(fd, (struct sockaddr *) &addr, sizeof(addr));
+ if (err < 0) {
+ error("Could not bind L2CAP CoC socket: %s", strerror(errno));
+ goto error;
+ }
+
+ addr.l2_psm = asha->psm;
+ bacpy(&addr.l2_bdaddr, device_get_address(asha->device));
+
+ opts.mode = BT_MODE_LE_FLOWCTL;
+ opts.omtu = opts.imtu = ASHA_MTU;
+
+ err = setsockopt(fd, SOL_BLUETOOTH, BT_MODE, &opts.mode,
+ sizeof(opts.mode));
+ if (err < 0) {
+ error("Could not set L2CAP CoC socket flow control mode: %s",
+ strerror(errno));
+ // Let this be non-fatal?
+ }
+
+ err = setsockopt(fd, SOL_BLUETOOTH, BT_RCVMTU, &opts.imtu, sizeof(opts.imtu));
+ if (err < 0) {
+ error("Could not set L2CAP CoC socket receive MTU: %s",
+ strerror(errno));
+ // Let this be non-fatal?
+ }
+
+ err = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
+ if (err < 0) {
+ error("Could not connect L2CAP CoC socket: %s", strerror(errno));
+ goto error;
+ }
+
+ DBG("L2CAP CoC socket is open");
+ return fd;
+
+error:
+ if (fd)
+ close(fd);
+ return -1;
+}
+
+static void asha_acp_sent(bool success, uint8_t err, void *user_data)
+{
+ struct asha_device *asha = user_data;
+
+ if (success) {
+ DBG("AudioControlPoint command successfully sent");
+ } else {
+ error("Failed to send AudioControlPoint command: %d", err);
+
+ if (asha->cb)
+ asha->cb(-1, asha->cb_user_data);
+
+ asha_state_reset(asha);
+ }
+}
+
+static int asha_send_acp(struct asha_device *asha, uint8_t *cmd,
+ unsigned int len, asha_cb_t cb, void *user_data)
+{
+ if (!bt_gatt_client_write_value(asha->client, asha->acp_handle, cmd,
+ len, asha_acp_sent, asha, NULL)) {
+ error("Error writing ACP start");
+ return -1;
+ }
+
+ asha->cb = cb;
+ asha->cb_user_data = user_data;
+
+ return 0;
+}
+
+unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb,
+ void *user_data)
+{
+ uint8_t acp_start_cmd[] = {
+ 0x01, // START
+ 0x01, // G.722, 16 kHz
+ 0, // Unknown media type
+ 0, // Other disconnected
+ };
+ int ret;
+
+ if (asha->state != ASHA_STOPPED) {
+ error("ASHA device start failed. Bad state %d", asha->state);
+ return 0;
+ }
+
+ ret = asha_connect_socket(asha);
+ if (ret < 0)
+ return 0;
+
+ asha->fd = ret;
+
+ ret = asha_send_acp(asha, acp_start_cmd, sizeof(acp_start_cmd), cb,
+ user_data);
+ if (ret < 0)
+ return 0;
+
+ asha->state = ASHA_STARTING;
+
+ return (++asha->resume_id);
+}
+
+unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb,
+ void *user_data)
+{
+ uint8_t acp_stop_cmd[] = {
+ 0x02, // STOP
+ };
+ int ret;
+
+ if (asha->state != ASHA_STARTED)
+ return 0;
+
+ asha->state = ASHA_STOPPING;
+
+ ret = asha_send_acp(asha, acp_stop_cmd, sizeof(acp_stop_cmd), cb,
+ user_data);
+ if (ret < 0)
+ return 0;
+
+ return asha->resume_id;
+}
+
+static char *make_endpoint_path(struct asha_device *asha)
+{
+ char *path;
+ int err;
+
+ err = asprintf(&path, "%s/asha", device_get_path(asha->device));
+ if (err < 0) {
+ error("Could not allocate path for remote %s",
+ device_get_path(asha->device));
+ return NULL;
+ }
+
+ return path;
+
+}
+
+static bool uuid_cmp(const char *uuid1, const bt_uuid_t *uuid2)
+{
+ bt_uuid_t lhs;
+
+ bt_string_to_uuid(&lhs, uuid1);
+
+ return bt_uuid_cmp(&lhs, uuid2) == 0;
+}
+
+static void read_psm(bool success,
+ uint8_t att_ecode,
+ const uint8_t *value,
+ uint16_t length,
+ void *user_data)
+{
+ struct asha_device *asha = user_data;
+
+ if (!success) {
+ DBG("Reading PSM failed with ATT errror: %u", att_ecode);
+ return;
+ }
+
+ if (length != 2) {
+ DBG("Reading PSM failed: unexpected length %u", length);
+ return;
+ }
+
+ asha->psm = get_le16(value);
+
+ DBG("Got PSM: %u", asha->psm);
+}
+
+static void read_rops(bool success,
+ uint8_t att_ecode,
+ const uint8_t *value,
+ uint16_t length,
+ void *user_data)
+{
+ struct asha_device *asha = user_data;
+
+ if (!success) {
+ DBG("Reading ROPs failed with ATT errror: %u", att_ecode);
+ return;
+ }
+
+ if (length != 17) {
+ DBG("Reading ROPs failed: unexpected length %u", length);
+ return;
+ }
+
+ if (value[0] != 0x01) {
+ DBG("Unexpected ASHA version: %u", value[0]);
+ return;
+ }
+
+ /* Device Capabilities */
+ asha->right_side = (value[1] & 0x1) != 0;
+ asha->binaural = (value[1] & 0x2) != 0;
+ asha->csis_supported = (value[1] & 0x4) != 0;
+ /* HiSyncId: 2 byte company id, 6 byte ID shared by left and right */
+ memcpy(asha->hisyncid, &value[2], 8);
+ /* FeatureMap */
+ asha->coc_streaming_supported = (value[10] & 0x1) != 0;
+ /* RenderDelay */
+ asha->render_delay = get_le16(&value[11]);
+ /* byte 13 & 14 are reserved */
+ /* Codec IDs */
+ asha->codec_ids = get_le16(&value[15]);
+
+ DBG("Got ROPS: side %u, binaural %u, csis: %u, delay %u, codecs: %u",
+ asha->right_side, asha->binaural, asha->csis_supported,
+ asha->render_delay, asha->codec_ids);
+}
+
+void audio_status_notify(uint16_t value_handle, const uint8_t *value,
+ uint16_t length, void *user_data)
+{
+ struct asha_device *asha = user_data;
+ uint8_t status = *value;
+ // Back these up to survive the reset paths
+ asha_cb_t cb = asha->cb;
+ asha_cb_t cb_user_data = asha->cb_user_data;
+
+ if (asha->state == ASHA_STARTING) {
+ if (status == 0) {
+ asha->state = ASHA_STARTED;
+ DBG("ASHA start complete");
+ } else {
+ asha_state_reset(asha);
+ DBG("ASHA start failed");
+ }
+ } else if (asha->state == ASHA_STOPPING) {
+ // We reset our state, regardless
+ asha_state_reset(asha);
+ DBG("ASHA stop %s", status == 0 ? "complete" : "failed");
+ }
+
+ if (cb) {
+ cb(status, cb_user_data);
+ asha->cb = NULL;
+ asha->cb_user_data = NULL;
+ }
+}
+
+static void handle_characteristic(struct gatt_db_attribute *attr,
+ void *user_data)
+{
+ struct asha_device *asha = user_data;
+ uint16_t value_handle;
+ bt_uuid_t uuid;
+
+ if (!gatt_db_attribute_get_char_data(attr, NULL, &value_handle, NULL,
+ NULL, &uuid)) {
+ error("Failed to obtain characteristic data");
+ return;
+ }
+
+ if (uuid_cmp(ASHA_CHRC_LE_PSM_OUT_UUID, &uuid)) {
+ if (!bt_gatt_client_read_value(asha->client, value_handle,
+ read_psm, asha, NULL))
+ DBG("Failed to send request to read battery level");
+ } if (uuid_cmp(ASHA_CHRC_READ_ONLY_PROPERTIES_UUID, &uuid)) {
+ if (!bt_gatt_client_read_value(asha->client, value_handle,
+ read_rops, asha, NULL))
+ DBG("Failed to send request to read battery level");
+ } if (uuid_cmp(ASHA_CHRC_AUDIO_CONTROL_POINT_UUID, &uuid)) {
+ // Store this for later writes
+ asha->acp_handle = value_handle;
+ } if (uuid_cmp(ASHA_CHRC_AUDIO_STATUS_UUID, &uuid)) {
+ asha->notify_id = bt_gatt_client_register_notify(asha->client,
+ value_handle, NULL, audio_status_notify, asha,
+ NULL);
+ if (!asha->notify_id)
+ DBG("Failed to send request to read battery level");
+ } else {
+ char uuid_str[MAX_LEN_UUID_STR];
+
+ bt_uuid_to_string(&uuid, uuid_str, sizeof(uuid_str));
+ DBG("Unsupported characteristic: %s", uuid_str);
+ }
+}
+
+static void foreach_asha_service(struct gatt_db_attribute *attr, void *user_data)
+{
+ struct asha_device *asha = user_data;
+
+ DBG("Found ASHA GATT service");
+
+ asha->attr = attr;
+ gatt_db_service_foreach_char(asha->attr, handle_characteristic, asha);
+}
+
+static DBusMessage *asha_set_configuration(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ return NULL;
+}
+
+static gboolean get_uuid(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ const char *uuid;
+
+ uuid = ASHA_PROFILE_UUID;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &uuid);
+
+ return TRUE;
+}
+
+static gboolean get_side(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct asha_device *asha = data;
+ const char *side = asha->right_side ? "right" : "left";
+
+ // Use a string in case we want to support anything else in the future
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &side);
+
+ return TRUE;
+}
+
+
+static gboolean get_binaural(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct asha_device *asha = data;
+ dbus_bool_t binaural = asha->binaural;
+
+ // Use a string in case we want to support anything else in the future
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &binaural);
+
+ return TRUE;
+}
+
+static gboolean get_hisyncid(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct asha_device *asha = data;
+ DBusMessageIter array;
+ uint8_t *hisyncid = asha->hisyncid;
+
+ dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_BYTE_AS_STRING, &array);
+
+ dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE,
+ &hisyncid, sizeof(asha->hisyncid));
+
+ dbus_message_iter_close_container(iter, &array);
+
+ return TRUE;
+}
+
+static gboolean get_codecs(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct asha_device *asha = data;
+ dbus_uint16_t codecs = asha->codec_ids;
+
+ // Use a string in case we want to support anything else in the future
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &codecs);
+
+ return TRUE;
+}
+
+static gboolean get_device(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct asha_device *asha = data;
+ const char *path;
+
+ path = device_get_path(asha->device);
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path);
+
+ return TRUE;
+}
+
+static gboolean get_transport(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct asha_device *asha = data;
+ const char *path;
+
+ path = media_transport_get_path(asha->transport);
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path);
+
+ return TRUE;
+}
+
+static int asha_source_device_probe(struct btd_service *service)
+{
+ struct asha_device *asha;
+ struct btd_device *device = btd_service_get_device(service);
+ char addr[18];
+
+ ba2str(device_get_address(device), addr);
+ DBG("Probing ASHA device %s", addr);
+
+ asha = asha_device_new();
+ asha->device = device;
+
+ btd_service_set_user_data(service, asha);
+
+ return 0;
+}
+
+static void asha_source_device_remove(struct btd_service *service)
+{
+ struct asha_device *asha;
+ struct btd_device *device = btd_service_get_device(service);
+ char addr[18];
+
+ ba2str(device_get_address(device), addr);
+ DBG("Removing ASHA device %s", addr);
+
+ asha = btd_service_get_user_data(service);
+ if (!asha) {
+ // Can this actually happen?
+ DBG("Not handlihng ASHA profile");
+ return;
+ }
+
+ asha_device_free(asha);
+}
+
+static const GDBusMethodTable asha_ep_methods[] = {
+ { },
+};
+
+static const GDBusPropertyTable asha_ep_properties[] = {
+ { "UUID", "s", get_uuid, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Side", "s", get_side, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Binaural", "b", get_binaural, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "HiSyncId", "ay", get_hisyncid, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Codecs", "q", get_codecs, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Device", "o", get_device, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { "Transport", "o", get_transport, NULL, NULL,
+ G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
+ { }
+};
+
+static void asha_source_endpoint_register(struct asha_device *asha)
+{
+ char *path;
+ const struct media_endpoint *asha_ep;
+
+ path = make_endpoint_path(asha);
+ if (!path)
+ goto error;
+
+ if (g_dbus_register_interface(btd_get_dbus_connection(),
+ path, MEDIA_ENDPOINT_INTERFACE,
+ asha_ep_methods, NULL,
+ asha_ep_properties,
+ asha, NULL) == FALSE) {
+ error("Could not register remote ep %s", path);
+ goto error;
+ }
+
+ asha_ep = media_endpoint_get_asha();
+ asha->transport = media_transport_create(asha->device, path, NULL, 0,
+ (void *) asha_ep, asha);
+
+error:
+ if (path)
+ free(path);
+ return;
+}
+
+static void asha_source_endpoint_unregister(struct asha_device *asha)
+{
+ char *path;
+
+ path = make_endpoint_path(asha);
+ if (!path)
+ goto error;
+
+ g_dbus_unregister_interface(btd_get_dbus_connection(),
+ path, MEDIA_ENDPOINT_INTERFACE);
+
+ if (asha->transport) {
+ media_transport_destroy(asha->transport);
+ asha->transport = NULL;
+ }
+
+error:
+ if (path)
+ free(path);
+}
+
+static int asha_source_accept(struct btd_service *service)
+{
+ struct btd_device *device = btd_service_get_device(service);
+ struct gatt_db *db = btd_device_get_gatt_db(device);
+ struct bt_gatt_client *client = btd_device_get_gatt_client(device);
+ struct asha_device *asha = btd_service_get_user_data(service);
+ bt_uuid_t asha_uuid;
+ char addr[18];
+
+ ba2str(device_get_address(device), addr);
+ DBG("Accepting ASHA connection on %s", addr);
+
+ if (!asha) {
+ // Can this actually happen?
+ DBG("Not handling ASHA profile");
+ return -1;
+ }
+
+ asha->db = gatt_db_ref(db);
+ asha->client = bt_gatt_client_clone(client);
+
+ bt_uuid16_create(&asha_uuid, ASHA_SERVICE);
+ gatt_db_foreach_service(db, &asha_uuid, foreach_asha_service, asha);
+
+ if (!asha->attr) {
+ error("ASHA attribute not found");
+ asha_device_reset(asha);
+ return -1;
+ }
+
+ asha_source_endpoint_register(asha);
+
+ btd_service_connecting_complete(service, 0);
+
+ return 0;
+}
+
+static int asha_source_disconnect(struct btd_service *service)
+{
+ struct btd_device *device = btd_service_get_device(service);
+ struct gatt_db *db = btd_device_get_gatt_db(device);
+ struct bt_gatt_client *client = btd_device_get_gatt_client(device);
+ struct asha_device *asha = btd_service_get_user_data(service);
+ bt_uuid_t asha_uuid;
+ char addr[18];
+
+ ba2str(device_get_address(device), addr);
+ DBG("Disconnecting ASHA on %s", addr);
+
+ if (!asha) {
+ // Can this actually happen?
+ DBG("Not handlihng ASHA profile");
+ return -1;
+ }
+
+ asha_source_endpoint_unregister(asha);
+ asha_device_reset(asha);
+
+ btd_service_disconnecting_complete(service, 0);
+
+ return 0;
+}
+
+static struct btd_profile asha_source_profile = {
+ .name = "asha-source",
+ .priority = BTD_PROFILE_PRIORITY_MEDIUM,
+ .remote_uuid = ASHA_PROFILE_UUID,
+ .experimental = true,
+
+ .device_probe = asha_source_device_probe,
+ .device_remove = asha_source_device_remove,
+
+ .auto_connect = true,
+ .accept = asha_source_accept,
+ .disconnect = asha_source_disconnect,
+};
+
+static int asha_init(void)
+{
+ int err;
+
+ err = btd_profile_register(&asha_source_profile);
+ if (err)
+ return err;
+
+ return 0;
+}
+
+static void asha_exit(void)
+{
+ btd_profile_unregister(&asha_source_profile);
+}
+
+BLUETOOTH_PLUGIN_DEFINE(asha, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
+ asha_init, asha_exit)
diff --git a/profiles/audio/asha.h b/profiles/audio/asha.h
new file mode 100644
index 000000000..0fc28e8a3
--- /dev/null
+++ b/profiles/audio/asha.h
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2024 Asymptotic Inc.
+ *
+ * Author: Arun Raghavan <[email protected]>
+ *
+ *
+ */
+
+#include <stdint.h>
+
+struct asha_device;
+
+typedef enum {
+ ASHA_STOPPED = 0,
+ ASHA_STARTING,
+ ASHA_STARTED,
+ ASHA_STOPPING,
+} asha_state_t;
+
+typedef void (*asha_cb_t)(int status, void *data);
+
+uint16_t asha_device_get_render_delay(struct asha_device *asha);
+asha_state_t asha_device_get_state(struct asha_device *asha);
+int asha_device_get_fd(struct asha_device *asha);
+uint16_t asha_device_get_mtu(struct asha_device *asha);
+
+unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb,
+ void *user_data);
+unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb,
+ void *user_data);
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 07147a25d..68ce2f17c 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -44,6 +44,7 @@
#include "src/shared/bap.h"
#include "src/shared/bap-debug.h"
+#include "asha.h"
#include "avdtp.h"
#include "media.h"
#include "transport.h"
@@ -88,6 +89,7 @@ struct endpoint_request {
struct media_endpoint {
struct a2dp_sep *sep;
struct bt_bap_pac *pac;
+ struct asha_device *asha;
char *sender; /* Endpoint DBus bus id */
char *path; /* Endpoint object path */
char *uuid; /* Endpoint property UUID */
@@ -1329,6 +1331,12 @@ static bool endpoint_init_broadcast_sink(struct media_endpoint *endpoint,
return endpoint_init_pac(endpoint, BT_BAP_BCAST_SINK, err);
}
+static bool endpoint_init_asha(struct media_endpoint *endpoint,
+ int *err)
+{
+ return true;
+}
+
static bool endpoint_properties_exists(const char *uuid,
struct btd_device *dev,
void *user_data)
@@ -1453,6 +1461,11 @@ static bool experimental_bcast_sink_ep_supported(struct btd_adapter *adapter)
return g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL;
}
+static bool experimental_asha_supported(struct btd_adapter *adapter)
+{
+ return g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL;
+}
+
static const struct media_endpoint_init {
const char *uuid;
bool (*func)(struct media_endpoint *endpoint, int *err);
@@ -1470,6 +1483,8 @@ static const struct media_endpoint_init {
experimental_broadcaster_ep_supported },
{ BAA_SERVICE_UUID, endpoint_init_broadcast_sink,
experimental_bcast_sink_ep_supported },
+ { ASHA_PROFILE_UUID, endpoint_init_asha,
+ experimental_asha_supported },
};
static struct media_endpoint *
@@ -3392,3 +3407,16 @@ bool media_endpoint_is_broadcast(struct media_endpoint *endpoint)
return false;
}
+
+const struct media_endpoint *media_endpoint_get_asha()
+{
+ // Because ASHA does not require the application to register an
+ // endpoint, we need a minimal media_endpoint for transport creation to
+ // work, so let's create one
+ static struct media_endpoint asha_endpoint = {
+ .uuid = ASHA_PROFILE_UUID,
+ .codec = 0x2, /* Currently on G.722 is defined by the spec */
+ };
+
+ return &asha_endpoint;
+}
diff --git a/profiles/audio/media.h b/profiles/audio/media.h
index 2b579877b..68c57cfc3 100644
--- a/profiles/audio/media.h
+++ b/profiles/audio/media.h
@@ -24,3 +24,5 @@ struct btd_adapter *media_endpoint_get_btd_adapter(
struct media_endpoint *endpoint);
bool media_endpoint_is_broadcast(struct media_endpoint *endpoint);
int8_t media_player_get_device_volume(struct btd_device *device);
+
+const struct media_endpoint *media_endpoint_get_asha();
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index 159fbd575..a104d27c0 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -37,6 +37,7 @@
#include "src/shared/bap.h"
#include "src/shared/io.h"
+#include "asha.h"
#include "avdtp.h"
#include "media.h"
#include "transport.h"
@@ -90,6 +91,10 @@ struct bap_transport {
guint resume_id;
};
+struct asha_transport {
+ uint16_t delay;
+};
+
struct media_transport_ops {
const char *uuid;
const GDBusPropertyTable *properties;
@@ -115,7 +120,7 @@ struct media_transport {
char *path; /* Transport object path */
struct btd_device *device; /* Transport device */
struct btd_adapter *adapter; /* Transport adapter bcast*/
- const char *remote_endpoint; /* Transport remote SEP */
+ char *remote_endpoint; /* Transport remote SEP */
struct media_endpoint *endpoint; /* Transport endpoint */
struct media_owner *owner; /* Transport owner */
uint8_t *configuration; /* Transport configuration */
@@ -219,6 +224,9 @@ void media_transport_destroy(struct media_transport *transport)
g_dbus_unregister_interface(btd_get_dbus_connection(), path,
MEDIA_TRANSPORT_INTERFACE);
+ if (transport->remote_endpoint)
+ g_free(transport->remote_endpoint);
+
g_free(path);
}
@@ -1199,6 +1207,32 @@ static const GDBusPropertyTable transport_bap_bc_properties[] = {
{ }
};
+static gboolean get_asha_delay(const GDBusPropertyTable *property,
+ DBusMessageIter *iter, void *data)
+{
+ struct media_transport *transport = data;
+ struct asha_device *asha = transport->data;
+ uint16_t delay;
+
+ // Delay property is in 1/10ths of ms, while ASHA RenderDelay is in ms
+ delay = asha_device_get_render_delay(asha) * 10;
+
+ dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &delay);
+
+ return TRUE;
+}
+
+static const GDBusPropertyTable transport_asha_properties[] = {
+ { "Device", "o", get_device },
+ { "Endpoint", "o", get_endpoint, NULL, endpoint_exists },
+ { "UUID", "s", get_uuid },
+ { "Codec", "y", get_codec },
+ { "State", "s", get_state },
+ { "Delay", "q", get_asha_delay },
+ { "Volume", "q", get_volume, set_volume, volume_exists },
+ { }
+};
+
static void transport_a2dp_destroy(void *data)
{
struct a2dp_transport *a2dp = data;
@@ -1713,6 +1747,106 @@ static void *transport_bap_init(struct media_transport *transport, void *stream)
return bap;
}
+static void asha_transport_sync_state(struct media_transport *transport,
+ struct asha_device *asha)
+{
+ switch (asha_device_get_state(asha)) {
+ case ASHA_STOPPED:
+ transport_set_state(transport, TRANSPORT_STATE_IDLE);
+ break;
+ case ASHA_STARTING:
+ transport_set_state(transport, TRANSPORT_STATE_REQUESTING);
+ break;
+ case ASHA_STARTED:
+ transport_set_state(transport, TRANSPORT_STATE_ACTIVE);
+ break;
+ case ASHA_STOPPING:
+ transport_set_state(transport, TRANSPORT_STATE_SUSPENDING);
+ break;
+ }
+}
+
+static void asha_transport_state_cb(int status, void *user_data)
+{
+ struct media_owner *owner = user_data;
+ struct media_transport *transport = owner->transport;
+ struct asha_device *asha = transport->data;
+ asha_state_t state;
+
+ state = asha_device_get_state(asha);
+
+ if (state == ASHA_STARTED) {
+ int fd;
+ uint16_t imtu, omtu;
+ gboolean ret;
+
+ fd = asha_device_get_fd(asha);
+ imtu = omtu = asha_device_get_mtu(asha);
+
+ media_transport_set_fd(transport, fd, imtu, omtu);
+
+ owner->pending->id = 0;
+ ret = g_dbus_send_reply(btd_get_dbus_connection(),
+ owner->pending->msg,
+ DBUS_TYPE_UNIX_FD, &fd,
+ DBUS_TYPE_UINT16, &imtu,
+ DBUS_TYPE_UINT16, &omtu,
+ DBUS_TYPE_INVALID);
+ if (!ret) {
+ media_transport_remove_owner(transport);
+ return;
+ }
+
+ media_owner_remove(owner);
+ } else if (state == ASHA_STOPPED) {
+ if (owner->pending) {
+ owner->pending->id = 0;
+ media_request_reply(owner->pending, 0);
+ media_owner_remove(owner);
+ }
+
+ media_transport_remove_owner(transport);
+ }
+
+ asha_transport_sync_state(transport, asha);
+}
+
+static guint transport_asha_resume(struct media_transport *transport,
+ struct media_owner *owner)
+{
+ struct asha_device *asha = transport->data;
+ guint ret;
+
+ ret = asha_device_start(asha, asha_transport_state_cb, owner);
+ asha_transport_sync_state(transport, asha);
+
+ return ret;
+}
+
+static guint transport_asha_suspend(struct media_transport *transport,
+ struct media_owner *owner)
+{
+ struct asha_device *asha = transport->data;
+ guint ret = 0;
+
+ if (owner) {
+ ret = asha_device_stop(asha, asha_transport_state_cb, owner);
+ asha_transport_sync_state(transport, asha);
+ } else {
+ ret = asha_device_stop(asha, NULL, NULL);
+ // We won't have a callback to set the final state
+ transport_set_state(transport, TRANSPORT_STATE_IDLE);
+ }
+
+ return ret;
+}
+
+static void *transport_asha_init(struct media_transport *transport, void *data)
+{
+ /* We just store the struct asha_device on the transport */
+ return data;
+}
+
#define TRANSPORT_OPS(_uuid, _props, _set_owner, _remove_owner, _init, \
_resume, _suspend, _cancel, _set_state, _get_stream, \
_get_volume, _set_volume, _destroy) \
@@ -1754,6 +1888,14 @@ static void *transport_bap_init(struct media_transport *transport, void *stream)
#define BAP_BC_OPS(_uuid) \
BAP_OPS(_uuid, transport_bap_bc_properties, NULL, NULL)
+#define ASHA_OPS(_uuid) \
+ TRANSPORT_OPS(_uuid, transport_asha_properties, NULL, NULL, \
+ transport_asha_init, \
+ transport_asha_resume, transport_asha_suspend, \
+ NULL, NULL, NULL, \
+ NULL, NULL, \
+ NULL)
+
static const struct media_transport_ops transport_ops[] = {
A2DP_OPS(A2DP_SOURCE_UUID, transport_a2dp_src_init,
transport_a2dp_src_set_volume,
@@ -1765,6 +1907,7 @@ static const struct media_transport_ops transport_ops[] = {
BAP_UC_OPS(PAC_SINK_UUID),
BAP_BC_OPS(BCAA_SERVICE_UUID),
BAP_BC_OPS(BAA_SERVICE_UUID),
+ ASHA_OPS(ASHA_PROFILE_UUID),
};
static const struct media_transport_ops *
@@ -1802,7 +1945,7 @@ struct media_transport *media_transport_create(struct btd_device *device,
transport->endpoint = endpoint;
transport->configuration = util_memdup(configuration, size);
transport->size = size;
- transport->remote_endpoint = remote_endpoint;
+ transport->remote_endpoint = g_strdup(remote_endpoint);
if (device)
transport->path = g_strdup_printf("%s/fd%d",
--
2.45.0
Plays out an audio file to the device. Depends on GStreamer for media
file reading and decoding (specifically, gstreamer core,
gst-plugins-base, gst-ffmpeg, and gst-python, or equivalent packages).
---
test/simple-asha | 158 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 158 insertions(+)
create mode 100755 test/simple-asha
diff --git a/test/simple-asha b/test/simple-asha
new file mode 100755
index 000000000..feff9d29c
--- /dev/null
+++ b/test/simple-asha
@@ -0,0 +1,158 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+import os
+import signal
+import sys
+
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
+import gi
+
+gi.require_version("Gst", "1.0")
+gi.require_version("GLib", "2.0")
+from gi.repository import GLib, Gst
+
+import bluezutils
+
+mainloop = None
+pipeline = None
+seqnum: int = 0
+
+
+def signal_handler(_sig, _frame):
+ print("Got interrupt")
+ mainloop.quit()
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
+def usage():
+ print(f"Usage: simple-asha <remote addr> <audio file name> (optional volume 0-127)")
+
+
+def start_playback(fd: int):
+ global mainloop, pipeline
+
+ outdata = bytearray(161)
+
+ Gst.init(None)
+
+ pipeline = Gst.parse_launch(
+ f"""
+ filesrc location="{sys.argv[2]}" ! decodebin !
+ audioconvert ! audioresample !
+ audiobuffersplit output-buffer-duration="20/1000" ! avenc_g722 !
+ appsink name=sink emit-signals=true
+ """
+ )
+
+ def on_new_sample(sink):
+ global seqnum
+
+ sample = sink.emit("pull-sample")
+ buf = sample.get_buffer()
+
+ with buf.map(Gst.MapFlags.READ) as info:
+ pos = 0
+
+ if info.size != 160:
+ print("Unexpected buffer size: ", info.size)
+
+ outdata[pos] = seqnum % 256
+ pos += 1
+
+ for byte in info.data:
+ outdata[pos] = byte
+ pos += 1
+
+ try:
+ n = os.write(fd, outdata)
+ if n != 161:
+ print("Wrote less than expected: ", n)
+ except:
+ return Gst.FlowReturn.ERROR
+
+ seqnum += 1
+
+ return Gst.FlowReturn.OK
+
+ sink = pipeline.get_by_name("sink")
+ sink.connect("new-sample", on_new_sample)
+
+ pipeline.set_state(Gst.State.PLAYING)
+
+ def bus_message(_bus, message, _data) -> bool:
+ typ = message.type
+
+ if typ == Gst.MessageType.EOS:
+ print("End of stream")
+ mainloop.quit()
+ elif typ == Gst.MessageType.ERROR:
+ err, debug = message.parse_error()
+ print(f"Pipeline error: {err} ({debug})")
+ mainloop.quit()
+
+ bus = pipeline.get_bus()
+ bus.add_watch(GLib.PRIORITY_DEFAULT, bus_message, None)
+
+
+if __name__ == "__main__":
+ dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+
+ mainloop = GLib.MainLoop()
+ bus = dbus.SystemBus()
+
+ if (len(sys.argv) == 3) or (len(sys.argv) == 4):
+ device = bluezutils.find_device(sys.argv[1])
+ if device is None:
+ print("Could not find device: ", sys.argv[1])
+ exit(255)
+ else:
+ usage()
+ sys.exit(255)
+
+ asha = bus.get_object("org.bluez", device.object_path + "/asha")
+ media = dbus.Interface(
+ bus.get_object("org.bluez", device.object_path + "/asha"),
+ "org.bluez.MediaEndpoint1",
+ )
+
+ props = asha.GetAll(
+ "org.bluez.MediaEndpoint1",
+ dbus_interface="org.freedesktop.DBus.Properties",
+ )
+ path = props["Transport"]
+
+ print("Trying to acquire", path)
+
+ transport = dbus.Interface(
+ bus.get_object("org.bluez", path),
+ "org.bluez.MediaTransport1",
+ )
+
+ # Keep default volume at 25%
+ volume = 32
+ if len(sys.argv) == 4:
+ volume = int(sys.argv[3])
+ if volume < 0 or volume > 127:
+ print("Volume must be between 0 (mute) and 127 (max)")
+
+ transport.Set(
+ "org.bluez.MediaTransport1",
+ "Volume",
+ dbus.UInt16(volume, variant_level=1),
+ dbus_interface="org.freedesktop.DBus.Properties",
+ )
+
+ (fd, imtu, omtu) = transport.Acquire()
+
+ start_playback(fd.take())
+
+ mainloop.run()
+
+ pipeline.set_state(Gst.State.NULL)
+ transport.Release()
--
2.45.0
These directories are created when running scripts in test/ in-tree, and
can safely be ignored.
---
.gitignore | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitignore b/.gitignore
index 6a6422379..041a707af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,3 +187,5 @@ compile_commands.json
cscope.in.out
cscope.out
cscope.po.out
+
+**/__pycache__
--
2.45.0
We convert from the spec definition of the range to the DBus API range
to make it easier for clients to not have to worry about that detail,
and share an implementation with other uses of MediaTransport1.
---
profiles/audio/asha.c | 88 +++++++++++++++++++++++++++++++++++---
profiles/audio/asha.h | 4 ++
profiles/audio/transport.c | 28 +++++++++++-
3 files changed, 112 insertions(+), 8 deletions(-)
diff --git a/profiles/audio/asha.c b/profiles/audio/asha.c
index c6769038f..a372e0db3 100644
--- a/profiles/audio/asha.c
+++ b/profiles/audio/asha.c
@@ -65,7 +65,9 @@ struct asha_device {
struct gatt_db *db;
struct gatt_db_attribute *attr;
uint16_t acp_handle;
- unsigned int notify_id;
+ uint16_t volume_handle;
+ unsigned int status_notify_id;
+ unsigned int volume_notify_id;
uint16_t psm;
bool right_side;
@@ -75,6 +77,7 @@ struct asha_device {
uint8_t hisyncid[8];
uint16_t render_delay;
uint16_t codec_ids;
+ int8_t volume;
struct media_transport *transport;
int fd;
@@ -95,9 +98,15 @@ static struct asha_device *asha_device_new(void)
static void asha_device_reset(struct asha_device *asha)
{
- if (asha->notify_id)
+ if (asha->status_notify_id) {
bt_gatt_client_unregister_notify(asha->client,
- asha->notify_id);
+ asha->status_notify_id);
+ }
+
+ if (asha->volume_notify_id) {
+ bt_gatt_client_unregister_notify(asha->client,
+ asha->volume_notify_id);
+ }
gatt_db_unref(asha->db);
asha->db = NULL;
@@ -244,6 +253,7 @@ unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb,
0x01, // START
0x01, // G.722, 16 kHz
0, // Unknown media type
+ asha->volume, // Volume
0, // Other disconnected
};
int ret;
@@ -290,6 +300,24 @@ unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb,
return asha->resume_id;
}
+int8_t asha_device_get_volume(struct asha_device *asha)
+{
+ return asha->volume;
+}
+
+bool asha_device_set_volume(struct asha_device *asha, int8_t volume)
+{
+ if (!bt_gatt_client_write_value(asha->client, asha->volume_handle,
+ (const uint8_t *)&volume, 1, NULL, NULL,
+ NULL)) {
+ error("Error writing ACP start");
+ return false;
+ }
+
+ asha->volume = volume;
+ return true;
+}
+
static char *make_endpoint_path(struct asha_device *asha)
{
char *path;
@@ -410,6 +438,39 @@ void audio_status_notify(uint16_t value_handle, const uint8_t *value,
}
}
+static void read_volume(bool success,
+ uint8_t att_ecode,
+ const uint8_t *value,
+ uint16_t length,
+ void *user_data)
+{
+ struct asha_device *asha = user_data;
+
+ if (!success) {
+ DBG("Reading volume failed with ATT errror: %u", att_ecode);
+ return;
+ }
+
+ if (length != 2) {
+ DBG("Reading volume failed: unexpected length %u", length);
+ return;
+ }
+
+ asha->volume = get_s8(value);
+
+ DBG("Got volume: %d", asha->volume);
+}
+
+void volume_notify(uint16_t value_handle, const uint8_t *value,
+ uint16_t length, void *user_data)
+{
+ struct asha_device *asha = user_data;
+
+ asha->volume = get_s8(value);
+
+ DBG("Volume changed: %d", asha->volume);
+}
+
static void handle_characteristic(struct gatt_db_attribute *attr,
void *user_data)
{
@@ -430,16 +491,29 @@ static void handle_characteristic(struct gatt_db_attribute *attr,
} if (uuid_cmp(ASHA_CHRC_READ_ONLY_PROPERTIES_UUID, &uuid)) {
if (!bt_gatt_client_read_value(asha->client, value_handle,
read_rops, asha, NULL))
- DBG("Failed to send request to read battery level");
+ DBG("Failed to send request for readonly properties");
} if (uuid_cmp(ASHA_CHRC_AUDIO_CONTROL_POINT_UUID, &uuid)) {
// Store this for later writes
asha->acp_handle = value_handle;
+ } if (uuid_cmp(ASHA_CHRC_VOLUME_UUID, &uuid)) {
+ // Store this for later reads and writes
+ asha->volume_handle = value_handle;
+ asha->volume_notify_id =
+ bt_gatt_client_register_notify(asha->client,
+ value_handle, NULL, volume_notify, asha,
+ NULL);
+ if (!asha->status_notify_id)
+ DBG("Failed to send request to notify volume");
+ if (!bt_gatt_client_read_value(asha->client, value_handle,
+ read_volume, asha, NULL))
+ DBG("Failed to send request to volume");
} if (uuid_cmp(ASHA_CHRC_AUDIO_STATUS_UUID, &uuid)) {
- asha->notify_id = bt_gatt_client_register_notify(asha->client,
+ asha->status_notify_id =
+ bt_gatt_client_register_notify(asha->client,
value_handle, NULL, audio_status_notify, asha,
NULL);
- if (!asha->notify_id)
- DBG("Failed to send request to read battery level");
+ if (!asha->status_notify_id)
+ DBG("Failed to send request to notify AudioStatus");
} else {
char uuid_str[MAX_LEN_UUID_STR];
diff --git a/profiles/audio/asha.h b/profiles/audio/asha.h
index 0fc28e8a3..20bcaa65b 100644
--- a/profiles/audio/asha.h
+++ b/profiles/audio/asha.h
@@ -10,6 +10,7 @@
*
*/
+#include <stdbool.h>
#include <stdint.h>
struct asha_device;
@@ -32,3 +33,6 @@ unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb,
void *user_data);
unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb,
void *user_data);
+
+int8_t asha_device_get_volume(struct asha_device *asha);
+bool asha_device_set_volume(struct asha_device *asha, int8_t volume);
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index a104d27c0..b85d96914 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -1841,6 +1841,32 @@ static guint transport_asha_suspend(struct media_transport *transport,
return ret;
}
+static int8_t transport_asha_get_volume(struct media_transport *transport)
+{
+ struct asha_device *asha = transport->data;
+ int8_t volume;
+ int scaled_volume;
+
+ volume = asha_device_get_volume(asha);
+
+ // Convert -128-0 to 0-127
+ scaled_volume = ((((int) volume) + 128) * 127) / 128;
+
+ return scaled_volume;
+}
+
+static int transport_asha_set_volume(struct media_transport *transport,
+ int8_t volume)
+{
+ struct asha_device *asha = transport->data;
+ int scaled_volume;
+
+ // Convert 0-127 to -128-0
+ scaled_volume = ((((int) volume) * 128) / 127) - 128;
+
+ return asha_device_set_volume(asha, scaled_volume) ? 0 : -EIO;
+}
+
static void *transport_asha_init(struct media_transport *transport, void *data)
{
/* We just store the struct asha_device on the transport */
@@ -1893,7 +1919,7 @@ static void *transport_asha_init(struct media_transport *transport, void *data)
transport_asha_init, \
transport_asha_resume, transport_asha_suspend, \
NULL, NULL, NULL, \
- NULL, NULL, \
+ transport_asha_get_volume, transport_asha_set_volume, \
NULL)
static const struct media_transport_ops transport_ops[] = {
--
2.45.0
Hi Arun,
On Wed, May 8, 2024 at 12:05 PM Arun Raghavan <[email protected]> wrote:
>
> This implements the server role for the Audio Streaming for Hearing Aid
> specification[1].
>
> The implementation registers a remote endpoint using a subset of the
> MediaEndpoint1 interface, without any mechanism for setting/selecting a
> configuration, as this is all static in the spec for now. Also exposed
> on connection is a MediaTransport1 object, which can be used to obtain
> an fd to stream to the device.
>
> [1] https://source.android.com/docs/core/connect/bluetooth/asha
> ---
> Makefile.plugins | 5 +
> configure.ac | 4 +
> lib/uuid.h | 3 +
> profiles/audio/asha.c | 761 +++++++++++++++++++++++++++++++++++++
> profiles/audio/asha.h | 34 ++
> profiles/audio/media.c | 28 ++
> profiles/audio/media.h | 2 +
> profiles/audio/transport.c | 147 ++++++-
> 8 files changed, 982 insertions(+), 2 deletions(-)
> create mode 100644 profiles/audio/asha.c
> create mode 100644 profiles/audio/asha.h
>
> diff --git a/Makefile.plugins b/Makefile.plugins
> index 4aa2c9c92..e196e1d2e 100644
> --- a/Makefile.plugins
> +++ b/Makefile.plugins
> @@ -147,3 +147,8 @@ if CSIP
> builtin_modules += csip
> builtin_sources += profiles/audio/csip.c
> endif
> +
> +if ASHA
> +builtin_modules += asha
> +builtin_sources += profiles/audio/asha.c
> +endif
> diff --git a/configure.ac b/configure.ac
> index 9dea70ddc..826b34518 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -216,6 +216,10 @@ AC_ARG_ENABLE(csip, AS_HELP_STRING([--disable-csip],
> [disable CSIP profile]), [enable_csip=${enableval}])
> AM_CONDITIONAL(CSIP, test "${enable_csip}" != "no")
>
> +AC_ARG_ENABLE(asha, AS_HELP_STRING([--disable-asha],
> + [disable ASHA support]), [enable_asha=${enableval}])
> +AM_CONDITIONAL(ASHA, test "${enable_asha}" != "no")
> +
> AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools],
> [disable Bluetooth tools]), [enable_tools=${enableval}])
> AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
> diff --git a/lib/uuid.h b/lib/uuid.h
> index 8404b287e..479986f06 100644
> --- a/lib/uuid.h
> +++ b/lib/uuid.h
> @@ -163,6 +163,9 @@ extern "C" {
> #define BAA_SERVICE 0x1851
> #define BAA_SERVICE_UUID "00001851-0000-1000-8000-00805f9b34fb"
>
> +#define ASHA_SERVICE 0xFDF0
> +#define ASHA_PROFILE_UUID "0000FDF0-0000-1000-8000-00805f9b34fb"
> +
> #define PAC_CONTEXT 0x2bcd
> #define PAC_SUPPORTED_CONTEXT 0x2bce
>
> diff --git a/profiles/audio/asha.c b/profiles/audio/asha.c
> new file mode 100644
> index 000000000..c6769038f
> --- /dev/null
> +++ b/profiles/audio/asha.c
> @@ -0,0 +1,761 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + *
> + * BlueZ - Bluetooth protocol stack for Linux
> + *
> + * Copyright (C) 2024 Asymptotic Inc.
> + *
> + * Author: Arun Raghavan <[email protected]>
> + *
> + *
> + */
> +
> +#ifdef HAVE_CONFIG_H
> +#include <config.h>
> +#endif
> +
> +#define _GNU_SOURCE
> +
> +#include <stdbool.h>
> +#include <stdint.h>
> +#include <stdlib.h>
> +#include <string.h>
> +#include <sys/socket.h>
> +
> +#include <dbus/dbus.h>
> +#include <glib.h>
> +
> +#include "gdbus/gdbus.h"
> +#include "lib/bluetooth.h"
> +#include "lib/uuid.h"
> +
> +#include "src/dbus-common.h"
> +#include "src/adapter.h"
> +#include "src/device.h"
> +#include "src/log.h"
> +#include "src/plugin.h"
> +#include "src/profile.h"
> +#include "src/service.h"
> +#include "src/shared/att.h"
> +#include "src/shared/gatt-client.h"
> +#include "src/shared/gatt-db.h"
> +#include "src/shared/util.h"
> +
> +#include "profiles/audio/media.h"
> +#include "profiles/audio/transport.h"
> +
> +#include "asha.h"
> +#include "l2cap.h"
> +
> +/* We use strings instead of uint128_t to maintain readability */
> +#define ASHA_CHRC_READ_ONLY_PROPERTIES_UUID "6333651e-c481-4a3e-9169-7c902aad37bb"
> +#define ASHA_CHRC_AUDIO_CONTROL_POINT_UUID "f0d4de7e-4a88-476c-9d9f-1937b0996cc0"
> +#define ASHA_CHRC_AUDIO_STATUS_UUID "38663f1a-e711-4cac-b641-326b56404837"
> +#define ASHA_CHRC_VOLUME_UUID "00e4ca9e-ab14-41e4-8823-f9e70c7e91df"
> +#define ASHA_CHRC_LE_PSM_OUT_UUID "2d410339-82b6-42aa-b34e-e2e01df8cc1a"
> +
> +#define MEDIA_ENDPOINT_INTERFACE "org.bluez.MediaEndpoint1"
> +
> +// 1 sequence number, 4 for L2CAP header, 2 for SDU, and then 20ms of G.722
> +#define ASHA_MTU 167
Afaik the L2CAP header is already accounted for, or is it another header?
> +
> +struct asha_device {
> + struct btd_device *device;
> + struct bt_gatt_client *client;
> + struct gatt_db *db;
> + struct gatt_db_attribute *attr;
> + uint16_t acp_handle;
> + unsigned int notify_id;
> +
> + uint16_t psm;
> + bool right_side;
> + bool binaural;
> + bool csis_supported;
> + bool coc_streaming_supported;
> + uint8_t hisyncid[8];
> + uint16_t render_delay;
> + uint16_t codec_ids;
> +
> + struct media_transport *transport;
> + int fd;
> + asha_state_t state;
> + asha_cb_t cb;
> + void *cb_user_data;
> + int resume_id;
> +};
> +
> +static struct asha_device *asha_device_new(void)
> +{
> + struct asha_device *asha;
> +
> + asha = new0(struct asha_device, 1);
> +
> + return asha;
> +}
> +
> +static void asha_device_reset(struct asha_device *asha)
> +{
> + if (asha->notify_id)
> + bt_gatt_client_unregister_notify(asha->client,
> + asha->notify_id);
> +
> + gatt_db_unref(asha->db);
> + asha->db = NULL;
> +
> + bt_gatt_client_unref(asha->client);
> + asha->client = NULL;
> +
> + asha->psm = 0;
> +}
> +
> +static void asha_state_reset(struct asha_device *asha)
> +{
> + close(asha->fd);
> + asha->fd = -1;
> +
> + asha->state = ASHA_STOPPED;
> + asha->resume_id = 0;
> +
> + asha->cb = NULL;
> + asha->cb_user_data = NULL;
> +}
> +
> +static void asha_device_free(struct asha_device *asha)
> +{
> + gatt_db_unref(asha->db);
> + bt_gatt_client_unref(asha->client);
> + free(asha);
> +}
> +
> +uint16_t asha_device_get_render_delay(struct asha_device *asha)
> +{
> + return asha->render_delay;
> +}
> +
> +asha_state_t asha_device_get_state(struct asha_device *asha)
> +{
> + return asha->state;
> +}
> +
> +int asha_device_get_fd(struct asha_device *asha)
> +{
> + return asha->fd;
> +}
> +
> +uint16_t asha_device_get_mtu(struct asha_device *asha)
> +{
> + return ASHA_MTU;
> +}
> +
> +static int asha_connect_socket(struct asha_device *asha)
> +{
> + int fd = 0, err, ret = 0;
> + struct sockaddr_l2 addr = { 0, };
> + struct l2cap_options opts;
> +
> + fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
> + if (fd < 0) {
> + error("Could not open L2CAP CoC socket: %s", strerror(errno));
> + goto error;
> + }
> +
> + addr.l2_family = AF_BLUETOOTH;
> + addr.l2_bdaddr_type = BDADDR_LE_PUBLIC;
> +
> + // We need to bind before connect to work around getting the wrong addr
> + // type on older(?) kernels
Lets use C style comments /* */ instead of //, so please fix that in
other comments as well.
> + err = bind(fd, (struct sockaddr *) &addr, sizeof(addr));
> + if (err < 0) {
> + error("Could not bind L2CAP CoC socket: %s", strerror(errno));
> + goto error;
> + }
> +
> + addr.l2_psm = asha->psm;
> + bacpy(&addr.l2_bdaddr, device_get_address(asha->device));
> +
> + opts.mode = BT_MODE_LE_FLOWCTL;
> + opts.omtu = opts.imtu = ASHA_MTU;
> +
> + err = setsockopt(fd, SOL_BLUETOOTH, BT_MODE, &opts.mode,
> + sizeof(opts.mode));
> + if (err < 0) {
> + error("Could not set L2CAP CoC socket flow control mode: %s",
> + strerror(errno));
> + // Let this be non-fatal?
> + }
> +
> + err = setsockopt(fd, SOL_BLUETOOTH, BT_RCVMTU, &opts.imtu, sizeof(opts.imtu));
> + if (err < 0) {
> + error("Could not set L2CAP CoC socket receive MTU: %s",
> + strerror(errno));
> + // Let this be non-fatal?
> + }
> +
> + err = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
> + if (err < 0) {
> + error("Could not connect L2CAP CoC socket: %s", strerror(errno));
> + goto error;
> + }
> +
> + DBG("L2CAP CoC socket is open");
> + return fd;
> +
> +error:
> + if (fd)
> + close(fd);
> + return -1;
> +}
> +
> +static void asha_acp_sent(bool success, uint8_t err, void *user_data)
> +{
> + struct asha_device *asha = user_data;
> +
> + if (success) {
> + DBG("AudioControlPoint command successfully sent");
> + } else {
> + error("Failed to send AudioControlPoint command: %d", err);
> +
> + if (asha->cb)
> + asha->cb(-1, asha->cb_user_data);
> +
> + asha_state_reset(asha);
> + }
> +}
> +
> +static int asha_send_acp(struct asha_device *asha, uint8_t *cmd,
> + unsigned int len, asha_cb_t cb, void *user_data)
> +{
> + if (!bt_gatt_client_write_value(asha->client, asha->acp_handle, cmd,
> + len, asha_acp_sent, asha, NULL)) {
> + error("Error writing ACP start");
> + return -1;
> + }
> +
> + asha->cb = cb;
> + asha->cb_user_data = user_data;
> +
> + return 0;
> +}
> +
> +unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb,
> + void *user_data)
> +{
> + uint8_t acp_start_cmd[] = {
> + 0x01, // START
> + 0x01, // G.722, 16 kHz
> + 0, // Unknown media type
> + 0, // Other disconnected
> + };
> + int ret;
> +
> + if (asha->state != ASHA_STOPPED) {
> + error("ASHA device start failed. Bad state %d", asha->state);
> + return 0;
> + }
> +
> + ret = asha_connect_socket(asha);
> + if (ret < 0)
> + return 0;
> +
> + asha->fd = ret;
> +
> + ret = asha_send_acp(asha, acp_start_cmd, sizeof(acp_start_cmd), cb,
> + user_data);
> + if (ret < 0)
> + return 0;
> +
> + asha->state = ASHA_STARTING;
> +
> + return (++asha->resume_id);
> +}
> +
> +unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb,
> + void *user_data)
> +{
> + uint8_t acp_stop_cmd[] = {
> + 0x02, // STOP
> + };
> + int ret;
> +
> + if (asha->state != ASHA_STARTED)
> + return 0;
> +
> + asha->state = ASHA_STOPPING;
> +
> + ret = asha_send_acp(asha, acp_stop_cmd, sizeof(acp_stop_cmd), cb,
> + user_data);
> + if (ret < 0)
> + return 0;
> +
> + return asha->resume_id;
> +}
> +
> +static char *make_endpoint_path(struct asha_device *asha)
> +{
> + char *path;
> + int err;
> +
> + err = asprintf(&path, "%s/asha", device_get_path(asha->device));
> + if (err < 0) {
> + error("Could not allocate path for remote %s",
> + device_get_path(asha->device));
> + return NULL;
> + }
> +
> + return path;
> +
> +}
> +
> +static bool uuid_cmp(const char *uuid1, const bt_uuid_t *uuid2)
> +{
> + bt_uuid_t lhs;
> +
> + bt_string_to_uuid(&lhs, uuid1);
> +
> + return bt_uuid_cmp(&lhs, uuid2) == 0;
> +}
> +
> +static void read_psm(bool success,
> + uint8_t att_ecode,
> + const uint8_t *value,
> + uint16_t length,
> + void *user_data)
> +{
> + struct asha_device *asha = user_data;
> +
> + if (!success) {
> + DBG("Reading PSM failed with ATT errror: %u", att_ecode);
> + return;
> + }
> +
> + if (length != 2) {
> + DBG("Reading PSM failed: unexpected length %u", length);
> + return;
> + }
> +
> + asha->psm = get_le16(value);
> +
> + DBG("Got PSM: %u", asha->psm);
> +}
> +
> +static void read_rops(bool success,
> + uint8_t att_ecode,
> + const uint8_t *value,
> + uint16_t length,
> + void *user_data)
> +{
> + struct asha_device *asha = user_data;
> +
> + if (!success) {
> + DBG("Reading ROPs failed with ATT errror: %u", att_ecode);
> + return;
> + }
> +
> + if (length != 17) {
> + DBG("Reading ROPs failed: unexpected length %u", length);
> + return;
> + }
> +
> + if (value[0] != 0x01) {
> + DBG("Unexpected ASHA version: %u", value[0]);
> + return;
> + }
> +
> + /* Device Capabilities */
> + asha->right_side = (value[1] & 0x1) != 0;
> + asha->binaural = (value[1] & 0x2) != 0;
> + asha->csis_supported = (value[1] & 0x4) != 0;
> + /* HiSyncId: 2 byte company id, 6 byte ID shared by left and right */
> + memcpy(asha->hisyncid, &value[2], 8);
> + /* FeatureMap */
> + asha->coc_streaming_supported = (value[10] & 0x1) != 0;
> + /* RenderDelay */
> + asha->render_delay = get_le16(&value[11]);
> + /* byte 13 & 14 are reserved */
> + /* Codec IDs */
> + asha->codec_ids = get_le16(&value[15]);
> +
> + DBG("Got ROPS: side %u, binaural %u, csis: %u, delay %u, codecs: %u",
> + asha->right_side, asha->binaural, asha->csis_supported,
> + asha->render_delay, asha->codec_ids);
> +}
> +
> +void audio_status_notify(uint16_t value_handle, const uint8_t *value,
> + uint16_t length, void *user_data)
> +{
> + struct asha_device *asha = user_data;
> + uint8_t status = *value;
> + // Back these up to survive the reset paths
> + asha_cb_t cb = asha->cb;
> + asha_cb_t cb_user_data = asha->cb_user_data;
> +
> + if (asha->state == ASHA_STARTING) {
> + if (status == 0) {
> + asha->state = ASHA_STARTED;
> + DBG("ASHA start complete");
> + } else {
> + asha_state_reset(asha);
> + DBG("ASHA start failed");
> + }
> + } else if (asha->state == ASHA_STOPPING) {
> + // We reset our state, regardless
> + asha_state_reset(asha);
> + DBG("ASHA stop %s", status == 0 ? "complete" : "failed");
> + }
> +
> + if (cb) {
> + cb(status, cb_user_data);
> + asha->cb = NULL;
> + asha->cb_user_data = NULL;
> + }
> +}
> +
> +static void handle_characteristic(struct gatt_db_attribute *attr,
> + void *user_data)
> +{
> + struct asha_device *asha = user_data;
> + uint16_t value_handle;
> + bt_uuid_t uuid;
> +
> + if (!gatt_db_attribute_get_char_data(attr, NULL, &value_handle, NULL,
> + NULL, &uuid)) {
> + error("Failed to obtain characteristic data");
> + return;
> + }
> +
> + if (uuid_cmp(ASHA_CHRC_LE_PSM_OUT_UUID, &uuid)) {
> + if (!bt_gatt_client_read_value(asha->client, value_handle,
> + read_psm, asha, NULL))
> + DBG("Failed to send request to read battery level");
> + } if (uuid_cmp(ASHA_CHRC_READ_ONLY_PROPERTIES_UUID, &uuid)) {
> + if (!bt_gatt_client_read_value(asha->client, value_handle,
> + read_rops, asha, NULL))
> + DBG("Failed to send request to read battery level");
> + } if (uuid_cmp(ASHA_CHRC_AUDIO_CONTROL_POINT_UUID, &uuid)) {
> + // Store this for later writes
> + asha->acp_handle = value_handle;
> + } if (uuid_cmp(ASHA_CHRC_AUDIO_STATUS_UUID, &uuid)) {
> + asha->notify_id = bt_gatt_client_register_notify(asha->client,
> + value_handle, NULL, audio_status_notify, asha,
> + NULL);
> + if (!asha->notify_id)
> + DBG("Failed to send request to read battery level");
> + } else {
> + char uuid_str[MAX_LEN_UUID_STR];
> +
> + bt_uuid_to_string(&uuid, uuid_str, sizeof(uuid_str));
> + DBG("Unsupported characteristic: %s", uuid_str);
> + }
> +}
> +
> +static void foreach_asha_service(struct gatt_db_attribute *attr, void *user_data)
> +{
> + struct asha_device *asha = user_data;
> +
> + DBG("Found ASHA GATT service");
> +
> + asha->attr = attr;
> + gatt_db_service_foreach_char(asha->attr, handle_characteristic, asha);
> +}
> +
> +static DBusMessage *asha_set_configuration(DBusConnection *conn,
> + DBusMessage *msg, void *data)
> +{
> + return NULL;
> +}
> +
> +static gboolean get_uuid(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + const char *uuid;
> +
> + uuid = ASHA_PROFILE_UUID;
> +
> + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &uuid);
> +
> + return TRUE;
> +}
> +
> +static gboolean get_side(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + struct asha_device *asha = data;
> + const char *side = asha->right_side ? "right" : "left";
> +
> + // Use a string in case we want to support anything else in the future
> + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &side);
> +
> + return TRUE;
> +}
> +
> +
> +static gboolean get_binaural(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + struct asha_device *asha = data;
> + dbus_bool_t binaural = asha->binaural;
> +
> + // Use a string in case we want to support anything else in the future
> + dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &binaural);
> +
> + return TRUE;
> +}
> +
> +static gboolean get_hisyncid(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + struct asha_device *asha = data;
> + DBusMessageIter array;
> + uint8_t *hisyncid = asha->hisyncid;
> +
> + dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
> + DBUS_TYPE_BYTE_AS_STRING, &array);
> +
> + dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE,
> + &hisyncid, sizeof(asha->hisyncid));
> +
> + dbus_message_iter_close_container(iter, &array);
> +
> + return TRUE;
> +}
> +
> +static gboolean get_codecs(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + struct asha_device *asha = data;
> + dbus_uint16_t codecs = asha->codec_ids;
> +
> + // Use a string in case we want to support anything else in the future
> + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &codecs);
> +
> + return TRUE;
> +}
> +
> +static gboolean get_device(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + struct asha_device *asha = data;
> + const char *path;
> +
> + path = device_get_path(asha->device);
> +
> + dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path);
> +
> + return TRUE;
> +}
> +
> +static gboolean get_transport(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + struct asha_device *asha = data;
> + const char *path;
> +
> + path = media_transport_get_path(asha->transport);
> +
> + dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path);
> +
> + return TRUE;
> +}
> +
> +static int asha_source_device_probe(struct btd_service *service)
> +{
> + struct asha_device *asha;
> + struct btd_device *device = btd_service_get_device(service);
> + char addr[18];
> +
> + ba2str(device_get_address(device), addr);
> + DBG("Probing ASHA device %s", addr);
> +
> + asha = asha_device_new();
> + asha->device = device;
> +
> + btd_service_set_user_data(service, asha);
> +
> + return 0;
> +}
> +
> +static void asha_source_device_remove(struct btd_service *service)
> +{
> + struct asha_device *asha;
> + struct btd_device *device = btd_service_get_device(service);
> + char addr[18];
> +
> + ba2str(device_get_address(device), addr);
> + DBG("Removing ASHA device %s", addr);
> +
> + asha = btd_service_get_user_data(service);
> + if (!asha) {
> + // Can this actually happen?
> + DBG("Not handlihng ASHA profile");
> + return;
> + }
> +
> + asha_device_free(asha);
> +}
> +
> +static const GDBusMethodTable asha_ep_methods[] = {
> + { },
> +};
> +
> +static const GDBusPropertyTable asha_ep_properties[] = {
> + { "UUID", "s", get_uuid, NULL, NULL,
> + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
> + { "Side", "s", get_side, NULL, NULL,
> + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
> + { "Binaural", "b", get_binaural, NULL, NULL,
> + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
> + { "HiSyncId", "ay", get_hisyncid, NULL, NULL,
> + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
> + { "Codecs", "q", get_codecs, NULL, NULL,
> + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
Codec?
> + { "Device", "o", get_device, NULL, NULL,
> + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
> + { "Transport", "o", get_transport, NULL, NULL,
> + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
> + { }
> +};
> +
> +static void asha_source_endpoint_register(struct asha_device *asha)
> +{
> + char *path;
> + const struct media_endpoint *asha_ep;
> +
> + path = make_endpoint_path(asha);
> + if (!path)
> + goto error;
> +
> + if (g_dbus_register_interface(btd_get_dbus_connection(),
> + path, MEDIA_ENDPOINT_INTERFACE,
> + asha_ep_methods, NULL,
> + asha_ep_properties,
> + asha, NULL) == FALSE) {
> + error("Could not register remote ep %s", path);
> + goto error;
> + }
> +
> + asha_ep = media_endpoint_get_asha();
> + asha->transport = media_transport_create(asha->device, path, NULL, 0,
> + (void *) asha_ep, asha);
> +
> +error:
> + if (path)
> + free(path);
> + return;
> +}
> +
> +static void asha_source_endpoint_unregister(struct asha_device *asha)
> +{
> + char *path;
> +
> + path = make_endpoint_path(asha);
> + if (!path)
> + goto error;
> +
> + g_dbus_unregister_interface(btd_get_dbus_connection(),
> + path, MEDIA_ENDPOINT_INTERFACE);
> +
> + if (asha->transport) {
> + media_transport_destroy(asha->transport);
> + asha->transport = NULL;
> + }
> +
> +error:
> + if (path)
> + free(path);
> +}
> +
> +static int asha_source_accept(struct btd_service *service)
> +{
> + struct btd_device *device = btd_service_get_device(service);
> + struct gatt_db *db = btd_device_get_gatt_db(device);
> + struct bt_gatt_client *client = btd_device_get_gatt_client(device);
> + struct asha_device *asha = btd_service_get_user_data(service);
> + bt_uuid_t asha_uuid;
> + char addr[18];
> +
> + ba2str(device_get_address(device), addr);
> + DBG("Accepting ASHA connection on %s", addr);
> +
> + if (!asha) {
> + // Can this actually happen?
> + DBG("Not handling ASHA profile");
> + return -1;
> + }
> +
> + asha->db = gatt_db_ref(db);
> + asha->client = bt_gatt_client_clone(client);
> +
> + bt_uuid16_create(&asha_uuid, ASHA_SERVICE);
> + gatt_db_foreach_service(db, &asha_uuid, foreach_asha_service, asha);
> +
> + if (!asha->attr) {
> + error("ASHA attribute not found");
> + asha_device_reset(asha);
> + return -1;
> + }
> +
> + asha_source_endpoint_register(asha);
> +
> + btd_service_connecting_complete(service, 0);
> +
> + return 0;
> +}
> +
> +static int asha_source_disconnect(struct btd_service *service)
> +{
> + struct btd_device *device = btd_service_get_device(service);
> + struct gatt_db *db = btd_device_get_gatt_db(device);
> + struct bt_gatt_client *client = btd_device_get_gatt_client(device);
> + struct asha_device *asha = btd_service_get_user_data(service);
> + bt_uuid_t asha_uuid;
> + char addr[18];
> +
> + ba2str(device_get_address(device), addr);
> + DBG("Disconnecting ASHA on %s", addr);
> +
> + if (!asha) {
> + // Can this actually happen?
> + DBG("Not handlihng ASHA profile");
> + return -1;
> + }
> +
> + asha_source_endpoint_unregister(asha);
> + asha_device_reset(asha);
> +
> + btd_service_disconnecting_complete(service, 0);
> +
> + return 0;
> +}
> +
> +static struct btd_profile asha_source_profile = {
> + .name = "asha-source",
> + .priority = BTD_PROFILE_PRIORITY_MEDIUM,
> + .remote_uuid = ASHA_PROFILE_UUID,
> + .experimental = true,
> +
> + .device_probe = asha_source_device_probe,
> + .device_remove = asha_source_device_remove,
> +
> + .auto_connect = true,
> + .accept = asha_source_accept,
> + .disconnect = asha_source_disconnect,
> +};
> +
> +static int asha_init(void)
> +{
> + int err;
> +
> + err = btd_profile_register(&asha_source_profile);
> + if (err)
> + return err;
> +
> + return 0;
> +}
> +
> +static void asha_exit(void)
> +{
> + btd_profile_unregister(&asha_source_profile);
> +}
> +
> +BLUETOOTH_PLUGIN_DEFINE(asha, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
> + asha_init, asha_exit)
> diff --git a/profiles/audio/asha.h b/profiles/audio/asha.h
> new file mode 100644
> index 000000000..0fc28e8a3
> --- /dev/null
> +++ b/profiles/audio/asha.h
> @@ -0,0 +1,34 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + *
> + * BlueZ - Bluetooth protocol stack for Linux
> + *
> + * Copyright (C) 2024 Asymptotic Inc.
> + *
> + * Author: Arun Raghavan <[email protected]>
> + *
> + *
> + */
> +
> +#include <stdint.h>
> +
> +struct asha_device;
> +
> +typedef enum {
> + ASHA_STOPPED = 0,
> + ASHA_STARTING,
> + ASHA_STARTED,
> + ASHA_STOPPING,
> +} asha_state_t;
> +
> +typedef void (*asha_cb_t)(int status, void *data);
> +
> +uint16_t asha_device_get_render_delay(struct asha_device *asha);
> +asha_state_t asha_device_get_state(struct asha_device *asha);
> +int asha_device_get_fd(struct asha_device *asha);
> +uint16_t asha_device_get_mtu(struct asha_device *asha);
> +
> +unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb,
> + void *user_data);
> +unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb,
> + void *user_data);
I'd suggest we split the protocol portion from the plugin and put it
under src/shared so we can do unit testing without the D-Bus blocks,
Id got with bt_asha for instance name, we can do it later if you don't
feel like it is necessary right now.
> diff --git a/profiles/audio/media.c b/profiles/audio/media.c
> index 07147a25d..68ce2f17c 100644
> --- a/profiles/audio/media.c
> +++ b/profiles/audio/media.c
> @@ -44,6 +44,7 @@
> #include "src/shared/bap.h"
> #include "src/shared/bap-debug.h"
>
> +#include "asha.h"
> #include "avdtp.h"
> #include "media.h"
> #include "transport.h"
> @@ -88,6 +89,7 @@ struct endpoint_request {
> struct media_endpoint {
> struct a2dp_sep *sep;
> struct bt_bap_pac *pac;
> + struct asha_device *asha;
> char *sender; /* Endpoint DBus bus id */
> char *path; /* Endpoint object path */
> char *uuid; /* Endpoint property UUID */
> @@ -1329,6 +1331,12 @@ static bool endpoint_init_broadcast_sink(struct media_endpoint *endpoint,
> return endpoint_init_pac(endpoint, BT_BAP_BCAST_SINK, err);
> }
>
> +static bool endpoint_init_asha(struct media_endpoint *endpoint,
> + int *err)
> +{
> + return true;
> +}
> +
> static bool endpoint_properties_exists(const char *uuid,
> struct btd_device *dev,
> void *user_data)
> @@ -1453,6 +1461,11 @@ static bool experimental_bcast_sink_ep_supported(struct btd_adapter *adapter)
> return g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL;
> }
>
> +static bool experimental_asha_supported(struct btd_adapter *adapter)
> +{
> + return g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL;
> +}
> +
> static const struct media_endpoint_init {
> const char *uuid;
> bool (*func)(struct media_endpoint *endpoint, int *err);
> @@ -1470,6 +1483,8 @@ static const struct media_endpoint_init {
> experimental_broadcaster_ep_supported },
> { BAA_SERVICE_UUID, endpoint_init_broadcast_sink,
> experimental_bcast_sink_ep_supported },
> + { ASHA_PROFILE_UUID, endpoint_init_asha,
> + experimental_asha_supported },
> };
>
> static struct media_endpoint *
> @@ -3392,3 +3407,16 @@ bool media_endpoint_is_broadcast(struct media_endpoint *endpoint)
>
> return false;
> }
> +
> +const struct media_endpoint *media_endpoint_get_asha()
> +{
> + // Because ASHA does not require the application to register an
> + // endpoint, we need a minimal media_endpoint for transport creation to
> + // work, so let's create one
> + static struct media_endpoint asha_endpoint = {
> + .uuid = ASHA_PROFILE_UUID,
> + .codec = 0x2, /* Currently on G.722 is defined by the spec */
> + };
> +
> + return &asha_endpoint;
> +}
> diff --git a/profiles/audio/media.h b/profiles/audio/media.h
> index 2b579877b..68c57cfc3 100644
> --- a/profiles/audio/media.h
> +++ b/profiles/audio/media.h
> @@ -24,3 +24,5 @@ struct btd_adapter *media_endpoint_get_btd_adapter(
> struct media_endpoint *endpoint);
> bool media_endpoint_is_broadcast(struct media_endpoint *endpoint);
> int8_t media_player_get_device_volume(struct btd_device *device);
> +
> +const struct media_endpoint *media_endpoint_get_asha();
> diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
> index 159fbd575..a104d27c0 100644
> --- a/profiles/audio/transport.c
> +++ b/profiles/audio/transport.c
> @@ -37,6 +37,7 @@
> #include "src/shared/bap.h"
> #include "src/shared/io.h"
>
> +#include "asha.h"
> #include "avdtp.h"
> #include "media.h"
> #include "transport.h"
> @@ -90,6 +91,10 @@ struct bap_transport {
> guint resume_id;
> };
>
> +struct asha_transport {
> + uint16_t delay;
> +};
> +
> struct media_transport_ops {
> const char *uuid;
> const GDBusPropertyTable *properties;
> @@ -115,7 +120,7 @@ struct media_transport {
> char *path; /* Transport object path */
> struct btd_device *device; /* Transport device */
> struct btd_adapter *adapter; /* Transport adapter bcast*/
> - const char *remote_endpoint; /* Transport remote SEP */
> + char *remote_endpoint; /* Transport remote SEP */
> struct media_endpoint *endpoint; /* Transport endpoint */
> struct media_owner *owner; /* Transport owner */
> uint8_t *configuration; /* Transport configuration */
> @@ -219,6 +224,9 @@ void media_transport_destroy(struct media_transport *transport)
> g_dbus_unregister_interface(btd_get_dbus_connection(), path,
> MEDIA_TRANSPORT_INTERFACE);
>
> + if (transport->remote_endpoint)
> + g_free(transport->remote_endpoint);
> +
> g_free(path);
> }
>
> @@ -1199,6 +1207,32 @@ static const GDBusPropertyTable transport_bap_bc_properties[] = {
> { }
> };
>
> +static gboolean get_asha_delay(const GDBusPropertyTable *property,
> + DBusMessageIter *iter, void *data)
> +{
> + struct media_transport *transport = data;
> + struct asha_device *asha = transport->data;
> + uint16_t delay;
> +
> + // Delay property is in 1/10ths of ms, while ASHA RenderDelay is in ms
> + delay = asha_device_get_render_delay(asha) * 10;
> +
> + dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &delay);
> +
> + return TRUE;
> +}
> +
> +static const GDBusPropertyTable transport_asha_properties[] = {
> + { "Device", "o", get_device },
> + { "Endpoint", "o", get_endpoint, NULL, endpoint_exists },
> + { "UUID", "s", get_uuid },
> + { "Codec", "y", get_codec },
> + { "State", "s", get_state },
> + { "Delay", "q", get_asha_delay },
> + { "Volume", "q", get_volume, set_volume, volume_exists },
> + { }
> +};
> +
> static void transport_a2dp_destroy(void *data)
> {
> struct a2dp_transport *a2dp = data;
> @@ -1713,6 +1747,106 @@ static void *transport_bap_init(struct media_transport *transport, void *stream)
> return bap;
> }
>
> +static void asha_transport_sync_state(struct media_transport *transport,
> + struct asha_device *asha)
> +{
> + switch (asha_device_get_state(asha)) {
> + case ASHA_STOPPED:
> + transport_set_state(transport, TRANSPORT_STATE_IDLE);
> + break;
> + case ASHA_STARTING:
> + transport_set_state(transport, TRANSPORT_STATE_REQUESTING);
> + break;
> + case ASHA_STARTED:
> + transport_set_state(transport, TRANSPORT_STATE_ACTIVE);
> + break;
> + case ASHA_STOPPING:
> + transport_set_state(transport, TRANSPORT_STATE_SUSPENDING);
> + break;
> + }
> +}
> +
> +static void asha_transport_state_cb(int status, void *user_data)
> +{
> + struct media_owner *owner = user_data;
> + struct media_transport *transport = owner->transport;
> + struct asha_device *asha = transport->data;
> + asha_state_t state;
> +
> + state = asha_device_get_state(asha);
> +
> + if (state == ASHA_STARTED) {
> + int fd;
> + uint16_t imtu, omtu;
> + gboolean ret;
> +
> + fd = asha_device_get_fd(asha);
> + imtu = omtu = asha_device_get_mtu(asha);
> +
> + media_transport_set_fd(transport, fd, imtu, omtu);
> +
> + owner->pending->id = 0;
> + ret = g_dbus_send_reply(btd_get_dbus_connection(),
> + owner->pending->msg,
> + DBUS_TYPE_UNIX_FD, &fd,
> + DBUS_TYPE_UINT16, &imtu,
> + DBUS_TYPE_UINT16, &omtu,
> + DBUS_TYPE_INVALID);
> + if (!ret) {
> + media_transport_remove_owner(transport);
> + return;
> + }
> +
> + media_owner_remove(owner);
> + } else if (state == ASHA_STOPPED) {
> + if (owner->pending) {
> + owner->pending->id = 0;
> + media_request_reply(owner->pending, 0);
> + media_owner_remove(owner);
> + }
> +
> + media_transport_remove_owner(transport);
> + }
> +
> + asha_transport_sync_state(transport, asha);
> +}
> +
> +static guint transport_asha_resume(struct media_transport *transport,
> + struct media_owner *owner)
> +{
> + struct asha_device *asha = transport->data;
> + guint ret;
> +
> + ret = asha_device_start(asha, asha_transport_state_cb, owner);
> + asha_transport_sync_state(transport, asha);
> +
> + return ret;
> +}
> +
> +static guint transport_asha_suspend(struct media_transport *transport,
> + struct media_owner *owner)
> +{
> + struct asha_device *asha = transport->data;
> + guint ret = 0;
> +
> + if (owner) {
> + ret = asha_device_stop(asha, asha_transport_state_cb, owner);
> + asha_transport_sync_state(transport, asha);
> + } else {
> + ret = asha_device_stop(asha, NULL, NULL);
> + // We won't have a callback to set the final state
> + transport_set_state(transport, TRANSPORT_STATE_IDLE);
> + }
> +
> + return ret;
> +}
> +
> +static void *transport_asha_init(struct media_transport *transport, void *data)
> +{
> + /* We just store the struct asha_device on the transport */
> + return data;
> +}
> +
> #define TRANSPORT_OPS(_uuid, _props, _set_owner, _remove_owner, _init, \
> _resume, _suspend, _cancel, _set_state, _get_stream, \
> _get_volume, _set_volume, _destroy) \
> @@ -1754,6 +1888,14 @@ static void *transport_bap_init(struct media_transport *transport, void *stream)
> #define BAP_BC_OPS(_uuid) \
> BAP_OPS(_uuid, transport_bap_bc_properties, NULL, NULL)
>
> +#define ASHA_OPS(_uuid) \
> + TRANSPORT_OPS(_uuid, transport_asha_properties, NULL, NULL, \
> + transport_asha_init, \
> + transport_asha_resume, transport_asha_suspend, \
> + NULL, NULL, NULL, \
> + NULL, NULL, \
> + NULL)
> +
> static const struct media_transport_ops transport_ops[] = {
> A2DP_OPS(A2DP_SOURCE_UUID, transport_a2dp_src_init,
> transport_a2dp_src_set_volume,
> @@ -1765,6 +1907,7 @@ static const struct media_transport_ops transport_ops[] = {
> BAP_UC_OPS(PAC_SINK_UUID),
> BAP_BC_OPS(BCAA_SERVICE_UUID),
> BAP_BC_OPS(BAA_SERVICE_UUID),
> + ASHA_OPS(ASHA_PROFILE_UUID),
> };
>
> static const struct media_transport_ops *
> @@ -1802,7 +1945,7 @@ struct media_transport *media_transport_create(struct btd_device *device,
> transport->endpoint = endpoint;
> transport->configuration = util_memdup(configuration, size);
> transport->size = size;
> - transport->remote_endpoint = remote_endpoint;
> + transport->remote_endpoint = g_strdup(remote_endpoint);
>
> if (device)
> transport->path = g_strdup_printf("%s/fd%d",
> --
> 2.45.0
Otherwise it looks pretty good.
--
Luiz Augusto von Dentz
Hi Arun,
On Wed, May 8, 2024 at 11:48 AM Arun Raghavan <[email protected]> wrote:
>
> Plays out an audio file to the device. Depends on GStreamer for media
> file reading and decoding (specifically, gstreamer core,
> gst-plugins-base, gst-ffmpeg, and gst-python, or equivalent packages).
> ---
> test/simple-asha | 158 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 158 insertions(+)
> create mode 100755 test/simple-asha
>
> diff --git a/test/simple-asha b/test/simple-asha
> new file mode 100755
> index 000000000..feff9d29c
> --- /dev/null
> +++ b/test/simple-asha
> @@ -0,0 +1,158 @@
> +#!/usr/bin/env python3
> +# SPDX-License-Identifier: LGPL-2.1-or-later
> +
> +import os
> +import signal
> +import sys
> +
> +import dbus
> +import dbus.service
> +import dbus.mainloop.glib
> +
> +import gi
> +
> +gi.require_version("Gst", "1.0")
> +gi.require_version("GLib", "2.0")
> +from gi.repository import GLib, Gst
> +
> +import bluezutils
> +
> +mainloop = None
> +pipeline = None
> +seqnum: int = 0
> +
> +
> +def signal_handler(_sig, _frame):
> + print("Got interrupt")
> + mainloop.quit()
> +
> +
> +signal.signal(signal.SIGINT, signal_handler)
> +
> +
> +def usage():
> + print(f"Usage: simple-asha <remote addr> <audio file name> (optional volume 0-127)")
> +
> +
> +def start_playback(fd: int):
> + global mainloop, pipeline
> +
> + outdata = bytearray(161)
> +
> + Gst.init(None)
> +
> + pipeline = Gst.parse_launch(
> + f"""
> + filesrc location="{sys.argv[2]}" ! decodebin !
> + audioconvert ! audioresample !
> + audiobuffersplit output-buffer-duration="20/1000" ! avenc_g722 !
> + appsink name=sink emit-signals=true
> + """
> + )
> +
> + def on_new_sample(sink):
> + global seqnum
> +
> + sample = sink.emit("pull-sample")
> + buf = sample.get_buffer()
> +
> + with buf.map(Gst.MapFlags.READ) as info:
> + pos = 0
> +
> + if info.size != 160:
> + print("Unexpected buffer size: ", info.size)
> +
> + outdata[pos] = seqnum % 256
> + pos += 1
> +
> + for byte in info.data:
> + outdata[pos] = byte
> + pos += 1
> +
> + try:
> + n = os.write(fd, outdata)
> + if n != 161:
> + print("Wrote less than expected: ", n)
> + except:
> + return Gst.FlowReturn.ERROR
> +
> + seqnum += 1
> +
> + return Gst.FlowReturn.OK
> +
> + sink = pipeline.get_by_name("sink")
> + sink.connect("new-sample", on_new_sample)
> +
> + pipeline.set_state(Gst.State.PLAYING)
> +
> + def bus_message(_bus, message, _data) -> bool:
> + typ = message.type
> +
> + if typ == Gst.MessageType.EOS:
> + print("End of stream")
> + mainloop.quit()
> + elif typ == Gst.MessageType.ERROR:
> + err, debug = message.parse_error()
> + print(f"Pipeline error: {err} ({debug})")
> + mainloop.quit()
> +
> + bus = pipeline.get_bus()
> + bus.add_watch(GLib.PRIORITY_DEFAULT, bus_message, None)
> +
> +
> +if __name__ == "__main__":
> + dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
> +
> + mainloop = GLib.MainLoop()
> + bus = dbus.SystemBus()
> +
> + if (len(sys.argv) == 3) or (len(sys.argv) == 4):
> + device = bluezutils.find_device(sys.argv[1])
> + if device is None:
> + print("Could not find device: ", sys.argv[1])
> + exit(255)
> + else:
> + usage()
> + sys.exit(255)
> +
> + asha = bus.get_object("org.bluez", device.object_path + "/asha")
> + media = dbus.Interface(
> + bus.get_object("org.bluez", device.object_path + "/asha"),
> + "org.bluez.MediaEndpoint1",
> + )
> +
> + props = asha.GetAll(
> + "org.bluez.MediaEndpoint1",
> + dbus_interface="org.freedesktop.DBus.Properties",
> + )
> + path = props["Transport"]
> +
> + print("Trying to acquire", path)
> +
> + transport = dbus.Interface(
> + bus.get_object("org.bluez", path),
> + "org.bluez.MediaTransport1",
> + )
> +
> + # Keep default volume at 25%
> + volume = 32
> + if len(sys.argv) == 4:
> + volume = int(sys.argv[3])
> + if volume < 0 or volume > 127:
> + print("Volume must be between 0 (mute) and 127 (max)")
> +
> + transport.Set(
> + "org.bluez.MediaTransport1",
> + "Volume",
> + dbus.UInt16(volume, variant_level=1),
> + dbus_interface="org.freedesktop.DBus.Properties",
> + )
> +
> + (fd, imtu, omtu) = transport.Acquire()
> +
> + start_playback(fd.take())
> +
> + mainloop.run()
> +
> + pipeline.set_state(Gst.State.NULL)
> + transport.Release()
> --
> 2.45.0
While I don't mind having a python example I think we are much better
of adding such support in bluetoothctl, most should already work with
transport submenu but perhaps we want to add support for gstreamer
pipeline instead of just a file which would be useful for creating
A2DP sbc and BAP lc3 streams.
>
--
Luiz Augusto von Dentz
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=851633
---Test result---
Test Summary:
CheckPatch FAIL 3.12 seconds
GitLint PASS 1.63 seconds
BuildEll PASS 24.29 seconds
BluezMake FAIL 85.07 seconds
MakeCheck FAIL 1965.36 seconds
MakeDistcheck FAIL 57.75 seconds
CheckValgrind FAIL 64.62 seconds
CheckSmatch FAIL 165.45 seconds
bluezmakeextell FAIL 65.35 seconds
IncrementalBuild FAIL 1553.75 seconds
ScanBuild FAIL 695.26 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,1/5] profiles: Add initial code for an ASHA plugin
WARNING:LONG_LINE: line length of 86 exceeds 80 columns
#352: FILE: profiles/audio/asha.c:187:
+ err = setsockopt(fd, SOL_BLUETOOTH, BT_RCVMTU, &opts.imtu, sizeof(opts.imtu));
WARNING:LONG_LINE: line length of 81 exceeds 80 columns
#361: FILE: profiles/audio/asha.c:196:
+ error("Could not connect L2CAP CoC socket: %s", strerror(errno));
WARNING:TYPO_SPELLING: 'errror' may be misspelled - perhaps 'error'?
#492: FILE: profiles/audio/asha.c:327:
+ DBG("Reading PSM failed with ATT errror: %u", att_ecode);
^^^^^^
WARNING:TYPO_SPELLING: 'errror' may be misspelled - perhaps 'error'?
#515: FILE: profiles/audio/asha.c:350:
+ DBG("Reading ROPs failed with ATT errror: %u", att_ecode);
^^^^^^
ERROR:TRAILING_STATEMENTS: trailing statements should be on next line (or did you mean 'else if'?)
#595: FILE: profiles/audio/asha.c:430:
+ } if (uuid_cmp(ASHA_CHRC_READ_ONLY_PROPERTIES_UUID, &uuid)) {
ERROR:TRAILING_STATEMENTS: trailing statements should be on next line (or did you mean 'else if'?)
#599: FILE: profiles/audio/asha.c:434:
+ } if (uuid_cmp(ASHA_CHRC_AUDIO_CONTROL_POINT_UUID, &uuid)) {
ERROR:TRAILING_STATEMENTS: trailing statements should be on next line (or did you mean 'else if'?)
#602: FILE: profiles/audio/asha.c:437:
+ } if (uuid_cmp(ASHA_CHRC_AUDIO_STATUS_UUID, &uuid)) {
WARNING:LONG_LINE: line length of 81 exceeds 80 columns
#616: FILE: profiles/audio/asha.c:451:
+static void foreach_asha_service(struct gatt_db_attribute *attr, void *user_data)
WARNING:RETURN_VOID: void function return statements are not generally useful
#809: FILE: profiles/audio/asha.c:644:
+ return;
+}
WARNING:NEW_TYPEDEFS: do not add new typedefs
#949: FILE: profiles/audio/asha.h:17:
+typedef enum {
ERROR:FUNCTION_WITHOUT_ARGS: Bad function definition - const struct media_endpoint *media_endpoint_get_asha() should probably be const struct media_endpoint *media_endpoint_get_asha(void)
#1026: FILE: profiles/audio/media.c:3411:
+const struct media_endpoint *media_endpoint_get_asha()
ERROR:FUNCTION_WITHOUT_ARGS: Bad function definition - const struct media_endpoint *media_endpoint_get_asha() should probably be const struct media_endpoint *media_endpoint_get_asha(void)
#1047: FILE: profiles/audio/media.h:28:
+const struct media_endpoint *media_endpoint_get_asha();
ERROR:SWITCH_CASE_INDENT_LEVEL: switch and case should be at the same indent
#1130: FILE: profiles/audio/transport.c:1753:
+ switch (asha_device_get_state(asha)) {
+ case ASHA_STOPPED:
[...]
+ case ASHA_STARTING:
[...]
+ case ASHA_STARTED:
[...]
+ case ASHA_STOPPING:
WARNING:LONG_LINE: line length of 83 exceeds 80 columns
#1135: FILE: profiles/audio/transport.c:1758:
+ transport_set_state(transport, TRANSPORT_STATE_REQUESTING);
WARNING:LONG_LINE: line length of 83 exceeds 80 columns
#1141: FILE: profiles/audio/transport.c:1764:
+ transport_set_state(transport, TRANSPORT_STATE_SUSPENDING);
/github/workspace/src/src/13658883.patch total: 6 errors, 9 warnings, 1089 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/13658883.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,2/5] asha: Implement volume on transport
WARNING:TYPO_SPELLING: 'errror' may be misspelled - perhaps 'error'?
#191: FILE: profiles/audio/asha.c:450:
+ DBG("Reading volume failed with ATT errror: %u", att_ecode);
^^^^^^
ERROR:TRAILING_STATEMENTS: trailing statements should be on next line (or did you mean 'else if'?)
#227: FILE: profiles/audio/asha.c:498:
+ } if (uuid_cmp(ASHA_CHRC_VOLUME_UUID, &uuid)) {
/github/workspace/src/src/13658879.patch total: 1 errors, 1 warnings, 190 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/13658879.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,3/5] test: Add a script to test ASHA
ERROR:EXECUTE_PERMISSIONS: do not set execute permissions for source files
#104: FILE: test/simple-asha
/github/workspace/src/src/13658880.patch total: 1 errors, 0 warnings, 158 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/13658880.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:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12725 | int main(int argc, char *argv[])
| ^~~~
profiles/audio/asha.c: In function ‘asha_state_reset’:
profiles/audio/asha.c:122:2: error: implicit declaration of function ‘close’; did you mean ‘pclose’? [-Werror=implicit-function-declaration]
122 | close(asha->fd);
| ^~~~~
| pclose
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c: In function ‘asha_connect_socket’:
profiles/audio/asha.c:167:57: error: ‘errno’ undeclared (first use in this function)
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:49:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
48 | #include "l2cap.h"
+++ |+#include <errno.h>
49 |
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c:167:57: note: each undeclared identifier is reported only once for each function it appears in
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:161:19: error: unused variable ‘ret’ [-Werror=unused-variable]
161 | int fd = 0, err, ret = 0;
| ^~~
profiles/audio/asha.c: At top level:
profiles/audio/asha.c:411:6: error: no previous declaration for ‘audio_status_notify’ [-Werror=missing-declarations]
411 | void audio_status_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~~~~~~~
profiles/audio/asha.c:464:6: error: no previous declaration for ‘volume_notify’ [-Werror=missing-declarations]
464 | void volume_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~
profiles/audio/asha.c: In function ‘asha_source_disconnect’:
profiles/audio/asha.c:784:12: error: unused variable ‘asha_uuid’ [-Werror=unused-variable]
784 | bt_uuid_t asha_uuid;
| ^~~~~~~~~
profiles/audio/asha.c:782:25: error: unused variable ‘client’ [-Werror=unused-variable]
782 | struct bt_gatt_client *client = btd_device_get_gatt_client(device);
| ^~~~~~
profiles/audio/asha.c:781:18: error: unused variable ‘db’ [-Werror=unused-variable]
781 | struct gatt_db *db = btd_device_get_gatt_db(device);
| ^~
At top level:
profiles/audio/asha.c:535:21: error: ‘asha_set_configuration’ defined but not used [-Werror=unused-function]
535 | static DBusMessage *asha_set_configuration(DBusConnection *conn,
| ^~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:10691: profiles/audio/bluetoothd-asha.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4656: all] Error 2
##############################
Test: MakeCheck - FAIL
Desc: Run Bluez Make Check
Output:
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[])
| ^~~~
profiles/audio/asha.c: In function ‘asha_state_reset’:
profiles/audio/asha.c:122:2: error: implicit declaration of function ‘close’; did you mean ‘pclose’? [-Werror=implicit-function-declaration]
122 | close(asha->fd);
| ^~~~~
| pclose
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c: In function ‘asha_connect_socket’:
profiles/audio/asha.c:167:57: error: ‘errno’ undeclared (first use in this function)
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:49:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
48 | #include "l2cap.h"
+++ |+#include <errno.h>
49 |
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c:167:57: note: each undeclared identifier is reported only once for each function it appears in
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:161:19: error: unused variable ‘ret’ [-Werror=unused-variable]
161 | int fd = 0, err, ret = 0;
| ^~~
profiles/audio/asha.c: At top level:
profiles/audio/asha.c:411:6: error: no previous declaration for ‘audio_status_notify’ [-Werror=missing-declarations]
411 | void audio_status_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~~~~~~~
profiles/audio/asha.c:464:6: error: no previous declaration for ‘volume_notify’ [-Werror=missing-declarations]
464 | void volume_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~
profiles/audio/asha.c: In function ‘asha_source_disconnect’:
profiles/audio/asha.c:784:12: error: unused variable ‘asha_uuid’ [-Werror=unused-variable]
784 | bt_uuid_t asha_uuid;
| ^~~~~~~~~
profiles/audio/asha.c:782:25: error: unused variable ‘client’ [-Werror=unused-variable]
782 | struct bt_gatt_client *client = btd_device_get_gatt_client(device);
| ^~~~~~
profiles/audio/asha.c:781:18: error: unused variable ‘db’ [-Werror=unused-variable]
781 | struct gatt_db *db = btd_device_get_gatt_db(device);
| ^~
At top level:
profiles/audio/asha.c:535:21: error: ‘asha_set_configuration’ defined but not used [-Werror=unused-function]
535 | static DBusMessage *asha_set_configuration(DBusConnection *conn,
| ^~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:10691: profiles/audio/bluetoothd-asha.o] Error 1
make: *** [Makefile:12209: check] Error 2
##############################
Test: MakeDistcheck - FAIL
Desc: Run Bluez Make Distcheck
Output:
Package cups was not found in the pkg-config search path.
Perhaps you should add the directory containing `cups.pc'
to the PKG_CONFIG_PATH environment variable
No package 'cups' found
../../profiles/audio/asha.c:47:10: fatal error: asha.h: No such file or directory
47 | #include "asha.h"
| ^~~~~~~~
compilation terminated.
make[2]: *** [Makefile:10691: profiles/audio/bluetoothd-asha.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile:4656: all] Error 2
make: *** [Makefile:12130: 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:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12725 | int main(int argc, char *argv[])
| ^~~~
profiles/audio/asha.c: In function ‘asha_state_reset’:
profiles/audio/asha.c:122:2: error: implicit declaration of function ‘close’; did you mean ‘pclose’? [-Werror=implicit-function-declaration]
122 | close(asha->fd);
| ^~~~~
| pclose
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c: In function ‘asha_connect_socket’:
profiles/audio/asha.c:167:57: error: ‘errno’ undeclared (first use in this function)
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:49:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
48 | #include "l2cap.h"
+++ |+#include <errno.h>
49 |
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c:167:57: note: each undeclared identifier is reported only once for each function it appears in
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:161:19: error: unused variable ‘ret’ [-Werror=unused-variable]
161 | int fd = 0, err, ret = 0;
| ^~~
profiles/audio/asha.c: At top level:
profiles/audio/asha.c:411:6: error: no previous declaration for ‘audio_status_notify’ [-Werror=missing-declarations]
411 | void audio_status_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~~~~~~~
profiles/audio/asha.c:464:6: error: no previous declaration for ‘volume_notify’ [-Werror=missing-declarations]
464 | void volume_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~
profiles/audio/asha.c: In function ‘asha_source_disconnect’:
profiles/audio/asha.c:784:12: error: unused variable ‘asha_uuid’ [-Werror=unused-variable]
784 | bt_uuid_t asha_uuid;
| ^~~~~~~~~
profiles/audio/asha.c:782:25: error: unused variable ‘client’ [-Werror=unused-variable]
782 | struct bt_gatt_client *client = btd_device_get_gatt_client(device);
| ^~~~~~
profiles/audio/asha.c:781:18: error: unused variable ‘db’ [-Werror=unused-variable]
781 | struct gatt_db *db = btd_device_get_gatt_db(device);
| ^~
At top level:
profiles/audio/asha.c:535:21: error: ‘asha_set_configuration’ defined but not used [-Werror=unused-function]
535 | static DBusMessage *asha_set_configuration(DBusConnection *conn,
| ^~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:10691: profiles/audio/bluetoothd-asha.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:12209: 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:278:25: warning: Variable length array is used.
src/shared/gatt-server.c:621:25: warning: Variable length array is used.
src/shared/gatt-server.c:720:25: warning: Variable length array is used.
src/shared/bap.c:282:25: warning: array of flexible structures
src/shared/bap.c: note: in included file:
./src/shared/ascs.h:88:25: warning: array of flexible structures
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:278:25: warning: Variable length array is used.
src/shared/gatt-server.c:621:25: warning: Variable length array is used.
src/shared/gatt-server.c:720:25: warning: Variable length array is used.
src/shared/bap.c:282:25: warning: array of flexible structures
src/shared/bap.c: note: in included file:
./src/shared/ascs.h:88:25: warning: array of flexible structures
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:219:15: warning: array of flexible structures
./lib/bluetooth.h:224: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.
profiles/audio/asha.c: In function ‘asha_state_reset’:
profiles/audio/asha.c:122:2: error: implicit declaration of function ‘close’; did you mean ‘pclose’? [-Werror=implicit-function-declaration]
122 | close(asha->fd);
| ^~~~~
| pclose
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c: In function ‘asha_connect_socket’:
profiles/audio/asha.c:167:57: error: ‘errno’ undeclared (first use in this function)
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:49:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
48 | #include "l2cap.h"
+++ |+#include <errno.h>
49 |
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c:167:57: note: each undeclared identifier is reported only once for each function it appears in
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:161:19: error: unused variable ‘ret’ [-Werror=unused-variable]
161 | int fd = 0, err, ret = 0;
| ^~~
profiles/audio/asha.c: At top level:
profiles/audio/asha.c:411:6: error: no previous declaration for ‘audio_status_notify’ [-Werror=missing-declarations]
411 | void audio_status_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~~~~~~~
profiles/audio/asha.c:464:6: error: no previous declaration for ‘volume_notify’ [-Werror=missing-declarations]
464 | void volume_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~
profiles/audio/asha.c: In function ‘asha_source_disconnect’:
profiles/audio/asha.c:784:12: error: unused variable ‘asha_uuid’ [-Werror=unused-variable]
784 | bt_uuid_t asha_uuid;
| ^~~~~~~~~
profiles/audio/asha.c:782:25: error: unused variable ‘client’ [-Werror=unused-variable]
782 | struct bt_gatt_client *client = btd_device_get_gatt_client(device);
| ^~~~~~
profiles/audio/asha.c:781:18: error: unused variable ‘db’ [-Werror=unused-variable]
781 | struct gatt_db *db = btd_device_get_gatt_db(device);
| ^~
At top level:
profiles/audio/asha.c:535:21: error: ‘asha_set_configuration’ defined but not used [-Werror=unused-function]
535 | static DBusMessage *asha_set_configuration(DBusConnection *conn,
| ^~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:10691: profiles/audio/bluetoothd-asha.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4656: all] Error 2
##############################
Test: bluezmakeextell - FAIL
Desc: Build Bluez with External ELL
Output:
profiles/audio/asha.c: In function ‘asha_state_reset’:
profiles/audio/asha.c:122:2: error: implicit declaration of function ‘close’; did you mean ‘pclose’? [-Werror=implicit-function-declaration]
122 | close(asha->fd);
| ^~~~~
| pclose
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c: In function ‘asha_connect_socket’:
profiles/audio/asha.c:167:57: error: ‘errno’ undeclared (first use in this function)
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:49:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
48 | #include "l2cap.h"
+++ |+#include <errno.h>
49 |
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c:167:57: note: each undeclared identifier is reported only once for each function it appears in
167 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:161:19: error: unused variable ‘ret’ [-Werror=unused-variable]
161 | int fd = 0, err, ret = 0;
| ^~~
profiles/audio/asha.c: At top level:
profiles/audio/asha.c:411:6: error: no previous declaration for ‘audio_status_notify’ [-Werror=missing-declarations]
411 | void audio_status_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~~~~~~~
profiles/audio/asha.c:464:6: error: no previous declaration for ‘volume_notify’ [-Werror=missing-declarations]
464 | void volume_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~
profiles/audio/asha.c: In function ‘asha_source_disconnect’:
profiles/audio/asha.c:784:12: error: unused variable ‘asha_uuid’ [-Werror=unused-variable]
784 | bt_uuid_t asha_uuid;
| ^~~~~~~~~
profiles/audio/asha.c:782:25: error: unused variable ‘client’ [-Werror=unused-variable]
782 | struct bt_gatt_client *client = btd_device_get_gatt_client(device);
| ^~~~~~
profiles/audio/asha.c:781:18: error: unused variable ‘db’ [-Werror=unused-variable]
781 | struct gatt_db *db = btd_device_get_gatt_db(device);
| ^~
At top level:
profiles/audio/asha.c:535:21: error: ‘asha_set_configuration’ defined but not used [-Werror=unused-function]
535 | static DBusMessage *asha_set_configuration(DBusConnection *conn,
| ^~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:10691: profiles/audio/bluetoothd-asha.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4656: all] Error 2
##############################
Test: IncrementalBuild - FAIL
Desc: Incremental build with the patches in the series
Output:
[BlueZ,1/5] profiles: Add initial code for an ASHA plugin
tools/mgmt-tester.c: In function ‘main’:
tools/mgmt-tester.c:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
12725 | 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[])
| ^~~~
profiles/audio/asha.c: In function ‘asha_state_reset’:
profiles/audio/asha.c:113:2: error: implicit declaration of function ‘close’; did you mean ‘pclose’? [-Werror=implicit-function-declaration]
113 | close(asha->fd);
| ^~~~~
| pclose
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c: In function ‘asha_connect_socket’:
profiles/audio/asha.c:158:57: error: ‘errno’ undeclared (first use in this function)
158 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:49:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
48 | #include "l2cap.h"
+++ |+#include <errno.h>
49 |
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c:158:57: note: each undeclared identifier is reported only once for each function it appears in
158 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:152:19: error: unused variable ‘ret’ [-Werror=unused-variable]
152 | int fd = 0, err, ret = 0;
| ^~~
profiles/audio/asha.c: At top level:
profiles/audio/asha.c:383:6: error: no previous declaration for ‘audio_status_notify’ [-Werror=missing-declarations]
383 | void audio_status_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~~~~~~~
profiles/audio/asha.c: In function ‘asha_source_disconnect’:
profiles/audio/asha.c:710:12: error: unused variable ‘asha_uuid’ [-Werror=unused-variable]
710 | bt_uuid_t asha_uuid;
| ^~~~~~~~~
profiles/audio/asha.c:708:25: error: unused variable ‘client’ [-Werror=unused-variable]
708 | struct bt_gatt_client *client = btd_device_get_gatt_client(device);
| ^~~~~~
profiles/audio/asha.c:707:18: error: unused variable ‘db’ [-Werror=unused-variable]
707 | struct gatt_db *db = btd_device_get_gatt_db(device);
| ^~
At top level:
profiles/audio/asha.c:461:21: error: ‘asha_set_configuration’ defined but not used [-Werror=unused-function]
461 | static DBusMessage *asha_set_configuration(DBusConnection *conn,
| ^~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:10691: profiles/audio/bluetoothd-asha.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4656: 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:996:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1102:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1294:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1359:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1634:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1639:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2143:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2151:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3240:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3262:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.
src/shared/shell.c:1331: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:996:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1102:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1294:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1359:2: warning: Use of memory after it is freed
discovery_op_complete(op, success, att_ecode);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1634:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:1639:2: warning: Use of memory after it is freed
discover_all(op);
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2143:6: warning: Use of memory after it is freed
if (read_db_hash(op)) {
^~~~~~~~~~~~~~~~
src/shared/gatt-client.c:2151:8: warning: Use of memory after it is freed
discovery_op_ref(op),
^~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3240:2: warning: Use of memory after it is freed
complete_write_long_op(req, success, 0, false);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/shared/gatt-client.c:3262:2: warning: Use of memory after it is freed
request_unref(req);
^~~~~~~~~~~~~~~~~~
12 warnings generated.
src/shared/shell.c:1331: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:234:3: warning: Value stored to 'i' is never read
i = execvp(cmdargv[0], cmdargv);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:234:7: warning: Null pointer passed to 1st parameter expecting 'nonnull'
i = execvp(cmdargv[0], cmdargv);
^~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/rfcomm.c:354: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:497:14: warning: Assigned value is garbage or undefined
req.channel = raddr.rc_channel;
^ ~~~~~~~~~~~~~~~~
tools/rfcomm.c:515: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:225:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:235:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:244:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:258:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:265:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:272:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:279:5: warning: Value stored to 'len' is never read
len = write(sk, buf,
^ ~~~~~~~~~~~~~~
tools/avtest.c:291:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:295:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:304:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:308:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:317:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:324:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:346:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:350:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:359:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:363:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:376:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 4);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:380:5: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:387:4: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:397:4: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:562:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:570:3: warning: Value stored to 'len' is never read
len = write(sk, buf, invalid ? 2 : 3);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/avtest.c:584:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 4 + sizeof(media_transport));
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tools/avtest.c:597:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:607:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:619:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:634:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:646:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:655:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 3);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:662:3: warning: Value stored to 'len' is never read
len = write(sk, buf, 2);
^ ~~~~~~~~~~~~~~~~~
tools/avtest.c:698: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:1824: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.
profiles/health/hdp.c:644:3: warning: Use of memory after it is freed
hdp_tmp_dc_data_unref(dc_data);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
profiles/health/hdp.c:800:19: warning: Use of memory after it is freed
path = g_strdup(chan->path);
^~~~~~~~~~
profiles/health/hdp.c:1779:6: warning: Use of memory after it is freed
hdp_tmp_dc_data_ref(hdp_conn),
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
profiles/health/hdp.c:1836:30: warning: Use of memory after it is freed
reply = g_dbus_create_error(data->msg, ERROR_INTERFACE ".HealthError",
^~~~~~~~~
4 warnings generated.
profiles/health/hdp_util.c:1052:2: warning: Use of memory after it is freed
conn_data->func(conn_data->data, gerr);
^~~~~~~~~~~~~~~
1 warning generated.
profiles/audio/asha.c: In function ‘asha_state_reset’:
profiles/audio/asha.c:113:2: error: implicit declaration of function ‘close’; did you mean ‘pclose’? [-Werror=implicit-function-declaration]
113 | close(asha->fd);
| ^~~~~
| pclose
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c: In function ‘asha_connect_socket’:
profiles/audio/asha.c:158:57: error: ‘errno’ undeclared (first use in this function)
158 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:49:1: note: ‘errno’ is defined in header ‘<errno.h>’; did you forget to ‘#include <errno.h>’?
48 | #include "l2cap.h"
+++ |+#include <errno.h>
49 |
In file included from profiles/audio/asha.c:35:
profiles/audio/asha.c:158:57: note: each undeclared identifier is reported only once for each function it appears in
158 | error("Could not open L2CAP CoC socket: %s", strerror(errno));
| ^~~~~
./src/log.h:62:59: note: in definition of macro ‘error’
62 | btd_error(0xffff, "%s:%s() " fmt, __FILE__, __func__, ## arg)
| ^~~
profiles/audio/asha.c:152:19: error: unused variable ‘ret’ [-Werror=unused-variable]
152 | int fd = 0, err, ret = 0;
| ^~~
profiles/audio/asha.c: At top level:
profiles/audio/asha.c:383:6: error: no previous declaration for ‘audio_status_notify’ [-Werror=missing-declarations]
383 | void audio_status_notify(uint16_t value_handle, const uint8_t *value,
| ^~~~~~~~~~~~~~~~~~~
profiles/audio/asha.c: In function ‘asha_source_disconnect’:
profiles/audio/asha.c:710:12: error: unused variable ‘asha_uuid’ [-Werror=unused-variable]
710 | bt_uuid_t asha_uuid;
| ^~~~~~~~~
profiles/audio/asha.c:708:25: error: unused variable ‘client’ [-Werror=unused-variable]
708 | struct bt_gatt_client *client = btd_device_get_gatt_client(device);
| ^~~~~~
profiles/audio/asha.c:707:18: error: unused variable ‘db’ [-Werror=unused-variable]
707 | struct gatt_db *db = btd_device_get_gatt_db(device);
| ^~
At top level:
profiles/audio/asha.c:461:21: error: ‘asha_set_configuration’ defined but not used [-Werror=unused-function]
461 | static DBusMessage *asha_set_configuration(DBusConnection *conn,
| ^~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [Makefile:10691: profiles/audio/bluetoothd-asha.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4656: all] Error 2
---
Regards,
Linux Bluetooth
Hey Luiz,
Thank you for the quick review!
On Wed, 8 May 2024 at 12:25, Luiz Augusto von Dentz
<[email protected]> wrote:
[...]
> > +// 1 sequence number, 4 for L2CAP header, 2 for SDU, and then 20ms of G.722
> > +#define ASHA_MTU 167
>
> Afaik the L2CAP header is already accounted for, or is it another header?
Good point. I guess both the L2CAP header and the SDU length are
accounted for. I've fixed this to be 161 now (sequence number + data).
[...]
> > + // We need to bind before connect to work around getting the wrong addr
> > + // type on older(?) kernels
>
> Lets use C style comments /* */ instead of //, so please fix that in
> other comments as well.
Done.
[...]
> > + { "Codecs", "q", get_codecs, NULL, NULL,
> > + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
>
> Codec?
I'm exposing the bitmask from DeviceCapabilities, which is
theoretically a set of codecs. In practice, since we only have one
codec, it will always be 0x2, but I thought I'd stick to the semantics
of the spec.
> > + { "Device", "o", get_device, NULL, NULL,
> > + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
> > + { "Transport", "o", get_transport, NULL, NULL,
> > + G_DBUS_PROPERTY_FLAG_EXPERIMENTAL },
> > + { }
> > +};
> > +
> > +static void asha_source_endpoint_register(struct asha_device *asha)
> > +{
> > + char *path;
> > + const struct media_endpoint *asha_ep;
> > +
> > + path = make_endpoint_path(asha);
> > + if (!path)
> > + goto error;
> > +
> > + if (g_dbus_register_interface(btd_get_dbus_connection(),
> > + path, MEDIA_ENDPOINT_INTERFACE,
> > + asha_ep_methods, NULL,
> > + asha_ep_properties,
> > + asha, NULL) == FALSE) {
> > + error("Could not register remote ep %s", path);
> > + goto error;
> > + }
> > +
> > + asha_ep = media_endpoint_get_asha();
> > + asha->transport = media_transport_create(asha->device, path, NULL, 0,
> > + (void *) asha_ep, asha);
> > +
> > +error:
> > + if (path)
> > + free(path);
> > + return;
> > +}
> > +
> > +static void asha_source_endpoint_unregister(struct asha_device *asha)
> > +{
> > + char *path;
> > +
> > + path = make_endpoint_path(asha);
> > + if (!path)
> > + goto error;
> > +
> > + g_dbus_unregister_interface(btd_get_dbus_connection(),
> > + path, MEDIA_ENDPOINT_INTERFACE);
> > +
> > + if (asha->transport) {
> > + media_transport_destroy(asha->transport);
> > + asha->transport = NULL;
> > + }
> > +
> > +error:
> > + if (path)
> > + free(path);
> > +}
> > +
> > +static int asha_source_accept(struct btd_service *service)
> > +{
> > + struct btd_device *device = btd_service_get_device(service);
> > + struct gatt_db *db = btd_device_get_gatt_db(device);
> > + struct bt_gatt_client *client = btd_device_get_gatt_client(device);
> > + struct asha_device *asha = btd_service_get_user_data(service);
> > + bt_uuid_t asha_uuid;
> > + char addr[18];
> > +
> > + ba2str(device_get_address(device), addr);
> > + DBG("Accepting ASHA connection on %s", addr);
> > +
> > + if (!asha) {
> > + // Can this actually happen?
> > + DBG("Not handling ASHA profile");
> > + return -1;
> > + }
> > +
> > + asha->db = gatt_db_ref(db);
> > + asha->client = bt_gatt_client_clone(client);
> > +
> > + bt_uuid16_create(&asha_uuid, ASHA_SERVICE);
> > + gatt_db_foreach_service(db, &asha_uuid, foreach_asha_service, asha);
> > +
> > + if (!asha->attr) {
> > + error("ASHA attribute not found");
> > + asha_device_reset(asha);
> > + return -1;
> > + }
> > +
> > + asha_source_endpoint_register(asha);
> > +
> > + btd_service_connecting_complete(service, 0);
> > +
> > + return 0;
> > +}
> > +
> > +static int asha_source_disconnect(struct btd_service *service)
> > +{
> > + struct btd_device *device = btd_service_get_device(service);
> > + struct gatt_db *db = btd_device_get_gatt_db(device);
> > + struct bt_gatt_client *client = btd_device_get_gatt_client(device);
> > + struct asha_device *asha = btd_service_get_user_data(service);
> > + bt_uuid_t asha_uuid;
> > + char addr[18];
> > +
> > + ba2str(device_get_address(device), addr);
> > + DBG("Disconnecting ASHA on %s", addr);
> > +
> > + if (!asha) {
> > + // Can this actually happen?
> > + DBG("Not handlihng ASHA profile");
> > + return -1;
> > + }
> > +
> > + asha_source_endpoint_unregister(asha);
> > + asha_device_reset(asha);
> > +
> > + btd_service_disconnecting_complete(service, 0);
> > +
> > + return 0;
> > +}
> > +
> > +static struct btd_profile asha_source_profile = {
> > + .name = "asha-source",
> > + .priority = BTD_PROFILE_PRIORITY_MEDIUM,
> > + .remote_uuid = ASHA_PROFILE_UUID,
> > + .experimental = true,
> > +
> > + .device_probe = asha_source_device_probe,
> > + .device_remove = asha_source_device_remove,
> > +
> > + .auto_connect = true,
> > + .accept = asha_source_accept,
> > + .disconnect = asha_source_disconnect,
> > +};
> > +
> > +static int asha_init(void)
> > +{
> > + int err;
> > +
> > + err = btd_profile_register(&asha_source_profile);
> > + if (err)
> > + return err;
> > +
> > + return 0;
> > +}
> > +
> > +static void asha_exit(void)
> > +{
> > + btd_profile_unregister(&asha_source_profile);
> > +}
> > +
> > +BLUETOOTH_PLUGIN_DEFINE(asha, VERSION, BLUETOOTH_PLUGIN_PRIORITY_DEFAULT,
> > + asha_init, asha_exit)
> > diff --git a/profiles/audio/asha.h b/profiles/audio/asha.h
> > new file mode 100644
> > index 000000000..0fc28e8a3
> > --- /dev/null
> > +++ b/profiles/audio/asha.h
> > @@ -0,0 +1,34 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +/*
> > + *
> > + * BlueZ - Bluetooth protocol stack for Linux
> > + *
> > + * Copyright (C) 2024 Asymptotic Inc.
> > + *
> > + * Author: Arun Raghavan <[email protected]>
> > + *
> > + *
> > + */
> > +
> > +#include <stdint.h>
> > +
> > +struct asha_device;
> > +
> > +typedef enum {
> > + ASHA_STOPPED = 0,
> > + ASHA_STARTING,
> > + ASHA_STARTED,
> > + ASHA_STOPPING,
> > +} asha_state_t;
> > +
> > +typedef void (*asha_cb_t)(int status, void *data);
> > +
> > +uint16_t asha_device_get_render_delay(struct asha_device *asha);
> > +asha_state_t asha_device_get_state(struct asha_device *asha);
> > +int asha_device_get_fd(struct asha_device *asha);
> > +uint16_t asha_device_get_mtu(struct asha_device *asha);
> > +
> > +unsigned int asha_device_start(struct asha_device *asha, asha_cb_t cb,
> > + void *user_data);
> > +unsigned int asha_device_stop(struct asha_device *asha, asha_cb_t cb,
> > + void *user_data);
>
> I'd suggest we split the protocol portion from the plugin and put it
> under src/shared so we can do unit testing without the D-Bus blocks,
> Id got with bt_asha for instance name, we can do it later if you don't
> feel like it is necessary right now.
Ah, I did not follow the reason for that split previously. Done now.
[...]
> Otherwise it looks pretty good.
Thank you for the quick review! I'll send out a v2 with these fixes
and whatever the linter caught.
Cheers,
Arun
On Wed, 8 May 2024 at 12:34, Luiz Augusto von Dentz
<[email protected]> wrote:
[...]
> While I don't mind having a python example I think we are much better
> of adding such support in bluetoothctl, most should already work with
> transport submenu but perhaps we want to add support for gstreamer
> pipeline instead of just a file which would be useful for creating
> A2DP sbc and BAP lc3 streams.
Makes sense, I can take a look at this, but if possible I'd like to
punt this till I get the end-to-end flow working with the PipeWire
BlueZ modules.
Cheers,
Arun