--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingSecondary.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingSecondary.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,50 +20,40 @@
@internalComponent
*/
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatecreatingSecondaryTraces.h"
-#endif
-
#include <networking/umtsnifcontrolif.h>
#include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "PDPFSM.h"
#include "cpdpfsm.h"
TInt TPdpStateCreatingSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_1, ">>TPdpStateCreatingSecondary::Input()");
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+ SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingSecondary::Input()");
+ SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
switch (aOperation)
{
case PdpFsm::E2ryPdpContextCreated:
aFsm.ChangeStateToCreatedSecondary();
SpudManNotify(aFsm, KSecondaryContextCreated, KErrNone);
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_3, "<<TPdpStateCreatingSecondary::Input()");
return KErrNone;
case PdpFsm::E2ryPdpContextCreatedFailed:
iErrorCode = aErrorCode;
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_4, "<<TPdpStateCreatingSecondary::Input()");
return KErrNone;
case PdpFsm::EContextDeletedFailed:
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_5, "**** DELETE FAILURE ****");
+ SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
// fall through
case PdpFsm::EContextDeleted:
aFsm.ChangeStateToInitialised();
SpudManNotify(aFsm, KSecondaryContextCreated, iErrorCode);
iErrorCode = KErrNone;
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_6, "<<TPdpStateCreatingSecondary::Input()");
return KErrNone;
}
// default error handling
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_7, "<<TPdpStateCreatingSecondary::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}