diff options
| author | aferir <arnaud.ferir@trusted-logic.com> | 2010-11-02 22:57:43 -0500 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-11-03 13:13:38 -0500 |
| commit | e1b8bffcf9ff1a5c290c03be5a1d85be0c103223 (patch) | |
| tree | 2e63f807583e0d11b40d4e48f32c348376e8832e /inc | |
| parent | b5419c7dd2b703f796dc10480a5a73c907f41e14 (diff) | |
| download | external_libnfc-nxp-e1b8bffcf9ff1a5c290c03be5a1d85be0c103223.zip external_libnfc-nxp-e1b8bffcf9ff1a5c290c03be5a1d85be0c103223.tar.gz external_libnfc-nxp-e1b8bffcf9ff1a5c290c03be5a1d85be0c103223.tar.bz2 | |
fixed ISO15693 collision
Change-Id: Ic27ec9adbdffb064f03f567b160b05502def2444
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/phNfcConfig.h | 14 |
1 files changed, 8 insertions, 6 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
/* ***************************************************************** |