This patch allows type 4 tag v2 ndef to be detected properly.

Same as Change-Id: I414e7864bdc654c3b9e1b459832bb8e95ea9c51a

Change-Id: I0a0119349419bb4f1031ab683e40dd3be7b26f5f

1 files changed, 113 insertions, 106 deletions

diff --git a/src/phFriNfc_NdefMap.h b/src/phFriNfc_NdefMap.h
index a70a489..f708d74 100644
--- a/src/phFriNfc_NdefMap.h
+++ b/src/phFriNfc_NdefMap.h
@@ -20,10 +20,10 @@
  *
  * Project: NFC-FRI
  *
- * $Date: Mon Mar 29 16:55:50 2010 $
+ * $Date: Tue Jul 27 08:58:22 2010 $
  * $Author: ing02260 $
- * $Revision: 1.23 $
- * $Aliases: NFC_FRI1.1_WK1007_R33_4,NFC_FRI1.1_WK1017_PREP1,NFC_FRI1.1_WK1017_R34_1,NFC_FRI1.1_WK1017_R34_2,NFC_FRI1.1_WK1023_R35_1 $
+ * $Revision: 1.24 $
+ * $Aliases:  $
  *
  */
 
@@ -35,24 +35,26 @@
 #include <phNfcTypes.h>
 #include <phNfcStatus.h>
 #include <phFriNfc.h>
-#if !defined PH_HAL4_ENABLE
-#include <phHal4Nfc.h>
+#ifdef PH_HAL4_ENABLE
+    #include <phHal4Nfc.h>
+#else
+    #include <phHalNfc.h>
 #endif
 
- 
+
 #include <phFriNfc_OvrHal.h>
 
 #ifndef PH_FRINFC_EXCLUDE_FROM_TESTFW /* */
 
-/** 
+/**
  * \name NDEF Mapping
  *
  * File: \ref phFriNfc_NdefMap.h
  *
  */
 /*@{*/
-#define PH_FRINFC_NDEFMAP_FILEREVISION "$Revision: 1.23 $"  /**< \ingroup grp_file_attributes */
-#define PH_FRINFC_NDEFMAP_FILEALIASES  "$Aliases: NFC_FRI1.1_WK1007_R33_4,NFC_FRI1.1_WK1017_PREP1,NFC_FRI1.1_WK1017_R34_1,NFC_FRI1.1_WK1017_R34_2,NFC_FRI1.1_WK1023_R35_1 $"       /**< \ingroup grp_file_attributes */
+#define PH_FRINFC_NDEFMAP_FILEREVISION "$Revision: 1.24 $"  /**< \ingroup grp_file_attributes */
+#define PH_FRINFC_NDEFMAP_FILEALIASES  "$Aliases:  $"       /**< \ingroup grp_file_attributes */
 /*@}*/
 
 #endif /* PH_FRINFC_EXCLUDE_FROM_TESTFW */
@@ -88,10 +90,13 @@
 
 /**
  * \name NDEF Mapping - specifies the different card types
- * These are the only recognised card types in this version.        
+ * These are the only recognised card types in this version.
  *
  */
 /*@{*/
+
+#define DESFIRE_EV1
+
 #define PH_FRINFC_NDEFMAP_MIFARE_UL_CARD                  1 /**< \internal Mifare UL */
 #define PH_FRINFC_NDEFMAP_ISO14443_4A_CARD                2 /**< \internal Iso 14443-4A */
 #define PH_FRINFC_NDEFMAP_MIFARE_STD_1K_CARD              3 /**< \internal Mifare Standard */
@@ -99,7 +104,9 @@
 #define PH_FRINFC_NDEFMAP_FELICA_SMART_CARD               5 /**< \internal Felica Smart Tag */
 #define PH_FRINFC_NDEFMAP_TOPAZ_CARD                      7 /**< \internal Felica Smart Tag */
 #define PH_FRINFC_NDEFMAP_TOPAZ_DYNAMIC_CARD              8 /**< \internal Felica Smart Tag */
+#ifdef DESFIRE_EV1
 #define PH_FRINFC_NDEFMAP_ISO14443_4A_CARD_EV1            9 /**< \internal Iso 14443-4A EV1 */
+#endif /* #ifdef DESFIRE_EV1 */
 
 
 #ifdef PH_NDEF_MIFARE_ULC
