Revert "wlan: add __printf() annotation to logging APIs"
This reverts commit dc1d8572cf279a426eb4cae35784845e3ce4b5b0.
diff --git a/CORE/MAC/src/cfg/cfgDebug.h b/CORE/MAC/src/cfg/cfgDebug.h
index 01e3564..55e320f 100644
--- a/CORE/MAC/src/cfg/cfgDebug.h
+++ b/CORE/MAC/src/cfg/cfgDebug.h
@@ -57,11 +57,7 @@
#include "utilsApi.h"
#include "limTrace.h"
-#if !defined(__printf)
-#define __printf(a,b)
-#endif
-void __printf(3,4) cfgLog(tpAniSirGlobal pMac, tANI_U32 loglevel,
- const char *pString, ...);
+void cfgLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString,...) ;
#endif
diff --git a/CORE/MAC/src/pe/lim/limDebug.h b/CORE/MAC/src/pe/lim/limDebug.h
index 217ffc8..cbea897 100644
--- a/CORE/MAC/src/pe/lim/limDebug.h
+++ b/CORE/MAC/src/pe/lim/limDebug.h
@@ -47,7 +47,7 @@
* History:-
* Date Modified by Modification Information
* --------------------------------------------------------------------
- *
+ *
*/
#ifndef __LIM_DEBUG_H__
@@ -56,12 +56,8 @@
#include "utilsApi.h"
#include "sirDebug.h"
-#if !defined(__printf)
-#define __printf(a,b)
-#endif
-void __printf(3,4) limLog(tpAniSirGlobal pMac, tANI_U32 loglevel,
- const char *pString, ...);
+void limLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString,...) ;
/* define this to show more message in the LIM during TDLS development */
#define LIM_DEBUG_TDLS
diff --git a/CORE/MAC/src/pe/pmm/pmmDebug.h b/CORE/MAC/src/pe/pmm/pmmDebug.h
index e5a161a..30f0caa 100644
--- a/CORE/MAC/src/pe/pmm/pmmDebug.h
+++ b/CORE/MAC/src/pe/pmm/pmmDebug.h
@@ -47,7 +47,7 @@
* History:-
* Date Modified by Modification Information
* --------------------------------------------------------------------
- *
+ *
*/
#ifndef __PMM_DEBUG_H__
@@ -59,12 +59,8 @@
#define UL_HI( field ) ( *( ( (ULONG *)(&(field)) ) + 1 ) )
#define UL_LO( field ) ( *( ( (ULONG *)(&(field)) ) + 0 ) )
-#if !defined(__printf)
-#define __printf(a,b)
-#endif
-void __printf(3,4) pmmLog(tpAniSirGlobal pMac, tANI_U32 loglevel,
- const char *pString, ...) ;
+void pmmLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString,...) ;
#endif
diff --git a/CORE/MAC/src/pe/sch/schDebug.h b/CORE/MAC/src/pe/sch/schDebug.h
index 855d8fd..9041077 100644
--- a/CORE/MAC/src/pe/sch/schDebug.h
+++ b/CORE/MAC/src/pe/sch/schDebug.h
@@ -61,11 +61,26 @@
#endif
#include "sirDebug.h"
-#if !defined(__printf)
-#define __printf(a,b)
-#endif
-void __printf(3,4) schLog(tpAniSirGlobal pMac, tANI_U32 loglevel,
- const char *pString, ...);
+
+void schLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString,...) ;
+
+// -------------------------------------------------------------
+/**
+ *
+ */
+
+#ifdef SCH_DEBUG_STATS
+inline void schClass::schTrace(tSchTrace event, tANI_U32 arg)
+{
+ if (gSchFreezeDump) return;
+ if ((tANI_U32)event >= traceLevel) return;
+
+ traceBuf[curTrace].event = event;
+ traceBuf[curTrace].arg = arg;
+ traceBuf[curTrace].timestamp = halGetTsfLow(pMac);
+ curTrace = (curTrace+1)%SCH_TRACE_BUF_SIZE;
+}
+#endif
#endif
diff --git a/CORE/SME/inc/smsDebug.h b/CORE/SME/inc/smsDebug.h
index 758f356..ac6f4e3 100644
--- a/CORE/SME/inc/smsDebug.h
+++ b/CORE/SME/inc/smsDebug.h
@@ -43,7 +43,7 @@
------------------------------------------------------------------------- *
- \file smsDebug.h
+ \file cssDebug.h
Define debug log interface for SMS.
@@ -54,17 +54,13 @@
#ifndef SMS_DEBUG_H__
#define SMS_DEBUG_H__
+//#include <stdio.h>
+//#include <stdarg.h>
+
#include "utilsApi.h"
#include "sirDebug.h"
-#if !defined(__printf)
-#define __printf(a,b)
-#endif
+void smsLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString,...);
+void pmcLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString,...);
-void __printf(3,4)
-void smsLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString, ...);
-
-void __printf(3,4)
-void pmcLog(tpAniSirGlobal pMac, tANI_U32 loglevel, const char *pString, ...);
-
-#endif // __SMS_DEBUG_H__
+#endif // __HAL_DEBUG_H__
diff --git a/CORE/VOSS/inc/i_vos_trace.h b/CORE/VOSS/inc/i_vos_trace.h
index dd0e8b6..e4add12 100644
--- a/CORE/VOSS/inc/i_vos_trace.h
+++ b/CORE/VOSS/inc/i_vos_trace.h
@@ -43,10 +43,6 @@
#if !defined( __I_VOS_TRACE_H )
#define __I_VOS_TRACE_H
-#if !defined(__printf)
-#define __printf(a,b)
-#endif
-
/**=========================================================================
\file i_vos_trace.h
@@ -88,8 +84,7 @@
\return nothing
--------------------------------------------------------------------------*/
-void __printf(3,4) vos_trace_msg( VOS_MODULE_ID module, VOS_TRACE_LEVEL level,
- char *strFormat, ... );
+void vos_trace_msg( VOS_MODULE_ID module, VOS_TRACE_LEVEL level, char *strFormat, ... );
void vos_trace_hex_dump( VOS_MODULE_ID module, VOS_TRACE_LEVEL level,
void *data, int buf_len );
@@ -117,8 +112,7 @@
#endif
-void __printf(3,4) vos_snprintf(char *strBuffer, unsigned int size,
- char *strFormat, ...);
+void vos_snprintf(char *strBuffer, unsigned int size, char *strFormat, ...);
#define VOS_SNPRINTF vos_snprintf
#ifdef VOS_ENABLE_TRACING
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h b/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
index 645f9b4..cf82b13 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
@@ -23,10 +23,6 @@
#include <vos_trace.h>
-#if !defined(__printf)
-#define __printf(a,b)
-#endif
-
#ifdef WLAN_DEBUG
/**----------------------------------------------------------------------------
@@ -52,8 +48,7 @@
\return nothing
--------------------------------------------------------------------------*/
-void __printf(3,4) wpalTrace( wpt_moduleid module, wpt_tracelevel level,
- char *strFormat, ... );
+void wpalTrace( wpt_moduleid module, wpt_tracelevel level, char *strFormat, ... );
/**----------------------------------------------------------------------------