diff -r ca8a1b6995f6 -r 52e343bb8f80 debugsrv/runmodedebug/securityserver/inc/rm_debug_logging.h
--- a/debugsrv/runmodedebug/securityserver/inc/rm_debug_logging.h	Tue Aug 31 16:45:49 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Logging macros for use in debug subsystem
-// 
-//
-
-#ifndef RM_DEBUG_LOGGING_H
-#define RM_DEBUG_LOGGING_H
-
-/* Debug messages
- * 
- * Debug messages are only generated for debug builds.
- * 
- * For kernel mode, use __KTRACE_OPT(KDEBUGGER, Kern::Printf(), 
- * for user mode use RDebug::Printf(). 
- * 
- */
-
-#ifdef _DEBUG
-
-  #ifdef __KERNEL_MODE__
-
-    #include <kernel/kernel.h>
-    #include <nkern/nk_trace.h>
-
-    #define LOG_MSG(args...)			__KTRACE_OPT(KDEBUGGER, Kern::Printf(args))
-	#define LOG_ENTRY()					__KTRACE_OPT(KDEBUGGER, Kern::Printf("+%s", __PRETTY_FUNCTION__))
-	#define LOG_EXIT()					__KTRACE_OPT(KDEBUGGER, Kern::Printf("-%s", __PRETTY_FUNCTION__))
-	#define LOG_ARGS(fmt, args...)		__KTRACE_OPT(KDEBUGGER, Kern::Printf("+%s " fmt, __PRETTY_FUNCTION__, args))
-	#define LOG_RETURN(x)				__KTRACE_OPT(KDEBUGGER, Kern::Printf("Returning %d from [%s]", x, __PRETTY_FUNCTION__)
-
-	// These kept for compatability
-    #define LOG_MSG2( a, b )			__KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b ))
-    #define LOG_MSG3( a, b, c )			__KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b, c ))
-    #define LOG_MSG4( a, b, c, d )		__KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b, c, d ))
-    #define LOG_MSG5( a, b, c, d, e )	__KTRACE_OPT(KDEBUGGER, Kern::Printf( a, b, c, d, e ))
-  #else
-
-    #include <e32debug.h>
-
-    #define LOG_MSG(args...)			RDebug::Printf(args)
-	#define LOG_DES(args...)			RDebug::Print(args) // For wide descriptors
-	#define LOG_ENTRY()					RDebug::Printf("+%s", __PRETTY_FUNCTION__)
-	#define LOG_EXIT()					RDebug::Printf("-%s", __PRETTY_FUNCTION__)
-	#define LOG_ARGS(fmt, args...)		RDebug::Printf("+%s " fmt, __PRETTY_FUNCTION__, args)
-	#define LOG_RETURN(x)				RDebug::Printf("Returning %d from [%s]", x, __PRETTY_FUNCTION__)
-
-    #define LOG_MSG2( a, b )			RDebug::Printf( a, b )
-    #define LOG_MSG3( a, b, c )			RDebug::Printf( a, b, c )
-    #define LOG_MSG4( a, b, c, d )		RDebug::Printf( a, b, c, d )
-    #define LOG_MSG5( a, b, c, d, e )	RDebug::Printf( a, b, c, d, e )
-
-  #endif
-
-#else
-
-	#define LOG_MSG(args...)
-	#define LOG_DES(args...)
-	#define LOG_ENTRY()
-	#define LOG_EXIT()
-	#define LOG_ARGS(fmt, args...)
-	#define LOG_RETURN(x)
-
-	#define LOG_MSG2( a, b )
-	#define LOG_MSG3( a, b, c )
-	#define LOG_MSG4( a, b, c, d )
-	#define LOG_MSG5( a, b, c, d, e )
-
-#endif
-
-#endif //RM_DEBUG_LOGGING_H
-