--- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.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"
@@ -19,12 +19,14 @@
@file
*/
-
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpdpfsminterfaceTraces.h"
+#endif
#include "CPdpFsmInterface.h"
#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
//-=========================================================
// Custom methods
@@ -35,15 +37,17 @@
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::()");
CPdpFsmInterface::Close();
delete iPdpFsmFactory;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_2, "<<CPdpFsmInterface::()");
}
//-=========================================================
@@ -55,32 +59,34 @@
*/
void CPdpFsmInterface::OpenL(TName& aTsyName, TInt aUmtsRelease)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::OpenL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_1, ">>CPdpFsmInterface::OpenL()");
iUmtsRelease = aUmtsRelease;
iPdpFsmFactory = CPdpFsmFactory::NewL();
iPdpFsmFactory->InitL(aTsyName, this);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_2, "<<CPdpFsmInterface::OpenL()");
}
/** 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()");
if (iPdpFsmFactory)
{
iPdpFsmFactory->Close();
}
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_2, "<<CPdpFsmInterface::Close()");
}
TContextId CPdpFsmInterface::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::NewFsmContext()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWFSMCONTESTL_1, ">>CPdpFsmInterface::NewFsmContext()");
ASSERT(iPdpFsmFactory);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWFSMCONTESTL_2, "<<CPdpFsmInterface::NewFsmContext()");
return iPdpFsmFactory->NewFsmContextL(aPdpFsmEventHandler,aContextType);
}
@@ -98,7 +104,7 @@
{
TInt ret = KErrNone;
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_1, ">>CPdpFsmInterface::Input(aParam)");
ASSERT(iPdpFsmFactory);
@@ -158,7 +164,7 @@
{
ret = KErrBadHandle;
}
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_2, "<<CPdpFsmInterface::Input(aParam)");
return ret;
}
@@ -171,7 +177,7 @@
*/
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));
@@ -185,6 +191,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
return KErrNone;
}
@@ -196,7 +203,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -210,6 +217,7 @@
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
return KErrNone;
}
@@ -225,7 +233,7 @@
*/
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_SET_2_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -240,6 +248,7 @@
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
return KErrNone;
}
@@ -251,7 +260,7 @@
*/
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_SET_3_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -266,7 +275,7 @@
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_3_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
return KErrNone;
}
@@ -287,7 +296,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_4_1, ">>CPdpFsmInterface::Set(TFTInfo)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -301,6 +310,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_4_2, "<<CPdpFsmInterface::Set(TFTInfo)");
return KErrNone;
}
@@ -312,7 +322,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_5_1, ">>CPdpFsmInterface::Set(TTFTOperationCode)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -326,6 +336,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_5_2, "<<CPdpFsmInterface::Set(TTFTOperationCode)");
return KErrNone;
}
@@ -337,7 +348,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_6_1, ">>CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -351,6 +362,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_6_2, "<<CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
return KErrNone;
}
@@ -363,7 +375,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_7_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -377,6 +389,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_7_2, "<<CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
return KErrNone;
}
@@ -388,7 +401,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TPacketDataConfigBase& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACESET_8_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -402,6 +415,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACESET_8_2, "<<CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
return KErrNone;
}
@@ -411,11 +425,12 @@
*/
void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_9_1, ">>CPdpFsmInterface::Set(RPacketService::TStatus)");
ASSERT(iPdpFsmFactory);
iNetworkStatus = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_9_2, "<<CPdpFsmInterface::Set(RPacketService::TStatus)");
}
@@ -431,7 +446,7 @@
*/
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));
@@ -445,6 +460,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
return KErrNone;
}
@@ -456,7 +472,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -470,6 +486,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
return KErrNone;
}
@@ -484,7 +501,7 @@
*/
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_GET_2_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -498,6 +515,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
return KErrNone;
}
@@ -509,7 +527,7 @@
*/
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_GET_3_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -523,6 +541,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_3_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
return KErrNone;
}
@@ -541,7 +560,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_4_1, ">>CPdpFsmInterface::Get(TFTInfo)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -555,6 +574,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_4_2, "<<CPdpFsmInterface::Get(TFTInfo)");
return KErrNone;
}
@@ -566,7 +586,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_5_1, ">>CPdpFsmInterface::Get(TFTInfo)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -580,6 +600,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_5_2, "<<CPdpFsmInterface::Get(TFTInfo)");
return KErrNone;
}
@@ -592,7 +613,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_6_1, ">>CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -606,6 +627,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_6_2, "<<CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
return KErrNone;
}
@@ -617,7 +639,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TPacketDataConfigBase& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_7_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
ASSERT( aParam.ExtensionId() == TPacketDataConfigBase::KConfigGPRS ||
aParam.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4 ||
@@ -635,6 +657,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_7_2, "<<CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
return KErrNone;
}
@@ -646,7 +669,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_8_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -660,6 +683,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_8_2, "<CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
return KErrNone;
}
@@ -671,11 +695,12 @@
*/
void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_9_1, ">>CPdpFsmInterface::Get(RPacketService::TStatus)");
ASSERT(iPdpFsmFactory);
aParam = iNetworkStatus;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_9_2, "<<CPdpFsmInterface::Get(RPacketService::TStatus)");
}
@@ -685,10 +710,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();
}
@@ -701,10 +726,11 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketMbmsContext::TContextConfigMbmsV1& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_10_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_10_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}
@@ -717,7 +743,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketMbmsContext::TContextConfigMbmsV1& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_10_1, "CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
@@ -735,10 +761,11 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TSessionOperatioInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}
@@ -751,10 +778,11 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TSessionOperatioInfo& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}