--- a/kernel/eka/drivers/hcr/hcr_debug.h	Mon Dec 21 16:14:42 2009 +0000
+++ b/kernel/eka/drivers/hcr/hcr_debug.h	Wed Dec 23 11:43:31 2009 +0000
@@ -24,36 +24,26 @@
 #include <e32des8.h>
 #include <kernel/kernel.h>
 
-
-// Make sure release builds get a warning if 
-//#ifndef _DEBUG
-//#if (defined HCR_TRACE)
-//#warning "Use of Kern::PrintF tracing in a release build, check MMP files"
-//#endif
-//#endif
-
-
 //
-// MACROs for trace statements in client/server code.
+// MACROs for log statements in code.
 //
 
 #ifdef _DEBUG
 
-#define HCR_LOG0(_text)				Kern::Printf("=== "_text)
-#define HCR_LOG1(_text, _a1)		Kern::Printf("... "_text, (_a1))
-#define HCR_LOG_RETURN(_r1)			return (Kern::Printf("!-- HCR Function exit, error=%d (%s:%d)", (_r1), __FILE__, __LINE__), _r1)
-#define HCR_LOGMSG_RETURN(_s1, _r1)	return (Kern::Printf("!-- HCR: "_s1" (%d)", (_r1)), _r1) 
+#define HCR_LOG0(_text)				__KTRACE_OPT(KHCR, Kern::Printf("=== "_text))
+#define HCR_LOG1(_text, _a1)		__KTRACE_OPT(KHCR, Kern::Printf("... "_text, (_a1)))
 
 #else
 
 #define HCR_LOG0(_text)				
 #define HCR_LOG1(_text, _a1)		
-#define HCR_LOG_RETURN(_r1)			return (_r1)
-#define HCR_LOGMSG_RETURN(_s1, _r1)	return (_r1) 
 
 #endif
 
 
+//
+// MACROs for trace statements in code.
+//
 
 #ifdef HCR_TRACE
 
@@ -73,17 +63,18 @@
 
 
 #else
+ 
+#define HCR_TRACE0(_text)                               __KTRACE_OPT(KHCR, Kern::Printf((_text)))
+#define HCR_TRACE1(_text, _a1)                          __KTRACE_OPT(KHCR, Kern::Printf((_text), (_a1)))
+#define HCR_TRACE2(_text, _a1, _a2)                     __KTRACE_OPT(KHCR, Kern::Printf((_text), (_a1), (_a2)))
+#define HCR_TRACE3(_text, _a1, _a2, _a3)                __KTRACE_OPT(KHCR, Kern::Printf((_text), (_a1), (_a2), (_a3)))
+#define HCR_TRACE4(_text, _a1, _a2, _a3, _a4)           __KTRACE_OPT(KHCR, Kern::Printf((_text), (_a1), (_a2), (_a3), (_a4)))
+#define HCR_TRACE5(_text, _a1, _a2, _a3, _a4, _a5)      __KTRACE_OPT(KHCR, Kern::Printf((_text), (_a1), (_a2), (_a3), (_a4), (_a5)))
+#define HCR_TRACE6(_text, _a1, _a2, _a3, _a4, _a5, _a6) __KTRACE_OPT(KHCR, Kern::Printf((_text), (_a1), (_a2), (_a3), (_a4), (_a5), (_a6)))
+#define HCR_TRACE_RETURN(_r1)                           { __KTRACE_OPT(KHCR, Kern::Printf("!-- Function exit return(%d) (%s:%d)", (_r1), __FILE__, __LINE__)); return (_r1);}
+#define HCR_TRACEMSG_RETURN(_s1, _r1)                   { __KTRACE_OPT(KHCR, Kern::Printf("!-- "_s1" (%d)", (_r1))); return (_r1);}
+#define HCR_FUNC(_text)
 
-#define HCR_TRACE0(_text)			
-#define HCR_TRACE1(_text, _a1)		
-#define HCR_TRACE2(_text, _a1, _a2)
-#define HCR_TRACE3(_text, _a1, _a2, _a3)	
-#define HCR_TRACE4(_text, _a1, _a2, _a3, _a4)
-#define HCR_TRACE5(_text, _a1, _a2, _a3, _a4, _a5)
-#define HCR_TRACE6(_text, _a1, _a2, _a3, _a4, _a5, _a6)
-#define HCR_TRACE_RETURN(_r1)		return (_r1)
-#define HCR_TRACEMSG_RETURN(_r1)	return (_r1)
-#define HCR_FUNC(_text)   
 #define HCR_HEX_DUMP_ABS(_address, _length)
 #define HCR_HEX_DUMP_REL(_address, _length)