commit 021a826c4beed65195918aa8b17d9a3f97aa105b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 13 00:24:54 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 13 00:24:54 2017 +0000
tree f52a56887855baab9e8613fe7c10dc1c76d868e0
parent e0e5b011e0b91088ee1ac3c667e359fc263d4f7a
parent e4f5740db739da80d41a020b721802ed0567c1f7

Merge changes from topic 'nci-2.0'

* changes:
  halimpl: Removed hardcoaded routing table.
  Enable screen on lock for ISO-DEP Protocol.

halimpl/pn54x/hal/phNxpNciHal_ext.c

diff --git a/halimpl/pn54x/hal/phNxpNciHal_ext.c b/halimpl/pn54x/hal/phNxpNciHal_ext.c
index 81d4bb1..cbfa296 100644
--- a/halimpl/pn54x/hal/phNxpNciHal_ext.c
+++ b/halimpl/pn54x/hal/phNxpNciHal_ext.c
@@ -604,26 +604,7 @@
   if (phNxpDta_IsEnable() == true) {
     status = phNxpNHal_DtaUpdate(cmd_len, p_cmd_data, rsp_len, p_rsp_data);
   }
-  if (nxpncihal_ctrl.nci_info.nci_version == NCI_VERSION_2_0 &&
-      p_cmd_data[0] == 0x21 && p_cmd_data[1] == 0x01) {
-    NXPLOG_NCIHAL_D("Setting up routing table - start");
-    p_cmd_data[2] = 0x0C;
-    p_cmd_data[3] = 0x00;
-    p_cmd_data[4] = 0x02;
-    p_cmd_data[5] = 0x01;
-    p_cmd_data[6] = 0x03;
-    p_cmd_data[7] = 0x00;
-    p_cmd_data[8] = 0x01;
-    p_cmd_data[9] = 0x05;
-    p_cmd_data[10] = 0x01;
-    p_cmd_data[11] = 0x03;
-    p_cmd_data[12] = 0x00;
-    p_cmd_data[13] = 0x01;
-    p_cmd_data[14] = 0x04;
-    *cmd_len = 15;
-    NXPLOG_NCIHAL_D("Setting up routing table - END");
-    status = NFCSTATUS_SUCCESS;
-  }
+
   if (p_cmd_data[0] == PROPRIETARY_CMD_FELICA_READER_MODE &&
       p_cmd_data[1] == PROPRIETARY_CMD_FELICA_READER_MODE &&
       p_cmd_data[2] == PROPRIETARY_CMD_FELICA_READER_MODE) {

src/nfa/ee/nfa_ee_act.c

diff --git a/src/nfa/ee/nfa_ee_act.c b/src/nfa/ee/nfa_ee_act.c
index 0dc30fd..670f543 100644
--- a/src/nfa/ee/nfa_ee_act.c
+++ b/src/nfa/ee/nfa_ee_act.c
@@ -274,6 +274,11 @@
        * which are not in the routing table can also be blocked */
       if (nfa_ee_proto_mask_list[xx] == NFA_PROTOCOL_MASK_ISO_DEP) {
         proto_tag = NFC_ROUTE_TAG_PROTO | nfa_ee_cb.route_block_control;
+
+        /* Enable screen on lock power state for ISO-DEP protocol to
+           enable HCE screen lock */
+        if (NFC_GetNCIVersion() == NCI_VERSION_2_0)
+          power_cfg |= NCI_ROUTE_PWR_STATE_SCREEN_ON_LOCK;
       } else {
         proto_tag = NFC_ROUTE_TAG_PROTO;
       }