summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-05-23 15:49:47 -0700
committerNick Pelly <npelly@google.com>2011-05-23 16:02:49 -0700
commit4be773cac714184b24bc9d4191b778efefe16472 (patch)
tree03a6f1b4ae5dff185fdc9a27f910cf25d6f8e10f
parent74decc93d868ec1a8f3975a4ce3d1548c6ec6d8f (diff)
downloadexternal_libnfc-nxp-4be773cac714184b24bc9d4191b778efefe16472.zip
external_libnfc-nxp-4be773cac714184b24bc9d4191b778efefe16472.tar.gz
external_libnfc-nxp-4be773cac714184b24bc9d4191b778efefe16472.tar.bz2
Update P2P Modes.
o Fix DEFAULT_NFCIP_INITIATOR_MODE_SUPPORT, DEFAULT_NFCIP_TARGET_MODE_SUPPORT to allow all possible modes (actual modes selected by Nfc.apk). o Fix phNfc_eP2PMode_t enum to list initiator modes. Change-Id: I841b6f1387ac536f47d357a0430eb9362b419810
-rw-r--r--inc/phNfcConfig.h6
-rw-r--r--inc/phNfcTypes.h10
2 files changed, 9 insertions, 7 deletions
diff --git a/inc/phNfcConfig.h b/inc/phNfcConfig.h
index ccc20c0..19a881b 100644
--- a/inc/phNfcConfig.h
+++ b/inc/phNfcConfig.h
@@ -141,7 +141,7 @@
/**< Default Session ID for Initialisation */
#ifndef DEFAULT_SESSION
-#define DEFAULT_SESSION "android7"
+#define DEFAULT_SESSION "android8"
#endif
@@ -240,7 +240,7 @@
#define DEV_MGMT_ACT_GRD_TO_DEFAULT 0x20U
#endif
-/**< NFCIP Active Mode Configuration
+/**< NFCIP Active Mode Default Configuration (when acting as Target)
0x01 106 kbps
0x02 212 kbps
0x04 424 kbps
@@ -323,7 +323,7 @@
/**< Macro to Enable the Peer to Peer Feature */
#define ENABLE_P2P
-#define DEFAULT_NFCIP_INITIATOR_MODE_SUPPORT 0x0FU
+#define DEFAULT_NFCIP_INITIATOR_MODE_SUPPORT 0x3FU
#define DEFAULT_NFCIP_TARGET_MODE_SUPPORT 0x0FU
/**< Macro to Enable the ISO14443-B Feature */
diff --git a/inc/phNfcTypes.h b/inc/phNfcTypes.h
index 03ce30d..989cfe8 100644
--- a/inc/phNfcTypes.h
+++ b/inc/phNfcTypes.h
@@ -978,10 +978,12 @@ typedef enum phNfc_eP2PMode_t
{
phNfc_eDefaultP2PMode = 0x00U,
phNfc_ePassive106 = 0x01U,
- phNfc_ePassive212 = 0x02U,
- phNfc_ePassive424 = 0x04U,
- phNfc_eActive = 0x08U,
- phNfc_eP2P_ALL = 0x0FU,
+ phNfc_ePassive212 = 0x02U,
+ phNfc_ePassive424 = 0x04U,
+ phNfc_eActive106 = 0x08U,
+ phNfc_eActive212 = 0x10U,
+ phNfc_eActive424 = 0x20U,
+ phNfc_eP2P_ALL = 0x27U, /* All Passive and 424 Active */
phNfc_eInvalidP2PMode = 0xFFU
} phNfc_eP2PMode_t;