--- a/kerneltest/e32test/usbho/t_usbdi/src/vendordevice.cpp	Tue Aug 24 14:42:58 2010 +0100
+++ b/kerneltest/e32test/usbho/t_usbdi/src/vendordevice.cpp	Tue Aug 24 14:49:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 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"
@@ -19,6 +19,10 @@
 #include "modelleddevices.h"
 #include "testinterfacebase.h"
 #include "testinterfacesettingbase.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "vendordeviceTraces.h"
+#endif
 
 namespace NUnitTesting_USBDI
 	{
@@ -26,23 +30,28 @@
 
 RUsbDeviceVendor::RUsbDeviceVendor()
 	{
+	OstTraceFunctionEntry1( RUSBDEVICEVENDOR_RUSBDEVICEVENDOR_ENTRY, this );
+	OstTraceFunctionExit1( RUSBDEVICEVENDOR_RUSBDEVICEVENDOR_EXIT, this );
 	}
 	
 RUsbDeviceVendor::RUsbDeviceVendor(CBaseTestCase* aTestCase):RUsbTestDevice(aTestCase)
 	{
-	LOG_FUNC
-	RDebug::Printf("aTestCase = %d", aTestCase);
+	OstTraceFunctionEntryExt( RUSBDEVICEVENDOR_RUSBDEVICEVENDOR_ENTRY_DUP01, this );
+	OstTrace1(TRACE_NORMAL, RUSBDEVICEVENDOR_RUSBDEVICEVENDOR, "aTestCase = %d", aTestCase);
+	OstTraceFunctionExit1( RUSBDEVICEVENDOR_RUSBDEVICEVENDOR_EXIT_DUP01, this );
 	}
 	
 
 RUsbDeviceVendor::~RUsbDeviceVendor()
 	{	
+	OstTraceFunctionEntry1( RUSBDEVICEVENDOR_RUSBDEVICEVENDOR_ENTRY_DUP02, this );
+	OstTraceFunctionExit1( RUSBDEVICEVENDOR_RUSBDEVICEVENDOR_EXIT_DUP02, this );
 	}
 	
 
 void RUsbDeviceVendor::OpenL(const TDesC& aSerialNumber)
 	{
-	LOG_FUNC
+	OstTraceFunctionEntryExt( RUSBDEVICEVENDOR_OPENL_ENTRY, this );
 	
 	RUsbTestDevice::OpenL();
 	
@@ -67,12 +76,14 @@
 	CleanupStack::Pop(interface0s0);
 	AddInterface(interface0);
 	CleanupStack::Pop(interface0);
+	OstTraceFunctionExit1( RUSBDEVICEVENDOR_OPENL_EXIT, this );
 	}
 
 
 void RUsbDeviceVendor::OnStateChangeL(TUsbcDeviceState aNewState)
 	{
-	LOG_FUNC
+	OstTraceFunctionEntryExt( RUSBDEVICEVENDOR_ONSTATECHANGEL_ENTRY, this );
+	OstTraceFunctionExit1( RUSBDEVICEVENDOR_ONSTATECHANGEL_EXIT, this );
 	}