Return-Path: From: Andrzej Kaczmarek To: linux-bluetooth@vger.kernel.org Cc: Andrzej Kaczmarek Subject: [PATCH 5/8] android/hal-gatt-api: Fix IPC definition for read_characteristic Date: Thu, 17 Apr 2014 01:10:30 +0200 Message-Id: <1397689833-17557-6-git-send-email-andrzej.kaczmarek@tieto.com> In-Reply-To: <1397689833-17557-1-git-send-email-andrzej.kaczmarek@tieto.com> References: <1397689833-17557-1-git-send-email-andrzej.kaczmarek@tieto.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: --- android/gatt.c | 6 +++--- android/hal-gatt.c | 2 +- android/hal-msg.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/gatt.c b/android/gatt.c index f9ba870..878df0e 100644 --- a/android/gatt.c +++ b/android/gatt.c @@ -2162,7 +2162,7 @@ static void handle_client_read_characteristic(const void *buf, uint16_t len) /* TODO authorization needs to be handled */ hal_srvc_id_to_element_id(&cmd->srvc_id, &srvc_id); - hal_gatt_id_to_element_id(&cmd->gatt_id, &char_id); + hal_gatt_id_to_element_id(&cmd->char_id, &char_id); if (!find_service(cmd->conn_id, &srvc_id, &dev, &srvc)) { status = HAL_STATUS_FAILED; @@ -2173,7 +2173,7 @@ static void handle_client_read_characteristic(const void *buf, uint16_t len) ch = queue_find(srvc->chars, match_char_by_element_id, &char_id); if (!ch) { error("gatt: Characteristic with inst_id: %d not found", - cmd->gatt_id.inst_id); + cmd->char_id.inst_id); status = HAL_STATUS_FAILED; goto failed; } @@ -2189,7 +2189,7 @@ static void handle_client_read_characteristic(const void *buf, uint16_t len) if (!gatt_read_char(dev->attrib, ch->ch.value_handle, read_char_cb, cb_data)) { error("gatt: Cannot read characteristic with inst_id: %d", - cmd->gatt_id.inst_id); + cmd->char_id.inst_id); status = HAL_STATUS_FAILED; free(cb_data); goto failed; diff --git a/android/hal-gatt.c b/android/hal-gatt.c index bcbeb54..e805a82 100644 --- a/android/hal-gatt.c +++ b/android/hal-gatt.c @@ -785,7 +785,7 @@ static bt_status_t read_characteristic(int conn_id, btgatt_srvc_id_t *srvc_id, cmd.auth_req = auth_req; srvc_id_to_hal(&cmd.srvc_id, srvc_id); - gatt_id_to_hal(&cmd.gatt_id, char_id); + gatt_id_to_hal(&cmd.char_id, char_id); return hal_ipc_cmd(HAL_SERVICE_ID_GATT, HAL_OP_GATT_CLIENT_READ_CHARACTERISTIC, diff --git a/android/hal-msg.h b/android/hal-msg.h index 6b4b2f5..4974a51 100644 --- a/android/hal-msg.h +++ b/android/hal-msg.h @@ -647,7 +647,7 @@ struct hal_cmd_gatt_client_get_descriptor { struct hal_cmd_gatt_client_read_characteristic { int32_t conn_id; struct hal_gatt_srvc_id srvc_id; - struct hal_gatt_gatt_id gatt_id; + struct hal_gatt_gatt_id char_id; int32_t auth_req; } __attribute__((packed)); -- 1.9.2