Remove unnecessary layer of indirection

diff --git a/bta/Android.mk b/bta/Android.mk
index c863d10..fe29116 100644 (file)
--- a/bta/Android.mk
+++ b/bta/Android.mk
@@ -80,7 +80,6 @@ LOCAL_SRC_FILES:= \
     ./sys/bta_sys_main.c \
     ./sys/bta_sys_ci.c \
     ./sys/bta_sys_conn.c \
-    ./sys/bta_sys_cfg.c \
     ./sys/ptim.c \
     ./sys/bd.c \
     ./sys/utl.c \

diff --git a/bta/sys/bta_sys.h b/bta/sys/bta_sys.h
index 7b60b1f..856d318 100644 (file)
--- a/bta/sys/bta_sys.h
+++ b/bta/sys/bta_sys.h
@@ -168,15 +168,6 @@ typedef struct
     tBTA_SYS_DISABLE    *disable;
 } tBTA_SYS_REG;
 
-/* system manager configuration structure */
-typedef struct
-{
-    UINT16          mbox_evt;                       /* GKI mailbox event */
-    UINT8           mbox;                           /* GKI mailbox id */
-    UINT8           timer;                          /* GKI timer id */
-    UINT8           trace_level;                    /* initial trace level */
-} tBTA_SYS_CFG;
-
 /* data type to send events to BTA SYS HW manager */
 typedef struct
 {
@@ -184,7 +175,20 @@ typedef struct
     tBTA_SYS_HW_MODULE   hw_module;
 } tBTA_SYS_HW_MSG;
 
+/* GKI task mailbox event for BTA. */
+#ifndef BTA_MBOX_EVT
+#define BTA_MBOX_EVT                TASK_MBOX_2_EVT_MASK
+#endif
 
+/* GKI task mailbox for BTA. */
+#ifndef BTA_MBOX
+#define BTA_MBOX                    TASK_MBOX_2
+#endif
+
+/* GKI timer id used for protocol timer for BTA. */
+#ifndef BTA_TIMER
+#define BTA_TIMER                   TIMER_1
+#endif
 
 /*****************************************************************************
 **  Global data

diff --git a/bta/sys/bta_sys_cfg.c b/bta/sys/bta_sys_cfg.c
deleted file mode 100644 (file)
index bcc7e40..0000000
--- a/bta/sys/bta_sys_cfg.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************************************************************************
- *
- *  Copyright (C) 2003-2012 Broadcom Corporation
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at:
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- ******************************************************************************/
-
-/******************************************************************************
- *
- *  This file contains compile-time configurable constants for the BTA
- *  system manager.
- *
- ******************************************************************************/
-
-#include "bt_target.h"
-#include "gki.h"
-#include "bta_sys.h"
-
-/* GKI task mailbox event for BTA. */
-#ifndef BTA_MBOX_EVT
-#define BTA_MBOX_EVT                TASK_MBOX_2_EVT_MASK
-#endif
-
-/* GKI task mailbox for BTA. */
-#ifndef BTA_MBOX
-#define BTA_MBOX                    TASK_MBOX_2
-#endif
-
-/* GKI timer id used for protocol timer for BTA. */
-#ifndef BTA_TIMER
-#define BTA_TIMER                   TIMER_1
-#endif
-
-const tBTA_SYS_CFG bta_sys_cfg =
-{
-    BTA_MBOX_EVT,               /* GKI mailbox event */
-    BTA_MBOX,                   /* GKI mailbox id */
-    BTA_TIMER,                  /* GKI timer id */
-    APPL_INITIAL_TRACE_LEVEL    /* initial trace level */
-};
-
-tBTA_SYS_CFG *p_bta_sys_cfg = (tBTA_SYS_CFG *)&bta_sys_cfg;
-
-

diff --git a/bta/sys/bta_sys_int.h b/bta/sys/bta_sys_int.h
index 32101a5..0369318 100644 (file)
--- a/bta/sys/bta_sys_int.h
+++ b/bta/sys/bta_sys_int.h
@@ -83,9 +83,6 @@ typedef struct
 
 } tBTA_SYS_CB;
 
-
-
-
 /*****************************************************************************
 **  Global variables
 *****************************************************************************/
@@ -98,12 +95,6 @@ extern tBTA_SYS_CB *bta_sys_cb_ptr;
 #define bta_sys_cb (*bta_sys_cb_ptr)
 #endif
 
-
-/* system manager configuration structure */
-extern tBTA_SYS_CFG *p_bta_sys_cfg;
-
-
-
 /* functions used for BTA SYS HW state machine */
 void bta_sys_hw_btm_cback( tBTM_DEV_STATUS status );
 void bta_sys_hw_error(tBTA_SYS_HW_MSG *p_sys_hw_msg);
@@ -115,8 +106,4 @@ void bta_sys_hw_evt_stack_enabled(tBTA_SYS_HW_MSG *p_sys_hw_msg);
 
 BOOLEAN bta_sys_sm_execute(BT_HDR *p_msg);
 
-
-
-
-
 #endif /* BTA_SYS_INT_H */

diff --git a/bta/sys/bta_sys_main.c b/bta/sys/bta_sys_main.c
index 0219290..041ce54 100644 (file)
--- a/bta/sys/bta_sys_main.c
+++ b/bta/sys/bta_sys_main.c
@@ -172,9 +172,9 @@ const tBTA_SYS_ST_TBL bta_sys_st_tbl[] = {
 BTA_API void bta_sys_init(void)
 {
     memset(&bta_sys_cb, 0, sizeof(tBTA_SYS_CB));
-    ptim_init(&bta_sys_cb.ptim_cb, BTA_SYS_TIMER_PERIOD, p_bta_sys_cfg->timer);
+    ptim_init(&bta_sys_cb.ptim_cb, BTA_SYS_TIMER_PERIOD, BTA_TIMER);
     bta_sys_cb.task_id = GKI_get_taskid();
-    appl_trace_level = p_bta_sys_cfg->trace_level;
+    appl_trace_level = APPL_INITIAL_TRACE_LEVEL;
 
     /* register BTA SYS message handler */
     bta_sys_register( BTA_ID_SYS,  &bta_sys_hw_reg);
@@ -596,7 +596,7 @@ BOOLEAN bta_sys_is_register(UINT8 id)
 *******************************************************************************/
 void bta_sys_sendmsg(void *p_msg)
 {
-    GKI_send_msg(bta_sys_cb.task_id, p_bta_sys_cfg->mbox, p_msg);
+    GKI_send_msg(bta_sys_cb.task_id, BTA_MBOX, p_msg);
 }
 
 /*******************************************************************************