@@ -192,35 +199,35 @@ typedef enum
 #define PH_FRINFC_NDEFMAP_CR_CHK_NDEF       0  /* */
 /** \ingroup grp_fri_nfc_ndef_map
  *  Completion Routine Index for \ref phFriNfc_NdefMap_RdNdef */
-#define PH_FRINFC_NDEFMAP_CR_RD_NDEF        1  /* */ 
+#define PH_FRINFC_NDEFMAP_CR_RD_NDEF        1  /* */
 /** \ingroup grp_fri_nfc_ndef_map
  *  Completion Routine Index for \ref phFriNfc_NdefMap_WrNdef */
-#define PH_FRINFC_NDEFMAP_CR_WR_NDEF        2  /* */ 
+#define PH_FRINFC_NDEFMAP_CR_WR_NDEF        2  /* */
 /** \ingroup grp_fri_nfc_ndef_map
  *  Completion Routine Index for \ref phFriNfc_NdefMap_EraseNdef */
-#define PH_FRINFC_NDEFMAP_CR_ERASE_NDEF     3  /* */ 
+#define PH_FRINFC_NDEFMAP_CR_ERASE_NDEF     3  /* */
 /** \ingroup grp_fri_nfc_ndef_map Completion
  *  Routine Index for Unknown States/Operations */
-#define PH_FRINFC_NDEFMAP_CR_INVALID_OPE    4  /* */  
+#define PH_FRINFC_NDEFMAP_CR_INVALID_OPE    4  /* */
 /** \ingroup grp_fri_nfc_ndef_map
  *  Number of completion routines that have to be initialised */
-#define PH_FRINFC_NDEFMAP_CR                5  /* */  
+#define PH_FRINFC_NDEFMAP_CR                5  /* */
 /*@}*/
 
 /**
  * \name File Offset Attributes
  *
- * Following values are used to determine the offset value for Read/Write. This specifies whether 
+ * Following values are used to determine the offset value for Read/Write. This specifies whether
  * the Read/Write operation needs to be restarted/continued from the last offset set.
  *
  */
 /*@{*/
 /** \ingroup grp_fri_nfc_ndef_map
  *  Read/Write operation shall start from the last offset set */
-#define PH_FRINFC_NDEFMAP_SEEK_CUR                          0 /* */  
+#define PH_FRINFC_NDEFMAP_SEEK_CUR                          0 /* */
 /** \ingroup grp_fri_nfc_ndef_map
  *  Read/Write operation shall start from the begining of the file/card */
-#define PH_FRINFC_NDEFMAP_SEEK_BEGIN                        1 /* */  
+#define PH_FRINFC_NDEFMAP_SEEK_BEGIN                        1 /* */
 /*@}*/
 
 
@@ -262,7 +269,7 @@ typedef struct phFriNfc_Felica
 
     /**< Buffer to store odd number of block data */
     uint8_t     Wr_RemainedBytesBuff[PH_FRINFC_NDEFMAP_FELICA_BLOCK_SIZE];
-    
+
     /**< Following are different variables used for read operation*/
     uint8_t     Rd_NoBytesToCopy;         /*specifies the extra number of read bytes */
 
@@ -274,12 +281,12 @@ typedef struct phFriNfc_Felica
 
     /**< Stores Intermediate Copy data len*/
     uint8_t     IntermediateCpyLen;
-    
+
     /**< Flag specifies Pad Byte Information*/
     uint8_t     PadByteFlag;
 
     /**< Flag specifies Intermediate WR Information*/
-    uint8_t     IntermediateWrFlag;         
+    uint8_t     IntermediateWrFlag;
 
     /**< Flag specifies Intermediate Rd Information*/
     uint8_t     IntermediateRdFlag;
@@ -316,10 +323,10 @@ typedef struct phFriNfc_Felica_PollDetails
 #ifndef PH_HAL4_ENABLE
     phHal_eOpModes_t                *OpMode;
 #endif
-    /**<   Temporary place holder to the Remote Device 
+    /**<   Temporary place holder to the Remote Device
                     Information, required to store the Felica
                     session opened information. */
-    phHal_sRemoteDevInformation_t   psTempRemoteDevInfo;   
+    phHal_sRemoteDevInformation_t   psTempRemoteDevInfo;
 }phFriNfc_Felica_PollDetails_t;
 
 /**
@@ -367,7 +374,7 @@ typedef struct phFriNfc_MifareStdCont
 {
     /** Device input parameter for poll and connect after failed authentication */
     phHal_sDevInputParam_t  *DevInputParam;
