--- a/kerneltest/e32test/device/t_usb.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/e32test/device/t_usb.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2002-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"
@@ -18,15 +18,11 @@
 //
 
 #include "t_usb.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "t_usbTraces.h"
-#endif
 
 
 void RunAppL(TBool aVerboseOutput)
 	{
-	OstTrace0(TRACE_NORMAL, RUNAPPL_RUNAPPL, "RunAppL()");
+	RDebug::Print(_L("RunAppL()"));
 	// Construct the active scheduler
 	CActiveScheduler* myScheduler = new (ELeave) CActiveScheduler();
 
@@ -60,7 +56,7 @@
 
 TInt E32Main()
 	{
-	OstTrace0(TRACE_NORMAL, E32MAIN_E32MAIN, "E32Main()");
+	RDebug::Print(_L("E32Main()"));
 
 	CTrapCleanup* cleanup = CTrapCleanup::New();			// get clean-up stack
 
@@ -72,7 +68,7 @@
 	TBool verbose = EFalse;
 	if (c.CompareF(KArg) == 0)
 		{
-		OstTrace0(TRACE_NORMAL, E32MAIN_E32MAIN_DUP01, "(Verbose output enabled.)\n");
+		RDebug::Print(_L("(Verbose output enabled.)\n"));
 		verbose = ETrue;
 		}
 
@@ -84,7 +80,7 @@
 
 	delete cleanup;											// destroy clean-up stack
 
-	OstTrace0(TRACE_NORMAL, E32MAIN_E32MAIN_DUP02, "Program exit: done.\n");
+	RDebug::Print(_L("Program exit: done.\n"));
 
 	return 0;												// and return
 	}