--- a/usbmgmt/usbmgr/host/fdf/production/server/src/utils.cpp	Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/fdf/production/server/src/utils.cpp	Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* 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 "Eclipse Public License v1.0"
@@ -22,16 +22,13 @@
 
 #include "utils.h"
 #include <usb/usblogger.h>
-
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "fdf      ");
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "utilsTraces.h"
 #endif
 
-#ifdef __FLOG_ACTIVE
+
 #define LOG Log()
-#else
-#define LOG
-#endif
 
 //*****************************************************************************
 // Code relating to the cleanup stack item which 'Remove's a given TUint from 
@@ -49,8 +46,8 @@
 
 void Remove(TAny* aArrayRemove)
 	{
-	LOG_STATIC_FUNC_ENTRY
-
+	OstTraceFunctionEntry0( FDF_UTILS_REMOVE_ENTRY );
+	
 	TArrayRemove* arrayRemove = reinterpret_cast<TArrayRemove*>(aArrayRemove);
 
 	const TUint count = arrayRemove->iDeviceIds.Count();
@@ -58,11 +55,12 @@
 		{
 		if ( arrayRemove->iDeviceIds[ii] == arrayRemove->iDeviceId )
 			{
-			LOGTEXT(_L8("\tmatching device id"));
+            OstTrace0( TRACE_NORMAL, FDF_UTILS_REMOVE, "::matching device id" );
 			arrayRemove->iDeviceIds.Remove(ii);
 			break;
 			}
 		}
+	OstTraceFunctionExit0( FDF_UTILS_REMOVE_EXIT );
 	}
 
 void CleanupRemovePushL(TArrayRemove& aArrayRemove)