--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcInterfaceBase.cpp	Thu Jul 15 20:42:20 2010 +0300
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/ecacm/src/CdcInterfaceBase.cpp	Tue Aug 31 17:01:47 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -17,11 +17,11 @@
 
 #include <e32std.h>
 #include "CdcInterfaceBase.h"
-#include <usb/usblogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CdcInterfaceBaseTraces.h"
+#endif
 
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "ECACM");
-#endif
 
 CCdcInterfaceBase::CCdcInterfaceBase(const TDesC16& aIfcName)
 /**
@@ -30,7 +30,9 @@
  * @param aIfcName The name of the interface.
  */
 	{
+	OstTraceFunctionEntry0( CCDCINTERFACEBASE_CCDCINTERFACEBASE_CONS_ENTRY );
 	iIfcName.Set(aIfcName);
+	OstTraceFunctionExit0( CCDCINTERFACEBASE_CCDCINTERFACEBASE_CONS_EXIT );
 	}
 
 void CCdcInterfaceBase::BaseConstructL()
@@ -39,21 +41,31 @@
  * This call registers the object with the USB device driver
  */
 	{
-	LOGTEXT(_L8("\tcalling RDevUsbcClient::Open"));
+	OstTraceFunctionEntry0( CCDCINTERFACEBASE_BASECONSTRUCTL_ENTRY );
+	OstTrace0( TRACE_NORMAL, CCDCINTERFACEBASE_BASECONSTRUCTL, "CCdcInterfaceBase::BaseConstructL;\tcalling RDevUsbcClient::Open" );
 	// 0 is assumed to mean ep0
 	TInt ret = iLdd.Open(0); 
 	if ( ret )
-		{
-		LOGTEXT2(_L8("\tRDevUsbcClient::Open = %d"), ret);
-		LEAVEIFERRORL(ret); 
+		{		
+		OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_BASECONSTRUCTL_DUP1, 
+					"CCdcInterfaceBase::BaseConstructL;\tRDevUsbcClient::Open = %d", ret );
+		if (ret < 0)
+			{
+			User::Leave(ret);
+			}
 		}
 
 	ret = SetUpInterface();
 	if ( ret )
 		{
-		LOGTEXT2(_L8("\tSetUpInterface = %d"), ret);
-		LEAVEIFERRORL(ret);
+		OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_BASECONSTRUCTL_DUP2, 
+					"CCdcInterfaceBase::BaseConstructL;\tSetUpInterface = %d", ret );
+		if (ret < 0)
+			{
+			User::Leave(ret);
+			}
 		}
+	OstTraceFunctionExit0( CCDCINTERFACEBASE_BASECONSTRUCTL_EXIT );
 	}
 
 CCdcInterfaceBase::~CCdcInterfaceBase()
@@ -61,18 +73,18 @@
  * Destructor.
  */
 	{
-	LOG_FUNC
-
+	OstTraceFunctionEntry0( CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES_ENTRY );
 	if ( iLdd.Handle() )
 		{
-		LOGTEXT(_L8("\tLDD handle exists"));
-
+		OstTrace0( TRACE_NORMAL, CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES, 
+				"CCdcInterfaceBase::~CCdcInterfaceBase;\tLDD handle exists" );
 		// Don't bother calling ReleaseInterface- the base driver spec says 
 		// that Close does it for us.
-
-		LOGTEXT(_L8("\tclosing LDD session"));
+		OstTrace0( TRACE_NORMAL, CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES_DUP1, 
+				"CCdcInterfaceBase::~CCdcInterfaceBase;\tclosing LDD session" );
 		iLdd.Close();
 		}
+	OstTraceFunctionExit0( CCDCINTERFACEBASE_CCDCINTERFACEBASE_DES_EXIT );
 	}
 
 TInt CCdcInterfaceBase::GetInterfaceNumber(TUint8& aIntNumber)
@@ -83,24 +95,25 @@
  * @return Error.
  */
 	{
-	LOG_FUNC
-
+	OstTraceFunctionEntry0( CCDCINTERFACEBASE_GETINTERFACENUMBER_ENTRY );
 	TInt interfaceSize = 0;
-
 	// 0 means the main interface in the LDD API
 	TInt res = iLdd.GetInterfaceDescriptorSize(0, interfaceSize);
 
 	if ( res )
 		{
-		LOGTEXT2(_L8("\t***GetInterfaceDescriptorSize()=%d"), res);
+		OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER, 
+				"CCdcInterfaceBase::GetInterfaceNumber;\t***GetInterfaceDescriptorSize()=%d", res );
+		OstTraceFunctionExit0( CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT );
 		return res;
 		}
 
 	HBufC8* interfaceBuf = HBufC8::New(interfaceSize);
 	if ( !interfaceBuf )
 		{
-		LOGTEXT(_L8("\t***failed to create interfaceBuf- "
-			"returning KErrNoMemory"));
+		OstTrace0( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP1, 
+				"CCdcInterfaceBase::GetInterfaceNumber;\t***failed to create interfaceBuf-returning KErrNoMemory" );
+		OstTraceFunctionExit0( CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT_DUP1 );
 		return KErrNoMemory;
 		}
 
@@ -112,26 +125,27 @@
 	if ( res )
 		{
 		delete interfaceBuf;
-		LOGTEXT2(_L8("\t***GetInterfaceDescriptor()=%d"), res);
+		OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP2, "CCdcInterfaceBase::GetInterfaceNumber;res=%d", res );
+		OstTraceFunctionExit0( CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT_DUP2 );
 		return res;
 		}
 
-#ifdef __FLOG_ACTIVE
-	LOGTEXT2(_L8("\t***interface length = %d"), interfacePtr.Length());
+	OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP3, 
+			"CCdcInterfaceBase::GetInterfaceNumber;\t***interface length = %d", interfacePtr.Length() );
 	for ( TInt i = 0 ; i < interfacePtr.Length() ; i++ )
 		{
-		LOGTEXT2(_L8("\t***** %x"),interfacePtr[i]);
+		OstTraceExt1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP4, 
+				"\t***** %hhx", interfacePtr[i] );
 		}
-#endif
 
 	const TUint8* buffer = reinterpret_cast<const TUint8*>(interfacePtr.Ptr());
 	// 2 is where the interface number is, according to the LDD API
 	aIntNumber = buffer[2]; 
-
-	LOGTEXT2(_L8("\tinterface number = %d"), aIntNumber);
-
+	OstTrace1( TRACE_NORMAL, CCDCINTERFACEBASE_GETINTERFACENUMBER_DUP5, 
+			"CCdcInterfaceBase::GetInterfaceNumber;\tinterface number = %d", (TInt)aIntNumber );
+	
 	delete interfaceBuf;
-
+	OstTraceFunctionExit0( CCDCINTERFACEBASE_GETINTERFACENUMBER_EXIT_DUP3 );
 	return KErrNone;
 	}