--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateinitialised.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateinitialised.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,15 +20,9 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstateinitialisedTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 #include "cpdpfsmfactory.h"
@@ -37,8 +31,8 @@
 
 TInt TPdpStateInitialised::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_1, ">>TPdpStateInitialised::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateInitialised::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
@@ -56,7 +50,7 @@
 			aFsm.ChangeStateToCreatingPrimary();
 			EtelDriverInput (aFsm, EtelDriver::ECreate1ryPdpContext);
 			}
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_3, "<<TPdpStateInitialised::Input()");
+	
 		return KErrNone;
 	case SpudMan::ECreateSecondaryPDPContext:
 		aFsm.ChangeStateToCreatingSecondary();
@@ -64,7 +58,7 @@
 		aFsm.iContextType = SpudMan::ESecondary;
 
 		EtelDriverInput (aFsm, EtelDriver::ECreate2ryPdpContext);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_4, "<<TPdpStateInitialised::Input()");
+	
 		return KErrNone;
 		
 		
@@ -72,7 +66,6 @@
 		aFsm.ChangeStateToCreatingMbms();
 		aFsm.iContextType = SpudMan::EMbms;
 		EtelDriverInput (aFsm, EtelDriver::ECreateMbmsPdpContext);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_5, "<<TPdpStateInitialised::Input()");
 		return KErrNone;
 		
 	// these stop the default actions which aren't of value in the Initialised state, although we 
@@ -82,14 +75,12 @@
 	case PdpFsm::EContextStatusChangeNetwork:
 		if (aFsm.iContextStatus == RPacketContext::EStatusDeleted)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_6, "<<TPdpStateInitialised::Input()");
-		return KErrNone;
+			return KErrNone;
 		}
 		break;
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_7, "<<TPdpStateInitialised::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 
 }