From 595bced8e7c280e37a75b9bf9c1f36263434041c Mon Sep 17 00:00:00 2001
From: Matthew Xie <mattx@google.com>
Date: Sat, 7 Apr 2012 04:41:39 -0700
Subject: replace logx with alogx

Conflicts:

	btif/src/btif_core.c
	btif/src/btif_dm.c
	btif/src/btif_hh.c
	btif/src/btif_sock.c
	gki/ulinux/gki_ulinux.c
	hci/include/bt_hci_bdroid.h
	hci/src/bt_hci_bdroid.c
	hci/src/btsnoop.c
	hci/src/hci_h4.c
	hci/src/userial.c
	vendor/libvendor/src/hardware.c
	vendor/libvendor/src/upio.c
---
 main/bte_conf.c   | 16 ++++++++--------
 main/bte_logmsg.c |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'main')

diff --git a/main/bte_conf.c b/main/bte_conf.c
index 662593a..9bd783e 100644
--- a/main/bte_conf.c
+++ b/main/bte_conf.c
@@ -85,9 +85,9 @@ DEV_CLASS local_device_default_class = {0x40, 0x02, 0x0C};
 **  Local type definitions
 ******************************************************************************/
 #define CONF_DBG          0
-#define info(format, ...) LOGI (format, ## __VA_ARGS__)
-#define debug(format, ...) if (CONF_DBG) LOGD (format, ## __VA_ARGS__)
-#define error(format, ...) LOGE (format, ## __VA_ARGS__)
+#define info(format, ...) ALOGI (format, ## __VA_ARGS__)
+#define debug(format, ...) if (CONF_DBG) ALOGD (format, ## __VA_ARGS__)
+#define error(format, ...) ALOGE (format, ## __VA_ARGS__)
 
 #define CONF_KEY_LEN   32
 #define CONF_VALUE_LEN 96
@@ -225,7 +225,7 @@ void bte_load_conf(const char *p_path)
     char    line[CONF_MAX_LINE_LEN+1]; /* add 1 for \0 char */
     BOOLEAN name_matched;
 
-    LOGI("Attempt to load stack conf from %s", p_path);
+    ALOGI("Attempt to load stack conf from %s", p_path);
 
     if ((p_file = fopen(p_path, "r")) != NULL)
     {
@@ -246,7 +246,7 @@ void bte_load_conf(const char *p_path)
 
             if (NULL == p_value)
             {
-                LOGW("bte_load_conf: missing value for name: %s", p_name);
+                ALOGW("bte_load_conf: missing value for name: %s", p_name);
                 continue;
             }
 
@@ -277,7 +277,7 @@ void bte_load_conf(const char *p_path)
     }
     else
     {
-        LOGI( "bte_load_conf file >%s< not found", p_path);
+        ALOGI( "bte_load_conf file >%s< not found", p_path);
     }
 }
 
@@ -301,7 +301,7 @@ static BOOLEAN bte_parse_did_conf (const char *p_path, UINT32 num,
     char    *p;
     char    line[CONF_MAX_LINE_LEN+1]; /* add 1 for \0 char */
 
-    LOGI("Attempt to load did conf from %s", p_path);
+    ALOGI("Attempt to load did conf from %s", p_path);
 
     if ((p_file = fopen(p_path, "r")) != NULL)
     {
@@ -361,7 +361,7 @@ static BOOLEAN bte_parse_did_conf (const char *p_path, UINT32 num,
    }
    else
    {
-        LOGI( "bte_parse_did_conf file >%s< not found", p_path);
+        ALOGI( "bte_parse_did_conf file >%s< not found", p_path);
    }
    if (!end_count)
        end_count = count;
diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c
index d8121a2..f6a08d2 100644
--- a/main/bte_logmsg.c
+++ b/main/bte_logmsg.c
@@ -432,7 +432,7 @@ BT_API void BTE_InitTraceLevels( void )
 
         while (p_f_map->trc_name != NULL)
         {
-            LOGI("BTE_InitTraceLevels -- %s", p_f_map->trc_name);
+            ALOGI("BTE_InitTraceLevels -- %s", p_f_map->trc_name);
 
             if (p_f_map->p_f)
                 p_f_map->p_f(p_f_map->trace_level);
@@ -442,7 +442,7 @@ BT_API void BTE_InitTraceLevels( void )
     }
     else
     {
-        LOGI("[bttrc] using compile default trace settings");
+        ALOGI("[bttrc] using compile default trace settings");
     }
 #endif
 }
-- 
cgit v1.1