Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Silviu Florian Barbulescu <silviu.barbulescu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com,
        silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com,
        andrei.istodorescu@nxp.com, iulia.tanasescu@nxp.com
Subject: [PATCH BlueZ v2 1/1] Rename BAA_SERVICE to BCAST_AA_SERVICE add BASIC_AA_SERVICE
Date:   Wed, 26 Jul 2023 17:53:03 +0300
Message-Id: <20230726145303.137597-2-silviu.barbulescu@nxp.com>
In-Reply-To: <20230726145303.137597-1-silviu.barbulescu@nxp.com>
References: <20230726145303.137597-1-silviu.barbulescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hTF1JFxahIPMilR+hq7+l5XnRiFstb5ok9x7C0FEJt7ilvmgYDxuCfe95d+D?=
 =?us-ascii?Q?KkOO5AKK7WdCcqOSK3OejUkgl8NiH0y2VSFZxEzgew/0iMLTtHEFn4znnQZM?=
 =?us-ascii?Q?Cx2lnQxnTQPWWck+hOBY5js5ThlKWTYVH68D7pxMtCYiPeuAsn/h5RyviaN5?=
 =?us-ascii?Q?0KP9Q41kbpKE6vVRLTaoeWEM66otrqoW0c4xKw0+fzUuxTI4TTE5fILu8bXv?=
 =?us-ascii?Q?mHMmGhxx7J0r3iJYuwIsfAgOBgvqiJOjSsOWFzy8jYfujd7bmBIA/gQHMbQ2?=
 =?us-ascii?Q?vwuakVOynpmPYBwkMcDdMoA/9CR1VLfPVHyySxkRJaAFdIPHLChqsk/mdLb5?=
 =?us-ascii?Q?HjAlkdD4z5116rj5OH7V7z1ML3XijQIL6LFQr1clwutMnfWuVytgFI44PW2n?=
 =?us-ascii?Q?H2PrashaOhCTJ25DzdeIgRoZuA2arZUcooLtmnX0jeiIaCfRJq96ee5h28eF?=
 =?us-ascii?Q?1mmgLVOvJJ6VDS1RnRfadaCyH9VzWnhjOpE8uSmOW39Cq7cgPHZStzgaOiVJ?=
 =?us-ascii?Q?0ZlKPDV4CPYRdV2xcHKf3GRdsuNmbpXTkPPiXZ2k54aLaqDMc2mCDULK1Pry?=
 =?us-ascii?Q?X/9i8nEXKr9h0n9Z9SDS4dj7Qjoauzzjfjdj91b4XB+9YwuhOWiWtruyt2tt?=
 =?us-ascii?Q?iUD3yLPOGp65bwbYX5mw8PkPovUJLVhRSffcC9HiUbiv3F/zUDi0UczeTVdY?=
 =?us-ascii?Q?FOf4ZauDszW8MmWPH1SwskrVKnLumSIBpyLI33ptn72MnonNsARleiFHlW3y?=
 =?us-ascii?Q?eWvLHFF5STWx03ycPkR8z7dbXgPjm2cYJ0Fctg633sncI98I/spguk3v5o8F?=
 =?us-ascii?Q?ngWybcXqNY2CItHa09ZCX1ZjnGaW+ffz+/Vplq30RKd885DxxxB932eA3+hj?=
 =?us-ascii?Q?YrW9MK5kpS9Ildb6E3QUC7SHNGRZSxOGVryYHFtyZzhM17lA/fUhwFC0SeRj?=
 =?us-ascii?Q?NxYGsElgLXdWyXrvi1tQGFC03uxHGCahbH7ViwJjRfKHkmCzoT7EL7FDkFhC?=
 =?us-ascii?Q?QcS4G/o5HsBXpyt7OQLqfweWgM7fPtJW4G+A7MRp7DAiqT9Bsm29G/uNVsZv?=
 =?us-ascii?Q?FK2FnCp9kzsGgU4Vuf7PdbjfLEAWaMQlk1ir3HBD8QB0srXQ/cn10MJ1DElJ?=
 =?us-ascii?Q?YH6tIYeco8J0KQgmeK2IsjPRnwFwNb0E/uQAv95/8K2AN6LO4j6SvVW6SkDa?=
 =?us-ascii?Q?FZJ5Ah251jLc49jfcNubTpDGPWGY/9P8UCHnNReNYN2cD7U3tvBy+Y6bV5To?=
 =?us-ascii?Q?Hj6vXZKRWW5TgEawcY+qoRc1Cg9b5RVhKvv2+5SDwzfmCAebTtYjuL2QywAo?=
 =?us-ascii?Q?br61TXSiPhZMD2NR0aF0K7ehzmXG/IN76X3vA9jI+nPrizqNWtubbLEPFsxK?=
 =?us-ascii?Q?ROpepPg7XNjgVpAkHzewD3LzEC5kSLElTWq5vY+eTAwDzZHx+b6oIDJ9EDkK?=
 =?us-ascii?Q?0k8q/HTDonoD3FUh12pHej4Fdzl2symqCR5+7mBcJcV6e5rVgYJU2egtOzTU?=
 =?us-ascii?Q?pGv7pvOa98kVuG1SDxKSnoFK+Flvdzl/jHy/olmn5I994pXZs2UE3o39TIWo?=
 =?us-ascii?Q?BuujKmVv0bqYOkdwClOlynnwdwhyoyOS5d3e6CqiSLx53Wnj7iMLF4b+hPJ8?=
 =?us-ascii?Q?DQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 704a3a09-ef50-4b6c-99e6-08db8de81b15
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5344.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 14:53:43.0826
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: LBLI/OC5SF4NKWfmhK2qo2KsjzVpilKrPN7GSOfqkIuGbe1fJXurjCRXPPOSyfEyANQ8V1BWBRJMDdVsFdIVMIflvK5TuwGouFCg16Ef2TU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9707
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

