commit 189c974ea42dcb1c28b9411075e43ae202d4fcc4
author nxpandroid <srikrishna.pramoda@nxp.com> Mon Aug 14 12:08:33 2017 +0530
committer nxpandroid <srikrishna.pramoda@nxp.com> Mon Aug 14 12:08:33 2017 +0530
tree 59dfe5512d04d5a20659bd937507239d473820af
parent 4874e03c6940ab4afbefd690fd01e36bb900da7a

[SINGLE BINARY] hikey NFC init phNxpNciHal_getChipType() Fix

halimpl/pn54x/hal/phNxpNciHal.c

diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c
index 4f69d3b..7036a1e 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.c
+++ b/halimpl/pn54x/hal/phNxpNciHal.c
@@ -3708,8 +3708,8 @@
 ** Returns          none
 *******************************************************************************/
 void phNxpNciHal_configFeatureList(uint8_t* init_rsp, uint16_t rsp_len) {
-    tNFC_chipType chipType = 0;
-    chipType = configChipType(init_rsp,rsp_len);
+    nxpncihal_ctrl.chipType = configChipType(init_rsp,rsp_len);
+    tNFC_chipType chipType = nxpncihal_ctrl.chipType;
     CONFIGURE_FEATURELIST(chipType);
     NXPLOG_NCIHAL_D("NFC_GetFeatureList ()chipType = %d", chipType);
 }
@@ -3725,6 +3725,6 @@
 ** Returns          chipType
 *******************************************************************************/
 tNFC_chipType phNxpNciHal_getChipType() {
-    return getChipType();
+    return nxpncihal_ctrl.chipType;
 }
 

halimpl/pn54x/hal/phNxpNciHal.h

diff --git a/halimpl/pn54x/hal/phNxpNciHal.h b/halimpl/pn54x/hal/phNxpNciHal.h
index 6ad5b65..7f69fcf 100644
--- a/halimpl/pn54x/hal/phNxpNciHal.h
+++ b/halimpl/pn54x/hal/phNxpNciHal.h
@@ -116,6 +116,7 @@
   uint8_t read_retry_cnt;
   phNxpNciInfo_t nci_info;
   uint8_t hal_boot_mode;
+  tNFC_chipType chipType;
 } phNxpNciHal_Control_t;
 
 typedef struct {