--- a/mtpfws/mtpfw/daemon/server/src/cmtpserversession.cpp	Thu Sep 02 21:21:26 2010 +0300
+++ b/mtpfws/mtpfw/daemon/server/src/cmtpserversession.cpp	Fri Sep 17 08:34:51 2010 +0300
@@ -25,7 +25,12 @@
 #include "cmtpdataprovidercontroller.h"
 #include "cmtpparserrouter.h"
 #include "e32def.h"
-__FLOG_STMT(_LIT8(KComponent,"ServerSession");)
+#include "mtpdebug.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmtpserversessionTraces.h"
+#endif
+
 
 
 /**
@@ -33,9 +38,8 @@
 */
 CMTPServerSession::CMTPServerSession()
     {
-    __FLOG_OPEN(KMTPSubsystem, KComponent);
-    __FLOG(_L8("CMTPServerSession - Entry"));
-    __FLOG(_L8("CMTPServerSession - Exit"));
+    OstTraceFunctionEntry0( CMTPSERVERSESSION_CMTPSERVERSESSION_CONS_ENTRY );
+    OstTraceFunctionExit0( CMTPSERVERSESSION_CMTPSERVERSESSION_CONS_EXIT );
     }
     
 /**
@@ -43,52 +47,54 @@
 */
 CMTPServerSession::~CMTPServerSession()
     {
-    __FLOG(_L8("~CMTPServerSession - Entry"));
+    OstTraceFunctionEntry0( CMTPSERVERSESSION_CMTPSERVERSESSION_DES_ENTRY );
     static_cast<CMTPServer*>(const_cast<CServer2*>(CSession2::Server()))->DropSession();
     iSingletons.Close();
-    __FLOG(_L8("~CMTPServerSession - Exit"));
-    __FLOG_CLOSE;
+    OstTraceFunctionExit0( CMTPSERVERSESSION_CMTPSERVERSESSION_DES_EXIT );
     }
     
 void CMTPServerSession::CreateL()
     {
-    __FLOG(_L8("CreateL - Entry"));
+    OstTraceFunctionEntry0( CMTPSERVERSESSION_CREATEL_ENTRY );
     iSingletons.OpenL();
     static_cast<CMTPServer*>(const_cast<CServer2*>(CSession2::Server()))->AddSession();
-    __FLOG(_L8("CreateL - Exit"));
+    OstTraceFunctionExit0( CMTPSERVERSESSION_CREATEL_EXIT );
     }
 
 void CMTPServerSession::ServiceL(const RMessage2& aMessage)
     {
-    __FLOG(_L8("ServiceL - Entry"));
+    OstTraceFunctionEntry0( CMTPSERVERSESSION_SERVICEL_ENTRY );
     switch (aMessage.Function())
         {
     case EMTPClientStartTransport:
-        __FLOG(_L8("StartTransport message received"));        
+        OstTrace0( TRACE_NORMAL, CMTPSERVERSESSION_SERVICEL, "StartTrasport message received" );      
         DoStartTransportL(aMessage);
         break;
-    case EMTPClientStopTransport:
-        __FLOG(_L8("StopTransport message received"));
+    case EMTPClientStopTransport:      
+        OstTrace0( TRACE_NORMAL, DUP1_CMTPSERVERSESSION_SERVICEL, "StopTransport message received" );       
         DoStopTransport(aMessage);
         break;
-     case EMTPClientIsAvailable :
-        __FLOG(_L8("IsAvailable message received"));
+     case EMTPClientIsAvailable :                 
+        OstTrace0( TRACE_NORMAL, DUP2_CMTPSERVERSESSION_SERVICEL, "IsAvailable message received" );    
         DoIsAvailableL(aMessage);
      
         break;
     default:
-        __FLOG(_L8("Unrecognised message received"));
+        
+        OstTrace0( TRACE_WARNING, DUP3_CMTPSERVERSESSION_SERVICEL, "Unrecognised message received" );
         break;        
         }
-    __FLOG(_L8("ServiceL - Exit"));
+    OstTraceFunctionExit0( CMTPSERVERSESSION_SERVICEL_EXIT );
     }
 TBool CMTPServerSession::CheckIsAvailableL(TUid aNewUID,TUid aCurUID)
 {
+        OstTraceFunctionEntry0( CMTPSERVERSESSION_CHECKISAVAILABLEL_ENTRY );
 
 	    TInt SwitchEnabled;
 	    iSingletons.FrameworkConfig().GetValueL(CMTPFrameworkConfig::ETransportSwitchEnabled, SwitchEnabled);	    
 	    if(!SwitchEnabled )
 		    {		    
+		    OstTraceFunctionExit0( CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT );
 		    return EFalse;
 		    }
        TBuf<30> value;
@@ -98,13 +104,16 @@
 	   TInt conErr = lex.Val(HighUID,EHex);
 	   if(aCurUID.iUid == HighUID)
 		    {
+		    OstTraceFunctionExit0( DUP1_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT );
 		    return EFalse;	
 
 		    }
 	   else if(aNewUID.iUid ==HighUID)
 		    {
+	    	OstTraceFunctionExit0( DUP2_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT );
 	    	return ETrue;
 		    }
+	   OstTraceFunctionExit0( DUP3_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT );
 	   return EFalse;	
 }
 /**
@@ -114,7 +123,8 @@
 */
 void CMTPServerSession::DoStartTransportL(const RMessage2& aMessage)
     {
-    __FLOG(_L8("DoStartTransportL - Entry"));
+    OstTraceFunctionEntry0( CMTPSERVERSESSION_DOSTARTTRANSPORTL_ENTRY );
+
     TUid newUID = TUid::Uid(aMessage.Int0()); 
     TUid curUID = iSingletons.ConnectionMgr().TransportUid();
     if(curUID !=(KNullUid))  // Another Transport is already running
@@ -123,6 +133,7 @@
     		{
     		aMessage.Complete(KErrServerBusy);
     		iSingletons.ConnectionMgr().QueueTransportL( newUID, NULL );
+    		OstTraceFunctionExit0( CMTPSERVERSESSION_DOSTARTTRANSPORTL_EXIT );
     		return;
     		}
 	    iSingletons.ConnectionMgr().StopTransport(curUID);
@@ -150,7 +161,7 @@
     		}
     	else 
     		{
-    		User::LeaveIfError( err );
+    		LEAVEIFERROR(err, OstTrace0(TRACE_ERROR, CMTPSERVERSESSION_DOSTARTTRANSPORTL, "start transport error"));
     		}
     	CleanupStack::PopAndDestroy(paramHbuf);
     	}
