diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
 
 
 // INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmpacketcontextgsmwcdmaextTraces.h"
-#endif
-
 #include <in_sock.h>
 #include "cmmpacketcontextgsmwcdmaext.h"
 #include "Cmmpacketcontexttsy.h"
@@ -38,7 +32,7 @@
         CMmPacketContextTsy* const aMmPacketContextTsy, 
         CMmPacketServiceTsy* const aMmPacketServiceTsy  ) 
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_NEWL_1,  "TSY: CMmPacketContextGsmWcdmaExt::NewL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::NewL." );
 
     CMmPacketContextGsmWcdmaExt* packetContextGsmWcdmaExt = 
         new ( ELeave ) CMmPacketContextGsmWcdmaExt();
@@ -65,7 +59,7 @@
  
 CMmPacketContextGsmWcdmaExt::~CMmPacketContextGsmWcdmaExt()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_DTOR_1,  "TSY: CMmPacketContextGsmWcdmaExt::~CMmPacketContextGsmWcdmaExt." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::~CMmPacketContextGsmWcdmaExt." );
 
     TInfoName contextName;
     if( iMmPacketContextTsy )
@@ -163,7 +157,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::InitialiseContextL(RPacketContext::TDataChannelV2* aDataChannel)
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_INITIALISECONTEXTL_1,  "TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextL." );
 
     TInt ret( KErrArgument );
 
@@ -197,7 +191,7 @@
 //
 void CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext(const TInt aResult) // Result
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext." );
 
     if ( KErrNone == aResult )
         {
@@ -232,7 +226,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::ActivateL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_ACTIVATEL_1,  "TSY: CMmPacketContextGsmWcdmaExt::ActivateL " );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::ActivateL " );
 
     TInt ret( KErrArgument );
 
@@ -291,7 +285,8 @@
         CMmDataPackage* aDataPackage,
         TInt aResult ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. Status: %d",aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. Status: %d",
+             aResult );
 
     if ( KErrNone == aResult )
         {
@@ -337,7 +332,8 @@
         }
     else
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_2,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. ErrorCause: %d",aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. ErrorCause: %d",
+             aResult );
         // Re-activation is allowed because activation has not succeeded
         iIsActivateAllowed = ETrue;
         }
@@ -361,7 +357,7 @@
 void CMmPacketContextGsmWcdmaExt::CompleteActivatePhase2(  
         CMmDataPackage* aDataPackage, const TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATEPHASE2_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivatePhase2. Status: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivatePhase2. Status: %d", aResult );
 
     if ( KErrNone == aResult )
         {
@@ -433,7 +429,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::DeactivateL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_DEACTIVATEL_1,  "TSY: CMmPacketContextGsmWcdmaExt::DeactivateL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::DeactivateL." );
 
     TInt ret( KErrArgument );
     //zero length
@@ -463,7 +459,7 @@
 void CMmPacketContextGsmWcdmaExt::CompleteDeactivate( 
         const TInt aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDEACTIVATE_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteDeactivate." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteDeactivate." );
 
     if ( KErrNone == aResult )
         {
@@ -491,7 +487,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::DeleteL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_DELETEL_1,  "TSY: CMmPacketContextGsmWcdmaExt::DeleteL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::DeleteL." );
 
     TInt ret( KErrNotReady );
 
@@ -520,7 +516,7 @@
 void CMmPacketContextGsmWcdmaExt::CompleteDelete( 
 		TInt const aResult )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDELETE_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteDelete." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteDelete." );
 
     if( KErrNone == aResult )
         {
@@ -552,7 +548,7 @@
 TInt CMmPacketContextGsmWcdmaExt::GetConfig( 
 		TPacketDataConfigBase* const aConfig )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIG_1,  "TSY: CMmPacketContextGsmWcdmaExt::GetConfig." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetConfig." );
 
     TInt ret( KErrNone );
 
@@ -606,7 +602,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::GetDataVolumeTransferredL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETDATAVOLUMETRANSFERREDL_1,  "TSY: CMmPacketContextGsmWcdmaExt::GetDataVolumeTransferredL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetDataVolumeTransferredL." );
 
     TInt ret( KErrNone );
     TInfoName contextName = iMmPacketContextTsy->ContextName();
