diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp --- a/telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp Wed Sep 01 12:40:21 2010 +0100 @@ -1,4 +1,4 @@ -// 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" @@ -21,18 +21,12 @@ @file */ - - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "CSimVoiceCallTraces.h" -#endif - #include #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) @@ -69,7 +63,7 @@ * @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); @@ -91,17 +85,17 @@ 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; @@ -117,7 +111,7 @@ 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() @@ -286,7 +280,7 @@ * @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. @@ -298,14 +292,14 @@ if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_2, "<>CSimVoiceCall::DialCancel"); + LOGVOICE1(">>CSimVoiceCall::DialCancel"); switch(iState) { case RMobileCall::EStatusIdle: @@ -348,7 +342,7 @@ default: break; } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALCANCEL_2, "<>CSimVoiceCall::DialISV"); + LOGVOICE1(">>CSimVoiceCall::DialISV"); // Note: The telephone number and call parameters should be validated against config file // values here. @@ -374,14 +368,14 @@ if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_2, "<>CSimVoiceCall::DialISVCancel"); + LOGVOICE1(">>CSimVoiceCall::DialISVCancel"); switch(iState) { case RMobileCall::EStatusIdle: @@ -424,7 +418,7 @@ default: break; } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISVCANCEL_2, "<>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) @@ -449,7 +443,7 @@ if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_2, "<>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::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) @@ -520,7 +514,7 @@ if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_2, "<>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::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::HangUpCancel"); + LOGVOICE1(">>CSimVoiceCall::HangUpCancel"); switch(iState) { case RMobileCall::EStatusIdle: @@ -635,7 +629,7 @@ default: break; } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUPCANCEL_2, "<>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)); @@ -879,7 +873,7 @@ case ECallEventHangUp: { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_3, ">>CSimVoiceCall::ActionEvent = [ECallEventHangUp]"); + LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventHangUp]"); switch(iState) { case RMobileCall::EStatusDialling: @@ -904,7 +898,7 @@ 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) @@ -923,7 +917,7 @@ 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()); @@ -937,7 +931,7 @@ 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()); @@ -952,31 +946,31 @@ 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); @@ -988,7 +982,7 @@ } 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) @@ -996,7 +990,7 @@ 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) @@ -1021,10 +1015,10 @@ * 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::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::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, "<