diff -r 630d2f34d719 -r 07a122eea281 telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingprimary.cpp
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingprimary.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingprimary.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,47 +20,37 @@
  @internalComponent
 */
  
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "tpdpstatecreatingprimaryTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsm.h"
 #include "PDPFSM.h"
 
 TInt TPdpStateCreatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_1, ">>TPdpStateCreatingPrimary::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingPrimary::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
 	case PdpFsm::E1ryPdpContextCreated:
 		aFsm.ChangeStateToActivatingPrimary();
 		EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_3, "<<TPdpStateCreatingPrimary::Input()");
 		return KErrNone;
 	case PdpFsm::E1ryPdpContextCreatedFailed: 
 		aFsm.ChangeStateToInitialised();
 		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); // or is it KContextActivateEvent?
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_5, "<<TPdpStateCreatingPrimary::Input()");
 		return KErrNone;
    case SpudMan::ECancelContextCreate:
 		aFsm.ChangeStateToStopping();
 		EtelDriverCancel(aFsm);
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_6, "<<TPdpStateCreatingPrimary::Input()");
 		return KErrNone;
 	}
 
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_7, "<<TPdpStateCreatingPrimary::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }