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

Commit eeefdcc4 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "system: Remove legacy trace_level variables" into main

parents 5914a6bd 8701b3ae

system/bta/av/bta_av_main.cc

+0 −2
Original line number Diff line number Diff line
@@ -1524,8 +1524,6 @@ const char* bta_av_evt_code(uint16_t evt_code) { 
}



void bta_debug_av_dump(int fd) {

  if (appl_trace_level < BT_TRACE_LEVEL_DEBUG) return;



  dprintf(fd, "\nBTA AV State:\n");

  dprintf(fd, "  State Machine State: %s\n", bta_av_st_code(bta_av_cb.state));

  dprintf(fd, "  SDP A2DP source handle: %d\n", bta_av_cb.sdp_a2dp_handle);

system/bta/hd/bta_hd_int.h

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ typedef struct { 
typedef struct {

  tBTA_HD_CBACK* p_cback;

  uint32_t sdp_handle;

  uint8_t trace_level;

  uint8_t state;

  RawAddress bd_addr;

  bool use_report_id;

system/bta/sys/bta_sys.h

+0 −7
Original line number Diff line number Diff line
@@ -224,13 +224,6 @@ typedef struct { 
  tBTA_SYS_DISABLE* disable;

} tBTA_SYS_REG;



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

 *  Global data

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



/* trace level */

extern uint8_t appl_trace_level;



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

 *  Macros

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

system/bta/sys/bta_sys_main.cc

+0 −5
Original line number Diff line number Diff line
@@ -45,11 +45,6 @@ void BTIF_dm_on_hw_error(); 
/* system manager control block definition */

tBTA_SYS_CB bta_sys_cb;



/* trace level */

/* TODO Hard-coded trace levels -  Needs to be configurable */

uint8_t appl_trace_level = APPL_INITIAL_TRACE_LEVEL;

uint8_t btif_trace_level = BT_TRACE_LEVEL_WARNING;



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

 *

 * Function         bta_sys_init

system/bta/test/bta_av_test.cc

+0 −4
Original line number Diff line number Diff line
@@ -51,17 +51,13 @@ struct alarm_t { 
  int any_value;

};



extern uint8_t appl_trace_level;



class BtaAvTest : public testing::Test {

 protected:

  void SetUp() override {

    reset_mock_function_count_map();

    bluetooth::common::InitFlags::SetAllForTesting();

    appl_trace_level = BT_TRACE_LEVEL_VERBOSE;

  }

  void TearDown() override {

    LOG_INFO("appl_trace_level:%hhu", appl_trace_level);

  }

};