MCL/sf/os/cellularsrv: comparison telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp

equal deleted inserted replaced

-:630d2f34d719
+:07a122eea281
-// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-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"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 /**
 @file
 */
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSimVoiceCallTraces.h"
-#endif
 #include <testconfigfileparser.h>
 #include "CSimVoiceCall.h"
 #include "CSimPhone.h"
 #include "CSimDtmf.h"
+#include "Simlog.h"
 #include "CSimTsyMode.h"
 CSimVoiceCall* CSimVoiceCall::NewL(CSimLine* aLine,const TDesC& aName, CSimPhone* aPhone)
 /**
 * Standard two phase constructor.
 * Retrieves all the pausing duration tags from the config file
 *
 * @param aName name of the voice call to be constructed
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_1, "Starting to parse Voice Call config parameters...");
+	LOGVOICE1("Starting to parse Voice Call config parameters...");
 	iCaps=Caps();
 	iDiallingPause=iLine->CfgFile()->ItemValue(KDiallingPauseDuration,KDefaultDiallingPauseDuration);
 	iConnectingPause=iLine->CfgFile()->ItemValue(KConnectingPauseDuration,KDefaultConnectingPauseDuration);
 	iDisconnectingPause=iLine->CfgFile()->ItemValue(KDisconnectingPauseDuration,KDefaultDisconnectingPauseDuration);
 	iAnswerIncomingPause=iLine->CfgFile()->ItemValue(KAnswerIncomingPauseDuration,KDefaultAnswerIncomingPauseDuration);
 	if (item)
 		{
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,delay);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAY returned %d (element no. %d) from tag %s.",ret,0,KNotifyRemotePartyInfo);
+			LOGPARSERR("delay",ret,0,&KNotifyRemotePartyInfo);
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,callingname);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CALLINGNAME returned %d (element no. %d) from tag %s.",ret,1,KNotifyRemotePartyInfo);
+			LOGPARSERR("callingname",ret,1,&KNotifyRemotePartyInfo);
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,remotenumber);
 		if(ret!=KErrNone)
 			{
-			OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element REMOTENUMBER returned %d (element no. %d) from tag %s.",ret,2,KNotifyRemotePartyInfo);
+			LOGPARSERR("remotenumber",ret,2,&KNotifyRemotePartyInfo);
 			}
 		iNotifyRemotePartyInfoTimer->iDelay = delay;
 		iNotifyRemotePartyInfoTimer->iRemotePartyInfoV1.iDirection = RMobileCall::EDirectionUnknown;
 		iNotifyRemotePartyInfoTimer->iRemotePartyInfoV1.iCallingName.Copy(callingname);
 	else
 		{
 		iNotifyRemotePartyInfoTimer->iRemotePartyInfoV1.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_5, "...Finished parsing Voice Call config parameters...");
+	LOGVOICE1("...Finished parsing Voice Call config parameters...");
 	}
 CSimVoiceCall::~CSimVoiceCall()
 /**
 * Destroy all the objects constructed.
 * @param aCallParams  the call parameters
 * @param aTelNumber The telephone number to dial
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_1, ">>CSimVoiceCall::Dial");
+	LOGVOICE1(">>CSimVoiceCall::Dial");
 	// Note: The telephone number and call parameters should be validated against config file
 	//       values here.
 	//see where the dial request has orignated from
 	if(aCallParams)
 		RCall::TCallParamsPckg* callparamsPckg=reinterpret_cast<RCall::TCallParamsPckg*>(const_cast<TDesC8*>(aCallParams));
 		RCall::TCallParams& callparams=(*callparamsPckg)();
 		if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_2, "<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
+			LOGVOICE1("<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
 			}
 		}
 	iDialRequestHandle=aTsyReqHandle;
 	TInt ret;
 	ret = ActionEvent(ECallEventDial,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_3, "<<CSimVoiceCall::Dial");
+	LOGVOICE1("<<CSimVoiceCall::Dial");
 	return ret;
 	}
 TInt CSimVoiceCall::DialCancel(const TTsyReqHandle /*aTsyReqHandle*/)
 /**
 *
 * @param aTsyReqHandle
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALCANCEL_1, ">>CSimVoiceCall::DialCancel");
+	LOGVOICE1(">>CSimVoiceCall::DialCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
 		SimPanic(EIllegalCancelRequest);		// A DialCancel should never reach the TSY in this state.
 		break;
 		break;
 	default:
 		break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALCANCEL_2, "<<CSimVoiceCall::DialCancel");
+	LOGVOICE1("<<CSimVoiceCall::DialCancel");
 	return KErrNone;
 	}
 TInt CSimVoiceCall::DialISV(const TTsyReqHandle aTsyReqHandle,const TDesC8* aCallParams,TDesC* /*aTelNumber*/)
 /**
 * @param aCallParams  the call parameters
 * @param aTelNumber The telephone number to dial
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_1, ">>CSimVoiceCall::DialISV");
+	LOGVOICE1(">>CSimVoiceCall::DialISV");
 	// Note: The telephone number and call parameters should be validated against config file
 	//       values here.
 	//see where the dial request has orignated from
 	if(aCallParams)
 		RCall::TCallParamsPckg* callparamsPckg=reinterpret_cast<RCall::TCallParamsPckg*>(const_cast<TDesC8*>(aCallParams));
 		RCall::TCallParams& callparams=(*callparamsPckg)();
 		if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_2, "<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
+			LOGVOICE1("<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
 			}
 		}
 	iDialRequestHandle=aTsyReqHandle;
 	TInt ret;
 	ret = ActionEvent(ECallEventDial,KErrNone);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_3, "<<CSimVoiceCall::DialISV");
+	LOGVOICE1("<<CSimVoiceCall::DialISV");
 	return ret;
 	}
 TInt CSimVoiceCall::DialISVCancel(const TTsyReqHandle /*aTsyReqHandle*/)
 /**
 *
 * @param aTsyReqHandle
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISVCANCEL_1, ">>CSimVoiceCall::DialISVCancel");
+	LOGVOICE1(">>CSimVoiceCall::DialISVCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
 		SimPanic(EIllegalCancelRequest);		// A DialCancel should never reach the TSY in this state.
 		break;
 		break;
 	default:
 		break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISVCANCEL_2, "<<CSimVoiceCall::DialISVCancel");
+	LOGVOICE1("<<CSimVoiceCall::DialISVCancel");
 	return KErrNone;
 	}
 TInt CSimVoiceCall::AnswerIncomingCall(const TTsyReqHandle aTsyReqHandle,const TDesC8* aCallParams)
 /**
 * @param aTsyReqHandle
 * @param aCallParams  the call parameters
 * @return KErrNone
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_1, ">>CSimVoiceCall::AnswerIncomingCall  0x%08x, state %d entry ",(TUint)this,iState);
+	LOGVOICE3(">>CSimVoiceCall::AnswerIncomingCall  0x%08x, state %d entry ",this,iState);
 	//see where the answer request has orignated from
 	if(aCallParams)
 		{
 		RCall::TCallParamsPckg* callparamsPckg=reinterpret_cast<RCall::TCallParamsPckg*>(const_cast<TDesC8*>(aCallParams));
 		RCall::TCallParams& callparams=(*callparamsPckg)();
 		if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_2, "<<CSimVoiceCall::AnswerIncomingCall request from Etel 3rd Party client.");
+			LOGVOICE1("<<CSimVoiceCall::AnswerIncomingCall request from Etel 3rd Party client.");
 			}
 		}
 	TInt ret=iLine->SetAutoAnswerCallObject(this);
 	if(ret!=KErrNone)
 			}
 		if(ret==KErrNone)
 			ret = ActionEvent(ECallEventAnswerIncoming,KErrNone);
 		}
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_3, "<<CSimVoiceCall::AnswerIncomingCall  0x%08x, state %d exit",(TUint)this,iState);
+	LOGVOICE3("<<CSimVoiceCall::AnswerIncomingCall  0x%08x, state %d exit",this,iState);
 	return ret;
 	}
 TInt CSimVoiceCall::AnswerIncomingCallCancel(const TTsyReqHandle /*aTsyReqHandle*/)
 /**
 *
 * @param aTsyReqHandle
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_1, ">>CSimVoiceCall::AnswerIncomingCallCancel");
+	LOGVOICE1(">>CSimVoiceCall::AnswerIncomingCallCancel");
 	if(iAnswerIncomingCall.iNotifyPending)
 		{
 		iAnswerIncomingCall.iNotifyPending=EFalse;
 		iLine->ResetAutoAnswerCallObject(this);
 		ReqCompleted(iAnswerIncomingCall.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_2, "<<CSimVoiceCall::AnswerIncomingCallCancel");
+	LOGVOICE1("<<CSimVoiceCall::AnswerIncomingCallCancel");
 	return KErrNone;
 	}
 TInt CSimVoiceCall::AnswerIncomingCallISVL(const TTsyReqHandle aTsyReqHandle,const TDesC8* aCallParams)
 /**
 * @param aTsyReqHandle
 * @param aCallParams  the call parameters
 * @return KErrNone
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_1, ">>CSimVoiceCall::AnswerIncomingCallISV  0x%08x, state %d entry ",(TUint)this,iState);
+	LOGVOICE3(">>CSimVoiceCall::AnswerIncomingCallISV  0x%08x, state %d entry ",this,iState);
 	//see where the answer request has orignated from
 	if(aCallParams)
 		{
 		RCall::TCallParamsPckg* callparamsPckg=reinterpret_cast<RCall::TCallParamsPckg*>(const_cast<TDesC8*>(aCallParams));
 		RCall::TCallParams& callparams=(*callparamsPckg)();
 		if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1)
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_2, "<<CSimVoiceCall::AnswerIncomingCallISV request from Etel 3rd Party client.");
+			LOGVOICE1("<<CSimVoiceCall::AnswerIncomingCallISV request from Etel 3rd Party client.");
 			}
 		}
 	TInt ret=iLine->SetAutoAnswerCallObject(this);
 	if(ret!=KErrNone)
 			if (ret == KErrNone)
 {
 				ret = ActionEvent(ECallEventAnswerIncoming,KErrNone);
 	 		    }
 		}
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_3, "<<CSimVoiceCall::AnswerIncomingCallISV  0x%08x, state %d exit",(TUint)this,iState);
+	LOGVOICE3("<<CSimVoiceCall::AnswerIncomingCallISV  0x%08x, state %d exit",this,iState);
 	return ret;
 	}
 TInt CSimVoiceCall::AnswerIncomingCallISVCancel(const TTsyReqHandle /*aTsyReqHandle*/)
 /**
 *
 * @param aTsyReqHandle
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_1, ">>CSimVoiceCall::AnswerIncomingCallISVCancel");
+	LOGVOICE1(">>CSimVoiceCall::AnswerIncomingCallISVCancel");
 	if(iAnswerIncomingCall.iNotifyPending)
 		{
 		iAnswerIncomingCall.iNotifyPending=EFalse;
 		iLine->ResetAutoAnswerCallObject(this);
 		ReqCompleted(iAnswerIncomingCall.iNotifyHandle,KErrCancel);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_2, "<<CSimVoiceCall::AnswerIncomingCallISVCancel");
+	LOGVOICE1("<<CSimVoiceCall::AnswerIncomingCallISVCancel");
 	return KErrNone;
 	}
 TInt CSimVoiceCall::Connect(const TTsyReqHandle aTsyReqHandle,const TDesC8* /*aCallParams*/)
 	{
 *
 * @param aTsyReqHandle
 * @return KErrNone
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUP_1, ">>CSimVoiceCall::HangUp");
+	LOGVOICE1(">>CSimVoiceCall::HangUp");
 	iHangUpRequestHandle=aTsyReqHandle;
 	TInt ret=ActionEvent(ECallEventHangUp,KErrNone);
 	if(ret!=KErrNone)
 		ReqCompleted(aTsyReqHandle,ret);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUP_2, "<<CSimVoiceCall::HangUp");
