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

Commit 42f9964c authored by Myles Watson's avatar Myles Watson
Browse files

Remove casts in bta/ and stack/btm 

Make pointers to const structs const pointers.
Pass complete unions instead of casting smaller objects.

Test: build
Change-Id: I7d6b61183554be70ac7f58f4133a76ec68e35408
parent 6f6f73b7

system/bta/av/bta_av_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -1797,7 +1797,7 @@ void bta_av_rc_disc_done(UNUSED_ATTR tBTA_AV_DATA* p_data) { 
      if (peer_rc_version <= AVRC_REV_1_3) {

        APPL_TRACE_DEBUG("%s Using AVRCP 1.3 Capabilities with remote device",

                         __func__);

        p_bta_av_cfg = (tBTA_AV_CFG*)&bta_av_cfg_compatibility;

        p_bta_av_cfg = &bta_av_cfg_compatibility;

      }

    }

  }

system/bta/av/bta_av_cfg.cc

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ const tBTA_AV_CFG bta_av_cfg_compatibility = { 
    BTA_AV_RC_TG_NAME  /* Default AVRCP target name */

};



tBTA_AV_CFG* p_bta_av_cfg = NULL;

const tBTA_AV_CFG* p_bta_av_cfg = NULL;



const uint16_t bta_av_rc_id[] = {

    0x0000, /* bit mask: 0=SELECT, 1=UP, 2=DOWN, 3=LEFT,

system/bta/av/bta_av_int.h

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ typedef struct { 
extern tBTA_AV_CB bta_av_cb;



/* config struct */

extern tBTA_AV_CFG* p_bta_av_cfg;

extern const tBTA_AV_CFG* p_bta_av_cfg;

extern const tBTA_AV_CFG bta_avk_cfg;

extern const tBTA_AV_CFG bta_av_cfg;

extern const tBTA_AV_CFG bta_av_cfg_compatibility;

system/bta/av/bta_av_main.cc

+3 −3
Original line number Diff line number Diff line
@@ -432,13 +432,13 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 


  uint16_t profile_initialized = p_data->api_reg.service_uuid;

  if (profile_initialized == UUID_SERVCLASS_AUDIO_SINK) {

    p_bta_av_cfg = (tBTA_AV_CFG*)&bta_avk_cfg;

    p_bta_av_cfg = &bta_avk_cfg;

  } else if (profile_initialized == UUID_SERVCLASS_AUDIO_SOURCE) {

    p_bta_av_cfg = (tBTA_AV_CFG*)&bta_av_cfg;

    p_bta_av_cfg = &bta_av_cfg;



    if (!strncmp(AVRCP_1_3_STRING, avrcp_version, sizeof(AVRCP_1_3_STRING))) {

      LOG_INFO(LOG_TAG, "AVRCP 1.3 capabilites used");

      p_bta_av_cfg = (tBTA_AV_CFG*)&bta_av_cfg_compatibility;

      p_bta_av_cfg = &bta_av_cfg_compatibility;

    }

  }

system/bta/dm/bta_dm_act.cc

+7 −9
Original line number Diff line number Diff line
@@ -256,17 +256,16 @@ extern DEV_CLASS local_device_default_class; 
 *

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

void bta_dm_enable(tBTA_DM_MSG* p_data) {

  tBTA_DM_ENABLE enable_event;



  /* if already in use, return an error */

  if (bta_dm_cb.is_bta_dm_active) {

    tBTA_DM_SEC enable_event;

    APPL_TRACE_WARNING("%s Device already started by another application",

                       __func__);

    memset(&enable_event, 0, sizeof(tBTA_DM_ENABLE));

    enable_event.status = BTA_FAILURE;

    memset(&enable_event, 0, sizeof(tBTA_DM_SEC));

    enable_event.enable.status = BTA_FAILURE;

    if (p_data->enable.p_sec_cback != NULL)

      p_data->enable.p_sec_cback(BTA_DM_ENABLE_EVT,

                                 (tBTA_DM_SEC*)&enable_event);

      p_data->enable.p_sec_cback(BTA_DM_ENABLE_EVT, &enable_event);

    return;

  }
@@ -425,7 +424,7 @@ static void bta_dm_sys_hw_cback(tBTA_SYS_HW_EVT status) { 
    }

    bta_dm_search_cb.conn_id = GATT_INVALID_CONN_ID;



    BTM_SecRegister((tBTM_APPL_INFO*)&bta_security);

    BTM_SecRegister(&bta_security);

    BTM_SetDefaultLinkSuperTout(p_bta_dm_cfg->link_timeout);

    BTM_WritePageTimeout(p_bta_dm_cfg->page_timeout);

    bta_dm_cb.cur_policy = p_bta_dm_cfg->policy_settings;
@@ -2958,7 +2957,7 @@ void bta_dm_acl_change(tBTA_DM_MSG* p_data) { 
        conn.role_chg.bd_addr = p_bda;

        conn.role_chg.new_role = (uint8_t)p_data->acl_change.new_role;

        if (bta_dm_cb.p_sec_cback)

          bta_dm_cb.p_sec_cback(BTA_DM_ROLE_CHG_EVT, (tBTA_DM_SEC*)&conn);

          bta_dm_cb.p_sec_cback(BTA_DM_ROLE_CHG_EVT, &conn);

      }

      return;

  }
@@ -3013,8 +3012,7 @@ void bta_dm_acl_change(tBTA_DM_MSG* p_data) { 
    APPL_TRACE_WARNING("%s info: 0x%x", __func__,

                       bta_dm_cb.device_list.peer_device[i].info);



    if (bta_dm_cb.p_sec_cback)

      bta_dm_cb.p_sec_cback(BTA_DM_LINK_UP_EVT, (tBTA_DM_SEC*)&conn);

    if (bta_dm_cb.p_sec_cback) bta_dm_cb.p_sec_cback(BTA_DM_LINK_UP_EVT, &conn);

  } else {

    for (i = 0; i < bta_dm_cb.device_list.count; i++) {

      if (bta_dm_cb.device_list.peer_device[i].peer_bdaddr != p_bda ||