commit 72b40962339c723c8c091087ed22f9f82bdef332
author jrior001 <jriordan001@gmail.com> Sun Sep 10 22:25:14 2017 -0400
committer Jackeagle <jackeagle102@gmail.com> Sun Nov 19 01:50:03 2017 -0500
tree 9b9f34855850931b804287b3f4c5b6944268882a
parent 02ee2dc6f597ad911ac8332a38d30c63c16fa48e

NFC: support loading BCM0279X NFC HAL ID as well

Change-Id: Id61f72dff63da515548f41469f604955e3cac64f

nfc/1.0/default/Nfc.cpp

diff --git a/nfc/1.0/default/Nfc.cpp b/nfc/1.0/default/Nfc.cpp
index d337a36..f04af2e 100644
--- a/nfc/1.0/default/Nfc.cpp
+++ b/nfc/1.0/default/Nfc.cpp
@@ -89,8 +89,18 @@
             ALOGE ("nfc_nci_open failed: %d", ret);
         }
     }
+    else if (ret != 0) {
+        //Try BCM hal ID
+        ret = hw_get_module (NFC_NCI_BCM2079X_HARDWARE_MODULE_ID, &hw_module);
+        if (ret == 0) {
+            ret = nfc_nci_open (hw_module, &nfc_device);
+            if (ret != 0) {
+                ALOGE ("nfc_nci_open failed: %d", ret);
+            }
+        }
+    }
     else
-        ALOGE ("hw_get_module %s failed: %d", NFC_NCI_HARDWARE_MODULE_ID, ret);
+        ALOGE ("hw_get_module %s or %s failed: %d", NFC_NCI_HARDWARE_MODULE_ID, NFC_NCI_BCM2079X_HARDWARE_MODULE_ID, ret);
 
     if (ret == 0) {
         return new Nfc(nfc_device);