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

Commit bad4739a authored by Chris Manton's avatar Chris Manton
Browse files

Replace tBTA_TRANSPORT=>tBT_TRANSPORT 

No need for duplicate definitions

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If24d9028416ad972fc8acaf94f9c50eb66aea609
parent 3f719c3a

system/bta/dm/bta_dm_act.cc

+5 −5
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ void bta_dm_add_device(std::unique_ptr<tBTA_DM_API_ADD_DEVICE> msg) { 
/** This function forces to close the connection to a remote device and

 * optionaly remove the device from security database if required. */

void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev,

                      tBTA_TRANSPORT transport) {

                      tBT_TRANSPORT transport) {

  uint8_t index;



  APPL_TRACE_DEBUG("bta_dm_close_acl");
@@ -725,7 +725,7 @@ void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev, 


/** Bonds with peer device */

void bta_dm_bond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,

                 tBTA_TRANSPORT transport, int device_type) {

                 tBT_TRANSPORT transport, int device_type) {

  tBTA_DM_SEC sec_event;

  char* p_name;
@@ -1756,7 +1756,7 @@ static void bta_dm_discover_next_device(void) { 
 ******************************************************************************/

static void bta_dm_discover_device(const RawAddress& remote_bd_addr) {

  tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;

  if (bta_dm_search_cb.transport == BTA_TRANSPORT_UNKNOWN) {

  if (bta_dm_search_cb.transport == BT_TRANSPORT_UNKNOWN) {

    tBT_DEVICE_TYPE dev_type;

    tBLE_ADDR_TYPE addr_type;
@@ -1768,7 +1768,7 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
  }



  /* Reset transport state for next discovery */

  bta_dm_search_cb.transport = BTA_TRANSPORT_UNKNOWN;

  bta_dm_search_cb.transport = BT_TRANSPORT_UNKNOWN;



  VLOG(1) << __func__ << " BDA: " << remote_bd_addr;
@@ -3336,7 +3336,7 @@ void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport, 
}



/**This function to encrypt the link */

void bta_dm_set_encryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport,

void bta_dm_set_encryption(const RawAddress& bd_addr, tBT_TRANSPORT transport,

                           tBTA_DM_ENCRYPT_CBACK* p_callback,

                           tBTM_BLE_SEC_ACT sec_act) {

  uint8_t i;

system/bta/dm/bta_dm_api.cc

+5 −6
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ void BTA_DmDiscoverUUID(const RawAddress& bd_addr, const Uuid& uuid, 


/** This function initiates a bonding procedure with a peer device */

void BTA_DmBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,

                tBTA_TRANSPORT transport, int device_type) {

                tBT_TRANSPORT transport, int device_type) {

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_bond, bd_addr, addr_type,

                                          transport, device_type));

}
@@ -518,8 +518,7 @@ void BTA_DmSetBlePrefConnParams(const RawAddress& bd_addr, 
static void bta_dm_discover_send_msg(const RawAddress& bd_addr,

                                     tBTA_SERVICE_MASK_EXT* p_services,

                                     tBTA_DM_SEARCH_CBACK* p_cback,

                                     bool sdp_search,

                                     tBTA_TRANSPORT transport) {

                                     bool sdp_search, tBT_TRANSPORT transport) {

  const size_t len =

      p_services

          ? (sizeof(tBTA_DM_API_DISCOVER) + sizeof(Uuid) * p_services->num_uuid)
@@ -564,7 +563,7 @@ static void bta_dm_discover_send_msg(const RawAddress& bd_addr, 
void BTA_DmDiscoverByTransport(const RawAddress& bd_addr,

                               tBTA_SERVICE_MASK_EXT* p_services,

                               tBTA_DM_SEARCH_CBACK* p_cback, bool sdp_search,

                               tBTA_TRANSPORT transport) {

                               tBT_TRANSPORT transport) {

  bta_dm_discover_send_msg(bd_addr, p_services, p_cback, sdp_search, transport);

}
@@ -660,7 +659,7 @@ void BTA_DmBleSetDataLength(const RawAddress& remote_device, 
 * Returns          void

 *

 ******************************************************************************/

void BTA_DmSetEncryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport,

void BTA_DmSetEncryption(const RawAddress& bd_addr, tBT_TRANSPORT transport,

                         tBTA_DM_ENCRYPT_CBACK* p_callback,

                         tBTM_BLE_SEC_ACT sec_act) {

  APPL_TRACE_API("%s", __func__);
@@ -682,7 +681,7 @@ void BTA_DmSetEncryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport, 
 *

 ******************************************************************************/

void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev,

                    tBTA_TRANSPORT transport) {

                    tBT_TRANSPORT transport) {

  do_in_main_thread(

      FROM_HERE, base::Bind(bta_dm_close_acl, bd_addr, remove_dev, transport));

}

system/bta/dm/bta_dm_int.h

+5 −5
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ typedef struct { 
  tBTA_SERVICE_MASK services;

  tBTA_DM_SEARCH_CBACK* p_cback;

  bool sdp_search;

  tBTA_TRANSPORT transport;

  tBT_TRANSPORT transport;

  uint8_t num_uuid;

  bluetooth::Uuid* p_uuid;

  bluetooth::Uuid uuid;
@@ -351,7 +351,7 @@ typedef struct { 
  uint8_t peer_scn;

  bool sdp_search;

  bool cancel_pending; /* inquiry cancel is pending */

  tBTA_TRANSPORT transport;

  tBT_TRANSPORT transport;

  tBTA_DM_SEARCH_CBACK* p_scan_cback;

  tGATT_IF client_if;

  uint8_t num_uuid;
@@ -472,12 +472,12 @@ extern void bta_dm_set_dev_name(const std::vector<uint8_t>&); 
extern void bta_dm_set_visibility(tBTA_DM_DISC, tBTA_DM_CONN, uint8_t, uint8_t);

extern void bta_dm_set_scan_config(tBTA_DM_MSG* p_data);

extern void bta_dm_vendor_spec_command(tBTA_DM_MSG* p_data);

extern void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBTA_TRANSPORT, int);

extern void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBT_TRANSPORT, int);

extern void bta_dm_bond_cancel(const RawAddress&);

extern void bta_dm_pin_reply(std::unique_ptr<tBTA_DM_API_PIN_REPLY> msg);

extern void bta_dm_add_device(std::unique_ptr<tBTA_DM_API_ADD_DEVICE> msg);

extern void bta_dm_remove_device(const RawAddress& bd_addr);

extern void bta_dm_close_acl(const RawAddress&, bool, tBTA_TRANSPORT);

extern void bta_dm_close_acl(const RawAddress&, bool, tBT_TRANSPORT);



extern void bta_dm_pm_btm_status(const RawAddress&, tBTM_PM_STATUS, uint16_t,

                                 uint8_t);
@@ -506,7 +506,7 @@ extern void bta_dm_ble_set_data_length(const RawAddress&, uint16_t); 


extern void bta_dm_ble_get_energy_info(tBTA_BLE_ENERGY_INFO_CBACK*);



extern void bta_dm_set_encryption(const RawAddress&, tBTA_TRANSPORT,

extern void bta_dm_set_encryption(const RawAddress&, tBT_TRANSPORT,

                                  tBTA_DM_ENCRYPT_CBACK*, tBTM_BLE_SEC_ACT);

extern void bta_dm_confirm(const RawAddress&, bool);

system/bta/gatt/bta_gattc_act.cc

+7 −7
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ void bta_gattc_conn(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { 


  if (p_clcb->p_rcb) {

    /* there is no RM for GATT */

    if (p_clcb->transport == BTA_TRANSPORT_BR_EDR)

    if (p_clcb->transport == BT_TRANSPORT_BR_EDR)

      bta_sys_conn_open(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);



    bta_gattc_send_open_cback(p_clcb->p_rcb, GATT_SUCCESS, p_clcb->bda,
@@ -542,7 +542,7 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { 
  cb_data.close.status = p_clcb->status;

  cb_data.close.remote_bda = p_clcb->bda;



  if (p_clcb->transport == BTA_TRANSPORT_BR_EDR)

  if (p_clcb->transport == BT_TRANSPORT_BR_EDR)

    bta_sys_conn_close(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);



  bta_gattc_clcb_dealloc(p_clcb);
@@ -649,7 +649,7 @@ void bta_gattc_start_discover(tBTA_GATTC_CLCB* p_clcb, 
      p_clcb->p_srcb->update_count = 0;

      p_clcb->p_srcb->state = BTA_GATTC_SERV_DISC_ACT;



      if (p_clcb->transport == BTA_TRANSPORT_LE)

      if (p_clcb->transport == BT_TRANSPORT_LE)

        L2CA_EnableUpdateBleConnParams(p_clcb->p_srcb->server_bda, false);



      /* set all srcb related clcb into discovery ST */
@@ -683,7 +683,7 @@ void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB* p_clcb, 


  VLOG(1) << __func__ << ": conn_id=" << loghex(p_clcb->bta_conn_id);



  if (p_clcb->transport == BTA_TRANSPORT_LE)

  if (p_clcb->transport == BT_TRANSPORT_LE)

    L2CA_EnableUpdateBleConnParams(p_clcb->p_srcb->server_bda, true);

  p_clcb->p_srcb->state = BTA_GATTC_SERV_IDLE;

  p_clcb->disc_active = false;
@@ -837,7 +837,7 @@ void bta_gattc_confirm(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { 
    LOG(ERROR) << __func__ << ": to handle=" << loghex(handle) << " failed";

  } else {

    /* if over BR_EDR, inform PM for mode change */

    if (p_clcb->transport == BTA_TRANSPORT_BR_EDR) {

    if (p_clcb->transport == BT_TRANSPORT_BR_EDR) {

      bta_sys_busy(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);

      bta_sys_idle(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);

    }
@@ -1216,7 +1216,7 @@ void bta_gattc_process_indicate(uint16_t conn_id, tGATTC_OPTYPE op, 
  tBTA_GATTC_NOTIFY notify;

  RawAddress remote_bda;

  tGATT_IF gatt_if;

  tBTA_TRANSPORT transport;

  tBT_TRANSPORT transport;



  if (!GATT_GetConnectionInfor(conn_id, &gatt_if, remote_bda, &transport)) {

    LOG(ERROR) << __func__ << ": indication/notif for unknown app";
@@ -1298,7 +1298,7 @@ static void bta_gattc_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op, 
  }



  /* if over BR_EDR, inform PM for mode change */

  if (p_clcb->transport == BTA_TRANSPORT_BR_EDR) {

  if (p_clcb->transport == BT_TRANSPORT_BR_EDR) {

    bta_sys_busy(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);

    bta_sys_idle(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);

  }

system/bta/gatt/bta_gattc_cache.cc

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ tGATT_STATUS bta_gattc_discover_pri_service(uint16_t conn_id, 
  tBTA_GATTC_CLCB* p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);

  if (!p_clcb) return GATT_ERROR;



  if (p_clcb->transport == BTA_TRANSPORT_LE) {

  if (p_clcb->transport == BT_TRANSPORT_LE) {

    return GATTC_Discover(conn_id, disc_type, 0x0001, 0xFFFF);

  }