Change default P2P initiator mode to phNfc_eP2P_ALL (all passive and 424A).

Also add debug hooks to manually set P2P modes.

Change-Id: I4abd8d5ac35c3ef6c6ffee475760b917a8bcebf1

1 files changed, 26 insertions, 2 deletions

diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp
index e220a33..c4d88f5 100644
--- a/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/jni/com_android_nfc_NativeNfcManager.cpp
@@ -1271,6 +1271,30 @@ static void nfc_jni_start_card_emu_discovery_locked(struct nfc_jni_native_data *
        return;
 }
 
+static short get_p2p_mode() {
+    char value[PROPERTY_VALUE_MAX];
+    property_get("debug.nfc.NXP_NFCI_MODE", value, "");
+    if (value[0]) {
+        short mode;
+        mode = atoi(value);
+        LOGD("debug.nfc.NXP_NFCI_MODE = %X", mode);
+        return mode;
+    }
+    return phNfc_eP2P_ALL;  // default
+}
+
+static bool get_p2p_target_disable() {
+    char value[PROPERTY_VALUE_MAX];
+    property_get("debug.nfc.TARGET_DISABLE", value, "");
+    if (value[0]) {
+        int mode;
+        mode = atoi(value);
+        LOGD("debug.nfc.TARGET_DISABLE = %d", mode);
+        return mode;
+    }
+    return FALSE;  // default
+}
+
 
 static void nfc_jni_start_discovery_locked(struct nfc_jni_native_data *nat)
 {
@@ -1299,9 +1323,9 @@ static void nfc_jni_start_discovery_locked(struct nfc_jni_native_data *nat)
 #endif
    
    nat->discovery_cfg.PollDevInfo.PollCfgInfo.DisableCardEmulation = FALSE;
-   nat->discovery_cfg.NfcIP_Mode = phNfc_ePassive424;
+   nat->discovery_cfg.NfcIP_Mode = get_p2p_mode();  //initiator
    nat->discovery_cfg.Duration = 300000; /* in ms */
-   nat->discovery_cfg.NfcIP_Tgt_Disable = FALSE;
+   nat->discovery_cfg.NfcIP_Tgt_Disable = get_p2p_target_disable();
 
 
    nat->registry_info.MifareUL = TRUE;