From 0502401a295b7c1e48753ffcfd267c7a57d39fb2 Mon Sep 17 00:00:00 2001
From: Romain Tartiere <romain.tartiere@gmail.com>
Date: Fri, 13 Aug 2010 08:31:16 +0000
Subject: [PATCH] Minor tweaks.

  - Rename the nfc_device_t's struct iErrorCode member to iPICCError (We are
    likely to have both PICC and PCD errors fields to avoid unneeded complexity
    at some point);
  - Make the PN53x error descriptions static;
  - Enhance some comments here and there.
---
 include/nfc/nfc-types.h |  4 ++--
 libnfc/chips/pn53x.c    | 10 +++++-----
 libnfc/nfc.c            |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/nfc/nfc-types.h b/include/nfc/nfc-types.h
index 45df928..c3a1c47 100644
--- a/include/nfc/nfc-types.h
+++ b/include/nfc/nfc-types.h
@@ -69,8 +69,8 @@ typedef struct {
   bool bPar;
 /** The last tx bits setting, we need to reset this if it does not apply anymore */
   uint8_t ui8TxBits;
-/** The last error encountered by the device */
-  int iErrorCode;
+/** Last error reported by the PICC */
+  int iPICCError;
 } nfc_device_t;
 
 
diff --git a/libnfc/chips/pn53x.c b/libnfc/chips/pn53x.c
index c5d3c1b..080031f 100644
--- a/libnfc/chips/pn53x.c
+++ b/libnfc/chips/pn53x.c
@@ -121,13 +121,13 @@ bool pn53x_transceive(nfc_device_t* pnd, const byte_t* pbtTx, const size_t szTxL
       case 0x90:	// TgResponseToInitiator
       case 0x92:	// TgSetGeneralBytes
       case 0x94:	// TgSetMetaData
-	  pnd->iErrorCode = pbtRx[0] & 0x3f;
+	  pnd->iPICCError = pbtRx[0] & 0x3f;
 	  break;
       default:
-	  pnd->iErrorCode = 0;
+	  pnd->iPICCError = 0;
   }
 
-  return (0 == pnd->iErrorCode);
+  return (0 == pnd->iPICCError);
 }
 
 byte_t pn53x_get_reg(nfc_device_t* pnd, uint16_t ui16Reg)
@@ -378,7 +378,7 @@ pn53x_InRelease(nfc_device_t* pnd, const uint8_t ui8Target)
   return(pn53x_transceive(pnd,abtCmd,sizeof(abtCmd),NULL,NULL));
 }
 
-struct sErrorMessage {
+static struct sErrorMessage {
   int iErrorCode;
   const char *pcErrorMsg;
 } sErrorMessages[] = {
@@ -421,7 +421,7 @@ pn53x_strerror (const nfc_device_t *pnd)
   size_t i;
 
   for (i=0; i < (sizeof (sErrorMessages) / sizeof (struct sErrorMessage)); i++) {
-    if (sErrorMessages[i].iErrorCode == pnd->iErrorCode) {
+    if (sErrorMessages[i].iErrorCode == pnd->iPICCError) {
       pcRes = sErrorMessages[i].pcErrorMsg;
       break;
     }
diff --git a/libnfc/nfc.c b/libnfc/nfc.c
index 1c39816..24a682e 100644
--- a/libnfc/nfc.c
+++ b/libnfc/nfc.c
@@ -1088,7 +1088,7 @@ bool nfc_target_send_dep_bytes(nfc_device_t* pnd, const byte_t* pbtTx, const siz
 }
 
 /**
- * @brief Return the PCD error string
+ * @brief Return the PICC/PCD error string
  * @return Returns a string
  */
 const char *nfc_strerror (const nfc_device_t *pnd)
@@ -1097,7 +1097,7 @@ const char *nfc_strerror (const nfc_device_t *pnd)
 }
 
 /**
- * @brief Renders the PCD error in pcStrErrBuf for a maximum size of szBufLen caracters
+ * @brief Renders the PICC/PCD error in pcStrErrBuf for a maximum size of szBufLen caracters
  * @return Returns 0 upon success
  */
 int nfc_strerror_r (const nfc_device_t *pnd, char *pcStrErrBuf, size_t szBufLen)
@@ -1106,7 +1106,7 @@ int nfc_strerror_r (const nfc_device_t *pnd, char *pcStrErrBuf, size_t szBufLen)
 }
 
 /**
- * @brief Display the PCD error a-la perror
+ * @brief Display the PICC/PCD error a-la perror
  */
 void nfc_perror (const nfc_device_t *pnd, const char *pcString)
 {