Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load legacy NFC libhardware HAL by correct name.

Browse Source 
Use NFC_NCI_HARDWARE_MODULE_ID, which maps to "nfc_nci",
and is correct for the PN54x HAL (which is the only
remaining HAL implementation in use).

Test: NFC works
Change-Id: Ida810ec990ddb4f71756225fffb3fc2757e76374
This commit is contained in:
Martijn Coenen
2017-01-12 11:37:25 +01:00
parent cb5989d239
commit ce2e6569dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nfc/1.0/default/Nfc.cpp
View File

@@ -51,21 +51,21 @@ Nfc::Nfc(nfc_nci_device_t* device) : mDevice(device) {
}
INfc* HIDL_FETCH_INfc(const char *hal) {
INfc* HIDL_FETCH_INfc(const char * /*name*/) {
nfc_nci_device_t* nfc_device;
int ret = 0;
const hw_module_t* hw_module = NULL;
ret = hw_get_module (hal, &hw_module);
ret = hw_get_module (NFC_NCI_HARDWARE_MODULE_ID, &hw_module);
if (ret == 0)
{
ret = nfc_nci_open (hw_module, &nfc_device);
if (ret != 0) {
ALOGE ("nfc_nci_open %s failed: %d", hal, ret);
ALOGE ("nfc_nci_open failed: %d", ret);
}
}
else
ALOGE ("hw_get_module %s failed: %d", hal, ret);
ALOGE ("hw_get_module failed: %d", ret);
if (ret == 0) {
return new Nfc(nfc_device);