diff options
| -rw-r--r--[-rwxr-xr-x] | extns/impl/Nxp_Features.h | 8 | ||||
| -rw-r--r-- | halimpl/hal/phNxpNciHal.cc | 12 |
2 files changed, 0 insertions, 20 deletions
diff --git a/extns/impl/Nxp_Features.h b/extns/impl/Nxp_Features.h index c1ca798..8a276d9 100755..100644 --- a/extns/impl/Nxp_Features.h +++ b/extns/impl/Nxp_Features.h @@ -24,15 +24,7 @@ #define STRMAX_1 40 #define STRMAX_2 100 - -#ifndef FW_DLL_ROOT_DIR -#ifdef __LP64__ -#define FW_DLL_ROOT_DIR "/system/vendor/lib64/" -#else #define FW_DLL_ROOT_DIR "/system/vendor/lib/" -#endif -#endif - #define FW_DLL_EXTENSION ".so" #define FW_MOBILE_MAJOR_NUMBER_PN553 0x01 diff --git a/halimpl/hal/phNxpNciHal.cc b/halimpl/hal/phNxpNciHal.cc index 384b1cb..35b0df4 100644 --- a/halimpl/hal/phNxpNciHal.cc +++ b/halimpl/hal/phNxpNciHal.cc @@ -471,18 +471,6 @@ static NFCSTATUS phNxpNciHal_fw_download(void) { return NFCSTATUS_REJECTED; } - if (nfcFL.nfcNxpEse == true) { - nfc_nci_IoctlInOutData_t data; - memset(&data, 0x00, sizeof(nfc_nci_IoctlInOutData_t)); - data.inp.level = 0x03; // ioctl call arg value to get eSE power GPIO value = 0x03 - int spi_current_state = phNxpNciHal_ioctl(HAL_NFC_GET_SPM_STATUS, &data); - NXPLOG_NCIHAL_D("spi_current_state = %4x ", spi_current_state); - if (spi_current_state != P61_STATE_IDLE) { - NXPLOG_NCIHAL_E("FW download denied while SPI in use, Continue NFC init"); - return NFCSTATUS_REJECTED; - } - } - nxpncihal_ctrl.phNxpNciGpioInfo.state = GPIO_UNKNOWN; phNxpNciHal_gpio_restore(GPIO_STORE); |