Diff between 1de15ca288a63d44bb56f0d09c9632ef7d22787b and c9275f5083c7c711b32bb683159e279ecf855aae

Changed Files

File Additions Deletions Status
android/gatt.c +16 -0 modified
android/hal-gatt.c +8 -3 modified
android/hal-msg.h +5 -0 modified

Full Patch

diff --git a/android/gatt.c b/android/gatt.c
index 6cb9cba..e46e896 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -5718,6 +5718,19 @@ static void handle_client_enable_batchscan(const void *buf, uint16_t len)
 					HAL_STATUS_UNSUPPORTED);
 }
 
+static void handle_client_disable_batchscan(const void *buf, uint16_t len)
+{
+	const struct hal_cmd_gatt_client_disable_batchscan *cmd = buf;
+
+	DBG("client_if %d", cmd->client_if);
+
+	/* TODO */
+
+	ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_GATT,
+					HAL_OP_GATT_CLIENT_DISABLE_BATCHSCAN,
+					HAL_STATUS_UNSUPPORTED);
+}
+
 static const struct ipc_handler cmd_handlers[] = {
 	/* HAL_OP_GATT_CLIENT_REGISTER */
 	{ handle_client_register, false,
@@ -5863,6 +5876,9 @@ static const struct ipc_handler cmd_handlers[] = {
 	/* HAL_OP_GATT_CLIENT_ENABLE_BATCHSCAN */
 	{ handle_client_enable_batchscan, false,
 		sizeof(struct hal_cmd_gatt_client_enable_batchscan) },
+	/* HAL_OP_GATT_CLIENT_DISABLE_BATCHSCAN */
+	{ handle_client_disable_batchscan, false,
+		sizeof(struct hal_cmd_gatt_client_disable_batchscan) },
 };
 
 static uint8_t read_by_group_type(const uint8_t *cmd, uint16_t cmd_len,
diff --git a/android/hal-gatt.c b/android/hal-gatt.c
index 30a51ba..0e3a29b 100644
--- a/android/hal-gatt.c
+++ b/android/hal-gatt.c
@@ -1631,11 +1631,16 @@ static bt_status_t batchscan_enb_batch_scan(int client_if, int scan_mode,
 
 static bt_status_t batchscan_dis_batch_scan(int client_if)
 {
-	DBG("");
+	struct hal_cmd_gatt_client_disable_batchscan cmd;
 
-	/* TODO */
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
 
-	return BT_STATUS_UNSUPPORTED;
+	cmd.client_if = client_if;
+
+	return hal_ipc_cmd(HAL_SERVICE_ID_GATT,
+					HAL_OP_GATT_CLIENT_DISABLE_BATCHSCAN,
+					sizeof(cmd), &cmd, NULL, NULL, NULL);
 }
 
 static bt_status_t batchscan_read_reports(int client_if, int scan_mode)
diff --git a/android/hal-msg.h b/android/hal-msg.h
index a81ebb4..75ad615 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -1152,6 +1152,11 @@ struct hal_cmd_gatt_client_enable_batchscan {
 	int32_t discard_rule;
 } __attribute__((packed));
 
+#define HAL_OP_GATT_CLIENT_DISABLE_BATCHSCAN		0x31
+struct hal_cmd_gatt_client_disable_batchscan {
+	int32_t client_if;
+} __attribute__((packed));
+
 /* Handsfree client HAL API */
 
 #define HAL_OP_HF_CLIENT_CONNECT		0x01