commit ae2dabbe3237514bf7398333026840d36f458505
author Martijn Coenen <maco@google.com> Fri Jan 08 10:04:55 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 08 10:04:55 2016 +0000
tree 2c9651a7c987a592b9fb5c19d9337e9fbd9f9f9d
parent dc0e6b62493b650bed4a26f55a61f50bebf7121c
parent 4fa41c72cb561579743db93db9e1e57845f60860

Merge "Implementation of HCE for NFC-F."

src/nfa/dm/nfa_dm_act.c

diff --git a/src/nfa/dm/nfa_dm_act.c b/src/nfa/dm/nfa_dm_act.c
index d28689e..e0268c2 100644
--- a/src/nfa/dm/nfa_dm_act.c
+++ b/src/nfa/dm/nfa_dm_act.c
@@ -147,7 +147,7 @@
         nfa_dm_cb.params.lf_t3t_id[xx][0] = 0xFF;
         nfa_dm_cb.params.lf_t3t_id[xx][1] = 0xFF;
         nfa_dm_cb.params.lf_t3t_id[xx][2] = 0x02;
-        nfa_dm_cb.params.lf_t3t_id[xx][2] = 0xFE;
+        nfa_dm_cb.params.lf_t3t_id[xx][3] = 0xFE;
     }
 
     /* LF_T3T_PMM */

src/nfa/dm/nfa_dm_cfg.c

diff --git a/src/nfa/dm/nfa_dm_cfg.c b/src/nfa/dm/nfa_dm_cfg.c
index 2ae9966..0f9400b 100644
--- a/src/nfa/dm/nfa_dm_cfg.c
+++ b/src/nfa/dm/nfa_dm_cfg.c
@@ -30,8 +30,8 @@
     13,                         /* total length */
     NFC_PMID_LF_T3T_PMM,        /* Type-3 tag default PMM */
     NCI_PARAM_LEN_LF_T3T_PMM,
-    0x20,
-    0x79,
+    0x01,                       /* This PAD0 is used to identify HCE-F on Android */
+    0xFE,                       /* This PAD0 is used to identify HCE-F on Android */
     0xFF,
     0xFF,
     0xFF,

src/nfc/tags/ce_t3t.c

diff --git a/src/nfc/tags/ce_t3t.c b/src/nfc/tags/ce_t3t.c
index 97de9ac..2d2b32f 100644
--- a/src/nfc/tags/ce_t3t.c
+++ b/src/nfc/tags/ce_t3t.c
@@ -57,7 +57,18 @@
 /*******************************************************************************
 * Static constant definitions
 *******************************************************************************/
-static const UINT8 CE_DEFAULT_LF_PMM[NCI_T3T_PMM_LEN] = {0x20, 0x79, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};   /* Default PMm param */
+/* Default PMm param */
+static const UINT8 CE_DEFAULT_LF_PMM[NCI_T3T_PMM_LEN] =
+{
+    0x01,    /* This PAD0 is used to identify HCE-F on Android */
+    0xFE,    /* This PAD0 is used to identify HCE-F on Android */
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xFF
+};
 
 /*******************************************************************************
 **