commit 287c01b6aae7df26237b255604e514d5a4168c97
author Ruchi Kandoi <kandoiruchi@google.com> Tue Aug 01 16:26:17 2017 -0700
committer Ruchi Kandoi <kandoiruchi@google.com> Tue Aug 01 16:33:40 2017 -0700
tree ffaa18d3a52bf21799eeefd13434d149ac1d659e
parent d8d776afa8489b0ea628757370b0bcc00d5f2759

Fix NXP_CHIP_TYPE and compile errors

NXP_CHIP_TYPE should be set in the device.mk for respective device and
not hard-coded. Fix compile time errors for the same.

Bug: 64264750
Test: HCE-F Emulator/Reader CTS tests
Change-Id: I6dc55d319784be0bc2b54d4801ac1f1695ebbe7e
(cherry picked from commit 79d3baa4e140dc82e19aafa63e6e432e189bc837)

Android.mk

diff --git a/Android.mk b/Android.mk
index cfbb9ce..c5a0030 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,9 +35,6 @@
 D_CFLAGS += -DPN553=4
 endif
 
-#### Select the CHIP ####
-NXP_CHIP_TYPE := $PN553
-
 ifeq ($(NXP_CHIP_TYPE),$(PN547C2))
 D_CFLAGS += -DNFC_NXP_CHIP_TYPE=PN547C2
 else ifeq ($(NXP_CHIP_TYPE),$(PN548C2))

hal/phNxpNciHal.c

diff --git a/hal/phNxpNciHal.c b/hal/phNxpNciHal.c
index be26279..0a4c372 100644
--- a/hal/phNxpNciHal.c
+++ b/hal/phNxpNciHal.c
@@ -2633,7 +2633,7 @@
     retry_core_init_cnt++;
     goto retry_core_init;
   }
-  if (nxpncihal_ctrl.nci_data.nci_version == NCI_VERSION_2_0) {
+  if (nxpncihal_ctrl.nci_info.nci_version == NCI_VERSION_2_0) {
     status = phNxpNciHal_send_ext_cmd(sizeof(cmd_init_nci2_0), cmd_init_nci2_0);
   } else {
     status = phNxpNciHal_send_ext_cmd(sizeof(cmd_init_nci), cmd_init_nci);