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

Commit 824963f3 authored by Myles Watson's avatar Myles Watson
Browse files

Fix formatting after removing defines 

clang-format -i --style=file bta/*/* btif/*/* include/*

Test: mma -j32
Change-Id: I9ebb32f0cc5bd24a7cb2ae25699999aab5036b13
parent 0a2959e3

system/bta/dm/bta_dm_api.cc

+0 −4
Original line number Diff line number Diff line
@@ -610,7 +610,6 @@ void bta_dmexecutecallback(tBTA_DM_EXEC_CBACK* p_callback, void* p_param) { 
 ******************************************************************************/

void BTA_DmAddBleKey(BD_ADDR bd_addr, tBTA_LE_KEY_VALUE* p_le_key,

                     tBTA_LE_KEY_TYPE key_type) {



  tBTA_DM_API_ADD_BLEKEY* p_msg =

      (tBTA_DM_API_ADD_BLEKEY*)osi_calloc(sizeof(tBTA_DM_API_ADD_BLEKEY));
@@ -842,7 +841,6 @@ void BTA_DmSetBleAdvParams(uint16_t adv_int_min, uint16_t adv_int_max, 


  do_in_bta_thread(FROM_HERE, base::Bind(&bta_dm_ble_set_adv_params,

                                         adv_int_min, adv_int_max, nullptr));



}



/*******************************************************************************
@@ -1523,7 +1521,6 @@ void BTA_DmBleSetDataLength(BD_ADDR remote_device, uint16_t tx_data_length) { 
  bta_sys_sendmsg(p_msg);

}





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

 *

 * Function         BTA_DmSetEncryption
@@ -1659,4 +1656,3 @@ void BTA_VendorCleanup(void) { 


  if (cmn_ble_vsc_cb.adv_inst_max > 0) btm_ble_multi_adv_cleanup();

}

system/bta/dm/bta_dm_main.cc

+6 −10
Original line number Diff line number Diff line
@@ -150,8 +150,7 @@ const tBTA_DM_ACTION bta_dm_search_action[] = { 
                                          */

    bta_dm_disc_rmt_name,              /* 16 BTA_DM_DISC_RMT_NAME */

    bta_dm_di_disc,                    /* 17 BTA_DM_API_DI_DISCOVER */

    bta_dm_close_gatt_conn

};

    bta_dm_close_gatt_conn};



#define BTA_DM_SEARCH_IGNORE BTA_DM_SEARCH_NUM_ACTIONS

/* state table information */
@@ -183,8 +182,7 @@ const uint8_t bta_dm_search_idle_st_table[][BTA_DM_SEARCH_NUM_COLS] = { 
    /* API_DI_DISCOVER_EVT */ {BTA_DM_API_DI_DISCOVER, BTA_DM_SEARCH_IGNORE,

                               BTA_DM_SEARCH_ACTIVE},

    /* DISC_CLOSE_TOUT_EVT */

    {BTA_DM_CLOSE_GATT_CONN, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IDLE}

};

    {BTA_DM_CLOSE_GATT_CONN, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IDLE}};

const uint8_t bta_dm_search_search_active_st_table[][BTA_DM_SEARCH_NUM_COLS] = {



    /* Event                        Action 1
@@ -237,8 +235,7 @@ const uint8_t 
        /* API_DI_DISCOVER_EVT */ {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE,

                                   BTA_DM_SEARCH_CANCELLING},

        /* DISC_CLOSE_TOUT_EVT */

        {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_CANCELLING}

};

        {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_CANCELLING}};



const uint8_t bta_dm_search_disc_active_st_table[][BTA_DM_SEARCH_NUM_COLS] = {
@@ -263,8 +260,7 @@ const uint8_t bta_dm_search_disc_active_st_table[][BTA_DM_SEARCH_NUM_COLS] = { 
    /* API_DI_DISCOVER_EVT */ {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE,

                               BTA_DM_DISCOVER_ACTIVE},

    /* DISC_CLOSE_TOUT_EVT */

    {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_DISCOVER_ACTIVE}

};

    {BTA_DM_SEARCH_IGNORE, BTA_DM_SEARCH_IGNORE, BTA_DM_DISCOVER_ACTIVE}};



typedef const uint8_t (*tBTA_DM_ST_TBL)[BTA_DM_SEARCH_NUM_COLS];

system/btif/co/bta_av_co.cc

+21 −22
Original line number Diff line number Diff line
@@ -446,10 +446,9 @@ tA2DP_STATUS bta_av_co_audio_getconfig(tBTA_AV_HNDL hndl, uint8_t* p_codec_info, 
                         A2DP_CodecSepIndexStr(source_codec_sep_index));

        continue;

      }

      p_sink = bta_av_co_find_peer_sink_supports_codec(avdt_cfg.codec_info,

                                                       p_peer);

      if (p_sink == NULL)

        continue;

      p_sink =

          bta_av_co_find_peer_sink_supports_codec(avdt_cfg.codec_info, p_peer);

      if (p_sink == NULL) continue;

      // Found a preferred codec

      APPL_TRACE_DEBUG("%s: selected codec %s", __func__,

                       A2DP_CodecName(avdt_cfg.codec_info));