+	LOGVOICE1("<<CSimVoiceCall::HangUp");
 	return KErrNone;
 	}
 TInt CSimVoiceCall::HangUpCancel(const TTsyReqHandle /*aTsyReqHandle*/)
 /**
 *
 * @param aTsyReqHandle
 * @return KErrNone if successfully cancelled
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUPCANCEL_1, ">>CSimVoiceCall::HangUpCancel");
+	LOGVOICE1(">>CSimVoiceCall::HangUpCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
 		SimPanic(EIllegalCancelRequest);		// A DialCancel should never reach the TSY in this state.
 		break;
 		break;
 	default:
 		break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUPCANCEL_2, "<<CSimVoiceCall::HangUpCancel");
+	LOGVOICE1("<<CSimVoiceCall::HangUpCancel");
 	return KErrNone;
 	}
 TInt CSimVoiceCall::RelinquishOwnership()
 	{
 */
 	{
 	TInt ret=KErrNone;
 	__ASSERT_ALWAYS(iState!=RMobileCall::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal));
 	__ASSERT_ALWAYS(aEvent!=ECallEventNtRasConnected,SimPanic(ECallEventIllegal));
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_1, ">>CSimVoiceCall::ActionEvent 0x%08x %d",(TUint)this,iState);
+	LOGVOICE3(">>CSimVoiceCall::ActionEvent 0x%08x %d",this,iState);
 	switch(aEvent)
 		{
 	case ECallEventDial:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_2, ">>CSimVoiceCall::ActionEvent = [ECallEventDial]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventDial]");
 		if(iState==RMobileCall::EStatusIdle)
 			{
 			TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusDialling,EFalse,EFalse));
 			if(ret==KErrNone)
 				iTimer->Start(iDiallingPause,this);
 			return KErrEtelCallAlreadyActive;
 		break;
 	case ECallEventHangUp:
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_3, ">>CSimVoiceCall::ActionEvent = [ECallEventHangUp]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventHangUp]");
 		switch(iState)
 			{
 		case RMobileCall::EStatusDialling:
 		case RMobileCall::EStatusRinging:
 		case RMobileCall::EStatusAnswering:
 			}
 		}
 		break;
 	case ECallEventIncomingCall:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_4, ">>CSimVoiceCall::ActionEvent = [ECallEventIncomingCall]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventIncomingCall]");
 		if(iState==RMobileCall::EStatusIdle)
 			{
 			if(iAnswerIncomingCall.iNotifyPending)
 				{
 				TRAP(ret,	 ret=ProcessAnswerIncomingCallL());
 		else
 			return KErrEtelCallAlreadyActive;
 		break;
 	case ECallEventAnswerIncoming:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_5, ">>CSimVoiceCall::ActionEvent = [ECallEventAnswerIncoming]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventAnswerIncoming]");
 		if(iState==RMobileCall::EStatusRinging)
 			{
 			TRAP(ret, ret=ProcessAnswerIncomingCallL());
 			if(ret!=KErrNone)
 				{
 		else
 			SimPanic(EIllegalStateInconsistancy);		// This is checked before calling ActionEvent
 		break;
 	case ECallEventRemoteHangup:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_6, ">>CSimVoiceCall::ActionEvent = [ECallEventRemoteHangup]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventRemoteHangup]");
 		if(iState==RMobileCall::EStatusConnected)
 			{
 			TRAP(ret, ret=ProcessRemoteHangupL());
 			if(ret!=KErrNone)
 				{
 			SimPanic(EIllegalStateInconsistancy);		// This is checked before calling ActionEvent
 		break;
 	case ECallEventTimeOut:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_7, ">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]");
+			LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]");
 			switch(iState)
 				{
 			case RMobileCall::EStatusDialling:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_8, ">>CSimVoiceCall::State = [EStatusDialling]");
+				LOGVOICE1(">>CSimVoiceCall::State = [EStatusDialling]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnecting,EFalse,EFalse));
 				if(ret==KErrNone)
 					iTimer->Start(iConnectingPause,this);
 				return ret;
 			case RMobileCall::EStatusConnecting:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_9, ">>CSimVoiceCall::State = [EStatusConnecting]");
+				LOGVOICE1(">>CSimVoiceCall::State = [EStatusConnecting]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,EFalse,EFalse));
 				UpdateRemotePartyInfoDirection(RMobileCall::EStatusConnecting);
 				ReqCompleted(iDialRequestHandle,ret);
 				return ret;
 			case RMobileCall::EStatusDisconnecting:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_10, ">>CSimVoiceCall::State = [EStatusDisconnecting]");
+				LOGVOICE1(">>CSimVoiceCall::State = [EStatusDisconnecting]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusIdle,EFalse,EFalse));
 				ReqCompleted(iHangUpRequestHandle,ret);
 				return ret;
 			case RMobileCall::EStatusAnswering:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_11, ">>CSimVoiceCall::State = [EStatusAnswering]");
+				LOGVOICE1(">>CSimVoiceCall::State = [EStatusAnswering]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,EFalse,EFalse));
 				UpdateRemotePartyInfoDirection(RMobileCall::EStatusAnswering);
 				ReqCompleted(iAnswerIncomingCall.iNotifyHandle,ret);
 				return ret;
 				break;
 				}
 			}
 		break;
 	case ECallEventHold:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_12, ">>CSimVoiceCall::ActionEvent = [ECallEventHold]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventHold]");
 		__ASSERT_ALWAYS(iState==RMobileCall::EStatusConnected,SimPanic(EIllegalStateInconsistancy));
 		TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusHold,aOtherArgument == ECallEventSwap,EFalse));
 		if (ret == KErrNone)
 			ReqCompleted(iHoldResumeRequestHandle,ret);
 		break;
 	case ECallEventResume:
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_13, ">>CSimVoiceCall::ActionEvent = [ECallEventResume]");
+		LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventResume]");
 		__ASSERT_ALWAYS(iState==RMobileCall::EStatusHold,SimPanic(EIllegalStateInconsistancy));
 		TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,aOtherArgument == ECallEventSwap,EFalse));
 		if (ret == KErrNone)
 			ReqCompleted(iHoldResumeRequestHandle,ret);
 		break;
 /**
 * Timer callback function.  When the timer goes off, it will call back into this
 * function for further processing.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_TIMERCALLBACK_1, ">>CSimVoiceCall::TimerCallBack");
+	LOGVOICE1(">>CSimVoiceCall::TimerCallBack");
 	TInt ret=ActionEvent(ECallEventTimeOut,KErrNone);
 	__ASSERT_ALWAYS(ret==KErrNone,SimPanic(ETimeOutEventActionFailed));
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_TIMERCALLBACK_2, "<<CSimVoiceCall::TimerCallBack");
+	LOGVOICE1("<<CSimVoiceCall::TimerCallBack");
 	}
 TInt CSimVoiceCall::ProcessAnswerIncomingCallL()
 /**
 * Answers an Incoming Call.
 * First the call state must be changed to "answering", then the flag indicating
 * that an answer incoming call request is no longer pending.  Finally, a new
 * call object must be assigned to receive the details of the next incoming call.
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_1, ">>CSimVoiceCall::ProcessAnswerIncomingCall %d , 0x%08x",iState,(TUint)this);
+	LOGVOICE3(">>CSimVoiceCall::ProcessAnswerIncomingCall %d",iState,this);
 	TInt ret=ChangeStateL(RMobileCall::EStatusAnswering,EFalse,EFalse);
 	if(ret!=KErrNone)
 		return ret;
 	iTimer->Start(iAnswerIncomingPause,this);
 	iAnswerIncomingCall.iNotifyPending=EFalse;
 	iLine->ResetAutoAnswerCallObject(this);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_2, "<<CSimVoiceCall::ProcessAnswerIncomingCall");
+	LOGVOICE1("<<CSimVoiceCall::ProcessAnswerIncomingCall");
 	return ret;
 	}
 TInt CSimVoiceCall::ProcessRemoteHangupL()
 /**
 * First the call state must be changed to "disconnecting", then the flag indicating
 * that a remote hangup request is no longer pending.  Finally, a new
 * call object must be assigned to receive the next remote hangup request.
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSREMOTEHANGUPL_1, ">>CSimVoiceCall::ProcessRemoteHangupL %d, 0x%08x",iState,(TUint)this);
+	LOGVOICE3(">>CSimVoiceCall::ProcessRemoteHangupL %d",iState,this);
 	TInt ret=ChangeStateL(RMobileCall::EStatusDisconnecting,EFalse,EFalse);
 	if(ret!=KErrNone)
 		return ret;
 	iTimer->Start(iRemoteHangupPause,this);
 	iLine->ResetRemoteHangupCallObject(this);
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSREMOTEHANGUPL_2, "<<CSimVoiceCall::ProcessRemoteHangupL");
+	LOGVOICE1("<<CSimVoiceCall::ProcessRemoteHangupL");
 	return ret;
 	}
 void CSimVoiceCall::SetDtmfSession(CSimDtmf* aSimDtmf)
 /**

branch	RCL_3
changeset 20	07a122eea281
parent 19	630d2f34d719