commit ef5b4d9591b7aca0c99eea3e760b2cd7b5778a1c
author Arach MOHAMMED BRAHIM <arach.mohammed.brahim@st.com> Mon Sep 24 16:07:04 2018 +0200
committer Arach MOHAMMED BRAHIM <arach.mohammed.brahim@st.com> Mon Sep 24 17:00:55 2018 +0200
tree 572727e130f973cfa79b52d512fc9870ed8edaaa
parent 838910ba35ab5af945419d3db9927b16fa0d49ed

Handling NFC Mode feature in HAL

Depending of the NFC_MODE conf value, send a command to enter the CLF
either in QuickBoot/UsbCharging mode or in nfc mode off at switch off.
For all the other close cases, send a nfc mode off command.

Change-Id: I6f85dca5d1994964b83e366cfd5c5d34a1cdbdaa

st21nfc/hal_wrapper.cc

diff --git a/st21nfc/hal_wrapper.cc b/st21nfc/hal_wrapper.cc
index 6d67bb8..0563826 100644
--- a/st21nfc/hal_wrapper.cc
+++ b/st21nfc/hal_wrapper.cc
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <hardware/nfc.h>
 #include <string.h>
+#include <unistd.h>
 #include "android_logmsg.h"
 #include "halcore.h"
 
@@ -42,7 +43,8 @@
   HAL_WRAPPER_STATE_OPEN,
   HAL_WRAPPER_STATE_OPEN_CPLT,
   HAL_WRAPPER_STATE_NFC_ENABLE_ON,
-  HAL_WRAPPER_STATE_READY
+  HAL_WRAPPER_STATE_READY,
+  HAL_WRAPPER_STATE_CLOSING
 } hal_wrapper_state_e;
 
 static void halWrapperDataCallback(uint16_t data_len, uint8_t* p_data);
@@ -79,10 +81,20 @@
   return 1;
 }
 
-int hal_wrapper_close(int call_cb) {
-  STLOG_HAL_D("%s", __func__);
+int hal_wrapper_close(int call_cb, int nfc_mode) {
+  STLOG_HAL_V("%s - Sending PROP_NFC_MODE_SET_CMD(%d)", __func__, nfc_mode);
+  uint8_t propNfcModeSetCmdQb[] = {0x2f, 0x02, 0x02, 0x02, (uint8_t)nfc_mode};
 
-  mHalWrapperState = HAL_WRAPPER_STATE_CLOSED;
+  mHalWrapperState = HAL_WRAPPER_STATE_CLOSING;
+  // Send PROP_NFC_MODE_SET_CMD
+  if (!HalSendDownstreamTimer(mHalHandle, propNfcModeSetCmdQb,
+                              sizeof(propNfcModeSetCmdQb), 100)) {
+    STLOG_HAL_E("NFC-NCI HAL: %s  HalSendDownstreamTimer failed", __func__);
+    return -1;
+  }
+  // Let the CLF receive and process this
+  usleep(50000);
+
   I2cCloseLayer();
   if (call_cb) mHalWrapperCallback(HAL_NFC_CLOSE_CPLT_EVT, HAL_NFC_STATUS_OK);
 
@@ -158,6 +170,12 @@
         STLOG_HAL_V("%s - Core reset notification - Nfc mode ", __func__);
       }
       break;
+    case HAL_WRAPPER_STATE_CLOSING:
+      if ((p_data[0] == 0x4f) && (p_data[1] == 0x02)) {
+        mHalWrapperDataCallback(data_len, p_data);
+        mHalWrapperState = HAL_WRAPPER_STATE_CLOSED;
+      }
+      break;
   }
 }