--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingmbms.cpp Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingmbms.cpp Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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,10 +20,16 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatecreatingmbmsTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include <networking/pdpdef.h>
#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "PDPFSM.h"
#include "cpdpfsm.h"
@@ -31,36 +37,41 @@
TInt TPdpStateCreatingMbms::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
{
- SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingMbms::Input()");
- SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_1, ">>TPdpStateCreatingMbms::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::EMbmsPdpContextCreated:
EtelDriverInput(aFsm, EtelDriver::ESessionUpdate);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_3, "<<TPdpStateCreatingMbms::Input()");
return KErrNone;
case SpudMan::EMbmsParameterUpdate:
aFsm.ChangeStateToCreatedMbms();
SpudManNotify(aFsm,KMbmsContextCreated, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_4, "<<TPdpStateCreatingMbms::Input()");
return KErrNone;
case PdpFsm::EMbmsPdpContextCreatedFailed:
iErrorCode = aErrorCode;
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_5, "<<TPdpStateCreatingMbms::Input()");
return KErrNone;
case PdpFsm::EContextDeletedFailed:
- SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_6, "**** DELETE FAILURE ****");
// fall through
case PdpFsm::EContextDeleted:
aFsm.ChangeStateToInitialised();
SpudManNotify(aFsm, KMbmsContextCreated, iErrorCode);
iErrorCode = KErrNone;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_7, "<<TPdpStateCreatingMbms::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_8, "<<TPdpStateCreatingMbms::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}