--- a/kerneltest/e32test/usbho/t_usbdi/src/BasicWatcher.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/e32test/usbho/t_usbdi/src/BasicWatcher.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"
@@ -18,10 +18,6 @@
 
 #include "BasicWatcher.h"
 #include "testdebug.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "BasicWatcherTraces.h"
-#endif
 
 namespace NUnitTesting_USBDI
 	{
@@ -31,58 +27,51 @@
 	iCallBack(aCallBack),
 	iCompletionCode(KErrNone)
 	{
-	OstTraceFunctionEntryExt( CBASICWATCHER_CBASICWATCHER_ENTRY, this );
 	CActiveScheduler::Add(this);
-	OstTraceFunctionExit1( CBASICWATCHER_CBASICWATCHER_EXIT, this );
 	}
 	
 CBasicWatcher::~CBasicWatcher()
 	{
-    OstTraceFunctionEntry1( CBASICWATCHER_CBASICWATCHER_ENTRY_DUP01, this );
+	LOG_FUNC
 
 	Cancel();
-	OstTraceFunctionExit1( CBASICWATCHER_CBASICWATCHER_EXIT_DUP01, this );
 	}
 
 void CBasicWatcher::DoCancel()
 	{
-    OstTraceFunctionEntry1( CBASICWATCHER_DOCANCEL_ENTRY, this );
+	LOG_FUNC
 
-	OstTrace0(TRACE_NORMAL, CBASICWATCHER_DOCANCEL, "Watch cancelled");
+	RDebug::Printf("Watch cancelled");
 	iStatus = KErrCancel;
-	OstTraceFunctionExit1( CBASICWATCHER_DOCANCEL_EXIT, this );
 	}
 
 
 void CBasicWatcher::StartWatching()
 	{
-    OstTraceFunctionEntry1( CBASICWATCHER_STARTWATCHING_ENTRY, this );
+	LOG_FUNC
 
 	if(iStatus != KRequestPending)
 		{
 		User::Panic(_L("iStatus has not been set to pending this will lead to E32USER-CBase Panic"),46);
 		}
 	SetActive();
-	OstTraceFunctionExit1( CBASICWATCHER_STARTWATCHING_EXIT, this );
 	}
 
 
 void CBasicWatcher::RunL()
 	{
-    OstTraceFunctionEntry1( CBASICWATCHER_RUNL_ENTRY, this );
+	LOG_FUNC
 
 	iCompletionCode = iStatus.Int();
 	User::LeaveIfError(iCallBack.CallBack());
-	OstTraceFunctionExit1( CBASICWATCHER_RUNL_EXIT, this );
 	}
 
 
 TInt CBasicWatcher::RunError(TInt aError)
 	{
-    OstTraceFunctionEntryExt( CBASICWATCHER_RUNERROR_ENTRY, this );
+	LOG_FUNC
 
-	OstTrace1(TRACE_NORMAL, CBASICWATCHER_RUNERROR, "Watcher code Left with %d",aError);
-	OstTraceFunctionExitExt( CBASICWATCHER_RUNERROR_EXIT, this, KErrNone );
+	RDebug::Printf("Watcher code Left with %d",aError);
 	return KErrNone;
 	}