commit 7a8401b807954ffe84fd3c70c170667a21ff6658
author nxpandroid <srikrishna.pramoda@nxp.com> Wed Sep 13 16:00:46 2017 +0530
committer nxpandroid <srikrishna.pramoda@nxp.com> Wed Sep 13 16:00:46 2017 +0530
tree e01eeead662f053a945ca687b8946ad0e8dcc743
parent 0e3d6a54bef5cf799ec535e3a1fa43b2d50f0db0

 Remove APDU and connectivity pipe dependency on bin file

halimpl/pn54x/hal/phNxpNciHal.c

diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c
index f11d46b..01445b4 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.c
+++ b/halimpl/pn54x/hal/phNxpNciHal.c
@@ -1337,7 +1337,9 @@
       }
   }
   config_access = false;
+  if(nfcFL.eseFL._EXCLUDE_NV_MEM_DEPENDENCY == false) {
   phNxpNciHal_check_factory_reset();
+  }
 
 #ifdef FW_DWNLD_FLAG
   mEEPROM_info.buffer = &fw_dwnld_flag;

src/nfa/hci/nfa_hci_main.c

diff --git a/src/nfa/hci/nfa_hci_main.c b/src/nfa/hci/nfa_hci_main.c
index 5728d3f..2b2e712 100644
--- a/src/nfa/hci/nfa_hci_main.c
+++ b/src/nfa/hci/nfa_hci_main.c
@@ -877,6 +877,13 @@
         found = true;
         if (ee_info[count].ee_status == NFA_EE_STATUS_INACTIVE) {
           NFC_NfceeModeSet(target_handle, NFC_MODE_ACTIVATE);
+          /*HCI network is Inactive wait*/
+                nfa_hci_cb.w4_hci_netwk_init = true;
+            }
+            else
+            {
+                /*HCI network is already active*/
+                nfa_hci_cb.w4_hci_netwk_init = false;
         }
       }
       count++;
@@ -1365,6 +1372,11 @@
                   NFA_HCI_SESSION_ID_LEN))) ||
         (!(memcmp(nfa_hci_cb.cfg.admin_gate.session_id, reset_session,
                   NFA_HCI_SESSION_ID_LEN)))) {
+#if (NXP_EXTNS == TRUE)
+      if(nfcFL.eseFL._EXCLUDE_NV_MEM_DEPENDENCY == true) {
+        nfa_hci_getApduAndConnectivity_PipeStatus();
+      }
+#endif
       nfa_hci_cb.b_hci_netwk_reset = true;
       /* Set a new session id so that we clear all pipes later after seeing a
        * difference with the HC Session ID */