From d4cb91ee6f74f187cc0e7ba9dc073b0a77c27dfa Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Wed, 22 Jun 2011 15:20:48 -0700 Subject: Implement power control and firmware download for UART. Also clean up some UART and I2C DAL functions. o Re-enable FW download o Use /system/vendor/firmware for pn544 firmware now o Clean up read() and write() paths for both I2C and UART o Use new sysfs entry for power and FW control on I2C platforms o Remove userspace sleep()'s on power control toggle. They are now done in the kernel as they should be. Change-Id: I39956d36e02c1eb526a5c546bd3cb74edce4ff18 --- src/phHal4Nfc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/phHal4Nfc.c') diff --git a/src/phHal4Nfc.c b/src/phHal4Nfc.c index f3beacb..399cb3e 100644 --- a/src/phHal4Nfc.c +++ b/src/phHal4Nfc.c @@ -308,7 +308,7 @@ const unsigned char *nxp_nfc_fw = NULL; int dlopen_firmware() { void *p; - void *handle = dlopen("/system/lib/libpn544_fw.so", RTLD_NOW); + void *handle = dlopen("/system/vendor/firmware/libpn544_fw.so", RTLD_NOW); if (handle == NULL) { LOGE("Could not open libpn544.so"); return -1; @@ -367,8 +367,7 @@ NFCSTATUS phHal4Nfc_Open( else/*Do an initialization*/ { #ifdef ANDROID - //TODO: Re-enable FW update - //dlopen_firmware(); + dlopen_firmware(); #endif /*If hal4 ctxt in Hwreference is NULL create a new context*/ -- cgit v1.1