--- a/kerneltest/e32test/usbho/t_otgdi/src/testcase0464.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/e32test/usbho/t_otgdi/src/testcase0464.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"
@@ -23,10 +23,6 @@
 #include <e32Test.h>	// RTest headder
 #include "testcaseroot.h"
 #include "testcase0464.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "testcase0464Traces.h"
-#endif
 
 
 
@@ -37,10 +33,7 @@
 
 CTestCase0464* CTestCase0464::NewL(TBool aHost)
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0464_NEWL);
-	    }
+	LOG_FUNC
 	CTestCase0464* self = new (ELeave) CTestCase0464(aHost);
 	CleanupStack::PushL(self);
 	self->ConstructL();
@@ -52,10 +45,7 @@
 CTestCase0464::CTestCase0464(TBool aHost)
 :	CTestCaseRoot(KTestCaseId, aHost)
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0464_CTESTCASE0464);
-	    }
+	LOG_FUNC
 		
 	} 
 
@@ -65,10 +55,7 @@
 */
 void CTestCase0464::ConstructL()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0464_CONSTRUCTL);
-	    }
+	LOG_FUNC
 
 	BaseConstructL();
 	}
@@ -76,10 +63,7 @@
 
 CTestCase0464::~CTestCase0464()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0464_DCTESTCASE0464);
-	    }
+	LOG_FUNC
 
 	Cancel();
 	}
@@ -87,10 +71,7 @@
 
 void CTestCase0464::ExecuteTestCaseL()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0464_EXECUTETESTCASEL);
-	    }
+	LOG_FUNC
 	iCaseStep = EPreconditions;
 	
 	CActiveScheduler::Add(this);
@@ -101,16 +82,12 @@
 void CTestCase0464::DescribePreconditions()
 	{
 	test.Printf(_L("Insert 'A' connector beforehand.\n"));
-	OstTrace0(TRACE_NORMAL, CTESTCASE0464_DESCRIBEPRECONDITIONS, "Insert 'A' connector beforehand.\n");
 	}
 
 	
 void CTestCase0464::DoCancel()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0464_DOCANCEL);
-	    }
+	LOG_FUNC
 
 	// cancel our timer
 	iTimer.Cancel();
@@ -130,10 +107,7 @@
 // handle event completion	
 void CTestCase0464::RunStepL()
 	{
-	if(gVerboseOutput)
-	    {
-	    OstTraceFunctionEntry0(CTESTCASE0464_RUNSTEPL);
-	    }
+	LOG_FUNC
 	// Obtain the completion code for this CActive obj.
 	TInt completionCode(iStatus.Int()); 
 	TBuf<MAX_DSTRLEN> aDescription;
@@ -151,9 +125,7 @@
 				}
 			// prompt to insert 'A' connector
 			test.Printf(KInsertAConnectorPrompt);
-			OstTrace0(TRACE_NORMAL, CTESTCASE0464_RUNSTEPL_DUP01, KInsertAConnectorPrompt);
 			test.Printf(KPressAnyKeyToContinue);
-			OstTrace0(TRACE_NORMAL, CTESTCASE0464_RUNSTEPL_DUP02, KPressAnyKeyToContinue);
 			RequestCharacter();			
 			break;
 
@@ -169,10 +141,6 @@
 
 		case EDriveBus:
 			LOG_VERBOSE1(_L("Turn ON VBus\n"))
-			if(gVerboseOutput)
-			    {
-			    OstTrace0(TRACE_VERBOSE, CTESTCASE0464_RUNSTEPL_DUP03, "Turn ON VBus\n");
-			    }
 			err = otgBusRequest();
 			if (KErrNone != err)
 				{
@@ -184,29 +152,19 @@
 
 		case EUnloadLdd:
 			LOG_VERBOSE1(_L("Unload.\n"))
-			if(gVerboseOutput)
-			    {
-			    OstTrace0(TRACE_VERBOSE, CTESTCASE0464_RUNSTEPL_DUP04, "Unload.\n");
-			    }
 			if (EFalse == StepUnloadLDD())
 				return TestFailed(KErrAbort,_L("unload Ldd failure"));	
 			test.Printf(_L("Measure VBus =0 and then press Y or N to continue."));
-			OstTrace0(TRACE_NORMAL, CTESTCASE0464_RUNSTEPL_DUP05, "Measure VBus =0 and then press Y or N to continue.");
 			RequestCharacter();
 			iCaseStep = EVerifyVBusGone;
 			break;
 
 		case EVerifyVBusGone:
 			LOG_VERBOSE1(_L("Test !VBus after unload.\n"))
-			if(gVerboseOutput)
-			    {
-			    OstTrace0(TRACE_VERBOSE, CTESTCASE0464_RUNSTEPL_DUP06, "Test !VBus after unload.\n");
-			    }
 			// test key response (or via an API)
 			if (('y' == iKeyCodeInput) ||('Y' == iKeyCodeInput))
 				{
 				test.Printf(_L("VBUS drop 'seen' \n"));
-				OstTrace0(TRACE_NORMAL, CTESTCASE0464_RUNSTEPL_DUP07, "VBUS drop 'seen' \n");
 				SelfComplete();
 				}
 			else
@@ -221,7 +179,6 @@
 
 		default:
 			test.Printf(_L("<Error> unknown test step"));
-			OstTrace0(TRACE_NORMAL, CTESTCASE0464_RUNSTEPL_DUP08, "<Error> unknown test step");
 			Cancel();
 			return (TestFailed(KErrCorrupt, _L("<Error> unknown test step")));