--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp	Tue Sep 14 17:55:14 2010 +0100
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp	Thu Sep 23 14:44:40 2010 +0100
@@ -40,15 +40,13 @@
  iRefCount(1),
  iUmtsRelease(TPacketDataConfigBase::KConfigGPRS)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_1, ">>CPdpFsmInterface::()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_2, "<<CPdpFsmInterface::()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_1, " Constructor");
     }
 
 CPdpFsmInterface::~CPdpFsmInterface()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_1, ">>CPdpFsmInterface::()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_1, " Destructor");
 	delete iPdpFsmFactory;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_2, "<<CPdpFsmInterface::()");
     }
 
 TContextId CPdpFsmInterface::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
@@ -59,6 +57,7 @@
     
 TBool CPdpFsmInterface::FsmContextExists(const TContextId aPdpId)
     {
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_FSMCONTEXTEXISTS_1, " for context id [%d]", aPdpId);
     return iPdpFsmFactory->HaveFsmContext(aPdpId);
     }
     
@@ -74,12 +73,11 @@
 */
 void CPdpFsmInterface::NewL(const TName& aTsyName, TInt aUmtsRelease)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWL_1, ">>CPdpFsmInterface::NewL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWL_1, " 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
@@ -88,16 +86,15 @@
 */
 void 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()");
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_1, " RefCount [%d]", iRefCount);
     }
     
 /** closes the FSM and frees underlying resources
 */
 void CPdpFsmInterface::Close()
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_1, ">>CPdpFsmInterface::Close()");
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_1, " RefCount [%d]", iRefCount - 1);
     ASSERT( iRefCount > 0 );
 	if (--iRefCount == 0 )
 	    {
@@ -107,7 +104,6 @@
     	    }
     	delete this;
 	    }
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_2, "<<CPdpFsmInterface::Close()");
     }
     
 
@@ -125,7 +121,7 @@
     {
 	TInt ret = KErrNone;
 
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_1, ">>CPdpFsmInterface::Input(aParam)");
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_1, " for context id [%d]", aPdpId);
 
 	ASSERT(iPdpFsmFactory);
 
@@ -181,7 +177,7 @@
 	    {
 		ret = KErrBadHandle;
 	    }
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_2, "<<CPdpFsmInterface::Input(aParam)");
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_2, " return with value [%d]", ret);
 	return ret;
     }
 
@@ -197,13 +193,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR5Requested& aParam)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_QOSR5REQUESTED_1, "(TQoSR5Requested) for context id [%d]", aPdpId);
 
 	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;
 	}
 
@@ -216,13 +211,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR5Negotiated& aParam)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET1_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_QOSR5NEGOTIATED_1, "(TQoSR5Negotiated) for context name [%S]", GetContextName(aPdpId));
 
-	ASSERT(iPdpFsmFactory);
+    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;
 }
 
@@ -273,13 +267,12 @@
 
 void CPdpFsmInterface::Set(const TContextId aPdpId,MPdpFsmEventHandler& aPdpFsmEventHandler)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET4_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_PDPFSMEVENTHANDLER_1, "(MPdpFsmEventHandler) for context id [%d]", aPdpId);
 
 	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
@@ -290,13 +283,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const TTFTInfo& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET5_1, ">>CPdpFsmInterface::Set(TFTInfo)");
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_TFTINFO_1, "(TTFTInfo) for context id [%d]", aPdpId);
 
 	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;
     }
 
@@ -308,13 +300,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const TTFTOperationCode& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET6_1, ">>CPdpFsmInterface::Set(TTFTOperationCode)");
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_TFTOPERATIONCODE_1, "(TTFTOperationCode) for context id [%d]", aPdpId);
 
 	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;
     }
 
@@ -326,13 +317,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketContext::TDataChannelV2& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET7_1, ">>CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_DATACHANNELV2_1, "(TDataChannelV2) for context id [%d]", aPdpId);
 
 	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;
     }
 
@@ -344,13 +334,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketContext::TContextStatus& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET8_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_CONTEXTSTATUS_1, "(TContextStatus) for context name [%S]", GetContextName(aPdpId));
 
 	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;
     }
 
@@ -362,13 +351,12 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TPacketDataConfigBase& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET9_1, ">>CPdpFsmInterface::Set(TPacketDataConfigBase)");
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_PACKETCONFIGBASE_1, "(TPacketDataConfigBase) for context id [%d]", aPdpId);
 
 	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;
     }
 
@@ -378,12 +366,11 @@
 */
 void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET10_1, ">>CPdpFsmInterface::Set(RPacketService::TStatus)");
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_PACKET_STATUS_1, "(RPacketService::TStatus) set to [%d]", aParam);
 
 	ASSERT(iPdpFsmFactory);
 
 	iNetworkStatus = aParam;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET10_2, "<<CPdpFsmInterface::Set(RPacketService::TStatus)");
     }
 
 
