diff options
| -rw-r--r-- | inc/phNfcConfig.h | 14 | ||||
| -rw-r--r-- | src/phHciNfc_ISO15693.c | 6 | ||||
| -rw-r--r-- | src/phHciNfc_RFReader.c | 12 |
3 files changed, 24 insertions, 8 deletions
diff --git a/inc/phNfcConfig.h b/inc/phNfcConfig.h index 2e898f9..e5fe6d7 100644 --- a/inc/phNfcConfig.h +++ b/inc/phNfcConfig.h @@ -25,10 +25,10 @@ * * Project: NFC-FRI-1.1 / HAL4.0 * -* $Date: Fri Jun 11 16:20:17 2010 $ +* $Date: Thu Sep 9 14:56:35 2010 $
* $Author: ing04880 $ -* $Revision: 1.37 $ -* $Aliases: NFC_FRI1.1_WK1023_R35_1 $ +* $Revision: 1.39 $
+* $Aliases: $
* */ @@ -47,8 +47,8 @@ */ /*@{*/ -#define PH_NFC_CONFIG_FILEREVISION "$Revision: 1.37 $" /**< \ingroup grp_file_attributes */ -#define PH_NFC_CONFIG_FILEALIASES "$Aliases: NFC_FRI1.1_WK1023_R35_1 $" /**< \ingroup grp_file_attributes */ +#define PH_NFC_CONFIG_FILEREVISION "$Revision: 1.39 $" /**< \ingroup grp_file_attributes */
+#define PH_NFC_CONFIG_FILEALIASES "$Aliases: $" /**< \ingroup grp_file_attributes */
/*@}*/ @@ -485,7 +485,9 @@ #define NXP_NFC_IFC_CONFIG_DEFAULT 0x203AU #endif - +#ifndef NFC_ISO_15693_MULTIPLE_TAGS_SUPPORT
+#define NFC_ISO_15693_MULTIPLE_TAGS_SUPPORT 0x00
+#endif
/* ***************************************************************** diff --git a/src/phHciNfc_ISO15693.c b/src/phHciNfc_ISO15693.c index f9a3f9e..99ba86e 100644 --- a/src/phHciNfc_ISO15693.c +++ b/src/phHciNfc_ISO15693.c @@ -27,7 +27,7 @@ * $Date: Thu Feb 11 18:54:47 2010 $ * * $Author: ing04880 $ * * $Revision: 1.7 $ * -* $Aliases: NFC_FRI1.1_WK1007_R33_1,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 $ +* $Aliases: $ * * * =========================================================================== * */ @@ -599,12 +599,16 @@ phHciNfc_Recv_ISO15693_Event( { phNfc_sCompletionInfo_t pCompInfo; +/* #define NFC_ISO_15693_MULTIPLE_TAGS_SUPPORT 0x00 */ +#if (NFC_ISO_15693_MULTIPLE_TAGS_SUPPORT >= 0x01) + if (ISO_15693_MULTIPLE_TAGS_FOUND == message->payload[i]) { ps_15693_info->multiple_tgts_found = ISO_15693_MULTIPLE_TAGS_FOUND; pCompInfo.status = NFCSTATUS_MULTIPLE_TAGS; } else +#endif /* #if (NFC_ISO_15693_MULTIPLE_TAGS_SUPPORT <= 0x01) */ { ps_15693_info->multiple_tgts_found = FALSE; pCompInfo.status = NFCSTATUS_SUCCESS; diff --git a/src/phHciNfc_RFReader.c b/src/phHciNfc_RFReader.c index e0aa2dc..816c48d 100644 --- a/src/phHciNfc_RFReader.c +++ b/src/phHciNfc_RFReader.c @@ -27,7 +27,7 @@ * $Date: Wed Apr 21 12:21:15 2010 $ * * $Author: ing07385 $ * * $Revision: 1.53 $ * -* $Aliases: NFC_FRI1.1_WK1007_R33_6,NFC_FRI1.1_WK1017_PREP1,NFC_FRI1.1_WK1017_R34_1,NFC_FRI1.1_WK1017_R34_2,NFC_FRI1.1_WK1023_R35_1 $ * +* $Aliases: NFC_FRI1.1_WK1007_R33_6 $ * * * * =========================================================================== * */ @@ -1524,6 +1524,16 @@ phHciNfc_ReaderMgmt_Activate_Next( break; } #endif /* #ifdef TYPE_FELICA */ +#ifdef TYPE_ISO15693 + case phHal_eISO15693_PCD: + { + /* Get the ISO 15693 Reader Pipe ID */ + status = phHciNfc_ISO15693_Get_PipeID + (psHciContext, &reader_pipe_id); + + break; + } +#endif /* #ifdef TYPE_ISO15693 */ default: { status = PHNFCSTVAL(CID_NFC_HCI, NFCSTATUS_FEATURE_NOT_SUPPORTED); |