--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopeningphone.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopeningphone.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 "tpdpstateopeningphoneTraces.h"
-#endif
-
 #include <networking/umtsnifcontrolif.h>
 #include "tpdpstates.h"
+#include "spudfsmdebuglogger.h"
 #include "pdpfsmnmspace.h"
 #include "cpdpfsmfactory.h"
 #include "cpdpfsm.h"
@@ -36,8 +30,8 @@
 
 TInt TPdpStateOpeningPhone::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
 {
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_1, ">>TPdpStateOpeningPhone::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
+	SPUDFSMVERBOSE_FNLOG("TPdpStateOpeningPhone::Input()");
+	SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
 
 	switch (aOperation)
 	{
@@ -46,24 +40,20 @@
 		aFsm.ChangeStateToCreatingPrimary();
 		iPdpFsmFactory->iEtelOpened = ETrue;		
 		EtelDriverInput(aFsm, EtelDriver::ECreate1ryPdpContext);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_3, "<<TPdpStateOpeningPhone::Input()");
 		return KErrNone;
 	case PdpFsm::EPhoneOpenedFailed:
 		aFsm.ChangeStateToInitialised();
 		iPdpFsmFactory->iEtelOpened = EFalse;		
 		SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_4, "<<TPdpStateOpeningPhone::Input()");
 		return KErrNone;
   case SpudMan::ECancelContextCreate:
 		aFsm.ChangeStateToStopping();
 		EtelDriverCancel(aFsm);
 		EtelDriverInput(aFsm, EtelDriver::EContextDelete);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_5, "<<TPdpStateOpeningPhone::Input()");
 		return KErrNone;
 	}
 	
 	// default error handling
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_6, "<<TPdpStateOpeningPhone::Input()");
 	return TPdpState::Input(aFsm, aOperation, aErrorCode);
 }