commit 94f24b787a111d05802c328fd6917dc073dbd350
author Linux Build Service Account <lnxbuild@quicinc.com> Mon Aug 21 04:29:15 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Aug 21 04:29:15 2017 -0700
tree 9a8a7c745b04d5b1e5901de72de7c227513ccde6
parent 29bd3177ed39bca8feaa0e18ebbe5999e86ba83e
parent 0f2d47fddf36bd39e0842ced53d00636d7927c2e

Merge "NFC: Fix CTS HCE Felica Emulator Test Failure"

src/nfa/ce/nfa_ce_act.c

diff --git a/src/nfa/ce/nfa_ce_act.c b/src/nfa/ce/nfa_ce_act.c
index 11f1c38..9b4882b 100755
--- a/src/nfa/ce/nfa_ce_act.c
+++ b/src/nfa/ce/nfa_ce_act.c
@@ -410,7 +410,6 @@
   if(NFC_GetNCIVersion() != NCI_VERSION_2_0) {
     UINT8_TO_STREAM (p_params, NCI_PARAM_ID_LF_T3T_PMM);      /* type */
     UINT8_TO_STREAM (p_params, NCI_PARAM_LEN_LF_T3T_PMM);     /* length */
-    ARRAY_TO_BE_STREAM(p_params,t3tPMM, NCI_T3T_PMM_LEN);
   }
 #else
   /* Mask of IDs to disable listening */

src/nfa/ce/nfa_ce_api.c

diff --git a/src/nfa/ce/nfa_ce_api.c b/src/nfa/ce/nfa_ce_api.c
index 9577380..e516d81 100644
--- a/src/nfa/ce/nfa_ce_api.c
+++ b/src/nfa/ce/nfa_ce_api.c
@@ -331,7 +331,6 @@
 *******************************************************************************/
 tNFA_STATUS NFA_CeRegisterFelicaSystemCodeOnDH(uint16_t system_code,
                                                uint8_t nfcid2[NCI_RF_F_UID_LEN],
-                                               uint8_t t3tPmm[NCI_T3T_PMM_LEN],
                                                tNFA_CONN_CBACK* p_conn_cback) {
   tNFA_CE_MSG* p_msg;
 
@@ -348,7 +347,6 @@
 
     /* Listen info */
     memcpy(p_msg->reg_listen.nfcid2, nfcid2, NCI_RF_F_UID_LEN);
-    memcpy(p_msg->reg_listen.t3tPmm, t3tPmm, NCI_T3T_PMM_LEN);
     p_msg->reg_listen.system_code = system_code;
 
     nfa_sys_sendmsg(p_msg);

src/nfa/include/nfa_ce_api.h

diff --git a/src/nfa/include/nfa_ce_api.h b/src/nfa/include/nfa_ce_api.h
index b4f1da8..28a5708 100644
--- a/src/nfa/include/nfa_ce_api.h
+++ b/src/nfa/include/nfa_ce_api.h
@@ -182,7 +182,6 @@
 *******************************************************************************/
 extern tNFA_STATUS NFA_CeRegisterFelicaSystemCodeOnDH(
     uint16_t system_code, uint8_t nfcid2[NCI_RF_F_UID_LEN],
-    uint8_t t3tPmm[NCI_T3T_PMM_LEN],
     tNFA_CONN_CBACK* p_conn_cback);
 
 /*******************************************************************************