commit b2aa64fc4f6e4abd3762712e870e2c79ffd0f5b7
author Linux Build Service Account <lnxbuild@quicinc.com> Fri Jul 07 23:38:26 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 07 23:38:26 2017 -0700
tree 12ccfbaa1850827fb15b33732ac1071cf2d2c2ab
parent b7c30e886858d9a1ed073d4488d5be4a402420e5
parent c2f9ee0505d4edb125f3c67535496cc33f8a9259

Merge "Don't close hal in case of invalid response from NFCC, instead return error."

halimpl/pn54x/hal/phNxpNciHal.c

diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c
index 44b26c7..692a0d8 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.c
+++ b/halimpl/pn54x/hal/phNxpNciHal.c
@@ -63,6 +63,7 @@
 #endif
 static uint8_t pwr_link_required = FALSE;
 static uint8_t config_access = FALSE;
+static uint8_t config_success = true;
 static NFCSTATUS phNxpNciHal_FwDwnld(void);
 static NFCSTATUS phNxpNciHal_SendCmd(uint8_t cmd_len, uint8_t* pcmd_buff);
 static void phNxpNciHal_check_delete_nfaStorage_DHArea();
@@ -1249,6 +1250,7 @@
 #endif
     static uint8_t swp_switch_timeout_cmd[] = {0x20, 0x02, 0x06, 0x01, 0xA0, 0xF3, 0x02, 0x00, 0x00};
 
+    config_success = true;
     uint8_t *buffer = NULL;
     unsigned long bufflen = 260;
     long retlen = 0;
@@ -2290,6 +2292,7 @@
                     nxpncihal_ctrl.rx_data_len, nxpncihal_ctrl.p_rx_data);
         }
     }
+    if (config_success == false) return NFCSTATUS_FAILED;
 /* This code is moved to JNI
 #ifdef PN547C2_CLOCK_SETTING
     if (isNxpConfigModified())
@@ -3809,8 +3812,8 @@
     {
         if(p_rx_data[3]!=NFCSTATUS_SUCCESS)
         {
-            NXPLOG_NCIHAL_W("Invalid Data from config file . Aborting..");
-            phNxpNciHal_close();
+            NXPLOG_NCIHAL_W("Invalid Data from config file.");
+            config_success = false;
         }
     }
 }