diff options
| -rw-r--r-- | 2.0/default/Android.bp | 3 | ||||
| -rw-r--r-- | 2.0/default/NqNfc.cpp | 4 | ||||
| -rw-r--r-- | 2.0/default/service.cpp | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/2.0/default/Android.bp b/2.0/default/Android.bp index de5fef5..c7b3d35 100644 --- a/2.0/default/Android.bp +++ b/2.0/default/Android.bp @@ -8,10 +8,10 @@ cc_binary { "service.cpp", "Nfc.cpp", "NqNfc.cpp", + "NxpNfcLegacy.cpp", ], shared_libs: [ "nfc_nci.nqx.default.hw", - "se_nq_extn_client", "libhidlbase", "libutils", "liblog", @@ -19,6 +19,7 @@ cc_binary { "android.hardware.nfc@1.1", "android.hardware.nfc@1.2", "vendor.nxp.hardware.nfc@2.0", + "vendor.nxp.nxpnfclegacy@1.0", ], header_libs: [ "libhardware_headers", diff --git a/2.0/default/NqNfc.cpp b/2.0/default/NqNfc.cpp index 4e2cd03..8e07a6f 100644 --- a/2.0/default/NqNfc.cpp +++ b/2.0/default/NqNfc.cpp @@ -85,12 +85,12 @@ Return<bool> NqNfc::setVendorParam(const ::android::hardware::hidl_string &key, return phNxpNciHal_setSystemProperty(key, value); } -Return<bool> NqNfc::resetEse(uint64_t resetType) { +Return<bool> NqNfc::resetEse(uint64_t /* resetType */) { NFCSTATUS status = NFCSTATUS_FAILED; bool ret = false; ALOGD("NqNfc::resetEse Entry"); - status = phNxpNciHal_resetEse(resetType); + status = phNxpNciHal_resetEse(); if(NFCSTATUS_SUCCESS == status) { ret = true; status = NFCSTATUS_SUCCESS; diff --git a/2.0/default/service.cpp b/2.0/default/service.cpp index 1ed3aca..f5d820a 100644 --- a/2.0/default/service.cpp +++ b/2.0/default/service.cpp @@ -32,6 +32,7 @@ #include <hidl/LegacySupport.h> #include "Nfc.h" #include "NqNfc.h" +#include "NxpNfcLegacy.h" using android::hardware::nfc::V1_2::INfc; using android::hardware::nfc::V1_2::implementation::Nfc; @@ -39,6 +40,8 @@ using android::hardware::configureRpcThreadpool; using android::hardware::joinRpcThreadpool; using vendor::nxp::hardware::nfc::V2_0::INqNfc; using vendor::nxp::hardware::nfc::V2_0::implementation::NqNfc; +using vendor::nxp::nxpnfclegacy::V1_0::INxpNfcLegacy; +using vendor::nxp::nxpnfclegacy::V1_0::implementation::NxpNfcLegacy; using android::OK; using android::sp; using android::status_t; @@ -55,6 +58,10 @@ int main() { status = nq_nfc_service->registerAsService(); ALOGE_IF(status != OK, "Error while registering nqnfc vendor service: %d", status); + sp<INxpNfcLegacy> nxp_nfc_legacy_service = new NxpNfcLegacy(); + status = nxp_nfc_legacy_service->registerAsService(); + ALOGE_IF(status != OK, "Error while registering NxpNfcLegacy vendor service: %d", status); + joinRpcThreadpool(); return status; } |