diff options
author | daniel_Tomas <daniel.tomas@trusted-logic.com> | 2010-11-19 15:43:12 +0100 |
---|---|---|
committer | Nick Pelly <npelly@google.com> | 2010-12-05 18:33:24 -0800 |
commit | bf52196cdecd0decc2f8deabb19bf5877794bc31 (patch) | |
tree | bed84f9598cd4d3e4e1e74a0bdde9b66eef3e4d2 | |
parent | 6e286043593b281d161dad4969e05ba9c53ef6d1 (diff) | |
download | external_libnfc-nxp-bf52196cdecd0decc2f8deabb19bf5877794bc31.zip external_libnfc-nxp-bf52196cdecd0decc2f8deabb19bf5877794bc31.tar.gz external_libnfc-nxp-bf52196cdecd0decc2f8deabb19bf5877794bc31.tar.bz2 |
Fix buffer display in LLCP receive callback
Change-Id: I85a4235a4f13e02a61d2c07ca301e72e7b369c8b
-rw-r--r-- | Linux_x86/phDal4Nfc_debug.h | 3 | ||||
-rw-r--r-- | src/phFriNfc_Llcp.c | 20 | ||||
-rw-r--r-- | src/phLibNfcStatus.h | 1 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Linux_x86/phDal4Nfc_debug.h b/Linux_x86/phDal4Nfc_debug.h index ab586ef..a77e797 100644 --- a/Linux_x86/phDal4Nfc_debug.h +++ b/Linux_x86/phDal4Nfc_debug.h @@ -4,9 +4,6 @@ /*----------------------------------------------------------------------------------- DEBUG CORNER ------------------------------------------------------------------------------------*/ -/* Activate for debug */ -#define DAL_TRACE - #ifdef DAL_TRACE #include <stdio.h> diff --git a/src/phFriNfc_Llcp.c b/src/phFriNfc_Llcp.c index c17cad9..ef7e1b9 100644 --- a/src/phFriNfc_Llcp.c +++ b/src/phFriNfc_Llcp.c @@ -936,18 +936,10 @@ static void phFriNfc_Llcp_Receive_CB( void *pContext, /* Parse header */ phFriNfc_Llcp_Buffer2Header(psData->buffer, 0, &sPacketHeader); - if (sPacketHeader.ptype != PHFRINFC_LLCP_PTYPE_SYMM) - { - LLCP_PRINT_BUFFER("\nReceived LLCP packet :", psData->buffer, psData->length); - } - else - { - LLCP_PRINT("?"); - } - /* Check reception status and for pending disconnection */ if ((status != NFCSTATUS_SUCCESS) || (Llcp->bDiscPendingFlag == TRUE)) { + LLCP_DEBUG("\nReceived LLCP packet error - status = 0x%04x", status); /* Reset disconnection operation */ Llcp->bDiscPendingFlag = FALSE; /* Deactivate the link */ @@ -955,6 +947,16 @@ static void phFriNfc_Llcp_Receive_CB( void *pContext, return; } + if (sPacketHeader.ptype != PHFRINFC_LLCP_PTYPE_SYMM) + { + LLCP_PRINT_BUFFER("\nReceived LLCP packet :", psData->buffer, psData->length); + } + else + { + LLCP_PRINT("?"); + } + + /* Check new link status */ switch(Llcp->state) { diff --git a/src/phLibNfcStatus.h b/src/phLibNfcStatus.h index 62bd3ec..c4deb8f 100644 --- a/src/phLibNfcStatus.h +++ b/src/phLibNfcStatus.h @@ -42,6 +42,7 @@ #define LLCP_STATE_RESET_INIT 0x00U #define LLCP_STATE_CHECKED 0x01U + #endif /* #ifdef LLCP_TRANSACT_CHANGES */ #define LIB_NFC_VERSION_SET(v,major,minor,patch,build) ((v) = \ ( ((major) << 24) & 0xFF000000 ) | \ |