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

Commit edcd92a3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "bta: Remove unsafe casts in BTA_AG"

parents 72a9441d a653ee0e

system/bta/ag/bta_ag_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ void bta_ag_svc_conn_open(tBTA_AG_SCB* p_scb, 
 ******************************************************************************/

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

  uint16_t len;

  tBTA_AG_CI_RX_WRITE* p_rx_write_msg = (tBTA_AG_CI_RX_WRITE*)p_data;

  tBTA_AG_CI_RX_WRITE* p_rx_write_msg = &p_data->ci_rx_write;

  char* p_data_area =

      (char*)(p_rx_write_msg + 1); /* Point to data area after header */

system/bta/ag/bta_ag_cfg.cc

+1 −1
Original line number Diff line number Diff line
@@ -75,4 +75,4 @@ const tBTA_AG_CFG bta_ag_cfg = {BTA_AG_CIND_INFO, BTA_AG_BIND_INFO, 
                                BTA_AG_SCO_PKT_TYPES,    BTA_AG_CHLD_VAL_ECC,

                                BTA_AG_CHLD_VAL};



tBTA_AG_CFG* p_bta_ag_cfg = (tBTA_AG_CFG*)&bta_ag_cfg;
 
const tBTA_AG_CFG* p_bta_ag_cfg = &bta_ag_cfg;

system/bta/ag/bta_ag_int.h

+2 −1
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ typedef union { 
  tBTA_AG_API_OPEN api_open;

  tBTA_AG_API_RESULT api_result;

  tBTA_AG_API_SETCODEC api_setcodec;

  tBTA_AG_API_SET_SCO_ALLOWED api_set_sco_allowed;

  tBTA_AG_DISC_RESULT disc_result;

  tBTA_AG_RFC rfc;

  tBTA_AG_CI_RX_WRITE ci_rx_write;
@@ -311,7 +312,7 @@ extern const tBTA_AG_AT_CMD* bta_ag_at_tbl[BTA_AG_NUM_IDX]; 
extern tBTA_AG_CB bta_ag_cb;



/* config struct */

extern tBTA_AG_CFG* p_bta_ag_cfg;

extern const tBTA_AG_CFG* p_bta_ag_cfg;

extern const tBTA_AG_HF_IND bta_ag_local_hf_ind_cfg[];



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

system/bta/ag/bta_ag_main.cc

+3 −3
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ static void bta_ag_api_disable(tBTA_AG_DATA* p_data) { 
 ******************************************************************************/

static void bta_ag_api_register(tBTA_AG_DATA* p_data) {

  tBTA_AG_SCB* p_scb;

  tBTA_AG_REGISTER reg;



  /* allocate an scb */

  p_scb = bta_ag_scb_alloc();
@@ -664,8 +663,9 @@ static void bta_ag_api_register(tBTA_AG_DATA* p_data) { 
    APPL_TRACE_DEBUG("bta_ag_api_register: p_scb 0x%08x ", p_scb);

    bta_ag_sm_execute(p_scb, p_data->hdr.event, p_data);

  } else {

    reg.status = BTA_AG_FAIL_RESOURCES;

    (*bta_ag_cb.p_cback)(BTA_AG_REGISTER_EVT, (tBTA_AG*)&reg);

    tBTA_AG bta_ag;

    bta_ag.reg.status = BTA_AG_FAIL_RESOURCES;

    (*bta_ag_cb.p_cback)(BTA_AG_REGISTER_EVT, &bta_ag);

  }

}

system/bta/ag/bta_ag_sco.cc

+1 −1
Original line number Diff line number Diff line
@@ -1363,7 +1363,7 @@ void bta_ag_ci_sco_data(UNUSED_ATTR tBTA_AG_SCB* p_scb, 
}



void bta_ag_set_sco_allowed(tBTA_AG_DATA* p_data) {

  sco_allowed = ((tBTA_AG_API_SET_SCO_ALLOWED*)p_data)->value;

  sco_allowed = p_data->api_set_sco_allowed.value;

  APPL_TRACE_DEBUG(sco_allowed ? "sco now allowed" : "sco now not allowed");

}