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 v2 2/2] Make VOCS (Secondary) as an included service of VCS (Primary)
Date:   Wed,  7 Jun 2023 15:13:42 +0300
Message-Id: <20230607121342.6136-3-nitin.jadhav@nxp.com>
In-Reply-To: <20230607121342.6136-1-nitin.jadhav@nxp.com>
References: <20230607121342.6136-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?yZ5FzMek5SnpwCV641dWWh43Xa4qcIWPJx0CtcMKfEIdDRQQvg+HWoQrf+XN?=
 =?us-ascii?Q?urgVBajAinggeoJvYLQ5Id2b48Ax0Iezjl76HGlywfEytykkM/xtch3ynwIw?=
 =?us-ascii?Q?xr8XIHMRSrWVNw0jfJDynMZQjJycBH7NWT2U7Q9tSMhTKKbqiNyQ57CKbmlu?=
 =?us-ascii?Q?KkzAyMUT6NlpF8mYsgjeYswz7F6YqepcxX3Ys8Bx902p2vj70p0suTyo3ip9?=
 =?us-ascii?Q?iiGRPTmNB4RVIoz0RSuZD0sZcDNqZFVu0Ula4yIliMMHWrW35ajIwXAEvbeD?=
 =?us-ascii?Q?lBA18UmDFrCFMhr96X/a8CLy+pfY9BjfmgFsS0+SuFNiwsOfaODIFiMDphPK?=
 =?us-ascii?Q?qgiOjC+eJSObQZEhhNUzf6leeaNsL7Smnxb+kASkC5rZq4I6DN8/yUc+r8IP?=
 =?us-ascii?Q?m5vdmrBPnnXAf8lPwxrbcru7+Q45OB+FDpnigH2pqIksmtA7MkDAZcN+kB1I?=
 =?us-ascii?Q?J6lme3lFe2b4Asotk3TCKWvM5C+v7JwHVY3XEIIKmo98e562E8p0RsieMZ/m?=
 =?us-ascii?Q?RKvAOf2Kkl4jI4NefiJLwjpTjsO1cEB/1xiPwwxMTf4nElh+r/tkbBMWO7d6?=
 =?us-ascii?Q?IXJyIYE1s7iH8vIKrmTPxs3C/CbmzqObWUoa7FBLYGsWV0h8gCyeJbsLREUF?=
 =?us-ascii?Q?0lNxte7KuUN2YAKb+hlk0HPLSNp22b3kVfo/O10wexEjzC2XMTfJMv8gzxHf?=
 =?us-ascii?Q?L9hLxxHR1tNNWBLnrY2wDoKt/WCBTq0bN4x+qNXHgpb+gE/G1Kn+IfLtR5fQ?=
 =?us-ascii?Q?WFjhE8q34eqjFNqY2C7FBZtAtNpoV973N1VJjp/ULDZ7mI82XPROXEpPxJzH?=
 =?us-ascii?Q?7jp54Hz9op+Nfcu8bGgNX57IzXv+uCAhzkvar4VQ3mT0m9Id+JqEXQkukcqm?=
 =?us-ascii?Q?VVf7+CQcuiPAe7hfx1o4qT/YDKb/fn3YQdmYbzXXP33cQOi5kjIfLEiv47yN?=
 =?us-ascii?Q?V5nbj/D5u8pb7pmtCypb7nVtEBUiHlvlS8JN3qvmLO2ZvSnoAIzdN9UpoYax?=
 =?us-ascii?Q?zEFmcrUa6VWuXcvpOmHXiA7CpIwpJmRNFzlDFf2Ex0egdVRE4EEJfEmJkQU5?=
 =?us-ascii?Q?kOXAmYcBO2Da+cuXsxgq0oBmJmiYh5xx9++DAcp+/Sg29HtYgHVp+zAlTSmx?=
 =?us-ascii?Q?3PgUoB4uxEHvmrRTi1IRzOxdXqVXl3oWT9sp+RLn6G3pzLfORtg9jrKAlBSi?=
 =?us-ascii?Q?Iay/PDEzCFmkYQeQHRzeNmsS2q4004+9GIPmmL61VLcAjPJyKCOp0K7BdTKU?=
 =?us-ascii?Q?kpSG56Xj/pz++FX03eGqtg7xm7EgvErvPzK3erbLddR0tx1xhCFj9fCoTvO9?=
 =?us-ascii?Q?tylmtM6sezBuyFqnKn4UkeciOTPW07ensAanahDDOw87fAtKhoweDdHo6ovv?=
 =?us-ascii?Q?s0AKtMHCiILQA/s/5IfOduMNzNPGVCLgJjdyJffzM/VxvIkttWMRZw1nMKIf?=
 =?us-ascii?Q?bz563VS/RKv2GWj9rkT/seoQyW28/1AzP1PFyeSLAYt0gIIOjLPzrRT9iHN/?=
 =?us-ascii?Q?e25WLLU7PJfRwYIsW53MHrT5qi4MgzfWCue39k/TxfrylykidswDZA8UPxFo?=
 =?us-ascii?Q?JbKpkU9OYnOkvhnJwek7VFJUbrxmqR4R2lWy74v5?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 551fbafc-0deb-4ac4-6a32-08db6750b961
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB9126.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2023 12:14:21.0751
 (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: 4lclQkQI+P5JWHl90SPy2dEwv88Aeyq/SbwlOv/XVVQEc5R3VHjOieuIeZ177UrileYbIHmWfuB9nYaoFu5muQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9434
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

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)
---
 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 e9bd6e88b..7a9a6c9ed 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