From patchwork Tue Aug 30 14:47:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= X-Patchwork-Id: 601526 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA787ECAAA1 for ; Tue, 30 Aug 2022 14:48:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230022AbiH3OsB (ORCPT ); Tue, 30 Aug 2022 10:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229518AbiH3Or7 (ORCPT ); Tue, 30 Aug 2022 10:47:59 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49A26D2912 for ; Tue, 30 Aug 2022 07:47:56 -0700 (PDT) Received: from localhost.localdomain (67.227.121.78.rev.sfr.net [78.121.227.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: fdanis) by madras.collabora.co.uk (Postfix) with ESMTPSA id 99A1B6601DC3 for ; Tue, 30 Aug 2022 15:47:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1661870874; bh=eMxynpX8LsZUg6Hmd83LRbSqFYSJQhe3zoDjJp+qTu4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=eB8LGOS65lRV54VLbwIsKBnHE4NivUIlpJptRKH1E0PoCl2Nh0gQVwdY4oY/EPcYg cIrnvf8WZ/opUr8PscELraqAga/5CLN9xa4C8p/H5pF3CQxdXRIXXywutj7bJk/Zgl G8ueULqvn1DUpZl3VuQU8wqZR35xzD0Vvmx3uen/2xLLTbR5cqJvdKQdTZ9Rz+ap+p aYCYUMemNL+WlpKYmzv4NUXpJ+BymgZH+7JDbH5UHRYhBAOllLX/GS8zQ2yxf2vWIo 6IquDzzQyna7g1ClbDkTcFV0CSooAqWqWSOWO3gOjEVKhhb5ycL4YRF1AZuQoo/oVn 0gS5DU/nlhlpQ== From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v2 1/3] profiles: Add remote endpoint path to SelectProperties Date: Tue, 30 Aug 2022 16:47:32 +0200 Message-Id: <20220830144734.55263-2-frederic.danis@collabora.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220830144734.55263-1-frederic.danis@collabora.com> References: <20220830144734.55263-1-frederic.danis@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds the remote endpoint path to the dictionary sent in SelectProperties. It allows audio application to know for which remote endpoint the call is done and so for which it should act as an initiator. --- profiles/audio/bap.c | 2 ++ profiles/audio/media.c | 15 ++++++++++++--- src/shared/bap.c | 12 +++++++++++- src/shared/bap.h | 7 +++++-- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index d388afe56..67aba3bd7 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -555,6 +555,8 @@ static struct bap_ep *ep_register(struct btd_service *service, return NULL; } + bt_bap_pac_set_user_data(rpac, ep->path); + DBG("ep %p lpac %p rpac %p path %s", ep, ep->lpac, ep->rpac, ep->path); queue_push_tail(queue, ep); diff --git a/profiles/audio/media.c b/profiles/audio/media.c index ff3fa197b..85278a6d9 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -889,16 +889,20 @@ done: data->cb(data->pac, err, caps, metadata, &qos, data->user_data); } -static int pac_select(struct bt_bap_pac *pac, struct bt_bap_pac_qos *qos, - struct iovec *caps, struct iovec *metadata, +static int pac_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, + struct bt_bap_pac_qos *qos, bt_bap_pac_select_t cb, void *cb_data, void *user_data) { struct media_endpoint *endpoint = user_data; + struct iovec *caps; + struct iovec *metadata; + const char *endpoint_path; struct pac_select_data *data; DBusMessage *msg; DBusMessageIter iter, dict; const char *key = "Capabilities"; + bt_bap_pac_get_codec(rpac, NULL, &caps, &metadata); if (!caps) return -EINVAL; @@ -911,7 +915,7 @@ static int pac_select(struct bt_bap_pac *pac, struct bt_bap_pac_qos *qos, } data = new0(struct pac_select_data, 1); - data->pac = pac; + data->pac = lpac; data->cb = cb; data->user_data = cb_data; @@ -919,6 +923,11 @@ static int pac_select(struct bt_bap_pac *pac, struct bt_bap_pac_qos *qos, dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &dict); + endpoint_path = bt_bap_pac_get_user_data(rpac); + if (endpoint_path) + g_dbus_dict_append_entry(&dict, "Endpoint", + DBUS_TYPE_OBJECT_PATH, &endpoint_path); + g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &key, DBUS_TYPE_BYTE, &caps->iov_base, caps->iov_len); diff --git a/src/shared/bap.c b/src/shared/bap.c index 8edc7b72e..150b2116e 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -3934,6 +3934,16 @@ int bt_bap_pac_get_codec(struct bt_bap_pac *pac, uint8_t *id, return bt_bap_pac_get_vendor_codec(pac, id, NULL, NULL, data, metadata); } +void bt_bap_pac_set_user_data(struct bt_bap_pac *pac, void *user_data) +{ + pac->user_data = user_data; +} + +void *bt_bap_pac_get_user_data(struct bt_bap_pac *pac) +{ + return pac->user_data; +} + static bool find_ep_unused(const void *data, const void *user_data) { const struct bt_bap_endpoint *ep = data; @@ -4066,7 +4076,7 @@ int bt_bap_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, if (!lpac->ops || !lpac->ops->select) return -EOPNOTSUPP; - lpac->ops->select(lpac, &rpac->qos, rpac->data, rpac->metadata, + lpac->ops->select(lpac, rpac, &rpac->qos, func, user_data, lpac->user_data); return 0; diff --git a/src/shared/bap.h b/src/shared/bap.h index ff4bac330..93b00d771 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -120,8 +120,8 @@ struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name, struct iovec *metadata); struct bt_bap_pac_ops { - int (*select) (struct bt_bap_pac *pac, struct bt_bap_pac_qos *qos, - struct iovec *caps, struct iovec *metadata, + int (*select)(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, + struct bt_bap_pac_qos *qos, bt_bap_pac_select_t cb, void *cb_data, void *user_data); int (*config) (struct bt_bap_stream *stream, struct iovec *cfg, struct bt_bap_qos *qos, bt_bap_pac_config_t cb, @@ -186,6 +186,9 @@ int bt_bap_pac_get_vendor_codec(struct bt_bap_pac *pac, uint8_t *id, int bt_bap_pac_get_codec(struct bt_bap_pac *pac, uint8_t *id, struct iovec **data, struct iovec **metadata); +void bt_bap_pac_set_user_data(struct bt_bap_pac *pac, void *user_data); +void *bt_bap_pac_get_user_data(struct bt_bap_pac *pac); + /* Stream related functions */ int bt_bap_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, bt_bap_pac_select_t func, void *user_data); From patchwork Tue Aug 30 14:47:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= X-Patchwork-Id: 601527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3219CECAAD1 for ; Tue, 30 Aug 2022 14:48:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229521AbiH3OsA (ORCPT ); Tue, 30 Aug 2022 10:48:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229985AbiH3Or6 (ORCPT ); Tue, 30 Aug 2022 10:47:58 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A417D31E9 for ; Tue, 30 Aug 2022 07:47:56 -0700 (PDT) Received: from localhost.localdomain (67.227.121.78.rev.sfr.net [78.121.227.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: fdanis) by madras.collabora.co.uk (Postfix) with ESMTPSA id CDF286601E7E for ; Tue, 30 Aug 2022 15:47:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1661870875; bh=C6OUOHXNHpu4Tz4UaptT6NPb9XXLiHH4PdT77NztCmc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=bj+neXRislsjQBtZq/aptYbp75VcV+UmvKosQowI9Fio3rbTeJZGtcaB5PPppYk1b EouTyhgBPiIDk8OglX5paXMJvtCC6P4pveyLm/6plne4V52u20ahVRKTzriMocfi9E VoJKtQnp+D+IXIcO63XdsXWgQdXorkFw9HFVHI0gU+W5PT7lyEv2uHuPOFImpSGDCa NuSEpQ3IMmnS7iP1CM6icQouyBlLdctcehjehyTqtSZwL9f5bJpt8AUtJ+83O9LqLv MaGNfh/3a8yB0ali2B2WrSw6BLVDWr87azU9uqh9P/a8TfH+GWbwgAgbRmEMN22azX 1LjIommKTusMQ== From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v2 2/3] doc: Add remote endpoint path to SelectProperties Date: Tue, 30 Aug 2022 16:47:33 +0200 Message-Id: <20220830144734.55263-3-frederic.danis@collabora.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220830144734.55263-1-frederic.danis@collabora.com> References: <20220830144734.55263-1-frederic.danis@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org --- doc/media-api.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/media-api.txt b/doc/media-api.txt index 9cd211355..847f8bee7 100644 --- a/doc/media-api.txt +++ b/doc/media-api.txt @@ -601,8 +601,10 @@ Methods void SetConfiguration(object transport, dict properties) dict SelectProperties(dict properties) Select preferable properties from the supported - properties. Refer to SetConfiguration for the list of - possible properties. + properties: + object Endpoint [ISO only] + Refer to SetConfiguration for the list of + other possible properties. Returns propeties which can be used to setup a transport. From patchwork Tue Aug 30 14:47:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= X-Patchwork-Id: 601153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B542BC0502C for ; Tue, 30 Aug 2022 14:48:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229985AbiH3OsB (ORCPT ); Tue, 30 Aug 2022 10:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229998AbiH3Or7 (ORCPT ); Tue, 30 Aug 2022 10:47:59 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76735BFC53 for ; Tue, 30 Aug 2022 07:47:56 -0700 (PDT) Received: from localhost.localdomain (67.227.121.78.rev.sfr.net [78.121.227.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: fdanis) by madras.collabora.co.uk (Postfix) with ESMTPSA id 1B5D36601F01 for ; Tue, 30 Aug 2022 15:47:55 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1661870875; bh=6QLviVyQq0ni+/AJifpiFagFZmFAziOKtE9yGu4Jbzc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jDWhkY5vDLQ9eTrSHoUev6easnT5qFtiNmwhf1fWqdJQoOxBF7s+gv5dZiqzXdQfQ UcJGNtCazvtTu6XwSWHH6LAAEKF3NUkVIB0M1HFqBx98UoKdq087dOzueEXIYMM6+D Tn+RoakpvH7uQ7R/9fCGW0c2xU4uDKVyhJkrAXA72VObVfAaZb7ps48arOPVoUWqww ZD5jbDq5FJs63T7VLl36M/LM/lsnu6sqdVxB+/y1Q44zY/zucEJ8ALBzNGaZeXXGon /gs1898A2W04uy+M5OeDv5YEUTSZ8Ujp+e3WmG+C56KYEV/EH+FdCFJJiDQZzs9DlU 6sbfRKKfyipPA== From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v2 3/3] profiles: Fix function definition style Date: Tue, 30 Aug 2022 16:47:34 +0200 Message-Id: <20220830144734.55263-4-frederic.danis@collabora.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220830144734.55263-1-frederic.danis@collabora.com> References: <20220830144734.55263-1-frederic.danis@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This was found by checkpatch in previous commit: WARNING:SPACING: Unnecessary space before function pointer arguments 124: FILE: src/shared/bap.h:123: + int (*select) (struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, Do the same for (*config) and (*clear) for consistence. --- src/shared/bap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/bap.h b/src/shared/bap.h index 93b00d771..b63b4b024 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -123,10 +123,10 @@ struct bt_bap_pac_ops { int (*select)(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, struct bt_bap_pac_qos *qos, bt_bap_pac_select_t cb, void *cb_data, void *user_data); - int (*config) (struct bt_bap_stream *stream, struct iovec *cfg, + int (*config)(struct bt_bap_stream *stream, struct iovec *cfg, struct bt_bap_qos *qos, bt_bap_pac_config_t cb, void *user_data); - void (*clear) (struct bt_bap_stream *stream, void *user_data); + void (*clear)(struct bt_bap_stream *stream, void *user_data); }; bool bt_bap_pac_set_ops(struct bt_bap_pac *pac, struct bt_bap_pac_ops *ops,