Collapse RFCOMM_INCLUDED and GAP_INCLUDED guards.
Both of these features are always available in bluedroid.
diff --git a/include/bt_target.h b/include/bt_target.h
index e523a5e..cc903d0 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -1031,10 +1031,6 @@
**
******************************************************************************/
-#ifndef RFCOMM_INCLUDED
-#define RFCOMM_INCLUDED TRUE
-#endif
-
/* The maximum number of ports supported. */
#ifndef MAX_RFC_PORTS
#define MAX_RFC_PORTS 30
@@ -1350,10 +1346,6 @@
**
******************************************************************************/
-#ifndef GAP_INCLUDED
-#define GAP_INCLUDED TRUE
-#endif
-
/* keep the raw data received from SDP server in database. */
#ifndef SDP_RAW_DATA_INCLUDED
#define SDP_RAW_DATA_INCLUDED TRUE
diff --git a/main/bte_init.c b/main/bte_init.c
index 13820d4..450f5a1 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 @@
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 @@
/***********
** 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 ee99620..918deb6 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 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 @@
{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
diff --git a/stack/btm/btm_acl.c b/stack/btm/btm_acl.c
index 661449c..65b7630 100644
--- a/stack/btm/btm_acl.c
+++ b/stack/btm/btm_acl.c
@@ -62,9 +62,7 @@
BTM_TRACE_DEBUG ("btm_acl_init");
#if 0 /* cleared in btm_init; put back in if called from anywhere else! */
memset (&btm_cb.acl_db, 0, sizeof (btm_cb.acl_db));
-#if RFCOMM_INCLUDED == TRUE
memset (btm_cb.btm_scn, 0, BTM_MAX_SCN); /* Initialize the SCN usage to FALSE */
-#endif
btm_cb.btm_def_link_policy = 0;
btm_cb.p_bl_changed_cb = NULL;
#endif
@@ -1594,7 +1592,6 @@
}
-#if (RFCOMM_INCLUDED==TRUE)
/*******************************************************************************
**
** Function BTM_AllocateSCN
@@ -1674,21 +1671,6 @@
return(FALSE); /* Illegal SCN passed in */
}
-#else
-
-/* Make dummy functions for the RPC to link against */
-UINT8 BTM_AllocateSCN(void)
-{
- return(0);
-}
-
-BOOLEAN BTM_FreeSCN(UINT8 scn)
-{
- return(FALSE);
-}
-
-#endif
-
/*******************************************************************************
**
** Function btm_set_packet_types
diff --git a/stack/btm/btm_ble_gap.c b/stack/btm/btm_ble_gap.c
index bdbf1e4..3aada69 100644
--- a/stack/btm/btm_ble_gap.c
+++ b/stack/btm/btm_ble_gap.c
@@ -33,9 +33,7 @@
#include "btu.h"
#include "device/include/controller.h"
#include "hcimsgs.h"
-#if (GAP_INCLUDED == TRUE)
#include "gap_api.h"
-#endif
#if BLE_INCLUDED == TRUE
#include "l2c_int.h"
diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h
index 4c31227..b61ea07 100644
--- a/stack/btm/btm_int.h
+++ b/stack/btm/btm_int.h
@@ -29,9 +29,7 @@
#include "gki.h"
#include "hcidefs.h"
-#if RFCOMM_INCLUDED == TRUE
#include "rfcdefs.h"
-#endif
#include "btm_api.h"
@@ -757,9 +755,7 @@
** ACL Management
****************************************************/
tACL_CONN acl_db[MAX_L2CAP_LINKS];
-#if( RFCOMM_INCLUDED==TRUE)
UINT8 btm_scn[BTM_MAX_SCN]; /* current SCNs: TRUE if SCN is in use */
-#endif
UINT16 btm_def_link_policy;
UINT16 btm_def_link_super_tout;
diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c
index 4b05e94..83d1679 100644
--- a/stack/btm/btm_sec.c
+++ b/stack/btm/btm_sec.c
@@ -2627,10 +2627,8 @@
/* set the default IO capabilities */
btm_cb.devcb.loc_io_caps = BTM_LOCAL_IO_CAPS;
/* add mx service to use no security */
-#if (RFCOMM_INCLUDED == TRUE)
BTM_SetSecurityLevel(FALSE, "RFC_MUX", BTM_SEC_SERVICE_RFC_MUX,
BTM_SEC_NONE, BT_PSM_RFCOMM, BTM_SEC_PROTO_RFCOMM, 0);
-#endif
}
else
{
diff --git a/stack/btu/btu_task.c b/stack/btu/btu_task.c
index f8268c6..a79ba58 100644
--- a/stack/btu/btu_task.c
+++ b/stack/btu/btu_task.c
@@ -44,18 +44,10 @@
#include "sdpint.h"
#include "thread.h"
-#if ( defined(RFCOMM_INCLUDED) && RFCOMM_INCLUDED == TRUE )
#include "port_api.h"
#include "port_ext.h"
-#endif
-#if (defined(EVAL) && EVAL == TRUE)
-#include "btu_eval.h"
-#endif
-
-#if GAP_INCLUDED == TRUE
#include "gap_int.h"
-#endif
/* BTE application task */
#if APPL_INCLUDED == TRUE
@@ -96,17 +88,8 @@
#include "btm_ble_int.h"
#endif
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
extern void BTE_InitStack(void);
-#ifdef __cplusplus
-}
-#endif
-
/* Define BTU storage area
*/
#if BTU_DYNAMIC_MEMORY == FALSE
@@ -119,9 +102,6 @@
// Communication queue between btu_task and hci.
extern fixed_queue_t *btu_hci_msg_queue;
-// Timer queue between btu_task and bta.
-extern fixed_queue_t *btu_bta_alarm_queue;
-
// General timer queue.
extern fixed_queue_t *btu_general_alarm_queue;
extern hash_map_t *btu_general_alarm_hash_map;
@@ -386,14 +366,11 @@
btm_inq_rmt_name_failed();
break;
-#if (defined(RFCOMM_INCLUDED) && RFCOMM_INCLUDED == TRUE)
case BTU_TTYPE_RFCOMM_MFC:
case BTU_TTYPE_RFCOMM_PORT:
rfcomm_process_timeout (p_tle);
break;
-#endif /* If defined(RFCOMM_INCLUDED) && RFCOMM_INCLUDED == TRUE */
-
#if ((defined(BNEP_INCLUDED) && BNEP_INCLUDED == TRUE))
case BTU_TTYPE_BNEP:
bnep_process_timeout(p_tle);