diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// 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,12 +20,6 @@
 
 
 //INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyCloseChannelTraces.h"
-#endif
-
 #include <satcs.h>                  // Etel SAT IPC definitions
 #include "CSatTsy.h"                // Tsy class header
 #include "CSatNotifyCloseChannel.h" // Class header
@@ -33,6 +27,7 @@
 #include "CBerTlv.h"                // Ber Tlv data handling
 #include "TTlv.h"					// TTlv class
 #include "CSatDataPackage.h"        // Parameter packing 
+#include "TfLogger.h"               // For TFLOGSTRING
 #include "TSatUtility.h"            // Utilities
 #include "CSatTsyReqHandleStore.h"  // Request handle class
 #include "cmmmessagemanagerbase.h"  // Message manager class for forwarding req.
@@ -47,13 +42,13 @@
         CSatNotificationsTsy* aNotificationsTsy 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_NEWL_1, "CSAT: CSatNotifyCloseChannel::NewL");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::NewL");
    	CSatNotifyCloseChannel* const satNotifyCloseChannel = 
         new ( ELeave ) CSatNotifyCloseChannel( aNotificationsTsy );
     CleanupStack::PushL( satNotifyCloseChannel );
     satNotifyCloseChannel->ConstructL();
     CleanupStack::Pop( satNotifyCloseChannel );
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_NEWL_2, "CSAT: CSatNotifyCloseChannel::NewL, end of method");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::NewL, end of method");
     return satNotifyCloseChannel;
     }
 
@@ -67,7 +62,7 @@
 		// None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_DTOR_1, "CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel");
     }
     
 // -----------------------------------------------------------------------------
@@ -93,7 +88,8 @@
         // None
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CONSTRUCTL_1, "CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel, does nothing");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel, \
+    	does nothing");
     }
 
 // -----------------------------------------------------------------------------
@@ -108,7 +104,7 @@
         const TDataPackage& aPackage    
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_NOTIFY_1, "CSAT: CSatNotifyCloseChannel::Notify");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::Notify");
 
     // Save data pointer to client side for completion
     iCloseChannelRspV2Pckg = reinterpret_cast<RSat::TCloseChannelV2Pckg*>( 
@@ -133,7 +129,7 @@
         const TTsyReqHandle aTsyReqHandle 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CANCELNOTIFICATION_1, "CSAT: CSatNotifyCloseChannel::CancelNotification");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CancelNotification");
     // Reset the request handle
     TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
         ResetTsyReqHandle( CSatTsy::ESatNotifyCloseChannelPCmdReqType );
@@ -156,7 +152,7 @@
         TInt aErrorCode                  
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_1, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL");
     TInt ret( KErrNone );
     // Unpack parameters
     TPtrC8* data;
@@ -206,7 +202,8 @@
 	            closeChannelV2.iAlphaId.iStatus = RSat::EAlphaIdNotPresent;            
 		        if ( KErrNotFound != returnValue )
 		            {
-		            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_2, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL Alpha ID present");
+		            TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL\
+		            	Alpha ID present");
 		            TUint16 alphaIdLength = alphaIdentifier.GetLength();
 		            if ( alphaIdLength )
 		                {
@@ -226,7 +223,8 @@
 		                }
 		            else
 		                {
-		                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_3, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL Alpha ID is NULL");
+		                TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL\
+		                	Alpha ID is NULL");
 		                closeChannelV2.iAlphaId.iStatus = RSat::EAlphaIdNull;
 		                }
 		            }
@@ -238,7 +236,8 @@
         	else
         		{
             	// Required values missing
-            	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_4, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL, required values missing (Device Identities)");
+            	TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL,\
+            	    required values missing (Device Identities)");
             	ret = KErrCorrupt;
 	            CreateTerminalRespL( pCmdNumber, RSat::KErrorRequiredValuesMissing, KNullDesC16 );
         		}
@@ -252,7 +251,8 @@
         }
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_5, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL Request not ongoing");
+		TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL\
+			Request not ongoing");
 		// Request not on, returning response immediately
 		TBuf16<1> additionalInfo;	
         additionalInfo.Append ( RSat::KNoSpecificMeProblem );
@@ -273,7 +273,7 @@
         TDes8* aRsp 
         )
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_1, "CSAT: CSatNotifyCloseChannel::TerminalResponseL");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL");
     TInt   ret( KErrNone );
     
     TBuf16<1> additionalInfo;
@@ -298,7 +298,8 @@
         && ( RSat::KBearerIndepProtocolError != rspV2.iGeneralResult ) 
         && ( RSat::KFramesError != rspV2.iGeneralResult ))
         {
-        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_2, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid General Result");
+        TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\
+        	Invalid General Result");
         // Invalid general result
         ret = KErrCorrupt;
         }
@@ -311,7 +312,8 @@
         	}
     	else
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_3, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid Additional Info");
+        	TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\
+        		Invalid Additional Info");
         	ret = KErrCorrupt;
         	}
         }
@@ -321,7 +323,8 @@
     	}
     else
     	{
-    	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_4, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid Additional Info type");
+    	TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\
+    		Invalid Additional Info type");
     	ret = KErrCorrupt;
     	}
             
@@ -347,7 +350,7 @@
         const TDesC16& aAdditionalInfo	
 		)
     {
-    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_1, "CSAT: CSatNotifyCloseChannel::CreateTerminalRespL");
+    TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CreateTerminalRespL");
     TTlv tlvSpecificData;
     // Append general result tag
     tlvSpecificData.AddTag( KTlvResultTag );
@@ -364,7 +367,8 @@
         // Unsuccessful result requires an additional info byte
         for ( TInt i = 0; i < aAdditionalInfo.Length(); i++ )
         	{
-        	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_2, "CSAT: CSatNotifyCloseChannel::CreateTerminalRespL, Unsuccessful result");
+        	TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CreateTerminalRespL,\
+        	    Unsuccessful result");
         	tlvSpecificData.AddByte( static_cast<TUint8>( 
         	    aAdditionalInfo[i] ) );
         	}