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

Commit f5e4ccdf authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Use bt_bdaddr_t instead of BD_ADDR in AVDT related code 

am: dd2802dc

Change-Id: I2fc7d8e2cc826afa2c210b68d2679f16651aa8bd
parents db32cbbe dd2802dc

system/bta/ar/bta_ar.cc

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

 *

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

static void bta_ar_avdt_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event,

                              tAVDT_CTRL* p_data) {

static void bta_ar_avdt_cback(uint8_t handle, const bt_bdaddr_t* 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)

    (*bta_ar_cb.p_av_conn_cback)(handle, bd_addr, event, p_data);
@@ -159,11 +159,11 @@ void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, BD_ADDR bd_addr) { 


  if (sys_id == BTA_ID_AV) {

    if (bta_ar_cb.p_avk_conn_cback) {

      (*bta_ar_cb.p_avk_conn_cback)(0, bd_addr, event, &data);

      (*bta_ar_cb.p_avk_conn_cback)(0, &from_BD_ADDR(bd_addr), event, &data);

    }

  } else if (sys_id == BTA_ID_AVK) {

    if (bta_ar_cb.p_av_conn_cback) {

      (*bta_ar_cb.p_av_conn_cback)(0, bd_addr, event, &data);

      (*bta_ar_cb.p_av_conn_cback)(0, &from_BD_ADDR(bd_addr), event, &data);

    }

  }

}

system/bta/av/bta_av_aact.cc

+76 −75

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/av/bta_av_act.cc

+43 −60

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/av/bta_av_api.cc

