--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp	Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -20,9 +20,13 @@
 */
 
 
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "PDPSCPRFSMTraces.h"
+#endif
+
 #include "PDPFSM.h"
 #include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
 #include "PDPDeftSCPR.h"
 
 
@@ -36,13 +40,15 @@
  iRefCount(1),
  iUmtsRelease(TPacketDataConfigBase::KConfigGPRS)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_1, ">>CPdpFsmInterface::()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_2, "<<CPdpFsmInterface::()");
     }
 
 CPdpFsmInterface::~CPdpFsmInterface()
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_1, ">>CPdpFsmInterface::()");
 	delete iPdpFsmFactory;
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_2, "<<CPdpFsmInterface::()");
     }
 
 TContextId CPdpFsmInterface::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
@@ -68,11 +74,12 @@
 */
 void CPdpFsmInterface::NewL(const TName& aTsyName, TInt aUmtsRelease)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::NewL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWL_1, ">>CPdpFsmInterface::NewL()");
 	
 	iUmtsRelease = aUmtsRelease;
 	iPdpFsmFactory = CPdpFsmFactory::NewL();
 	iPdpFsmFactory->InitL(aTsyName, this);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWL_2, "<<CPdpFsmInterface::NewL()");
     }
 
 /** request to open the FSM
@@ -81,15 +88,16 @@
 */
 void CPdpFsmInterface::Open()
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Open()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_1, ">>CPdpFsmInterface::Open()");
 	iRefCount++;
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_2, "<<CPdpFsmInterface::Open()");
     }
     
 /** closes the FSM and frees underlying resources
 */
 void CPdpFsmInterface::Close()
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_1, ">>CPdpFsmInterface::Close()");
     ASSERT( iRefCount > 0 );
 	if (--iRefCount == 0 )
 	    {
@@ -99,7 +107,9 @@
     	    }
     	delete this;
 	    }
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_2, "<<CPdpFsmInterface::Close()");
     }
+    
 
 
 /** 
@@ -115,7 +125,7 @@
     {
 	TInt ret = KErrNone;
 
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_1, ">>CPdpFsmInterface::Input(aParam)");
 
 	ASSERT(iPdpFsmFactory);
 
@@ -171,7 +181,7 @@
 	    {
 		ret = KErrBadHandle;
 	    }
-	
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_2, "<<CPdpFsmInterface::Input(aParam)");
 	return ret;
     }
 
@@ -187,12 +197,13 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR5Requested& aParam)
 	{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
 	return KErrNone;
 	}
 
@@ -205,12 +216,13 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR5Negotiated& aParam)
 {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET1_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET1_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
 	return KErrNone;
 }
 
@@ -226,12 +238,13 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR99_R4Requested& aParam)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET2_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
 
 	ASSERT(iPdpFsmFactory);
     ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
     iPdpFsmFactory->GetFsmContext(aPdpId,aContextType)->Set(aParam);
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET2_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
 	return KErrNone;
     }
 
@@ -244,12 +257,13 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR99_R4Negotiated& aParam)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET3_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId,aContextType)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET3_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
 	return KErrNone;
     }
 
@@ -259,12 +273,13 @@
 
 void CPdpFsmInterface::Set(const TContextId aPdpId,MPdpFsmEventHandler& aPdpFsmEventHandler)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET4_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aPdpFsmEventHandler);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET4_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
     }
 
 /** Set context parameters
@@ -275,12 +290,13 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const TTFTInfo& aParam)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET5_1, ">>CPdpFsmInterface::Set(TFTInfo)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET5_2, "<<CPdpFsmInterface::Set(TFTInfo)");
 	return KErrNone;
     }
 
@@ -292,12 +308,13 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const TTFTOperationCode& aParam)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET6_1, ">>CPdpFsmInterface::Set(TTFTOperationCode)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET6_2, "<<CPdpFsmInterface::Set(TTFTOperationCode)");
 	return KErrNone;
     }
 
@@ -309,12 +326,13 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketContext::TDataChannelV2& aParam)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET7_1, ">>CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET7_2, "<<CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
 	return KErrNone;
     }
 
@@ -326,12 +344,13 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketContext::TContextStatus& aParam)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET8_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET8_2, "<<CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
 	return KErrNone;
     }
 
@@ -343,12 +362,13 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TPacketDataConfigBase& aParam)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TPacketDataConfigBase)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET9_1, ">>CPdpFsmInterface::Set(TPacketDataConfigBase)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET9_2, "<<CPdpFsmInterface::Set(TPacketDataConfigBase)");
 	return KErrNone;
     }
 
@@ -358,11 +378,12 @@
 */
 void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET10_1, ">>CPdpFsmInterface::Set(RPacketService::TStatus)");
 
 	ASSERT(iPdpFsmFactory);
 
 	iNetworkStatus = aParam;
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET10_2, "<<CPdpFsmInterface::Set(RPacketService::TStatus)");
     }
 
 
