commit 032502f5585a8367d727321b7a143359e23eec93
author Martijn Coenen <maco@google.com> Thu Apr 16 07:49:56 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 16 07:49:57 2015 +0000
tree 5b7b81d37639df99d6bcaa68ac6b5d2bd88faa9a
parent 28a1e8d27f1055594043bee9831428b457a74212
parent e4ecc7d6288141ce651fa288fbda7a6e5b0623d6

Merge "Add system prop for enabling protocol logging"

halimpl/bcm2079x/adaptation/HalAdaptation.cpp

diff --git a/halimpl/bcm2079x/adaptation/HalAdaptation.cpp b/halimpl/bcm2079x/adaptation/HalAdaptation.cpp
index 9674e0e..c39bd1e 100644
--- a/halimpl/bcm2079x/adaptation/HalAdaptation.cpp
+++ b/halimpl/bcm2079x/adaptation/HalAdaptation.cpp
@@ -121,8 +121,7 @@
     }
 
     // Initialize protocol logging level
-    if ( GetNumValue ( NAME_PROTOCOL_TRACE_LEVEL, &num, sizeof ( num ) ) )
-        ScrProtocolTraceFlag = num;
+    InitializeProtocolLogLevel ();
 
     tUSERIAL_OPEN_CFG cfg;
     struct tUART_CONFIG  uart;

halimpl/bcm2079x/adaptation/OverrideLog.cpp

diff --git a/halimpl/bcm2079x/adaptation/OverrideLog.cpp b/halimpl/bcm2079x/adaptation/OverrideLog.cpp
index ba99f0d..b3623b1 100644
--- a/halimpl/bcm2079x/adaptation/OverrideLog.cpp
+++ b/halimpl/bcm2079x/adaptation/OverrideLog.cpp
@@ -31,7 +31,6 @@
 
 unsigned char appl_trace_level = BT_TRACE_LEVEL_DEBUG;
 
-
 /*******************************************************************************
 **
 ** Function:        InitializeGlobalAppLogLevel
@@ -78,3 +77,25 @@
     }
     return appl_trace_level;
 }
+
+UINT32 InitializeProtocolLogLevel () {
+    UINT32 num = 0;
+    char valueStr [PROPERTY_VALUE_MAX] = {0};
+
+    if ( GetNumValue ( NAME_PROTOCOL_TRACE_LEVEL, &num, sizeof ( num ) ) )
+        ScrProtocolTraceFlag = num;
+
+    int len = property_get ("nfc.enable_protocol_log", valueStr, "");
+    if (len > 0)
+    {
+        if (strncmp("0", valueStr, 1) == 0)
+        {
+            ScrProtocolTraceFlag = 0;
+        } else {
+            ScrProtocolTraceFlag = ~0;
+        }
+    }
+
+    return ScrProtocolTraceFlag;
+}
+

halimpl/bcm2079x/include/OverrideLog.h

diff --git a/halimpl/bcm2079x/include/OverrideLog.h b/halimpl/bcm2079x/include/OverrideLog.h
index 523f331..a441cbd 100644
--- a/halimpl/bcm2079x/include/OverrideLog.h
+++ b/halimpl/bcm2079x/include/OverrideLog.h
@@ -41,6 +41,7 @@
 
 
 extern unsigned char appl_trace_level;
+extern UINT32 ScrProtocolTraceFlag;
 
 
 /*******************************************************************************
@@ -61,6 +62,7 @@
 **
 *******************************************************************************/
 unsigned char InitializeGlobalAppLogLevel ();
+UINT32 InitializeProtocolLogLevel ();
 
 
 #ifdef __cplusplus

src/adaptation/NfcAdaptation.cpp

diff --git a/src/adaptation/NfcAdaptation.cpp b/src/adaptation/NfcAdaptation.cpp
index 0736811..1a9e191 100644
--- a/src/adaptation/NfcAdaptation.cpp
+++ b/src/adaptation/NfcAdaptation.cpp
@@ -130,8 +130,8 @@
     {
         strlcpy (bcm_nfc_location, "/data/nfc", sizeof(bcm_nfc_location));
     }
-    if ( GetNumValue ( NAME_PROTOCOL_TRACE_LEVEL, &num, sizeof ( num ) ) )
-        ScrProtocolTraceFlag = num;
+
+    initializeProtocolLogLevel ();
 
     if ( GetStrValue ( NAME_NFA_DM_CFG, (char*)nfa_dm_cfg, sizeof ( nfa_dm_cfg ) ) )
         p_nfa_dm_cfg = ( tNFA_DM_CFG * ) &nfa_dm_cfg[0];

src/adaptation/OverrideLog.cpp

diff --git a/src/adaptation/OverrideLog.cpp b/src/adaptation/OverrideLog.cpp
index 11b735a..93f2b47 100644
--- a/src/adaptation/OverrideLog.cpp
+++ b/src/adaptation/OverrideLog.cpp
@@ -76,3 +76,25 @@
     }
     return appl_trace_level;
 }
+
+UINT32 initializeProtocolLogLevel () {
+    UINT32 num = 0;
+    char valueStr [PROPERTY_VALUE_MAX] = {0};
+
+    if ( GetNumValue ( NAME_PROTOCOL_TRACE_LEVEL, &num, sizeof ( num ) ) )
+        ScrProtocolTraceFlag = num;
+
+    int len = property_get ("nfc.enable_protocol_log", valueStr, "");
+    if (len > 0)
+    {
+        if (strncmp("0", valueStr, 1) == 0)
+        {
+            ScrProtocolTraceFlag = 0;
+        } else {
+            ScrProtocolTraceFlag = ~0;
+        }
+    }
+
+    return ScrProtocolTraceFlag;
+}
+

src/include/OverrideLog.h

diff --git a/src/include/OverrideLog.h b/src/include/OverrideLog.h
index 472f4da..42905ce 100644
--- a/src/include/OverrideLog.h
+++ b/src/include/OverrideLog.h
@@ -41,6 +41,7 @@
 
 
 extern unsigned char appl_trace_level;
+extern UINT32 ScrProtocolTraceFlag;
 
 
 /*******************************************************************************
@@ -61,6 +62,7 @@
 **
 *******************************************************************************/
 unsigned char initializeGlobalAppLogLevel ();
+UINT32 initializeProtocolLogLevel ();
 
 
 #ifdef __cplusplus