diff options
| -rw-r--r-- | bta/av/bta_av_cfg.c | 3 | ||||
| -rwxr-xr-x | btif/co/bta_ag_co.c | 1 | ||||
| -rw-r--r-- | include/bt_target.h | 86 | ||||
| -rw-r--r-- | include/bte_appl.h | 145 | ||||
| -rw-r--r-- | main/bte_init.c | 9 | ||||
| -rw-r--r-- | main/bte_logmsg.c | 11 | ||||
| -rw-r--r-- | stack/a2dp/a2d_sbc.c | 57 | ||||
| -rw-r--r-- | stack/btm/btm_int.h | 18 | ||||
| -rw-r--r-- | stack/btu/btu_hcif.c | 7 | ||||
| -rw-r--r-- | stack/btu/btu_task.c | 5 | ||||
| -rw-r--r-- | stack/include/hcidefs.h | 6 | ||||
| -rw-r--r-- | stack/sdp/sdp_main.c | 6 |
12 files changed, 3 insertions, 351 deletions
diff --git a/bta/av/bta_av_cfg.c b/bta/av/bta_av_cfg.c index 9eb8bd671..e2978c18b 100644 --- a/bta/av/bta_av_cfg.c +++ b/bta/av/bta_av_cfg.c @@ -46,7 +46,6 @@ const UINT32 bta_av_meta_caps_co_ids[] = { ** 3. GetCapabilities supported event_ids list ** 4. GetCapabilities supported event_ids count */ -#ifdef ANDROID_APP_INCLUDED /* Flushing partial avdtp packets can cause some headsets to disconnect the link if receiving partial a2dp frames */ const UINT16 bta_av_audio_flush_to[] = { @@ -80,8 +79,6 @@ const UINT8 bta_av_meta_caps_evt_ids[] = { #define BTA_AV_NUM_RC_EVT_IDS (sizeof(bta_av_meta_caps_evt_ids) / sizeof(bta_av_meta_caps_evt_ids[0])) #endif /* BTA_AV_NUM_RC_EVT_IDS */ -#endif /* ANDROID_APP_INCLUDED */ - /* the MTU for the AVRCP browsing channel */ #ifndef BTA_AV_MAX_RC_BR_MTU #define BTA_AV_MAX_RC_BR_MTU 1008 diff --git a/btif/co/bta_ag_co.c b/btif/co/bta_ag_co.c index 7072093f7..2092d5865 100755 --- a/btif/co/bta_ag_co.c +++ b/btif/co/bta_ag_co.c @@ -23,7 +23,6 @@ #include "bta_sys.h" #include "bta_ag_api.h" #include "bta_ag_co.h" -#include "bte_appl.h" #include "bt_utils.h" #ifndef LINUX_NATIVE diff --git a/include/bt_target.h b/include/bt_target.h index cc903d0f1..b3dc33c9e 100644 --- a/include/bt_target.h +++ b/include/bt_target.h @@ -23,9 +23,6 @@ #ifndef BUILDCFG #define BUILDCFG #endif -#include "bt_types.h" - -#ifdef BUILDCFG #if !defined(HAS_BDROID_BUILDCFG) && !defined(HAS_NO_BDROID_BUILDCFG) #error "An Android.mk file did not include bdroid_CFLAGS and possibly not bdorid_C_INCLUDES" @@ -35,12 +32,10 @@ #include "bdroid_buildcfg.h" #endif -#endif // BUILDCFG +#include "bt_types.h" /* This must be defined AFTER buildcfg.h */ /* Include common GKI definitions used by this platform */ #include "gki_target.h" - -#include "bt_types.h" /* This must be defined AFTER buildcfg.h */ #include "dyn_mem.h" /* defines static and/or dynamic memory for components */ //------------------Added from bdroid_buildcfg.h--------------------- @@ -64,10 +59,6 @@ #define BTA_INCLUDED TRUE #endif -#ifndef BTA_AG_INCLUDED -#define BTA_AG_INCLUDED TRUE -#endif - #ifndef BTA_PAN_INCLUDED #define BTA_PAN_INCLUDED TRUE #endif @@ -104,14 +95,6 @@ #define BTA_DISABLE_DELAY 200 /* in milliseconds */ #endif -#ifndef ANDROID_APP_INCLUDED -#define ANDROID_APP_INCLUDED TRUE -#endif - -#ifndef ANDROID_USE_LOGCAT -#define ANDROID_USE_LOGCAT TRUE -#endif - // If the next wakeup time is less than this threshold, we should acquire // a wakelock instead of setting a wake alarm so we're not bouncing in // and out of suspend frequently. @@ -380,13 +363,6 @@ ** HCI Services (H4) ** ******************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif /* Use 2 second for low-resolution systems, override to 1 for high-resolution systems */ #ifndef BT_1SEC_TIMEOUT @@ -405,10 +381,6 @@ extern "C" { ** BTM ** ******************************************************************************/ -/* Include inquiry code. */ -#ifndef BTM_INQUIRY_INCLUDED -#define BTM_INQUIRY_INCLUDED TRUE -#endif /* Cancel Inquiry on incoming SSP */ #ifndef BTM_NO_SSP_ON_INQUIRY @@ -430,11 +402,6 @@ extern "C" { #define BTM_WBS_INCLUDED FALSE /* TRUE includes WBS code */ #endif -/* Includes PCM2 support if TRUE */ -#ifndef BTM_PCM2_INCLUDED -#define BTM_PCM2_INCLUDED FALSE -#endif - /* This is used to work around a controller bug that doesn't like Disconnect ** issued while there is a role switch in progress */ @@ -636,12 +603,6 @@ extern "C" { ** ******************************************************************************/ -/* Flow control and retransmission mode */ - -#ifndef L2CAP_FCR_INCLUDED -#define L2CAP_FCR_INCLUDED TRUE -#endif - /* The maximum number of simultaneous links that L2CAP can support. */ #ifndef MAX_ACL_CONNECTIONS #define MAX_L2CAP_LINKS 7 @@ -1362,10 +1323,6 @@ extern "C" { ** ******************************************************************************/ -#ifndef HID_DEV_PM_INCLUDED -#define HID_DEV_PM_INCLUDED TRUE -#endif - #ifndef HID_DEV_SUBCLASS #define HID_DEV_SUBCLASS COD_MINOR_POINTING #endif @@ -1420,16 +1377,6 @@ extern "C" { #define HID_HOST_REPAGE_WIN (2) #endif -/****************************************************************************** -** -** PAN -** -******************************************************************************/ - -#ifndef PAN_INCLUDED -#define PAN_INCLUDED FALSE -#endif - /************************************************************************* * A2DP Definitions */ @@ -1437,21 +1384,12 @@ extern "C" { #define A2D_INCLUDED TRUE #endif -/* TRUE to include SBC utility functions */ -#ifndef A2D_SBC_INCLUDED -#define A2D_SBC_INCLUDED A2D_INCLUDED -#endif - /****************************************************************************** ** ** AVCTP ** ******************************************************************************/ -#ifndef AVCT_INCLUDED -#define AVCT_INCLUDED TRUE -#endif - /* Number of simultaneous ACL links to different peer devices. */ #ifndef AVCT_NUM_LINKS #define AVCT_NUM_LINKS 2 @@ -1468,10 +1406,6 @@ extern "C" { ** ******************************************************************************/ -#ifndef AVRC_INCLUDED -#define AVRC_INCLUDED TRUE -#endif - #ifndef AVRC_METADATA_INCLUDED #define AVRC_METADATA_INCLUDED TRUE #endif @@ -1603,10 +1537,6 @@ The maximum number of payload octets that the local device can receive in a sing ** ******************************************************************************/ -#ifndef SER_INCLUDED -#define SER_INCLUDED FALSE -#endif - /* Mailbox used by serial application. */ #ifndef SER_MBOX #define SER_MBOX TASK_MBOX_1 @@ -1624,23 +1554,9 @@ The maximum number of payload octets that the local device can receive in a sing /****************************************************************************** ** -** SAP - Sample applications -** -******************************************************************************/ - -#ifndef MMI_INCLUDED -#define MMI_INCLUDED FALSE -#endif - -/****************************************************************************** -** ** APPL - Application Task ** ******************************************************************************/ -/* When TRUE indicates that an application task is to be run */ -#ifndef APPL_INCLUDED -#define APPL_INCLUDED TRUE -#endif #define L2CAP_FEATURE_REQ_ID 73 #define L2CAP_FEATURE_RSP_ID 173 diff --git a/include/bte_appl.h b/include/bte_appl.h index cf0baed24..4850250b8 100644 --- a/include/bte_appl.h +++ b/include/bte_appl.h @@ -22,52 +22,7 @@ * ******************************************************************************/ -#ifndef BTE_APPL_H -#define BTE_APPL_H - -#include "btm_int.h" -#include "bta_api.h" -#include "bta_sys.h" -#include "bte.h" - -/* Maximum length for serial port device name */ -#ifndef BTE_APPL_MAX_USERIAL_DEV_NAME -#define BTE_APPL_MAX_USERIAL_DEV_NAME (256) -#endif -#ifndef BTAPP_AHF_API_SUPPORT -#define BTAPP_AHF_API_SUPPORT FALSE -#endif - -/* BTA APP_IDs */ -#define UI_DM_ID 1 -#define UI_PRM_ID 20 -/* this defines the enabled BTA modules. client may not be defined as those are enabled at run time. - * they are defined for completeness. please check with bta_sys.h for new modules. - * BTA_ID_DM serves as flag for BTA_EnableBluetooth() - * BTA_ID_RES can be used to fs ID in bte_appl. - */ - -#define BTAPP_NUM_ID_BLOCKS ((BTA_ID_MAX/32)+1) /* number of 32 bit required to store one bit per - btapp id */ - -#define BTAPP_APPL_MAIL_EVENT(x) (x<<8) /* define bte_appl task mail box event. LSB contains - BTA_ID_xxx (see bta_sys.h) */ -#define BTAPP_APPL_MAIL_EVT 0xff00 /* high byte contains bitmap of application module event */ - -/* helper macro to copy BTA callack data y into message buffer x, for event data structure z */ -#define MEMCPY_APPL_MSG(x, y, z) memcpy( (void *)(((UINT8 *)x)+sizeof(BT_HDR)), (void *)y, sizeof(z) ) - -/* Event masks for BTE_APPL_TASK */ -#define BTE_APPL_STARTUP_EVT EVENT_MASK(APPL_EVT_0) /* Bluetooth has started */ -#define BTE_APPL_SHUTDOWN_EVT EVENT_MASK(APPL_EVT_1) /* Bluetooth is shutting down */ -#define BTE_APPL_SOCKET_RX_EVT EVENT_MASK(APPL_EVT_2) /* Socket data ready to be read */ -#define BTE_APPL_DBUS_RX_EVT EVENT_MASK(APPL_EVT_3) /* DBUS message ready to be read */ -#define BTE_APPL_BTA_ENABLE_EVT EVENT_MASK(APPL_EVT_4) /* BTA Enabled event */ - - -/* Application configuration */ -#define BTE_APPL_PATCHRAM_PATH_MAXLEN 128 -#define BTE_APPL_CONTACTS_DB_PATH 256 +#pragma once typedef struct { #if ((BLE_INCLUDED == TRUE) && (SMP_INCLUDED == TRUE)) @@ -80,101 +35,3 @@ typedef struct { } tBTE_APPL_CFG; extern tBTE_APPL_CFG bte_appl_cfg; - -typedef struct { - pthread_mutex_t mutex; /* mutex to protect below signal condition */ - pthread_cond_t cond; /* signal event */ -} tBTAPP_SEMAPHORE; - -/* helper functions to handle pthread conditions event from outside GKI */ -extern void bte_create_semaphore( tBTAPP_SEMAPHORE * p_sema ); -extern void bte_wait_semaphore( tBTAPP_SEMAPHORE * p_sema, unsigned msecs_to ); -extern void bte_signal_semaphore( tBTAPP_SEMAPHORE * p_sema ); -extern void bte_destroy_semaphore( tBTAPP_SEMAPHORE * p_sema ); - -/* global application control block storing global application states and variables */ -typedef struct tBTE_APPL_CB_tag { - sigset_t signal_handler_set; /* signal handler set used by signal handler thread */ -#if ( TRUE == BTE_RESET_BAUD_ON_BT_DISABLE ) - tBTAPP_SEMAPHORE shutdown_semaphore; /* used to sync with terminate handler initated ops */ -#endif - BOOLEAN amp_enabled; /* TRUE if AMP is in use */ -} tBTE_APPL_CB; - -extern tBTE_APPL_CB bte_appl_cb; - -/* Exports the application task */ -extern void BTE_appl_task(UINT32 params); -extern int BTAPP_enable_bta( const UINT32 bta_module_state[BTAPP_NUM_ID_BLOCKS], int includingFM ); -extern int BTAPP_disable_bta( const UINT32 bta_module_state[BTAPP_NUM_ID_BLOCKS], int includingFM ); - -extern UINT8 appl_trace_level; -#define BT_PCM_CLK_IDX 1 -#ifndef BT_PCM_DEF_CLK -#define BT_PCM_DEF_CLK 4 /* defaults to 2048khz PCM clk */ -#endif -#define BT_PCM_SYNC_MS_ROLE_IDX 3 -#define BT_PCM_CLK_MS_ROLE_IDX 4 -#ifndef BT_PCM_DEF_ROLE -#define BT_PCM_DEF_ROLE 0x00 /* assume slave as default */ -#endif - -/* helper macros to set, clear and get current BTA module id in a 32bit ARRAY!! */ -/* set bit id to 1 in UINT32 a[] NO RANGE CHECK!*/ -#define BTAPP_SET_BTA_MOD(id, a) { a[id/32] |= (UINT32)(1<<(id % 32)); } - -/* set bit id to 0 (cleared) in UINT32 a[] NO RANGE CHECK */ -#define BTAPP_CLEAR_BTA_MOD(id, a) { a[id/32] &= (UINT32)!(1<<(id % 32)); } - -/* tests if bit id is 1 in UINT32 a[] NO RANGE CHECK */ -#define BTAPP_BTA_MOD_IS_SET(id, a) (a[id/32] & (UINT32)(1<<(id % 32))) - -/* update this list either via btld.txt or directly here by adding the new profiles as per bta_sys.h. - * each xxx_LISTx may only contain 32 bits */ -#ifndef BTAPP_BTA_MODULES_LIST0 -#define BTAPP_BTA_MODULES_LIST0 (\ - ( 1<<BTA_ID_DM ) | \ - ( 1<<BTA_ID_DG ) | \ - ( 1<<BTA_ID_AG ) | \ - ( 1<<BTA_ID_OPC )| \ - ( 1<<BTA_ID_OPS )| \ - ( 1<<BTA_ID_FTS )| \ - ( 1<<BTA_ID_PAN )| \ - ( 1<<BTA_ID_PR ) | \ - ( 1<<BTA_ID_SC) | \ - ( 1<<BTA_ID_AV ) | \ - ( 1<<BTA_ID_HH ) | \ - ( 1<<BTA_ID_PBS) | \ - ( 1<<BTA_ID_FMTX)| \ - ( 1<<BTA_ID_JV) | \ - ( 1<<BTA_ID_MSE) \ - ) -#endif - -#define BTAPP_LIST1_BLOCK 32 /* next 32 bit block */ -#ifndef BTAPP_BTA_MODULES_LIST1 -#define BTAPP_BTA_MODULES_LIST1 (\ - ( 1<<(BTA_ID_MAX-BTAPP_LIST1_BLOCK) ) | \ - ( 1<<(BTA_ID_MSE-BTAPP_LIST1_BLOCK) ) | \ - 0 \ - ) -#endif -/* for future GPS etc support. goes int LIST1 above */ -#if 0 - ( 1<<(BTA_ID_SSR-BTAPP_LIST1_BLOCK) ) \ - ( 1<<(BTA_ID_MSE-BTAPP_LIST1_BLOCK) ) \ - ( 1<<(BTA_ID_MCE-BTAPP_LIST1_BLOCK) ) -#endif - -/* used application init default in bte_main.c, bte_appl_cfg */ -#ifndef BTAPP_DEFAULT_MODULES -#if (1==BTAPP_NUM_ID_BLOCKS) -#define BTAPP_DEFAULT_MODULES {BTAPP_BTA_MODULES_LIST0} /* max 32 modules IDs */ -#elif (2==BTAPP_NUM_ID_BLOCKS) -#define BTAPP_DEFAULT_MODULES {BTAPP_BTA_MODULES_LIST0, BTAPP_BTA_MODULES_LIST1} /* 64 module IDs max */ -#else -#error "Define more BTAPP_BTA_MODULES_LISTx" -#endif -#endif - -#endif /* BTE_APPL_H */ 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 diff --git a/stack/a2dp/a2d_sbc.c b/stack/a2dp/a2d_sbc.c index 5e6adeb4e..4b786b453 100644 --- a/stack/a2dp/a2d_sbc.c +++ b/stack/a2dp/a2d_sbc.c @@ -24,14 +24,13 @@ ******************************************************************************/ #include "bt_target.h" + #include <string.h> #include "a2d_api.h" #include "a2d_int.h" #include "a2d_sbc.h" #include "bt_utils.h" -#if (A2D_SBC_INCLUDED == TRUE) - /************************************************************************************************* * SBC descramble code * Purpose: to tie the SBC code with BTE/mobile stack code, @@ -398,57 +397,3 @@ void A2D_ParsSbcMplHdr(UINT8 *p_src, BOOLEAN *p_frag, BOOLEAN *p_start, BOOLEAN } } -#else /* A2D_SBC_INCLUDED == TRUE */ - -void A2D_SbcChkFrInit(UINT8 *p_pkt) -{ - UNUSED(p_pkt); -} - -void A2D_SbcDescramble(UINT8 *p_pkt, UINT16 len) -{ - UNUSED(p_pkt); - UNUSED(len); -} - -tA2D_STATUS A2D_BldSbcInfo(UINT8 media_type, tA2D_SBC_CIE *p_ie, - UINT8 *p_result) -{ - UNUSED(media_type); - UNUSED(p_ie); - UNUSED(p_result); - return A2D_FAIL; -} - -tA2D_STATUS A2D_ParsSbcInfo(tA2D_SBC_CIE *p_ie, UINT8 *p_info, - BOOLEAN for_caps) -{ - UNUSED(p_ie); - UNUSED(p_info); - UNUSED(for_caps); - return A2D_FAIL; -} - -void A2D_BldSbcMplHdr(UINT8 *p_dst, BOOLEAN frag, BOOLEAN start, - BOOLEAN last, UINT8 num) -{ - UNUSED(p_dst); - UNUSED(frag); - UNUSED(start); - UNUSED(last); - UNUSED(num); -} - -void A2D_ParsSbcMplHdr(UINT8 *p_src, BOOLEAN *p_frag, - BOOLEAN *p_start, BOOLEAN *p_last, - UINT8 *p_num) -{ - UNUSED(p_src); - UNUSED(p_frag); - UNUSED(p_start); - UNUSED(p_last); - UNUSED(p_num); -} - - -#endif /* A2D_SBC_INCLUDED == TRUE */ diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h index b61ea071b..828a84517 100644 --- a/stack/btm/btm_int.h +++ b/stack/btm/btm_int.h @@ -735,18 +735,6 @@ typedef BOOLEAN CONNECTION_TYPE; #define BTM_STATE_BUFFER_SIZE 5 /* size of state buffer */ -#if (BTM_PCM2_INCLUDED == TRUE) -/* Define pcm2_action */ -enum -{ - BTM_PCM2_ACT_NONE, - BTM_PCM2_ACT_SENT_ARC, - BTM_PCM2_READ_PARAM, - BTM_PCM2_WRITE_PARAM, -}; -typedef UINT8 tBTM_PCM2_ACTION; -#endif - typedef struct { tBTM_CFG cfg; /* Device configuration */ @@ -861,12 +849,6 @@ typedef struct char state_temp_buffer[BTM_STATE_BUFFER_SIZE]; #endif -#if (defined(BTM_PCM2_INCLUDED) && BTM_PCM2_INCLUDED == TRUE) - UINT16 sys_features; - UINT8 pcm2_params[BRCM_PCM2_SETUP_WRITE_SIZE]; - tBTM_PCM2_ACTION pcm2_action; -#endif - } tBTM_CB; diff --git a/stack/btu/btu_hcif.c b/stack/btu/btu_hcif.c index ad0050c32..e71723e46 100644 --- a/stack/btu/btu_hcif.c +++ b/stack/btu/btu_hcif.c @@ -51,13 +51,6 @@ extern fixed_queue_t *btu_hci_msg_queue; extern void btm_process_cancel_complete(UINT8 status, UINT8 mode); extern void btm_ble_test_command_complete(UINT8 *p); -// btla-specific ++ -/* BTE application task */ -#if APPL_INCLUDED == TRUE -#include "bte_appl.h" -#endif -// btla-specific -- - /********************************************************************************/ /* L O C A L F U N C T I O N P R O T O T Y P E S */ /********************************************************************************/ diff --git a/stack/btu/btu_task.c b/stack/btu/btu_task.c index a79ba58a4..99d73b970 100644 --- a/stack/btu/btu_task.c +++ b/stack/btu/btu_task.c @@ -49,11 +49,6 @@ #include "gap_int.h" -/* BTE application task */ -#if APPL_INCLUDED == TRUE -#include "bte_appl.h" -#endif - #if (defined(BNEP_INCLUDED) && BNEP_INCLUDED == TRUE) #include "bnep_int.h" #endif diff --git a/stack/include/hcidefs.h b/stack/include/hcidefs.h index 941ca57f7..63a0bc5d4 100644 --- a/stack/include/hcidefs.h +++ b/stack/include/hcidefs.h @@ -1635,14 +1635,8 @@ typedef struct #define HCI_FEATURE_NON_FLUSHABLE_PB_MASK 0x40 #define HCI_FEATURE_NON_FLUSHABLE_PB_OFF 6 -// btla-specific ++ -#ifdef ANDROID_APP_INCLUDED /* This feature is causing frequent link drops when doing call switch with certain av/hfp headsets */ #define HCI_NON_FLUSHABLE_PB_SUPPORTED(x) (0)//((x)[HCI_FEATURE_NON_FLUSHABLE_PB_OFF] & HCI_FEATURE_NON_FLUSHABLE_PB_MASK) -#else -#define HCI_NON_FLUSHABLE_PB_SUPPORTED(x) ((x)[HCI_FEATURE_NON_FLUSHABLE_PB_OFF] & HCI_FEATURE_NON_FLUSHABLE_PB_MASK) -#endif -// btla-specific -- #define HCI_FEATURE_LINK_SUP_TO_EVT_MASK 0x01 #define HCI_FEATURE_LINK_SUP_TO_EVT_OFF 7 diff --git a/stack/sdp/sdp_main.c b/stack/sdp/sdp_main.c index 1e0c22a3c..86f16fbeb 100644 --- a/stack/sdp/sdp_main.c +++ b/stack/sdp/sdp_main.c @@ -563,12 +563,6 @@ tCONN_CB* sdp_conn_originate (UINT8 *p_bd_addr) /* Transition to the next appropriate state, waiting for connection confirm. */ p_ccb->con_state = SDP_STATE_CONN_SETUP; -// btla-specific ++ -#ifndef ANDROID_APP_INCLUDED /* Skip for Android: Do not need to set out_service for sdp, since sdp does not use sec. Prevents over-writing service_rec of a connection already in progress */ - BTM_SetOutService(p_bd_addr, BTM_SEC_SERVICE_SDP_SERVER, 0); -#endif -// btla-specific -- - cid = L2CA_ConnectReq (SDP_PSM, p_bd_addr); /* Check if L2CAP started the connection process */ |