--- a/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/src/msmmindicatorclient.cpp	Wed Jul 07 14:16:40 2010 +0800
+++ b/usbmgmt/usbmgr/host/functiondrivers/ms/msmm/client/src/msmmindicatorclient.cpp	Wed Jul 07 15:08:54 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -25,10 +25,12 @@
 
 #include "srvdef.h"
 #include "msmmindicatorclient.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "msmmindicatorclientTraces.h"
+#endif
+
  
-#ifdef __FLOG_ACTIVE
-_LIT8(KLogComponent, "UsbHostMsmmIndicatorClient");
-#endif
 
 // Costants
 const TInt KConnectRetry = 0x2;
@@ -41,7 +43,7 @@
 
 EXPORT_C TInt RHostMassStorage::Connect()
     {
-    LOG_FUNC
+    OstTraceFunctionEntry0( RHOSTMASSSTORAGE_CONNECT_ENTRY );
     
     TInt retry = KConnectRetry; // Attempt to add a session to MSMM Server twice
     TInt ret(KErrNone);
@@ -51,7 +53,8 @@
         // We are not allowed to start the server
         if ((KErrNotFound == ret) || (KErrServerTerminated == ret))
             {
-            LOGTEXT2(_L("Underlying error value = %d"), ret)
+            OstTrace1( TRACE_NORMAL, RHOSTMASSSTORAGE_CONNECT, 
+                    "Underlying error value = %d", ret );
             return KErrNotReady;
             }
         if ( KErrNone == ret )
@@ -63,14 +66,16 @@
             break;
             }
         }    
+    OstTraceFunctionExit0( RHOSTMASSSTORAGE_CONNECT_EXIT );
     return ret; 
     }
 
 EXPORT_C TInt RHostMassStorage::Disconnect()
     {
-    LOG_FUNC
+    OstTraceFunctionEntry0( RHOSTMASSSTORAGE_DISCONNECT_ENTRY );
     
     Close();
+    OstTraceFunctionExit0( RHOSTMASSSTORAGE_DISCONNECT_EXIT );
     return KErrNone;
     }
 
@@ -80,7 +85,7 @@
  */
 EXPORT_C TVersion RHostMassStorage::Version() const
     {
-    LOG_FUNC
+    OstTraceFunctionEntry0( RHOSTMASSSTORAGE_VERSION_ENTRY );
     
     return TVersion(KMsmmServMajorVersionNumber,
                     KMsmmServMinorVersionNumber,
@@ -95,7 +100,7 @@
 
 EXPORT_C TInt RHostMassStorage::EjectUsbDrives()
     {
-    LOG_FUNC
+    OstTraceFunctionEntry0( RHOSTMASSSTORAGE_EJECTUSBDRIVES_ENTRY );
     
     TInt ret(KErrNone);
 
@@ -103,6 +108,7 @@
 
     ret = Send(EHostMsmmServerEjectUsbDrives, usbmsIpcArgs);
     
+    OstTraceFunctionExit0( RHOSTMASSSTORAGE_EJECTUSBDRIVES_EXIT );
     return ret;
     }