diff options
| author | Ruchi Kandoi <kandoiruchi@google.com> | 2017-09-12 09:07:17 -0700 |
|---|---|---|
| committer | Ruchi Kandoi <kandoiruchi@google.com> | 2017-09-12 10:20:31 -0700 |
| commit | a79af90cdc79766fe640272126bf9e9d905cb98c (patch) | |
| tree | 0ae695f62903e1a725f21ce877be2159f0c9d3dd /halimpl | |
| parent | 09d6deca3da3faf4fd07d62a0e9a6f15525f08ac (diff) | |
| download | android_hardware_broadcom_nfc-a79af90cdc79766fe640272126bf9e9d905cb98c.tar.gz android_hardware_broadcom_nfc-a79af90cdc79766fe640272126bf9e9d905cb98c.tar.bz2 android_hardware_broadcom_nfc-a79af90cdc79766fe640272126bf9e9d905cb98c.zip | |
Revert "isNxpConfigModified() is only used for debug purpose, removing it."
This reverts commit 80b1177ac7782c2870d16a32795761d89b4884f2.
NXP_CORE_CONF_EXTN should be updated even if there isn't a firmware
upgrade.
Bug: 65582747
Test: Modify libnfc-nxp.conf
Change-Id: If0b96b08dbbbb1fa1c5e1df1b9b920e0003a8bfa
(cherry picked from commit 210fc92332b13067c0a2c4bc234167eeab6f2e85)
Diffstat (limited to 'halimpl')
| -rw-r--r-- | halimpl/pn54x/hal/phNxpNciHal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/halimpl/pn54x/hal/phNxpNciHal.c b/halimpl/pn54x/hal/phNxpNciHal.c index f3ba207..5a799d5 100644 --- a/halimpl/pn54x/hal/phNxpNciHal.c +++ b/halimpl/pn54x/hal/phNxpNciHal.c @@ -1141,7 +1141,8 @@ int phNxpNciHal_core_initialized(uint8_t* p_core_init_rsp_params) { } #ifdef PN547C2_CLOCK_SETTING - if ((fw_download_success == 1) || (phNxpNciClock.issetConfig) + if (isNxpConfigModified() || (fw_download_success == 1) || + (phNxpNciClock.issetConfig) #if (NFC_NXP_HFO_SETTINGS == TRUE) || temp_fix == 1 #endif @@ -1198,7 +1199,7 @@ int phNxpNciHal_core_initialized(uint8_t* p_core_init_rsp_params) { } } - if (fw_download_success == 1) { + if (isNxpConfigModified() || (fw_download_success == 1)) { retlen = 0; fw_download_success = 0; |