diff -r 630d2f34d719 -r 07a122eea281 telephonyprotocols/pdplayer/umts/spudtel/src/reteldriverinput.cpp
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/reteldriverinput.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/reteldriverinput.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,19 +20,13 @@
  @internalComponent
 */
 
-
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "reteldriverinputTraces.h"
-#endif
-
 #include <e32def.h>
 #include <e32std.h>
 
 #include "ceteldriverfactory.h"
 #include "ceteldrivercontext.h"
 #include "reteldriverinput.h"
+#include "spudteldebuglogger.h"
 
 using namespace EtelDriver;
 
@@ -44,7 +38,7 @@
 
 REtelDriverInput::~REtelDriverInput()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_DTOR_1, "REtelDriverInput::~REtelDriverInput()");
+	SPUDTEL_FNLOG("REtelDriverInput::~REtelDriverInput()");
 	
 	if (iDriverFactory)
 	   {
@@ -59,7 +53,7 @@
 */
 void REtelDriverInput::OpenL (CPdpFsmInterface& aPdpFsmInterface)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_OPENL_1, "REtelDriverInput::OpenL()");
+	SPUDTEL_FNLOG("REtelDriverInput::OpenL()");
 
 	// internal check
 	iDriverFactory = CEtelDriverFactory::NewL(aPdpFsmInterface);
@@ -74,7 +68,7 @@
 */
 void REtelDriverInput::Close()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CLOSE_1, "REtelDriverInput::Close()");
+	SPUDTEL_FNLOG("REtelDriverInput::Close()");
 	
 	// cancel all outstanding requests
 	if (iDriverFactory)
@@ -95,8 +89,8 @@
 */
 void REtelDriverInput::CreatePdpL (TContextId aPdpId,SpudMan::TPdpContextType aContextType)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CREATEPDPL_1, "REtelDriverInput::CreatePdpL()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CREATEPDPL_2, "pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("REtelDriverInput::CreatePdpL()");
+	SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
 	
 	ASSERT(iDriverFactory);
 	iDriverFactory->CreatePdpL (aPdpId,aContextType );
@@ -108,8 +102,8 @@
 */
 void REtelDriverInput::DeletePdp (TContextId aPdpId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_DELETEPDP_1, "REtelDriverInput::DeletePdp()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_DELETEPDP_2, "pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("REtelDriverInput::DeletePdp()");
+	SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
 	
 	if(iDriverFactory)
     	{
@@ -124,8 +118,8 @@
 */
 void REtelDriverInput::Input(TContextId aPdpId, TEtelInput aOperation)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_INPUT_1, "REtelDriverInput::Input()");
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_INPUT_2, "REtelDriverInput::Input: pdp id : %d, operation %d", aPdpId, aOperation);
+	SPUDTEL_FNLOG("REtelDriverInput::Input()");
+	SPUDTEL_INFO_LOG2(_L("REtelDriverInput::Input: pdp id : %d, operation %d"), aPdpId, aOperation);
 	ASSERT(iDriverFactory);
 	
 	iDriverFactory->Context(aPdpId).Input(aOperation);
@@ -137,8 +131,8 @@
 */
 void REtelDriverInput::CancelPdp (TContextId aPdpId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDP_1, "REtelDriverInput::CancelPdp()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDP_2, "REtelDriverInput::CancelPdp: pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("REtelDriverInput::CancelPdp()");
+	SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdp: pdp id : %d"), aPdpId);
 	ASSERT(iDriverFactory);
 	
 	iDriverFactory->Context(aPdpId).Cancel();
@@ -150,7 +144,7 @@
 */
 void REtelDriverInput::StartPdpNotifications(TContextId aPdpId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_STARTPDPNOTIFICATIONS_1, "REtelDriverInput::StartPdpNotifications()");
+	SPUDTEL_FNLOG("REtelDriverInput::StartPdpNotifications()");
 	ASSERT(iDriverFactory);
 
 	iDriverFactory->StartPdpNotifications(aPdpId);
@@ -162,8 +156,8 @@
 */
 void REtelDriverInput::CancelPdpNotifications (TContextId aPdpId)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_1, "REtelDriverInput::CancelPdpNotifications()");
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_2, "REtelDriverInput::CancelPdpNotifications: pdp id : %d", aPdpId);
+	SPUDTEL_FNLOG("REtelDriverInput::CancelPdpNotifications()");
+	SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdpNotifications: pdp id : %d"), aPdpId);
 	ASSERT(iDriverFactory);
 
 	iDriverFactory->CancelPdpNotifications (aPdpId);
@@ -172,7 +166,7 @@
 /** cancels last operations for all created pdp contexts */
 void REtelDriverInput::CancelAllPdps ()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELALLPDPS_1, "REtelDriverInput::CancelAllPdps()");
+	SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdps()");
 	ASSERT(iDriverFactory);
 	
 	for(TContextId i = 0; i < static_cast<TContextId>(iDriverFactory->ContextCount()); i++)
@@ -187,7 +181,7 @@
 /** cancels all notifications for all pdp contexts */
 void REtelDriverInput::CancelAllPdpNotifications ()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELALLPDPNOTIFICATIONS_1, "REtelDriverInput::CancelAllPdpNotifications()");
+	SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdpNotifications()");
 	ASSERT(iDriverFactory);
 
 	iDriverFactory->CancelAllPdpNotifications();