Rename BAA_SERVICE to BCAST_AA_SERVICE and added BCAST_AA_SERVICE(0x1851)
as UUID for the broadcast sink.

---
 client/player.c            | 8 ++++----
 lib/uuid.h                 | 7 +++++--
 profiles/audio/bap.c       | 2 +-
 profiles/audio/media.c     | 2 +-
 profiles/audio/transport.c | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/client/player.c b/client/player.c
index e5084967a..508f73001 100644
--- a/client/player.c
+++ b/client/player.c
@@ -1180,7 +1180,7 @@ static const struct capabilities {
 	 * Channel count: 3
 	 * Frame length: 30-240
 	 */
-	CODEC_CAPABILITIES(BAA_SERVICE_UUID, LC3_ID,
+	CODEC_CAPABILITIES(BCAST_AA_SERVICE_UUID, LC3_ID,
 					LC3_DATA(LC3_FREQ_ANY, LC3_DURATION_ANY,
 						3u, 30, 240)),
 };
@@ -1464,7 +1464,7 @@ static struct preset {
 	PRESET(A2DP_SINK_UUID, A2DP_CODEC_SBC, sbc_presets, 6),
 	PRESET(PAC_SINK_UUID, LC3_ID, lc3_presets, 3),
 	PRESET(PAC_SOURCE_UUID, LC3_ID, lc3_presets, 3),
-	PRESET(BAA_SERVICE_UUID,  LC3_ID, lc3_presets, 3),
+	PRESET(BCAST_AA_SERVICE_UUID,  LC3_ID, lc3_presets, 3),
 };
 
 static void parse_vendor_codec(const char *codec, uint16_t *vid, uint16_t *cid)
@@ -2455,7 +2455,7 @@ static void endpoint_auto_accept(const char *input, void *user_data)
 {
 	struct endpoint *ep = user_data;
 
-	if (!strcmp(ep->uuid, BAA_SERVICE_UUID)) {
+	if (!strcmp(ep->uuid, BCAST_AA_SERVICE_UUID)) {
 		ep->broadcast = true;
 	} else {
 		ep->broadcast = false;
@@ -3189,7 +3189,7 @@ static struct endpoint *endpoint_new(const struct capabilities *cap)
 
 	ep = new0(struct endpoint, 1);
 	ep->uuid = g_strdup(cap->uuid);
-	ep->broadcast = strcmp(cap->uuid, BAA_SERVICE_UUID) ? false : true;
+	ep->broadcast = strcmp(cap->uuid, BCAST_AA_SERVICE_UUID) ? false : true;
 	ep->codec = cap->codec_id;
 	ep->path = g_strdup_printf("%s/ep%u", BLUEZ_MEDIA_ENDPOINT_PATH,
 					g_list_length(local_endpoints));
diff --git a/lib/uuid.h b/lib/uuid.h
index cd3b3655f..cd9e62f1a 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -157,8 +157,11 @@ extern "C" {
 #define PAC_SOURCE_UUID		"00002bcb-0000-1000-8000-00805f9b34fb"
 #define PAC_SOURCE_LOC_CHRC_UUID			0x2bcc
 
-#define BAA_SERVICE		0x1852
-#define BAA_SERVICE_UUID	"00001852-0000-1000-8000-00805f9b34fb"
+#define BCAST_AA_SERVICE				0x1852
+#define BCAST_AA_SERVICE_UUID	"00001852-0000-1000-8000-00805f9b34fb"
+
+#define BASIC_AA_SERVICE				0x1851
+#define BASIC_AA_SERVICE_UUID	"00001851-0000-1000-8000-00805f9b34fb"
 
 #define PAC_CONTEXT					0x2bcd
 #define PAC_SUPPORTED_CONTEXT				0x2bce
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index d7ce9e038..1d7a4a794 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -186,7 +186,7 @@ static gboolean get_uuid(const GDBusPropertyTable *property,
 	else if (queue_find(ep->data->srcs, NULL, ep))
 		uuid = PAC_SOURCE_UUID;
 	else
-		uuid = BAA_SERVICE_UUID;
+		uuid = BASIC_AA_SERVICE_UUID;
 
 	dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &uuid);
 
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index bcf4eae26..e5c18970e 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1364,7 +1364,7 @@ static struct media_endpoint_init {
 				experimental_endpoint_supported },
 	{ PAC_SOURCE_UUID, endpoint_init_pac_source,
 				experimental_endpoint_supported },
-	{ BAA_SERVICE_UUID, endpoint_init_broadcast_source,
+	{ BCAST_AA_SERVICE_UUID, endpoint_init_broadcast_source,
 			experimental_broadcaster_ep_supported },
 };
 
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index aa3a718b0..a997fab73 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -552,7 +552,7 @@ static DBusMessage *acquire(DBusConnection *conn, DBusMessage *msg,
 	owner = media_owner_create(msg);
 
 	if (!strcmp(media_endpoint_get_uuid(transport->endpoint),
-						BAA_SERVICE_UUID)) {
+						BCAST_AA_SERVICE_UUID)) {
 		req = media_request_create(msg, 0x00);
 		media_owner_add(owner, req);
 		media_transport_set_owner(transport, owner);
@@ -1631,7 +1631,7 @@ struct media_transport *media_transport_create(struct btd_device *device,
 		properties = a2dp_properties;
 	} else if (!strcasecmp(uuid, PAC_SINK_UUID) ||
 				!strcasecmp(uuid, PAC_SOURCE_UUID) ||
-				!strcasecmp(uuid, BAA_SERVICE_UUID)) {
+				!strcasecmp(uuid, BCAST_AA_SERVICE_UUID)) {
 		if (media_transport_init_bap(transport, stream) < 0)
 			goto fail;
 		properties = bap_properties;
-- 
2.34.1