From bf52196cdecd0decc2f8deabb19bf5877794bc31 Mon Sep 17 00:00:00 2001
From: daniel_Tomas <daniel.tomas@trusted-logic.com>
Date: Fri, 19 Nov 2010 15:43:12 +0100
Subject: Fix buffer display in LLCP receive callback

Change-Id: I85a4235a4f13e02a61d2c07ca301e72e7b369c8b
---
 Linux_x86/phDal4Nfc_debug.h |  3 ---
 src/phFriNfc_Llcp.c         | 20 +++++++++++---------
 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 ) | \
-- 
cgit v1.1