summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2011-09-13 16:22:03 -0500
committerJeff Hamilton <jham@android.com>2011-09-13 16:22:03 -0500
commit71b688d07db1e7fd32a1e02f29b9779f0d0db377 (patch)
tree610ff3dccba0d220965b8068d53895fa0be92dc7 /src
parent76a56bae5192ad4392d787c07e41db88da1c1418 (diff)
parentdf34eb0ea8cf035c5ca8e118773a614d92da943b (diff)
downloadexternal_libnfc-nxp-71b688d07db1e7fd32a1e02f29b9779f0d0db377.zip
external_libnfc-nxp-71b688d07db1e7fd32a1e02f29b9779f0d0db377.tar.gz
external_libnfc-nxp-71b688d07db1e7fd32a1e02f29b9779f0d0db377.tar.bz2
Merge commit 'df34eb0e' into manualmerge
Change-Id: I9807e540bad19933452f4a9f86b74021265f29cf
Diffstat (limited to 'src')
-rw-r--r--src/phLibNfc.c10
-rw-r--r--src/phLibNfc.h2
2 files changed, 12 insertions, 0 deletions
diff --git a/src/phLibNfc.c b/src/phLibNfc.c
index e5435de..92bdc40 100644
--- a/src/phLibNfc.c
+++ b/src/phLibNfc.c
@@ -47,6 +47,8 @@
*************************** Macro's ******************************************
*/
+extern int dlopen_firmware();
+
#ifndef STATIC_DISABLE
#define STATIC static
#else
@@ -108,6 +110,7 @@ NFCSTATUS phLibNfc_HW_Reset ()
{
NFCSTATUS Status = NFCSTATUS_SUCCESS;
+ Status = phDal4Nfc_Reset(1);
Status = phDal4Nfc_Reset(0);
Status = phDal4Nfc_Reset(1);
@@ -119,6 +122,13 @@ NFCSTATUS phLibNfc_Download_Mode ()
return phDal4Nfc_Download();
}
+int phLibNfc_Load_Firmware_Image ()
+{
+ int status;
+ status = dlopen_firmware();
+ return status;
+}
+
extern uint8_t nxp_nfc_isoxchg_timeout;
NFCSTATUS phLibNfc_SetIsoXchgTimeout(uint8_t timeout) {
diff --git a/src/phLibNfc.h b/src/phLibNfc.h
index 9e4aff1..8621361 100644
--- a/src/phLibNfc.h
+++ b/src/phLibNfc.h
@@ -854,6 +854,8 @@ NFCSTATUS phLibNfc_HW_Reset ();
NFCSTATUS phLibNfc_Download_Mode ();
+int phLibNfc_Load_Firmware_Image ();
+
// timeout is 8 bits
// bits [0..3] => timeout value, (256*16/13.56*10^6) * 2^value
// [0] -> 0.0003s