diff options
| author | YK Jeffrey Chao <jechao@broadcom.com> | 2012-08-24 11:47:04 -0700 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-08-24 15:45:44 -0700 |
| commit | 8ea28806bf5443ebf2e3449f810961ddbcf26d01 (patch) | |
| tree | bc53130b89568cbd8efdc485ac35926353e3ad07 | |
| parent | e9d957443d3e5d7427c5d09a306e2b5e99d26201 (diff) | |
| download | external_bluetooth_bluedroid-8ea28806bf5443ebf2e3449f810961ddbcf26d01.zip external_bluetooth_bluedroid-8ea28806bf5443ebf2e3449f810961ddbcf26d01.tar.gz external_bluetooth_bluedroid-8ea28806bf5443ebf2e3449f810961ddbcf26d01.tar.bz2 | |
Remove hardcoded trace level settings in stack modules.
BTM, BTU, and BTA modules were preset with hardcoded trace level
(BT_TRACE_LEVEL_DEBUG) during early development days. Since the trace levels
have been made configurable in /etc/bluetooth/bt_stack.conf at run-time,
removing those hardcoded settings.
So, the compile-time default trace level BT_TRACE_LEVEL_WARNING (set in
bt_trace.h) will be used if the bt_stack.conf is missing, or if the
TraceConf=false is given in the bt_stack.conf.
Change-Id: I76d905adbfda3c40f714398da86ebec90a1a8a40
| -rw-r--r-- | bta/sys/bta_sys_cfg.c | 2 | ||||
| -rw-r--r-- | stack/btm/btm_main.c | 2 | ||||
| -rw-r--r-- | stack/btu/btu_init.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/bta/sys/bta_sys_cfg.c b/bta/sys/bta_sys_cfg.c index 4d102ef..bf728cd 100644 --- a/bta/sys/bta_sys_cfg.c +++ b/bta/sys/bta_sys_cfg.c @@ -34,7 +34,7 @@ const tBTA_SYS_CFG bta_sys_cfg = BTA_MBOX_EVT, /* GKI mailbox event */ BTA_MBOX, /* GKI mailbox id */ BTA_TIMER, /* GKI timer id */ - BT_TRACE_LEVEL_DEBUG //TODO: Fix this - APPL_INITIAL_TRACE_LEVEL /* initial trace level */ + APPL_INITIAL_TRACE_LEVEL /* initial trace level */ }; tBTA_SYS_CFG *p_bta_sys_cfg = (tBTA_SYS_CFG *)&bta_sys_cfg; diff --git a/stack/btm/btm_main.c b/stack/btm/btm_main.c index 42489e1..67be0f2 100644 --- a/stack/btm/btm_main.c +++ b/stack/btm/btm_main.c @@ -43,8 +43,6 @@ void btm_init (void) #else btm_cb.trace_level = BT_TRACE_LEVEL_NONE; /* No traces */ #endif - /* TODO Bluedroid - Hardcoded trace level. Needs to be configurable */ - btm_cb.trace_level = BT_TRACE_LEVEL_DEBUG; /* Initialize BTM component structures */ btm_inq_db_init(); /* Inquiry Database and Structures */ btm_acl_init(); /* ACL Database and Structures */ diff --git a/stack/btu/btu_init.c b/stack/btu/btu_init.c index b1b7b2b..a153ed8 100644 --- a/stack/btu/btu_init.c +++ b/stack/btu/btu_init.c @@ -85,7 +85,7 @@ void BTE_Init(void) #if (BLE_INCLUDED == TRUE) btu_cb.hcit_ble_acl_pkt_size = BTU_DEFAULT_BLE_DATA_SIZE + HCI_DATA_PREAMBLE_SIZE; #endif - btu_cb.trace_level = BT_TRACE_LEVEL_DEBUG; //HCI_INITIAL_TRACE_LEVEL; + btu_cb.trace_level = HCI_INITIAL_TRACE_LEVEL; for ( i = 0; i < BTU_MAX_LOCAL_CTRLS; i++ ) /* include BR/EDR */ btu_cb.hci_cmd_cb[i].cmd_window = 1; |