--- a/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/src/acmserverclient.cpp	Tue Aug 31 17:01:47 2010 +0300
+++ b/usbmgmt/usbmgr/device/classdrivers/acm/classimplementation/acmserver/src/acmserverclient.cpp	Wed Sep 01 12:35:00 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2009 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"
@@ -20,28 +20,25 @@
 */
 
 #include <e32base.h>
-#include <usb/acmserver.h>
 #include "acmserverclient.h"
 #include "acmserverconsts.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "acmserverclientTraces.h"
+#include <usb/usblogger.h>
+#include <usb/acmserver.h>
+
+#ifdef __FLOG_ACTIVE
+_LIT8(KLogComponent, "ACMSVRCLI");
 #endif
 
 /** Constructor */
 RAcmServerClient::RAcmServerClient() 
 	{
-	OstTraceFunctionEntry0( RACMSERVERCLIENT_RACMSERVERCLIENT_CONS_ENTRY );
-	
-	OstTraceFunctionExit0( RACMSERVERCLIENT_RACMSERVERCLIENT_CONS_EXIT );
+	LOG_FUNC
 	}
 	   
 /** Destructor */
 RAcmServerClient::~RAcmServerClient()
 	{
-	OstTraceFunctionEntry0( RACMSERVERCLIENT_RACMSERVERCLIENT_DES_ENTRY);
-	
-	OstTraceFunctionExit0( RACMSERVERCLIENT_RACMSERVERCLIENT_ENTRY_DES_EXIT );
+	LOG_FUNC
 	}
 
 /**
@@ -50,8 +47,7 @@
 */
 TVersion RAcmServerClient::Version() const
 	{
-	OstTraceFunctionEntry0( RACMSERVERCLIENT_VERSION_ENTRY );
-	
+	LOG_FUNC
 
 	return TVersion(	KAcmSrvMajorVersionNumber,
 						KAcmSrvMinorVersionNumber,
@@ -66,17 +62,17 @@
 */
 TInt RAcmServerClient::Connect()
 	{
-	OstTraceFunctionEntry0( RACMSERVERCLIENT_CONNECT_ENTRY );
-	
+	LOG_FUNC
 
 	return CreateSession(KAcmServerName, Version(), 1);
 	}
 
 TInt RAcmServerClient::CreateFunctions(const TUint aNoAcms, const TUint8 aProtocolNum, const TDesC& aAcmControlIfcName, const TDesC& aAcmDataIfcName)
 	{
-	OstTraceFunctionEntry0( RACMSERVERCLIENT_CREATEFUNCTIONS_ENTRY );
-	OstTraceExt4( TRACE_NORMAL, RACMSERVERCLIENT_CREATEFUNCTIONS, "RAcmServerClient::CreateFunctions;aNoAcms=%d;aProtocolNum=%d;aAcmControlIfcName=%S;aAcmDataIfcName=%S", aNoAcms, aProtocolNum, aAcmControlIfcName, aAcmDataIfcName );
-	
+	LOG_FUNC
+	LOGTEXT5(_L("\taNoAcms = %d, aProtocolNum = %d, Control Ifc Name = %S, Data Ifc Name = %S"),
+			aNoAcms, aProtocolNum, &aAcmControlIfcName, &aAcmDataIfcName);
+
 	TIpcArgs args;
 	args.Set(0, aNoAcms);
 	args.Set(1, aProtocolNum);
@@ -87,7 +83,8 @@
 
 TInt RAcmServerClient::DestroyFunctions(const TUint aNoAcms)
 	{
-	OstTraceFunctionEntry0( RACMSERVERCLIENT_DESTROYFUNCTIONS_ENTRY );
-	OstTrace1( TRACE_NORMAL, RACMSERVERCLIENT_DESTROYFUNCTIONS, "RAcmServerClient::DestroyFunctions;aNoAcms=%d", aNoAcms );
+	LOG_FUNC
+	LOGTEXT2(_L8("\taNoAcms = %d"), aNoAcms);
+
 	return SendReceive(EAcmDestroyAcmFunctions, TIpcArgs(aNoAcms));
 	}