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

Commit d8e815c2 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Andre Eisenbach
Browse files

Rename bt_bdaddr_t into RawAddress (3/3) 

Test: compilation test
Change-Id: I4571721a0c6165a66450ee157a53d8d15bfc45d0
parent 6075dece

system/bta/ag/bta_ag_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) { 
 *

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

void bta_ag_start_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) {

  bt_bdaddr_t pending_bd_addr;

  RawAddress pending_bd_addr;



  /* store parameters */

  if (p_data) {
@@ -501,7 +501,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, tBTA_AG_DATA* p_data) { 
  uint16_t lcid;

  int i;

  tBTA_AG_SCB *ag_scb, *other_scb;

  bt_bdaddr_t dev_addr;

  RawAddress dev_addr;

  int status;



  /* set role */

system/bta/ag/bta_ag_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ void BTA_AgDeregister(uint16_t handle) { 
 * Returns          void

 *

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

void BTA_AgOpen(uint16_t handle, const bt_bdaddr_t& bd_addr, tBTA_SEC sec_mask,

void BTA_AgOpen(uint16_t handle, const RawAddress& bd_addr, tBTA_SEC sec_mask,

                tBTA_SERVICE_MASK services) {

  tBTA_AG_API_OPEN* p_buf =

      (tBTA_AG_API_OPEN*)osi_malloc(sizeof(tBTA_AG_API_OPEN));

system/bta/ag/bta_ag_int.h

+4 −5
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ typedef struct { 
/* data type for BTA_AG_API_OPEN_EVT */

typedef struct {

  BT_HDR hdr;

  bt_bdaddr_t bd_addr;

  RawAddress bd_addr;

  tBTA_SERVICE_MASK services;

  tBTA_SEC sec_mask;

} tBTA_AG_API_OPEN;
@@ -225,7 +225,7 @@ typedef struct { 
  char clip[BTA_AG_AT_MAX_LEN + 1];     /* number string used for CLIP */

  uint16_t serv_handle[BTA_AG_NUM_IDX]; /* RFCOMM server handles */

  tBTA_AG_AT_CB at_cb;                  /* AT command interpreter */

  bt_bdaddr_t peer_addr;                /* peer bd address */

  RawAddress peer_addr;                 /* peer bd address */

  tSDP_DISCOVERY_DB* p_disc_db;         /* pointer to discovery database */

  tBTA_SERVICE_MASK reg_services;       /* services specified in register API */

  tBTA_SERVICE_MASK open_services;      /* services specified in open API */
@@ -323,7 +323,7 @@ extern void bta_ag_scb_dealloc(tBTA_AG_SCB* p_scb); 
extern uint16_t bta_ag_scb_to_idx(tBTA_AG_SCB* p_scb);

extern tBTA_AG_SCB* bta_ag_scb_by_idx(uint16_t idx);

extern uint8_t bta_ag_service_to_idx(tBTA_SERVICE_MASK services);

extern uint16_t bta_ag_idx_by_bdaddr(const bt_bdaddr_t* peer_addr);

extern uint16_t bta_ag_idx_by_bdaddr(const RawAddress* peer_addr);

extern bool bta_ag_other_scb_open(tBTA_AG_SCB* p_curr_scb);

extern bool bta_ag_scb_open(tBTA_AG_SCB* p_curr_scb);

extern tBTA_AG_SCB* bta_ag_get_other_idle_scb(tBTA_AG_SCB* p_curr_scb);
@@ -331,8 +331,7 @@ extern void bta_ag_sm_execute(tBTA_AG_SCB* p_scb, uint16_t event, 
                              tBTA_AG_DATA* p_data);

extern bool bta_ag_hdl_event(BT_HDR* p_msg);

extern void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,

                                   uint8_t app_id,

                                   const bt_bdaddr_t* peer_addr);

                                   uint8_t app_id, const RawAddress* peer_addr);

extern void bta_ag_resume_open(tBTA_AG_SCB* p_scb);



/* SDP functions */

system/bta/ag/bta_ag_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ uint8_t bta_ag_service_to_idx(tBTA_SERVICE_MASK services) { 
 * Returns          Index of SCB or zero if none found.

 *

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

uint16_t bta_ag_idx_by_bdaddr(const bt_bdaddr_t* peer_addr) {

uint16_t bta_ag_idx_by_bdaddr(const RawAddress* peer_addr) {

  tBTA_AG_SCB* p_scb = &bta_ag_cb.scb[0];

  uint16_t i;
@@ -512,7 +512,7 @@ static void bta_ag_collision_timer_cback(void* data) { 
 ******************************************************************************/

void bta_ag_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, uint8_t id,

                            UNUSED_ATTR uint8_t app_id,

                            const bt_bdaddr_t* peer_addr) {

                            const RawAddress* peer_addr) {

  uint16_t handle;

  tBTA_AG_SCB* p_scb;

system/bta/ar/bta_ar.cc

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void bta_ar_init(void) { 
 * Returns          void

 *

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

static void bta_ar_avdt_cback(uint8_t handle, const bt_bdaddr_t* bd_addr,

static void bta_ar_avdt_cback(uint8_t handle, const RawAddress* bd_addr,

                              uint8_t event, tAVDT_CTRL* p_data) {

  /* route the AVDT registration callback to av or avk */

  if (bta_ar_cb.p_av_conn_cback)
@@ -153,7 +153,7 @@ void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id) { 
 * Returns          void

 *

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

void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const bt_bdaddr_t& bd_addr) {

void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr) {

  uint8_t event = BTA_AR_AVDT_CONN_EVT;

  tAVDT_CTRL data;