-    /** to store bytes that will be used in the 
+    /** to store bytes that will be used in the
         next write/read operation, if any */
     uint8_t             internalBuf[PH_FRINFC_NDEFMAP_MIFARESTD_ST15_BYTES];
     /** to Store the length of the internalBuf */
@@ -378,16 +385,16 @@ typedef struct phFriNfc_MifareStdCont
     uint8_t             NdefBlocks;
     /** Total Number of Ndef Complaint Blocks */
     uint16_t            NoOfNdefCompBlocks;
-    /** used in write ndef, to know that internal bytes 
+    /** used in write ndef, to know that internal bytes
         are accessed */
     uint8_t             internalBufFlag;
     /** used in write ndef, to know that last 16 bytes
         are used to write*/
     uint8_t             RemainingBufFlag;
-    /** indicates that Read has reached the end of the 
+    /** indicates that Read has reached the end of the
         card */
     uint8_t             ReadWriteCompleteFlag;
-    /** indicates that Read has reached the end of the 
+    /** indicates that Read has reached the end of the
         card */
     uint8_t             ReadCompleteFlag;
     /** indicates that Write is possible or not */
@@ -396,7 +403,7 @@ typedef struct phFriNfc_MifareStdCont
     uint8_t             ReadFlag;
     /** indicates that Write is possible or not */
     uint8_t             RdBeforeWrFlag;
-    /** Authentication Flag indicating that a particular 
+    /** Authentication Flag indicating that a particular
         sector is authenticated or not */
     uint8_t             AuthDone;
     /** to store the last Sector ID in Check Ndef */
@@ -417,13 +424,13 @@ typedef struct phFriNfc_MifareStdCont
     uint16_t            remainingSize;
     /** To update the remaining size when writing to the Mifare 1k or 4k card */
     uint8_t             remSizeUpdFlag;
-    /** The flag is to know that there is a different AID apart from 
+    /** The flag is to know that there is a different AID apart from
         NFC forum sector AID */
     uint16_t            aidCompleteFlag;
-    /** The flag is to know that there is a a NFC forum sector exists 
+    /** The flag is to know that there is a a NFC forum sector exists
         in the card */
     uint16_t            NFCforumSectFlag;
-    /** The flag is to know that the particular sector is a proprietary 
+    /** The flag is to know that the particular sector is a proprietary
         NFC forum sector */
     uint16_t            ProprforumSectFlag;
     /** The flag is set after reading the MAD sectors */
@@ -438,11 +445,11 @@ typedef struct phFriNfc_MifareStdCont
     uint8_t             RdAfterWrFlag;
     /** Flag to say that poll is required before write ndef (authentication) */
     uint8_t             PollFlag;
-    /** Flag is to know that this is first time the read has been called. This 
-    is required when read is called after write (especially for the card formatted 
+    /** Flag is to know that this is first time the read has been called. This
+    is required when read is called after write (especially for the card formatted
     with the 2nd configuration) */
     uint8_t             FirstReadFlag;
-    /** Flag is to know that this is first time the write has been called. This 
+    /** Flag is to know that this is first time the write has been called. This
     is required when the card formatted with the 3rd configuration */
     uint8_t             FirstWriteFlag;
 }phFriNfc_MifareStdCont_t;
@@ -480,8 +487,8 @@ typedef struct phFriNfc_DesfireCapCont
  *
  */
 typedef struct phFriNfc_MifareULCont
