commit af447a50441da6810b8a5ef0295e5478c4d6c9e2
author nxp61433 <siddaram.khed@nxp.com> Wed Feb 12 16:58:04 2020 +0530
committer Nanjesh <nanjesh.s_1@nxp.com> Fri Feb 28 18:36:25 2020 +0530
tree 021cb80f75e20e8780a06a62e047b521566a1dd5
parent bd5827d84a954bec1e68ed1779d9a782c2f2f9f0

NXP NFC HAL 2.0 adaptation : NCI_ESE_HARD_RESET_IOCTL to resetEse() mapping

nci/SN100x/jni/Android.bp

diff --git a/nci/SN100x/jni/Android.bp b/nci/SN100x/jni/Android.bp
index affefd8..fd61f04 100644
--- a/nci/SN100x/jni/Android.bp
+++ b/nci/SN100x/jni/Android.bp
@@ -35,6 +35,7 @@
         "libnfc-nci",
         "libchrome",
         "libbase",
+        "vendor.nxp.nxpnfc@2.0",
     ],
     product_variables: {
         debuggable: {

nci/SN100x/jni/NativeSecureElement.cpp

diff --git a/nci/SN100x/jni/NativeSecureElement.cpp b/nci/SN100x/jni/NativeSecureElement.cpp
index 655b045..e29ce59 100755
--- a/nci/SN100x/jni/NativeSecureElement.cpp
+++ b/nci/SN100x/jni/NativeSecureElement.cpp
@@ -12,7 +12,7 @@
 *  See the License for the specific language governing permissions and
 *  limitations under the License.
 *
-*  Copyright 2018-2019 NXP
+*  Copyright 2018-2020 NXP
 *
 ******************************************************************************/
 
@@ -185,15 +185,14 @@
   int ret = -1;
   NfcAdaptation& theInstance = NfcAdaptation::GetInstance();
   tHAL_NFC_ENTRY* halFuncEntries = theInstance.GetHalEntryFuncs ();
-  nfc_nci_IoctlInOutData_t inpOutData;
-  inpOutData.inp.level = NCI_ESE_HARD_RESET_IOCTL;
+
   LOG(INFO) << StringPrintf("%s: Entry", __func__);
   if(NULL == halFuncEntries) {
     LOG(INFO) << StringPrintf("%s: halFuncEntries is NULL", __func__);
   } else {
-    ret = halFuncEntries->ioctl(HAL_NFC_IOCTL_ESE_HARD_RESET, (void*)&inpOutData);
-    if(ret < 0) {
-      LOG(INFO) << StringPrintf("%s: IOCTL failed", __func__);
+    ret = theInstance.resetEse((uint64_t)NFA_ESE_HARD_RESET);
+    if(ret == 0) {
+      LOG(INFO) << StringPrintf("%s: reset IOCTL failed", __func__);
     } else {
       stat = true;
     }

nci/SN100x/jni/SecureElement.h

diff --git a/nci/SN100x/jni/SecureElement.h b/nci/SN100x/jni/SecureElement.h
index f8b2c0b..5d1c573 100755
--- a/nci/SN100x/jni/SecureElement.h
+++ b/nci/SN100x/jni/SecureElement.h
@@ -37,6 +37,7 @@
 #define CONNECTIVITY_PIPE_ID_UICC3 0x31
 #define NFA_EE_TAG_HCI_HOST_ID 0xA0 /* HCI host ID */
 #define SMX_PIPE_ID 0x19
+#define NFA_ESE_HARD_RESET  0x05
 #if (NXP_EXTNS == TRUE)
 typedef enum {
   UICC_01_SELECTED_ENABLED = 0x01,