Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86ad542e authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Remove unnecesary BTA redefinitions for GATT part 3 

Test: compilation test
Change-Id: I8d4b8cfd35fcb5ccd7067f1e02dedd1a58efa3ad
parent 46b950d7

system/bta/gatt/bta_gattc_api.cc

+8 −9
Original line number Diff line number Diff line
@@ -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<uint8_t> 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<uint8_t> 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<uint8_t> value,

                            tBTA_GATT_AUTH_REQ auth_req,

                            std::vector<uint8_t> 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());

system/bta/gatt/bta_gattc_int.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

system/bta/gatt/bta_gatts_api.cc

+4 −4
Original line number Diff line number Diff line
@@ -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<btgatt_db_element_t>& 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));

system/bta/gatt/bta_gatts_int.h

+6 −7
Original line number Diff line number Diff line
@@ -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);

system/bta/gatt/bta_gatts_utils.cc

+2 −2
Original line number Diff line number Diff line
@@ -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++) {