From 595bced8e7c280e37a75b9bf9c1f36263434041c Mon Sep 17 00:00:00 2001 From: Matthew Xie 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 --- gki/ulinux/gki_ulinux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gki') diff --git a/gki/ulinux/gki_ulinux.c b/gki/ulinux/gki_ulinux.c index 8263d2b..98e6f84 100644 --- a/gki/ulinux/gki_ulinux.c +++ b/gki/ulinux/gki_ulinux.c @@ -75,13 +75,13 @@ #define GKI_TICK_TIMER_DEBUG FALSE #endif -#define GKI_INFO(fmt, ...) LOGI ("%s: " fmt, __FUNCTION__, ## __VA_ARGS__) +#define GKI_INFO(fmt, ...) ALOGI ("%s: " fmt, __FUNCTION__, ## __VA_ARGS__) /* always log errors */ -#define GKI_ERROR_LOG(fmt, ...) LOGE ("##### ERROR : %s: " fmt "#####", __FUNCTION__, ## __VA_ARGS__) +#define GKI_ERROR_LOG(fmt, ...) ALOGE ("##### ERROR : %s: " fmt "#####", __FUNCTION__, ## __VA_ARGS__) #if defined (GKI_TICK_TIMER_DEBUG) && (GKI_TICK_TIMER_DEBUG == TRUE) -#define GKI_TIMER_TRACE(fmt, ...) LOGI ("%s: " fmt, __FUNCTION__, ## __VA_ARGS__) +#define GKI_TIMER_TRACE(fmt, ...) ALOGI ("%s: " fmt, __FUNCTION__, ## __VA_ARGS__) #else #define GKI_TIMER_TRACE(fmt, ...) #endif @@ -520,7 +520,7 @@ void GKI_shutdown(void) if ( result < 0 ) { - LOGE( "pthread_join() FAILED: result: %d", result ); + ALOGE( "pthread_join() FAILED: result: %d", result ); } #endif // GKI_ERROR_LOG( "GKI_shutdown(): task %s dead\n", gki_cb.com.OSTName[task_id]); -- cgit v1.1