diff options
| author | Mallikarjuna GB <gbmalli@codeaurora.org> | 2015-03-21 23:15:30 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:22:06 -0600 |
| commit | a4afb57a9bf3694155dc6daff754525b0a72deae (patch) | |
| tree | 2afba4a1be52417fc0f2c2142a89898b06d0de60 /main | |
| parent | 407d9a42f775ed49d6e4b10890919da116f907dc (diff) | |
| download | android_system_bt-a4afb57a9bf3694155dc6daff754525b0a72deae.tar.gz android_system_bt-a4afb57a9bf3694155dc6daff754525b0a72deae.tar.bz2 android_system_bt-a4afb57a9bf3694155dc6daff754525b0a72deae.zip | |
AV: Logging changes to properly set loglevel
- Control block and log level initialization
in BTA, AVDT and AVCT in proper place.
- Init functions for AVCT and AVDT
and call from stack init path.
Change-Id: I6056d5e9132330b4116a6d4410c2259ccc181109
Diffstat (limited to 'main')
| -rw-r--r-- | main/bte_init.c | 19 | ||||
| -rw-r--r-- | main/bte_logmsg.c | 6 |
2 files changed, 24 insertions, 1 deletions
diff --git a/main/bte_init.c b/main/bte_init.c index e212f3900..a84a6a960 100644 --- a/main/bte_init.c +++ b/main/bte_init.c @@ -43,7 +43,17 @@ #include "pan_api.h" #endif +#if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE) +#include "avdt_api.h" +#endif + +#if (defined(AVCT_INCLUDED) && AVCT_INCLUDED == TRUE) +#include "avct_api.h" +#endif + +#if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE) #include "avrc_api.h" +#endif #if (defined(A2D_INCLUDED) && A2D_INCLUDED == TRUE) #include "a2d_api.h" @@ -152,12 +162,21 @@ void BTE_InitStack(void) /************************** ** AVDT and its profiles ** ***************************/ +#if (defined(AVDT_INCLUDED) && AVDT_INCLUDED == TRUE) + AVDT_Init(); +#endif /* AVDT */ + #if (defined(A2D_INCLUDED) && A2D_INCLUDED == TRUE) A2D_Init(); #endif /* AADP */ +#if (defined(AVCT_INCLUDED) && AVCT_INCLUDED == TRUE) + AVCT_Init(); +#endif /* AVCT */ +#if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE) AVRC_Init(); +#endif /* AVRC */ /*********** diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c index 6bb15320e..16286bab2 100644 --- a/main/bte_logmsg.c +++ b/main/bte_logmsg.c @@ -144,6 +144,9 @@ static tBTTRC_FUNC_MAP bttrc_set_level_map[] = { {BTTRC_ID_STK_BTU, BTTRC_ID_STK_HCI, BTU_SetTraceLevel, "TRC_HCI", DEFAULT_CONF_TRACE_LEVEL}, {BTTRC_ID_STK_L2CAP, BTTRC_ID_STK_L2CAP, L2CA_SetTraceLevel, "TRC_L2CAP", DEFAULT_CONF_TRACE_LEVEL}, {BTTRC_ID_STK_RFCOMM, BTTRC_ID_STK_RFCOMM_DATA, PORT_SetTraceLevel, "TRC_RFCOMM", DEFAULT_CONF_TRACE_LEVEL}, +#if (AVCT_INCLUDED==TRUE) + {BTTRC_ID_STK_AVCT, BTTRC_ID_STK_AVCT, AVCT_SetTraceLevel, "TRC_AVCT", DEFAULT_CONF_TRACE_LEVEL}, +#endif #if (AVDT_INCLUDED==TRUE) {BTTRC_ID_STK_AVDT, BTTRC_ID_STK_AVDT, AVDT_SetTraceLevel, "TRC_AVDT", DEFAULT_CONF_TRACE_LEVEL}, #endif @@ -252,11 +255,12 @@ static void load_levels_from_config(const config_t *config) { assert(config != NULL); for (tBTTRC_FUNC_MAP *functions = &bttrc_set_level_map[0]; functions->trc_name; ++functions) { - LOG_INFO("BTE_InitTraceLevels -- %s", functions->trc_name); int value = config_get_int(config, CONFIG_DEFAULT_SECTION, functions->trc_name, -1); if (value != -1) functions->trace_level = value; + LOG_INFO("BTE_InitTraceLevels -- %s : Level %d", functions->trc_name, functions->trace_level); + if (functions->p_f) functions->p_f(functions->trace_level); } |