Return-Path: From: Szymon Janc To: linux-bluetooth@vger.kernel.org Cc: Szymon Janc Subject: [PATCH 15/16] android/hal-gatt: Implement client batchscan_dis_batch_scan Date: Mon, 17 Nov 2014 23:28:07 +0100 Message-Id: <1416263288-30530-15-git-send-email-szymon.janc@tieto.com> In-Reply-To: <1416263288-30530-1-git-send-email-szymon.janc@tieto.com> References: <1416263288-30530-1-git-send-email-szymon.janc@tieto.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: This adds required IPC message, HAL implementation and daemon stub handler. --- android/gatt.c | 16 ++++++++++++++++ android/hal-gatt.c | 11 ++++++++--- android/hal-msg.h | 5 +++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/android/gatt.c b/android/gatt.c index dbe749f..24b2af1 100644 --- a/android/gatt.c +++ b/android/gatt.c @@ -5714,6 +5714,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, @@ -5859,6 +5872,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 0fc89ac..a97095f 100644 --- a/android/hal-gatt.c +++ b/android/hal-gatt.c @@ -1634,11 +1634,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 ca2cf9a..696972a 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 -- 1.9.3