--- a/kerneltest/e32test/usbho/t_otgdi/src/testcase0457.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/e32test/usbho/t_otgdi/src/testcase0457.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -24,10 +24,6 @@
 #include <e32Test.h>	// RTest headder
 #include "testcaseroot.h"
 #include "testcase0457.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "testcase0457Traces.h"
-#endif
 
 
 
@@ -41,10 +37,7 @@
 
 CTestCase0457* CTestCase0457::NewL(TBool aHost)
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0457_NEWL);
-	    }
+	LOG_FUNC
 	CTestCase0457* self = new (ELeave) CTestCase0457(aHost);
 	CleanupStack::PushL(self);
 	self->ConstructL();
@@ -56,10 +49,7 @@
 CTestCase0457::CTestCase0457(TBool aHost)
 :	CTestCaseRoot(KTestCaseId, aHost)
 	{	
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0457_CTESTCASE0457);
-	    }
+	LOG_FUNC
 	} 
 
 
@@ -68,10 +58,7 @@
 */
 void CTestCase0457::ConstructL()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0457_CONSTRUCTL);
-	    }
+	LOG_FUNC
 	iRepeats = OPEN_REPEATS;
 	
 	BaseConstructL();
@@ -80,10 +67,7 @@
 
 CTestCase0457::~CTestCase0457()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0457_DCTESTCASE0457);
-	    }
+	LOG_FUNC
 
 	Cancel();
 	}
@@ -91,10 +75,7 @@
 
 void CTestCase0457::ExecuteTestCaseL()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0457_EXECUTETESTCASEL);
-	    }
+	LOG_FUNC
 	iCaseStep = EPreconditions;
 	
 	CActiveScheduler::Add(this);
@@ -105,16 +86,12 @@
 void CTestCase0457::DescribePreconditions()
 	{
 	test.Printf(_L("Remove any USB plug beforehand.\n"));
-	OstTrace0(TRACE_NORMAL, CTESTCASE0457_DESCRIBEPRECONDITIONS, "Remove any USB plug beforehand.\n");
 	}
 
 	
 void CTestCase0457::DoCancel()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0457_DOCANCEL);
-	    }
+	LOG_FUNC
 
 	// cancel our timer
 	iTimer.Cancel();
@@ -124,10 +101,7 @@
 // handle event completion	
 void CTestCase0457::RunStepL()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0457_RUNSTEPL);
-	    }
+	LOG_FUNC
 
 	// Obtain the completion code for this CActive obj.
 	TInt completionCode(iStatus.Int()); 
@@ -137,7 +111,6 @@
 		case EPreconditions:
 			{
 			test.Printf(KPressAnyKeyToStart);
-			OstTrace0(TRACE_NORMAL, CTESTCASE0457_RUNSTEPL_DUP01, KPressAnyKeyToStart);
 			iCaseStep = ELoadLdd;
 			RequestCharacter();			
 			break;			
@@ -145,7 +118,6 @@
 
 		case ELoadLdd:
 			test.Printf(_L("Load the LDD iteration %d/%d\n"), OPEN_REPEATS-iRepeats+1, OPEN_REPEATS);
-			OstTraceExt2(TRACE_NORMAL, CTESTCASE0457_RUNSTEPL_DUP02, "Load the LDD iteration %d/%d\n", OPEN_REPEATS-iRepeats+1, OPEN_REPEATS);
 			if (!StepLoadLDD())
 				{
 				break;
@@ -164,7 +136,6 @@
 						
 		case ELoopDecrement:
 			test.Printf(_L("Repeat test\n"));
-			OstTrace0(TRACE_NORMAL, CTESTCASE0457_RUNSTEPL_DUP03, "Repeat test\n");
 
 			if (--iRepeats)
 				iCaseStep = ELoadLdd;
@@ -181,7 +152,6 @@
 			
 		default:
 			test.Printf(_L("<Error> unknown test step"));
-			OstTrace0(TRACE_NORMAL, CTESTCASE0457_RUNSTEPL_DUP04, "<Error> unknown test step");
 			Cancel();
 			TestPolicy().SignalTestComplete(KErrCorrupt);
 			break;