diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-02 07:27:33 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-02 07:27:33 +0000 |
| commit | 1c99ae19da5afe5b3b3e45c70cca20ced54f9de5 (patch) | |
| tree | c0d4bd80ed22bb970032d159708ec95e7ba05e29 | |
| parent | adc5bbe9835483daee318e1b0efde9e1f851ca47 (diff) | |
| parent | c32f778b3bd69df9197ca70600225a200d2c0563 (diff) | |
| download | android_hardware_broadcom_nfc-1c99ae19da5afe5b3b3e45c70cca20ced54f9de5.tar.gz android_hardware_broadcom_nfc-1c99ae19da5afe5b3b3e45c70cca20ced54f9de5.tar.bz2 android_hardware_broadcom_nfc-1c99ae19da5afe5b3b3e45c70cca20ced54f9de5.zip | |
release-request-ceffd4a6-d719-491c-b078-6ce33cda5fb8-for-git_oc-mr1-release-4237114 snap-temp-L83200000088245566
Change-Id: I169d1b5560e755532063fb12d0d87bfa64a47f1c
| -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); |