From dc2410df7f1a6c595705c72a66d459ae5325d60b Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Mon, 17 Nov 2014 16:41:56 +0100 Subject: [PATCH] android/hal-gatt: Implement client set_scan_parameters This adds required IPC message, HAL implementation and daemon stub handler. --- android/gatt.c | 16 ++++++++++++++++ android/hal-gatt.c | 12 +++++++++--- android/hal-msg.h | 6 ++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/android/gatt.c b/android/gatt.c index 5955d3a18..09a3a7f9c 100644 --- a/android/gatt.c +++ b/android/gatt.c @@ -5627,6 +5627,19 @@ static void handle_client_conn_param_update(const void *buf, uint16_t len) HAL_STATUS_UNSUPPORTED); } +static void handle_client_set_scan_param(const void *buf, uint16_t len) +{ + const struct hal_cmd_gatt_client_set_scan_param *cmd = buf; + + DBG("interval %d window %d", cmd->interval, cmd->window); + + /* TODO */ + + ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_GATT, + HAL_OP_GATT_CLIENT_SET_SCAN_PARAM, + HAL_STATUS_UNSUPPORTED); +} + static const struct ipc_handler cmd_handlers[] = { /* HAL_OP_GATT_CLIENT_REGISTER */ { handle_client_register, false, @@ -5751,6 +5764,9 @@ static const struct ipc_handler cmd_handlers[] = { /* HAL_OP_GATT_CLIENT_CONN_PARAM_UPDATE */ { handle_client_conn_param_update, false, sizeof(struct hal_cmd_gatt_client_conn_param_update) }, + /* HAL_OP_GATT_CLIENT_SET_SCAN_PARAM */ + { handle_client_set_scan_param, false, + sizeof(struct hal_cmd_gatt_client_set_scan_param) }, }; 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 276268bc8..78ac8f097 100644 --- a/android/hal-gatt.c +++ b/android/hal-gatt.c @@ -1452,11 +1452,17 @@ static bt_status_t conn_parameter_update(const bt_bdaddr_t *bd_addr, static bt_status_t set_scan_parameters(int scan_interval, int scan_window) { - DBG(""); + struct hal_cmd_gatt_client_set_scan_param cmd; - /* TODO */ + if (!interface_ready()) + return BT_STATUS_NOT_READY; - return BT_STATUS_UNSUPPORTED; + cmd.interval = scan_interval; + cmd.window = scan_window; + + return hal_ipc_cmd(HAL_SERVICE_ID_GATT, + HAL_OP_GATT_CLIENT_SET_SCAN_PARAM, + sizeof(cmd), &cmd, NULL, NULL, NULL); } static bt_status_t multi_adv_enable(int client_if, int min_interval, diff --git a/android/hal-msg.h b/android/hal-msg.h index b9d47ff22..e3f65dccd 100644 --- a/android/hal-msg.h +++ b/android/hal-msg.h @@ -1088,6 +1088,12 @@ struct hal_cmd_gatt_client_conn_param_update { int32_t timeout; } __attribute__((packed)); +#define HAL_OP_GATT_CLIENT_SET_SCAN_PARAM 0x2a +struct hal_cmd_gatt_client_set_scan_param { + int32_t interval; + int32_t window; +} __attribute__((packed)); + /* Handsfree client HAL API */ #define HAL_OP_HF_CLIENT_CONNECT 0x01 -- 2.47.3