diff options
author | Jeff Hamilton <jham@google.com> | 2011-04-17 07:52:25 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-17 07:52:25 -0700 |
commit | 4ce9f49c89e0ad124f950f535b63dc401117f0d8 (patch) | |
tree | c3a54fd675c838a7980f7a94adcb300cbb889997 | |
parent | 32e6c583a586eabb10bb68e2a6ce0d4b2640fd16 (diff) | |
parent | 17018c3fdfd2a3e17cb8ff950fea16ea1000506e (diff) | |
download | external_libnfc-nxp-4ce9f49c89e0ad124f950f535b63dc401117f0d8.zip external_libnfc-nxp-4ce9f49c89e0ad124f950f535b63dc401117f0d8.tar.gz external_libnfc-nxp-4ce9f49c89e0ad124f950f535b63dc401117f0d8.tar.bz2 |
am 17018c3f: Merge "Enable P2P 106 passive (again)." into gingerbread
* commit '17018c3fdfd2a3e17cb8ff950fea16ea1000506e':
Enable P2P 106 passive (again).
-rw-r--r-- | inc/phNfcConfig.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/phNfcConfig.h b/inc/phNfcConfig.h index 3f5a108..ccc20c0 100644 --- a/inc/phNfcConfig.h +++ b/inc/phNfcConfig.h @@ -141,7 +141,7 @@ /**< Default Session ID for Initialisation */ #ifndef DEFAULT_SESSION -#define DEFAULT_SESSION "android6" +#define DEFAULT_SESSION "android7" #endif @@ -324,7 +324,7 @@ #define ENABLE_P2P #define DEFAULT_NFCIP_INITIATOR_MODE_SUPPORT 0x0FU -#define DEFAULT_NFCIP_TARGET_MODE_SUPPORT 0x0EU +#define DEFAULT_NFCIP_TARGET_MODE_SUPPORT 0x0FU /**< Macro to Enable the ISO14443-B Feature */ #define TYPE_B |