@@ -168,7 +179,7 @@
     	}
     
     
-    __FLOG(_L8("DoStartTransportL - Exit"));
+    OstTraceFunctionExit0( DUP1_CMTPSERVERSESSION_DOSTARTTRANSPORTL_EXIT );
     }  
 
 
@@ -178,10 +189,10 @@
 */  
 void CMTPServerSession::DoStopTransport(const RMessage2& aMessage)
     {
-    __FLOG(_L8("DoStopTransport - Entry"));
+    OstTraceFunctionEntry0( CMTPSERVERSESSION_DOSTOPTRANSPORT_ENTRY );
    iSingletons.ConnectionMgr().StopTransport( TUid::Uid( aMessage.Int0() ), ETrue );
     aMessage.Complete(KErrNone);
-    __FLOG(_L8("DoStopTransport - Exit"));
+    OstTraceFunctionExit0( CMTPSERVERSESSION_DOSTOPTRANSPORT_EXIT );
     }
 
 /**
@@ -191,7 +202,7 @@
 */  
 void CMTPServerSession::DoIsAvailableL(const RMessage2& aMessage)
     {
-    __FLOG(_L8("DoStopTransport - Entry"));
+    OstTraceFunctionEntry0( CMTPSERVERSESSION_DOISAVAILABLEL_ENTRY );
    
    TUid newUID = TUid::Uid(aMessage.Int0()); 
    TUid curUID = iSingletons.ConnectionMgr().TransportUid();
@@ -201,17 +212,20 @@
 		if(curUID== newUID)
 			{
     		aMessage.Complete(KErrAlreadyExists); 	
+    		OstTraceFunctionExit0( CMTPSERVERSESSION_DOISAVAILABLEL_EXIT );
     		return;				
 			}
     	else if(!CheckIsAvailableL(newUID,curUID))
     		{
     		aMessage.Complete(KErrServerBusy); 	
+    		OstTraceFunctionExit0( DUP1_CMTPSERVERSESSION_DOISAVAILABLEL_EXIT );
     		return;
     		}	    
     	}
 
     aMessage.Complete(KErrNone);
-    __FLOG(_L8("DoStopTransport - Exit"));
+
+    OstTraceFunctionExit0( DUP2_CMTPSERVERSESSION_DOISAVAILABLEL_EXIT );
     }
 
 TBool CMTPServerSession::CheckIsBlueToothTransport(TUid aNewUid)