diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simtsy/src/CSimCall.cpp --- a/telephonyserverplugins/simtsy/src/CSimCall.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyserverplugins/simtsy/src/CSimCall.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,14 +21,9 @@ @file */ - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "CSimCallTraces.h" -#endif - #include "CSimCall.h" #include "CSimPhone.h" +#include "Simlog.h" void CSimCall::CloseCall(TAny* aObj) /** @@ -86,7 +81,7 @@ // in order to check the type of request it has CTelObject::TReqMode reqMode=0; - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_REQMODEL_1, "CSimCall::ReqModeL called with IPC number %d",aIpc); + LOGCALL2("CSimCall::ReqModeL called with IPC number %d",aIpc); switch (aIpc) { // @@ -150,10 +145,10 @@ case EMobileCallNotifyMobileCallStatusChange: case EMobileCallNotifyMobileCallCapsChange: case EMobileCallNotifyRemotePartyInfoChange: - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NUMBEROFSLOTSL_1, "CSimCall: Registered with default number of slots"); + LOGCALL1("CSimCall: Registered with default number of slots"); return KDefaultNumberOfSlots; default: - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NUMBEROFSLOTSL_2, "CSimCall::NumberOfSlotsL: No match for IPC, defering to base function"); + LOGCALL1("CSimCall::NumberOfSlotsL: No match for IPC, defering to base function"); break; } return CCallBase::NumberOfSlotsL(aIpc); @@ -295,11 +290,11 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGE_1, ">>CSimCall::NotifyHookChange"); + LOGCALL1(">>CSimCall::NotifyHookChange"); iNotifyHookChange.iNotifyPending = ETrue; iNotifyHookChange.iNotifyHandle = aTsyReqHandle; iNotifyHookChange.iNotifyData = aHookStatus; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGE_2, "<>CSimCall::NotifyHookChangeCancel"); + LOGCALL1(">>CSimCall::NotifyHookChangeCancel"); if(iNotifyHookChange.iNotifyPending) { iNotifyHookChange.iNotifyPending=EFalse; ReqCompleted(iNotifyHookChange.iNotifyHandle,KErrCancel); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGECANCEL_2, "<>CSimCall::NotifyMobileCallStatusChange"); + LOGCALL1(">>CSimCall::NotifyMobileCallStatusChange"); __ASSERT_ALWAYS(!iMobileNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); iMobileNotifyStatusChange.iNotifyPending = ETrue; iMobileNotifyStatusChange.iNotifyHandle = aTsyReqHandle; iMobileNotifyStatusChange.iNotifyData = aStatus; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGE_2, "<>CSimCall::NotifyMobileCallStatusChangeCancel"); + LOGCALL1(">>CSimCall::NotifyMobileCallStatusChangeCancel"); if(iMobileNotifyStatusChange.iNotifyPending) { iMobileNotifyStatusChange.iNotifyPending=EFalse; ReqCompleted(iMobileNotifyStatusChange.iNotifyHandle,KErrCancel); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGECANCEL_2, "<>CSimCall::NotifyStatusChange"); + LOGCALL1(">>CSimCall::NotifyStatusChange"); __ASSERT_ALWAYS(!iNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); iNotifyStatusChange.iNotifyPending = ETrue; iNotifyStatusChange.iNotifyHandle = aTsyReqHandle; iNotifyStatusChange.iNotifyData = aStatus; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGE_2, "<>CSimCall::NotifyStatusChangeCancel"); + LOGCALL1(">>CSimCall::NotifyStatusChangeCancel"); if(iNotifyStatusChange.iNotifyPending) { iNotifyStatusChange.iNotifyPending=EFalse; ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrCancel); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGECANCEL_2, "<iLineName); - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETMOBILECALLINFO_1, "CSimCall::GetMobileCallInfo request completed with %d",iState); + LOGCALL2("CSimCall::GetMobileCallInfo request completed with %d",iState); ReqCompleted(aTsyReqHandle,KErrNone); return KErrNone; } @@ -524,10 +519,10 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETSTATUS_1, ">>CSimCall::GetStatus"); + LOGCALL1(">>CSimCall::GetStatus"); *aCallStatus=GetCoreCallStatus(); ReqCompleted(aTsyReqHandle,KErrNone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETSTATUS_2, "<>CSimCall::GetMobileCallStatus"); + LOGCALL1(">>CSimCall::GetMobileCallStatus"); *aCallStatus=iState; ReqCompleted(aTsyReqHandle,KErrNone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETMOBILECALLSTATUS_2, "<>CSimCall::GetCallDuration"); + LOGCALL1(">>CSimCall::GetCallDuration"); iCallDurationHandler->GetDuration(aTime); ReqCompleted(aTsyReqHandle,KErrNone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETCALLDURATION_2, "<>CSimCall::ChangeState 0x%08x [newState=%d] entry", (TUint)this,aNewState); + LOGCALL3(">>CSimCall::ChangeState 0x%08x [newState=%d] entry", this,aNewState); if(!aNoPropagation) { @@ -739,7 +734,7 @@ if((aNewState == RMobileCall::EStatusConnected && !aSwap)|| aNewState == RMobileCall::EStatusDisconnecting) iLine->UpdatePhoneNotifiers(this,aNewState); - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_CHANGESTATEL_2, "<>CSimCall::UpdateNotifiers 0x%08x entry", this); + LOGCALL2(">>CSimCall::UpdateNotifiers 0x%08x entry", this); // Check for call duration change if (!iCallDurationHandler) @@ -810,7 +805,7 @@ } } - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_UPDATENOTIFIERS_2, "<>CSimCall::NotifyRemotePartyInfoChange"); + LOGCALL1(">>CSimCall::NotifyRemotePartyInfoChange"); __ASSERT_ALWAYS(iNotifyRemotePartyInfoTimer, SimPanic(EOjectNotConstructed)); __ASSERT_ALWAYS(!iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending,SimPanic(ENotificationAlreadyPending)); @@ -1032,7 +1027,7 @@ iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending = ETrue; iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyHandle = aTsyReqHandle; iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyData = &remoteparty; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGE_2, "<>CSimCall::NotifyRemotePartyInfoChangeCancel"); + LOGCALL1(">>CSimCall::NotifyRemotePartyInfoChangeCancel"); if(iNotifyRemotePartyInfoTimer && iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending) { iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending=EFalse; ReqCompleted(iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyHandle,KErrCancel); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGECANCEL_2, "<