summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2014-09-01 10:36:01 +0200
committerPaul Kocialkowski <contact@paulk.fr>2014-09-01 10:36:13 +0200
commit15e9f165e86064ad637f782bed0b9bd66beb40b9 (patch)
tree22d9834afe37f9d384357a988fc6a5ed624c69ef
parent85af7251179c3cf53c785e9a055942d3ab6462c1 (diff)
downloadexternal_libnfc-nxp-15e9f165e86064ad637f782bed0b9bd66beb40b9.zip
external_libnfc-nxp-15e9f165e86064ad637f782bed0b9bd66beb40b9.tar.gz
external_libnfc-nxp-15e9f165e86064ad637f782bed0b9bd66beb40b9.tar.bz2
Revert "Properly handle missing firmwares"
Every chip has a preinstalled firmware, this doesn't seem to cause any PM issue This reverts commit 85af7251179c3cf53c785e9a055942d3ab6462c1.
-rwxr-xr-xsrc/phHal4Nfc.c10
-rw-r--r--src/phLibNfc.c5
2 files changed, 2 insertions, 13 deletions
diff --git a/src/phHal4Nfc.c b/src/phHal4Nfc.c
index 3be1589..f40ed9b 100755
--- a/src/phHal4Nfc.c
+++ b/src/phHal4Nfc.c
@@ -357,8 +357,6 @@ NFCSTATUS phHal4Nfc_Open(
NFCSTATUS openRetVal = NFCSTATUS_SUCCESS;
phHal4Nfc_Hal4Ctxt_t *Hal4Ctxt = NULL;
phHciNfc_Init_t eHciInitType = (phHciNfc_Init_t)InitType;
- int rc;
-
/*Set Default Clock settings once*/
static phHal_sHwConfig_t sHwConfig = {
{0},
@@ -379,13 +377,7 @@ NFCSTATUS phHal4Nfc_Open(
else/*Do an initialization*/
{
#ifdef ANDROID
- rc = dlopen_firmware();
- if(rc < 0)
- {
- openRetVal = NFCSTATUS_FAILED;
- pOpenCallback(pContext, openRetVal);
- return openRetVal;
- }
+ dlopen_firmware();
#endif
/*If hal4 ctxt in Hwreference is NULL create a new context*/
diff --git a/src/phLibNfc.c b/src/phLibNfc.c
index 63daaa2..6477a3f 100644
--- a/src/phLibNfc.c
+++ b/src/phLibNfc.c
@@ -230,16 +230,13 @@ NFCSTATUS phLibNfc_Mgt_Initialize(void *pDriverHandle,
eInitDefault,
phLibNfc_InitCb,
(void *)gpphLibContext);
- if(Status!=NFCSTATUS_FAILED)
- {
- phLibNfc_Ndef_Init();
- }
}
}
else
{
Status = NFCSTATUS_INSUFFICIENT_RESOURCES;
}
+ phLibNfc_Ndef_Init();
}
}
else if(gpphLibContext->LibNfcState.next_state==eLibNfcHalStateShutdown)