Remove HCI access macros
And some other minor bt_target cleanup.
diff --git a/include/bt_target.h b/include/bt_target.h
index 107f4f9..b10c37c 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -25,19 +25,6 @@
#endif
#include "data_types.h"
-
-#ifndef BTIF_HSAG_SERVICE_NAME
-#define BTIF_HSAG_SERVICE_NAME ("Headset Gateway")
-#endif
-
-#ifndef BTIF_HFAG_SERVICE_NAME
-#define BTIF_HFAG_SERVICE_NAME ("Handsfree Gateway")
-#endif
-
-#ifndef BTIF_HF_CLIENT_SERVICE_NAME
-#define BTIF_HF_CLIENT_SERVICE_NAME ("Handsfree")
-#endif
-
#ifdef BUILDCFG
#if !defined(HAS_BDROID_BUILDCFG) && !defined(HAS_NO_BDROID_BUILDCFG)
@@ -48,7 +35,7 @@
#include "bdroid_buildcfg.h"
#endif
-#endif
+#endif // BUILDCFG
/* Include common GKI definitions used by this platform */
#include "gki_target.h"
@@ -56,7 +43,6 @@
#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---------------------
#ifndef L2CAP_EXTFEA_SUPPORTED_MASK
#define L2CAP_EXTFEA_SUPPORTED_MASK (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
@@ -484,42 +470,10 @@
extern "C" {
#endif
-BT_API extern void bte_main_hci_send (BT_HDR *p_msg, UINT16 event);
-BT_API extern void bte_main_lpm_allow_bt_device_sleep(void);
-
#ifdef __cplusplus
}
#endif
-/* Sends ACL data received from the upper stack to the BD/EDR HCI transport. */
-#ifndef HCI_ACL_DATA_TO_LOWER
-#define HCI_ACL_DATA_TO_LOWER(p) bte_main_hci_send((BT_HDR *)(p), BT_EVT_TO_LM_HCI_ACL);
-#endif
-
-#ifndef HCI_BLE_ACL_DATA_TO_LOWER
-#define HCI_BLE_ACL_DATA_TO_LOWER(p) bte_main_hci_send((BT_HDR *)(p), (UINT16)(BT_EVT_TO_LM_HCI_ACL|LOCAL_BLE_CONTROLLER_ID));
-#endif
-
-/* Sends SCO data received from the upper stack to the HCI transport. */
-#ifndef HCI_SCO_DATA_TO_LOWER
-#define HCI_SCO_DATA_TO_LOWER(p) bte_main_hci_send((BT_HDR *)(p), BT_EVT_TO_LM_HCI_SCO);
-#endif
-
-/* Sends an HCI command received from the upper stack to the BD/EDR HCI transport. */
-#ifndef HCI_CMD_TO_LOWER
-#define HCI_CMD_TO_LOWER(p) bte_main_hci_send((BT_HDR *)(p), BT_EVT_TO_LM_HCI_CMD);
-#endif
-
-/* Sends an LM Diagnosic command received from the upper stack to the HCI transport. */
-#ifndef HCI_LM_DIAG_TO_LOWER
-#define HCI_LM_DIAG_TO_LOWER(p) bte_main_hci_send((BT_HDR *)(p), BT_EVT_TO_LM_DIAG);
-#endif
-
-/* Send HCISU a message to allow BT sleep */
-#ifndef HCI_LP_ALLOW_BT_DEVICE_SLEEP
-#define HCI_LP_ALLOW_BT_DEVICE_SLEEP() bte_main_lpm_allow_bt_device_sleep()
-#endif
-
/* Use 2 second for low-resolution systems, override to 1 for high-resolution systems */
#ifndef BT_1SEC_TIMEOUT
#define BT_1SEC_TIMEOUT (2)
@@ -962,14 +916,9 @@
#define L2CAP_CONFORMANCE_TESTING FALSE
#endif
-
#ifndef TIMER_PARAM_TYPE
-#ifdef WIN2000
-#define TIMER_PARAM_TYPE void *
-#else
#define TIMER_PARAM_TYPE UINT32
#endif
-#endif
/******************************************************************************
**
@@ -1151,11 +1100,7 @@
/* The maximum number of attributes in each record. */
#ifndef SDP_MAX_REC_ATTR
-//#if defined(HID_DEV_INCLUDED) && (HID_DEV_INCLUDED==TRUE)
#define SDP_MAX_REC_ATTR 25
-//#else
-//#define SDP_MAX_REC_ATTR 13
-//#endif
#endif
#ifndef SDP_MAX_PAD_LEN
@@ -1164,11 +1109,6 @@
/* The maximum length, in bytes, of an attribute. */
#ifndef SDP_MAX_ATTR_LEN
-//#if defined(HID_DEV_INCLUDED) && (HID_DEV_INCLUDED==TRUE)
-//#define SDP_MAX_ATTR_LEN 80
-//#else
-//#define SDP_MAX_ATTR_LEN 100
-//#endif
#define SDP_MAX_ATTR_LEN 400
#endif
@@ -1552,9 +1492,9 @@
#else
/* signaling and media channels */
#define AVDT_NUM_CHANNELS 2
-#endif
+#endif // AVDT_REPORTING
-#endif
+#endif // AVDT_NUM_CHANNELS
/* Number of transport channels setup by AVDT for all media streams
* AVDT_NUM_CHANNELS * Number of simultaneous streams.
@@ -1563,7 +1503,6 @@
#define AVDT_NUM_TC_TBL 6
#endif
-
/* Maximum size in bytes of the codec capabilities information element. */
#ifndef AVDT_CODEC_SIZE
#define AVDT_CODEC_SIZE 10
@@ -1610,7 +1549,6 @@
#define PAN_SUPPORTS_DEBUG_DUMP TRUE
#endif
-
/* Maximum number of PAN connections allowed */
#ifndef MAX_PAN_CONNS
#define MAX_PAN_CONNS 7
@@ -1661,9 +1599,6 @@
#define PAN_NAP_SECURITY_LEVEL 0
#endif
-
-
-
/******************************************************************************
**
** GAP
@@ -1846,7 +1781,6 @@
#define HID_HOST_REPAGE_WIN (2)
#endif
-
/******************************************************************************
**
** DUN and FAX
@@ -1857,7 +1791,6 @@
#define DUN_INCLUDED FALSE
#endif
-
/******************************************************************************
**
** GOEP