From ee9a11f903af6ee6b3ca1bd59fc9f89fd029ceba Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Mon, 25 Sep 2017 18:47:54 -0700 Subject: [PATCH] Remove unnecesary BTA redefinitions for GATT part 3 Test: compilation test Change-Id: I8d4b8cfd35fcb5ccd7067f1e02dedd1a58efa3ad --- bta/gatt/bta_gattc_api.cc | 17 +++++++-------- bta/gatt/bta_gattc_int.h | 6 ++--- bta/gatt/bta_gatts_api.cc | 8 +++---- bta/gatt/bta_gatts_int.h | 13 +++++------ bta/gatt/bta_gatts_utils.cc | 4 ++-- bta/hh/bta_hh_le.cc | 9 ++++---- bta/include/bta_gatt_api.h | 53 ++++++++++++++++----------------------------- 7 files changed, 46 insertions(+), 64 deletions(-) diff --git a/bta/gatt/bta_gattc_api.cc b/bta/gatt/bta_gattc_api.cc index cdba2dace..18d90795c 100644 --- a/bta/gatt/bta_gattc_api.cc +++ b/bta/gatt/bta_gattc_api.cc @@ -340,7 +340,7 @@ void BTA_GATTC_GetGattDb(uint16_t conn_id, uint16_t start_handle, * ******************************************************************************/ void BTA_GATTC_ReadCharacteristic(uint16_t conn_id, uint16_t handle, - tBTA_GATT_AUTH_REQ auth_req, + tGATT_AUTH_REQ auth_req, GATT_READ_OP_CB callback, void* cb_data) { tBTA_GATTC_API_READ* p_buf = (tBTA_GATTC_API_READ*)osi_calloc(sizeof(tBTA_GATTC_API_READ)); @@ -361,7 +361,7 @@ void BTA_GATTC_ReadCharacteristic(uint16_t conn_id, uint16_t handle, */ void BTA_GATTC_ReadUsingCharUuid(uint16_t conn_id, const Uuid& uuid, uint16_t s_handle, uint16_t e_handle, - tBTA_GATT_AUTH_REQ auth_req, + tGATT_AUTH_REQ auth_req, GATT_READ_OP_CB callback, void* cb_data) { tBTA_GATTC_API_READ* p_buf = (tBTA_GATTC_API_READ*)osi_calloc(sizeof(tBTA_GATTC_API_READ)); @@ -392,8 +392,8 @@ void BTA_GATTC_ReadUsingCharUuid(uint16_t conn_id, const Uuid& uuid, * ******************************************************************************/ void BTA_GATTC_ReadCharDescr(uint16_t conn_id, uint16_t handle, - tBTA_GATT_AUTH_REQ auth_req, - GATT_READ_OP_CB callback, void* cb_data) { + tGATT_AUTH_REQ auth_req, GATT_READ_OP_CB callback, + void* cb_data) { tBTA_GATTC_API_READ* p_buf = (tBTA_GATTC_API_READ*)osi_calloc(sizeof(tBTA_GATTC_API_READ)); @@ -421,7 +421,7 @@ void BTA_GATTC_ReadCharDescr(uint16_t conn_id, uint16_t handle, * ******************************************************************************/ void BTA_GATTC_ReadMultiple(uint16_t conn_id, tBTA_GATTC_MULTI* p_read_multi, - tBTA_GATT_AUTH_REQ auth_req) { + tGATT_AUTH_REQ auth_req) { tBTA_GATTC_API_READ_MULTI* p_buf = (tBTA_GATTC_API_READ_MULTI*)osi_calloc(sizeof(tBTA_GATTC_API_READ_MULTI)); @@ -454,7 +454,7 @@ void BTA_GATTC_ReadMultiple(uint16_t conn_id, tBTA_GATTC_MULTI* p_read_multi, void BTA_GATTC_WriteCharValue(uint16_t conn_id, uint16_t handle, tGATT_WRITE_TYPE write_type, std::vector value, - tBTA_GATT_AUTH_REQ auth_req, + tGATT_AUTH_REQ auth_req, GATT_WRITE_OP_CB callback, void* cb_data) { tBTA_GATTC_API_WRITE* p_buf = (tBTA_GATTC_API_WRITE*)osi_calloc( sizeof(tBTA_GATTC_API_WRITE) + value.size()); @@ -491,7 +491,7 @@ void BTA_GATTC_WriteCharValue(uint16_t conn_id, uint16_t handle, ******************************************************************************/ void BTA_GATTC_WriteCharDescr(uint16_t conn_id, uint16_t handle, std::vector value, - tBTA_GATT_AUTH_REQ auth_req, + tGATT_AUTH_REQ auth_req, GATT_WRITE_OP_CB callback, void* cb_data) { tBTA_GATTC_API_WRITE* p_buf = (tBTA_GATTC_API_WRITE*)osi_calloc( sizeof(tBTA_GATTC_API_WRITE) + value.size()); @@ -529,8 +529,7 @@ void BTA_GATTC_WriteCharDescr(uint16_t conn_id, uint16_t handle, * ******************************************************************************/ void BTA_GATTC_PrepareWrite(uint16_t conn_id, uint16_t handle, uint16_t offset, - std::vector value, - tBTA_GATT_AUTH_REQ auth_req, + std::vector value, tGATT_AUTH_REQ auth_req, GATT_WRITE_OP_CB callback, void* cb_data) { tBTA_GATTC_API_WRITE* p_buf = (tBTA_GATTC_API_WRITE*)osi_calloc( sizeof(tBTA_GATTC_API_WRITE) + value.size()); diff --git a/bta/gatt/bta_gattc_int.h b/bta/gatt/bta_gattc_int.h index 76ad40797..08fc2e3b5 100644 --- a/bta/gatt/bta_gattc_int.h +++ b/bta/gatt/bta_gattc_int.h @@ -95,7 +95,7 @@ typedef tBTA_GATTC_API_OPEN tBTA_GATTC_API_CANCEL_OPEN; typedef struct { BT_HDR hdr; - tBTA_GATT_AUTH_REQ auth_req; + tGATT_AUTH_REQ auth_req; // read by handle data uint16_t handle; @@ -112,7 +112,7 @@ typedef struct { typedef struct { BT_HDR hdr; - tBTA_GATT_AUTH_REQ auth_req; + tGATT_AUTH_REQ auth_req; uint16_t handle; tGATT_WRITE_TYPE write_type; uint16_t offset; @@ -148,7 +148,7 @@ typedef struct { typedef struct { BT_HDR hdr; - tBTA_GATT_AUTH_REQ auth_req; + tGATT_AUTH_REQ auth_req; uint8_t num_attr; uint16_t handles[GATT_MAX_READ_MULTI_HANDLES]; } tBTA_GATTC_API_READ_MULTI; diff --git a/bta/gatt/bta_gatts_api.cc b/bta/gatt/bta_gatts_api.cc index eed5ce1eb..223317db6 100644 --- a/bta/gatt/bta_gatts_api.cc +++ b/bta/gatt/bta_gatts_api.cc @@ -101,7 +101,7 @@ void BTA_GATTS_AppRegister(const bluetooth::Uuid& app_uuid, * Returns void * ******************************************************************************/ -void BTA_GATTS_AppDeregister(tBTA_GATTS_IF server_if) { +void BTA_GATTS_AppDeregister(tGATT_IF server_if) { tBTA_GATTS_API_DEREG* p_buf = (tBTA_GATTS_API_DEREG*)osi_malloc(sizeof(tBTA_GATTS_API_DEREG)); @@ -126,7 +126,7 @@ void BTA_GATTS_AppDeregister(tBTA_GATTS_IF server_if) { * service cannot be added. * ******************************************************************************/ -extern uint16_t BTA_GATTS_AddService(tBTA_GATTS_IF server_if, +extern uint16_t BTA_GATTS_AddService(tGATT_IF server_if, vector& service) { uint8_t rcb_idx = bta_gatts_find_app_rcb_idx_by_app_if(&bta_gatts_cb, server_if); @@ -278,7 +278,7 @@ void BTA_GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id, tGATT_STATUS status, * Returns void * ******************************************************************************/ -void BTA_GATTS_Open(tBTA_GATTS_IF server_if, const RawAddress& remote_bda, +void BTA_GATTS_Open(tGATT_IF server_if, const RawAddress& remote_bda, bool is_direct, tBTA_GATT_TRANSPORT transport) { tBTA_GATTS_API_OPEN* p_buf = (tBTA_GATTS_API_OPEN*)osi_malloc(sizeof(tBTA_GATTS_API_OPEN)); @@ -306,7 +306,7 @@ void BTA_GATTS_Open(tBTA_GATTS_IF server_if, const RawAddress& remote_bda, * Returns void * ******************************************************************************/ -void BTA_GATTS_CancelOpen(tBTA_GATTS_IF server_if, const RawAddress& remote_bda, +void BTA_GATTS_CancelOpen(tGATT_IF server_if, const RawAddress& remote_bda, bool is_direct) { tBTA_GATTS_API_CANCEL_OPEN* p_buf = (tBTA_GATTS_API_CANCEL_OPEN*)osi_malloc( sizeof(tBTA_GATTS_API_CANCEL_OPEN)); diff --git a/bta/gatt/bta_gatts_int.h b/bta/gatt/bta_gatts_int.h index 5af731104..7d9301e04 100644 --- a/bta/gatt/bta_gatts_int.h +++ b/bta/gatt/bta_gatts_int.h @@ -65,14 +65,14 @@ typedef struct { typedef struct { BT_HDR hdr; - tBTA_GATTS_IF server_if; + tGATT_IF server_if; } tBTA_GATTS_INT_START_IF; typedef tBTA_GATTS_INT_START_IF tBTA_GATTS_API_DEREG; typedef struct { BT_HDR hdr; - tBTA_GATTS_IF server_if; + tGATT_IF server_if; btgatt_db_element_t* service; uint16_t count; } tBTA_GATTS_API_ADD_SERVICE; @@ -100,7 +100,7 @@ typedef struct { typedef struct { BT_HDR hdr; RawAddress remote_bda; - tBTA_GATTS_IF server_if; + tGATT_IF server_if; bool is_direct; tBTA_GATT_TRANSPORT transport; @@ -126,7 +126,7 @@ typedef struct { bool in_use; bluetooth::Uuid app_uuid; tBTA_GATTS_CBACK* p_cback; - tBTA_GATTS_IF gatt_if; + tGATT_IF gatt_if; } tBTA_GATTS_RCB; /* service registration control block */ @@ -175,10 +175,9 @@ extern void bta_gatts_open(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); extern void bta_gatts_cancel_open(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); extern void bta_gatts_close(tBTA_GATTS_CB* p_cb, tBTA_GATTS_DATA* p_msg); -extern tBTA_GATTS_RCB* bta_gatts_find_app_rcb_by_app_if( - tBTA_GATTS_IF server_if); +extern tBTA_GATTS_RCB* bta_gatts_find_app_rcb_by_app_if(tGATT_IF server_if); extern uint8_t bta_gatts_find_app_rcb_idx_by_app_if(tBTA_GATTS_CB* p_cb, - tBTA_GATTS_IF server_if); + tGATT_IF server_if); extern uint8_t bta_gatts_alloc_srvc_cb(tBTA_GATTS_CB* p_cb, uint8_t rcb_idx); extern tBTA_GATTS_SRVC_CB* bta_gatts_find_srvc_cb_by_srvc_id( tBTA_GATTS_CB* p_cb, uint16_t service_id); diff --git a/bta/gatt/bta_gatts_utils.cc b/bta/gatt/bta_gatts_utils.cc index ed86f3aa8..315b22738 100644 --- a/bta/gatt/bta_gatts_utils.cc +++ b/bta/gatt/bta_gatts_utils.cc @@ -62,7 +62,7 @@ uint8_t bta_gatts_alloc_srvc_cb(tBTA_GATTS_CB* p_cb, uint8_t rcb_idx) { * Returns pointer to the control block if success, otherwise NULL * ******************************************************************************/ -tBTA_GATTS_RCB* bta_gatts_find_app_rcb_by_app_if(tBTA_GATTS_IF server_if) { +tBTA_GATTS_RCB* bta_gatts_find_app_rcb_by_app_if(tGATT_IF server_if) { uint8_t i; tBTA_GATTS_RCB* p_reg; @@ -85,7 +85,7 @@ tBTA_GATTS_RCB* bta_gatts_find_app_rcb_by_app_if(tBTA_GATTS_IF server_if) { ******************************************************************************/ uint8_t bta_gatts_find_app_rcb_idx_by_app_if(tBTA_GATTS_CB* p_cb, - tBTA_GATTS_IF server_if) { + tGATT_IF server_if) { uint8_t i; for (i = 0; i < BTA_GATTS_MAX_APP_NUM; i++) { diff --git a/bta/hh/bta_hh_le.cc b/bta/hh/bta_hh_le.cc index 4dc748954..4dc0019d6 100644 --- a/bta/hh/bta_hh_le.cc +++ b/bta/hh/bta_hh_le.cc @@ -174,28 +174,27 @@ static void gatt_execute_next_op(uint16_t conn_id) { if (op.type == GATT_READ_CHAR) { act_read_cb = op.read_cb; act_read_cb_data = op.read_cb_data; - BTA_GATTC_ReadCharacteristic(conn_id, op.handle, BTA_GATT_AUTH_REQ_NONE, + BTA_GATTC_ReadCharacteristic(conn_id, op.handle, GATT_AUTH_REQ_NONE, gatt_read_op_finished, NULL); } else if (op.type == GATT_READ_DESC) { act_read_cb = op.read_cb; act_read_cb_data = op.read_cb_data; - BTA_GATTC_ReadCharDescr(conn_id, op.handle, BTA_GATT_AUTH_REQ_NONE, + BTA_GATTC_ReadCharDescr(conn_id, op.handle, GATT_AUTH_REQ_NONE, gatt_read_op_finished, NULL); } else if (op.type == GATT_WRITE_CHAR) { act_write_cb = op.write_cb; act_write_cb_data = op.write_cb_data; BTA_GATTC_WriteCharValue(conn_id, op.handle, op.write_type, - std::move(op.value), BTA_GATT_AUTH_REQ_NONE, + std::move(op.value), GATT_AUTH_REQ_NONE, gatt_write_op_finished, NULL); } else if (op.type == GATT_WRITE_DESC) { act_write_cb = op.write_cb; act_write_cb_data = op.write_cb_data; BTA_GATTC_WriteCharDescr(conn_id, op.handle, std::move(op.value), - BTA_GATT_AUTH_REQ_NONE, gatt_write_op_finished, - NULL); + GATT_AUTH_REQ_NONE, gatt_write_op_finished, NULL); } gatt_ops.pop_front(); diff --git a/bta/include/bta_gatt_api.h b/bta/include/bta_gatt_api.h index 38fc9d3bd..8c5219062 100644 --- a/bta/include/bta_gatt_api.h +++ b/bta/include/bta_gatt_api.h @@ -100,17 +100,6 @@ typedef struct { uint16_t handles[BTA_GATTC_MULTI_MAX]; } tBTA_GATTC_MULTI; -#define BTA_GATT_AUTH_REQ_NONE GATT_AUTH_REQ_NONE -#define BTA_GATT_AUTH_REQ_NO_MITM \ - GATT_AUTH_REQ_NO_MITM /* unauthenticated encryption */ -#define BTA_GATT_AUTH_REQ_MITM \ - GATT_AUTH_REQ_MITM /* authenticated encryption \ - */ -#define BTA_GATT_AUTH_REQ_SIGNED_NO_MITM GATT_AUTH_REQ_SIGNED_NO_MITM -#define BTA_GATT_AUTH_REQ_SIGNED_MITM GATT_AUTH_REQ_SIGNED_MITM - -typedef tGATT_AUTH_REQ tBTA_GATT_AUTH_REQ; - enum { BTA_GATTC_ATTR_TYPE_INCL_SRVC, BTA_GATTC_ATTR_TYPE_CHAR, @@ -283,7 +272,6 @@ typedef void(tBTA_GATTC_CBACK)(tBTA_GATTC_EVT event, tBTA_GATTC* p_data); #define BTA_GATTS_CONN_UPDATE_EVT 22 typedef uint8_t tBTA_GATTS_EVT; -typedef tGATT_IF tBTA_GATTS_IF; /* Attribute permissions */ @@ -368,13 +356,13 @@ typedef struct { } tBTA_GATTS_REQ; typedef struct { - tBTA_GATTS_IF server_if; + tGATT_IF server_if; tGATT_STATUS status; bluetooth::Uuid uuid; } tBTA_GATTS_REG_OPER; typedef struct { - tBTA_GATTS_IF server_if; + tGATT_IF server_if; uint16_t service_id; uint16_t svc_instance; bool is_primary; @@ -383,13 +371,13 @@ typedef struct { } tBTA_GATTS_CREATE; typedef struct { - tBTA_GATTS_IF server_if; + tGATT_IF server_if; uint16_t service_id; tGATT_STATUS status; } tBTA_GATTS_SRVC_OPER; typedef struct { - tBTA_GATTS_IF server_if; + tGATT_IF server_if; RawAddress remote_bda; uint16_t conn_id; tBTA_GATT_REASON reason; /* report disconnect reason */ @@ -407,7 +395,7 @@ typedef struct { } tBTA_GATTS_CONF; typedef struct { - tBTA_GATTS_IF server_if; + tGATT_IF server_if; uint16_t conn_id; uint8_t tx_phy; uint8_t rx_phy; @@ -415,7 +403,7 @@ typedef struct { } tBTA_GATTS_PHY_UPDATE; typedef struct { - tBTA_GATTS_IF server_if; + tGATT_IF server_if; uint16_t conn_id; uint16_t interval; uint16_t latency; @@ -679,7 +667,7 @@ typedef void (*GATT_WRITE_OP_CB)(uint16_t conn_id, tGATT_STATUS status, * ******************************************************************************/ void BTA_GATTC_ReadCharacteristic(uint16_t conn_id, uint16_t handle, - tBTA_GATT_AUTH_REQ auth_req, + tGATT_AUTH_REQ auth_req, GATT_READ_OP_CB callback, void* cb_data); /** @@ -688,7 +676,7 @@ void BTA_GATTC_ReadCharacteristic(uint16_t conn_id, uint16_t handle, */ void BTA_GATTC_ReadUsingCharUuid(uint16_t conn_id, const bluetooth::Uuid& uuid, uint16_t s_handle, uint16_t e_handle, - tBTA_GATT_AUTH_REQ auth_req, + tGATT_AUTH_REQ auth_req, GATT_READ_OP_CB callback, void* cb_data); /******************************************************************************* @@ -704,8 +692,8 @@ void BTA_GATTC_ReadUsingCharUuid(uint16_t conn_id, const bluetooth::Uuid& uuid, * ******************************************************************************/ void BTA_GATTC_ReadCharDescr(uint16_t conn_id, uint16_t handle, - tBTA_GATT_AUTH_REQ auth_req, - GATT_READ_OP_CB callback, void* cb_data); + tGATT_AUTH_REQ auth_req, GATT_READ_OP_CB callback, + void* cb_data); /******************************************************************************* * @@ -723,8 +711,7 @@ void BTA_GATTC_ReadCharDescr(uint16_t conn_id, uint16_t handle, ******************************************************************************/ void BTA_GATTC_WriteCharValue(uint16_t conn_id, uint16_t handle, tGATT_WRITE_TYPE write_type, - vector value, - tBTA_GATT_AUTH_REQ auth_req, + vector value, tGATT_AUTH_REQ auth_req, GATT_WRITE_OP_CB callback, void* cb_data); /******************************************************************************* @@ -741,8 +728,7 @@ void BTA_GATTC_WriteCharValue(uint16_t conn_id, uint16_t handle, * ******************************************************************************/ void BTA_GATTC_WriteCharDescr(uint16_t conn_id, uint16_t handle, - vector value, - tBTA_GATT_AUTH_REQ auth_req, + vector value, tGATT_AUTH_REQ auth_req, GATT_WRITE_OP_CB callback, void* cb_data); /******************************************************************************* @@ -810,7 +796,7 @@ extern tGATT_STATUS BTA_GATTC_DeregisterForNotifications( ******************************************************************************/ extern void BTA_GATTC_PrepareWrite(uint16_t conn_id, uint16_t handle, uint16_t offset, vector value, - tBTA_GATT_AUTH_REQ auth_req, + tGATT_AUTH_REQ auth_req, GATT_WRITE_OP_CB callback, void* cb_data); /******************************************************************************* @@ -843,7 +829,7 @@ extern void BTA_GATTC_ExecuteWrite(uint16_t conn_id, bool is_execute); ******************************************************************************/ extern void BTA_GATTC_ReadMultiple(uint16_t conn_id, tBTA_GATTC_MULTI* p_read_multi, - tBTA_GATT_AUTH_REQ auth_req); + tGATT_AUTH_REQ auth_req); /******************************************************************************* * @@ -930,7 +916,7 @@ extern void BTA_GATTS_AppRegister(const bluetooth::Uuid& app_uuid, * Returns void * ******************************************************************************/ -extern void BTA_GATTS_AppDeregister(tBTA_GATTS_IF server_if); +extern void BTA_GATTS_AppDeregister(tGATT_IF server_if); /******************************************************************************* * @@ -947,7 +933,7 @@ extern void BTA_GATTS_AppDeregister(tBTA_GATTS_IF server_if); * service cannot be added. * ******************************************************************************/ -extern uint16_t BTA_GATTS_AddService(tBTA_GATTS_IF server_if, +extern uint16_t BTA_GATTS_AddService(tGATT_IF server_if, vector& service); /******************************************************************************* @@ -1029,9 +1015,8 @@ extern void BTA_GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id, * Returns void * ******************************************************************************/ -extern void BTA_GATTS_Open(tBTA_GATTS_IF server_if, - const RawAddress& remote_bda, bool is_direct, - tBTA_GATT_TRANSPORT transport); +extern void BTA_GATTS_Open(tGATT_IF server_if, const RawAddress& remote_bda, + bool is_direct, tBTA_GATT_TRANSPORT transport); /******************************************************************************* * @@ -1047,7 +1032,7 @@ extern void BTA_GATTS_Open(tBTA_GATTS_IF server_if, * Returns void * ******************************************************************************/ -extern void BTA_GATTS_CancelOpen(tBTA_GATTS_IF server_if, +extern void BTA_GATTS_CancelOpen(tGATT_IF server_if, const RawAddress& remote_bda, bool is_direct); /******************************************************************************* -- 2.11.0