Eliminate unnecessary macros GKI_API, EXPORT_API, and UDRV_API.
diff --git a/gki/common/gki.h b/gki/common/gki.h
index 7acbf91..36a59c5 100644
--- a/gki/common/gki.h
+++ b/gki/common/gki.h
@@ -130,71 +130,71 @@
/* Task management
*/
-GKI_API extern UINT8 GKI_create_task(TASKPTR, UINT8, const char *);
-GKI_API extern void GKI_destroy_task(UINT8 task_id);
-GKI_API extern void GKI_task_self_cleanup(UINT8 task_id);
-GKI_API extern void GKI_exit_task(UINT8);
-GKI_API extern UINT8 GKI_get_taskid(void);
-GKI_API extern void GKI_init(void);
-GKI_API extern void GKI_shutdown(void);
-GKI_API extern const char *GKI_map_taskname(UINT8);
+UINT8 GKI_create_task(TASKPTR, UINT8, const char *);
+void GKI_destroy_task(UINT8 task_id);
+void GKI_task_self_cleanup(UINT8 task_id);
+void GKI_exit_task(UINT8);
+UINT8 GKI_get_taskid(void);
+void GKI_init(void);
+void GKI_shutdown(void);
+const char *GKI_map_taskname(UINT8);
/* To send buffers and events between tasks
*/
-GKI_API extern UINT8 GKI_send_event (UINT8, UINT16);
+UINT8 GKI_send_event (UINT8, UINT16);
/* To get and release buffers, change owner and get size
*/
-GKI_API extern void GKI_freebuf (void *);
-GKI_API extern void *GKI_getbuf (UINT16);
-GKI_API extern UINT16 GKI_get_buf_size (void *);
-GKI_API extern void *GKI_getpoolbuf (UINT8);
-GKI_API extern UINT16 GKI_poolcount (UINT8);
-GKI_API extern UINT16 GKI_poolfreecount (UINT8);
-GKI_API extern UINT16 GKI_poolutilization (UINT8);
+void GKI_freebuf (void *);
+void *GKI_getbuf (UINT16);
+UINT16 GKI_get_buf_size (void *);
+void *GKI_getpoolbuf (UINT8);
+UINT16 GKI_poolcount (UINT8);
+UINT16 GKI_poolfreecount (UINT8);
+UINT16 GKI_poolutilization (UINT8);
/* User buffer queue management
*/
-GKI_API extern void *GKI_dequeue (BUFFER_Q *);
-GKI_API extern void GKI_enqueue (BUFFER_Q *, void *);
-GKI_API extern void GKI_enqueue_head (BUFFER_Q *, void *);
-GKI_API extern void *GKI_getfirst (BUFFER_Q *);
-GKI_API extern void *GKI_getlast (BUFFER_Q *);
-GKI_API extern void *GKI_getnext (void *);
-GKI_API extern void GKI_init_q (BUFFER_Q *);
-GKI_API extern UINT16 GKI_queue_length(BUFFER_Q *);
-GKI_API extern BOOLEAN GKI_queue_is_empty(BUFFER_Q *);
-GKI_API extern void *GKI_remove_from_queue (BUFFER_Q *, void *);
-GKI_API extern UINT16 GKI_get_pool_bufsize (UINT8);
+void *GKI_dequeue (BUFFER_Q *);
+void GKI_enqueue (BUFFER_Q *, void *);
+void GKI_enqueue_head (BUFFER_Q *, void *);
+void *GKI_getfirst (BUFFER_Q *);
+void *GKI_getlast (BUFFER_Q *);
+void *GKI_getnext (void *);
+void GKI_init_q (BUFFER_Q *);
+UINT16 GKI_queue_length(BUFFER_Q *);
+BOOLEAN GKI_queue_is_empty(BUFFER_Q *);
+void *GKI_remove_from_queue (BUFFER_Q *, void *);
+UINT16 GKI_get_pool_bufsize (UINT8);
/* Timer management
*/
-GKI_API extern void GKI_add_to_timer_list (TIMER_LIST_Q *, TIMER_LIST_ENT *);
-GKI_API extern void GKI_delay(UINT32);
-GKI_API extern UINT32 GKI_get_tick_count(void);
-GKI_API extern void GKI_init_timer_list (TIMER_LIST_Q *);
-GKI_API extern INT32 GKI_ready_to_sleep (void);
-GKI_API extern BOOLEAN GKI_remove_from_timer_list (TIMER_LIST_Q *, TIMER_LIST_ENT *);
-GKI_API extern void GKI_start_timer(UINT8, INT32, BOOLEAN);
-GKI_API extern void GKI_stop_timer (UINT8);
-GKI_API extern void GKI_timer_update(INT32);
-GKI_API extern UINT16 GKI_update_timer_list (TIMER_LIST_Q *, INT32);
-GKI_API extern UINT32 GKI_get_remaining_ticks (TIMER_LIST_Q *, TIMER_LIST_ENT *);
-GKI_API extern UINT16 GKI_wait(UINT16, UINT32);
-GKI_API extern BOOLEAN GKI_timer_queue_is_empty(const TIMER_LIST_Q *timer_q);
-GKI_API extern TIMER_LIST_ENT *GKI_timer_getfirst(const TIMER_LIST_Q *timer_q);
-GKI_API extern INT32 GKI_timer_ticks_getinitial(const TIMER_LIST_ENT *tle);
+void GKI_add_to_timer_list (TIMER_LIST_Q *, TIMER_LIST_ENT *);
+void GKI_delay(UINT32);
+UINT32 GKI_get_tick_count(void);
+void GKI_init_timer_list (TIMER_LIST_Q *);
+INT32 GKI_ready_to_sleep (void);
+BOOLEAN GKI_remove_from_timer_list (TIMER_LIST_Q *, TIMER_LIST_ENT *);
+void GKI_start_timer(UINT8, INT32, BOOLEAN);
+void GKI_stop_timer (UINT8);
+void GKI_timer_update(INT32);
+UINT16 GKI_update_timer_list (TIMER_LIST_Q *, INT32);
+UINT32 GKI_get_remaining_ticks (TIMER_LIST_Q *, TIMER_LIST_ENT *);
+UINT16 GKI_wait(UINT16, UINT32);
+BOOLEAN GKI_timer_queue_is_empty(const TIMER_LIST_Q *timer_q);
+TIMER_LIST_ENT *GKI_timer_getfirst(const TIMER_LIST_Q *timer_q);
+extern INT32 GKI_timer_ticks_getinitial(const TIMER_LIST_ENT *tle);
/* Disable Interrupts, Enable Interrupts
*/
-GKI_API extern void GKI_enable(void);
-GKI_API extern void GKI_disable(void);
+void GKI_enable(void);
+void GKI_disable(void);
/* os timer operation */
-GKI_API extern UINT32 GKI_get_os_tick_count(void);
+UINT32 GKI_get_os_tick_count(void);
/* Exception handling
*/
-GKI_API extern void GKI_exception (UINT16, char *);
+void GKI_exception (UINT16, char *);
diff --git a/gki/common/gki_common.h b/gki/common/gki_common.h
index c98af14..83dcd3f 100644
--- a/gki/common/gki_common.h
+++ b/gki/common/gki_common.h
@@ -136,14 +136,9 @@
/* Internal GKI function prototypes
*/
-GKI_API extern BOOLEAN gki_chk_buf_damage(void *);
-extern BOOLEAN gki_chk_buf_owner(void *);
-extern void gki_buffer_init (void);
-extern void gki_timers_init(void);
-extern void gki_adjust_timer_count (INT32);
-extern void gki_dealloc_free_queue(void);
-
-
-/* Debug aids
-*/
-typedef void (*FP_PRINT)(char *, ...);
+BOOLEAN gki_chk_buf_damage(void *);
+BOOLEAN gki_chk_buf_owner(void *);
+void gki_buffer_init (void);
+void gki_timers_init(void);
+void gki_adjust_timer_count (INT32);
+void gki_dealloc_free_queue(void);
diff --git a/gki/ulinux/gki_int.h b/gki/ulinux/gki_int.h
index c7cf4af..25696e1 100644
--- a/gki/ulinux/gki_int.h
+++ b/gki/ulinux/gki_int.h
@@ -45,8 +45,8 @@
} tGKI_CB;
#if GKI_DYNAMIC_MEMORY == FALSE
-GKI_API extern tGKI_CB gki_cb;
+tGKI_CB gki_cb;
#else
-GKI_API extern tGKI_CB *gki_cb_ptr;
+tGKI_CB *gki_cb_ptr;
#define gki_cb (*gki_cb_ptr)
#endif
diff --git a/include/bt_trace.h b/include/bt_trace.h
index 703b582..7d1e605 100644
--- a/include/bt_trace.h
+++ b/include/bt_trace.h
@@ -183,48 +183,41 @@
extern BT_API tBTTRC_LEVEL * BTA_SysSetTraceLevel( tBTTRC_LEVEL * p_levels );
// btla-specific --
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
/* External declaration for appl_trace_level here to avoid to add the declaration in all the files using APPL_TRACExxx macros */
extern UINT8 appl_trace_level ;
-// btla-specific ++
-EXPORT_API extern void BTE_InitTraceLevels( void );
-// btla-specific --
+void BTE_InitTraceLevels( void );
/* Prototype for message logging function. */
-EXPORT_API extern void LogMsg (UINT32 trace_set_mask, const char *fmt_str, ...);
+void LogMsg (UINT32 trace_set_mask, const char *fmt_str, ...);
/* Prototype for stack tracing function. */
-EXPORT_API extern void BTTRC_StackTrace0(tBTTRC_LAYER_ID layer_id,
+void BTTRC_StackTrace0(tBTTRC_LAYER_ID layer_id,
tBTTRC_TYPE type,
UINT16 token);
-EXPORT_API extern void BTTRC_StackTrace1(tBTTRC_LAYER_ID layer_id,
+void BTTRC_StackTrace1(tBTTRC_LAYER_ID layer_id,
tBTTRC_TYPE type,
UINT16 token,
tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val);
-EXPORT_API extern void BTTRC_StackTrace2(tBTTRC_LAYER_ID layer_id,
+void BTTRC_StackTrace2(tBTTRC_LAYER_ID layer_id,
tBTTRC_TYPE type,
UINT16 token,
tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
tBTTRC_PARAM_TYPE p2_type, UINT32 p2_val);
-EXPORT_API extern void BTTRC_StackTrace3(tBTTRC_LAYER_ID layer_id,
+void BTTRC_StackTrace3(tBTTRC_LAYER_ID layer_id,
tBTTRC_TYPE type,
UINT16 token,
tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
tBTTRC_PARAM_TYPE p2_type, UINT32 p2_val,
tBTTRC_PARAM_TYPE p3_type, UINT32 p3_val);
-EXPORT_API extern void BTTRC_StackTrace4(tBTTRC_LAYER_ID layer_id,
+void BTTRC_StackTrace4(tBTTRC_LAYER_ID layer_id,
tBTTRC_TYPE type,
UINT16 token,
tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
tBTTRC_PARAM_TYPE p2_type, UINT32 p2_val,
tBTTRC_PARAM_TYPE p3_type, UINT32 p3_val,
tBTTRC_PARAM_TYPE p4_type, UINT32 p4_val);
-EXPORT_API extern void BTTRC_StackTrace5(tBTTRC_LAYER_ID layer_id,
+void BTTRC_StackTrace5(tBTTRC_LAYER_ID layer_id,
tBTTRC_TYPE type,
UINT16 token,
tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
@@ -232,7 +225,7 @@
tBTTRC_PARAM_TYPE p3_type, UINT32 p3_val,
tBTTRC_PARAM_TYPE p4_type, UINT32 p4_val,
tBTTRC_PARAM_TYPE p5_type, UINT32 p5_val);
-EXPORT_API extern void BTTRC_StackTrace6(tBTTRC_LAYER_ID layer_id,
+void BTTRC_StackTrace6(tBTTRC_LAYER_ID layer_id,
tBTTRC_TYPE type,
UINT16 token,
tBTTRC_PARAM_TYPE p1_type, UINT32 p1_val,
@@ -242,15 +235,6 @@
tBTTRC_PARAM_TYPE p5_type, UINT32 p5_val,
tBTTRC_PARAM_TYPE p6_type, UINT32 p6_val);
-// btla-specific ++
-/* p_levels must be a 0 terminated list ! */
-//EXPORT_API extern tBTTRC_LEVEL * BTA_SysSetTraceLevel( tBTTRC_LEVEL * p_levels );
-// btla-specific --
-
-#ifdef __cplusplus
-}
-#endif
-
/******************************************************************************
**
** Trace configurable parameters
diff --git a/include/gki_target.h b/include/gki_target.h
index e685fb7..20fb036 100644
--- a/include/gki_target.h
+++ b/include/gki_target.h
@@ -18,27 +18,6 @@
#ifndef GKI_TARGET_H
#define GKI_TARGET_H
-/* Operating System Selection */
-#ifndef BTE_SIM_APP
-#define _GKI_ARM
-#define _GKI_STANDALONE
-#else
-#define _BT_WIN32
-#endif
-
-/* define prefix for exporting APIs from libraries */
-#define EXPORT_API
-
-#ifndef BTE_BSE_WRAPPER
-#ifdef BTE_SIM_APP
-#undef EXPORT_API
-#define EXPORT_API __declspec(dllexport)
-#endif
-#endif
-
-#define GKI_API EXPORT_API
-#define UDRV_API EXPORT_API
-
#define GKI_TRACE(fmt, ...)
/******************************************************************************
@@ -230,7 +209,6 @@
If BLE_INCLUDED is FALSE then Pool ID 8 is uncessary and set the following to 8, otherwise set to 9
POOL_ID 9 is a public pool meant for large buffer needs such as SDP_DB
*/
-// btla-specific ++
#ifndef GKI_NUM_FIXED_BUF_POOLS
#define GKI_NUM_FIXED_BUF_POOLS 10
#endif
@@ -240,7 +218,6 @@
/* Setting POOL_ID 9 as a public pool meant for large buffers such as SDP_DB */
#define GKI_DEF_BUFPOOL_PERM_MASK 0xfdf0
#endif
-// btla-specific --
/* The number of fixed and dynamic buffer pools */
#ifndef GKI_NUM_TOTAL_BUF_POOLS
@@ -362,7 +339,6 @@
#define GKI_BUF8_MAX 30
#endif
-// btla-specific ++
/* The following pool is meant for large allocations such as SDP_DB */
#ifndef GKI_POOL_ID_9
#define GKI_POOL_ID_9 9
@@ -375,17 +351,7 @@
#ifndef GKI_BUF9_MAX
#define GKI_BUF9_MAX 5
#endif
-// btla-specific --
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-EXPORT_API extern void LogMsg (UINT32 trace_set_mask, const char *fmt_str, ...);
-
-#ifdef __cplusplus
-}
-#endif
+void LogMsg (UINT32 trace_set_mask, const char *fmt_str, ...);
#endif /* GKI_TARGET_H */
diff --git a/udrv/include/uipc.h b/udrv/include/uipc.h
index 37d508c..b5efbd7 100644
--- a/udrv/include/uipc.h
+++ b/udrv/include/uipc.h
@@ -18,10 +18,6 @@
#ifndef UIPC_H
#define UIPC_H
-#ifndef UDRV_API
-#define UDRV_API
-#endif
-
#define UIPC_CH_ID_AV_CTRL 0
#define UIPC_CH_ID_AV_AUDIO 1
#define UIPC_CH_NUM 2
@@ -52,14 +48,8 @@
typedef void (tUIPC_RCV_CBACK)(tUIPC_CH_ID ch_id, tUIPC_EVENT event); /* points to BT_HDR which describes event type and length of data; len contains the number of bytes of entire message (sizeof(BT_HDR) + offset + size of data) */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
const char* dump_uipc_event(tUIPC_EVENT event);
-
/*******************************************************************************
**
** Function UIPC_Init
@@ -69,7 +59,7 @@
** Returns void
**
*******************************************************************************/
-UDRV_API extern void UIPC_Init(void *);
+void UIPC_Init(void *);
/*******************************************************************************
**
@@ -80,7 +70,7 @@
** Returns void
**
*******************************************************************************/
-UDRV_API extern BOOLEAN UIPC_Open(tUIPC_CH_ID ch_id, tUIPC_RCV_CBACK *p_cback);
+BOOLEAN UIPC_Open(tUIPC_CH_ID ch_id, tUIPC_RCV_CBACK *p_cback);
/*******************************************************************************
**
@@ -91,7 +81,7 @@
** Returns void
**
*******************************************************************************/
-UDRV_API extern void UIPC_Close(tUIPC_CH_ID ch_id);
+void UIPC_Close(tUIPC_CH_ID ch_id);
/*******************************************************************************
**
@@ -103,7 +93,7 @@
** Returns void
**
*******************************************************************************/
-UDRV_API extern BOOLEAN UIPC_SendBuf(tUIPC_CH_ID ch_id, BT_HDR *p_msg);
+BOOLEAN UIPC_SendBuf(tUIPC_CH_ID ch_id, BT_HDR *p_msg);
/*******************************************************************************
**
@@ -114,7 +104,7 @@
** Returns void
**
*******************************************************************************/
-UDRV_API extern BOOLEAN UIPC_Send(tUIPC_CH_ID ch_id, UINT16 msg_evt, UINT8 *p_buf, UINT16 msglen);
+BOOLEAN UIPC_Send(tUIPC_CH_ID ch_id, UINT16 msg_evt, UINT8 *p_buf, UINT16 msglen);
/*******************************************************************************
**
@@ -125,7 +115,7 @@
** Returns void
**
*******************************************************************************/
-UDRV_API extern UINT32 UIPC_Read(tUIPC_CH_ID ch_id, UINT16 *p_msg_evt, UINT8 *p_buf, UINT32 len);
+UINT32 UIPC_Read(tUIPC_CH_ID ch_id, UINT16 *p_msg_evt, UINT8 *p_buf, UINT32 len);
/*******************************************************************************
**
@@ -136,14 +126,6 @@
** Returns void
**
*******************************************************************************/
-UDRV_API extern BOOLEAN UIPC_Ioctl(tUIPC_CH_ID ch_id, UINT32 request, void *param);
-
-
-#ifdef __cplusplus
-}
-#endif
-
+BOOLEAN UIPC_Ioctl(tUIPC_CH_ID ch_id, UINT32 request, void *param);
#endif /* UIPC_H */
-
-
diff --git a/udrv/ulinux/uipc.c b/udrv/ulinux/uipc.c
index 81ca7f8..a389c95 100644
--- a/udrv/ulinux/uipc.c
+++ b/udrv/ulinux/uipc.c
@@ -579,7 +579,7 @@
**
*******************************************************************************/
-UDRV_API void UIPC_Init(void *p_data)
+void UIPC_Init(void *p_data)
{
UNUSED(p_data);
@@ -601,7 +601,7 @@
** Returns TRUE in case of success, FALSE in case of failure.
**
*******************************************************************************/
-UDRV_API BOOLEAN UIPC_Open(tUIPC_CH_ID ch_id, tUIPC_RCV_CBACK *p_cback)
+BOOLEAN UIPC_Open(tUIPC_CH_ID ch_id, tUIPC_RCV_CBACK *p_cback)
{
BTIF_TRACE_DEBUG("UIPC_Open : ch_id %d, p_cback %x", ch_id, p_cback);
@@ -646,7 +646,7 @@
**
*******************************************************************************/
-UDRV_API void UIPC_Close(tUIPC_CH_ID ch_id)
+void UIPC_Close(tUIPC_CH_ID ch_id)
{
BTIF_TRACE_DEBUG("UIPC_Close : ch_id %d", ch_id);
@@ -675,7 +675,7 @@
** Returns TRUE in case of success, FALSE in case of failure.
**
*******************************************************************************/
-UDRV_API BOOLEAN UIPC_SendBuf(tUIPC_CH_ID ch_id, BT_HDR *p_msg)
+BOOLEAN UIPC_SendBuf(tUIPC_CH_ID ch_id, BT_HDR *p_msg)
{
UNUSED(p_msg);
@@ -699,7 +699,7 @@
** Returns TRUE in case of success, FALSE in case of failure.
**
*******************************************************************************/
-UDRV_API BOOLEAN UIPC_Send(tUIPC_CH_ID ch_id, UINT16 msg_evt, UINT8 *p_buf,
+BOOLEAN UIPC_Send(tUIPC_CH_ID ch_id, UINT16 msg_evt, UINT8 *p_buf,
UINT16 msglen)
{
int n;
@@ -728,7 +728,7 @@
** Returns void
**
*******************************************************************************/
-UDRV_API void UIPC_ReadBuf(tUIPC_CH_ID ch_id, BT_HDR *p_msg)
+void UIPC_ReadBuf(tUIPC_CH_ID ch_id, BT_HDR *p_msg)
{
UNUSED(p_msg);
@@ -748,7 +748,7 @@
**
*******************************************************************************/
-UDRV_API UINT32 UIPC_Read(tUIPC_CH_ID ch_id, UINT16 *p_msg_evt, UINT8 *p_buf, UINT32 len)
+UINT32 UIPC_Read(tUIPC_CH_ID ch_id, UINT16 *p_msg_evt, UINT8 *p_buf, UINT32 len)
{
int n;
int n_read = 0;
@@ -831,7 +831,7 @@
**
*******************************************************************************/
-UDRV_API extern BOOLEAN UIPC_Ioctl(tUIPC_CH_ID ch_id, UINT32 request, void *param)
+extern BOOLEAN UIPC_Ioctl(tUIPC_CH_ID ch_id, UINT32 request, void *param)
{
BTIF_TRACE_DEBUG("#### UIPC_Ioctl : ch_id %d, request %d ####", ch_id, request);