From patchwork Thu Nov 2 15:58:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 740524 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 5AB39C4332F for ; Thu, 2 Nov 2023 15:58:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377031AbjKBP6o (ORCPT ); Thu, 2 Nov 2023 11:58:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377024AbjKBP6n (ORCPT ); Thu, 2 Nov 2023 11:58:43 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2058.outbound.protection.outlook.com [40.107.22.58]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C511B138 for ; Thu, 2 Nov 2023 08:58:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J82enRc4f10usoHoQJV6AX3MQZVyf0VDC2SlHCfUmn9qhI9T8AWALyRpsZ4NBEW1klMAGadWM1fawl47CdBpmxbHRVrWA2irWcA5DPv4N/nfJAFTcexuQ+shz4e8nnsv+rWnG+YikqlFAuIV+59C6/1fTy+uou7UwcsBB39cb3X4FAMkBoivzG8t7JGKjb8YzEyuxGalc+lRHZSthG9Q465D6i2/NvnA4SvzH5rAAkIerYUxXwYNEhZgmeP5x+fI6YDf1v3d/PxdxWmedKu0KIxfJ0TnLxMutWZG1bRUAAu5nbxuJWQkZLedU8N32t5ouniG/38qrNYSE3Gu16Gwow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hWM/uQZU9RxfJdKvLLiJrUcg9hwoKwESBKE1PIF6FLo=; b=MABaLx8fTEihScQK+bv/R/LhzoyF6qCj1nJ3IAnCOUb5s9MMT7uhE/QYKzpZnJ8PFWkujN92NbkYDpLxcaSmbFLlbZFDanqLxL/AqPxapKrjW8Qcq3fPSKBEPDlpxRcgUmej7xlh+W0ZAO7nJq+T7fpAc1OSaBRZODjNZTwd6E1l2tkATp8Ra5sU+F9VrmCTKEtjfKXRlQhYPmhpz9Yh/MTdNz9oP+e+glxk2CAZhWPvDB7B9cgf1WcZKX3aeo+tFhPXZoRCPC0ecwrxBbVFvbcMt55uNnmA3a27YdWQ5jM6H49jGvigmY6ET4lXPaPOtxrXXSy1i/Szxy8QQy30eQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hWM/uQZU9RxfJdKvLLiJrUcg9hwoKwESBKE1PIF6FLo=; b=D1K9hH2QbiIfX7RC+dL12S3y+z51p1Y7D6ShN4KP1Ns3J1khfNpPH65acBxH7ACq1Brvt+1FuWAjOyDa07dmdFJMGmsIt9rz4Ww+nB3W5bgqwyK6PA98diV6mdN3VwguPmGZ+AFp27P6Au3HxYOVZ1XRtSaL7WQ5XfSA89FlRD8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) by PAXPR04MB9005.eurprd04.prod.outlook.com (2603:10a6:102:210::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.18; Thu, 2 Nov 2023 15:58:34 +0000 Received: from DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a]) by DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a%7]) with mapi id 15.20.6954.019; Thu, 2 Nov 2023 15:58:34 +0000 From: Silviu Florian Barbulescu 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, luiz.dentz@gmail.com, iulia.tanasescu@nxp.com Subject: [PATCH v3 1/5] bap: Fix source+sink endpoint registration Date: Thu, 2 Nov 2023 17:58:23 +0200 Message-Id: <20231102155827.4219-2-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231102155827.4219-1-silviu.barbulescu@nxp.com> References: <20231102155827.4219-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: VI1PR0102CA0009.eurprd01.prod.exchangelabs.com (2603:10a6:802::22) To DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6331:EE_|PAXPR04MB9005:EE_ X-MS-Office365-Filtering-Correlation-Id: ac2b6407-69a8-4cb4-fd89-08dbdbbc9121 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W45NF+bnb5/MlhZJlE0BomyjLi4HLH/gqZ79ri3MYUOG/nPiigfz8fu9+NvOAZjLYmmbep5fan4XwZBRha8t3CPWSeGqn5if3rcCICdjA5ULt/2pnNdm6qOsj37x2KfPEbFfI7Rgwk+fNz7xQwBzM+9aydaZtG8qASnGlSIWqPWxc3fCXayBDki1QCjvrepXeJb1sEJNrI6HKdr01IF6UKHqSAGGvJG4uZe18PmuLPE4MTvBdyFZMoepAZWeuwlufzpJpLVMdw89NRls4KL8XXUXlk+JZkpL6rJmmCQw1oVjbQj/0qTiRiZDrr7qsn18EVg5lm8UzoPHQoZ+8u6i3ZrONgB/CHlP3VK1+Ir5vQxQVsdKZIxTvjpPe/qNX8Qv2u/SH9/ei9N6wEsNFXV3LRtilnOcq69i9zcWdIjOwvgdBKOcsOyQxE25ZhK8uSIjLY83wxEtKhUhG9mZJwZTbNf757KagyE91xVBL66pDt0dH5U1kbWfXDCBNOh0qxPOSHcyTsCf4Rl45dXpWJ/LrLVr6EvZrSM/r3LcBY6Pr4k+VKIreXzgnDTDWhoUoJCj X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6331.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(346002)(366004)(376002)(136003)(396003)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(6512007)(1076003)(478600001)(6506007)(83380400001)(6666004)(8936002)(8676002)(66946007)(41300700001)(5660300002)(66556008)(6486002)(2616005)(66476007)(6916009)(316002)(4326008)(38100700002)(86362001)(36756003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fb/729Lg8bK2QDX864sjN2pQ7phKvT0Vv8NeT8QhgPn0ilnDlbJQQ5Q+Tld5vkWqiabTRfdEU27cTMMcDQUHXz5Jm+R/N1aZlEP0D/bbzchuqQKxYy8UARIzjAK+1jU/nAEtbqHbSD1ej0fBp6BgvA7NcpONBL51JYBh0KjerWwZ30yz+OozDbWyKh4j5GR96KmD+zBbntd+q8HAqB5jq8Gy89E6yBJ/RrTV21BPKxxhW79cGVwcAucDcl+fuuxfUrJyeE7IQmnSIRhtuFG+upeiHh/VSms2ryyWBSytgWnl+dTQiVoqQf03/vOUFer4QFrcaswBBxwqxAD0L9T9Cq3wKmAyIIgEFFwigbMEWNNj/cSxPWIjxttPQ60DtJ8fktNjF3gxMsaXgbqDpJAWYqYc5LLIgaZSek40vgWodtJcYvE1mrS+H+fG0H6eS+7O/4ggNCtk/YRb5wg3mZb7hMFHkKpxsDlX9f+rqdMdrjXWOQN6p5QyFS2Oi+YsXz4FOA49uxJiaoYzoRwG/sAqwv128qoDMEubBzoxAB0Bpayc39l2FbINhPpcXbSTip3FQ4he8NngJwvJRc/+GJSfBd9VRmARk6TJMkuxTPsZfiR4lNnMp2p0bj95oFZ8Kjr+/WDjFnidZ8mOp3CRjqDJUyLyYuNk4ndKUJyorAtZdgeiSwEXc5bdFHU1H2Z8Slt+8Thams+isGW9vDw29JzBEav7xQUVcDaq9yYWosuPFfcwJhDkcl+Q0I59fWtWjCNO+sYN5zeQdQB9V/ak/z45gffjFT1ALfpPK6UYBrM3MOPY20JdvXvwfzmenFnTY4pohJ8FKvXaE3/owyB2depArFOWeq31YNe3gT4iO+i5nTV75yrrkH/SGrbDWcE029wDJVBDmtjUCyyuYRhbt8ElYqULNrkgdHShKAuHPRnKnRrLVpatlg0VbTLJwuJfEwipeltC/42G4iU7W3YeZhVH8R6UTl0ehoA6z7+rOljtak8UBmYfI7sRopQwiAcKQcUCBqFhRu6re+VSDp0PieqOls8jsUOV/FzTGR0n6ljLfXhNnTsdZZd9z1eons2PCiA93NUJGpohMwIlpw1Tb1CvCvF90zGgd9on1Zt/r3Ho7OATUmeHKJL+dGvnyAazLp4YC6oXgTZnPf6BrDTdTW5WbyVSZF8wl5SUWaxt1F7j2lIXe5LqyuDtF+DUHV0QDBrBD54Z5LD1gsOiM0z8iZvTfYY6D99IKTDCOyjG+Wp3Uzzx0COkOAMZKzka2UjkxUzj3uOsvqRO5fazGNawrXAdfPjybRNpouS7vo8o1et9yFTsaX0ofbfZekBcYPqY5z2QeLj1PZFu46nUvbNL5iJdIM1j6DTcLGp4FFEMaZEU/iWF9OQJZazuXd5DZmujXyDtHnDYGbpaXCOigpXYFYgh+M2UZauKBH2Ek2ReuaUVt5dZIiYsHNtUHrkOzUZjKWDMPbYmUgZoPmzv66/pfx+zBoj6HZOD5KBZ+Ld5FUobHVj8DLINmjxWKOtuEafIG96BXtnq71/GB1ntxR9BOQJF+0BgZzDW2cZAwZzJtuNIn9BV5ZMFY4oaHwE0/k9jemZMXCEdXgnK7fsm4cqe/R3Z9Q== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac2b6407-69a8-4cb4-fd89-08dbdbbc9121 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 15:58:34.0245 (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: E4533Jci6DehLP8hL5jQefwOyePBVlm7M9r1cImwIcDpMX2+K7JldLGnIuO+5yT6JfA5LQha2mOw28uZjKIre6vNlcJ3z41kzNxY7zZTA1c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9005 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Claudia Draghicescu When registering both sink and source endpoints, the register endpoint method call results in 2 remote endpoints for each scanned broadcast source --- src/shared/bap.c | 73 ++++++++++++++++++++++++------------------------ src/shared/bap.h | 3 ++ 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/shared/bap.c b/src/shared/bap.c index 13bbcf793..d8a3adde6 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -629,7 +629,7 @@ static struct bt_bap_endpoint *bap_endpoint_new_broadcast(struct bt_bap_db *bdb, if (type == BT_BAP_BCAST_SINK) ep->dir = BT_BAP_BCAST_SOURCE; else - ep->dir = BT_BAP_BCAST_SINK; + ep->dir = 0; return ep; } @@ -1485,12 +1485,12 @@ static void ep_config_cb(struct bt_bap_stream *stream, int err) return; if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BCAST) { - if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK) + if (!bt_bap_stream_io_dir(stream)) stream_set_state_broadcast(stream, - BT_BAP_STREAM_STATE_QOS); + BT_BAP_STREAM_STATE_QOS); else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE) stream_set_state_broadcast(stream, - BT_BAP_STREAM_STATE_CONFIG); + BT_BAP_STREAM_STATE_CONFIG); return; } @@ -2622,7 +2622,7 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, struct iovec *metadata) { struct bt_bap_db *bdb; - struct bt_bap_pac *pac, *pac_broadcast_sink; + struct bt_bap_pac *pac; struct bt_bap_codec codec; if (!db) @@ -2650,15 +2650,6 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, break; case BT_BAP_BCAST_SOURCE: bap_add_broadcast_source(pac); - if (queue_isempty(bdb->broadcast_sinks)) { - /* When adding a local broadcast source, add also a - * local broadcast sink - */ - pac_broadcast_sink = bap_pac_new(bdb, name, - BT_BAP_BCAST_SINK, &codec, qos, - data, metadata); - bap_add_broadcast_sink(pac_broadcast_sink); - } break; case BT_BAP_BCAST_SINK: bap_add_broadcast_sink(pac); @@ -4416,21 +4407,12 @@ void bt_bap_foreach_pac(struct bt_bap *bap, uint8_t type, func, user_data); case BT_BAP_SOURCE: return bap_foreach_pac(bap->ldb->sinks, bap->rdb->sources, - func, user_data); + func, user_data); case BT_BAP_BCAST_SOURCE: - if (queue_isempty(bap->rdb->broadcast_sources) - && queue_isempty(bap->rdb->broadcast_sinks)) - return bap_foreach_pac(bap->ldb->broadcast_sources, - bap->ldb->broadcast_sinks, - func, user_data); - - return bap_foreach_pac(bap->ldb->broadcast_sinks, - bap->rdb->broadcast_sources, - func, user_data); case BT_BAP_BCAST_SINK: return bap_foreach_pac(bap->ldb->broadcast_sinks, - bap->rdb->broadcast_sources, - func, user_data); + bap->rdb->broadcast_sources, + func, user_data); } } @@ -4475,6 +4457,20 @@ void *bt_bap_pac_get_user_data(struct bt_bap_pac *pac) return pac->user_data; } +bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac) +{ + if (!bap->ldb) + return false; + + if (queue_find(bap->ldb->broadcast_sinks, NULL, pac)) + return true; + + if (queue_find(bap->ldb->broadcast_sources, NULL, pac)) + return true; + + return false; +} + static bool find_ep_unused(const void *data, const void *user_data) { const struct bt_bap_endpoint *ep = data; @@ -4483,7 +4479,10 @@ static bool find_ep_unused(const void *data, const void *user_data) if (ep->stream) return false; - return ep->dir == match->rpac->type; + if (match->rpac) + return ep->dir == match->rpac->type; + else + return true; } static bool find_ep_pacs(const void *data, const void *user_data) @@ -4642,7 +4641,11 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap, struct bt_bap_endpoint *ep; struct match_pac match; - if (!bap || !bap->rdb || queue_isempty(bap->remote_eps)) + if (!bap) + return NULL; + + if (!rpac && (lpac->type != BT_BAP_BCAST_SOURCE) + && queue_isempty(bap->remote_eps)) return NULL; if (lpac && rpac) { @@ -4679,7 +4682,9 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap, return NULL; bt_bap_foreach_pac(bap, type, match_pac, &match); - if (!match.lpac || !match.rpac) + if (!match.lpac) + return NULL; + if (!match.rpac && (lpac->type != BT_BAP_BCAST_SOURCE)) return NULL; lpac = match.lpac; @@ -4861,12 +4866,12 @@ unsigned int bt_bap_stream_enable(struct bt_bap_stream *stream, queue_foreach(stream->links, bap_stream_enable_link, metadata); break; case BT_BAP_STREAM_TYPE_BCAST: - if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK) + if (!bt_bap_stream_io_dir(stream)) stream_set_state_broadcast(stream, - BT_BAP_STREAM_STATE_CONFIG); + BT_BAP_STREAM_STATE_CONFIG); else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE) stream_set_state_broadcast(stream, - BT_BAP_STREAM_STATE_STREAMING); + BT_BAP_STREAM_STATE_STREAMING); return 1; } @@ -5399,10 +5404,6 @@ bool bt_bap_new_bcast_source(struct bt_bap *bap, const char *name) struct bt_bap_endpoint *ep; struct bt_bap_pac *pac_broadcast_source; - /* Add the remote source only if a local sink endpoint was registered */ - if (queue_isempty(bap->ldb->broadcast_sinks)) - return false; - /* Add the remote source only if a local sink endpoint was registered */ if (queue_isempty(bap->ldb->broadcast_sinks)) return false; diff --git a/src/shared/bap.h b/src/shared/bap.h index 23edbf4c6..2c8f9208e 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -317,3 +317,6 @@ void bt_bap_update_bcast_source(struct bt_bap_pac *pac, struct bt_bap_codec *codec, struct iovec *data, struct iovec *metadata); + +bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac); + From patchwork Thu Nov 2 15:58:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 740803 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 78906C4167B for ; Thu, 2 Nov 2023 15:58:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376943AbjKBP6q (ORCPT ); Thu, 2 Nov 2023 11:58:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377029AbjKBP6p (ORCPT ); Thu, 2 Nov 2023 11:58:45 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2058.outbound.protection.outlook.com [40.107.22.58]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DB7112D for ; Thu, 2 Nov 2023 08:58:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DbZIx/d0LNDjGjq1p7RhFML8AqWNMhZbuAuqytU/lyZSXsQM1GPaZzmCUiJ1ro+yWlOasrqfkIPJqhA0mVio8ifnesi5YKoOUMfrQF/DLWXzB22GUcUgw/2wmBtfRdCzCmxB5gq1eXNYLE5oH5AqLQ8S9wGFDPpK+wWwAcylybYiu+VVypGePpfs/xynfLPk+/7n4ka6DVrvT+UIyWzmAG/+AY96/sPOEFW/xvbg/xbB/QRRHvtcI8OUkn5mhni9tFdt7/DgBH+4/1AX4xEfTS9oUbxXY0QBzordXkPpDL5AQfVw5bk5fFFdL6uxCgQhk35gCRSj+qUZgV/lDlqgSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vi/ZSLXSrUXlK01jYrePfFEPvoRv24/Uft1lOdUvYOE=; b=PAIrKiFG+9k/WKfx5s+AtdZPPRb9qJ/I4u6W3ieVPOJHuC6oB4G+HvByBqe1Z5j3yOZUiQbyrMxV2kFTNDT6JU39VzII4eGpniKw7lkiWXdhM+QpL53JIQ8HS4HpOlSRFHje8Tb2GjJlnsTx0V1tG6/NfF0Yav8xsDQMyKJXaGcgtFl1vaLsK8t/PWmj0wO24uCsPj/zhJPWBHdhRWtay9Ozb1JFMx/MOiRqU7p8aK/smLS2OusvdaQJ1K8ML8xPXlKkZeXlMWh2RobvzKmVfK+PKBoUEIpqXG3H3M4toz3Ymj8hlCayn3ZJGif4QEZSVB1GrCwJvpi2dqN3937mWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vi/ZSLXSrUXlK01jYrePfFEPvoRv24/Uft1lOdUvYOE=; b=dGaj2/QseDkanMHNmROj9HfCA9oSB7TTuHrRJyU5rJOcJgsrKYijUmXH93EkuYmt9Z+PiiUO9QB4ABRFki89rihoo3oBK91RbuYBW6UPJkeJoP3ZuUXl9hgqbV4IpspukZDMVg1+I4UIvaryeKu+aFKYvuLumd8xlkURiO2lr1Q= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) by PAXPR04MB9005.eurprd04.prod.outlook.com (2603:10a6:102:210::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.18; Thu, 2 Nov 2023 15:58:36 +0000 Received: from DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a]) by DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a%7]) with mapi id 15.20.6954.019; Thu, 2 Nov 2023 15:58:36 +0000 From: Silviu Florian Barbulescu 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, luiz.dentz@gmail.com, iulia.tanasescu@nxp.com Subject: [PATCH v3 2/5] bap: Fix source+sink endpoint registration Date: Thu, 2 Nov 2023 17:58:24 +0200 Message-Id: <20231102155827.4219-3-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231102155827.4219-1-silviu.barbulescu@nxp.com> References: <20231102155827.4219-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: VE1PR08CA0035.eurprd08.prod.outlook.com (2603:10a6:803:104::48) To DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6331:EE_|PAXPR04MB9005:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b81032e-6785-4c76-112b-08dbdbbc92db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: na3CSHfyVSSUjkIKZVH6JNDZJ7PJEx0WzXOxIAUZcMadSErM2YMIUgTSgJKTnUEq7ssAXZDmxIOd6nuHHTXpKXdsGPKLKp2HCF1H+dJExBVZRvlj+EsvP4c6BMkcziodC1h8IkzjeqQdRdB67XE6+2yNZp3xJQH93I4Q3gj7Mkqqx9NOxc6IiSfZlL5ptQvchRxvOJN2/YJNxxkdGEnSQkZ4HyXd5rG6W7Z2B1aOaaBVeODKEb5ItU2u+jC/vLr/6OK5K833rb5Ilh+hZw9/tdtK5caokcJXFHMtyzyQbniQlPVTGkTU3nU5ghWwDXoYI6/FYpvadx6hqYiXvN2FLhoEwUv3on0+qfHztmBLkW43tQwbzDeRtS06Res8OeOStZY/9EuC6fOgadhPaQMaOak9EYBBLD31uLGBqCP1KCuD+Ay9S9zNxgb7f8Lm3KO3yTzPBdZcRfWSy/8fv/+1iLrc8AzV420lQ4p3YjTvmQ2Y0SH4j1DCxv1DyYQFY+W/NcqPLIPJTUw8h88nkRlwBMWN3L0D7g9pXhT193FOFlJ0PkqRlvVHZwRDj3RIV7vC X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6331.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(346002)(366004)(376002)(136003)(396003)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(6512007)(1076003)(478600001)(6506007)(83380400001)(6666004)(8936002)(8676002)(66946007)(41300700001)(5660300002)(66556008)(6486002)(2616005)(66476007)(6916009)(316002)(4326008)(38100700002)(86362001)(36756003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wwoRcsEC4UKXX4DdkUULeR2aejzfWCguU1k4NAfmUKdkKoG/EZDiYz+LtBnr3asqi1CwDvqjbKkZ9VjNiZN7eK8ar/3CxJ02ZUcl9QmwzXWeotle8t4wixNx2gUsX/aAkete223Nb3/p/ZUnK06arhoD4h4p3EPz7VsXScsJ+O/f82ocO4oQs9AcAuxPrY4qrlpynin6pMSISiFOXJ7WrYg/qWsWP39Edxs8eqUV0L37XphHoHQ09hsODQsUl7Vs1FYHtZlMqMAzx5kOKkeBlspWuU6KRBuSj7yHOrN4Afq6SsfUficGgQojPk5+rsjj5bPS0VkxYXh593/6HEUH/I0uwqTdMnYZtBu/I/d3xSCNeNsf3ss89LO0/plUzAGN/n9mL4FPaLAFtQs7HB+2xQlM41vHbDVLraHBadgjzNMSHU9rdSnTRCXBA/yUKMqQB5M5IjLIlTrmU2OV/ylH83BPcDaFwqAJTMi9oILoCTrjGDn2Fq7oslsZVWTFiA2EW7yuwYvRhzmpphQP+Eci2FNFMQUYT0vv6JUCC4fNAta+PxSrfCcqDxKOhpQ1q4Ez+r8gk/RrRZQyarCPc/F391398d3zN9T7N/47BRScv+bdhiD5ZPLsknpjtHlS4c2UlTgxJQlsdvrpi6eDi4yzdHCvto2hQRFZPIcjc4nNUyDKgqFWHuUB5O268FpGtinuKF9MMf6dZTQITh9e3WHaL0Qd2yciTS44bTIMYoghSkCd+7VV/r7jRAh9+Hr53Lq84+Kdw6fhWiVn17LoFO/HLmHtovKHS/33NnVCtGO7orL6GPvh9VKxJeYep6c6z1QInLaHWs7nvv2w4H19JjVnyzVftNNP2LVQQ3GpsEVCKSBXFzjuuQOTXh4PsrnYCNAB/ga6JxUnG+Qwtvw7gqgb/2I7vh+b5ctK3axJGkNIGM8fNDfC6svcSgNaduc/YlJRuaTxcXr4xHf/NebId5sa3cfGr22aQDgcqepK0Vfq8HDI5Pdphfs3yhw0EsCa2ltZZPLjQyL+XSxxykuLS+H9JOMUdQ9Qs2lq8nGLyol0R05e6QbJ/XK8c8adHY6gr4xjBmErHwAxUDqIvfWHH4GaqvGg3xg2cJyxck+RMUOZMUNj1Yg4XRy47qwfhQjEcjVVu9JswYMDVLfJZaTo3vhKYKMuasdK6bZL4AJ9irMuYAXg0Wy0wp1OISJP49Vh1BGt0aboq1jcOlDxtzvHh2vFE3AwqtRgnXWlmIwNYjntHqPki14VqtOv/cA2WcV/yj/ajj+H+8ik/YHga37U60Vnfugjb5yyU12u8+JA9MMGglz5N0PbN16Q38Jk3XsBw6SQTGyP1B8iAgYMQAg5oDYkv0A3MsFgmzAUpRkRJpK88dUZhCZEa9GsLFtYqh+00b9dsYGtxaYls7EJ/tvU+qKNaoanpymnlSFLE9nZfGCCIsM+okiZ5almKax9dREekv7Wndppf1hcYdhQTwikYkQ7MHv7ahfEeGWxfb58sZ829nGL55aI9tyb36D+HlsoLnjLLvL2kncRhFM4qP30/2r4ZF/W9tay5Pxf6NQrDPmqPg18MiJ1mnPNHGMkaCg+HZUDouznHvVWw3JucOpWdpJE4A== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b81032e-6785-4c76-112b-08dbdbbc92db X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 15:58:36.8221 (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: ON8ZhLh05vSmlw80UOw5WAbB59Na407pQWEWY7INa/99xzyaxxraYycr2XSsaW2UlgQFmt/FKyAvzZM+L1KdiNxnmRiQdtzPhJ3ysHZs9MU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9005 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Claudia Draghicescu When registering both sink and source endpoints, the register endpoint method call results in 2 remote endpoints for each scanned broadcast source --- profiles/audio/bap.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index b74498c4c..a84181e1a 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -1050,7 +1050,7 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data, const char *suffix; struct match_ep match = { lpac, rpac }; - switch (bt_bap_pac_get_type(rpac)) { + switch (bt_bap_pac_get_type(lpac)) { case BT_BAP_BCAST_SOURCE: case BT_BAP_BCAST_SINK: queue = data->bcast; @@ -1073,13 +1073,13 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data, if (device) ep->data->device = device; - switch (bt_bap_pac_get_type(rpac)) { - case BT_BAP_BCAST_SINK: + switch (bt_bap_pac_get_type(lpac)) { + case BT_BAP_BCAST_SOURCE: err = asprintf(&ep->path, "%s/pac_%s%d", adapter_get_path(adapter), suffix, i); ep->base = new0(struct iovec, 1); break; - case BT_BAP_BCAST_SOURCE: + case BT_BAP_BCAST_SINK: err = asprintf(&ep->path, "%s/pac_%s%d", device_get_path(device), suffix, i); ep->base = new0(struct iovec, 1); @@ -1101,7 +1101,10 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data, ep_free(ep); return NULL; } - bt_bap_pac_set_user_data(rpac, ep->path); + if (rpac) + bt_bap_pac_set_user_data(rpac, ep->path); + else + bt_bap_pac_set_user_data(lpac, ep->path); DBG("ep %p lpac %p rpac %p path %s", ep, ep->lpac, ep->rpac, ep->path); @@ -1792,7 +1795,7 @@ static void bap_listen_io_broadcast(struct bap_data *data, struct bap_ep *ep, error("%s", err->message); g_error_free(err); } - + ep->io = io; ep->data->listen_io = io; } @@ -1958,12 +1961,12 @@ static void pac_added_broadcast(struct bt_bap_pac *pac, void *user_data) { struct bap_data *data = user_data; - if (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SOURCE) - bt_bap_foreach_pac(data->bap, BT_BAP_BCAST_SOURCE, - pac_found_bcast, data); - else if (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SINK) - bt_bap_foreach_pac(data->bap, BT_BAP_BCAST_SINK, - pac_found_bcast, data); + if (bt_bap_pac_bcast_is_local(data->bap, pac) && + (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SOURCE)) + pac_found_bcast(pac, NULL, user_data); + else + bt_bap_foreach_pac(data->bap, bt_bap_pac_get_type(pac), + pac_found_bcast, data); } static bool ep_match_pac(const void *data, const void *match_data) From patchwork Thu Nov 2 15:58:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 740802 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 50D22C4167D for ; Thu, 2 Nov 2023 15:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347661AbjKBP67 (ORCPT ); Thu, 2 Nov 2023 11:58:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377055AbjKBP6w (ORCPT ); Thu, 2 Nov 2023 11:58:52 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2058.outbound.protection.outlook.com [40.107.22.58]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 607D5194 for ; Thu, 2 Nov 2023 08:58:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b7yV8NhqBtCa/tcqdw3CvINO2apfChMrYNYiHPfIrjR9CmrB0OOjJ3gKM8ajV1rdIxcUiVvpmcUifU+WyUThlaUiv1jHA5iDuiILwoJZDxtXVtoMAbW40ZRU9pJg98zc6gxDBid5AN4iub4TKZO0skKzISevMet+t5uKHubKnKFKOUOH6ih3Xbjq3j6CLh78S3AOzShvxqP1NYMJG8bKhMIEknhIXXt+FdHvEHLHIq5ealIRhwwCTflEL3VH8E3MLaJH8Ga4t3N2Gc9BoedggGzAAeIUtZMEOHj52d/acTsWKztJC454W0iSHutUPVOKZmNr7TldSlKK+zHaYJDWXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZnZxmAeS4RTDrsgKe6tnrqNOso53wFTFGxyhd2zqjLA=; b=fgWKXQkVUZkQ3iXeYAn3eyy4Uw579k0/m4XiXCVyvbPnABP0ogoYCPKmJJsiEmermrYKH+Vg2ELudYGTJH1u3pyIJJtZdKtdvq6QZE1psRjaxWLc2Z5jshOFzu8BtQQcsfqpkia3CYUf/RlCnMI5wev8CR4lWqgUjx09313xn23OlfrEJlsawrPuXxG7fbESGG2tfeRfw2zmHOcFTGqmPi2V2qoLBM7zrpU5uZMX3y8f16vzO5Usi1mROCeMuVNolT4fW9yqrtWTYDaZQuwYERx0bd8goqEpiRQffesulgIKKXlXOafsF6GgHtoNJNMI++yyAoRE2D6oaw+189lO2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZnZxmAeS4RTDrsgKe6tnrqNOso53wFTFGxyhd2zqjLA=; b=kTUATC5van6Vt+yLB9IzkJzvRKuJunfgA3XfDC3naK4bv//5VIBrdhe1AwLPcUesaPM7fmERDokfS6WQBKLTxK7xjxz5vTghPXPu2h+EldJ3OK3JtTrG+m00YzFmTP9itS2zInA1n5JBOsYo6zsuwGDl454vYMx2bNY3cW7ivnQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) by PAXPR04MB9005.eurprd04.prod.outlook.com (2603:10a6:102:210::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.18; Thu, 2 Nov 2023 15:58:39 +0000 Received: from DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a]) by DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a%7]) with mapi id 15.20.6954.019; Thu, 2 Nov 2023 15:58:39 +0000 From: Silviu Florian Barbulescu 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, luiz.dentz@gmail.com, iulia.tanasescu@nxp.com Subject: [PATCH v3 3/5] Add support for bcast multiple BISes Date: Thu, 2 Nov 2023 17:58:25 +0200 Message-Id: <20231102155827.4219-4-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231102155827.4219-1-silviu.barbulescu@nxp.com> References: <20231102155827.4219-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: VI1PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:803:8c::35) To DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6331:EE_|PAXPR04MB9005:EE_ X-MS-Office365-Filtering-Correlation-Id: 2f652074-44bc-4620-88b0-08dbdbbc9477 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aJuK0mV+fza6yCFkSmdFtXAqj5q5l56yUezhIDgriJckrEfq7LYqThmxUjxf+NHyYillr4moPXn6hG+MHlEG9pFND5U8KFS3dC50u+NI1rFpf4RcijKeDI/1qBXRcfDkrPFz8hS9SkP0RUcO8C5lSPyTQD2crguY/Xodr56qgTmQbWVxlMTuNB6Whvhw/nW4NS5lqH0Hec2xfImguVeOjJ7QJYAx/nPwXgtvLb2kXPWNio20rzNfdhCq+Z/DHS+OSeig5LMFH6WnIKgDuaz5PBz3eYR5i+QbUAuGWz0MeS1jxOn14XJ4R3X5LzdXPd+TYjCocgrRwM/VhUaZujFuPKVDOuGLfkg9YOkbzLAVviJAYAE+ScPPqNWN+grWBandltmjrW3pHWmQyrEbPWzZLK94sSsQZU2IA0wCryuKYqEOS2dK3EeHJ6Ct7aBNaaCrp1W1rStXZaaz8pE17Yqd+Tsv3Quf8cjAotP0XhLn86jYv2pLtg0iEEE/UvW0kOQ1mMnggHG2gMxBc7PSvEMdg627U7MAGKVRwyQtWf0v5Hs6Z3kP19WLPpyvAlOUfAHh X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6331.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(346002)(366004)(376002)(136003)(396003)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(6512007)(1076003)(478600001)(6506007)(83380400001)(6666004)(8936002)(30864003)(8676002)(66946007)(41300700001)(5660300002)(66556008)(6486002)(2616005)(66476007)(6916009)(316002)(4326008)(38100700002)(86362001)(36756003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F1IFJ5siVHCxsVcDKUTLxlZ9I5VBMGY2OeVD1Ka8T3Xub9F1DnE+W12tdpu/AO/hTjBYhFC+C9/tT+lN6PU3mA/sL+Uxui8+Zvz57sQEXthY1448cNBSc95ZIVOJIQWyqTcJchS+eIr9tPxdTsAwCdKmLqYLQPhDp+OmQ99BF8oZQQT3qiLt2VB/S93BggT7vrQLgvY2TGEZX7/nrYNqHfAo8b6Cj4vUH720vUJQzDHpm4tyGz74E8dSoYsMpNINEd3HuHMaSG2JZDCqG7yogtYArimn5zXi8RegyPGvQTZizxyF+JqC1VS14FLeIWniDaT27kJ1nRKZ6VfZ/RNkt8vnWThXCSIlN+1t4Cj0Iu7oWie1ESMKCIe0any6Q7Pj55MrU9E2qWZfDqvSus2Kt283hX+Lre1auAKjKbF4G4IjJZcps3FLnV5vaE/NvfcMjwV2qy2LoXmMhLs3Ccht0j3je9D+/0Pmw0MKRt7A23/zUm7QKhucL44HZfl9NV90cUD33FOWU/IxDYBKR+0O58udXhkmc5hLa45Ton2Kfwi/7y8XM1z8GZMk72uFnDRTng4QnL5NMPw4TmogiXy1qFWpkCK3scapQYSq9r8HAEFBP00ELvTEKu0wY6eCnq4pRoxvjw0rWwDcl2u2Mk9zsOidNgOv6bpEOSmXWUVNuwmPJbjgRY6zxn/cBPS5rH3bHQeXNQbxkREI51tqsly/uDArKsCLaI5rFrk9mBPXvvDsqx+WohTJCfKn8z/+U5jeTPkUOnGqnPT0EKsFHQ42dTYz5Eok7chyhWzL14u2rIhqsSRiIs/aNNywJLA9wkCl+iHuiCpgM/add1gjWtRWqZpo0vJrGS5AssXUJcGpNIClA9PcFySqfc70nMcb1b90C90OkXMxGA7emPhgVQAOl7VSBCtIh6LI1ZRMLgnS8gbXE6fg5X5ubVPQ1xmcjptnB0Y/jJbjPg0UjGCtJtf/0WX/i+xOcbFFXJXV6g7MfLwBaJy2lySrqkEZN4Xp3kLGA/dSr7GU8+crpxSlIyE9H0LZJp68sTMRGQNAypw4cmNl3yPaa5CSmDcam/XTQuQ9T67IxJ/XFIU3EROJqpLGeZuw8j21JqZ24NN78q0YrgTjrDg/OLLGP8r7mXLvDTCOeyHVaf6BgP5Cv1UF3i1o9TJDzu/UF0QpLZFgeWaU0uuxDyyrkLDnlUelJO8d3LLMsCgUTPf+FDkT0T+k8m5kco2d/t3oS/Gxh2kZIbI9zm+nsQsVmI2xJ+AKPj/4+qpHxsO4+UtAH44SvDri9MiZjg3MYwEtsA8cRlj/Ef8ATSm3FJfiC2fWgZIEdeWlo1suQFrBvShqaZUxbzWY9VOKVZnKYmNhYJXZAsxdmOnkjt3X0fTQCbd9hErc1Xva7JFPFcbPtL4az1UaCMudIDetSamzzx2iri3QGnDTB+R7VG7aZrwEQvYgDFa4Xx4of1pIvGBiU3W0fQLpjQXTYkfneY9bcOJ4Oxku+zC9r9L5die+wS9RjvgEgeYBgcYgjVWCkcklpf52Tk3Tyhqcm7T/StUjivIDSqRnydDfYHeql4TSt3+Zyo6rLdA6Ipinmx5y52zkdLwG0QhzZtd8NDcK+g== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f652074-44bc-4620-88b0-08dbdbbc9477 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 15:58:39.7025 (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: tUPmx3mlbzPudNqk60NP6dqtfKsuaBOmXuwSZq+nbGzQ8xH6Xoxo2CCHpSLh52vSmm0Tzsl4N6aHbZ7nkOFPo9FT8NaC27PIdy+FSbMOS+c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9005 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Add support for bcast multiple BISes --- profiles/audio/bap.c | 557 ++++++++++++++++++++++++++++++------------- src/shared/bap.c | 226 ++++++++++++++---- src/shared/bap.h | 32 ++- unit/test-bap.c | 12 +- 4 files changed, 617 insertions(+), 210 deletions(-) diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c index a84181e1a..a7a362bc6 100644 --- a/profiles/audio/bap.c +++ b/profiles/audio/bap.c @@ -97,6 +97,35 @@ struct bap_data { void *user_data; }; +#define DEFAULT_IO_QOS \ +{ \ + .interval = 10000, \ + .latency = 10, \ + .sdu = 40, \ + .phy = 0x02, \ + .rtn = 2, \ +} + +static struct bt_iso_qos default_qos = { + .bcast = { + .big = BT_ISO_QOS_BIG_UNSET, + .bis = BT_ISO_QOS_BIS_UNSET, + .sync_factor = 0x07, + .packing = 0x00, + .framing = 0x00, + .in = DEFAULT_IO_QOS, + .out = DEFAULT_IO_QOS, + .encryption = 0x00, + .bcode = {0x00}, + .options = 0x00, + .skip = 0x0000, + .sync_timeout = 0x4000, + .sync_cte_type = 0x00, + .mse = 0x00, + .timeout = 0x4000, + } +}; + static struct queue *sessions; static bool bap_data_set_user_data(struct bap_data *data, void *user_data) @@ -254,7 +283,11 @@ static gboolean get_device(const GDBusPropertyTable *property, const char *path; if (bt_bap_pac_get_type(ep->lpac) == BT_BAP_BCAST_SOURCE) - path = adapter_get_path(ep->data->adapter); + /* + *Use remote endpoint path as fake device path + *for the remote broadcast source endpoint + */ + path = ep->path; else path = device_get_path(ep->data->device); @@ -379,101 +412,203 @@ static int parse_array(DBusMessageIter *iter, struct iovec *iov) return 0; } -static bool parse_base(void *data, size_t len, util_debug_func_t func, - uint32_t *presDelay, uint8_t *numSubgroups, uint8_t *numBis, - struct bt_bap_codec *codec, struct iovec **caps, - struct iovec **meta) +static void cleanup_subgroup(struct bt_bap_base_subgroup *subGroup) +{ + if (!subGroup) + return; + + if (subGroup->meta) + util_iov_free(subGroup->meta, 1); + + if (subGroup->caps) + util_iov_free(subGroup->caps, 1); + + while (!queue_isempty(subGroup->bises)) { + struct bt_bap_bis *bis = queue_peek_head(subGroup->bises); + + if (bis->caps) + util_iov_free(bis->caps, 1); + queue_remove(subGroup->bises, bis); + subGroup->numBises--; + } + queue_destroy(subGroup->bises, NULL); + + if (subGroup) + free(subGroup); +} + +static bool parse_base(struct bt_bap *bap, void *data, size_t len, + util_debug_func_t func, struct bt_bap_base *base) { + uint8_t numSubgroups; + uint8_t numBis; + struct iovec iov = { .iov_base = data, .iov_len = len, }; + util_debug(func, NULL, "BASE len %ld", len); + if (!base) + return false; - uint8_t capsLen, metaLen; - uint8_t *hexstream; + if (!util_iov_pull_le24(&iov, &base->presDelay)) + return false; + util_debug(func, NULL, "PresentationDelay %d", base->presDelay); - if (presDelay) { - if (!util_iov_pull_le24(&iov, presDelay)) - return false; - util_debug(func, NULL, "PresentationDelay %d", *presDelay); - } + if (!util_iov_pull_u8(&iov, &base->numSubgroups)) + return false; + util_debug(func, NULL, "NumSubgroups %d", base->numSubgroups); + numSubgroups = base->numSubgroups; - if (numSubgroups) { - if (!util_iov_pull_u8(&iov, numSubgroups)) - return false; - util_debug(func, NULL, "NumSubgroups %d", *numSubgroups); - } + for (int sg = 0; sg < numSubgroups; sg++) { + struct bt_bap_base_subgroup *subGroup = new0( + struct bt_bap_base_subgroup, 1); + uint8_t capsLen, metaLen; + uint8_t *hexstream; - if (numBis) { - if (!util_iov_pull_u8(&iov, numBis)) - return false; - util_debug(func, NULL, "NumBis %d", *numBis); - } + subGroup->subGroupIndex = sg; - if (codec) { - codec = util_iov_pull_mem(&iov, sizeof(*codec)); - if (!codec) - return false; + util_debug(func, NULL, "Subgroup #%d", sg); + subGroup->bap = bap; + subGroup->bises = queue_new(); + + if (!util_iov_pull_u8(&iov, &numBis)) { + cleanup_subgroup(subGroup); + goto fail; + } + util_debug(func, NULL, "NumBis %d", numBis); + subGroup->numBises = numBis; + + memcpy(&subGroup->codec, util_iov_pull_mem(&iov, + sizeof(struct bt_bap_codec)), sizeof(struct bt_bap_codec)); util_debug(func, NULL, "%s: ID %d CID 0x%2.2x VID 0x%2.2x", - "Codec", codec->id, codec->cid, codec->vid); - } + "Codec", subGroup->codec.id, subGroup->codec.cid, + subGroup->codec.vid); + if (!util_iov_pull_u8(&iov, &capsLen)) { + cleanup_subgroup(subGroup); + goto fail; + } - if (!util_iov_pull_u8(&iov, &capsLen)) - return false; - util_debug(func, NULL, "CC Len %d", capsLen); + util_debug(func, NULL, "CC Len %d", capsLen); - if (!capsLen) - return false; - if (caps) { - if (!(*caps)) - *caps = new0(struct iovec, 1); - (*caps)->iov_len = capsLen; - (*caps)->iov_base = iov.iov_base; - } + subGroup->caps = new0(struct iovec, 1); + util_iov_memcpy(subGroup->caps, iov.iov_base, capsLen); + DBG("subgroup caps len %ld", subGroup->caps->iov_len); - for (int i = 0; capsLen > 1; i++) { - struct bt_ltv *ltv = util_iov_pull_mem(&iov, sizeof(*ltv)); - uint8_t *caps; + for (int i = 0; capsLen > 1; i++) { + struct bt_ltv *ltv = util_iov_pull_mem(&iov, + sizeof(*ltv)); + uint8_t *caps; - if (!ltv) { - util_debug(func, NULL, "Unable to parse %s", - "Capabilities"); - return false; + if (!ltv) { + util_debug(func, NULL, "Unable to parse %s", + "Capabilities"); + cleanup_subgroup(subGroup); + goto fail; + } + + util_debug(func, NULL, "%s #%u: len %u type %u", + "CC", i, ltv->len, ltv->type); + + caps = util_iov_pull_mem(&iov, ltv->len - 1); + if (!caps) { + util_debug(func, NULL, "Unable to parse %s", + "CC"); + cleanup_subgroup(subGroup); + goto fail; + } + util_hexdump(' ', caps, ltv->len - 1, func, NULL); + + capsLen -= (ltv->len + 1); } - util_debug(func, NULL, "%s #%u: len %u type %u", - "CC", i, ltv->len, ltv->type); + if (!util_iov_pull_u8(&iov, &metaLen)) { + cleanup_subgroup(subGroup); + goto fail; + } + util_debug(func, NULL, "Metadata Len %d", metaLen); - caps = util_iov_pull_mem(&iov, ltv->len - 1); - if (!caps) { - util_debug(func, NULL, "Unable to parse %s", - "CC"); - return false; + subGroup->meta = new0(struct iovec, 1); + subGroup->meta->iov_len = metaLen; + subGroup->meta->iov_base = iov.iov_base; + + hexstream = util_iov_pull_mem(&iov, metaLen); + if (!hexstream) { + cleanup_subgroup(subGroup); + goto fail; } - util_hexdump(' ', caps, ltv->len - 1, func, NULL); + util_hexdump(' ', hexstream, metaLen, func, NULL); - capsLen -= (ltv->len + 1); - } + for (int bis_sg = 0; bis_sg < subGroup->numBises; bis_sg++) { + struct bt_bap_bis *bis; + uint8_t capsLen; + uint8_t crtBis; - if (!util_iov_pull_u8(&iov, &metaLen)) - return false; - util_debug(func, NULL, "Metadata Len %d", metaLen); + if (!util_iov_pull_u8(&iov, &crtBis)) { + cleanup_subgroup(subGroup); + goto fail; + } + util_debug(func, NULL, "BIS #%d", crtBis); - if (!metaLen) - return false; - if (meta) { - if (!(*meta)) - *meta = new0(struct iovec, 1); - (*meta)->iov_len = metaLen; - (*meta)->iov_base = iov.iov_base; - } + bis = new0(struct bt_bap_bis, 1); + bis->bisIndex = crtBis; - hexstream = util_iov_pull_mem(&iov, metaLen); - if (!hexstream) - return false; - util_hexdump(' ', hexstream, metaLen, func, NULL); + if (!util_iov_pull_u8(&iov, &capsLen)) { + cleanup_subgroup(subGroup); + goto fail; + } + util_debug(func, NULL, "CC Len %d", capsLen); + + bis->caps = new0(struct iovec, 1); + bis->caps->iov_len = capsLen; + util_iov_memcpy(bis->caps, iov.iov_base, capsLen); + DBG("bis caps len %ld", bis->caps->iov_len); + + for (int i = 0; capsLen > 1; i++) { + struct bt_ltv *ltv = util_iov_pull_mem(&iov, + sizeof(*ltv)); + uint8_t *caps; + if (!ltv) { + util_debug(func, NULL, "Unable to parse %s", + "Capabilities"); + cleanup_subgroup(subGroup); + goto fail; + } + + util_debug(func, NULL, "%s #%u: len %u type %u", + "CC", i, ltv->len, ltv->type); + + caps = util_iov_pull_mem(&iov, ltv->len - 1); + if (!caps) { + util_debug(func, NULL, + "Unable to parse %s", "CC"); + cleanup_subgroup(subGroup); + goto fail; + } + util_hexdump(' ', caps, ltv->len - 1, func, + NULL); + + capsLen -= (ltv->len + 1); + } + + queue_push_tail(subGroup->bises, bis); + } + + queue_push_tail(base->subgroups, subGroup); + } return true; + +fail: + while (!queue_isempty(base->subgroups)) { + struct bt_bap_base_subgroup *subGroup = + queue_peek_head(base->subgroups); + cleanup_subgroup(subGroup); + base->numSubgroups--; + } + util_debug(func, NULL, "Unable to parse %s", "Base"); + + return false; } static int parse_io_qos(const char *key, int var, DBusMessageIter *iter, @@ -556,6 +691,16 @@ static int parse_bcast_qos(const char *key, int var, DBusMessageIter *iter, return -EINVAL; dbus_message_iter_get_basic(iter, &qos->bcast.encryption); + } else if (!strcasecmp(key, "BIG")) { + if (var != DBUS_TYPE_BYTE) + return -EINVAL; + + dbus_message_iter_get_basic(iter, &qos->bcast.big); + } else if (!strcasecmp(key, "BIS")) { + if (var != DBUS_TYPE_BYTE) + return -EINVAL; + + dbus_message_iter_get_basic(iter, &qos->bcast.bis); } else if (!strcasecmp(key, "Options")) { if (var != DBUS_TYPE_BYTE) return -EINVAL; @@ -653,10 +798,12 @@ static int parse_qos(DBusMessageIter *iter, struct bt_bap_qos *qos, static int parse_configuration(DBusMessageIter *props, struct iovec **caps, struct iovec **metadata, struct iovec **base, - struct bt_bap_qos *qos) + struct bt_bap_qos *qos, + struct bt_bap_base *base_s) { const char *key; struct iovec iov; + base_s->subgroups = NULL; memset(&iov, 0, sizeof(iov)); @@ -702,14 +849,10 @@ static int parse_configuration(DBusMessageIter *props, struct iovec **caps, } if (*base) { - uint32_t presDelay; - uint8_t numSubgroups, numBis; - struct bt_bap_codec codec; - util_iov_memcpy(*base, (*caps)->iov_base, (*caps)->iov_len); - parse_base((*caps)->iov_base, (*caps)->iov_len, bap_debug, - &presDelay, &numSubgroups, &numBis, &codec, - caps, NULL); + base_s->subgroups = queue_new(); + parse_base(NULL, (*caps)->iov_base, (*caps)->iov_len, + bap_debug, base_s); } return 0; @@ -796,12 +939,40 @@ static void bap_io_close(struct bap_ep *ep) ep->cig_active = false; } +static bool match_bis_by_id(const void *data, const void *user_data) +{ + int32_t bis_id = PTR_TO_INT(user_data); + const struct bt_bap_bis *bis = data; + + return bis->bisIndex == bis_id; +} + +static int get_number_bcast_source_ep(struct bap_ep *ep) +{ + const struct queue_entry *entry; + struct bap_ep *current_ep; + int nr_ep = 0; + + for (entry = queue_get_entries(ep->data->bcast); entry; + entry = entry->next) { + current_ep = entry->data; + if (bt_bap_pac_get_type(current_ep->lpac) == + BT_BAP_BCAST_SOURCE) + nr_ep++; + } + + return nr_ep; +} + static DBusMessage *set_configuration(DBusConnection *conn, DBusMessage *msg, void *data) { struct bap_ep *ep = data; const char *path; DBusMessageIter args, props; + struct bt_bap_base parse_bap_base; + struct bt_bap_bis *curent_bis; + struct bt_bap_base_subgroup *subgroup; if (ep->msg) return btd_error_busy(msg); @@ -832,11 +1003,46 @@ static DBusMessage *set_configuration(DBusConnection *conn, DBusMessage *msg, } if (parse_configuration(&props, &ep->caps, &ep->metadata, - &ep->base, &ep->qos) < 0) { + &ep->base, &ep->qos, &parse_bap_base) < 0) { DBG("Unable to parse configuration"); return btd_error_invalid_args(msg); } + if (bt_bap_pac_get_type(ep->lpac) == BT_BAP_BCAST_SOURCE) { + unsigned int nr_ep = 1; + + subgroup = queue_peek_head(parse_bap_base.subgroups); + curent_bis = queue_find(subgroup->bises, match_bis_by_id, + INT_TO_PTR(ep->qos.bcast.bis)); + if (curent_bis == NULL) { + DBG("Unable to find BIS"); + return btd_error_invalid_args(msg); + } + util_iov_free(ep->caps, 1); + ep->caps = new0(struct iovec, 1); + bt_bap_ltv_merge(ep->caps, subgroup->caps, false); + bt_bap_ltv_merge(ep->caps, curent_bis->caps, false); + + nr_ep = get_number_bcast_source_ep(ep); + if (nr_ep < queue_length(subgroup->bises)) { + for (uint8_t i = 0; + i < queue_length(subgroup->bises)-1; i++) + bt_bap_add_vendor_pac_from_pac(ep->lpac); + } + } else if ((bt_bap_pac_get_type(ep->rpac) == BT_BAP_BCAST_SOURCE) && + (bt_bap_pac_get_type(ep->lpac) == BT_BAP_BCAST_SINK)) { + util_iov_free(ep->caps, 1); + ep->caps = new0(struct iovec, 1); + bt_bap_ltv_merge(ep->caps, bt_bap_pac_get_data(ep->rpac), + false); + } + /* + * Kernel uses bis id as advertising handler. To open all BISes from + * a big on the same advertisng handler set the bis + * to BT_ISO_QOS_BIS_UNSET + */ + ep->qos.bcast.bis = BT_ISO_QOS_BIS_UNSET; + /* TODO: Check if stream capabilities match add support for Latency * and PHY. */ @@ -848,7 +1054,7 @@ static DBusMessage *set_configuration(DBusConnection *conn, DBusMessage *msg, config_cb, ep); if (!ep->id) { DBG("Unable to config stream"); - free(ep->caps); + util_iov_free(ep->caps, 1); ep->caps = NULL; return btd_error_invalid_args(msg); } @@ -901,31 +1107,16 @@ static void update_bcast_qos(struct bt_iso_qos *qos, sizeof(qos->bcast.bcode)); } -static bool match_ep_type(const void *data, const void *user_data) -{ - const struct bap_ep *ep = data; - - return (bt_bap_pac_get_type(ep->lpac) == PTR_TO_INT(user_data)); -} - static void iso_bcast_confirm_cb(GIOChannel *io, GError *err, void *user_data) { - struct bap_data *data = user_data; + struct bap_ep *ep = user_data; struct bt_iso_qos qos; - struct bt_iso_base base; char address[18]; - struct bap_ep *ep; int fd; - struct iovec *base_io; - uint32_t presDelay; - uint8_t numSubgroups; - uint8_t numBis; - struct bt_bap_codec codec; bt_io_get(io, &err, BT_IO_OPT_DEST, address, BT_IO_OPT_QOS, &qos, - BT_IO_OPT_BASE, &base, BT_IO_OPT_INVALID); if (err) { error("%s", err->message); @@ -934,29 +1125,15 @@ static void iso_bcast_confirm_cb(GIOChannel *io, GError *err, void *user_data) } g_io_channel_ref(io); - btd_service_connecting_complete(data->service, 0); + btd_service_connecting_complete(ep->data->service, 0); DBG("BCAST ISO: sync with %s (BIG 0x%02x BIS 0x%02x)", address, qos.bcast.big, qos.bcast.bis); - ep = queue_find(data->bcast, match_ep_type, - INT_TO_PTR(BT_BAP_BCAST_SINK)); - if (!ep) - return; - update_bcast_qos(&qos, &ep->qos); - base_io = new0(struct iovec, 1); - util_iov_memcpy(base_io, base.base, base.base_len); - - parse_base(base_io->iov_base, base_io->iov_len, bap_debug, - &presDelay, &numSubgroups, &numBis, - &codec, &ep->caps, &ep->metadata); - - /* Update pac with BASE information */ - bt_bap_update_bcast_source(ep->rpac, &codec, ep->caps, ep->metadata); ep->id = bt_bap_stream_config(ep->stream, &ep->qos, ep->caps, NULL, NULL); - data->listen_io = io; + ep->data->listen_io = io; bt_bap_stream_set_user_data(ep->stream, ep->path); @@ -968,25 +1145,39 @@ static void iso_bcast_confirm_cb(GIOChannel *io, GError *err, void *user_data) return; } - return; drop: g_io_channel_shutdown(io, TRUE, NULL); - } static void iso_pa_sync_confirm_cb(GIOChannel *io, void *user_data) { GError *err = NULL; + struct bt_iso_base base; + char address[18]; + struct bt_bap_base base_s; + struct bap_data *data = user_data; + struct bt_iso_qos qos; - if (!bt_io_bcast_accept(io, iso_bcast_confirm_cb, - user_data, NULL, &err, BT_IO_OPT_INVALID)) { - error("bt_io_bcast_accept: %s", err->message); + bt_io_get(io, &err, + BT_IO_OPT_DEST, address, + BT_IO_OPT_QOS, &qos, + BT_IO_OPT_BASE, &base, + BT_IO_OPT_INVALID); + if (err) { + error("%s", err->message); g_error_free(err); - g_io_channel_shutdown(io, TRUE, NULL); + return; } + g_io_channel_ref(io); + data->listen_io = io; + btd_service_connecting_complete(data->service, 0); + base_s.subgroups = queue_new(); + parse_base(data->bap, base.base, base.base_len, bap_debug, &base_s); + + bt_bap_update_bcast_source(NULL, &base_s); } static bool match_data_bap_data(const void *data, const void *match_data) @@ -1082,6 +1273,7 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data, case BT_BAP_BCAST_SINK: err = asprintf(&ep->path, "%s/pac_%s%d", device_get_path(device), suffix, i); + ep->io = data->listen_io; ep->base = new0(struct iovec, 1); break; } @@ -1582,9 +1774,12 @@ static gboolean bap_io_disconnected(GIOChannel *io, GIOCondition cond, bap_io_close(ep); - /* Check if connecting recreate IO */ - if (!is_cig_busy(ep->data, ep->qos.ucast.cig_id)) - recreate_cig(ep); + if (bt_bap_stream_get_type(ep->stream) == + BT_BAP_STREAM_TYPE_UCAST) { + /* Check if connecting recreate IO */ + if (!is_cig_busy(ep->data, ep->qos.ucast.cig_id)) + recreate_cig(ep); + } return FALSE; } @@ -1675,7 +1870,7 @@ static void bap_connect_io(struct bap_data *data, struct bap_ep *ep, static void bap_connect_io_broadcast(struct bap_data *data, struct bap_ep *ep, struct bt_bap_stream *stream, - struct bt_iso_qos *qos) + struct bt_iso_qos *qos, int defer) { struct btd_adapter *adapter = data->user_data; GIOChannel *io = NULL; @@ -1711,7 +1906,7 @@ static void bap_connect_io_broadcast(struct bap_data *data, struct bap_ep *ep, BT_IO_OPT_MODE, BT_IO_MODE_ISO, BT_IO_OPT_QOS, qos, BT_IO_OPT_BASE, &base, - BT_IO_OPT_DEFER_TIMEOUT, false, + BT_IO_OPT_DEFER_TIMEOUT, defer, BT_IO_OPT_INVALID); if (!io) { @@ -1763,42 +1958,28 @@ static void bap_listen_io(struct bap_data *data, struct bt_bap_stream *stream, static void bap_listen_io_broadcast(struct bap_data *data, struct bap_ep *ep, struct bt_bap_stream *stream, struct bt_iso_qos *qos) { - GIOChannel *io; GError *err = NULL; struct sockaddr_iso_bc iso_bc_addr; iso_bc_addr.bc_bdaddr_type = btd_device_get_bdaddr_type(data->device); memcpy(&iso_bc_addr.bc_bdaddr, device_get_address(data->device), sizeof(bdaddr_t)); - iso_bc_addr.bc_bis[0] = 1; iso_bc_addr.bc_num_bis = 1; + iso_bc_addr.bc_bis[0] = strtol(bt_bap_pac_get_name(ep->rpac), NULL, 10); DBG("stream %p", stream); - /* If IO already set skip creating it again */ - if (bt_bap_stream_get_io(stream) || data->listen_io) - return; - - io = bt_io_listen(NULL, iso_pa_sync_confirm_cb, ep->data, NULL, &err, - BT_IO_OPT_SOURCE_BDADDR, - btd_adapter_get_address(ep->data->adapter), - BT_IO_OPT_DEST_BDADDR, - device_get_address(data->device), - BT_IO_OPT_DEST_TYPE, - btd_device_get_bdaddr_type(data->device), - BT_IO_OPT_MODE, BT_IO_MODE_ISO, - BT_IO_OPT_QOS, &qos->bcast, - BT_IO_OPT_ISO_BC_NUM_BIS, iso_bc_addr.bc_num_bis, - BT_IO_OPT_ISO_BC_BIS, iso_bc_addr.bc_bis, - BT_IO_OPT_INVALID); - if (!io) { - error("%s", err->message); + if (!bt_io_bcast_accept(ep->data->listen_io, iso_bcast_confirm_cb, + ep, NULL, &err, + BT_IO_OPT_ISO_BC_NUM_BIS, + iso_bc_addr.bc_num_bis, BT_IO_OPT_ISO_BC_BIS, + iso_bc_addr.bc_bis, BT_IO_OPT_INVALID)) { + error("bt_io_bcast_accept: %s", err->message); g_error_free(err); + g_io_channel_shutdown(ep->data->listen_io, TRUE, NULL); } - ep->io = io; - ep->data->listen_io = io; - } + static void bap_create_ucast_io(struct bap_data *data, struct bap_ep *ep, struct bt_bap_stream *stream, int defer) { @@ -1833,9 +2014,6 @@ static void bap_create_bcast_io(struct bap_data *data, struct bap_ep *ep, memset(&iso_qos, 0, sizeof(iso_qos)); - if (!defer) - goto done; - iso_qos.bcast.big = ep->qos.bcast.big; iso_qos.bcast.bis = ep->qos.bcast.bis; iso_qos.bcast.sync_factor = ep->qos.bcast.sync_factor; @@ -1852,9 +2030,9 @@ static void bap_create_bcast_io(struct bap_data *data, struct bap_ep *ep, iso_qos.bcast.timeout = ep->qos.bcast.timeout; memcpy(&iso_qos.bcast.out, &ep->qos.bcast.io_qos, sizeof(struct bt_iso_io_qos)); -done: + if (bt_bap_pac_get_type(ep->lpac) == BT_BAP_BCAST_SOURCE) - bap_connect_io_broadcast(data, ep, stream, &iso_qos); + bap_connect_io_broadcast(data, ep, stream, &iso_qos, defer); else bap_listen_io_broadcast(data, ep, stream, &iso_qos); } @@ -1879,6 +2057,31 @@ static void bap_create_io(struct bap_data *data, struct bap_ep *ep, break; } } +/* + * Function test_linked_streams_state will check if all linked streams + * have the test state. + * If all streams are in test_state returns true; Else returns false + */ +static bool test_linked_streams_state(struct bt_bap_stream *stream, + uint8_t test_state) +{ + const struct queue_entry *entry; + struct bt_bap_stream *linked_stream; + struct queue *links; + + links = bt_bap_stream_io_get_links(stream); + + if (!links) + return true; + + for (entry = queue_get_entries(links); entry; entry = entry->next) { + linked_stream = entry->data; + if (bt_bap_stream_get_state(linked_stream) != test_state) + return false; + } + + return true; +} static void bap_state(struct bt_bap_stream *stream, uint8_t old_state, uint8_t new_state, void *user_data) @@ -1906,15 +2109,26 @@ static void bap_state(struct bt_bap_stream *stream, uint8_t old_state, break; case BT_BAP_STREAM_STATE_CONFIG: if (ep && !ep->id) { - bap_create_io(data, ep, stream, true); - if (!ep->io) { - error("Unable to create io"); - bt_bap_stream_release(stream, NULL, NULL); - return; - } - if (bt_bap_stream_get_type(stream) == + BT_BAP_STREAM_TYPE_BCAST) { + bool defer = !test_linked_streams_state(stream, + BT_BAP_STREAM_STATE_CONFIG); + bap_create_io(data, ep, stream, defer); + if (!ep->io) { + error("Unable to create io"); + bt_bap_stream_release(stream, + NULL, NULL); + return; + } + } else if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_UCAST) { + bap_create_io(data, ep, stream, true); + if (!ep->io) { + error("Unable to create io"); + bt_bap_stream_release(stream, + NULL, NULL); + return; + } /* Wait QoS response to respond */ ep->id = bt_bap_stream_qos(stream, &ep->qos, qos_cb, ep); @@ -2222,6 +2436,12 @@ static int bap_bcast_probe(struct btd_service *service) struct btd_gatt_database *database = btd_adapter_get_database(adapter); struct bap_data *data = btd_service_get_user_data(service); char addr[18]; + GIOChannel *io; + GError *err = NULL; + struct sockaddr_iso_bc iso_bc_addr; + + iso_bc_addr.bc_bis[0] = 1; + iso_bc_addr.bc_num_bis = 1; ba2str(device_get_address(device), addr); @@ -2260,7 +2480,24 @@ static int bap_bcast_probe(struct btd_service *service) bt_bap_set_user_data(data->bap, service); - bt_bap_new_bcast_source(data->bap, device_get_path(device)); + DBG("Create PA sync with source"); + io = bt_io_listen(NULL, iso_pa_sync_confirm_cb, data, NULL, &err, + BT_IO_OPT_SOURCE_BDADDR, + btd_adapter_get_address(data->adapter), + BT_IO_OPT_DEST_BDADDR, + device_get_address(data->device), + BT_IO_OPT_DEST_TYPE, + btd_device_get_bdaddr_type(data->device), + BT_IO_OPT_MODE, BT_IO_MODE_ISO, + BT_IO_OPT_QOS, &default_qos, + BT_IO_OPT_ISO_BC_NUM_BIS, iso_bc_addr.bc_num_bis, + BT_IO_OPT_ISO_BC_BIS, iso_bc_addr.bc_bis, + BT_IO_OPT_INVALID); + if (!io) { + error("%s", err->message); + g_error_free(err); + } + return 0; } diff --git a/src/shared/bap.c b/src/shared/bap.c index d8a3adde6..8ba0320d6 100644 --- a/src/shared/bap.c +++ b/src/shared/bap.c @@ -254,6 +254,8 @@ static struct queue *bap_db; static struct queue *bap_cbs; static struct queue *sessions; +static bool bt_bap_new_bcast_sink(struct bt_bap *bap); + static bool bap_db_match(const void *data, const void *match_data) { const struct bt_bap_db *bdb = data; @@ -1111,7 +1113,8 @@ static struct bt_bap_stream_io *stream_get_io(struct bt_bap_stream *stream) return stream->io; io = NULL; - queue_foreach(stream->links, stream_find_io, &io); + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_UCAST) + queue_foreach(stream->links, stream_find_io, &io); return io; } @@ -1323,6 +1326,12 @@ static void stream_set_state_broadcast(struct bt_bap_stream *stream, bt_bap_ref(bap); + switch (stream->ep->state) { + case BT_ASCS_ASE_STATE_QOS: + bap_stream_update_io_links(stream); + break; + } + for (entry = queue_get_entries(bap->state_cbs); entry; entry = entry->next) { struct bt_bap_state *state = entry->data; @@ -2357,33 +2366,18 @@ static struct bt_bap_pac *bap_pac_find(struct bt_bap_db *bdb, uint8_t type, return NULL; } -static void *ltv_merge(struct iovec *data, struct iovec *cont) -{ - uint8_t delimiter = 0; - - if (!data) - return NULL; - - if (!cont || !cont->iov_len || !cont->iov_base) - return data->iov_base; - - iov_append(data, sizeof(delimiter), &delimiter); - - return iov_append(data, cont->iov_len, cont->iov_base); -} - static void bap_pac_merge(struct bt_bap_pac *pac, struct iovec *data, struct iovec *metadata) { /* Merge data into existing record */ if (pac->data) - ltv_merge(pac->data, data); + bt_bap_ltv_merge(pac->data, data, true); else pac->data = util_iov_dup(data, 1); /* Merge metadata into existing record */ if (pac->metadata) - ltv_merge(pac->metadata, metadata); + bt_bap_ltv_merge(pac->metadata, metadata, true); else pac->metadata = util_iov_dup(metadata, 1); } @@ -2614,6 +2608,20 @@ static void notify_session_pac_added(void *data, void *user_data) queue_foreach(bap->pac_cbs, notify_pac_added, user_data); } +struct bt_bap_pac *bt_bap_add_vendor_pac_from_pac(struct bt_bap_pac *pac) +{ + struct bt_bap_pac *new_pac; + + new_pac = bt_bap_add_vendor_pac(pac->bdb->db, pac->name, pac->type, + pac->codec.id, + pac->codec.cid, + pac->codec.cid, + &pac->qos, pac->data, + pac->metadata); + bt_bap_pac_set_ops(new_pac, pac->ops, pac->user_data); + return new_pac; +} + struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db, const char *name, uint8_t type, uint8_t id, uint16_t cid, uint16_t vid, @@ -2671,7 +2679,7 @@ struct bt_bap_pac *bt_bap_add_pac(struct gatt_db *db, const char *name, struct iovec *metadata) { return bt_bap_add_vendor_pac(db, name, type, id, 0x0000, 0x0000, qos, - data, metadata); + data, metadata); } uint8_t bt_bap_pac_get_type(struct bt_bap_pac *pac) @@ -2701,6 +2709,14 @@ uint32_t bt_bap_pac_get_locations(struct bt_bap_pac *pac) } } +struct iovec *bt_bap_pac_get_data(struct bt_bap_pac *pac) +{ + if (!pac) + return 0x00; + + return pac->data; +} + uint16_t bt_bap_pac_get_supported_context(struct bt_bap_pac *pac) { struct bt_pacs *pacs; @@ -2783,12 +2799,26 @@ static void notify_session_pac_removed(void *data, void *user_data) bool bt_bap_pac_set_ops(struct bt_bap_pac *pac, struct bt_bap_pac_ops *ops, void *user_data) { + const struct queue_entry *entry = NULL; + struct bt_bap_pac *pac_entry; + if (!pac) return false; pac->ops = ops; pac->user_data = user_data; + if (pac->type == BT_BAP_BCAST_SOURCE) { + for (entry = queue_get_entries(pac->bdb->broadcast_sources); + entry != NULL; entry = entry->next) { + pac_entry = entry->data; + if (pac_entry != pac) { + pac_entry->ops = ops; + pac_entry->user_data = user_data; + } + } + } + return true; } @@ -2807,8 +2837,13 @@ static void remove_streams(void *data, void *user_data) struct bt_bap_stream *stream; stream = queue_remove_if(bap->streams, match_stream_lpac, pac); - if (stream) + if (stream) { + /* Mark stream->lpac to NULL, + * as it will be freed in bt_bap_remove_pac + */ + stream->lpac = NULL; bt_bap_stream_release(stream, NULL, NULL); + } } static void bap_pac_sink_removed(void *data, void *user_data) @@ -4471,6 +4506,11 @@ bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac) return false; } +char *bt_bap_pac_get_name(struct bt_bap_pac *pac) +{ + return pac->name; +} + static bool find_ep_unused(const void *data, const void *user_data) { const struct bt_bap_endpoint *ep = data; @@ -4682,7 +4722,7 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap, return NULL; bt_bap_foreach_pac(bap, type, match_pac, &match); - if (!match.lpac) + if ((!match.lpac) || (!lpac)) return NULL; if (!match.rpac && (lpac->type != BT_BAP_BCAST_SOURCE)) return NULL; @@ -4699,7 +4739,15 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap, if (!ep) { /* Check for unused ASE */ ep = queue_find(bap->remote_eps, find_ep_unused, &match); - if (!ep) { + if (!ep && lpac->type == BT_BAP_BCAST_SOURCE) { + bt_bap_new_bcast_sink(bap); + ep = queue_find(bap->remote_eps, find_ep_unused, + &match); + if (!ep) { + DBG(bap, "Unable to find unused ASE"); + return NULL; + } + } else if (!ep) { DBG(bap, "Unable to find unused ASE"); return NULL; } @@ -4839,7 +4887,16 @@ static void bap_stream_enable_link(void *data, void *user_data) struct bt_bap_stream *stream = data; struct iovec *metadata = user_data; - bap_stream_metadata(stream, BT_ASCS_ENABLE, metadata, NULL, NULL); + switch (bt_bap_stream_get_type(stream)) { + case BT_BAP_STREAM_TYPE_UCAST: + bap_stream_metadata(stream, BT_ASCS_ENABLE, metadata, + NULL, NULL); + break; + case BT_BAP_STREAM_TYPE_BCAST: + stream_set_state_broadcast(stream, + BT_BAP_STREAM_STATE_CONFIG); + break; + } } unsigned int bt_bap_stream_enable(struct bt_bap_stream *stream, @@ -4866,13 +4923,14 @@ unsigned int bt_bap_stream_enable(struct bt_bap_stream *stream, queue_foreach(stream->links, bap_stream_enable_link, metadata); break; case BT_BAP_STREAM_TYPE_BCAST: - if (!bt_bap_stream_io_dir(stream)) + if (!bt_bap_stream_io_dir(stream)) { stream_set_state_broadcast(stream, - BT_BAP_STREAM_STATE_CONFIG); - else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE) + BT_BAP_STREAM_STATE_CONFIG); + queue_foreach(stream->links, bap_stream_enable_link, + NULL); + } else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE) stream_set_state_broadcast(stream, BT_BAP_STREAM_STATE_STREAMING); - return 1; } @@ -4933,17 +4991,27 @@ static void bap_stream_disable_link(void *data, void *user_data) struct iovec iov; struct bt_ascs_disable disable; - memset(&disable, 0, sizeof(disable)); + switch (bt_bap_stream_get_type(stream)) { + case BT_BAP_STREAM_TYPE_UCAST: + memset(&disable, 0, sizeof(disable)); - disable.ase = stream->ep->id; + disable.ase = stream->ep->id; - iov.iov_base = &disable; - iov.iov_len = sizeof(disable); + iov.iov_base = &disable; + iov.iov_len = sizeof(disable); - req = bap_req_new(stream, BT_ASCS_DISABLE, &iov, 1, NULL, NULL); + req = bap_req_new(stream, BT_ASCS_DISABLE, &iov, + 1, NULL, NULL); - if (!bap_queue_req(stream->bap, req)) - bap_req_free(req); + if (!bap_queue_req(stream->bap, req)) + bap_req_free(req); + break; + + case BT_BAP_STREAM_TYPE_BCAST: + stream_set_state_broadcast(stream, + BT_BAP_STREAM_STATE_RELEASING); + break; + } } unsigned int bt_bap_stream_disable(struct bt_bap_stream *stream, @@ -5189,7 +5257,8 @@ bool bt_bap_stream_set_io(struct bt_bap_stream *stream, int fd) bap_stream_set_io(stream, INT_TO_PTR(fd)); - queue_foreach(stream->links, bap_stream_set_io, INT_TO_PTR(fd)); + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_UCAST) + queue_foreach(stream->links, bap_stream_set_io, INT_TO_PTR(fd)); return true; } @@ -5210,6 +5279,23 @@ static bool match_name(const void *data, const void *match_data) return (!strcmp(pac->name, name)); } +void *bt_bap_ltv_merge(struct iovec *data, struct iovec *cont, + bool add_delimiter) +{ + uint8_t delimiter = 0; + + if (!data) + return NULL; + + if (!cont || !cont->iov_len || !cont->iov_base) + return data->iov_base; + + if (add_delimiter) + iov_append(data, sizeof(delimiter), &delimiter); + + return iov_append(data, cont->iov_len, cont->iov_base); +} + int bt_bap_stream_cancel(struct bt_bap_stream *stream, unsigned int id) { struct bt_bap_req *req; @@ -5245,10 +5331,15 @@ int bt_bap_stream_io_link(struct bt_bap_stream *stream, if (queue_find(stream->links, NULL, link)) return -EALREADY; - if (stream->client != link->client || + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BCAST) { + if (stream->qos.bcast.big != link->qos.bcast.big) + return -EINVAL; + } else { + if (stream->client != link->client || stream->qos.ucast.cig_id != link->qos.ucast.cig_id || stream->qos.ucast.cis_id != link->qos.ucast.cis_id) - return -EINVAL; + return -EINVAL; + } if (!stream->links) stream->links = queue_new(); @@ -5377,7 +5468,9 @@ int bt_bap_stream_io_connecting(struct bt_bap_stream *stream, int fd) bap_stream_io_connecting(stream, INT_TO_PTR(fd)); - queue_foreach(stream->links, bap_stream_io_connecting, INT_TO_PTR(fd)); + if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_UCAST) + queue_foreach(stream->links, bap_stream_io_connecting, + INT_TO_PTR(fd)); return 0; } @@ -5433,11 +5526,58 @@ bool bt_bap_new_bcast_source(struct bt_bap *bap, const char *name) return true; } +static bool bt_bap_new_bcast_sink(struct bt_bap *bap) +{ + struct bt_bap_endpoint *ep; + + /* Push remote endpoint with direction source */ + ep = bap_endpoint_new_broadcast(bap->ldb, BT_BAP_BCAST_SOURCE); + + if (ep) + queue_push_tail(bap->remote_eps, ep); + + ep->bap = bap; + return true; +} + +static void bis_to_pac(void *data, void *user_data) +{ + struct bt_bap_bis *bis = data; + struct bt_bap_base_subgroup *subgroup = user_data; + struct bt_bap_pac *pac_source_bis; + struct bt_bap_endpoint *ep; + int err = 0; + + bt_bap_ltv_merge(bis->caps, subgroup->caps, false); + pac_source_bis = bap_pac_new(subgroup->bap->rdb, NULL, + BT_BAP_BCAST_SOURCE, &subgroup->codec, NULL, + bis->caps, subgroup->meta); + + err = asprintf(&pac_source_bis->name, "%d", bis->bisIndex); + + if (err < 0) + DBG(subgroup->bap, "error in asprintf"); + + /* Add remote source endpoint */ + if (!subgroup->bap->rdb->broadcast_sources) + subgroup->bap->rdb->broadcast_sources = queue_new(); + queue_push_tail(subgroup->bap->rdb->broadcast_sources, pac_source_bis); + + queue_foreach(subgroup->bap->pac_cbs, notify_pac_added, pac_source_bis); + /* Push remote endpoint with direction sink */ + ep = bap_endpoint_new_broadcast(subgroup->bap->rdb, BT_BAP_BCAST_SINK); + + if (ep) + queue_push_tail(subgroup->bap->remote_eps, ep); +} +static void parse_bis(void *data, void *user_data) +{ + struct bt_bap_base_subgroup *subgroup = data; + + queue_foreach(subgroup->bises, bis_to_pac, subgroup); +} void bt_bap_update_bcast_source(struct bt_bap_pac *pac, - struct bt_bap_codec *codec, - struct iovec *data, - struct iovec *metadata) + struct bt_bap_base *base) { - bap_pac_merge(pac, data, metadata); - pac->codec = *codec; + queue_foreach(base->subgroups, parse_bis, NULL); } diff --git a/src/shared/bap.h b/src/shared/bap.h index 2c8f9208e..ea49b13a4 100644 --- a/src/shared/bap.h +++ b/src/shared/bap.h @@ -97,6 +97,27 @@ struct bt_bap_qos { }; }; +struct bt_bap_base { + uint32_t presDelay; + uint8_t numSubgroups; + struct queue *subgroups; +}; + +struct bt_bap_base_subgroup { + uint8_t subGroupIndex; + struct bt_bap *bap; + uint8_t numBises; + struct bt_bap_codec codec; + struct iovec *caps; + struct iovec *meta; + struct queue *bises; +}; + +struct bt_bap_bis { + uint8_t bisIndex; + struct iovec *caps; +}; + typedef void (*bt_bap_ready_func_t)(struct bt_bap *bap, void *user_data); typedef void (*bt_bap_destroy_func_t)(void *user_data); typedef void (*bt_bap_debug_func_t)(const char *str, void *user_data); @@ -168,6 +189,8 @@ uint8_t bt_bap_pac_get_type(struct bt_bap_pac *pac); uint32_t bt_bap_pac_get_locations(struct bt_bap_pac *pac); +struct iovec *bt_bap_pac_get_data(struct bt_bap_pac *pac); + uint16_t bt_bap_pac_get_supported_context(struct bt_bap_pac *pac); uint16_t bt_bap_pac_get_context(struct bt_bap_pac *pac); @@ -176,6 +199,8 @@ struct bt_bap_pac_qos *bt_bap_pac_get_qos(struct bt_bap_pac *pac); uint8_t bt_bap_stream_get_type(struct bt_bap_stream *stream); +struct bt_bap_pac *bt_bap_add_vendor_pac_from_pac(struct bt_bap_pac *pac); + struct bt_bap_stream *bt_bap_pac_get_stream(struct bt_bap_pac *pac); /* Session related function */ @@ -231,6 +256,7 @@ int bt_bap_pac_get_codec(struct bt_bap_pac *pac, uint8_t *id, 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); +char *bt_bap_pac_get_name(struct bt_bap_pac *pac); /* Stream related functions */ int bt_bap_select(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac, @@ -314,9 +340,9 @@ bool bt_bap_stream_io_is_connecting(struct bt_bap_stream *stream, int *fd); bool bt_bap_new_bcast_source(struct bt_bap *bap, const char *name); void bt_bap_update_bcast_source(struct bt_bap_pac *pac, - struct bt_bap_codec *codec, - struct iovec *data, - struct iovec *metadata); + struct bt_bap_base *base); +void *bt_bap_ltv_merge(struct iovec *data, struct iovec *cont, + bool add_delimiter); bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac); diff --git a/unit/test-bap.c b/unit/test-bap.c index adade07db..d308d42f9 100644 --- a/unit/test-bap.c +++ b/unit/test-bap.c @@ -377,11 +377,13 @@ static void test_client_config(struct test_data *data) "test-bap-snk", BT_BAP_SINK, 0x0ff, 0x0001, 0x0001, - NULL, data->caps, NULL); + NULL, data->caps, + NULL); else data->snk = bt_bap_add_pac(data->db, "test-bap-snk", BT_BAP_SINK, LC3_ID, - NULL, data->caps, NULL); + NULL, data->caps, + NULL); g_assert(data->snk); } @@ -391,11 +393,13 @@ static void test_client_config(struct test_data *data) "test-bap-src", BT_BAP_SOURCE, 0x0ff, 0x0001, 0x0001, - NULL, data->caps, NULL); + NULL, data->caps, + NULL); else data->src = bt_bap_add_pac(data->db, "test-bap-src", BT_BAP_SOURCE, LC3_ID, - NULL, data->caps, NULL); + NULL, data->caps, + NULL); g_assert(data->src); } } From patchwork Thu Nov 2 15:58:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 740522 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 2C25AC4332F for ; Thu, 2 Nov 2023 15:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377029AbjKBP7B (ORCPT ); Thu, 2 Nov 2023 11:59:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377051AbjKBP66 (ORCPT ); Thu, 2 Nov 2023 11:58:58 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2064.outbound.protection.outlook.com [40.107.22.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EBBF18C for ; Thu, 2 Nov 2023 08:58:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VhBnr3ru3Ie73NoH2jK8xHcA2LhyiG7Z1XjpCMwHXID+KyhVLh3UqBoKr0h3BLGScdQSlq9nLyOmiN1OWukbkNdqmbk+I+oFJMEUOXaHuH9oh0ylX/vCqv+0W/q7HadHmc0PY7QcU+dGjZeRyjatW+fwgS8aGxzb2cfyTxZRPi/KQD1RcA9SOjL9kFcfmOOyLbs/zvDgXMZuwRN9pFzPKX4Amu5IO0HVzuje32smtzcC+Nk6sE+CqGcL4aC0o1xQWSNbePnw1RAiFQr3qZzSpvJV4o0mIY9q3+QMWXdZQAAQOaF6fDbe/hb8FZTXbGFxoE+QqfC03D7vJhqAfGWKIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=K/MoR3CeKgusR4AD2j8Im/7Sgya094xGwNBknJJYytk=; b=B7RtKhTkQgMK2C5DvP3855TN6hHioNGtluxPApDL2MLRQd4eIytz//ltZpgnB7ImI15ocXKLSWIhK3CJyI4EXoxlwe9Ndpo5pSvCefpbHdDrHCb7adzbERlRBFI/QeynraGSLn1MUXAlOtG/Ahf0gCnZzIwaYNgkUcg+mgJPvy5kbi0VRhymBGHTxGZJ57G/k/Da2v3do6epXNy4F8p7aF4+w+lMs8gWtJhJMK0KRAIokjk5zFtMAPfSnYf8Sw298oudR1E2lwx/vkFmvq+REpCO6VeUlEovVFt0zS8tLgFjCz1IzbI4+tR2a7Jow/hRUxt2+UuBe2SR8oN307tq9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K/MoR3CeKgusR4AD2j8Im/7Sgya094xGwNBknJJYytk=; b=OXMSdrg5wy7o4PjdHYjrqrublbbrInZUCH45Kxb5WvkAdL0XMZ/TLieFZqC+MGXTsryU/7H/efIieyAoTQM1JH9OS+f0aVWEaIwBHsr/k4BXFKn0uAdijXB6G6IcxiteSxfDWF2AKornwRN9HxkZDPTMfpwHeJAcCyxjKj4Fna8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) by PAXPR04MB9005.eurprd04.prod.outlook.com (2603:10a6:102:210::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.18; Thu, 2 Nov 2023 15:58:42 +0000 Received: from DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a]) by DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a%7]) with mapi id 15.20.6954.019; Thu, 2 Nov 2023 15:58:42 +0000 From: Silviu Florian Barbulescu 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, luiz.dentz@gmail.com, iulia.tanasescu@nxp.com Subject: [PATCH v3 4/5] profiles/audio/transport.c: Add support multiple BIS Date: Thu, 2 Nov 2023 17:58:26 +0200 Message-Id: <20231102155827.4219-5-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231102155827.4219-1-silviu.barbulescu@nxp.com> References: <20231102155827.4219-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: VI1PR07CA0308.eurprd07.prod.outlook.com (2603:10a6:800:130::36) To DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6331:EE_|PAXPR04MB9005:EE_ X-MS-Office365-Filtering-Correlation-Id: 3008d46c-f8ac-4d7a-8839-08dbdbbc963c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OHDibp9NU+tTYegAQupIHq13dme3WxJBsS91248v+B2YUh9X70Ymlb2g+K9Tz7kZX5t/nCdDyzhibMOa1VCWWuIvGPA17fdQWCXh+gzKY4QPZP6hYFaJK7sZZvv5wPj/jbtP1wGXCqHLwPn09+skBzmZh0N+zRaEEomeS7rnEKlW0OBfJKxw6OkgEjFMt54dDDTkPcwR5OTLO6aeQG/9Zc+97frZ7AsrltYHzpguoeFYJIlF/uziEOwQBx7Yp1IrSahqDzfiu1joJtdoguHB9SQUokkYEFoCNPeNS/WdcWrgVl0zSXLOKlhJbqxFUkV92u0T/zDyzkT9KMaV4vjeHCqGCzD1KZJSq5ijhvtHRevE5fEqdLo98dww2k55dYzzfZo+C/vgqvug5YIZ0CK2qpD32dyp0jj3d87kjtAz/k/5GjYf1m7bnTGYlvl58r8Ff55Y7wY9DUIYcDpe7SuRQ6VnhlgPW0uKyF3MvEf2itaosoASy7WntMCn8fXvTo6Wl+d47zkpE9bUJlZdiNlz2JxbojZ1T9QFL2gVp72LLcPDA7h5bOFNZp/CF/XVLVdhuQRoaxRztVU/4kqKpIQVr2LepaaArU5G5Nz4TaC5pm53y9QvDxE99dJlO7iBBjDa X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6331.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(346002)(366004)(376002)(136003)(396003)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(6512007)(1076003)(478600001)(6506007)(83380400001)(6666004)(8936002)(8676002)(66946007)(41300700001)(5660300002)(66556008)(6486002)(2616005)(66476007)(6916009)(316002)(4326008)(38100700002)(2013699003)(86362001)(36756003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P5MjFvXeToxfcyaAnQDNmxSyDXV8BgxmpoAJszIw4XrdQTu3YKqDzjW4GWfdFtikWNWvqK/iR56oJnvWIyXH9iooBmTJ70A2LyNiIyOZVrTU3Dh2+tiHANoSJF4d98Io5tw5VGcxe0UqI+dQSbHwwdBR8VxlCycWGG3XsFCRZMS4XOT/jQdJW5CANcCacl81oc2kb//NVpeL7wJ5o+5j0BK6sr46jhS8ZnhJriWAgk1ljp/QaDoLA/kZtQSfOoz+dy3io5jDZVOVlIqKH8r25QMQaNdtRCzWpjba6G/CVDRPsvwCCZBTFL0zKD9pqdKTCCk9n7k2xxPW7LQJg1f8azzI2H6ZaY19P2hWBCg0/ZZ+d5D1+SG36k06nLjSkyrV3fUg+ykyVpSIQlcUqGZrzXI4f25o6G1dnrPuuBAgmPyzd7smdnV/g/F4TDh5RlJE875gCcC3LTTKH5LJN3sUGEElH64bbJoO4tm3TKroDTjboJ7o5ytuyIO0HaaEbT5dL62j4moBfqPY2XghFmkR3xDrch+29jrdM9jJfWQrruvxNiF4Qv0/Git6OKCBE+ZXNP/8zEfwKDrPhFWVrgIfd0Uqf7vSD7ZZ+U7AF3VNzoTKWi21myIAALZaAoQGtf/CYRRjjmsR1VEhiyYI9S8DfXmniGJPnNo2u8NhfsdZQt+/MRDzd93bdmbFh1n4okvCjeOcJbng3O+yWNZnDoAUAIKl2w1efM0w4OLf0/n5+IMm8IL5GM0q8mp0ie8AsSbi5bCoPT52//R2GpusO8Reeh+aebkYucAnO1EAJzZ+Lcrok2DP/LYpVL037QIsUWtT+yNWqtl4PvAbkK8UrbJ7f5OnJ5FyFD2tEqF8N0yIT9ufNjzWBSybYGQCtcoYQdZpOfwmqTv8csJFHdjIzqC46w+b7rUbKmhXk4oZhan3KHkqH7Y9tsGw85ZSCCcpOTp0/paw7dVAE1FFlQrkJjvXbIZ4D+vkHZGj83RuHsT08ZVNoxI3X0ujTX93sAtn26ZoxPGMrxSYHn8/YivT7OyXr1Dn+0yo1eR4DJmibqstIVNXTsaccvDAzCncUDpBpOtUbHm4aUwCxAefFE6SGsCA7111P1nJzAKvLBIMwAWwnVlXCJZzUTbu+E5MvZ43T3itKWO80fgdlhDr+gJC1eiHUWGnSUpXsWd5iBdo6ar2vquRwWeum4TKWUrNS1bpWBS1s5Zo0Y46+nQ7uKeAaPvlTTbqiaBu5p2r+wAhbeEXztLwo2h8Y2b9ZN1diiLscp850uJqKxGK589xeFrm12g9IemnHPxYwyX1XU7ewNeD1JCL9N8d3bnKIofGw5I2vpNTcTex9QJR83jL6KQEnmZWC3fSP2owuLa0vB5kRy0ueNxHFE+r4jmqAKH5bUs59w9TagCbwu1EaAAr67E7dfqKkQd++tj52ZfxQTwHR3giAhZJiD5xj9ZzLPiGU6hIRlrZiEiyi4h/wVXKG6SLWsocJ9aXo3K/5e/LEA1bxBSrOvpoO+XiCbzGSrH2n3jERs61N3logpaFk6lQDs5mDTjTdvsIT1N+7WjQBl+Nkwq0bHfcxT6sm4zfZkgdz6jpRdgqx87FrR1r0DzuPlE+GtTWuw== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3008d46c-f8ac-4d7a-8839-08dbdbbc963c X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 15:58:42.7526 (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: tNbSi1Dy6pEc/fHZwSsAIVF52O/x9ET1e9uklXq7kzUbclgJ8wxZAKnzcnCaBfZn4k7RyuzYnUUECGdG1eQfNNDfnr54l7NIDoajbqhqEUg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9005 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Add support for bcast multiple BISes --- profiles/audio/transport.c | 59 ++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index 23ea267f6..eaafd8a35 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -163,7 +163,9 @@ find_transport_by_bap_stream(const struct bt_bap_stream *stream) struct bap_transport *bap; if (strcasecmp(uuid, PAC_SINK_UUID) && - strcasecmp(uuid, PAC_SOURCE_UUID)) + strcasecmp(uuid, PAC_SOURCE_UUID) && + strcasecmp(uuid, BCAA_SERVICE_UUID) && + strcasecmp(uuid, BAA_SERVICE_UUID)) continue; bap = transport->data; @@ -312,9 +314,11 @@ static void media_transport_remove_owner(struct media_transport *transport) media_request_reply(owner->pending, EIO); transport->owner = NULL; - if (bap->linked) - queue_foreach(bt_bap_stream_io_get_links(bap->stream), - linked_transport_remove_owner, owner); + if (bt_bap_stream_get_type(bap->stream) == + BT_BAP_STREAM_TYPE_UCAST) + if (bap->linked) + queue_foreach(bt_bap_stream_io_get_links(bap->stream), + linked_transport_remove_owner, owner); if (owner->watch) g_dbus_remove_watch(btd_get_dbus_connection(), owner->watch); @@ -496,9 +500,11 @@ static void media_transport_set_owner(struct media_transport *transport, DBG("Transport %s Owner %s", transport->path, owner->name); transport->owner = owner; - if (bap->linked) - queue_foreach(bt_bap_stream_io_get_links(bap->stream), - linked_transport_set_owner, owner); + if (bt_bap_stream_get_type(bap->stream) == + BT_BAP_STREAM_TYPE_UCAST) + if (bap->linked) + queue_foreach(bt_bap_stream_io_get_links(bap->stream), + linked_transport_set_owner, owner); owner->transport = transport; owner->watch = g_dbus_add_disconnect_watch(btd_get_dbus_connection(), @@ -641,6 +647,7 @@ static DBusMessage *release(DBusConnection *conn, DBusMessage *msg, const char *sender; struct media_request *req; guint id; + const char *uuid; sender = dbus_message_get_sender(msg); @@ -669,9 +676,12 @@ static DBusMessage *release(DBusConnection *conn, DBusMessage *msg, req = media_request_create(msg, id); media_owner_add(owner, req); - if (bt_bap_stream_get_type(bap->stream) == - BT_BAP_STREAM_TYPE_BCAST) { - bap_disable_complete(bap->stream, 0x00, 0x00, owner); + uuid = media_endpoint_get_uuid(transport->endpoint); + if (!strcasecmp(uuid, BCAA_SERVICE_UUID) || + !strcasecmp(uuid, BAA_SERVICE_UUID)) { + if (bt_bap_stream_get_type(bap->stream) == + BT_BAP_STREAM_TYPE_BCAST) + bap_disable_complete(bap->stream, 0x00, 0x00, owner); } return NULL; @@ -686,7 +696,11 @@ static gboolean get_device(const GDBusPropertyTable *property, if (transport->device) path = device_get_path(transport->device); else - path = adapter_get_path(transport->adapter); + /* + *Use remote endpoint path as fake device path + *for broadcast source transport + */ + path = transport->remote_endpoint; dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH, &path); @@ -1272,7 +1286,9 @@ static bool match_link_transport(const void *data, const void *user_data) if (!transport) return false; - bap_update_links(transport); + if (bt_bap_stream_get_type((struct bt_bap_stream *)stream) == + BT_BAP_STREAM_TYPE_UCAST) + bap_update_links(transport); return true; } @@ -1378,7 +1394,9 @@ static guint resume_bap(struct media_transport *transport, if (bap->resume_id) return 0; - bap_update_links(transport); + if (bt_bap_stream_get_type(bap->stream) == + BT_BAP_STREAM_TYPE_UCAST) + bap_update_links(transport); switch (bt_bap_stream_get_state(bap->stream)) { case BT_BAP_STREAM_STATE_ENABLING: @@ -1416,7 +1434,9 @@ static guint suspend_bap(struct media_transport *transport, else transport_set_state(transport, TRANSPORT_STATE_IDLE); - bap_update_links(transport); + if (bt_bap_stream_get_type(bap->stream) == + BT_BAP_STREAM_TYPE_UCAST) + bap_update_links(transport); return bt_bap_stream_disable(bap->stream, bap->linked, func, owner); } @@ -1491,9 +1511,10 @@ static void bap_state_changed(struct bt_bap_stream *stream, uint8_t old_state, /* If a request is pending wait it to complete */ if (owner && owner->pending) return; - bap_update_links(transport); - if (!media_endpoint_is_broadcast(transport->endpoint)) + if (!media_endpoint_is_broadcast(transport->endpoint)) { + bap_update_links(transport); bap_update_qos(transport); + } else if (bt_bap_stream_io_dir(stream) != BT_BAP_BCAST_SOURCE) bap_update_bcast_qos(transport); transport_update_playing(transport, FALSE); @@ -1510,7 +1531,7 @@ static void bap_state_changed(struct bt_bap_stream *stream, uint8_t old_state, bap_update_bcast_qos(transport); break; case BT_BAP_STREAM_STATE_RELEASING: - if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK) + if (!bt_bap_stream_io_dir(stream)) return; break; } @@ -1555,7 +1576,9 @@ static void bap_connecting(struct bt_bap_stream *stream, bool state, int fd, if (bap->stream != stream) return; - bap_update_links(transport); + if (bt_bap_stream_get_type(bap->stream) == + BT_BAP_STREAM_TYPE_UCAST) + bap_update_links(transport); } static void free_bap(void *data) From patchwork Thu Nov 2 15:58:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Silviu Florian Barbulescu X-Patchwork-Id: 740523 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 EDEA5C4167B for ; Thu, 2 Nov 2023 15:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347662AbjKBP67 (ORCPT ); Thu, 2 Nov 2023 11:58:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377113AbjKBP65 (ORCPT ); Thu, 2 Nov 2023 11:58:57 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2064.outbound.protection.outlook.com [40.107.22.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A823194 for ; Thu, 2 Nov 2023 08:58:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oXMhgWVr0jXGkZAUS544UNpFzUWwVv1eyeQH0QyrtaUxBYRBymS5S6EhAYj/PDWJ/Fkp2fSWbJUWtZGr6t6GJ/n1/jBc/iZ6tr91jaef9L51YcOdeavNxMon1GdwMn2IfhMz0JGa6iVST07ugFYVwB9OtNw/OEDToaehqh/X3TMSoqEDNgbiKJk0uxFJmBZyUK/4e/Z0rDaTwgfJQSP/+dNiUAgmVERTzma6YGSOTzpPejmEZplQ3HmlshPmFTSMR7lnc6LHLYQWYyNuWXHrUoLuNAhnyqoNTLGvgwNwAe00IEnO9cNmvSyfConaP9QYb/F8/yaZx5HSFIXYTwOlPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=b4P7N6R0YZ7jVM++ZH6BIFAcsphVZ+UzRMM1Nptk+J8=; b=TPZBoDFQwJ8ObU8/3kJiwSArce0g5eDiBqqoAjPUSfI6+dGTmS4NBmz5D5xgz6mdVGPP2HI390FPENfoFH0iqGeF4BQ9sU/HNZApD/0kfLXNqKpdbkPFUYxr0N2oBHAXNWWK9sg8nvsoBRt3zCDGQzt+iiStV6KhuccmlyW7c/4LKEuNIOMTz9dCJ2bCIiHCPmXZTRVHKi4gcEGOCA7yPViz6Bul0RTJAdQ/jZLs5FsLb5dxYnb88iMpO/FtX5caldjYw65Q3sLrEIyQ04+8HyKJer5/FfVWm5fUkG5DhZTosOKs7gJi8zFvb+wTqyEX2r/kZYbivveTWCBdIpzOFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b4P7N6R0YZ7jVM++ZH6BIFAcsphVZ+UzRMM1Nptk+J8=; b=iRHyMRQNNrPp/OReJ0IT6Gm6Azr241aHDUBnjndU5HZ1GoCS3/xfTNeIaPhhtBddxPhdx0Wpi0SuToshAPvABNToySslOWih00ELX7mURwATsg3JwaCRDvNTFrneoxRyJ7edm5wBgNuXGSAdzuI6VGEvAe98edLaskPNyCignOE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) by PAXPR04MB9005.eurprd04.prod.outlook.com (2603:10a6:102:210::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.18; Thu, 2 Nov 2023 15:58:45 +0000 Received: from DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a]) by DBBPR04MB6331.eurprd04.prod.outlook.com ([fe80::7c8a:c8da:e6a5:8a4a%7]) with mapi id 15.20.6954.019; Thu, 2 Nov 2023 15:58:45 +0000 From: Silviu Florian Barbulescu 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, luiz.dentz@gmail.com, iulia.tanasescu@nxp.com Subject: [PATCH v3 5/5] client/player.c: Add support for multiple BISes Date: Thu, 2 Nov 2023 17:58:27 +0200 Message-Id: <20231102155827.4219-6-silviu.barbulescu@nxp.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231102155827.4219-1-silviu.barbulescu@nxp.com> References: <20231102155827.4219-1-silviu.barbulescu@nxp.com> X-ClientProxiedBy: VI1PR09CA0108.eurprd09.prod.outlook.com (2603:10a6:803:78::31) To DBBPR04MB6331.eurprd04.prod.outlook.com (2603:10a6:10:ca::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6331:EE_|PAXPR04MB9005:EE_ X-MS-Office365-Filtering-Correlation-Id: 64fec5dc-553e-46ca-ad4a-08dbdbbc9827 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dwXuvZj1vEu2NGKvEGimJ7GrvJrcre/6MAVMvyJEopc14fAcGQcjCg8rW8qmMdkfNARfmXCF08ZT4H7DOP/N4NtyXww+SODpOmDq/imf1k4yN51m6X14fQ0tkJTYeyhHtXSldgVIYJre32+H8EOGOE4mDyQnAB3QJfEtB0rNRTeTgMHn+fYywRcc6OQsFRNVnKhjLtamRki+D83Q/ukq/b3DLZqsInCwUBDRBPDKsCk5zG78PM5W57KU8x/TtH5GFOs7cn1wTx75a3nDumjazVHrPPIjHcyS+MpHPHSeJqG1pmbuDh+3RFTmVP7xT/1UI3+b3yN2WE6T+h553rdTi/U47YKB/ZPS2JtTA26S9U3+EySK187s+P186dfNfQa5V+t7Q8KN888zPmXLBl6//oh8fXklH+OL2HL2VGyaDdlw1FQOs3thuObedOIObl8aLJsKgnxeHPz0bkpACWRMXm1FkZ6xwLzyKXrzcutYwAfb0JOWOv5ktqv2D9mVNdiyg3jMGbcobVxz6Ly2DGEZT2D2ync0tdKZO5ggX2xurtgofbeu8S5FJapAyiekYRQv X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6331.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(346002)(366004)(376002)(136003)(396003)(230922051799003)(451199024)(1800799009)(186009)(64100799003)(26005)(6512007)(1076003)(478600001)(6506007)(83380400001)(6666004)(8936002)(8676002)(66946007)(41300700001)(5660300002)(66556008)(6486002)(2616005)(66476007)(6916009)(316002)(4326008)(38100700002)(86362001)(36756003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JaTr1fKJMFBUHuCuFadvuSJkgPhj8yUhw2TNgaxJH0pkeQx+MDZTRgnffHjoLcYB7LZuLokLrVIyBLyO2htvgH103egutZB4ni9hdSD24+vMAWz+eFJkqeSoU9M5VO7avfIKY6/OZMTvLyIVVh57EYI5yMDZmpYt7SQk+KyAs6+vaTyrDKgdf/qLANu3vBZZhIgezNZOv2mB0brMZnsiOUA6G5+jghG+owCSwat1BC31X/yOMelaSdRERDAmotSrxI3MzrZ9b2rJLef+o3YpHnh/uT3dc+52iTkrI0BCBo0ccdSEZ0LPBQ2WuMQfZ+ppZrGuVk6StV5rRHaiGB6DBz4pbBGBvWKNdByJsqwVmfx38IJc3Krhz+KsdKn+LCD5yIOU/TRHCrqmTWRSUPBmZ4QSTJB4poqwqT67SLcNDkaJuO6fpMFsKE0rP0pu8jljKCrl+yr3cFeoWJI4ksRRIARVPD3u9D3SxAblivGkwtxbvgJ+gSvX94ji+EILzizAs2Q6YfsfHyzJFW7j+lMS7orNe1/HYNf4TWotOyQdSE8QicFlWx5PegzIN4p5bhj6nwgp+aFLM6tOeXhbUsUfYvB8shHqjaTOskuGo7YAPi7pARyq202DyBqH6e8uYq69ksIq8g64U6GHBbgRP8fjuUaADMIcJuD+vsG876feaPj4KnqZ+2XlJootMiyKArfJ/YX/3YaXVWDFHCNTkoPyovV7jhEP84lI9n6MipkUY/ECiyHdNSYOa5Y0ITMaCHNwSR5UJt9pONtAiAegKCCbhwzjZb7qI+prBu4a662YeeWEjamqoySomnUJno3Y8sJR8abV/jy6llcuLmjUQoK6E3Yr4/2MfTo7WiN/3iYS4Ltt9Qa4FKp4ThKN58SK75YA0Hj4ClpULWuyfYeqIL9zSuX4NcJQCVTb9ragHV+QeNgWwfAQnmiBNoANIJUKWUISxSBbgKCXvQNhK4ifsqj7w/ZMRDmEA/orOmtWHPx7wDvLyXYRGhpY3n4sjpED/YeNxpk/0XSiU//of/WlHVRMgtq0BpwFa0Xh/OEjlnuWxUXKNkzmNyBQtCu3an9zn2ncyZTDOgprBP/vgeGWt37UhpU7stB8ufuT/s2fhZ0ioLzIdJ2x8FS2GEihnlZ+DC2NFANp/mbPXAXBRDwvF0crn6W5K2w96DAvFNrj6Ecu2yO1ext8isHvTT6qgdK7HQ1jvIG5vz4/emHnz7YZ3x2JXmK3lof+s3JR/2+wNGvkdB8CF787WXaOpOxrRK9LvZd2gMZpQs1BEc6cCt7jEfnKSUJ/Pja990EO/5p62FuLWTfJR8lnSgjx4tVhR96vIWT3vxNtNfvU23TGHTU6HEIxTCKZQ/6x7I5cMDnrWZlELdsYSRwZqhG4+cMY1YggIUbkm1sm8CK5IRZG97bfz59EMlHXTX/4o9ioztSQHX8AMaSa/6QaeAt5epzNfIxKhKMJqyhP+yGpBFG52+PN2tHjwE3c/PG8FXamymYRroyWL5cgxSEz9geZ6TTBrsbExnyxKCURnLFgiYHcS5WYsRqhSiao0fF9KxGIucmHJlayUxix5g9MOr/EakL38L57n7sAdJIzfWWqFdgDXZs6KTnIig== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64fec5dc-553e-46ca-ad4a-08dbdbbc9827 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 15:58:45.7163 (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: xitzCBcnWSVvRLvpNyhdHDRls/pawAlrICg3FlYOi+aTKqY8Xstvd6t1OsxVgbi5jtAPmk81rnzOoVyKTkr7u4PFzCFPKPz0fMTPuZaBprs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9005 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Add support for bcast multiple BISes --- client/player.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/client/player.c b/client/player.c index 715598aa9..e060e6a5f 100644 --- a/client/player.c +++ b/client/player.c @@ -2999,7 +2999,45 @@ static void endpoint_config(const char *input, void *user_data) endpoint_set_config(cfg); } +static void config_endpoint_iso_stream(const char *input, void *user_data) +{ + struct endpoint_config *cfg = user_data; + char *endptr = NULL; + int value; + + value = strtol(input, &endptr, 0); + + if (!endptr || *endptr != '\0' || value > UINT8_MAX) { + bt_shell_printf("Invalid argument: %s\n", input); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + bcast_qos.bcast.bis = value; + + endpoint_set_config(cfg); +} + +static void config_endpoint_iso_group(const char *input, void *user_data) +{ + struct endpoint_config *cfg = user_data; + char *endptr = NULL; + int value; + + value = strtol(input, &endptr, 0); + + if (!endptr || *endptr != '\0' || value > UINT8_MAX) { + bt_shell_printf("Invalid argument: %s\n", input); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + bcast_qos.bcast.big = value; + + bt_shell_prompt_input(cfg->ep->path, "BIS (value):", + config_endpoint_iso_stream, cfg); +} + static struct endpoint *endpoint_new(const struct capabilities *cap); +static void endpoint_init_defaults(struct endpoint *ep); static void cmd_config_endpoint(int argc, char *argv[]) { @@ -3033,6 +3071,7 @@ static void cmd_config_endpoint(int argc, char *argv[]) if (cap) { broadcast = true; cfg->ep = endpoint_new(cap); + endpoint_init_defaults(cfg->ep); cfg->ep->preset = find_presets_name(uuid, argv[3]); if (!cfg->ep->preset) bt_shell_printf("Preset not found\n"); @@ -3068,7 +3107,12 @@ static void cmd_config_endpoint(int argc, char *argv[]) /* Set QoS parameters */ cfg->qos = &preset->qos; - endpoint_set_config(cfg); + if ((cfg->ep->broadcast) && (strcmp(cfg->ep->uuid, + BCAA_SERVICE_UUID) == 0)) + bt_shell_prompt_input(cfg->ep->path, "BIG (value):", + config_endpoint_iso_group, cfg); + else + endpoint_set_config(cfg); return; }