diff options
| author | Sharvil Nanavati <sharvil@google.com> | 2014-12-28 22:29:42 -0800 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-03-16 16:51:42 -0700 |
| commit | a330b102cc2f0b87919ff457563a3a722a73dd67 (patch) | |
| tree | ef849498281cae3243f58934795132112e0b22fe /main | |
| parent | 85273185da7e3fec7cd70fde10b79b237bde16c1 (diff) | |
| download | android_system_bt-a330b102cc2f0b87919ff457563a3a722a73dd67.tar.gz android_system_bt-a330b102cc2f0b87919ff457563a3a722a73dd67.tar.bz2 android_system_bt-a330b102cc2f0b87919ff457563a3a722a73dd67.zip | |
Collapse RFCOMM_INCLUDED and GAP_INCLUDED guards.
Both of these features are always available in bluedroid.
Diffstat (limited to 'main')
| -rw-r--r-- | main/bte_init.c | 12 | ||||
| -rw-r--r-- | main/bte_logmsg.c | 8 |
2 files changed, 0 insertions, 20 deletions
diff --git a/main/bte_init.c b/main/bte_init.c index 13820d4dc..450f5a149 100644 --- a/main/bte_init.c +++ b/main/bte_init.c @@ -31,17 +31,13 @@ #endif /* Include initialization functions definitions */ -#if (defined(RFCOMM_INCLUDED) && RFCOMM_INCLUDED == TRUE) #include "port_api.h" -#endif #if (defined(BNEP_INCLUDED) && BNEP_INCLUDED == TRUE) #include "bnep_api.h" #endif -#if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE) #include "gap_api.h" -#endif #if (defined(PAN_INCLUDED) && PAN_INCLUDED == TRUE) #include "pan_api.h" @@ -143,13 +139,7 @@ tBTA_JV_CB *bta_jv_cb_ptr = NULL; void BTE_InitStack(void) { /* Initialize the optional stack components */ - -/**************************** -** RFCOMM and its profiles ** -*****************************/ -#if (defined(RFCOMM_INCLUDED) && RFCOMM_INCLUDED == TRUE) RFCOMM_Init(); -#endif /* RFCOMM Included */ /************************** ** BNEP and its profiles ** @@ -179,9 +169,7 @@ void BTE_InitStack(void) /*********** ** Others ** ************/ -#if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE) GAP_Init(); -#endif /* GAP Included */ #if (defined(HID_HOST_INCLUDED) && HID_HOST_INCLUDED == TRUE) HID_HostInit(); diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c index ee99620d0..918deb605 100644 --- a/main/bte_logmsg.c +++ b/main/bte_logmsg.c @@ -34,9 +34,7 @@ #include "osi/include/log.h" #include "stack_config.h" -#if (RFCOMM_INCLUDED==TRUE) #include "port_api.h" -#endif #if (AVCT_INCLUDED==TRUE) #include "avct_api.h" #endif @@ -56,9 +54,7 @@ #include "bnep_api.h" #endif #include "btm_api.h" -#if (GAP_INCLUDED==TRUE) #include "gap_api.h" -#endif #if (PAN_INCLUDED==TRUE) #include "pan_api.h" #endif @@ -146,9 +142,7 @@ static uint8_t BTU_SetTraceLevel(uint8_t new_level); 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}, -#if (RFCOMM_INCLUDED==TRUE) {BTTRC_ID_STK_RFCOMM, BTTRC_ID_STK_RFCOMM_DATA, PORT_SetTraceLevel, "TRC_RFCOMM", DEFAULT_CONF_TRACE_LEVEL}, -#endif #if (AVCT_INCLUDED==TRUE) //{BTTRC_ID_STK_AVCT, BTTRC_ID_STK_AVCT, NULL, "TRC_AVCT", DEFAULT_CONF_TRACE_LEVEL}, #endif @@ -168,9 +162,7 @@ static tBTTRC_FUNC_MAP bttrc_set_level_map[] = { {BTTRC_ID_STK_BNEP, BTTRC_ID_STK_BNEP, BNEP_SetTraceLevel, "TRC_BNEP", DEFAULT_CONF_TRACE_LEVEL}, #endif {BTTRC_ID_STK_BTM_ACL, BTTRC_ID_STK_BTM_SEC, BTM_SetTraceLevel, "TRC_BTM", DEFAULT_CONF_TRACE_LEVEL}, -#if (GAP_INCLUDED==TRUE) {BTTRC_ID_STK_GAP, BTTRC_ID_STK_GAP, GAP_SetTraceLevel, "TRC_GAP", DEFAULT_CONF_TRACE_LEVEL}, -#endif #if (PAN_INCLUDED==TRUE) {BTTRC_ID_STK_PAN, BTTRC_ID_STK_PAN, PAN_SetTraceLevel, "TRC_PAN", DEFAULT_CONF_TRACE_LEVEL}, #endif |