diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-01 22:11:55 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-01 22:11:55 +0000 |
| commit | c0021b51adacf019d00f76da0f83bec5d1c7b31d (patch) | |
| tree | e0e262289d29fbdac560ba862c40370c0fef878f | |
| parent | e248b1d39ddaf6bcc33ef5b219da48a70f71b335 (diff) | |
| parent | d56116f35652de682d7029eee0f0ee24ff6ea20d (diff) | |
| download | platform_hardware_nxp_nfc-simpleperf-release.tar.gz platform_hardware_nxp_nfc-simpleperf-release.tar.bz2 platform_hardware_nxp_nfc-simpleperf-release.zip | |
Snap for 7514810 from d56116f35652de682d7029eee0f0ee24ff6ea20d to simpleperf-releasesimpleperf-release
Change-Id: I47dd32e93ed06e3427cf6b2e51567aa47614623d
| -rw-r--r-- | pn8x/halimpl/dnld/phNxpNciHal_Dnld.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pn8x/halimpl/dnld/phNxpNciHal_Dnld.cc b/pn8x/halimpl/dnld/phNxpNciHal_Dnld.cc index e5060b4..247b24e 100644 --- a/pn8x/halimpl/dnld/phNxpNciHal_Dnld.cc +++ b/pn8x/halimpl/dnld/phNxpNciHal_Dnld.cc @@ -597,13 +597,6 @@ static void phNxpNciHal_fw_dnld_get_version_cb(void* pContext, NFCSTATUS status, (gphNxpNciHal_fw_IoctlCtx.bForceDnld) = TRUE; #endif - } - /* Minor Version number check - after download - * after download, we should get the same version information.*/ - else if ((TRUE == (gphNxpNciHal_fw_IoctlCtx.bDnldInitiated)) && - ((bNewVer[0] != bCurrVer[0]) || (bNewVer[1] != bCurrVer[1]))) { - NXPLOG_FWDNLD_E("Version Not Updated After Download!!\n"); - wStatus = NFCSTATUS_FAILED; } else { NXPLOG_FWDNLD_D("Version Check Successful\n"); /* Store the Mw & Fw Version for updating in EEPROM Log Area after @@ -928,6 +921,9 @@ static void phNxpNciHal_fw_dnld_write_cb(void* pContext, NFCSTATUS status, if (NFCSTATUS_SUCCESS == status) { NXPLOG_FWDNLD_D("phNxpNciHal_fw_dnld_write_cb - Request Successful"); (gphNxpNciHal_fw_IoctlCtx.bDnldEepromWrite) = false; + NXPLOG_FWDNLD_E( + "Do VEN reset before checking session state after Download success"); + phTmlNfc_IoCtl(phTmlNfc_e_EnableDownloadMode); if ((gphNxpNciHal_fw_IoctlCtx.bDnldInitiated) == true) { (gphNxpNciHal_fw_IoctlCtx.tLogParams.wNumDnldSuccess) += 1; @@ -1566,6 +1562,7 @@ static NFCSTATUS phNxpNciHal_fw_dnld_complete(void* pContext, NFCSTATUS status, } status = phNxpNciHal_fw_dnld_complete(pContext, wStatus, &pInfo); if (NFCSTATUS_SUCCESS == status) { + wStatus = NFCSTATUS_SUCCESS; NXPLOG_FWDNLD_D(" phNxpNciHal_fw_dnld_complete : SUCCESS"); } else { NXPLOG_FWDNLD_E(" phNxpNciHal_fw_dnld_complete : FAILED"); |