From 779bf1afd19f5b784c5c1c47d50fdd56b1f5ebfd Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <contact@paulk.fr>
Date: Mon, 30 Jun 2014 00:11:52 +0200
Subject: NativeNfcManager: Properly unconfigure NFC chip

Change-Id: I8da74ff64579181387b3905c29e5d4dca9e9e7eb
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 nxp/jni/com_android_nfc.h                    | 1 +
 nxp/jni/com_android_nfc_NativeNfcManager.cpp | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/nxp/jni/com_android_nfc.h b/nxp/jni/com_android_nfc.h
index fcf54cf..770ae35 100755
--- a/nxp/jni/com_android_nfc.h
+++ b/nxp/jni/com_android_nfc.h
@@ -30,6 +30,7 @@ extern "C" {
 #include <phNfcTypes.h>
 #include <phNfcIoctlCode.h>
 #include <phLibNfc.h>
+#include <phDal4Nfc.h>
 #include <phDal4Nfc_messageQueueLib.h>
 #include <phFriNfc_NdefMap.h>
 #include <cutils/log.h>
diff --git a/nxp/jni/com_android_nfc_NativeNfcManager.cpp b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
index af0e4fb..02086da 100755
--- a/nxp/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/nxp/jni/com_android_nfc_NativeNfcManager.cpp
@@ -624,10 +624,14 @@ clean_and_return:
    {
       if(nat)
       {
+          if (driverConfigured)
+              nfc_jni_unconfigure_driver(nat);
+
          kill_client(nat);
       }
    }
    if (pn544_dev != NULL) {
+       phDal4Nfc_Reset(0);
        nfc_pn544_close(pn544_dev);
    }
    nfc_cb_data_deinit(&cb_data);
-- 
cgit v1.1