--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingprimary.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingprimary.cpp Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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"
@@ -20,23 +20,17 @@
@internalComponent
*/
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateactivatingprimaryTraces.h"
-#endif
-
#include <networking/umtsnifcontrolif.h>
#include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "cpdpfsm.h"
#include "PDPFSM.h"
TInt TPdpStateActivatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_1, ">>TPdpStateActivatingPrimary::Input()");
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_2, "aOperation : %S(%d)", *LogOperation(aFsm, aOperation), aOperation);
+ SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingPrimary::Input()");
+ SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
switch (aOperation)
{
@@ -46,27 +40,23 @@
aFsm.Set(RPacketContext::EStatusActive);
aFsm.ChangeStateToOpen();
SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone);
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_3, "<<TPdpStateActivatingPrimary::Input()");
return KErrNone;
case PdpFsm::EPdpActivatedFailed:
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_4, "*** FAILURE ***");
+ SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
aFsm.ChangeStateToClosing();
SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode);
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_5, "<<TPdpStateActivatingPrimary::Input()");
return KErrNone;
case SpudMan::ECancelContextCreate:
aFsm.ChangeStateToStopping();
EtelDriverCancel(aFsm);
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_6, "<<TPdpStateActivatingPrimary::Input()");
return KErrNone;
// no default
}
// default error handling
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_7, "<<TPdpStateActivatingPrimary::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}