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 1/2] client/player: Configure BASE using separate structure.
Date:   Fri,  4 Aug 2023 17:10:58 +0300
Message-Id: <20230804141059.24352-2-silviu.barbulescu@nxp.com>
In-Reply-To: <20230804141059.24352-1-silviu.barbulescu@nxp.com>
References: <20230804141059.24352-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?R4Wi+jWZWIF9ssUY6T9eR9i5Zl67D28Lueg6S4h82b7CkI622IZLckjPQDnb?=
 =?us-ascii?Q?wgwEHq3Aw4c3Qei3ZJ1Lpqx8tdVkyki0yJHJSpK0xPvhnnPEwHjixEauEGr6?=
 =?us-ascii?Q?kU1mYnZ/3080EDPgOISSfgL7mPOga/hMzek/9cFbIcuZqSEzTD0ulaX8qCHb?=
 =?us-ascii?Q?KoHKYZU3SVdA9FOV4GaI64QzKJfBWwkjKA47pLYoAKG5rECn0sdroTKHdOip?=
 =?us-ascii?Q?unNLoqlOXkWJ/gnSgjBY7IGjeNUhyxYiCb0zV4dlOP3KqQvMaTxb/Kg7EtBY?=
 =?us-ascii?Q?NYWW7QFQQrs/BoB/8ajHQARKNtCL54zVnotRKXzGP88avtVX0ISngnPNHwtz?=
 =?us-ascii?Q?eD9O9bOkJ64Q3WVDm2KxWgCTf52nTtwIZ84IulBpj7XCfAgpDTKC86hnVHDh?=
 =?us-ascii?Q?e8wCzMsxVz5az3dMuctWucXEi74bE3VZvFthJmynugcJyy9zXApIOleCC3Kg?=
 =?us-ascii?Q?Vh87FPooaOAbls7dWN5Xx3a07/E5Rd0xB1RJmOOG1BoibJYPYxoE5kjEcAUg?=
 =?us-ascii?Q?LsfP9p46KfbxoGfsbLU5K3hsYGfQfmGxZ0WoqRlTVuZpdPbU6t9XTTj/3v9O?=
 =?us-ascii?Q?3OF4bPumo1Nc27sK9uqap2nKltWVxK5YeFNXIqvBli4jvslnheVKUcNj5H+T?=
 =?us-ascii?Q?ybaHgx4lDjcrfsEb3kXftZPf5arL+aHSs+0IYVLM0sLiO0IkKboC0XtMRZwL?=
 =?us-ascii?Q?O0xEJjnExAdewz3CbNXz4lbp3xcQ+3LT0aUe/5/DwSn//92W7HQcP08u9i9q?=
 =?us-ascii?Q?/3lMgdj0Hmb9TVLi2piDImR5x4gz09AdS75ZFViWvyP0oEfL7JTV5tJ9KQMl?=
 =?us-ascii?Q?3C34nCEc6bFHUtgMVw9AqQqYduT6JHkzsEjBZkzpnYboRyIWOgyLX/rcID5j?=
 =?us-ascii?Q?nUGMcNmFGIoEQQ1vFbEw9Eo7it30JnC/Qg49r8B5OlNdR9DmpwLPk9wDpApu?=
 =?us-ascii?Q?qyd3NdBgdWnHYgKWDLaU+/EC0r8IZnHRW81grYZ9GqZPBJYvjTlhvyInpImq?=
 =?us-ascii?Q?fXRUpqPMhgmoMtWWotSqXv+dUXe1icnt3+l+rLE55pPzKicenswaLYQTJC+2?=
 =?us-ascii?Q?JXuJBP23Uh52zJ014JauJlIR4CbRC50E9xzZDMQaqQoapn/UYHBlk2M/dZlH?=
 =?us-ascii?Q?NUaBk1vYM7kXA338jIMR55khoj8hN51/ItBbZJ1EiwPIYhWBYZhY1m2wt7IC?=
 =?us-ascii?Q?IM7QA2ioxmpJXPqRHivEFhM9gVAUD1c7jxrnwmvCAh5TgYvuJ3m24tfwUrrJ?=
 =?us-ascii?Q?1Ew8lgF49HjgxOuhDSslgdlwKCWrt/UnXIvL/sMRXJqPdQLGhCF5uEKXIb8m?=
 =?us-ascii?Q?92R37t9vVGtaX4y7aiVuCan0rQkkCrKwPP2w3IVm284SC3tQc58CMNqwmwTL?=
 =?us-ascii?Q?Dw0GrqSF9vH3m/tKpfTSq8T4wGd1fZNMGUJfzCMrxr9+WIXChpqUb3Y+SJsZ?=
 =?us-ascii?Q?57ybK6xi1KoPomNKplNnLQzikH0OrFY2C09/o5qx/SNFIh4D+yL3B5Re4CN6?=
 =?us-ascii?Q?4EkFdUZNKzzfYMdvWiErkcgVB0PH3HoBJ8SfZTI/YFNh0ufmCOf6gFrvbVhI?=
 =?us-ascii?Q?dTpQ0Zkad8vKmzif8MlxJPqueN60t7flXBaZ2MY3IIxAjEU936UyZLa2qWxt?=
 =?us-ascii?Q?vw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c22b29f0-96dc-42cf-6215-08db94f4b904
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5344.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2023 14:11:40.2610
 (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: kYrZV/oTxtfVkZcBGiq+8nue5e8sXjBoJUh/qkrsPg2Tbj5wF6NkVDv+tKXdXTg6/2kSle4wn6axia2tEwYmCIDLNw1iJLvHHNhBmgMvoEI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9287
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_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,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

From: Claudia Draghicescu <claudia.rosu@nxp.com>

Use preset configuration in capabilities.
Configure BASE using separate structure.

---
 client/player.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/client/player.c b/client/player.c
index 9bc5f2a36..00ab33084 100644
--- a/client/player.c
+++ b/client/player.c
@@ -1735,6 +1735,7 @@ struct endpoint_config {
 	struct iovec *meta;
 	uint8_t target_latency;
 	const struct codec_qos *qos;
+	struct iovec *base;
 };
 
 #define BCODE {0x01, 0x02, 0x68, 0x05, 0x53, 0xf1, 0x41, 0x5a, \
@@ -1766,6 +1767,7 @@ static void append_properties(DBusMessageIter *iter,
 	const char *key = "Capabilities";
 	const char *meta = "Metadata";
 	const char *keyBCode = "BroadcastCode";
+	const char *base = "BASE";
 
 	dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "{sv}", &dict);
 
@@ -1902,6 +1904,14 @@ static void append_properties(DBusMessageIter *iter,
 	g_dbus_dict_append_entry(&dict, "Timeout", DBUS_TYPE_UINT16,
 						&bcast_qos.bcast.timeout);
 
+	bt_shell_printf("BASE:\n");
+	bt_shell_hexdump(cfg->base->iov_base, cfg->base->iov_len);
+
+	g_dbus_dict_append_basic_array(&dict, DBUS_TYPE_STRING, &base,
+						DBUS_TYPE_BYTE,
+						&cfg->base->iov_base,
+						cfg->base->iov_len);
+
 	bt_shell_printf("BroadcastCode:\n");
 	bt_shell_hexdump(cfg->ep->bcode->iov_base, cfg->ep->bcode->iov_len);
 
@@ -2758,15 +2768,15 @@ static void cmd_config_endpoint(int argc, char *argv[])
 		if (cfg->ep->broadcast) {
 			iov_append(&cfg->ep->bcode, bcast_qos.bcast.bcode,
 				sizeof(bcast_qos.bcast.bcode));
-			/* Copy capabilities for broadcast*/
-			iov_append(&cfg->caps, base_lc3_16_2_1,
-				sizeof(base_lc3_16_2_1));
-		} else {
-			/* Copy capabilities */
-			iov_append(&cfg->caps, preset->data.iov_base,
-							preset->data.iov_len);
+			/* Copy BASE for broadcast*/
+			iov_append(&cfg->base, base_lc3_16_2_1,
+			sizeof(base_lc3_16_2_1));
 		}
 
+		/* Copy capabilities */
+		iov_append(&cfg->caps, preset->data.iov_base,
+						preset->data.iov_len);
+
 		/* Set QoS parameters */
 		cfg->qos = &preset->qos;
 
-- 
2.34.1