summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Singhal <gsinghal@codeaurora.org>2018-04-20 14:14:20 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2018-08-29 21:47:04 -0700
commit69c6c9e36fdb219ebb94df78a131d2f0b8ba914f (patch)
tree7eb9bbe5b333be03ef3a8fa155d756af9663f4f1
parent380cb877eaf269c9031e31517db023cd9b8ec530 (diff)
NFC: Add NqNfc interface support
Add NqNfc interface support in 1.1 HIDL service. Change-Id: I7bbc37590ba08680276b6300080953a0826b3685
-rw-r--r--1.1/default/NqNfc.cpp108
-rw-r--r--1.1/default/NqNfc.h79
2 files changed, 187 insertions, 0 deletions
diff --git a/1.1/default/NqNfc.cpp b/1.1/default/NqNfc.cpp
new file mode 100644
index 0000000..15a57bf
--- /dev/null
+++ b/1.1/default/NqNfc.cpp
@@ -0,0 +1,108 @@
+/*
+ * 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.1/default/NqNfc.h b/1.1/default/NqNfc.h
new file mode 100644
index 0000000..d3e22d8
--- /dev/null
+++ b/1.1/default/NqNfc.h
@@ -0,0 +1,79 @@
+/*
+ * 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