diff options
-rw-r--r-- | 1.2/default/Android.bp | 25 | ||||
-rw-r--r-- | 1.2/default/NfcClientCallback.cpp | 60 | ||||
-rw-r--r-- | 1.2/default/NfcClientCallback.h | 69 | ||||
-rw-r--r-- | 1.2/default/NqNfc.cpp | 88 | ||||
-rw-r--r-- | 1.2/default/NqNfc.h | 73 | ||||
-rw-r--r-- | 1.2/default/service.cpp | 63 | ||||
-rw-r--r-- | 1.2/default/vendor.nxp.hardware.nfc@1.2-service.rc | 33 | ||||
-rw-r--r-- | Android.bp | 1 |
8 files changed, 412 insertions, 0 deletions
diff --git a/1.2/default/Android.bp b/1.2/default/Android.bp new file mode 100644 index 0000000..c70d220 --- /dev/null +++ b/1.2/default/Android.bp @@ -0,0 +1,25 @@ +cc_binary { + name: "vendor.nxp.hardware.nfc@1.2-service", + defaults: ["hidl_defaults"], + init_rc: ["vendor.nxp.hardware.nfc@1.2-service.rc"], + relative_install_path: "hw", + vendor: true, + srcs: [ + "service.cpp", + "NqNfc.cpp", + ], + shared_libs: [ + "nfc_nci.nqx.default.hw", + "libhidlbase", + "libhidltransport", + "libutils", + "liblog", + "android.hardware.nfc@1.1", + "android.hardware.nfc@1.0", + "vendor.nxp.hardware.nfc@1.0", + "vendor.nxp.hardware.nfc@1.1", + ], + header_libs: [ + "libhardware_headers", + ], +} diff --git a/1.2/default/NfcClientCallback.cpp b/1.2/default/NfcClientCallback.cpp new file mode 100644 index 0000000..1082d95 --- /dev/null +++ b/1.2/default/NfcClientCallback.cpp @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018, 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 + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "NfcClientCallback.h" + +namespace android { +namespace hardware { +namespace nfc { +namespace V1_1 { +namespace implementation { + +// Methods from ::android::hardware::nfc::V1_0::INfcClientCallback follow. +Return<void> NfcClientCallback::sendEvent(::android::hardware::nfc::V1_0::NfcEvent event, ::android::hardware::nfc::V1_0::NfcStatus status) { + // TODO implement + return Void(); +} + +Return<void> NfcClientCallback::sendData(const hidl_vec<uint8_t>& data) { + // TODO implement + return Void(); +} + + +// Methods from ::android::hardware::nfc::V1_1::INfcClientCallback follow. +Return<void> NfcClientCallback::sendEvent_1_1(::android::hardware::nfc::V1_1::NfcEvent event, ::android::hardware::nfc::V1_0::NfcStatus status) { + // TODO implement + return Void(); +} + +} // namespace implementation +} // namespace V1_1 +} // namespace nfc +} // namespace hardware +} // namespace android diff --git a/1.2/default/NfcClientCallback.h b/1.2/default/NfcClientCallback.h new file mode 100644 index 0000000..ab6ae96 --- /dev/null +++ b/1.2/default/NfcClientCallback.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2018, 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 + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef ANDROID_HARDWARE_NFC_V1_1_NFCCLIENTCALLBACK_H +#define ANDROID_HARDWARE_NFC_V1_1_NFCCLIENTCALLBACK_H + +#include <android/hardware/nfc/1.1/INfcClientCallback.h> +#include <hidl/MQDescriptor.h> +#include <hidl/Status.h> + +namespace android { +namespace hardware { +namespace nfc { +namespace V1_1 { +namespace implementation { + +using ::android::hardware::hidl_array; +using ::android::hardware::hidl_memory; +using ::android::hardware::hidl_string; +using ::android::hardware::hidl_vec; +using ::android::hardware::Return; +using ::android::hardware::Void; +using ::android::sp; + +struct NfcClientCallback : public INfcClientCallback { + // Methods from ::android::hardware::nfc::V1_0::INfcClientCallback follow. + Return<void> sendEvent(::android::hardware::nfc::V1_0::NfcEvent event, ::android::hardware::nfc::V1_0::NfcStatus status) override; + Return<void> sendData(const hidl_vec<uint8_t>& data) override; + + // Methods from ::android::hardware::nfc::V1_1::INfcClientCallback follow. + Return<void> sendEvent_1_1(::android::hardware::nfc::V1_1::NfcEvent event, ::android::hardware::nfc::V1_0::NfcStatus status) override; + + // Methods from ::android::hidl::base::V1_0::IBase follow. + +}; + +} // namespace implementation +} // namespace V1_1 +} // namespace nfc +} // namespace hardware +} // namespace android + +#endif // ANDROID_HARDWARE_NFC_V1_1_NFCCLIENTCALLBACK_H diff --git a/1.2/default/NqNfc.cpp b/1.2/default/NqNfc.cpp new file mode 100644 index 0000000..543b045 --- /dev/null +++ b/1.2/default/NqNfc.cpp @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2017-2019, 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 + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <hardware/hardware.h> +#include <log/log.h> +#include "NqNfc.h" +#include "phNxpNciHal_Adaptation.h" + +namespace vendor { +namespace nxp { +namespace hardware { +namespace nfc { +namespace V1_1 { +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) { + uint32_t status; + nfc_nci_IoctlInOutData_t inpOutData; + V1_0::NfcData outputData; + + nfc_nci_IoctlInOutData_t *pInOutData = (nfc_nci_IoctlInOutData_t*)&inputData[0]; + + /* + * data from proxy->stub is copied to local data which can be updated by + * underlying HAL implementation since its an inout argument + */ + memcpy(&inpOutData, pInOutData, sizeof(nfc_nci_IoctlInOutData_t)); + status = phNxpNciHal_ioctl(ioctlType, &inpOutData); + + /* + * copy data and additional fields indicating status of ioctl operation + * and context of the caller. Then invoke the corresponding proxy callback + */ + inpOutData.out.ioctlType = ioctlType; + inpOutData.out.context = pInOutData->inp.context; + inpOutData.out.result = status; + outputData.setToExternal((uint8_t*)&inpOutData.out, sizeof(nfc_nci_ExtnOutputData_t)); + _hidl_cb(outputData); + return Void(); +} + +// Methods from ::vendor::nxp::hardware::nfc::V1_1::INqNfc follow. +Return<void> NqNfc::getNfcChipId(getNfcChipId_cb _hidl_cb) { + std::string value = phNxpNciHal_getNfcChipId(); + _hidl_cb(value); + return Void(); +} + +Return<void> NqNfc::getNfcFirmwareVersion(getNfcFirmwareVersion_cb _hidl_cb) { + std::string value = phNxpNciHal_getNfcFirmwareVersion(); + _hidl_cb(value); + return Void(); +} + + +} // namespace implementation +} // namespace V1_1 +} // namespace nfc +} // namespace hardware +} // namespace nxp +} // namespace vendor diff --git a/1.2/default/NqNfc.h b/1.2/default/NqNfc.h new file mode 100644 index 0000000..83d3aaa --- /dev/null +++ b/1.2/default/NqNfc.h @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2017-2019, 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 + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef VENDOR_NXP_HARDWARE_NFC_V1_1_NQNFC_H +#define VENDOR_NXP_HARDWARE_NFC_V1_1_NQNFC_H + +#include <vendor/nxp/hardware/nfc/1.1/INqNfc.h> +#include <hidl/MQDescriptor.h> +#include <hidl/Status.h> +#include "hal_nxpnfc.h" + +namespace vendor { +namespace nxp { +namespace hardware { +namespace nfc { +namespace V1_1 { +namespace implementation { + +using ::android::hidl::base::V1_0::DebugInfo; +using ::android::hidl::base::V1_0::IBase; +using ::vendor::nxp::hardware::nfc::V1_1::INqNfc; +using ::android::hardware::hidl_array; +using ::android::hardware::hidl_memory; +using ::android::hardware::hidl_string; +using ::android::hardware::hidl_vec; +using ::android::hardware::hidl_string; +using ::android::hardware::Return; +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. + Return<void> getNfcChipId(getNfcChipId_cb _hidl_cb); + Return<void> getNfcFirmwareVersion(getNfcFirmwareVersion_cb _hidl_cb); +}; + +} // namespace implementation +} // namespace V1_1 +} // namespace nfc +} // namespace hardware +} // namespace nxp +} // namespace vendor + +#endif // VENDOR_NXP_HARDWARE_NFC_V1_1_NQNFC_H diff --git a/1.2/default/service.cpp b/1.2/default/service.cpp new file mode 100644 index 0000000..cd69133 --- /dev/null +++ b/1.2/default/service.cpp @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2018-2019, 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 + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#define LOG_TAG "vendor.nxp.hardware.nfc@1.2-service" + +#include <android/hardware/nfc/1.1/INfc.h> +#include <vendor/nxp/hardware/nfc/1.1/INqNfc.h> + +#include <hidl/LegacySupport.h> +#include "Nfc.h" +#include "NqNfc.h" + +using android::hardware::configureRpcThreadpool; +using android::hardware::joinRpcThreadpool; +using android::hardware::nfc::V1_1::INfc; +using vendor::nxp::hardware::nfc::V1_1::INqNfc; +using android::hardware::nfc::V1_1::implementation::Nfc; +using vendor::nxp::hardware::nfc::V1_1::implementation::NqNfc; +using android::OK; +using android::sp; +using android::status_t; + +int main() { + configureRpcThreadpool(1, true /*callerWillJoin*/); + status_t status; + + sp<INfc> nfc_service = new Nfc(); + status = nfc_service->registerAsService(); + LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering nfc AOSP service: %d", status); + + sp<INqNfc> nq_nfc_service = new NqNfc(); + status = nq_nfc_service->registerAsService(); + LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering nqnfc vendor service: %d", status); + + joinRpcThreadpool(); + return status; +} diff --git a/1.2/default/vendor.nxp.hardware.nfc@1.2-service.rc b/1.2/default/vendor.nxp.hardware.nfc@1.2-service.rc new file mode 100644 index 0000000..f245d0e --- /dev/null +++ b/1.2/default/vendor.nxp.hardware.nfc@1.2-service.rc @@ -0,0 +1,33 @@ +# +# Copyright (c) 2019, 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 +# met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# * Neither the name of The Linux Foundation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +service nqnfc_1_2_hal_service /vendor/bin/hw/vendor.nxp.hardware.nfc@1.2-service + class hal + user nfc + group nfc @@ -1,4 +1,5 @@ // This is an autogenerated file, do not edit. subdirs = [ "1.0/default", + "1.2/default", ] |