diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2017-08-01 16:26:17 -0700 |
|---|---|---|
| committer | Ruchi Kandoi <kandoiruchi@google.com> | 2017-08-01 16:33:40 -0700 |
| commit | c32f778b3bd69df9197ca70600225a200d2c0563 (patch) | |
| tree | c0d4bd80ed22bb970032d159708ec95e7ba05e29 /halimpl | |
| parent | 2578b42c0e2c4af9a9f26e6fa41ec3a158e02c25 (diff) | |
| download | android_hardware_broadcom_nfc-c32f778b3bd69df9197ca70600225a200d2c0563.tar.gz android_hardware_broadcom_nfc-c32f778b3bd69df9197ca70600225a200d2c0563.tar.bz2 android_hardware_broadcom_nfc-c32f778b3bd69df9197ca70600225a200d2c0563.zip | |
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)
Diffstat (limited to 'halimpl')
| -rw-r--r-- | halimpl/pn54x/Android.mk | 3 | ||||
| -rw-r--r-- | halimpl/pn54x/hal/phNxpNciHal.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/halimpl/pn54x/Android.mk b/halimpl/pn54x/Android.mk index cfbb9ce..c5a0030 100644 --- a/halimpl/pn54x/Android.mk +++ b/halimpl/pn54x/Android.mk @@ -35,9 +35,6 @@ ifeq ($(PN553),4) 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)) diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c index be26279..0a4c372 100644 --- a/halimpl/pn54x/hal/phNxpNciHal.c +++ b/halimpl/pn54x/hal/phNxpNciHal.c @@ -2633,7 +2633,7 @@ retry_core_init: 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); |