diff options
| author | Sharvil Nanavati <sharvil@google.com> | 2014-12-29 10:24:15 -0800 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-03-16 16:51:42 -0700 |
| commit | 24ff5af9e40aaebc236bb6a16849c63bff0f23ba (patch) | |
| tree | 38f1362962b906d4a5575504120e01830a5471f8 /main | |
| parent | a330b102cc2f0b87919ff457563a3a722a73dd67 (diff) | |
| download | android_system_bt-24ff5af9e40aaebc236bb6a16849c63bff0f23ba.tar.gz android_system_bt-24ff5af9e40aaebc236bb6a16849c63bff0f23ba.tar.bz2 android_system_bt-24ff5af9e40aaebc236bb6a16849c63bff0f23ba.zip | |
Collapse more feature flags.
Start reviewing in include/bt_target.h.
Diffstat (limited to 'main')
| -rw-r--r-- | main/bte_init.c | 9 | ||||
| -rw-r--r-- | main/bte_logmsg.c | 11 |
2 files changed, 0 insertions, 20 deletions
diff --git a/main/bte_init.c b/main/bte_init.c index 450f5a149..e212f3900 100644 --- a/main/bte_init.c +++ b/main/bte_init.c @@ -43,9 +43,7 @@ #include "pan_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" @@ -71,9 +69,7 @@ #include "bta_api.h" #include "bta_sys.h" -#if BTA_AG_INCLUDED == TRUE #include "bta_ag_int.h" -#endif #if BTA_HS_INCLUDED == TRUE #include "bta_hs_int.h" @@ -161,9 +157,7 @@ void BTE_InitStack(void) #endif /* AADP */ -#if (defined(AVRC_INCLUDED) && AVRC_INCLUDED == TRUE) AVRC_Init(); -#endif /*********** @@ -188,10 +182,7 @@ void BTE_InitStack(void) memset((void*)bta_dm_search_cb_ptr, 0, sizeof(tBTA_DM_SEARCH_CB)); memset((void*)bta_dm_di_cb_ptr, 0, sizeof(tBTA_DM_DI_CB)); memset((void*)bta_prm_cb_ptr, 0, sizeof(tBTA_PRM_CB)); - -#if BTA_AG_INCLUDED == TRUE memset((void*)bta_ag_cb_ptr, 0, sizeof(tBTA_AG_CB)); -#endif #if BTA_HS_INCLUDED == TRUE memset((void*)bta_hs_cb_ptr, 0, sizeof(tBTA_HS_CB)); #endif diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c index 918deb605..d37cf5da2 100644 --- a/main/bte_logmsg.c +++ b/main/bte_logmsg.c @@ -26,7 +26,6 @@ #include "bte.h" #include "bta_api.h" -#include "bte_appl.h" #include "btu.h" #include "config.h" #include "gki.h" @@ -35,15 +34,10 @@ #include "stack_config.h" #include "port_api.h" -#if (AVCT_INCLUDED==TRUE) -#include "avct_api.h" -#endif #if (AVDT_INCLUDED==TRUE) #include "avdt_api.h" #endif -#if (AVRC_INCLUDED==TRUE) #include "avrc_api.h" -#endif #if (AVDT_INCLUDED==TRUE) #include "avdt_api.h" #endif @@ -143,15 +137,10 @@ 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, NULL, "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 -#if (AVRC_INCLUDED==TRUE) {BTTRC_ID_STK_AVRC, BTTRC_ID_STK_AVRC, AVRC_SetTraceLevel, "TRC_AVRC", DEFAULT_CONF_TRACE_LEVEL}, -#endif #if (AVDT_INCLUDED==TRUE) //{BTTRC_ID_AVDT_SCB, BTTRC_ID_AVDT_CCB, NULL, "TRC_AVDT_SCB", DEFAULT_CONF_TRACE_LEVEL}, #endif |