From 20a48c8facfb0af9600cab53f94d3b34e1e8474e Mon Sep 17 00:00:00 2001 From: Jakub Tyszkowski Date: Wed, 5 Mar 2014 09:59:47 +0100 Subject: [PATCH] android/hal-gatt-api: Simplify GATT Notify ev struct Make nested struct open coded for simplicity. --- android/hal-ipc-api.txt | 3 +-- android/hal-msg.h | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/android/hal-ipc-api.txt b/android/hal-ipc-api.txt index 6fa0d3b26..e88a85ddf 100644 --- a/android/hal-ipc-api.txt +++ b/android/hal-ipc-api.txt @@ -1885,8 +1885,7 @@ Android HAL name: "gatt" (BT_PROFILE_GATT_ID) Opcode 0x8b - Notify notification Notification parameters: Connection ID (4 octets) - Notify Parameters (variable) - Valid Notify Parameters: Address (6 octets) + Address (6 octets) GATT Service ID (18 octets) GATT Char. ID (17 octets) Is Notify (1 octet) diff --git a/android/hal-msg.h b/android/hal-msg.h index 90d685480..ebf6d896a 100644 --- a/android/hal-msg.h +++ b/android/hal-msg.h @@ -1310,7 +1310,8 @@ struct hal_ev_gatt_client_reg_for_notif { } __attribute__((packed)); #define HAL_EV_GATT_CLIENT_NOTIFY 0x8b -struct hal_gatt_notify_params { +struct hal_ev_gatt_client_notify { + int32_t conn_id; uint8_t bda[6]; struct hal_gatt_srvc_id srvc_id; struct hal_gatt_gatt_id char_id; @@ -1319,11 +1320,6 @@ struct hal_gatt_notify_params { uint8_t value[0]; } __attribute__((packed)); -struct hal_ev_gatt_client_notify { - int32_t conn_id; - struct hal_gatt_notify_params data; -} __attribute__((packed)); - #define HAL_EV_GATT_CLIENT_READ_CHARACTERISTIC 0x8c struct hal_gatt_unformated_value { uint16_t len; -- 2.47.3