diff options
| author | Karthik Poosa <kpoosa2@codeaurora.org> | 2020-04-03 15:50:11 +0530 |
|---|---|---|
| committer | Karthik Poosa <kpoosa2@codeaurora.org> | 2020-04-06 22:36:00 +0530 |
| commit | 50fd82d61d737b59f7ae401e22ca284b619b9d14 (patch) | |
| tree | d7e969ff3ad126938c8c5f54313011426092732a | |
| parent | b19ac5827ae725c6dde2f30f6bff1c6aa41605f9 (diff) | |
NFC: Fix compilation issues due to the change in interface.
Remove usage of 1.0 HAL API ioctl() as it is not used now.
Change-Id: I46697c7c7663488ceee685e97ae0a997749d97dc
| -rw-r--r-- | 2.0/default/Android.bp | 2 | ||||
| -rw-r--r-- | 2.0/default/NqNfc.cpp | 10 | ||||
| -rw-r--r-- | 2.0/default/NqNfc.h | 9 |
3 files changed, 4 insertions, 17 deletions
diff --git a/2.0/default/Android.bp b/2.0/default/Android.bp index 4e80d0e..de5fef5 100644 --- a/2.0/default/Android.bp +++ b/2.0/default/Android.bp @@ -18,8 +18,6 @@ cc_binary { "android.hardware.nfc@1.0", "android.hardware.nfc@1.1", "android.hardware.nfc@1.2", - "vendor.nxp.hardware.nfc@1.0", - "vendor.nxp.hardware.nfc@1.1", "vendor.nxp.hardware.nfc@2.0", ], header_libs: [ diff --git a/2.0/default/NqNfc.cpp b/2.0/default/NqNfc.cpp index 1b0b392..0a5cfec 100644 --- a/2.0/default/NqNfc.cpp +++ b/2.0/default/NqNfc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -63,13 +63,7 @@ namespace nfc { namespace V2_0 { namespace implementation { -// Methods from ::vendor::nxp::hardware::nfc::V1_0::INqNfc follow. -Return<void> NqNfc::ioctl(uint64_t /* ioctlType */, const hidl_vec<uint8_t>& /* inputData */, ioctl_cb /* _hidl_cb */) { - // Deprecated - return Void(); -} - -// Methods from ::vendor::nxp::hardware::nfc::V1_1::INqNfc follow. +// Methods from ::vendor::nxp::hardware::nfc::V2_0::INqNfc follow. Return<void> NqNfc::getNfcChipId(getNfcChipId_cb _hidl_cb) { std::string value = phNxpNciHal_getNfcChipId(); _hidl_cb(value); diff --git a/2.0/default/NqNfc.h b/2.0/default/NqNfc.h index e3c9f95..a1869d5 100644 --- a/2.0/default/NqNfc.h +++ b/2.0/default/NqNfc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -82,14 +82,9 @@ using ::android::hardware::Void; using ::android::sp; struct NqNfc : public INqNfc { - // Methods from ::vendor::nxp::hardware::nfc::V1_0::INqNfc follow. - Return<void> ioctl(uint64_t ioctlType, const hidl_vec<uint8_t>& inputData, ioctl_cb _hidl_cb) override; - - // Methods from ::vendor::nxp::hardware::nfc::V1_1::INqNfc follow. + // Methods from ::vendor::nxp::hardware::nfc::V2_0::INqNfc follow. Return<void> getNfcChipId(getNfcChipId_cb _hidl_cb); Return<void> getNfcFirmwareVersion(getNfcFirmwareVersion_cb _hidl_cb); - - // Methods from ::vendor::nxp::hardware::nfc::V2_0::INqNfc follow. Return<void> getVendorParam(const ::android::hardware::hidl_string &key, getVendorParam_cb _hidl_cb) override; Return<bool> setVendorParam(const ::android::hardware::hidl_string &key, |