diff options
| -rw-r--r-- | 1.0/default/Android.bp | 16 | ||||
| -rw-r--r-- | 1.0/default/Android.mk | 26 | ||||
| -rw-r--r-- | 1.0/default/NqNfc.cpp | 108 | ||||
| -rw-r--r-- | 1.0/default/NqNfc.h | 79 | ||||
| -rw-r--r-- | 1.0/default/include/device.h | 42 | ||||
| -rw-r--r-- | 1.0/default/include/utils.h | 121 | ||||
| -rw-r--r-- | 1.0/default/service.cpp | 53 | ||||
| -rw-r--r-- | 1.0/default/vendor.nxp.hardware.nfc@1.0-service.rc | 33 | ||||
| -rw-r--r-- | 1.1/default/Android.bp | 24 | ||||
| -rw-r--r-- | 1.1/default/Nfc.cpp | 173 | ||||
| -rw-r--r-- | 1.1/default/Nfc.h | 140 | ||||
| -rw-r--r-- | 1.1/default/NfcClientCallback.cpp | 67 | ||||
| -rw-r--r-- | 1.1/default/NfcClientCallback.h | 72 | ||||
| -rw-r--r-- | 1.1/default/service.cpp | 56 | ||||
| -rw-r--r-- | 1.1/default/vendor.nxp.hardware.nfc@1.1-service.rc | 33 | ||||
| -rw-r--r-- | Android.bp | 1 |
16 files changed, 0 insertions, 1044 deletions
diff --git a/1.0/default/Android.bp b/1.0/default/Android.bp deleted file mode 100644 index 083dc08..0000000 --- a/1.0/default/Android.bp +++ /dev/null @@ -1,16 +0,0 @@ -cc_library_shared { - name: "vendor.nxp.hardware.nfc@1.0-impl", - relative_install_path: "hw", - vendor: true, - srcs: [ - "NqNfc.cpp", - ], - shared_libs: [ - "liblog", - "libhardware", - "libhidlbase", - "libhidltransport", - "libutils", - "vendor.nxp.hardware.nfc@1.0", - ], -} diff --git a/1.0/default/Android.mk b/1.0/default/Android.mk deleted file mode 100644 index 6220ea9..0000000 --- a/1.0/default/Android.mk +++ /dev/null @@ -1,26 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE := vendor.nxp.hardware.nfc@1.0-service -LOCAL_INIT_RC := vendor.nxp.hardware.nfc@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - libhardware_legacy \ - libhardware \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.nfc@1.0 \ - vendor.nxp.hardware.nfc@1.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/1.0/default/NqNfc.cpp b/1.0/default/NqNfc.cpp deleted file mode 100644 index 15a57bf..0000000 --- a/1.0/default/NqNfc.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2017, 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" - -namespace vendor { -namespace nxp { -namespace hardware { -namespace nfc { -namespace V1_0 { -namespace implementation { - -NqNfc::NqNfc(pn547_dev_t* device) : mDevice(device) { -} - -// 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; - 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 = mDevice->ioctl(&mDevice->nci_device, 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 ::android::hidl::base::V1_0::IBase follow. - -INqNfc* HIDL_FETCH_INqNfc(const char* /* name */) { - nfc_nci_device_t* nci_device; - const hw_module_t* hw_module = NULL; - pn547_dev_t* nfc_device = NULL; - int ret = 0; - - nci_device = &nfc_device->nci_device; - - ret = hw_get_module (NFC_NCI_HARDWARE_MODULE_ID, &hw_module); - if (ret == 0) - { - ret = nfc_nci_open (hw_module, &nci_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); - - if (ret == 0) { - ALOGD ("vendor NXP NFC HAL module loaded properly"); - nfc_device = (pn547_dev_t*)nci_device; - return new NqNfc(nfc_device); - } else { - ALOGE("Passthrough failed to load legacy HAL."); - return nullptr; - } -} - -} // namespace implementation -} // namespace V1_0 -} // namespace nfc -} // namespace hardware -} // namespace nxp -} // namespace vendor diff --git a/1.0/default/NqNfc.h b/1.0/default/NqNfc.h deleted file mode 100644 index d3e22d8..0000000 --- a/1.0/default/NqNfc.h +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2017, 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_0_NQNFC_H -#define VENDOR_NXP_HARDWARE_NFC_V1_0_NQNFC_H - -#include <vendor/nxp/hardware/nfc/1.0/INqNfc.h> -#include <hidl/MQDescriptor.h> -#include <hidl/Status.h> -#include <hardware/nfc.h> -#include "include/device.h" -#include "include/utils.h" - -namespace vendor { -namespace nxp { -namespace hardware { -namespace nfc { -namespace V1_0 { -namespace implementation { - -using ::android::hidl::base::V1_0::DebugInfo; -using ::android::hidl::base::V1_0::IBase; -using ::vendor::nxp::hardware::nfc::V1_0::INqNfc; -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 NqNfc : public INqNfc { - NqNfc(pn547_dev_t* device); - // 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; - - private: - const pn547_dev_t* mDevice; - - // Methods from ::android::hidl::base::V1_0::IBase follow. - -}; - -extern "C" INqNfc* HIDL_FETCH_INqNfc(const char* name); - -} // namespace implementation -} // namespace V1_0 -} // namespace nfc -} // namespace hardware -} // namespace nxp -} // namespace vendor - -#endif // VENDOR_NXP_HARDWARE_NFC_V1_0_NQNFC_H diff --git a/1.0/default/include/device.h b/1.0/default/include/device.h deleted file mode 100644 index 79f2e88..0000000 --- a/1.0/default/include/device.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2017, 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_NQNFC_V1_0_DEVICE_H -#define VENDOR_NXP_NQNFC_V1_0_DEVICE_H - -typedef struct { - struct nfc_nci_device nci_device; - - /* Local definitions */ - int(*ioctl)(const struct nfc_nci_device *p_dev, long arg, void *p_data); - int(*check_fw_dwnld_flag)(const struct nfc_nci_device *p_dev, uint8_t* param1); - -} pn547_dev_t; - -#endif // VENDOR_NXP_NQNFC_V1_0_DEVICE_H diff --git a/1.0/default/include/utils.h b/1.0/default/include/utils.h deleted file mode 100644 index ba2bf7c..0000000 --- a/1.0/default/include/utils.h +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2017, 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_NQNFC_V1_0_UTILS_H -#define VENDOR_NXP_NQNFC_V1_0_UTILS_H - -#define MAX_IOCTL_TRANSCEIVE_CMD_LEN 256 -#define MAX_IOCTL_TRANSCEIVE_RESP_LEN 256 -#define MAX_ATR_INFO_LEN 128 - -/* - * Data structures provided below are used of Hal Ioctl calls - */ - -/* - * nfc_nci_ExtnCmd_t shall contain data for commands used for transceive command in ioctl - */ -typedef struct -{ - uint16_t cmd_len; - uint8_t p_cmd[MAX_IOCTL_TRANSCEIVE_CMD_LEN]; -} nfc_nci_ExtnCmd_t; - -/* - * nfc_nci_ExtnRsp_t shall contain response for command sent in transceive command - */ -typedef struct -{ - uint16_t rsp_len; - uint8_t p_rsp[MAX_IOCTL_TRANSCEIVE_RESP_LEN]; -} nfc_nci_ExtnRsp_t; - -/* - * InputData_t :ioctl has multiple subcommands - * Each command has corresponding input data which needs to be populated in this - */ -typedef union { - uint16_t bootMode; - uint8_t halType; - nfc_nci_ExtnCmd_t nciCmd; - uint32_t timeoutMilliSec; -}InputData_t; - -/* - * nfc_nci_ExtnInputData_t :Apart from InputData_t, there are context data - * which is required during callback from stub to proxy. - * To avoid additional copy of data while propagating from libnfc to Adaptation - * and Nfcstub to ncihal, common structure is used. As a sideeffect, context data - * is exposed to libnfc (Not encapsulated). - */ -typedef struct { - void* context; - InputData_t data; -}nfc_nci_ExtnInputData_t; - -/* - * outputData_t :ioctl has multiple commands/responses - * This contains the output types for each ioctl. - */ -typedef union{ - uint32_t status; - nfc_nci_ExtnRsp_t nciRsp; - uint8_t nxpNciAtrInfo[MAX_ATR_INFO_LEN]; - uint32_t p61CurrentState; - uint16_t fwUpdateInf; - uint16_t fwDwnldStatus; - uint16_t fwMwVerStatus; -}outputData_t; - -/* - * nfc_nci_ExtnOutputData_t :Apart from outputData_t, there are other information - * which is required during callback from stub to proxy. - * For ex (context, result of the operation , type of ioctl which was completed). - * To avoid additional copy of data while propagating from libnfc to Adaptation - * and Nfcstub to ncihal, common structure is used. As a sideeffect, these data - * is exposed(Not encapsulated). - */ -typedef struct { - uint64_t ioctlType; - uint32_t result; - void* context; - outputData_t data; -}nfc_nci_ExtnOutputData_t; - -/* - * nfc_nci_IoctlInOutData_t :data structure for input & output - * to be sent for ioctl command. input is populated by client/proxy side - * output is provided from server/stub to client/proxy - */ -typedef struct { - nfc_nci_ExtnInputData_t inp; - nfc_nci_ExtnOutputData_t out; -}nfc_nci_IoctlInOutData_t; - -#endif //VENDOR_NXP_NQNFC_V1_0_UTILS_H diff --git a/1.0/default/service.cpp b/1.0/default/service.cpp deleted file mode 100644 index 795b368..0000000 --- a/1.0/default/service.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2017, 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.0-service" - -#include <android/hardware/nfc/1.0/INfc.h> -#include <vendor/nxp/hardware/nfc/1.0/INqNfc.h> - -#include <hidl/LegacySupport.h> - -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; -using android::hardware::nfc::V1_0::INfc; -using vendor::nxp::hardware::nfc::V1_0::INqNfc; -using android::hardware::registerPassthroughServiceImplementation; -using android::OK; - -int main() { - configureRpcThreadpool(10, true /*callerWillJoin*/); - android::status_t status; - status = registerPassthroughServiceImplementation<INfc>(); - LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering nfc AOSP service: %d", status); - status = registerPassthroughServiceImplementation<INqNfc>(); - LOG_ALWAYS_FATAL_IF(status != OK, "Error while registering nqnfc vendor service: %d", status); - joinRpcThreadpool(); - return status; -} diff --git a/1.0/default/vendor.nxp.hardware.nfc@1.0-service.rc b/1.0/default/vendor.nxp.hardware.nfc@1.0-service.rc deleted file mode 100644 index afa6209..0000000 --- a/1.0/default/vendor.nxp.hardware.nfc@1.0-service.rc +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2017, 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_hal_service /vendor/bin/hw/vendor.nxp.hardware.nfc@1.0-service - class hal - user nfc - group nfc diff --git a/1.1/default/Android.bp b/1.1/default/Android.bp deleted file mode 100644 index 4260e6b..0000000 --- a/1.1/default/Android.bp +++ /dev/null @@ -1,24 +0,0 @@ -cc_binary { - name: "vendor.nxp.hardware.nfc@1.1-service", - defaults: ["hidl_defaults"], - init_rc: ["vendor.nxp.hardware.nfc@1.1-service.rc"], - relative_install_path: "hw", - proprietary: true, - srcs: [ - "service.cpp", - "Nfc.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", - ], - header_libs: [ - "libhardware_headers", - ], -} diff --git a/1.1/default/Nfc.cpp b/1.1/default/Nfc.cpp deleted file mode 100644 index 12923a3..0000000 --- a/1.1/default/Nfc.cpp +++ /dev/null @@ -1,173 +0,0 @@ -/****************************************************************************** - * - * Copyright 2018 NXP - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************************/ -/* - * 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. - */ - -#define LOG_TAG "android.hardware.nfc@1.1-impl" -#include <log/log.h> -#include "Nfc.h" -#include "phNxpNciHal_Adaptation.h" -#include "phNfcStatus.h" - -#define CHK_STATUS(x) ((x) == NFCSTATUS_SUCCESS) \ - ? (V1_0::NfcStatus::OK) : (V1_0::NfcStatus::FAILED) - -extern bool nfc_debug_enabled; - -namespace android { -namespace hardware { -namespace nfc { -namespace V1_1 { -namespace implementation { - -sp<V1_1::INfcClientCallback> Nfc::mCallbackV1_1 = nullptr; -sp<V1_0::INfcClientCallback> Nfc::mCallbackV1_0 = nullptr; - -Return<V1_0::NfcStatus> Nfc::open_1_1( - const sp<V1_1::INfcClientCallback>& clientCallback) { - if (clientCallback == nullptr) { - ALOGD_IF(nfc_debug_enabled, "Nfc::open null callback"); - return V1_0::NfcStatus::FAILED; - } else { - mCallbackV1_1 = clientCallback; - mCallbackV1_1->linkToDeath(this, 0 /*cookie*/); - } - return open(clientCallback); -} - -// Methods from ::android::hardware::nfc::V1_0::INfc follow. -Return<V1_0::NfcStatus> Nfc::open( - const sp<V1_0::INfcClientCallback>& clientCallback) { - ALOGD_IF(nfc_debug_enabled, "Nfc::open Enter"); - if (clientCallback == nullptr) { - ALOGD_IF(nfc_debug_enabled, "Nfc::open null callback"); - return V1_0::NfcStatus::FAILED; - } else { - mCallbackV1_0 = clientCallback; - mCallbackV1_0->linkToDeath(this, 0 /*cookie*/); - } - - NFCSTATUS status = phNxpNciHal_open(eventCallback, dataCallback); - ALOGD_IF(nfc_debug_enabled, "Nfc::open Exit"); - return CHK_STATUS(status); -} - -Return<uint32_t> Nfc::write(const hidl_vec<uint8_t>& data) { - hidl_vec<uint8_t> copy = data; - return phNxpNciHal_write(copy.size(), ©[0]); -} - -Return<V1_0::NfcStatus> Nfc::coreInitialized(const hidl_vec<uint8_t>& data) { - hidl_vec<uint8_t> copy = data; - NFCSTATUS status = phNxpNciHal_core_initialized(©[0]); - return CHK_STATUS(status); -} - -Return<V1_0::NfcStatus> Nfc::prediscover() { - NFCSTATUS status = phNxpNciHal_pre_discover(); - return CHK_STATUS(status); -} - -Return<V1_0::NfcStatus> Nfc::close() { - if (mCallbackV1_1 == nullptr && mCallbackV1_0 == nullptr) { - return V1_0::NfcStatus::FAILED; - } - NFCSTATUS status = phNxpNciHal_close(false); - - if (mCallbackV1_1 != nullptr) { - mCallbackV1_1->unlinkToDeath(this); - mCallbackV1_1 = nullptr; - } - if (mCallbackV1_0 != nullptr) { - mCallbackV1_0->unlinkToDeath(this); - mCallbackV1_0 = nullptr; - } - return CHK_STATUS(status); -} - -Return<V1_0::NfcStatus> Nfc::controlGranted() { - NFCSTATUS status = phNxpNciHal_control_granted(); - return CHK_STATUS(status); -} - -Return<V1_0::NfcStatus> Nfc::powerCycle() { - NFCSTATUS status = phNxpNciHal_power_cycle(); - return CHK_STATUS(status); -} - -// Methods from ::android::hardware::nfc::V1_1::INfc follow. -Return<void> Nfc::factoryReset() { - phNxpNciHal_do_factory_reset(); - return Void(); -} - -Return<V1_0::NfcStatus> Nfc::closeForPowerOffCase() { - if (mCallbackV1_1 == nullptr && mCallbackV1_0 == nullptr) { - return V1_0::NfcStatus::FAILED; - } - NFCSTATUS status = phNxpNciHal_configDiscShutdown(); - - if (mCallbackV1_1 != nullptr) { - mCallbackV1_1->unlinkToDeath(this); - mCallbackV1_1 = nullptr; - } - if (mCallbackV1_0 != nullptr) { - mCallbackV1_0->unlinkToDeath(this); - mCallbackV1_0 = nullptr; - } - return CHK_STATUS(status); -} - -Return<void> Nfc::getConfig(getConfig_cb hidl_cb) { - NfcConfig nfcVendorConfig; - phNxpNciHal_getVendorConfig(nfcVendorConfig); - hidl_cb(nfcVendorConfig); - return Void(); -} - -} // namespace implementation -} // namespace V1_1 -} // namespace nfc -} // namespace hardware -} // namespace android diff --git a/1.1/default/Nfc.h b/1.1/default/Nfc.h deleted file mode 100644 index eaec8ca..0000000 --- a/1.1/default/Nfc.h +++ /dev/null @@ -1,140 +0,0 @@ -/****************************************************************************** - * - * Copyright 2018 NXP - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************************/ -/* - * 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_NFC_H -#define ANDROID_HARDWARE_NFC_V1_1_NFC_H - -#include <android/hardware/nfc/1.1/INfc.h> -#include <android/hardware/nfc/1.1/types.h> -#include <hidl/MQDescriptor.h> -#include <hidl/Status.h> -#include <log/log.h> - -namespace android { -namespace hardware { -namespace nfc { -namespace V1_1 { -namespace implementation { - -using ::android::hidl::base::V1_0::IBase; -using ::android::hardware::nfc::V1_1::INfc; -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 Nfc : public V1_1::INfc, public hidl_death_recipient { - public: - // Methods from ::android::hardware::nfc::V1_0::INfc follow. - Return<V1_0::NfcStatus> open( - const sp<V1_0::INfcClientCallback>& clientCallback) override; - Return<V1_0::NfcStatus> open_1_1( - const sp<V1_1::INfcClientCallback>& clientCallback) override; - Return<uint32_t> write(const hidl_vec<uint8_t>& data) override; - Return<V1_0::NfcStatus> coreInitialized( - const hidl_vec<uint8_t>& data) override; - Return<V1_0::NfcStatus> prediscover() override; - Return<V1_0::NfcStatus> close() override; - Return<V1_0::NfcStatus> controlGranted() override; - Return<V1_0::NfcStatus> powerCycle() override; - - // Methods from ::android::hardware::nfc::V1_1::INfc follow. - Return<void> factoryReset(); - Return<V1_0::NfcStatus> closeForPowerOffCase(); - Return<void> getConfig(getConfig_cb config); - - // Methods from ::android::hidl::base::V1_0::IBase follow. - - static void eventCallback(uint8_t event, uint8_t status) { - if (mCallbackV1_1 != nullptr) { - auto ret = mCallbackV1_1->sendEvent_1_1((V1_1::NfcEvent)event, - (V1_0::NfcStatus)status); - if (!ret.isOk()) { - ALOGW("failed to send event for mCallbackV1_1!!!"); - } - } else if (mCallbackV1_0 != nullptr) { - auto ret = mCallbackV1_0->sendEvent((V1_0::NfcEvent)event, - (V1_0::NfcStatus)status); - if (!ret.isOk()) { - ALOGE("failed to send event for mCallbackV1_0!!!"); - } - } - } - - static void dataCallback(uint16_t data_len, uint8_t* p_data) { - hidl_vec<uint8_t> data; - data.setToExternal(p_data, data_len); - if (mCallbackV1_1 != nullptr) { - auto ret = mCallbackV1_1->sendData(data); - if (!ret.isOk()) { - ALOGW("failed to send data for mCallbackV1_1!!!"); - } - } else if (mCallbackV1_0 != nullptr) { - auto ret = mCallbackV1_0->sendData(data); - if (!ret.isOk()) { - ALOGE("failed to send data for mCallbackV1_0!!!"); - } - } - } - - virtual void serviceDied(uint64_t /*cookie*/, const wp<IBase>& /*who*/) { - close(); - } - - private: - static sp<V1_1::INfcClientCallback> mCallbackV1_1; - static sp<V1_0::INfcClientCallback> mCallbackV1_0; -}; - -} // namespace implementation -} // namespace V1_1 -} // namespace nfc -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_NFC_V1_1_NFC_H diff --git a/1.1/default/NfcClientCallback.cpp b/1.1/default/NfcClientCallback.cpp deleted file mode 100644 index b9eafe1..0000000 --- a/1.1/default/NfcClientCallback.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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(); -} - - -// Methods from ::android::hidl::base::V1_0::IBase follow. - -//INfcClientCallback* HIDL_FETCH_INfcClientCallback(const char* /* name */) { -// return new NfcClientCallback(); -//} - -} // namespace implementation -} // namespace V1_1 -} // namespace nfc -} // namespace hardware -} // namespace android diff --git a/1.1/default/NfcClientCallback.h b/1.1/default/NfcClientCallback.h deleted file mode 100644 index 774df2b..0000000 --- a/1.1/default/NfcClientCallback.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * 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. - -}; - -// FIXME: most likely delete, this is only for passthrough implementations -// extern "C" INfcClientCallback* HIDL_FETCH_INfcClientCallback(const char* name); - -} // namespace implementation -} // namespace V1_1 -} // namespace nfc -} // namespace hardware -} // namespace android - -#endif // ANDROID_HARDWARE_NFC_V1_1_NFCCLIENTCALLBACK_H diff --git a/1.1/default/service.cpp b/1.1/default/service.cpp deleted file mode 100644 index c3ddb9b..0000000 --- a/1.1/default/service.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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. - */ - -#define LOG_TAG "vendor.nxp.hardware.nfc@1.1-service" - -#include <android/hardware/nfc/1.1/INfc.h> -#include <vendor/nxp/hardware/nfc/1.0/INqNfc.h> - -#include <hidl/LegacySupport.h> -#include "Nfc.h" - -using android::hardware::configureRpcThreadpool; -using android::hardware::joinRpcThreadpool; -using android::hardware::nfc::V1_1::INfc; -using vendor::nxp::hardware::nfc::V1_0::INqNfc; -using android::hardware::nfc::V1_1::implementation::Nfc; -using android::hardware::registerPassthroughServiceImplementation; -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); - joinRpcThreadpool(); - return status; -} diff --git a/1.1/default/vendor.nxp.hardware.nfc@1.1-service.rc b/1.1/default/vendor.nxp.hardware.nfc@1.1-service.rc deleted file mode 100644 index d36c19d..0000000 --- a/1.1/default/vendor.nxp.hardware.nfc@1.1-service.rc +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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. - */ - -service nqnfc_1_1_hal_service /vendor/bin/hw/vendor.nxp.hardware.nfc@1.1-service - class hal - user nfc - group nfc @@ -1,7 +1,6 @@ // This is an autogenerated file, do not edit. subdirs = [ "1.0", - "1.0/default", ] hidl_package_root { |