--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingsecondary.cpp Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingsecondary.cpp Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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,16 +20,22 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstateactivatingsecondaryTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "cpdpfsm.h"
TInt TPdpStateActivatingSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
{
- SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingSecondary::Input()");
- SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_1, ">>TPdpStateActivatingSecondary::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
@@ -40,16 +46,19 @@
aFsm.ChangeStateToGettingNegQoS(); // Context was activated, but we don't necessarily have negotiated QoS yet;
// a TSY might wait for a successfull activation to report it to Etel.
SpudManNotify (aFsm, KContextActivateEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_3, "<<TPdpStateActivatingSecondary::Input()");
return KErrNone;
case PdpFsm::EPdpActivatedFailed:
- SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_4, "*** FAILURE ***");
aFsm.ChangeStateToCreatedSecondary();
SpudManNotify (aFsm, KContextActivateEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_5, "<<TPdpStateActivatingSecondary::Input()");
return KErrNone;
// no default
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_6, "<<TPdpStateActivatingSecondary::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}