Remove more GKI code.

This change removes all remaining GKI task remnants as well as
a few timer and buffer bits.

2 files changed, 6 insertions, 71 deletions

diff --git a/include/bt_target.h b/include/bt_target.h
index 1e99670b2..f61d2f4ec 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -108,10 +108,6 @@
 #define BTA_SYS_TIMER_PERIOD  100
 #endif
 
-#ifndef GKI_SHUTDOWN_EVT
-#define GKI_SHUTDOWN_EVT  APPL_EVT_7
-#endif
-
 #ifndef SBC_FOR_EMBEDDED_LINUX
 #define SBC_FOR_EMBEDDED_LINUX TRUE
 #endif
@@ -1514,17 +1510,6 @@ The maximum number of payload octets that the local device can receive in a sing
 
 /******************************************************************************
 **
-** SER
-**
-******************************************************************************/
-
-/* Mailbox used by serial application. */
-#ifndef SER_MBOX
-#define SER_MBOX                    TASK_MBOX_1
-#endif
-
-/******************************************************************************
-**
 ** Sleep Mode (Low Power Mode)
 **
 ******************************************************************************/
diff --git a/include/gki_target.h b/include/gki_target.h
index c16327aa9..1d35c25d1 100644
--- a/include/gki_target.h
+++ b/include/gki_target.h
@@ -15,26 +15,8 @@
  *  limitations under the License.
  *
  ******************************************************************************/
-#ifndef GKI_TARGET_H
-#define GKI_TARGET_H
 
-#define GKI_TRACE(fmt, ...)
-
-/******************************************************************************
-**
-** Task configuration
-**
-******************************************************************************/
-
-/* Definitions of task IDs for inter-task messaging */
-#ifndef BTIF_TASK
-#define BTIF_TASK               1
-#endif
-
-/* The number of GKI tasks in the software system. */
-#ifndef GKI_MAX_TASKS
-#define GKI_MAX_TASKS               3
-#endif
+#pragma once
 
 /******************************************************************************
 **
@@ -42,11 +24,6 @@
 **
 ******************************************************************************/
 
-/* TRUE if GKI uses dynamic buffers. */
-#ifndef GKI_USE_DYNAMIC_BUFFERS
-#define GKI_USE_DYNAMIC_BUFFERS     FALSE
-#endif
-
 /* The size of the buffers in pool 0. */
 #ifndef GKI_BUF0_SIZE
 #define GKI_BUF0_SIZE               64
@@ -150,11 +127,6 @@ POOL_ID 9 is a public pool meant for large buffer needs such as SDP_DB
 #define GKI_DEF_BUFPOOL_PERM_MASK   0xfdf0
 #endif
 
-/* The number of fixed and dynamic buffer pools */
-#ifndef GKI_NUM_TOTAL_BUF_POOLS
-#define GKI_NUM_TOTAL_BUF_POOLS     10
-#endif
-
 /* The following is intended to be a reserved pool for L2CAP
 Flow control and retransmissions and intentionally kept out
 of order */
@@ -179,31 +151,6 @@ of order */
 #define GKI_BUF5_SIZE               748
 #endif
 
-/* The buffer corruption check flag. */
-#ifndef GKI_ENABLE_BUF_CORRUPTION_CHECK
-#define GKI_ENABLE_BUF_CORRUPTION_CHECK TRUE
-#endif
-
-/* The GKI severe error macro. */
-#ifndef GKI_SEVERE
-#define GKI_SEVERE(code)
-#endif
-
-/* TRUE if GKI includes debug functionality. */
-#ifndef GKI_DEBUG
-#define GKI_DEBUG                   FALSE
-#endif
-
-/* Maximum number of exceptions logged. */
-#ifndef GKI_MAX_EXCEPTION
-#define GKI_MAX_EXCEPTION           8
-#endif
-
-/* Maximum number of chars stored for each exception message. */
-#ifndef GKI_MAX_EXCEPTION_MSGLEN
-#define GKI_MAX_EXCEPTION_MSGLEN    64
-#endif
-
 /* The following is intended to be a reserved pool for SCO
 over HCI data and intentionally kept out of order */
 
@@ -283,6 +230,9 @@ over HCI data and intentionally kept out of order */
 #define GKI_BUF9_MAX           5
 #endif
 
-void LogMsg (UINT32 trace_set_mask, const char *fmt_str, ...);
+/* The number of fixed and dynamic buffer pools */
+#ifndef GKI_NUM_TOTAL_BUF_POOLS
+#define GKI_NUM_TOTAL_BUF_POOLS     10
+#endif
 
-#endif  /* GKI_TARGET_H */
+void LogMsg (UINT32 trace_set_mask, const char *fmt_str, ...);