--- a/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldriverfactory.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldriverfactory.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,18 +20,12 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "ceteldriverfactoryTraces.h"
-#endif
-
 #include <e32base.h>
 #include <etelmm.h>
 
 #include "cspudcontextelem.h"
 #include "ceteldriverfactory.h"
+#include "spudteldebuglogger.h"
 #include "PDPFSM.h"
 using namespace EtelDriver;
 
@@ -42,7 +36,7 @@
 : iPdpFsmInterface(aPdpFsmInterface),
   iServiceChangeNotifier(iPacketService, iPdpFsmInterface)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG,TRACE_INTERNALS, CETELDRIVERFACTORY_CTOR_1, "CEtelDriverFactory::CEtelDriverFactory()");
+	SPUDTELVERBOSE_INFO_LOG(_L("CEtelDriverFactory::CEtelDriverFactory()"));
 	}
 
 /**
@@ -50,15 +44,15 @@
 */
 CEtelDriverFactory* CEtelDriverFactory::NewL (CPdpFsmInterface& aPdpFsmInterface)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_NEWL_1, "CEtelDriverFactory::NewL()");
+	SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::NewL()"));
 	
 	return new (ELeave) CEtelDriverFactory (aPdpFsmInterface);
 	}
 
 CEtelDriverFactory::~CEtelDriverFactory()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_DTOR_1, "CEtelDriverFactory::~CEtelDriverFactory()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_DTOR_2, "CEtelDriverFactory::~CEtelDriverFactory()");
+	SPUDTEL_FNLOG("CEtelDriverFactory::~CEtelDriverFactory()");
+	SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::~CEtelDriverFactory()"));
 
 	// cancel all notificators
 	iServiceChangeNotifier.Cancel();
@@ -97,7 +91,7 @@
 	{
 	// dev. note: leavescan reports an error in this method.
 	// But there is no visible ground for it.
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, GETPHONEINFOL_1, "GetPhoneInfoL()");
+	SPUDTEL_FNLOG("GetPhoneInfoL()");
 	TInt count;
 	User::LeaveIfError(aTelServer.EnumeratePhones(count));
 	if (count<=0)
@@ -134,8 +128,8 @@
 /** initializes factory objects */
 void CEtelDriverFactory::InitL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_INITL_1, "CEtelDriverFactory::InitL()");
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_INITL_2, "Initializing Etel driver");
+	SPUDTEL_FNLOG("CEtelDriverFactory::InitL()");
+	SPUDTEL_INFO_LOG(_L("Initializing Etel driver"));
 	
 	iStrategies[EOpenPhoneStrategy] 			= &iOpenStrategy;
 	iStrategies[ESetQoSStrategy] 				= &iSetQoSStrategy;
@@ -188,8 +182,8 @@
 */
 void CEtelDriverFactory::CreatePdpL (TContextId aPdpId,SpudMan::TPdpContextType aContextType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CREATEPDPL_1, "CEtelDriverFactory::CreatePdpL()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CREATEPDPL_2, "pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("CEtelDriverFactory::CreatePdpL()");
+	SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
 	__ASSERT_ALWAYS((NULL == iContexts[aPdpId]), User::Panic(KTxtSpudTel, KErrArgument));
 
 	if (aContextType == SpudMan::EMbms)
@@ -210,7 +204,7 @@
 void CEtelDriverFactory::FreePdp(TContextId aPdpId)
 	{
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_FREEPDP_1, "Free pdp id : %d", aPdpId);
+	SPUDTELVERBOSE_INFO_LOG1(_L("Free pdp id : %d"), aPdpId);
     // In an OOM situation, this object may be cleaned up prior to establishment. 
     if (iContexts[aPdpId] != NULL) 
         { 
@@ -228,7 +222,7 @@
 */
 void CEtelDriverFactory::StartPdpNotifications (TContextId aPdpId)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_STARTPDPNOTIFICATIONS_1, "StartPdpNotifications for pdp id : %d", aPdpId);
+	SPUDTELVERBOSE_INFO_LOG1(_L("StartPdpNotifications for pdp id : %d"), aPdpId);
 	// sanity check
 	ASSERT(iContexts[aPdpId]);
 	
@@ -241,7 +235,7 @@
 */
 void CEtelDriverFactory::CancelPdpNotifications (TContextId aPdpId)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CANCELPDPNOTIFICATIONS_1, "CancelPdpNotifications for pdp id : %d", aPdpId);
+	SPUDTELVERBOSE_INFO_LOG1(_L("CancelPdpNotifications for pdp id : %d"), aPdpId);
 	// sanity check
 	ASSERT(iContexts[aPdpId]);
 	
@@ -251,7 +245,7 @@
 /** cancels notifications for all pdp contexts */
 void CEtelDriverFactory::CancelAllPdpNotifications()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CANCELALLPDPNOTIFICATIONS_1, "CancelAllPdpNotifications");
+	SPUDTEL_INFO_LOG(_L("CancelAllPdpNotifications"));
 	for(TContextId i = 0; i < static_cast<TContextId>(ContextCount()); i++)
 		{ 
 		CancelPdpNotifications (i);