diff options
| author | Zach Johnson <zachoverflow@google.com> | 2014-10-20 15:40:01 -0700 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-03-16 16:51:36 -0700 |
| commit | 8e90de46284238e551ad825fb00bda2bbc90ea1d (patch) | |
| tree | 54420ac881165d51b4168add8a0e1378ea8bca19 /main | |
| parent | 9df3c8cb90caea19b96a84aedec6f275b7b53b70 (diff) | |
| download | android_system_bt-8e90de46284238e551ad825fb00bda2bbc90ea1d.tar.gz android_system_bt-8e90de46284238e551ad825fb00bda2bbc90ea1d.tar.bz2 android_system_bt-8e90de46284238e551ad825fb00bda2bbc90ea1d.zip | |
Remove some remaining references to OBX
Android implements the Object Push Profile in java
against RFCOMM sockets with its own implementation of
OBX there.
OBX in Bluedroid isn't compiled, and is missing header files required
to compile it anyway. Removed a number of OBX related headers and updated
a few references where they were used out of place.
Change-Id: Ifaecfb6f85b1dca9055932886af484b6dc107fc1
Diffstat (limited to 'main')
| -rw-r--r-- | main/bte_init.c | 13 | ||||
| -rw-r--r-- | main/bte_logmsg.c | 6 |
2 files changed, 0 insertions, 19 deletions
diff --git a/main/bte_init.c b/main/bte_init.c index 94baf36e0..bc44aa1f4 100644 --- a/main/bte_init.c +++ b/main/bte_init.c @@ -35,10 +35,6 @@ #include "port_api.h" #endif -#if (defined(OBX_INCLUDED) && OBX_INCLUDED == TRUE) -#include "obx_api.h" -#endif - #if (defined(BNEP_INCLUDED) && BNEP_INCLUDED == TRUE) #include "bnep_api.h" #endif @@ -157,15 +153,6 @@ void BTE_InitStack(void) *****************************/ #if (defined(RFCOMM_INCLUDED) && RFCOMM_INCLUDED == TRUE) RFCOMM_Init(); - -/************************** -** OBEX and its profiles ** -***************************/ -#if (defined(OBX_INCLUDED) && OBX_INCLUDED == TRUE) - OBX_Init(); -#endif /* OBX */ - - #endif /* RFCOMM Included */ /************************** diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c index 5105a7de4..6d4c9bcde 100644 --- a/main/bte_logmsg.c +++ b/main/bte_logmsg.c @@ -37,9 +37,6 @@ #if (RFCOMM_INCLUDED==TRUE) #include "port_api.h" #endif -#if (OBX_INCLUDED==TRUE) -#include "obx_api.h" -#endif #if (AVCT_INCLUDED==TRUE) #include "avct_api.h" #endif @@ -152,9 +149,6 @@ static tBTTRC_FUNC_MAP bttrc_set_level_map[] = { #if (RFCOMM_INCLUDED==TRUE) {BTTRC_ID_STK_RFCOMM, BTTRC_ID_STK_RFCOMM_DATA, PORT_SetTraceLevel, "TRC_RFCOMM", DEFAULT_CONF_TRACE_LEVEL}, #endif -#if (OBX_INCLUDED==TRUE) - {BTTRC_ID_STK_OBEX, BTTRC_ID_STK_OBEX, OBX_SetTraceLevel, "TRC_OBEX", 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 |