--- a/telephonyserverplugins/simtsy/src/CSimLine.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimLine.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -1,5 +1,5 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2001-2010 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,11 +21,17 @@
@file
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimLineTraces.h"
+#endif
+
#include <testconfigfileparser.h>
#include "CSimLine.h"
#include "CSimPhone.h"
#include "CSimCall.h"
-#include "Simlog.h"
#include "CSimPubSub.h"
void CSimLine::CloseLine(TAny* aObj)
@@ -55,7 +61,7 @@
* @param aName name of the Line to be created.
*/
{
- LOGLINE2(">>CSimLine::ConstructL [aLineName=%S]", &aName);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CONSTRUCTL_1, ">>CSimLine::ConstructL [aLineName=%S]", aName);
iLineName = aName;
iSimPubSubIC = CSimPubSub::NewL(this,iICProperty);
iSimPubSubIC->Start();
@@ -66,7 +72,7 @@
iNotifyIncomingCallPause=this->CfgFile()->ItemValue(KNotifyIncomingCallPauseDuration,KDefaultNotifyIncomingCallPauseDuration);
iTimer = CSimTimer::NewL(iPhone);
- LOGLINE1("<<CSimLine::ConstructL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CONSTRUCTL_2, "<<CSimLine::ConstructL");
}
CSimLine::~CSimLine()
@@ -150,11 +156,11 @@
switch (aIpc)
{
case EMobileLineNotifyMobileLineStatusChange:
- LOGLINE1("CLineMobile: Registered with the default number of slots");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NUMBEROFSLOTSL_1, "CLineMobile: Registered with the default number of slots");
return KDefaultNumberOfSlots;
default:
- LOGLINE1("CSimLine::NumberOfSlotsL: No match for IPC, defering to base function");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NUMBEROFSLOTSL_2, "CSimLine::NumberOfSlotsL: No match for IPC, defering to base function");
break;
}
return CLineBase::NumberOfSlotsL(aIpc);
@@ -198,11 +204,11 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyIncomingCall");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALL_1, ">>CSimLine::NotifyIncomingCall");
iNotifyIncomingCall.iNotifyPending=ETrue;
iNotifyIncomingCall.iNotifyHandle=aTsyReqHandle;
iNotifyIncomingCall.iNotifyData=(TAny*)aName;
- LOGLINE1("<<CSimLine::NotifyIncomingCall");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALL_2, "<<CSimLine::NotifyIncomingCall");
return KErrNone;
}
@@ -215,14 +221,14 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyIncomingCallCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALLCANCEL_1, ">>CSimLine::NotifyIncomingCallCancel");
if(iNotifyIncomingCall.iNotifyPending)
{
iTimer->Cancel();
iNotifyIncomingCall.iNotifyPending=EFalse;
ReqCompleted(iNotifyIncomingCall.iNotifyHandle, KErrCancel);
}
- LOGLINE1("<<CSimLine::NotifyIncomingCallCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALLCANCEL_2, "<<CSimLine::NotifyIncomingCallCancel");
return KErrNone;
}
@@ -236,11 +242,11 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyHookChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGE_1, ">>CSimLine::NotifyHookChange");
iNotifyHookChange.iNotifyPending=ETrue;
iNotifyHookChange.iNotifyHandle=aTsyReqHandle;
iNotifyHookChange.iNotifyData=(TAny*)aHookStatus;
- LOGLINE1("<<CSimLine::NotifyHookChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGE_2, "<<CSimLine::NotifyHookChange");
return KErrNone;
}
@@ -253,13 +259,13 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyHookChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGECANCEL_1, ">>CSimLine::NotifyHookChangeCancel");
if(iNotifyHookChange.iNotifyPending)
{
iNotifyHookChange.iNotifyPending=EFalse;
ReqCompleted(iNotifyHookChange.iNotifyHandle,KErrCancel);
}
- LOGLINE1("<<CSimLine::NotifyHookChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGECANCEL_2, "<<CSimLine::NotifyHookChangeCancel");
return KErrNone;
}
@@ -274,11 +280,11 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyMobileLineStatusChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_1, ">>CSimLine::NotifyMobileLineStatusChange");
iNotifyMobileStatusChange.iNotifyPending=ETrue;
iNotifyMobileStatusChange.iNotifyHandle=aTsyReqHandle;
iNotifyMobileStatusChange.iNotifyData=aStatus;
- LOGLINE1("<<CSimLine::NotifyMobileLineStatusChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_2, "<<CSimLine::NotifyMobileLineStatusChange");
return KErrNone;
}
@@ -291,13 +297,13 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyMobileLineStatusChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_1, ">>CSimLine::NotifyMobileLineStatusChangeCancel");
if(iNotifyMobileStatusChange.iNotifyPending)
{
iNotifyMobileStatusChange.iNotifyPending=EFalse;
ReqCompleted(iNotifyMobileStatusChange.iNotifyHandle,KErrCancel);
}
- LOGLINE1("<<CSimLine::NotifyMobileLineStatusChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_2, "<<CSimLine::NotifyMobileLineStatusChangeCancel");
return KErrNone;
}
@@ -311,11 +317,11 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyStatusChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGE_1, ">>CSimLine::NotifyStatusChange");
iNotifyStatusChange.iNotifyPending=ETrue;
iNotifyStatusChange.iNotifyHandle=aTsyReqHandle;
iNotifyStatusChange.iNotifyData=aStatus;
- LOGLINE1("<<CSimLine::NotifyStatusChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGE_2, "<<CSimLine::NotifyStatusChange");
return KErrNone;
}
@@ -328,13 +334,13 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyStatusChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGECANCEL_1, ">>CSimLine::NotifyStatusChangeCancel");
if(iNotifyStatusChange.iNotifyPending)
{
iNotifyStatusChange.iNotifyPending=EFalse;
ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrCancel);
}
- LOGLINE1("<<CSimLine::NotifyStatusChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGECANCEL_2, "<<CSimLine::NotifyStatusChangeCancel");
return KErrNone;
}
@@ -348,11 +354,11 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyCallAdded");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDED_1, ">>CSimLine::NotifyCallAdded");
iNotifyCallAdded.iNotifyPending=ETrue;
iNotifyCallAdded.iNotifyHandle=aTsyReqHandle;
iNotifyCallAdded.iNotifyData=(TAny*)aName;
- LOGLINE1("<<CSimLine::NotifyCallAdded");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDED_2, "<<CSimLine::NotifyCallAdded");
return KErrNone;
}
@@ -365,13 +371,13 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::NotifyCallAddedCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDEDCANCEL_1, ">>CSimLine::NotifyCallAddedCancel");
if(iNotifyCallAdded.iNotifyPending)
{
iNotifyCallAdded.iNotifyPending=EFalse;
ReqCompleted(iNotifyCallAdded.iNotifyHandle,KErrCancel);
}
- LOGLINE1("<<CSimLine::NotifyCallAddedCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDEDCANCEL_2, "<<CSimLine::NotifyCallAddedCancel");
return KErrNone;
}
@@ -381,7 +387,7 @@
* Process a potential "New Call Added Notification" completion.
*/
{
- LOGLINE1(">>CSimLine::HandleNewCallAddedNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_1, ">>CSimLine::HandleNewCallAddedNotification");
iNameOfLastCallAdded.Copy(aNewName);
if(iNotifyCallAdded.iNotifyPending)
{
@@ -389,7 +395,7 @@
((TName*)iNotifyCallAdded.iNotifyData)->Copy(aNewName);
ReqCompleted(iNotifyCallAdded.iNotifyHandle,KErrNone);
}
- LOGLINE1("<<CSimLine::HandleNewCallAddedNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_2, "<<CSimLine::HandleNewCallAddedNotification");
}
TInt CSimLine::GetCaps(const TTsyReqHandle aTsyReqHandle, RLine::TCaps* aCaps)
@@ -449,7 +455,7 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::GetInfo");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETINFO_1, ">>CSimLine::GetInfo");
aLineInfo->iHookStatus=iHookState;
aLineInfo->iStatus=(RCall::TStatus)iState;
aLineInfo->iNameOfLastCallAdded.Copy(iNameOfLastCallAdded);
@@ -459,7 +465,7 @@
aLineInfo->iNameOfCallForAnswering.Zero();
ReqCompleted(aTsyReqHandle,KErrNone);
- LOGLINE1("<<CSimLine::GetInfo");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETINFO_2, "<<CSimLine::GetInfo");
return KErrNone;
}
@@ -504,10 +510,10 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::GetStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETSTATUS_1, ">>CSimLine::GetStatus");
*aLineStatus=GetCoreLineStatus();
ReqCompleted(aTsyReqHandle,KErrNone);
- LOGLINE1("<<CSimLine::GetStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETSTATUS_2, "<<CSimLine::GetStatus");
return KErrNone;
}
@@ -521,10 +527,10 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::GetMobileLineStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETMOBILELINESTATUS_1, ">>CSimLine::GetMobileLineStatus");
*aLineStatus=iState;
ReqCompleted(aTsyReqHandle,KErrNone);
- LOGLINE1("<<CSimLine::GetMobileLineStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETMOBILELINESTATUS_2, "<<CSimLine::GetMobileLineStatus");
return KErrNone;
}
@@ -538,10 +544,10 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::GetHookStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETHOOKSTATUS_1, ">>CSimLine::GetHookStatus");
*aHookStatus=iHookState;
ReqCompleted(aTsyReqHandle,KErrNone);
- LOGLINE1("<<CSimLine::GetHookStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETHOOKSTATUS_2, "<<CSimLine::GetHookStatus");
return KErrNone;
}
@@ -552,7 +558,7 @@
* @return CTestConfig a pointer to the configuration file data section
*/
{
- LOGLINE1(">>CSimLine::CfgFile");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CFGFILE_1, ">>CSimLine::CfgFile");
return iPhone->CfgFile();
}
@@ -573,7 +579,7 @@
TInt count=iCalls->Count();
for(i=0;i<count;i++)
{
- LOGLINE3(">>CSimLine::ChangeState0 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_1, ">>CSimLine::ChangeState0 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
}
TInt ret=KErrGeneral;
@@ -593,7 +599,7 @@
if(ret!=KErrNone && !(aSwap && iState==RMobileCall::EStatusConnected && aNewState==RMobileCall::EStatusConnected))
return ret;
- LOGLINE2(">>CSimLine::ChangeState 0x%08x",aOriginatingCall);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_2, ">>CSimLine::ChangeState 0x%08x",aOriginatingCall);
if(aNewState==RMobileCall::EStatusIdle)
{
if(iState==RMobileCall::EStatusIdle)
@@ -604,7 +610,7 @@
TInt count=iCalls->Count();
for(i=0;i<count;i++)
{
- LOGLINE3(">>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_3, ">>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
if(aOriginatingCall!=iCalls->At(i) && iCalls->At(i)->iState != RMobileCall::EStatusIdle)
{
@@ -627,7 +633,7 @@
TInt count=iCalls->Count();
for(i=0;i<count;i++)
{
- LOGLINE3(">>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_4, ">>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
if(iCalls->At(i) != aOriginatingCall && iCalls->At(i)->iState == RMobileCall::EStatusHold)
{
if(aSwap)
@@ -647,7 +653,7 @@
TInt count=iCalls->Count();
for(i=0;i<count;i++)
{
- LOGLINE3(">>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_5, ">>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
if(iCalls->At(i) != aOriginatingCall)
{
if(iCalls->At(i)->iState == RMobileCall::EStatusConnected)
@@ -669,7 +675,7 @@
}
// Actually change the state.
- LOGLINE3(">>CSimLine::ChangeState [oldState=%d] [newState=%d]", iState, aNewState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_6, ">>CSimLine::ChangeState [oldState=%d] [newState=%d]", iState, aNewState);
if(iState != aNewState)
{
@@ -724,10 +730,10 @@
for(i=0;i<iCalls->Count();i++)
{
- LOGLINE3(">>CSimLine::ChangeState5 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_7, ">>CSimLine::ChangeState5 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState);
}
- LOGLINE1("<<CSimLine::ChangeState");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_8, "<<CSimLine::ChangeState");
return KErrNone;
}
@@ -738,12 +744,12 @@
@param aProperty The property key representing the notification.
*/
{
- LOGLINE1(">>CSimLine::SimPSEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SIMPSEVENT_1, ">>CSimLine::SimPSEvent");
if(aProperty==iICProperty) // check for this here still, start the timer for amount specified in config file.
ProcessIncomingCallEvent();
if(aProperty==iRHProperty)
ProcessRemoteHangupEvent();
- LOGLINE1("<<CSimLine::SimPSEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SIMPSEVENT_2, "<<CSimLine::SimPSEvent");
}
TInt CSimLine::SetAutoAnswerCallObject(CSimCall* aCallObject)
@@ -756,7 +762,7 @@
* @return KErrNone if successful
*/
{
- LOGLINE1(">>CSimLine::SetAnswerCallObject");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETAUTOANSWERCALLOBJECT_1, ">>CSimLine::SetAnswerCallObject");
if(iAnswerIncomingCallReqPending) // Is there a request already outstanding?
return KErrEtelAnswerAlreadyOutstanding;
@@ -770,7 +776,7 @@
iAnswerNextIncomingCall=aCallObject; // Set the "answer next call" object
iAnswerNextIncomingCall->Open();
}
- LOGLINE1("<<CSimLine::SetAnswerCallObject");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETAUTOANSWERCALLOBJECT_2, "<<CSimLine::SetAnswerCallObject");
return KErrNone;
}
@@ -782,7 +788,7 @@
* @param aCallObject pointer to the call object
*/
{
- LOGLINE1(">>CSimLine::ResetAnswerCallObject");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_RESETAUTOANSWERCALLOBJECT_1, ">>CSimLine::ResetAnswerCallObject");
__ASSERT_ALWAYS(iAnswerNextIncomingCall==aCallObject,SimPanic(EIllegalAnswerNextIncomingCallInconsistancy));
iAnswerNextIncomingCall->Close();
iAnswerNextIncomingCall=iSpareCall;
@@ -794,7 +800,7 @@
* Process an incoming call event.
*/
{
- LOGLINE1(">>CSimLine::ProcessIncomingCallEvent ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSINCOMINGCALLEVENT_1, ">>CSimLine::ProcessIncomingCallEvent ");
if (iSpareCall == iAnswerNextIncomingCall)
{
@@ -811,7 +817,7 @@
iTimer->Start(iNotifyIncomingCallPause, this);
__ASSERT_ALWAYS(iAnswerNextIncomingCall->ActionEvent(CSimCall::ECallEventIncomingCall,KErrNone) == KErrNone, SimPanic(EGeneral));
- LOGLINE1("<<CSimLine::ProcessIncomingCallEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSINCOMINGCALLEVENT_2, "<<CSimLine::ProcessIncomingCallEvent");
}
TInt CSimLine::SetRemoteHangupCallObject(CSimCall* aCallObject)
@@ -824,7 +830,7 @@
* @return KErrNone if successful
*/
{
- LOGLINE1(">>CSimLine::SetRemoteHangupCallObject");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETREMOTEHANGUPCALLOBJECT_1, ">>CSimLine::SetRemoteHangupCallObject");
if(iRemoteHangupCallReqPending) // Is there a request already outstanding?
return KErrEtelInitialisationFailure;
@@ -833,7 +839,7 @@
{
iRemoteHangupCall=aCallObject; // Set the "remote hang up" object
}
- LOGLINE1("<<CSimLine::SetRemoteHangupCallObject");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETREMOTEHANGUPCALLOBJECT_2, "<<CSimLine::SetRemoteHangupCallObject");
return KErrNone;
}
@@ -845,7 +851,7 @@
* @param aCallObject pointer to the call object
*/
{
- LOGLINE1(">>CSimLine::ResetRemoteHangupCallObject");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_RESETREMOTEHANGUPCALLOBJECT_1, ">>CSimLine::ResetRemoteHangupCallObject");
__ASSERT_ALWAYS(iRemoteHangupCall==aCallObject,SimPanic(EIllegalAnswerRemoteHangupCallInconsistency));
iRemoteHangupCallReqPending=EFalse;
}
@@ -855,7 +861,7 @@
* Process a remote hangup event.
*/
{
- LOGLINE1(">>CSimLine::ProcessRemoteHangupEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_1, ">>CSimLine::ProcessRemoteHangupEvent");
if (iRemoteHangupCall == NULL)
{
@@ -865,15 +871,15 @@
err = iRemoteHangupCall->ActionEvent(CSimCall::ECallEventRemoteHangup,KErrNone);
if(err != KErrNone)
{
- LOGLINE2("ERROR: CSimLine::ProcessRemoteHangupEvent returned: %d", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_2, "ERROR: CSimLine::ProcessRemoteHangupEvent returned: %d", err);
}
}
else
{
- LOGLINE1("No outstanding call to hang up remotely");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_3, "No outstanding call to hang up remotely");
}
}
- LOGLINE1("<<CSimLine::ProcessRemoteHangupEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_4, "<<CSimLine::ProcessRemoteHangupEvent");
}
void CSimLine::CallDestructor(CSimCall* aCall)
@@ -915,13 +921,13 @@
*/
void CSimLine::ProcessNotifyIncomingCallEvent()
{
- LOGLINE1(">>CSimLine::ProcessNotifyIncomingCallEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_1, ">>CSimLine::ProcessNotifyIncomingCallEvent");
if(iNotifyIncomingCall.iNotifyPending)
{
iNotifyIncomingCall.iNotifyPending=EFalse;
((TName*)iNotifyIncomingCall.iNotifyData)->Copy(iAnswerNextIncomingCall->iName);
ReqCompleted(iNotifyIncomingCall.iNotifyHandle,KErrNone);
}
- LOGLINE1("<<CSimLine::ProcessNotifyIncomingCallEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_2, "<<CSimLine::ProcessNotifyIncomingCallEvent");
}