-{   
-    /** to store bytes that will be used in the 
+{
+    /** to store bytes that will be used in the
         next write/read operation, if any */
     uint8_t             InternalBuf[PH_FRINFC_NDEFMAP_MFUL_4BYTES_BUF];
     /** to Store the length of the internalBuf */
@@ -498,10 +505,10 @@ typedef struct phFriNfc_MifareULCont
     uint8_t             ReadBuf[PH_FRINFC_NDEFMAP_MFUL_64BYTES_BUF];
     /** index of the above buffer */
     uint16_t            ReadBufIndex;
-    /** This variable stores the index of the "ReadBuf" from which actual 
+    /** This variable stores the index of the "ReadBuf" from which actual
         data has to be copied into the user buffer */
     uint16_t            ByteNumber;
-    /** indicates that read/write has reached the end of the 
+    /** indicates that read/write has reached the end of the
         card */
     uint8_t             ReadWriteCompleteFlag;
     /** Buffer to store 4 bytes of data which is written to a block */
@@ -517,8 +524,8 @@ typedef struct phFriNfc_MifareULCont
  *
  */
 typedef struct phFriNfc_MockupCont
-{   
-    /** to store bytes that will be used in the 
+{
+    /** to store bytes that will be used in the
         next write/read operation, if any */
     uint8_t             *NdefData;
     /** to Store the length of the internalBuf */
@@ -548,7 +555,7 @@ typedef struct phFriNfc_NDEFTLVCont
     uint8_t             NdefTLVSector;
     /** Following two variables are used to store the
         T byte and the Block number in which the T is
-        found in Tag */     
+        found in Tag */
     /** Byte number of the next/present available TLV */
     uint16_t            NdefTLVByte;
     /** Block number of the next/present available TLV */
@@ -563,21 +570,21 @@ typedef struct phFriNfc_NDEFTLVCont
         and next read contains length (L) bytes of TLV. This flag
         is set when the Length (L) of TLV is found in the last read */
     uint8_t             LcheckedinTLVFlag;
-    /** This flag is set, if Terminator TLV is already written 
+    /** This flag is set, if Terminator TLV is already written
         and next read contains value (V) bytes of TLV. This flag
         is set when the value (V) of TLV is found in the last read */
     uint8_t             SetTermTLVFlag;
-    /** To know the number of Length (L) field is present in the 
+    /** To know the number of Length (L) field is present in the
         next block */
     uint8_t             NoLbytesinTLV;
-    /** The value of 3 bytes length(L) field in TLV. In 3 bytes 
-        length field, 2 bytes are in one block and other 1 byte 
-        is in the next block. To store the former block length 
+    /** The value of 3 bytes length(L) field in TLV. In 3 bytes
+        length field, 2 bytes are in one block and other 1 byte
+        is in the next block. To store the former block length
         field value, this variable is used */
     uint16_t            prevLenByteValue;
     /** The value of length(L) field in TLV. */
     uint16_t            BytesRemainLinTLV;
-    /** Actual size to read and write. This will be always equal to the 
+    /** Actual size to read and write. This will be always equal to the
         length (L) of TLV as there is only one NDEF TLV . */
     uint16_t            ActualSize;
     /** Flag is to write the length (L) field of the TLV */
@@ -593,7 +600,7 @@ typedef struct phFriNfc_NDEFTLVCont
 /**
  *  \ingroup grp_fri_nfc_ndef_map
  *  \brief Lock Control TLV structure which stores the Position,
- *         Size and PageCntrl details. 
+ *         Size and PageCntrl details.
  */
 
 typedef struct phFriNfc_LockCntrlTLVCont
@@ -602,7 +609,7 @@ typedef struct phFriNfc_LockCntrlTLVCont
         in the card memory*/
     uint16_t             ByteAddr;
 
-    /** Specifies the Size of the lock area in terms of 
+    /** Specifies the Size of the lock area in terms of
         bits/bytes*/
     uint16_t             Size;
 
@@ -631,7 +638,7 @@ typedef struct phFriNfc_LockCntrlTLVCont
 /**
  *  \ingroup grp_fri_nfc_ndef_map
  *  \brief Memeory Control TLV structure which stores the Position,
- *         Size and PageCntrl details of the reserved byte area. 
+ *         Size and PageCntrl details of the reserved byte area.
  */
 
 typedef struct phFriNfc_ResMemCntrlTLVCont
@@ -640,7 +647,7 @@ typedef struct phFriNfc_ResMemCntrlTLVCont
         in the card memory*/
     uint16_t             ByteAddr;
 
-    /** Specifies the Size of the lock area in terms of 
+    /** Specifies the Size of the lock area in terms of
         bits/bytes*/
     uint16_t             Size;
 
@@ -673,7 +680,7 @@ typedef struct phFriNfc_ResMemCntrlTLVCont
  */
 typedef struct phFriNfc_TopazCont
 {
-    /** This stores the free memory size left in the card. In case of topaz, 
+    /** This stores the free memory size left in the card. In case of topaz,
         this is updated only during check ndef */
     uint16_t            RemainingSize;
     /** Stores the current block number */
@@ -694,7 +701,7 @@ typedef struct phFriNfc_TopazCont
     uint8_t             CCByteBuf[4];
     /** Store the Buffer Index */
     uint16_t             Cur_RW_Index;
-          
+
     /* No of bytes read or write*/
     uint16_t            ByteRWFrmCard;
 
@@ -704,11 +711,11 @@ typedef struct phFriNfc_TopazCont
      /** Store the read bytes */
     uint8_t             ReadBuffer[PH_FRINFC_NDEFMAP_TOPAZ_MAX_SIZE];
 
-    /** Size to know the exact data filled in the ReadBuffer. Useful, when the 
+    /** Size to know the exact data filled in the ReadBuffer. Useful, when the
         offset = PH_FRINFC_NDEFMAP_SEEK_CUR */
     uint8_t             ReadBufferSize;
 
-    /** NDEF TLV byte address, This stores the byte address of 
+    /** NDEF TLV byte address, This stores the byte address of
         TYPE field of the TLV */
     uint16_t            NdefTLVByteAddress;
 
@@ -721,14 +728,14 @@ typedef struct phFriNfc_TopazCont
     /** Actual NDEF message size */
     uint16_t            ActualNDEFMsgSize;
 
-    /** NDEF Read Write size in the card, this excludes lock and reserved bytes, 
+    /** NDEF Read Write size in the card, this excludes lock and reserved bytes,
         mentioned in the LOCK and MEMORY control TLVs */
     uint16_t            NDEFRWSize;
 
-    /** Remaining read size in the card, after reading the card. 
-        User has asked for the data less than " ActualNDEFMsgSize ", 
+    /** Remaining read size in the card, after reading the card.
+        User has asked for the data less than " ActualNDEFMsgSize ",
         then remaining read bytes are stored in this variable.
-        If the next read is with offset = PH_FRINFC_NDEFMAP_SEEK_CUR, 
+        If the next read is with offset = PH_FRINFC_NDEFMAP_SEEK_CUR,
         then this variable is used.
     */
     uint16_t            RemainingReadSize;
@@ -746,13 +753,13 @@ typedef struct phFriNfc_TopazCont
 typedef struct phFriNfc_NdefMap
 {
     /**< \internal The state of the operation. */
-    uint8_t                         State;                                   
-    
+    uint8_t                         State;
+
     /**< \internal Completion Routine Context. */
-    phFriNfc_CplRt_t                CompletionRoutine[PH_FRINFC_NDEFMAP_CR]; 
-    
+    phFriNfc_CplRt_t                CompletionRoutine[PH_FRINFC_NDEFMAP_CR];
+
     /**< \internal Pointer to the lower (HAL) instance. */
-    void                            *LowerDevice;         
+    void                            *LowerDevice;
 
     /**<\internal Holds the device additional informations*/
     phHal_sDepAdditionalInfo_t      psDepAdditionalInfo;
@@ -761,24 +768,24 @@ typedef struct phFriNfc_NdefMap
     phFriNfc_CplRt_t                MapCompletionInfo;
 
     /**< \internal Pointer to the Remote Device Information */
-    phHal_sRemoteDevInformation_t   *psRemoteDevInfo;   
+    phHal_sRemoteDevInformation_t   *psRemoteDevInfo;
 
     /**<\internal Holds the Command Type(read/write)*/
     phHal_uCmdList_t               Cmd;
-    
+
     /**< \internal Pointer to a temporary buffer. Could be
           used for read/write purposes */
-    uint8_t                         *ApduBuffer;    
-    
+    uint8_t                         *ApduBuffer;
+
     /**< \internal Size allocated to the ApduBuffer. */
-    uint32_t                        ApduBufferSize; 
+    uint32_t                        ApduBufferSize;
 
     /**< \internal Index to the APDU Buffer. Used for internal calculations */
     uint16_t                        ApduBuffIndex;
-    
+
     /**< \internal Pointer to the user-provided Data Size to be written trough WrNdef function. */
     uint32_t                        *WrNdefPacketLength;
-    
+
 
     /**< \internal Holds the length of the received data. */
     uint16_t                        *SendRecvLength;
@@ -787,10 +794,10 @@ typedef struct phFriNfc_NdefMap
     uint8_t                         *SendRecvBuf;
 
     /**< \internal Holds the length of the data to be sent. */
-    uint16_t                        SendLength; 
+    uint16_t                        SendLength;
 
     /**< \internal Data Byte Count, which gives the offset to the integration.*/
-    uint16_t                        *DataCount; 
+    uint16_t                        *DataCount;
 
     /**< \ internal Holds the previous operation on the card*/
     uint8_t                         PrevOperation;
@@ -799,34 +806,34 @@ typedef struct phFriNfc_NdefMap
     uint8_t                         PrevState;
 
     /**< \internal Stores the type of the smart card. */
-    uint8_t                         CardType;   
+    uint8_t                         CardType;
 
      /**< \internal Stores the card state. */
-    uint8_t                         CardState;   
+    uint8_t                         CardState;
 
     /**< \internal Stores the memory size of the card */
     uint16_t                        CardMemSize;
 
     /**<\internal to Store the page offset on the mifare ul card*/
-    uint8_t                         Offset; 
+    uint8_t                         Offset;
 
     /** \internal specifies the desfire operation to be performed*/
-    uint8_t                         DespOpFlag; 
-    
-    /** \internal  Used to remeber how many bytes were written, to update 
+    uint8_t                         DespOpFlag;
+
+    /** \internal  Used to remeber how many bytes were written, to update
                    the dataCount and the BufferIndex */
     uint16_t                        NumOfBytesWritten;
 
     /**\internal used to remember number of L byte Remaining to be written */
-    uint16_t                        NumOfLReminWrite;       
+    uint16_t                        NumOfLReminWrite;
 
-    /** \internal  Pointer Used to remeber and return how many bytes were read, 
+    /** \internal  Pointer Used to remeber and return how many bytes were read,
                    to update the PacketDataLength in case of Read operation */
-    /*  Fix for 0000238: [gk] MAP: Number of bytes actually read out is 
+    /*  Fix for 0000238: [gk] MAP: Number of bytes actually read out is
         not returned. */
     uint32_t                        *NumOfBytesRead;
 
-    /** \internal  Flag used to tell the process function that WRITE has 
+    /** \internal  Flag used to tell the process function that WRITE has
                    requested for an internal READ.*/
     uint8_t                         ReadingForWriteOperation;
 
@@ -849,7 +856,7 @@ typedef struct phFriNfc_NdefMap
     /** \internal stores the TLV structure related informations  */
     phFriNfc_NDEFTLVCont_t          TLVStruct;
 
-    
+
     /** \internal stores the Lock Contrl Tlv related informations  */
     phFriNfc_LockCntrlTLVCont_t     LockTlv;
 
@@ -862,7 +869,7 @@ typedef struct phFriNfc_NdefMap
     #ifndef PH_FRINFC_EXCLUDE_FROM_TESTFW /* */
         /** \internal Desfire capability Container Structure. */
 #ifndef PH_FRINFC_MAP_DESFIRE_DISABLED
-        phFriNfc_DesfireCapCont_t       DesfireCapContainer;  
+        phFriNfc_DesfireCapCont_t       DesfireCapContainer;
 #endif  /* PH_FRINFC_MAP_DESFIRE_DISABLED */
 
 #ifndef PH_FRINFC_MAP_MIFARESTD_DISABLED
@@ -870,7 +877,7 @@ typedef struct phFriNfc_NdefMap
         phFriNfc_MifareStdCont_t        StdMifareContainer;
 #endif  /* PH_FRINFC_MAP_MIFARESTD_DISABLED */
 
-#ifndef PH_FRINFC_MAP_FELICA_DISABLED        
+#ifndef PH_FRINFC_MAP_FELICA_DISABLED
         /** \internal Following are the Felica Smart tag related strucutre & variables */
         phFriNfc_Felica_t               Felica;
 
@@ -908,7 +915,7 @@ typedef struct phFriNfc_NdefMap
  *
  * \brief Ndef Mapping \b Reset function
  *
- * \copydoc page_reg Resets the component instance to the initial state and initialises the 
+ * \copydoc page_reg Resets the component instance to the initial state and initialises the
  *          internal variables.
  *
  * \param[in] NdefMap is a Pointer to a valid and initialised or uninitialised instance
@@ -919,7 +926,7 @@ typedef struct phFriNfc_NdefMap
  *                            the information about the device (Smart card, NFC device) to access.
  * \param[in] psDevInputParam The Device input parameter, as used for the HAL POLL function.
  *                            This parameter is needed by the component in special cases, when an internal call
- *                            to POLL is required again, such as for FeliCa. The storage of the structure behind 
+ *                            to POLL is required again, such as for FeliCa. The storage of the structure behind
  *                            the pointer must be retained by the calling software. The component itself only
  *                            keeps the reference. No change is applied to the structure's content.
  * \param[in] TrxBuffer Pointer to an internally used buffer. The buffer has to be allocated by
@@ -927,12 +934,12 @@ typedef struct phFriNfc_NdefMap
  *                      this storage is to serve as an intermediate buffer for data frame
  *                      composition and analysis.
  *                      The size shall be at least \ref PH_FRINFC_NDEFMAP_MAX_SEND_RECV_BUF_SIZE .
- * \param[in] TrxBufferSize The size of TrxBuffer: 
+ * \param[in] TrxBufferSize The size of TrxBuffer:
  *            The size shall be at least \ref PH_FRINFC_NDEFMAP_MAX_SEND_RECV_BUF_SIZE .
  * \param[in] ReceiveBuffer Pointer to a buffer that the component uses internally use to
  *            store the data received from the lower component.
  *            The size shall be at least \ref PH_FRINFC_NDEFMAP_MAX_SEND_RECV_BUF_SIZE .
- * \param[in] ReceiveLength The size of ReceiveBuffer. This specifies the actual length 
+ * \param[in] ReceiveLength The size of ReceiveBuffer. This specifies the actual length
  *            of the data received from the lower component.
  *            The size shall be at least \ref PH_FRINFC_NDEFMAP_MAX_SEND_RECV_BUF_SIZE .
  * \param[in] DataCount Specifies the offset count during read/write operations. This can be
@@ -973,7 +980,7 @@ NFCSTATUS phFriNfc_NdefMap_Reset(phFriNfc_NdefMap_t              *NdefMap,
  * is available. The list of valid function IDs can be found under the section
  * "Completion Routine Indices", like e.g. \ref PH_FRINFC_NDEFMAP_CR_CHK_NDEF.
  *
- * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t structure 
+ * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t structure
  *                    serving as the component context.
  * \param[in] FunctionID ID of the component API function to set a with a completion routine for.
  *                       A valid routine has to be assigned for each function ID.
@@ -1004,7 +1011,7 @@ NFCSTATUS phFriNfc_NdefMap_SetCompletionRoutine(phFriNfc_NdefMap_t  *NdefMap,
  * The function initiates the reading of NDEF information from a Remote Device.
  * It performs a reset of the state and restarts the state machine.
  *
- * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t 
+ * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t
  *                    component context structure.
  * \param[in,out] PacketData  Pointer to a location that shall receive the NDEF Packet.
  * \param[in,out] PacketDataLength Pointer to a variable that shall receive the length of the NDEF packet.
@@ -1016,7 +1023,7 @@ NFCSTATUS phFriNfc_NdefMap_SetCompletionRoutine(phFriNfc_NdefMap_t  *NdefMap,
  *            If the caller sets the value to \ref PH_FRINFC_NDEFMAP_SEEK_CUR, the component shall
  *            start reading from the last offset set (continue where it has stopped before).
  *            If set to \ref PH_FRINFC_NDEFMAP_SEEK_BEGIN, the component shall start reading
- *            from the begining of the card (restarted) 
+ *            from the begining of the card (restarted)
  *
  * \retval NFCSTATUS_PENDING               The action has been successfully triggered.
  * \retval NFCSTATUS_SUCCESS               Operation Successful.
@@ -1049,7 +1056,7 @@ NFCSTATUS phFriNfc_NdefMap_RdNdef(phFriNfc_NdefMap_t      *NdefMap,
  * A periodic call of the \ref phFriNfc_NdefMap_Process has to be done once the action
  * has been triggered.
  *
- * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t 
+ * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t
  *                    component context structure.
  * \param[in] PacketData  Pointer to a location that holds the prepared NDEF Packet.
  * \param[in,out] PacketDataLength Pointer to a variable that shall specify the length of the prepared NDEF packet.
@@ -1061,7 +1068,7 @@ NFCSTATUS phFriNfc_NdefMap_RdNdef(phFriNfc_NdefMap_t      *NdefMap,
  *            If the caller sets the value to \ref PH_FRINFC_NDEFMAP_SEEK_CUR, the component shall
  *            start writing from the last offset set (continue where it has stopped before).
  *            If set to \ref PH_FRINFC_NDEFMAP_SEEK_BEGIN, the component shall start writing
- *            from the begining of the card (restarted) 
+ *            from the begining of the card (restarted)
  *
  * \retval NFCSTATUS_PENDING               The action has been successfully triggered.
  * \retval NFCSTATUS_SUCCESS               Operation Successful.
@@ -1090,7 +1097,7 @@ extern NFCSTATUS phFriNfc_NdefMap_WrNdef(phFriNfc_NdefMap_t  *NdefMap,
  *
  * \copydoc page_ovr Check whether a particular Remote Device is NDEF compliant.
  *
- * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t 
+ * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t
  *                    component context structure.
  *
  * \retval NFCSTATUS_PENDING               The action has been successfully triggered.
@@ -1112,10 +1119,10 @@ NFCSTATUS phFriNfc_NdefMap_ChkNdef(phFriNfc_NdefMap_t *NdefMap);
  *
  * \brief Ndef Mapping \b Erase \b NDEF function
  *
- * \copydoc page_ovr find the position of the existing NDEF TLV and overwrite with \b empty NDEF 
+ * \copydoc page_ovr find the position of the existing NDEF TLV and overwrite with \b empty NDEF
  * message \b at that position.
  *
- * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t 
+ * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t
  *                    component context structure.
  *
  * \retval NFCSTATUS_PENDING               The action has been successfully triggered.
@@ -1139,7 +1146,7 @@ NFCSTATUS phFriNfc_NdefMap_EraseNdef(phFriNfc_NdefMap_t *NdefMap);
  *
  * \copydoc page_ovr Returns the size of the NDEF data that the card can hold to the caller.
  *
- * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t 
+ * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t
  *                    component context structure.
  *
  * \param[out] size Pointer to a uint32_t variable, which receives the size of the NDEF data
@@ -1187,7 +1194,7 @@ void phFriNfc_NdefMap_Process(void        *Context,
  *
  * \copydoc page_ovr Checks the presence of a valid TLV's(NDEF/Propritery).
  *
- * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t 
+ * \param[in] NdefMap Pointer to a valid instance of the \ref phFriNfc_NdefMap_t
  *                    component context structure.
  *
  * \retval NFCSTATUS_INVALID_FORMAT         No valid TLV Found.
@@ -1199,13 +1206,13 @@ NFCSTATUS phFriNfc_ChkAndParseTLV(phFriNfc_NdefMap_t    *NdefMap);
 
 #ifdef PHFRINFC_OVRHAL_MOCKUP  /* */
 
-/** 
+/**
  * \ingroup grp_fri_nfc_ndef_map
  *
  * \brief Set data NDEF in mockup mode
  *
  * \param[in]       NdefMap          Pointer to a valid instance of the \ref phFriNfc_NdefMap_t component context structure.
- * \param[in]       NdefData         Pointer to card mockup data 
+ * \param[in]       NdefData         Pointer to card mockup data
  * \param[in]       NdefActualSize    The actual data length
  * \param[in]       NdefMaxSize       The max data length
  * \param[in]       NdefCardSize     The total card size
@@ -1219,7 +1226,7 @@ NFCSTATUS phFriNfc_NdefMap_MockupNDefModeEn(uint8_t  *pNdefCompliancy, uint8_t
 
 
 /**
- * \internal 
+ * \internal
  * \name States of the FSM.
  *
  */
@@ -1229,13 +1236,13 @@ NFCSTATUS phFriNfc_NdefMap_MockupNDefModeEn(uint8_t  *pNdefCompliancy, uint8_t
 #define PH_FRINFC_NDEFMAP_STATE_EOF_CARD                    2   /**< \internal EOF card reached */
 /*@}*/
 
-/* Following values specify the previous operation on the card. This value is assigned to 
+/* Following values specify the previous operation on the card. This value is assigned to
    the context structure variable: PrevOperation. */
 
 /**< Previous operation is check*/
-#define PH_FRINFC_NDEFMAP_CHECK_OPE                         1 
+#define PH_FRINFC_NDEFMAP_CHECK_OPE                         1
 /**< Previous operation is read*/
-#define PH_FRINFC_NDEFMAP_READ_OPE                          2  
+#define PH_FRINFC_NDEFMAP_READ_OPE                          2
 /**< Previous operation is write */
 #define PH_FRINFC_NDEFMAP_WRITE_OPE                         3
 /**< Previous operation is Actual size */