@@ -376,12 +397,13 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR5Requested& aParam) const
 {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
 	return KErrNone;
 }
 
@@ -395,12 +417,13 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR5Negotiated& aParam) const
 {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET1_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET1_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
 	return KErrNone;
 }
 
@@ -416,12 +439,13 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR99_R4Requested& aParam) const
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET2_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET2_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
 	return KErrNone;
     }
 
@@ -435,12 +459,13 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR99_R4Negotiated& aParam) const
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET3_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET3_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
 	return KErrNone;
     }
 
@@ -457,12 +482,13 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,TTFTInfo& aParam) const
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET4_1, ">>CPdpFsmInterface::Get(TFTInfo)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET4_2, "<<CPdpFsmInterface::Get(TFTInfo)");
 	return KErrNone;
     }
 
@@ -474,12 +500,13 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,TTFTOperationCode& aParam) const
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET5_1, ">>CPdpFsmInterface::Get(TFTInfo)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET5_2, "<<CPdpFsmInterface::Get(TFTInfo)");
 	return KErrNone;
     }
 
@@ -493,12 +520,13 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketContext::TDataChannelV2& aParam) const
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET6_1, ">>CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET6_2, "<<CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
 	return KErrNone;
     }
 
@@ -510,12 +538,13 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TPacketDataConfigBase& aParam) const
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TPacketDataConfigBase)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET7_1, ">>CPdpFsmInterface::Get(TPacketDataConfigBase)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET7_2, "<<CPdpFsmInterface::Get(TPacketDataConfigBase)");
 	return KErrNone;
     }
 
@@ -527,12 +556,13 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketContext::TContextStatus& aParam) const
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET8_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
 
 	ASSERT(iPdpFsmFactory);
 	ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
 	ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET8_2, "<<CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
 	return KErrNone;
     }
 
@@ -544,11 +574,12 @@
 */
 void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET9_1, ">>CPdpFsmInterface::Get(RPacketService::TStatus)");
 
 	ASSERT(iPdpFsmFactory);
 
 	aParam = iNetworkStatus;
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET9_2, "<<CPdpFsmInterface::Get(RPacketService::TStatus)");
     }
 
 
@@ -558,10 +589,10 @@
 */
 const TName& CPdpFsmInterface::TsyName(void)
     {
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_1, ">>CPdpFsmInterface::TsyName");
 
 	ASSERT(iPdpFsmFactory);
-	
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_2, "<<CPdpFsmInterface::TsyName");
 	return iPdpFsmFactory->TsyName();
 }
 
@@ -577,10 +608,11 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketMbmsContext::TContextConfigMbmsV1& aParam)
 	{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 
@@ -592,10 +624,11 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketMbmsContext::TContextConfigMbmsV1& aParam) const 
 	{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET10_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET10_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 	
@@ -607,10 +640,11 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TSessionOperatioInfo& aParam)
 	{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET12_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET12_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 
@@ -623,10 +657,11 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TSessionOperatioInfo& aParam) const 
 	{
-	SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}