diff options
author | Zach Johnson <zachoverflow@google.com> | 2014-10-20 13:06:52 -0700 |
---|---|---|
committer | Andre Eisenbach <eisenbach@google.com> | 2015-03-16 16:51:36 -0700 |
commit | e623c26bb2e14c2fa7cf76d55e51d93c1ac42782 (patch) | |
tree | 95807533b24ec274773b712ef746ee5d870be794 | |
parent | 86a56d303fdbed734549b181622ed74140113d2d (diff) | |
download | android_system_bt-e623c26bb2e14c2fa7cf76d55e51d93c1ac42782.tar.gz android_system_bt-e623c26bb2e14c2fa7cf76d55e51d93c1ac42782.tar.bz2 android_system_bt-e623c26bb2e14c2fa7cf76d55e51d93c1ac42782.zip |
Remove definitions for DUN
Missing header files, etc so it wouldn't compile anyway.
-rw-r--r-- | include/bt_target.h | 10 | ||||
-rw-r--r-- | include/bt_trace.h | 1 | ||||
-rw-r--r-- | main/bte_init.c | 8 | ||||
-rw-r--r-- | main/bte_logmsg.c | 8 | ||||
-rw-r--r-- | stack/include/bt_types.h | 1 | ||||
-rw-r--r-- | stack/include/dyn_mem.h | 4 |
6 files changed, 1 insertions, 31 deletions
diff --git a/include/bt_target.h b/include/bt_target.h index 4fb0c84e5..744dcac27 100644 --- a/include/bt_target.h +++ b/include/bt_target.h @@ -1629,16 +1629,6 @@ Note: This pool needs to have enough buffers to hold two times the window size /****************************************************************************** ** -** DUN and FAX -** -******************************************************************************/ - -#ifndef DUN_INCLUDED -#define DUN_INCLUDED FALSE -#endif - -/****************************************************************************** -** ** OPP ** ******************************************************************************/ diff --git a/include/bt_trace.h b/include/bt_trace.h index 37e7d7e67..62afb19fd 100644 --- a/include/bt_trace.h +++ b/include/bt_trace.h @@ -44,7 +44,6 @@ #define BTTRC_ID_STK_BTM_INQ 20 #define BTTRC_ID_STK_BTM_SCO 21 #define BTTRC_ID_STK_BTM_SEC 22 -#define BTTRC_ID_STK_DUN 23 #define BTTRC_ID_STK_HID 24 #define BTTRC_ID_STK_HSP2 25 #define BTTRC_ID_STK_CTP 26 diff --git a/main/bte_init.c b/main/bte_init.c index ab58b2c7a..bef720664 100644 --- a/main/bte_init.c +++ b/main/bte_init.c @@ -51,10 +51,6 @@ #include "spp_api.h" #endif -#if (defined(DUN_INCLUDED) && DUN_INCLUDED == TRUE) -#include "dun_api.h" -#endif - #if (defined(OPP_INCLUDED) && OPP_INCLUDED == TRUE) #include "opp_api.h" #endif /* OPP */ @@ -284,10 +280,6 @@ void BTE_InitStack(void) SPP_Init(); #endif /* SPP */ -#if (defined(DUN_INCLUDED) && DUN_INCLUDED == TRUE) - DUN_Init(); -#endif /* DUN */ - #if (defined(HSP2_INCLUDED) && HSP2_INCLUDED == TRUE) HSP2_Init(); #endif /* HSP2 */ diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c index 9733183b3..16209c5be 100644 --- a/main/bte_logmsg.c +++ b/main/bte_logmsg.c @@ -65,9 +65,6 @@ #include "bpp_api.h" #endif #include "btm_api.h" -#if (DUN_INCLUDED==TRUE) -#include "dun_api.h" -#endif #if (GAP_INCLUDED==TRUE) #include "gap_api.h" #endif @@ -118,7 +115,7 @@ static const char * const bt_layer_tags[] = { "bt-obex", "bt-btm", "bt-gap", - "bt-dun", + "UNUSED", "UNUSED", "bt-icp", "bt-hsp2", @@ -192,9 +189,6 @@ static tBTTRC_FUNC_MAP bttrc_set_level_map[] = { {BTTRC_ID_STK_BPP, BTTRC_ID_STK_BPP, BPP_SetTraceLevel, "TRC_BPP", DEFAULT_CONF_TRACE_LEVEL}, #endif {BTTRC_ID_STK_BTM_ACL, BTTRC_ID_STK_BTM_SEC, BTM_SetTraceLevel, "TRC_BTM", DEFAULT_CONF_TRACE_LEVEL}, -#if (DUN_INCLUDED==TRUE) - {BTTRC_ID_STK_DUN, BTTRC_ID_STK_DUN, DUN_SetTraceLevel, "TRC_DUN", DEFAULT_CONF_TRACE_LEVEL}, -#endif #if (GAP_INCLUDED==TRUE) {BTTRC_ID_STK_GAP, BTTRC_ID_STK_GAP, GAP_SetTraceLevel, "TRC_GAP", DEFAULT_CONF_TRACE_LEVEL}, #endif diff --git a/stack/include/bt_types.h b/stack/include/bt_types.h index 65c9fcc38..eaf9af4f7 100644 --- a/stack/include/bt_types.h +++ b/stack/include/bt_types.h @@ -565,7 +565,6 @@ typedef UINT8 tBT_DEVICE_TYPE; #define TRACE_LAYER_OBEX 0x000c0000 #define TRACE_LAYER_BTM 0x000d0000 #define TRACE_LAYER_GAP 0x000e0000 -#define TRACE_LAYER_DUN 0x000f0000 #define TRACE_LAYER_ICP 0x00110000 #define TRACE_LAYER_HSP2 0x00120000 #define TRACE_LAYER_SPP 0x00130000 diff --git a/stack/include/dyn_mem.h b/stack/include/dyn_mem.h index d1cfbcf8a..9c7793f69 100644 --- a/stack/include/dyn_mem.h +++ b/stack/include/dyn_mem.h @@ -111,10 +111,6 @@ #define CTP_DYNAMIC_MEMORY FALSE #endif -#ifndef DUN_DYNAMIC_MEMORY -#define DUN_DYNAMIC_MEMORY FALSE -#endif - #ifndef FTP_DYNAMIC_MEMORY #define FTP_DYNAMIC_MEMORY FALSE #endif |