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

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

Merge "config: Remove TraceConf key from config" into main

parents 7affa558 10045d8e

system/bta/le_audio/le_audio_client_test.cc

+0 −2
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ void invoke_switch_codec_cb(bool is_low_latency_buffer_size) {} 
void invoke_switch_buffer_size_cb(bool is_low_latency_buffer_size) {}



const std::string kSmpOptions("mock smp options");

bool get_trace_config_enabled(void) { return false; }

bool get_pts_avrcp_test(void) { return false; }

bool get_pts_secure_only_mode(void) { return false; }

bool get_pts_conn_updates_disabled(void) { return false; }
@@ -189,7 +188,6 @@ bool get_pts_le_audio_disable_ases_before_stopping(void) { return false; } 
config_t* get_all(void) { return nullptr; }



stack_config_t mock_stack_config{

    .get_trace_config_enabled = get_trace_config_enabled,

    .get_pts_avrcp_test = get_pts_avrcp_test,

    .get_pts_secure_only_mode = get_pts_secure_only_mode,

    .get_pts_conn_updates_disabled = get_pts_conn_updates_disabled,

system/conf/bt_stack.conf

+0 −5
Original line number Diff line number Diff line 
# Enable trace level reconfiguration function

# Must be present before any TRC_ trace level settings

TraceConf=true



# This is Log configuration for new C++ code using LOG() macros.

# See libchrome/base/logging.h for description on how to configure your logs.

# sample configuration:
@@ -91,7 +87,6 @@ TraceConf=true 
#  SMP_NUMERIC_COMPAR_FAIL = 12

#PTS_SmpFailureCase=0





# PTS Broadcast audio configuration option

# Option:

# lc3_stereo_48_1_2

system/internal_include/stack_config.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
static const char STACK_CONFIG_MODULE[] = "stack_config_module";



typedef struct {

  bool (*get_trace_config_enabled)(void);

  bool (*get_pts_avrcp_test)(void);

  bool (*get_pts_secure_only_mode)(void);

  bool (*get_pts_conn_updates_disabled)(void);

system/main/bte_logmsg.cc

+1 −8
Original line number Diff line number Diff line
@@ -21,20 +21,13 @@ 
#include <cstdarg>

#include <cstdint>



#include "internal_include/bt_trace.h"

#include "bt_trace.h"

#include "internal_include/stack_config.h"

#include "main/main_int.h"

#include "osi/include/log.h"



static future_t* init(void) {

  const stack_config_t* stack_config = stack_config_get_interface();

  if (!stack_config->get_trace_config_enabled()) {

    LOG_INFO("using compile default trace settings");

    return NULL;

  }



  init_cpp_logging(stack_config->get_all());



  return NULL;

}

system/main/stack_config.cc

+0 −7
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include "osi/include/log.h"



namespace {

const char* TRACE_CONFIG_ENABLED_KEY = "TraceConf";

const char* PTS_AVRCP_TEST = "PTS_AvrcpTest";

const char* PTS_SECURE_ONLY_MODE = "PTS_SecurePairOnly";

const char* PTS_LE_CONN_UPDATED_DISABLED = "PTS_DisableConnUpdates";
@@ -94,11 +93,6 @@ EXPORT_SYMBOL extern const module_t stack_config_module = { 
    .dependencies = {NULL}};



// Interface functions

static bool get_trace_config_enabled(void) {

  return config_get_bool(*config, CONFIG_DEFAULT_SECTION,

                         TRACE_CONFIG_ENABLED_KEY, false);

}



static bool get_pts_avrcp_test(void) {

  return config_get_bool(*config, CONFIG_DEFAULT_SECTION, PTS_AVRCP_TEST,

                         false);
@@ -211,7 +205,6 @@ static bool get_pts_le_audio_disable_ases_before_stopping(void) { 
static config_t* get_all(void) { return config.get(); }



const stack_config_t interface = {

    get_trace_config_enabled,

    get_pts_avrcp_test,

    get_pts_secure_only_mode,

    get_pts_conn_updates_disabled,