+4 −4
Original line number Diff line number Diff line
@@ -151,14 +151,14 @@ void BTA_AvDeregister(tBTA_AV_HNDL hndl) { 
 * Returns          void

 *

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

void BTA_AvOpen(BD_ADDR bd_addr, tBTA_AV_HNDL handle, bool use_rc,

void BTA_AvOpen(const bt_bdaddr_t& bd_addr, tBTA_AV_HNDL handle, bool use_rc,

                tBTA_SEC sec_mask, uint16_t uuid) {

  tBTA_AV_API_OPEN* p_buf =

      (tBTA_AV_API_OPEN*)osi_malloc(sizeof(tBTA_AV_API_OPEN));



  p_buf->hdr.event = BTA_AV_API_OPEN_EVT;

  p_buf->hdr.layer_specific = handle;

  bdcpy(p_buf->bd_addr, bd_addr);

  p_buf->bd_addr = bd_addr;

  p_buf->use_rc = use_rc;

  p_buf->sec_mask = sec_mask;

  p_buf->switch_res = BTA_AV_RS_NONE;
@@ -194,12 +194,12 @@ void BTA_AvClose(tBTA_AV_HNDL handle) { 
 * Returns          void

 *

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

void BTA_AvDisconnect(BD_ADDR bd_addr) {

void BTA_AvDisconnect(const bt_bdaddr_t& bd_addr) {

  tBTA_AV_API_DISCNT* p_buf =

      (tBTA_AV_API_DISCNT*)osi_malloc(sizeof(tBTA_AV_API_DISCNT));



  p_buf->hdr.event = BTA_AV_API_DISCONNECT_EVT;

  bdcpy(p_buf->bd_addr, bd_addr);

  p_buf->bd_addr = bd_addr;



  bta_sys_sendmsg(p_buf);

}

system/bta/av/bta_av_int.h

+13 −12
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ typedef bool (*tBTA_AV_CO_INIT)(btav_a2dp_codec_index_t codec_index, 
                                tAVDT_CFG* p_cfg);

typedef void (*tBTA_AV_CO_DISC_RES)(tBTA_AV_HNDL hndl, uint8_t num_seps,

                                    uint8_t num_snk, uint8_t num_src,

                                    BD_ADDR addr, uint16_t uuid_local);

                                    const bt_bdaddr_t& addr,

                                    uint16_t uuid_local);

typedef tA2DP_STATUS (*tBTA_AV_CO_GETCFG)(tBTA_AV_HNDL hndl,

                                          uint8_t* p_codec_info,

                                          uint8_t* p_sep_info_idx, uint8_t seid,
@@ -169,7 +170,7 @@ typedef tA2DP_STATUS (*tBTA_AV_CO_GETCFG)(tBTA_AV_HNDL hndl, 
                                          uint8_t* p_protect_info);

typedef void (*tBTA_AV_CO_SETCFG)(tBTA_AV_HNDL hndl,

                                  const uint8_t* p_codec_info, uint8_t seid,

                                  BD_ADDR addr, uint8_t num_protect,

                                  const bt_bdaddr_t& addr, uint8_t num_protect,

                                  const uint8_t* p_protect_info,

                                  uint8_t t_local_sep, uint8_t avdt_handle);

typedef void (*tBTA_AV_CO_OPEN)(tBTA_AV_HNDL hndl, uint16_t mtu);
@@ -224,7 +225,7 @@ typedef uint8_t tBTA_AV_RS_RES; 
/* data type for BTA_AV_API_OPEN_EVT */

typedef struct {

  BT_HDR hdr;

  BD_ADDR bd_addr;

  bt_bdaddr_t bd_addr;

  bool use_rc;

  tBTA_SEC sec_mask;

  tBTA_AV_RS_RES switch_res;
@@ -242,7 +243,7 @@ typedef struct { 
/* data type for BTA_AV_API_DISCONNECT_EVT */

typedef struct {

  BT_HDR hdr;

  BD_ADDR bd_addr;

  bt_bdaddr_t bd_addr;

} tBTA_AV_API_DISCNT;



/* data type for BTA_AV_API_PROTECT_REQ_EVT */
@@ -316,7 +317,7 @@ typedef struct { 
  BT_HDR hdr;

  tAVDT_CFG cfg;   /* configuration/capabilities parameters */

  tAVDT_CTRL msg;  /* AVDTP callback message parameters */

  BD_ADDR bd_addr; /* bd address */

  bt_bdaddr_t bd_addr; /* bd address */

  uint8_t handle;

  uint8_t avdt_event;

  bool initiator; /* true, if local device initiates the SUSPEND */
@@ -334,14 +335,14 @@ typedef struct { 
/* data type for BTA_AV_AVRC_OPEN_EVT, BTA_AV_AVRC_CLOSE_EVT */

typedef struct {

  BT_HDR hdr;

  BD_ADDR peer_addr;

  bt_bdaddr_t peer_addr;

  uint8_t handle;

} tBTA_AV_RC_CONN_CHG;



/* data type for BTA_AV_CONN_CHG_EVT */

typedef struct {

  BT_HDR hdr;

  BD_ADDR peer_addr;

  bt_bdaddr_t peer_addr;

  bool is_up;

} tBTA_AV_CONN_CHG;
@@ -453,7 +454,7 @@ typedef struct { 
  tAVDT_SEP_INFO sep_info[BTA_AV_NUM_SEPS]; /* stream discovery results */

  tAVDT_CFG cfg;                            /* local SEP configuration */

  alarm_t* avrc_ct_timer;                   /* delay timer for AVRC CT */

  BD_ADDR peer_addr;                        /* peer BD address */

  bt_bdaddr_t peer_addr;                    /* peer BD address */

  uint16_t l2c_cid;                         /* L2CAP channel ID */

  uint16_t stream_mtu;                      /* MTU of stream */

  uint16_t avdt_version;      /* the avdt version of peer device */
@@ -522,7 +523,7 @@ enum { BTA_AV_LCB_FREE, BTA_AV_LCB_FIND }; 


/* type for AV ACL Link control block */

typedef struct {

  BD_ADDR addr;     /* peer BD address */

  bt_bdaddr_t addr; /* peer BD address */

  uint8_t conn_msk; /* handle mask of connected stream handle */

  uint8_t lidx;     /* index + 1 */

} tBTA_AV_LCB;
@@ -595,8 +596,8 @@ extern tBTA_AV_SCB* bta_av_hndl_to_scb(uint16_t handle); 
extern bool bta_av_chk_start(tBTA_AV_SCB* p_scb);

extern void bta_av_restore_switch(void);

extern uint16_t bta_av_chk_mtu(tBTA_AV_SCB* p_scb, uint16_t mtu);

extern void bta_av_conn_cback(uint8_t handle, BD_ADDR bd_addr, uint8_t event,

                              tAVDT_CTRL* p_data);

extern void bta_av_conn_cback(uint8_t handle, const bt_bdaddr_t* bd_addr,

                              uint8_t event, tAVDT_CTRL* p_data);

extern uint8_t bta_av_rc_create(tBTA_AV_CB* p_cb, uint8_t role, uint8_t shdl,

                                uint8_t lidx);

extern void bta_av_stream_chg(tBTA_AV_SCB* p_scb, bool started);
@@ -605,7 +606,7 @@ extern bool bta_av_is_scb_incoming(tBTA_AV_SCB* p_scb); 
extern void bta_av_set_scb_sst_init(tBTA_AV_SCB* p_scb);

extern bool bta_av_is_scb_init(tBTA_AV_SCB* p_scb);

extern void bta_av_set_scb_sst_incoming(tBTA_AV_SCB* p_scb);

extern tBTA_AV_LCB* bta_av_find_lcb(BD_ADDR addr, uint8_t op);

extern tBTA_AV_LCB* bta_av_find_lcb(const bt_bdaddr_t& addr, uint8_t op);



/* main functions */

extern void bta_av_api_deregister(tBTA_AV_DATA* p_data);