From 113bdd7504d69f483c4208bc30a457b7ff4b69fa Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 5 Jan 2012 23:18:54 +0000 Subject: Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I05dd3a5e5f671c0fdc17bf4e3d52395ccdb56e45 --- Linux_x86/phDal4Nfc_uart.c | 6 +++--- src/phHciNfc_DevMgmt.c | 2 +- src/phLibNfc.c | 2 +- src/phLlcNfc_Interface.c | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Linux_x86/phDal4Nfc_uart.c b/Linux_x86/phDal4Nfc_uart.c index b19c5c5..e8dbce9 100644 --- a/Linux_x86/phDal4Nfc_uart.c +++ b/Linux_x86/phDal4Nfc_uart.c @@ -253,11 +253,11 @@ static int apply_errors(uint8_t *buffer, int length) { // 50% chance of dropping byte length--; memcpy(&buffer[i], &buffer[i+1], length-i); - LOGW("dropped byte %d", i); + ALOGW("dropped byte %d", i); } else { // 50% chance of corruption buffer[i] = (uint8_t)rand(); - LOGW("corrupted byte %d", i); + ALOGW("corrupted byte %d", i); } } } @@ -344,7 +344,7 @@ int phDal4Nfc_uart_read(uint8_t * pBuffer, int nNbBytesToRead) } return -1; } else if (ret == 0) { - LOGW("timeout!"); + ALOGW("timeout!"); break; // return partial response } ret = read(gComPortContext.nHandle, pBuffer + numRead, nNbBytesToRead - numRead); diff --git a/src/phHciNfc_DevMgmt.c b/src/phHciNfc_DevMgmt.c index 9517741..358f8eb 100644 --- a/src/phHciNfc_DevMgmt.c +++ b/src/phHciNfc_DevMgmt.c @@ -1370,7 +1370,7 @@ phHciNfc_Recv_DevMgmt_Event( case NXP_EVT_INFO_MEM_VIOLATION: { event_info.eventType = NFC_INFO_MEM_VIOLATION; - LOGW("Your NFC controller is kinda hosed, take it to npelly@ to fix"); + ALOGW("Your NFC controller is kinda hosed, take it to npelly@ to fix"); break; } case NXP_EVT_INFO_TEMP_OVERHEAT: diff --git a/src/phLibNfc.c b/src/phLibNfc.c index 92bdc40..1012acb 100644 --- a/src/phLibNfc.c +++ b/src/phLibNfc.c @@ -870,7 +870,7 @@ NFCSTATUS phLibNfc_Mgt_GetstackCapabilities( /* Check the firmware version */ if (nxp_nfc_full_version == NULL) { // Couldn't load firmware, just pretend we're up to date. - LOGW("Firmware image not available: this device might be running old NFC firmware!"); + ALOGW("Firmware image not available: this device might be running old NFC firmware!"); phLibNfc_StackCapabilities->psDevCapabilities.firmware_update_info = 0; } else { phLibNfc_StackCapabilities->psDevCapabilities.firmware_update_info = memcmp(phLibNfc_StackCapabilities->psDevCapabilities.full_version, nxp_nfc_full_version, diff --git a/src/phLlcNfc_Interface.c b/src/phLlcNfc_Interface.c index 175462d..9e92163 100644 --- a/src/phLlcNfc_Interface.c +++ b/src/phLlcNfc_Interface.c @@ -786,7 +786,7 @@ phLlcNfc_RdResp_Cb( else if (ps_frame_info->recv_error_count < PH_LLCNFC_MAX_REJ_RETRY_COUNT) { - LOGW("LLC bad crc"); + ALOGW("LLC bad crc"); PH_LLCNFC_PRINT("CRC ERROR RECVD \n"); PH_LLCNFC_DEBUG("RECV ERROR COUNT : 0x%02X\n", ps_frame_info->recv_error_count); @@ -883,7 +883,7 @@ phLlcNfc_RdResp_Cb( value is greater than (0x21 - 1), then pend a read to get 1 byte again */ - LOGW("bad LLC length byte %x\n", *(pCompInfo->buffer)); + ALOGW("bad LLC length byte %x\n", *(pCompInfo->buffer)); ps_frame_info->recv_error_count = (uint8_t) (ps_frame_info->recv_error_count + 1); libnfc_llc_error_count++; @@ -895,7 +895,7 @@ phLlcNfc_RdResp_Cb( } else { - LOGW("unknown LLC error1"); + ALOGW("unknown LLC error1"); ps_frame_info->recv_error_count = (uint8_t) (ps_frame_info->recv_error_count + 1); libnfc_llc_error_count++; @@ -919,7 +919,7 @@ phLlcNfc_RdResp_Cb( } } else if (NFCSTATUS_READ_FAILED == pCompInfo->status) { // partial read - try reading the length byte again - LOGW("LLC length mis-match\n"); + ALOGW("LLC length mis-match\n"); ps_frame_info->recv_error_count = (uint8_t) (ps_frame_info->recv_error_count + 1); libnfc_llc_error_count++; @@ -931,7 +931,7 @@ phLlcNfc_RdResp_Cb( } else { - LOGW("unknown LLC error2"); + ALOGW("unknown LLC error2"); ps_frame_info->recv_error_count = (uint8_t) (ps_frame_info->recv_error_count + 1); libnfc_llc_error_count++; -- cgit v1.2.3