diff options
| author | jrior001 <jriordan001@gmail.com> | 2017-09-22 19:22:25 -0400 |
|---|---|---|
| committer | Rashed Abdel-Tawab <rashed@linux.com> | 2017-10-01 14:00:56 -0400 |
| commit | 6efa74efa32db5f539cd98275a6db64ebab16851 (patch) | |
| tree | d8cffb0b8e01c7f9bdccd6e03a48f14ccdb2021e | |
| parent | c75904f1ab1b314792eaf025ff4f7cdd85bb6c6a (diff) | |
| download | hardware_lineage_interfaces-6efa74efa32db5f539cd98275a6db64ebab16851.tar.gz hardware_lineage_interfaces-6efa74efa32db5f539cd98275a6db64ebab16851.tar.bz2 hardware_lineage_interfaces-6efa74efa32db5f539cd98275a6db64ebab16851.zip | |
lineage/interfaces: Add bcm2709x changes to Nfc impl
Convert to android.hardware.nfc@1.0-impl-bcm and change to
checking the BCM2079X HAL ID
Change-Id: I4dfe232363ae6141020715ba98918b99c556f8ff
| -rw-r--r-- | nfc/1.0-bcm/Android.bp (renamed from nfc/1.0/Android.bp) | 2 | ||||
| -rw-r--r-- | nfc/1.0-bcm/Nfc.cpp (renamed from nfc/1.0/Nfc.cpp) | 4 | ||||
| -rw-r--r-- | nfc/1.0-bcm/Nfc.h (renamed from nfc/1.0/Nfc.h) | 0 | ||||
| -rw-r--r-- | nfc/Android.bp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nfc/1.0/Android.bp b/nfc/1.0-bcm/Android.bp index a157f86..f533a1d 100644 --- a/nfc/1.0/Android.bp +++ b/nfc/1.0-bcm/Android.bp @@ -1,5 +1,5 @@ cc_library_shared { - name: "android.hardware.nfc@1.0-impl", + name: "android.hardware.nfc@1.0-impl-bcm", defaults: ["hidl_defaults"], relative_install_path: "hw", proprietary: true, diff --git a/nfc/1.0/Nfc.cpp b/nfc/1.0-bcm/Nfc.cpp index d337a36..1b5637a 100644 --- a/nfc/1.0/Nfc.cpp +++ b/nfc/1.0-bcm/Nfc.cpp @@ -82,7 +82,7 @@ INfc* HIDL_FETCH_INfc(const char * /*name*/) { int ret = 0; const hw_module_t* hw_module = nullptr; - ret = hw_get_module (NFC_NCI_HARDWARE_MODULE_ID, &hw_module); + 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) { @@ -90,7 +90,7 @@ INfc* HIDL_FETCH_INfc(const char * /*name*/) { } } else - ALOGE ("hw_get_module %s failed: %d", NFC_NCI_HARDWARE_MODULE_ID, ret); + ALOGE ("hw_get_module %s failed: %d", NFC_NCI_BCM2079X_HARDWARE_MODULE_ID, ret); if (ret == 0) { return new Nfc(nfc_device); diff --git a/nfc/1.0/Nfc.h b/nfc/1.0-bcm/Nfc.h index d8787fd..d8787fd 100644 --- a/nfc/1.0/Nfc.h +++ b/nfc/1.0-bcm/Nfc.h diff --git a/nfc/Android.bp b/nfc/Android.bp index 58a4473..bb37fae 100644 --- a/nfc/Android.bp +++ b/nfc/Android.bp @@ -1,3 +1,3 @@ subdirs = [ - "1.0", + "1.0-bcm", ] |