@@ -397,13 +384,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR5Requested& aParam) const
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_QOSR5REQUESTED_1, "(TQoSR5Requested) for context id [%d]", aPdpId);
 
 	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;
 }
 
@@ -417,13 +403,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR5Negotiated& aParam) const
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET1_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
-
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_QOSR5NEGOTIATED_1, "(TQoSR5Negotiated) for context name [%S]", GetContextName(aPdpId));
+   
 	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;
 }
 
@@ -482,13 +467,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,TTFTInfo& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET4_1, ">>CPdpFsmInterface::Get(TFTInfo)");
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_TFTINFO_1, "(TTFTInfo) for context id [%d]", aPdpId);
 
 	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;
     }
 
@@ -500,13 +484,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,TTFTOperationCode& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET5_1, ">>CPdpFsmInterface::Get(TFTInfo)");
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_TFTOPERATIONCODE_1, "(TTFTOperationCode) for context id [%d]", aPdpId);
 
 	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;
     }
 
@@ -520,13 +503,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketContext::TDataChannelV2& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET6_1, ">>CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_DATACHANNELV2_1, "(TDataChannelV2) for context name [%S]", GetContextName(aPdpId));
 
 	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;
     }
 
@@ -538,13 +520,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TPacketDataConfigBase& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET7_1, ">>CPdpFsmInterface::Get(TPacketDataConfigBase)");
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_PACKETCONFIGBASE_1, "(TPacketDataConfigBase) for context name [%S]", GetContextName(aPdpId));
 
 	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;
     }
 
@@ -556,13 +537,12 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketContext::TContextStatus& aParam) const
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET8_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_CONTEXTSTATUS_1, "(TContextStatus) for context name [%S]", GetContextName(aPdpId));
 
 	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;
     }
 
@@ -574,12 +554,11 @@
 */
 void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET9_1, ">>CPdpFsmInterface::Get(RPacketService::TStatus)");
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_PACKETSTATUS_1, "(RPacketService::TStatus) [%d]", iNetworkStatus);
 
 	ASSERT(iPdpFsmFactory);
 
 	aParam = iNetworkStatus;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET9_2, "<<CPdpFsmInterface::Get(RPacketService::TStatus)");
     }
 
 
@@ -589,10 +568,9 @@
 */
 const TName& CPdpFsmInterface::TsyName(void)
     {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_1, ">>CPdpFsmInterface::TsyName");
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_1, " TsyName: [%S]", iPdpFsmFactory->TsyName());
 
 	ASSERT(iPdpFsmFactory);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_2, "<<CPdpFsmInterface::TsyName");
 	return iPdpFsmFactory->TsyName();
 }
 
@@ -608,11 +586,10 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketMbmsContext::TContextConfigMbmsV1& aParam)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_CONTEXTCONFIGMBMSV1_1, "(TContextConfigMbmsV1) for context id [%d]", aPdpId);
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 
@@ -624,11 +601,10 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketMbmsContext::TContextConfigMbmsV1& aParam) const 
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET10_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_CONTEXTCONFIGMBMSV1_1, "(TContextConfigMbmsV1) for context name [%S]", GetContextName(aPdpId));
 
-	ASSERT(iPdpFsmFactory);
+    ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET10_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 	
@@ -640,11 +616,10 @@
 */
 TInt CPdpFsmInterface::Set(TContextId aPdpId, const TSessionOperatioInfo& aParam)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET12_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_SESSIONOPERATION_INFO_1, "(TSessionOperatioInfo) for context name [%S]", GetContextName(aPdpId));
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET12_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 
@@ -657,11 +632,10 @@
 */
 TInt CPdpFsmInterface::Get(TContextId aPdpId, TSessionOperatioInfo& aParam) const 
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+    OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_SESSIONOPERATION_INFO_1, "(TSessionOperatioInfo) for context name [%S]", GetContextName(aPdpId));
 
 	ASSERT(iPdpFsmFactory);
 	iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
 	return KErrNone;
 	}
 
@@ -670,9 +644,9 @@
 @param aPdpId - the PDP context ID, 0 to KMaxPdpContexts
 @return - Context name in a TName
 */
-const TName& CPdpFsmInterface::GetContextName(TContextId aPdpId)
+const TName& CPdpFsmInterface::GetContextName(TContextId aPdpId) const
     {
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GETCONTEXTNAME_1, ">>CPdpFsmInterface::GetContextName() for context id [%d]", aPdpId);
+    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GETCONTEXTNAME_1, " for context id [%d]", aPdpId);
 
     ASSERT(iPdpFsmFactory);
     ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));