diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simtsy/src/CSimLine.cpp --- a/telephonyserverplugins/simtsy/src/CSimLine.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyserverplugins/simtsy/src/CSimLine.cpp Wed Sep 01 12:40:21 2010 +0100 @@ -1,5 +1,5 @@ -// 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,17 +21,11 @@ @file */ - - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "CSimLineTraces.h" -#endif - #include #include "CSimLine.h" #include "CSimPhone.h" #include "CSimCall.h" +#include "Simlog.h" #include "CSimPubSub.h" void CSimLine::CloseLine(TAny* aObj) @@ -61,7 +55,7 @@ * @param aName name of the Line to be created. */ { - OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CONSTRUCTL_1, ">>CSimLine::ConstructL [aLineName=%S]", aName); + LOGLINE2(">>CSimLine::ConstructL [aLineName=%S]", &aName); iLineName = aName; iSimPubSubIC = CSimPubSub::NewL(this,iICProperty); iSimPubSubIC->Start(); @@ -72,7 +66,7 @@ iNotifyIncomingCallPause=this->CfgFile()->ItemValue(KNotifyIncomingCallPauseDuration,KDefaultNotifyIncomingCallPauseDuration); iTimer = CSimTimer::NewL(iPhone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CONSTRUCTL_2, "<>CSimLine::NotifyIncomingCall"); + LOGLINE1(">>CSimLine::NotifyIncomingCall"); iNotifyIncomingCall.iNotifyPending=ETrue; iNotifyIncomingCall.iNotifyHandle=aTsyReqHandle; iNotifyIncomingCall.iNotifyData=(TAny*)aName; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALL_2, "<>CSimLine::NotifyIncomingCallCancel"); + LOGLINE1(">>CSimLine::NotifyIncomingCallCancel"); if(iNotifyIncomingCall.iNotifyPending) { iTimer->Cancel(); iNotifyIncomingCall.iNotifyPending=EFalse; ReqCompleted(iNotifyIncomingCall.iNotifyHandle, KErrCancel); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALLCANCEL_2, "<>CSimLine::NotifyHookChange"); + LOGLINE1(">>CSimLine::NotifyHookChange"); iNotifyHookChange.iNotifyPending=ETrue; iNotifyHookChange.iNotifyHandle=aTsyReqHandle; iNotifyHookChange.iNotifyData=(TAny*)aHookStatus; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGE_2, "<>CSimLine::NotifyHookChangeCancel"); + LOGLINE1(">>CSimLine::NotifyHookChangeCancel"); if(iNotifyHookChange.iNotifyPending) { iNotifyHookChange.iNotifyPending=EFalse; ReqCompleted(iNotifyHookChange.iNotifyHandle,KErrCancel); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGECANCEL_2, "<>CSimLine::NotifyMobileLineStatusChange"); + LOGLINE1(">>CSimLine::NotifyMobileLineStatusChange"); iNotifyMobileStatusChange.iNotifyPending=ETrue; iNotifyMobileStatusChange.iNotifyHandle=aTsyReqHandle; iNotifyMobileStatusChange.iNotifyData=aStatus; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_2, "<>CSimLine::NotifyMobileLineStatusChangeCancel"); + LOGLINE1(">>CSimLine::NotifyMobileLineStatusChangeCancel"); if(iNotifyMobileStatusChange.iNotifyPending) { iNotifyMobileStatusChange.iNotifyPending=EFalse; ReqCompleted(iNotifyMobileStatusChange.iNotifyHandle,KErrCancel); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_2, "<>CSimLine::NotifyStatusChange"); + LOGLINE1(">>CSimLine::NotifyStatusChange"); iNotifyStatusChange.iNotifyPending=ETrue; iNotifyStatusChange.iNotifyHandle=aTsyReqHandle; iNotifyStatusChange.iNotifyData=aStatus; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGE_2, "<>CSimLine::NotifyStatusChangeCancel"); + LOGLINE1(">>CSimLine::NotifyStatusChangeCancel"); if(iNotifyStatusChange.iNotifyPending) { iNotifyStatusChange.iNotifyPending=EFalse; ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrCancel); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGECANCEL_2, "<>CSimLine::NotifyCallAdded"); + LOGLINE1(">>CSimLine::NotifyCallAdded"); iNotifyCallAdded.iNotifyPending=ETrue; iNotifyCallAdded.iNotifyHandle=aTsyReqHandle; iNotifyCallAdded.iNotifyData=(TAny*)aName; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDED_2, "<>CSimLine::NotifyCallAddedCancel"); + LOGLINE1(">>CSimLine::NotifyCallAddedCancel"); if(iNotifyCallAdded.iNotifyPending) { iNotifyCallAdded.iNotifyPending=EFalse; ReqCompleted(iNotifyCallAdded.iNotifyHandle,KErrCancel); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDEDCANCEL_2, "<>CSimLine::HandleNewCallAddedNotification"); + LOGLINE1(">>CSimLine::HandleNewCallAddedNotification"); iNameOfLastCallAdded.Copy(aNewName); if(iNotifyCallAdded.iNotifyPending) { @@ -395,7 +389,7 @@ ((TName*)iNotifyCallAdded.iNotifyData)->Copy(aNewName); ReqCompleted(iNotifyCallAdded.iNotifyHandle,KErrNone); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_2, "<>CSimLine::GetInfo"); + LOGLINE1(">>CSimLine::GetInfo"); aLineInfo->iHookStatus=iHookState; aLineInfo->iStatus=(RCall::TStatus)iState; aLineInfo->iNameOfLastCallAdded.Copy(iNameOfLastCallAdded); @@ -465,7 +459,7 @@ aLineInfo->iNameOfCallForAnswering.Zero(); ReqCompleted(aTsyReqHandle,KErrNone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETINFO_2, "<>CSimLine::GetStatus"); + LOGLINE1(">>CSimLine::GetStatus"); *aLineStatus=GetCoreLineStatus(); ReqCompleted(aTsyReqHandle,KErrNone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETSTATUS_2, "<>CSimLine::GetMobileLineStatus"); + LOGLINE1(">>CSimLine::GetMobileLineStatus"); *aLineStatus=iState; ReqCompleted(aTsyReqHandle,KErrNone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETMOBILELINESTATUS_2, "<>CSimLine::GetHookStatus"); + LOGLINE1(">>CSimLine::GetHookStatus"); *aHookStatus=iHookState; ReqCompleted(aTsyReqHandle,KErrNone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETHOOKSTATUS_2, "<>CSimLine::CfgFile"); + LOGLINE1(">>CSimLine::CfgFile"); return iPhone->CfgFile(); } @@ -579,7 +573,7 @@ TInt count=iCalls->Count(); for(i=0;i>CSimLine::ChangeState0 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); + LOGLINE3(">>CSimLine::ChangeState0 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); } TInt ret=KErrGeneral; @@ -599,7 +593,7 @@ if(ret!=KErrNone && !(aSwap && iState==RMobileCall::EStatusConnected && aNewState==RMobileCall::EStatusConnected)) return ret; - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_2, ">>CSimLine::ChangeState 0x%08x",aOriginatingCall); + LOGLINE2(">>CSimLine::ChangeState 0x%08x",aOriginatingCall); if(aNewState==RMobileCall::EStatusIdle) { if(iState==RMobileCall::EStatusIdle) @@ -610,7 +604,7 @@ TInt count=iCalls->Count(); for(i=0;i>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); + LOGLINE3(">>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); if(aOriginatingCall!=iCalls->At(i) && iCalls->At(i)->iState != RMobileCall::EStatusIdle) { @@ -633,7 +627,7 @@ TInt count=iCalls->Count(); for(i=0;i>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); + LOGLINE3(">>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); if(iCalls->At(i) != aOriginatingCall && iCalls->At(i)->iState == RMobileCall::EStatusHold) { if(aSwap) @@ -653,7 +647,7 @@ TInt count=iCalls->Count(); for(i=0;i>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); + LOGLINE3(">>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); if(iCalls->At(i) != aOriginatingCall) { if(iCalls->At(i)->iState == RMobileCall::EStatusConnected) @@ -675,7 +669,7 @@ } // Actually change the state. - OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_6, ">>CSimLine::ChangeState [oldState=%d] [newState=%d]", iState, aNewState); + LOGLINE3(">>CSimLine::ChangeState [oldState=%d] [newState=%d]", iState, aNewState); if(iState != aNewState) { @@ -730,10 +724,10 @@ for(i=0;iCount();i++) { - OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_7, ">>CSimLine::ChangeState5 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); + LOGLINE3(">>CSimLine::ChangeState5 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_8, "<>CSimLine::SimPSEvent"); + LOGLINE1(">>CSimLine::SimPSEvent"); if(aProperty==iICProperty) // check for this here still, start the timer for amount specified in config file. ProcessIncomingCallEvent(); if(aProperty==iRHProperty) ProcessRemoteHangupEvent(); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SIMPSEVENT_2, "<>CSimLine::SetAnswerCallObject"); + LOGLINE1(">>CSimLine::SetAnswerCallObject"); if(iAnswerIncomingCallReqPending) // Is there a request already outstanding? return KErrEtelAnswerAlreadyOutstanding; @@ -776,7 +770,7 @@ iAnswerNextIncomingCall=aCallObject; // Set the "answer next call" object iAnswerNextIncomingCall->Open(); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETAUTOANSWERCALLOBJECT_2, "<>CSimLine::ResetAnswerCallObject"); + LOGLINE1(">>CSimLine::ResetAnswerCallObject"); __ASSERT_ALWAYS(iAnswerNextIncomingCall==aCallObject,SimPanic(EIllegalAnswerNextIncomingCallInconsistancy)); iAnswerNextIncomingCall->Close(); iAnswerNextIncomingCall=iSpareCall; @@ -800,7 +794,7 @@ * Process an incoming call event. */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSINCOMINGCALLEVENT_1, ">>CSimLine::ProcessIncomingCallEvent "); + LOGLINE1(">>CSimLine::ProcessIncomingCallEvent "); if (iSpareCall == iAnswerNextIncomingCall) { @@ -817,7 +811,7 @@ iTimer->Start(iNotifyIncomingCallPause, this); __ASSERT_ALWAYS(iAnswerNextIncomingCall->ActionEvent(CSimCall::ECallEventIncomingCall,KErrNone) == KErrNone, SimPanic(EGeneral)); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSINCOMINGCALLEVENT_2, "<>CSimLine::SetRemoteHangupCallObject"); + LOGLINE1(">>CSimLine::SetRemoteHangupCallObject"); if(iRemoteHangupCallReqPending) // Is there a request already outstanding? return KErrEtelInitialisationFailure; @@ -839,7 +833,7 @@ { iRemoteHangupCall=aCallObject; // Set the "remote hang up" object } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETREMOTEHANGUPCALLOBJECT_2, "<>CSimLine::ResetRemoteHangupCallObject"); + LOGLINE1(">>CSimLine::ResetRemoteHangupCallObject"); __ASSERT_ALWAYS(iRemoteHangupCall==aCallObject,SimPanic(EIllegalAnswerRemoteHangupCallInconsistency)); iRemoteHangupCallReqPending=EFalse; } @@ -861,7 +855,7 @@ * Process a remote hangup event. */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_1, ">>CSimLine::ProcessRemoteHangupEvent"); + LOGLINE1(">>CSimLine::ProcessRemoteHangupEvent"); if (iRemoteHangupCall == NULL) { @@ -871,15 +865,15 @@ err = iRemoteHangupCall->ActionEvent(CSimCall::ECallEventRemoteHangup,KErrNone); if(err != KErrNone) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_2, "ERROR: CSimLine::ProcessRemoteHangupEvent returned: %d", err); + LOGLINE2("ERROR: CSimLine::ProcessRemoteHangupEvent returned: %d", err); } } else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_3, "No outstanding call to hang up remotely"); + LOGLINE1("No outstanding call to hang up remotely"); } } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_4, "<>CSimLine::ProcessNotifyIncomingCallEvent"); + LOGLINE1(">>CSimLine::ProcessNotifyIncomingCallEvent"); if(iNotifyIncomingCall.iNotifyPending) { iNotifyIncomingCall.iNotifyPending=EFalse; ((TName*)iNotifyIncomingCall.iNotifyData)->Copy(iAnswerNextIncomingCall->iName); ReqCompleted(iNotifyIncomingCall.iNotifyHandle,KErrNone); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_2, "<