diff options
| author | Nick Pelly <npelly@google.com> | 2011-06-27 09:01:51 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-06-27 09:30:36 -0700 |
| commit | 34ff48f6cd6595a899e05fbd56f4c84891840d3f (patch) | |
| tree | 2157358fa3ddd5309f102185c8cf278fbb078d2c /Linux_x86 | |
| parent | d4cb91ee6f74f187cc0e7ba9dc073b0a77c27dfa (diff) | |
| download | external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.zip external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.tar.gz external_libnfc-nxp-34ff48f6cd6595a899e05fbd56f4c84891840d3f.tar.bz2 | |
libnfc spring cleaning
o Fix most libnfc warnings, from 360 to 18
o Make DAL_DEBUG much less verbose and more useful
o Clean up Android.mk
Done with minimal textual diff to minimize merge conflicts.
Change-Id: I918645500723ff7bb092ad9959628fcabac45bec
Diffstat (limited to 'Linux_x86')
| -rw-r--r-- | Linux_x86/phDal4Nfc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Linux_x86/phDal4Nfc.c b/Linux_x86/phDal4Nfc.c index df069f3..7a4986c 100644 --- a/Linux_x86/phDal4Nfc.c +++ b/Linux_x86/phDal4Nfc.c @@ -629,7 +629,7 @@ NFCSTATUS phDal4Nfc_Reset(long level) { NFCSTATUS retstatus = NFCSTATUS_SUCCESS; - DAL_DEBUG("phDal4Nfc_Reset: VEN to %d",level); + DAL_DEBUG("phDal4Nfc_Reset: VEN to %ld",level); retstatus = gLinkFunc.reset(level); @@ -725,7 +725,7 @@ retry: if(gReadWriteContext.nNbOfBytesToRead == 1 && gReadWriteContext.pReadBuffer[0] == 0x57) { i2c_error_count++; - DAL_DEBUG("Read 0x57 %d times\n", i2c_error_count); + LOGW("Read 0x57 %d times\n", i2c_error_count); if (i2c_error_count < 5) { usleep(2000); goto retry; @@ -743,12 +743,12 @@ retry: } DAL_DEBUG("Read ok. nbToRead=%d\n", gReadWriteContext.nNbOfBytesToRead); DAL_DEBUG("NbReallyRead=%d\n", gReadWriteContext.nNbOfBytesRead); - DAL_PRINT("ReadBuff[]={ "); +/* DAL_PRINT("ReadBuff[]={ "); for (i = 0; i < gReadWriteContext.nNbOfBytesRead; i++) { DAL_DEBUG("0x%x ", gReadWriteContext.pReadBuffer[i]); } - DAL_PRINT("}\n"); + DAL_PRINT("}\n"); */ /* read completed immediately */ sMsg.eMsgType= PHDAL4NFC_READ_MESSAGE; @@ -910,12 +910,12 @@ void phDal4Nfc_DeferredCb (void *params) DAL_PRINT(" Physical Write Success \n"); TransactionInfo.length=(uint16_t)gReadWriteContext.nNbOfBytesWritten; TransactionInfo.status=NFCSTATUS_SUCCESS; - DAL_PRINT("WriteBuff[]={ "); +/* DAL_PRINT("WriteBuff[]={ "); for (i = 0; i < gReadWriteContext.nNbOfBytesWritten; i++) { DAL_DEBUG("0x%x ", gReadWriteContext.pWriteBuffer[i]); } - DAL_PRINT("}\n"); + DAL_PRINT("}\n"); */ // Free TempWriteBuffer if(gReadWriteContext.pTempWriteBuffer != NULL) |