Merge "DO NOT MERGE Add ability to add interop entries dynamically (2/2)" into mnc...

[android-x86/system-bt.git] / main / bte_logmsg.c

diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c
index 5105a7d..3258f47 100644 (file)
--- a/main/bte_logmsg.c
+++ b/main/bte_logmsg.c
@@ -17,7 +17,6 @@
  ******************************************************************************/
 
 #include <assert.h>
-#include <cutils/log.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,28 +26,18 @@
 
 #include "bte.h"
 #include "bta_api.h"
-#include "bte_appl.h"
 #include "btu.h"
-#include "config.h"
+#include "osi/include/config.h"
 #include "gki.h"
 #include "l2c_api.h"
+#include "osi/include/log.h"
 #include "stack_config.h"
 
-#if (RFCOMM_INCLUDED==TRUE)
 #include "port_api.h"
-#endif
-#if (OBX_INCLUDED==TRUE)
-#include "obx_api.h"
-#endif
-#if (AVCT_INCLUDED==TRUE)
-#include "avct_api.h"
-#endif
 #if (AVDT_INCLUDED==TRUE)
 #include "avdt_api.h"
 #endif
-#if (AVRC_INCLUDED==TRUE)
 #include "avrc_api.h"
-#endif
 #if (AVDT_INCLUDED==TRUE)
 #include "avdt_api.h"
 #endif
@@ -59,9 +48,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
@@ -91,55 +78,55 @@
 
 /* LayerIDs for BTA, currently everything maps onto appl_trace_level */
 static const char * const bt_layer_tags[] = {
-  "bt-btif",
-  "bt-usb",
-  "bt-serial",
-  "bt-socket",
-  "bt-rs232",
-  "bt-lc",
-  "bt-lm",
-  "bt-hci",
-  "bt-l2cap",
-  "bt-rfcomm",
-  "bt-sdp",
-  "bt-tcs",
-  "bt-obex",
-  "bt-btm",
-  "bt-gap",
+  "bt_btif",
+  "bt_usb",
+  "bt_serial",
+  "bt_socket",
+  "bt_rs232",
+  "bt_lc",
+  "bt_lm",
+  "bt_hci",
+  "bt_l2cap",
+  "bt_rfcomm",
+  "bt_sdp",
+  "bt_tcs",
+  "bt_obex",
+  "bt_btm",
+  "bt_gap",
   "UNUSED",
   "UNUSED",
-  "bt-icp",
-  "bt-hsp2",
-  "bt-spp",
-  "bt-ctp",
-  "bt-bpp",
-  "bt-hcrp",
-  "bt-ftp",
-  "bt-opp",
-  "bt-btu",
-  "bt-gki",
-  "bt-bnep",
-  "bt-pan",
-  "bt-hfp",
-  "bt-hid",
-  "bt-bip",
-  "bt-avp",
-  "bt-a2d",
-  "bt-sap",
-  "bt-amp",
-  "bt-mca",
-  "bt-att",
-  "bt-smp",
-  "bt-nfc",
-  "bt-nci",
-  "bt-idep",
-  "bt-ndep",
-  "bt-llcp",
-  "bt-rw",
-  "bt-ce",
-  "bt-snep",
-  "bt-ndef",
-  "bt-nfa",
+  "bt_icp",
+  "bt_hsp2",
+  "bt_spp",
+  "bt_ctp",
+  "bt_bpp",
+  "bt_hcrp",
+  "bt_ftp",
+  "bt_opp",
+  "bt_btu",
+  "bt_gki",
+  "bt_bnep",
+  "bt_pan",
+  "bt_hfp",
+  "bt_hid",
+  "bt_bip",
+  "bt_avp",
+  "bt_a2d",
+  "bt_sap",
+  "bt_amp",
+  "bt_mca",
+  "bt_att",
+  "bt_smp",
+  "bt_nfc",
+  "bt_nci",
+  "bt_idep",
+  "bt_ndep",
+  "bt_llcp",
+  "bt_rw",
+  "bt_ce",
+  "bt_snep",
+  "bt_ndef",
+  "bt_nfa",
 };
 static uint8_t BTAPP_SetTraceLevel(uint8_t new_level);
 static uint8_t BTIF_SetTraceLevel(uint8_t new_level);
@@ -149,21 +136,11 @@ static uint8_t BTU_SetTraceLevel(uint8_t new_level);
 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 (OBX_INCLUDED==TRUE)
-  {BTTRC_ID_STK_OBEX, BTTRC_ID_STK_OBEX, OBX_SetTraceLevel, "TRC_OBEX", 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
 #if (AVDT_INCLUDED==TRUE)
   {BTTRC_ID_STK_AVDT, BTTRC_ID_STK_AVDT, AVDT_SetTraceLevel, "TRC_AVDT", DEFAULT_CONF_TRACE_LEVEL},
 #endif
-#if (AVRC_INCLUDED==TRUE)
   {BTTRC_ID_STK_AVRC, BTTRC_ID_STK_AVRC, AVRC_SetTraceLevel, "TRC_AVRC", DEFAULT_CONF_TRACE_LEVEL},
-#endif
 #if (AVDT_INCLUDED==TRUE)
   //{BTTRC_ID_AVDT_SCB, BTTRC_ID_AVDT_CCB, NULL, "TRC_AVDT_SCB", DEFAULT_CONF_TRACE_LEVEL},
 #endif
@@ -174,9 +151,7 @@ static tBTTRC_FUNC_MAP bttrc_set_level_map[] = {
   {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
@@ -253,7 +228,7 @@ static void load_levels_from_config(const config_t *config) {
   assert(config != NULL);
 
   for (tBTTRC_FUNC_MAP *functions = &bttrc_set_level_map[0]; functions->trc_name; ++functions) {
-    ALOGI("BTE_InitTraceLevels -- %s", functions->trc_name);
+    LOG_INFO("BTE_InitTraceLevels -- %s", functions->trc_name);
     int value = config_get_int(config, CONFIG_DEFAULT_SECTION, functions->trc_name, -1);
     if (value != -1)
       functions->trace_level = value;
@@ -266,7 +241,7 @@ static void load_levels_from_config(const config_t *config) {
 static future_t *init(void) {
   const stack_config_t *stack_config = stack_config_get_interface();
   if (!stack_config->get_trace_config_enabled()) {
-    ALOGI("[bttrc] using compile default trace settings");
+    LOG_INFO("[bttrc] using compile default trace settings");
     return NULL;
   }