@@ -604,7 +603,8 @@ void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, const uint8_t* p_codec_info, 
      } else if ((num_protect == 1) && (!bta_av_co_cb.cp.active)) {

        reconfig_needed = true;

      }

      memcpy(bta_av_co_cb.codec_config_setconfig, p_codec_info, AVDT_CODEC_SIZE);

      memcpy(bta_av_co_cb.codec_config_setconfig, p_codec_info,

             AVDT_CODEC_SIZE);

      if (t_local_sep == AVDT_TSEP_SNK) {

        /*

         * If Peer is SRC, and our config subset matches with what is
@@ -903,8 +903,7 @@ static const tBTA_AV_CO_SINK* bta_av_co_find_peer_sink_supports_codec( 
    if (A2DP_CodecConfigMatchesCapabilities(codec_config,

                                            p_peer->sinks[index].codec_caps)) {

#if (BTA_AV_CO_CP_SCMS_T == TRUE)

      if (!bta_av_co_audio_sink_has_scmst(&p_peer->sinks[index]))

          continue;

      if (!bta_av_co_audio_sink_has_scmst(&p_peer->sinks[index])) continue;

#endif

      return &p_peer->sinks[index];

    }

system/btif/co/bta_dm_co.cc

+7 −7
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
#include "bta_dm_ci.h"

#include "bta_dm_co.h"

#include "bta_sys.h"

#include "bte_appl.h"

#include "btif_dm.h"

#include "osi/include/osi.h"

#include "bte_appl.h"



tBTE_APPL_CFG bte_appl_cfg = {

    BTA_LE_AUTH_REQ_SC_MITM_BOND,  // Authentication requirements
@@ -46,7 +46,8 @@ tBTE_APPL_CFG bte_appl_cfg = { 
 * Returns          true for success, false for fail.

 *

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

bool bta_dm_co_get_compress_memory(UNUSED_ATTR tBTA_SYS_ID id, UNUSED_ATTR uint8_t **memory_p,

bool bta_dm_co_get_compress_memory(UNUSED_ATTR tBTA_SYS_ID id,

                                   UNUSED_ATTR uint8_t** memory_p,

                                   UNUSED_ATTR uint32_t* memory_size) {

  return true;

}
@@ -115,8 +116,7 @@ void bta_dm_co_io_rsp(BD_ADDR bd_addr, tBTA_IO_CAP io_cap, 
 *

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

void bta_dm_co_lk_upgrade(UNUSED_ATTR BD_ADDR bd_addr,

                          UNUSED_ATTR bool *p_upgrade) {

}

                          UNUSED_ATTR bool* p_upgrade) {}



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

 *
@@ -316,7 +316,8 @@ void bta_dm_sco_co_out_data(BT_HDR** p_buf) { btui_sco_codec_readbuf(p_buf); } 
 * Returns          void.

 *

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

void bta_dm_co_le_io_key_req(UNUSED_ATTR BD_ADDR bd_addr, uint8_t* p_max_key_size,

void bta_dm_co_le_io_key_req(UNUSED_ATTR BD_ADDR bd_addr,

                             uint8_t* p_max_key_size,

                             tBTA_LE_KEY_TYPE* p_init_key,

                             tBTA_LE_KEY_TYPE* p_resp_key) {

  BTIF_TRACE_ERROR("##################################");
@@ -408,4 +409,3 @@ void bta_dm_co_ble_io_req(UNUSED_ATTR BD_ADDR bd_addr, tBTA_IO_CAP* p_io_cap, 
  if (bte_appl_cfg.ble_max_key_size > 7 && bte_appl_cfg.ble_max_key_size <= 16)

    *p_max_key_size = bte_appl_cfg.ble_max_key_size;

}

system/btif/co/bta_gatts_co.cc

+7 −7
Original line number Diff line number Diff line
@@ -101,9 +101,8 @@ void btif_gatts_add_bonded_dev_from_nv(BD_ADDR bda) { 
 * Returns          void.

 *

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

void bta_gatts_co_update_handle_range(UNUSED_ATTR bool is_add,

                                      UNUSED_ATTR tBTA_GATTS_HNDL_RANGE *p_hndl_range) {

}

void bta_gatts_co_update_handle_range(

    UNUSED_ATTR bool is_add, UNUSED_ATTR tBTA_GATTS_HNDL_RANGE* p_hndl_range) {}



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

 *
@@ -140,7 +139,8 @@ bool bta_gatts_co_srv_chg(UNUSED_ATTR tBTA_GATTS_SRV_CHG_CMD cmd, 
 * Returns          void.

 *

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

bool bta_gatts_co_load_handle_range(UNUSED_ATTR uint8_t index,

bool bta_gatts_co_load_handle_range(

    UNUSED_ATTR uint8_t index,

    UNUSED_ATTR tBTA_GATTS_HNDL_RANGE* p_handle_range) {

  return false;

}