@@ -649,7 +645,8 @@
         {
         errorValue = KErrGeneral;
         }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEGETDATAVOLUMETRANSFERRED_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteGetDataVolumeTransferred. Error Value:%d",errorValue );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteGetDataVolumeTransferred. Error Value:%d",
+                errorValue );
 
     iMmPacketContextTsy->CompleteGetDataVolumeTransferred( errorValue );
 
@@ -665,7 +662,7 @@
 TInt CMmPacketContextGsmWcdmaExt::NotifyConfigChanged(
         TPacketDataConfigBase& aConfig )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_NOTIFYCONFIGCHANGED_1,  "TSY: CMmPacketContextGsmWcdmaExt::NotifyConfigChanged." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::NotifyConfigChanged." );
 
     TInt ret( KErrNone );
 
@@ -687,7 +684,7 @@
 //
 void CMmPacketContextGsmWcdmaExt::CompleteNotifyConfigChanged()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETENOTIFYCONFIGCHANGED_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteNotifyConfigChanged." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteNotifyConfigChanged." );
 
     if ( NULL != iConfig )
         {
@@ -720,7 +717,7 @@
 TInt CMmPacketContextGsmWcdmaExt::SetConfigL( 
 		TPacketDataConfigBase* const aConfig )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_1,  "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL." );
 
     TInt ret( KErrNotSupported );
 
@@ -747,7 +744,7 @@
                  // Temporary store the configGPRS
                 *iTempConfig = configGPRS;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_2,  "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL. NWIContext: %d", configGPRS.iNWIContext );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL. NWIContext: %d", configGPRS.iNWIContext );
 
                 TInfoName contextName = iMmPacketContextTsy->ContextName();
                 CMmDataPackage data;
@@ -830,7 +827,8 @@
 void CMmPacketContextGsmWcdmaExt::CompleteSetConfig( 
 		const TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETESETCONFIG_1,  "TSY: CMmPacketContextGsmWcdmaExt::CompleteSetConfig. aStatus:%d",aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteSetConfig. aStatus:%d",
+                aResult );
 
 
     if ( NULL != iTempConfig )
@@ -887,7 +885,7 @@
         TBool& aContextType,                       
         TInfoName& aPrimaryContextName )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIGURATIONDATA_1,  "TSY: CMmPacketContextGsmWcdmaExt::GetConfigurationData." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetConfigurationData." );
 
     TInt ret( KErrNotReady );
 
@@ -922,7 +920,7 @@
     RPacketContext::TPacketFilterV2& contextFilter =
         ( *contextFilterPckg )();
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_ADDPACKETFILTERL_1,  "TSY: CMmPacketContextGsmWcdmaExt::AddPacketFilterL contextFilterId: %d", contextFilter.iId );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::AddPacketFilterL contextFilterId: %d", contextFilter.iId );
 
     // Check out Tft operation
     iFilterStatus = EAddPacketFilterStatusAdd;
@@ -1144,7 +1142,7 @@
 TInt CMmPacketContextGsmWcdmaExt::RemovePacketFilter( 
 			const TInt aID )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_REMOVEPACKETFILTER_1,  "TSY: CMmPacketContextGsmWcdmaExt::RemovePacketFilter. FilterId:%d", aID );
+TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::RemovePacketFilter. FilterId:%d", aID );
 
     TInt ret( KErrArgument );
 
@@ -1219,7 +1217,7 @@
 //
 TInt CMmPacketContextGsmWcdmaExt::ModifyActiveContextL()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_MODIFYACTIVECONTEXTL_1,  "TSY: CMmPacketContextGsmWcdmaExt::ModifyActiveContextL." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::ModifyActiveContextL." );
 
     TInt ret( KErrArgument );
     
@@ -1612,7 +1610,7 @@
 TInt CMmPacketContextGsmWcdmaExt::GetDnsInfoEtel(
             TDes8* const aDnsInfo )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETDNSINFOETEL_1,  "TSY: CMmPacketContextGsmWcdmaExt::GetDnsInfoEtel." );
+TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetDnsInfoEtel." );
 
     // Unpack the aDnsInfo
     RPacketContext::TTDnsInfoV2Pckg* dnsInfoPckg =