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:   Nitin Jadhav <nitin.jadhav@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     devyani.godbole@nxp.com, mihai-octavian.urzica@nxp.com,
        silviu.barbulescu@nxp.com, nitin.jadhav@nxp.com
Subject: [PATCH BlueZ v3 2/2] Make VOCS (Secondary) as an included service of VCS (Primary)
Date:   Thu,  8 Jun 2023 15:09:45 +0300
Message-Id: <20230608120945.4478-3-nitin.jadhav@nxp.com>
In-Reply-To: <20230608120945.4478-1-nitin.jadhav@nxp.com>
References: <20230608120945.4478-1-nitin.jadhav@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?z+JeArok8Q44/YfXbIYZbgPjCZFpDL6YisVpd6SRb6RPaI15EI0WH+8uE58Y?=
 =?us-ascii?Q?Qy3u4gNO5IFW4Ly3MIdVc84PluuPaoNr5QQnDkwY2PStHTqKkQ35pmnGlcjE?=
 =?us-ascii?Q?BQmI9MkhyiVTKIaB3wabVrNfvO6ZXQj4L/6Rbl1Ewrbtcn+gfQ4E4TOJii0W?=
 =?us-ascii?Q?kFBVK2jfbLXkcHFpd/TICSzdqlQVqcUUchnB/hOkT6e1H+Zz7IHZWd/iq9K6?=
 =?us-ascii?Q?dQDG7znifYqsel5rByrH6/XMfET81VqwUOL/ThVmHVJk8FP1LTK4nSvwDEiP?=
 =?us-ascii?Q?w9DxjxMjiyKUjp5jy6oxW7wlUKChawkQrrOHvqadreWJ8yRTpQuw1H87ACAm?=
 =?us-ascii?Q?1+pHJlpAhkaKA0J3WnIMEZuHzq+Y1JySdNmT0OI7vfMSp5suDU+T8hdKSx4p?=
 =?us-ascii?Q?IBRn2xOT3dMFAUM9W7AbWsF7nFmh6zuCMgo2o5iJZQd/s4G7DV3wIDlTxh8P?=
 =?us-ascii?Q?6uNHezEV28ncF4CaNqMoGuDVtYW2f4+d6vMKQno7PnzJ7fO8QUeLEAmKarEg?=
 =?us-ascii?Q?XyBTbdl8bqSBG1sYsfx+0UUCe/1XDsFn9Cgx+kgJmmPA18M2AxLczutE/8GI?=
 =?us-ascii?Q?koxYh0AKsblex0ytLWgbzlh8zmL1c0qrvRUA8vyzw8IaC9xc7zcikcPE2BHs?=
 =?us-ascii?Q?n3Z517s9VG8Wlm1sDLKqxWL0I2tGi++8QypTrOr0O+5kj+hqI06zncWgRogo?=
 =?us-ascii?Q?Ql75uFLc5QjZ7JxpKPqirI9pseNAze0xg3ZYS4IZRNuEk4zIYbA9WwmOTP9o?=
 =?us-ascii?Q?yvYhmG+kKyotOiSM+jUDgsENUfA1ZuO9d++DPMJbkYatFXbzK7eBLFhA6SLr?=
 =?us-ascii?Q?MYxGEl6E4RkSNb4yFbTyZkzWm80/XKKrFErOT6p9SK6TQh6xst2wRS/tuACY?=
 =?us-ascii?Q?/deSg4vXQTrO4p2WimFxLEnVjFvE8MUEcsYmUnkVX9EAngMGNxpz/gfKLdxy?=
 =?us-ascii?Q?0PWKNLEhKzSwQ0CvndwXFA99NToppLCFtOVUzutMmBmYLJ3+suvUlegzXXgO?=
 =?us-ascii?Q?DmqUlHMkyDtP/dBU0AUgMBZv/p4FRhBdT84OH0T/ostqWuNbgIzK7vtwZX99?=
 =?us-ascii?Q?2dyRK53BRB8vt8xOjmvQIf6KQhrQQEWtHde2czssCwWC1lP+sy/jzTvOwz2M?=
 =?us-ascii?Q?pOt84IEHVGUgevNG7ikHWdxJocJ3JMzVzz2quRsiKPv4j2IVtnTLEaz3ufyI?=
 =?us-ascii?Q?CmnAk2Hc/Qaut8g8oaqlkdZj+oMAEnJ1ztFpqgUWK0B1ze1GQAqbSJNRXuOH?=
 =?us-ascii?Q?hJcjVGoIwk5po9AwaYE83uk73LurkNIf45khVvV7Lf6b9q4zlFrfjehqgQz4?=
 =?us-ascii?Q?jdwWdYP+ZHZvROw5eSYxrbUD+ygFBslG1nZ/XOmxc9DGZGYQ/H5Le/rnkNOc?=
 =?us-ascii?Q?4kf/WGrX7glXa12XGPaT9SMCIVWs1pBnu7x+cip5iFQ7mbjMdHqwzs25BtOI?=
 =?us-ascii?Q?UjWr0MhQOImc27rkf8+Vmzx3fBq6wHRINKIlo0cqXt9IQt7fhpcsRs9Yd82a?=
 =?us-ascii?Q?R7Nt31bmqQUtI6mFlgp+BT94PRf0Uf5cv1pXmLSY0HFgSuWv5gSHlUB+RA8B?=
 =?us-ascii?Q?lJYmRR8Sw+BbZoaq4BYfcCGoAj/Sm1M6RNw7sGpX?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 843601cb-ab6b-43d9-487e-08db68195a94
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB9126.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2023 12:10:30.9038
 (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: aHXrImCYTiwoSFKc803Z6F34xslMD09luML+5pQIJA1jG9SqYvAF5N2gtL/Iijtua3VVJM/MCxeXeiZF1ET4FA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7597
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
        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

Fixed the following issue observed during PTS testing
- Specified Upper and Lower Limit for Volume offset
- Corrected the number of handles for VOCS
- VOCS is made as included service of VCS
  (VOCS is secondary service and VSC is primary service)
---
v2: Cosmetic Changes (Bluez Test Bot)
v3: No change
---
 src/shared/vcp.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/shared/vcp.c b/src/shared/vcp.c
index aa75f498a..e656615cc 100644
--- a/src/shared/vcp.c
+++ b/src/shared/vcp.c
@@ -32,9 +32,13 @@
 
 #define VCP_STEP_SIZE 1
 
+#define VOCS_VOL_OFFSET_UPPER_LIMIT	 255
+#define VOCS_VOL_OFFSET_LOWER_LIMIT	-255
+
 /* Apllication Error Code */
 #define BT_ATT_ERROR_INVALID_CHANGE_COUNTER	0x80
 #define BT_ATT_ERROR_OPCODE_NOT_SUPPORTED	0x81
+#define BT_ATT_ERROR_VALUE_OUT_OF_RANGE		0x82
 
 #define BT_VCP_NA                   0x00000000
 #define BT_VCP_FRONT_LEFT           0x00000001
@@ -100,7 +104,7 @@ struct bt_vcs_ab_vol {
 
 struct bt_vocs_set_vol_off {
 	uint8_t	change_counter;
-	uint8_t	set_vol_offset;
+	int16_t set_vol_offset;
 } __packed;
 
 struct bt_vcp_cb {
@@ -167,7 +171,7 @@ struct bt_vcs {
 
 /* Contains local bt_vcp_db */
 struct vol_offset_state {
-	uint16_t vol_offset;
+	int16_t vol_offset;
 	uint8_t counter;
 } __packed;
 
@@ -705,6 +709,11 @@ static uint8_t vocs_set_vol_offset(struct bt_vocs *vocs, struct bt_vcp *vcp,
 		return BT_ATT_ERROR_INVALID_CHANGE_COUNTER;
 	}
 
+	if (req->set_vol_offset > VOCS_VOL_OFFSET_UPPER_LIMIT ||
+		req->set_vol_offset < VOCS_VOL_OFFSET_LOWER_LIMIT) {
+		DBG(vcp, "error: Value Out of Range");
+		return BT_ATT_ERROR_VALUE_OUT_OF_RANGE;
+	}
 	vstate->vol_offset = req->set_vol_offset;
 	vstate->counter = -~vstate->counter; /*Increment Change Counter*/
 
@@ -971,7 +980,7 @@ static void vocs_voaodec_read(struct gatt_db_attribute *attrib,
 							iov.iov_len);
 }
 
-static struct bt_vcs *vcs_new(struct gatt_db *db)
+static struct bt_vcs *vcs_new(struct gatt_db *db, struct bt_vcp_db *vdb)
 {
 	struct bt_vcs *vcs;
 	struct vol_state *vstate;
@@ -990,6 +999,8 @@ static struct bt_vcs *vcs_new(struct gatt_db *db)
 	/* Populate DB with VCS attributes */
 	bt_uuid16_create(&uuid, VCS_UUID);
 	vcs->service = gatt_db_add_service(db, &uuid, true, 9);
+	gatt_db_service_add_included(vcs->service, vdb->vocs->service);
+	gatt_db_service_set_active(vdb->vocs->service, true);
 
 	bt_uuid16_create(&uuid, VOL_STATE_CHRC_UUID);
 	vcs->vs = gatt_db_service_add_characteristic(vcs->service,
@@ -1048,7 +1059,8 @@ static struct bt_vocs *vocs_new(struct gatt_db *db)
 
 	/* Populate DB with VOCS attributes */
 	bt_uuid16_create(&uuid, VOL_OFFSET_CS_UUID);
-	vocs->service = gatt_db_add_service(db, &uuid, true, 9);
+
+	vocs->service = gatt_db_add_service(db, &uuid, false, 12);
 
 	bt_uuid16_create(&uuid, VOCS_STATE_CHAR_UUID);
 	vocs->vos = gatt_db_service_add_characteristic(vocs->service,
@@ -1110,11 +1122,10 @@ static struct bt_vcp_db *vcp_db_new(struct gatt_db *db)
 	if (!vcp_db)
 		vcp_db = queue_new();
 
-	vdb->vcs = vcs_new(db);
-	vdb->vcs->vdb = vdb;
-
 	vdb->vocs = vocs_new(db);
 	vdb->vocs->vdb = vdb;
+	vdb->vcs = vcs_new(db, vdb);
+	vdb->vcs->vdb = vdb;
 
 	queue_push_tail(vcp_db, vdb);
 
-- 
2.34.1