--- a/kerneltest/e32test/usbho/t_otgdi/src/testcase0463.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/e32test/usbho/t_otgdi/src/testcase0463.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 "testcase0463.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "testcase0463Traces.h"
-#endif
 
 
 
@@ -40,10 +36,7 @@
 
 CTestCase0463* CTestCase0463::NewL(TBool aHost)
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0463_NEWL);
-	    }
+	LOG_FUNC
 	CTestCase0463* self = new (ELeave) CTestCase0463(aHost);
 	CleanupStack::PushL(self);
 	self->ConstructL();
@@ -55,10 +48,7 @@
 CTestCase0463::CTestCase0463(TBool aHost)
 :	CTestCaseRoot(KTestCaseId, aHost)
 	{	
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0463_CTESTCASE0463);
-	    }
+	LOG_FUNC
 	} 
 
 
@@ -67,10 +57,7 @@
 */
 void CTestCase0463::ConstructL()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0463_CONSTRUCTL);
-	    }
+	LOG_FUNC
 	iRepeats = OOMOPEN_REPEATS;
 	iAllocFailNumber = OOMOPEN_REPEATS + 1; // allocs 1..11 fail
 	
@@ -80,10 +67,7 @@
 
 CTestCase0463::~CTestCase0463()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0463_DCTESTCASE0463);
-	    }
+	LOG_FUNC
 
 	Cancel();
 	}
@@ -91,10 +75,7 @@
 
 void CTestCase0463::ExecuteTestCaseL()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0463_EXECUTETESTCASEL);
-	    }
+	LOG_FUNC
 	iCaseStep = EMarkStack;
 	CActiveScheduler::Add(this);
 
@@ -105,16 +86,12 @@
 void CTestCase0463::DescribePreconditions()
 	{
 	test.Printf(_L("Insert A connector beforehand.\n"));
-	OstTrace0(TRACE_NORMAL, CTESTCASE0463_DESCRIBEPRECONDITIONS, "Insert A connector beforehand.\n");
 	}
 
 	
 void CTestCase0463::DoCancel()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0463_DOCANCEL);
-	    }
+	LOG_FUNC
 
 	// cancel our timer
 	iTimer.Cancel();
@@ -124,10 +101,7 @@
 // handle event completion	
 void CTestCase0463::RunStepL()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0463_RUNSTEPL);
-	    }
+	LOG_FUNC
 
 	// Obtain the completion code for this CActive obj.
 	TInt completionCode(iStatus.Int()); 
@@ -143,7 +117,6 @@
 			__UHEAP_SETFAIL(RHeap::EDeterministic, iAllocFailNumber);
 			__UHEAP_MARK;
 			test.Printf(_L("Load the LDD iteration %d/%d\n"), OOMOPEN_REPEATS-iRepeats+1, OOMOPEN_REPEATS);
-			OstTraceExt2(TRACE_NORMAL, CTESTCASE0463_RUNSTEPL_DUP01, "Load the LDD iteration %d/%d\n", OOMOPEN_REPEATS-iRepeats+1, OOMOPEN_REPEATS);
 			aIntegerP = new TInt;
 			CleanupStack::PushL(aIntegerP);
 			if (!StepLoadLDD())
@@ -170,14 +143,12 @@
 				return TestFailed(KErrAbort,_L("Unload Ldd failure"));	
 			__UHEAP_MARKEND;
 			test.Printf(_L("Heap intact: Asize %d\n"), iAllocFailNumber);
-			OstTrace1(TRACE_NORMAL, CTESTCASE0463_RUNSTEPL_DUP03, "Heap intact: Asize %d\n", iAllocFailNumber);
 			iCaseStep = ELoopDecrement;
 			SelfComplete();			
 			break;
 						
 		case ELoopDecrement:
 			test.Printf(_L("Repeat test\n"));
-			OstTrace0(TRACE_NORMAL, CTESTCASE0463_RUNSTEPL_DUP04, "Repeat test\n");
 			__UHEAP_RESET;
 			iAllocFailNumber--;
 			
@@ -195,7 +166,6 @@
 			
 		default:
 			test.Printf(_L("<Error> unknown test step"));
-			OstTrace0(TRACE_NORMAL, CTESTCASE0463_RUNSTEPL_DUP05, "<Error> unknown test step");
 			Cancel();
 			TestPolicy().SignalTestComplete(KErrCorrupt);
 			break;