diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simtsy/src/CSimCallForwarding.cpp --- a/telephonyserverplugins/simtsy/src/CSimCallForwarding.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyserverplugins/simtsy/src/CSimCallForwarding.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" @@ -20,16 +20,10 @@ @file */ - - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "CSimCallForwardingTraces.h" -#endif - #include #include "CSimCallForwarding.h" #include "CSimPhone.h" +#include "Simlog.h" const TInt KSettingListGranularity=5; // < The granularity used for parameter list arrays. const TInt KInvalidTimeout = -1; // Value used when timeout period does not matter @@ -65,7 +59,7 @@ Retrieves all the Call forwarding and Identity services tags from the config file */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_1, "Starting to parse Call Forwarding config parameters..."); + LOGCALL1("Starting to parse Call Forwarding config parameters..."); iIdentityServiceStatus=new(ELeave) CArrayFixFlat(KSettingListGranularity); @@ -86,13 +80,13 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,service); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICE returned %d (element no. %d) from tag %s.",ret,0,KIdentityServiceStatus); + LOGPARSERR("service",ret,0,&KIdentityServiceStatus); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,status); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,1,KIdentityServiceStatus); + LOGPARSERR("status",ret,1,&KIdentityServiceStatus); continue; } @@ -102,7 +96,7 @@ iIdentityServiceStatus->AppendL(identityServiceStatus); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_4, "...Finished parsing Call Forwarding config parameters..."); + LOGCALL1("...Finished parsing Call Forwarding config parameters..."); } CSimCallForwarding::~CSimCallForwarding() @@ -185,7 +179,7 @@ /** Creates the Call forwarding list from the config file */ - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_1, "CSimPhone::FindAndCreateCFListL"); + LOGCALL1("CSimPhone::FindAndCreateCFListL"); RMobilePhone::TMobilePhoneCFInfoEntryV1 entry; if(iCFList) @@ -197,7 +191,7 @@ const CTestConfigItem* item=NULL; TInt ret=KErrNone; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_2, "Starting to Load and Parse CFList Config parameters"); + LOGCALL1("Starting to Load and Parse CFList Config parameters"); TInt i; for(i=0;iValue(),KStdDelimiter,0,condition); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONDITION returned %d (element no. %d) from tag %s.",ret,0,KCFList); + LOGPARSERR("condition",ret,0,&KCFList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,serviceGroup); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICEGROUP returned %d (element no. %d) from tag %s.",ret,1,KCFList); + LOGPARSERR("serviceGroup",ret,1,&KCFList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,status); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,2,KCFList); + LOGPARSERR("status",ret,2,&KCFList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,timeout); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element TIMEOUT returned %d (element no. %d) from tag %s.",ret,3,KCFList); + LOGPARSERR("timeout",ret,3,&KCFList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,number); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element NUMBER returned %d (element no. %d) from tag %s.",ret,4,KCFList); + LOGPARSERR("number",ret,4,&KCFList); continue; } @@ -360,7 +354,7 @@ iCFNotification.iCFChangeInfoNotificationPending=ETrue; iCFNotification.iCFChangeInfoReqHandle=aReqHandle; iCFNotification.iCurrentCFCondition=aCF; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_NOTIFYCALLFORWARDINGSTATUSCHANGE_1, "Finished CSimCallForwarding::NotifyCallForwardingStatusChange"); + LOGCALL1("Finished CSimCallForwarding::NotifyCallForwardingStatusChange"); return KErrNone; } @@ -401,7 +395,7 @@ } iPhone->ReqCompleted(aReqHandle,err); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_SETCALLFORWARDINGSTATUS_1, "Finished CSimCallForwarding::SetCallForwardingStatus"); + LOGCALL1("Finished CSimCallForwarding::SetCallForwardingStatus"); return KErrNone; } @@ -426,7 +420,7 @@ @param aReqData contains details of the request @param aBufSize size of the buffer the client needs to allocate for phase 2 */ - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_1, "CSimPhone::GetCallForwardingStatusPhase1"); + LOGCALL1("CSimPhone::GetCallForwardingStatusPhase1"); TInt ret=KErrNone; // for forwarding we cannot querry for all conditions; @@ -445,7 +439,7 @@ if (leaveCode != KErrNone) iPhone->ReqCompleted(aTsyReqHandle,leaveCode); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_2, "CSimPhone::GetCallForwardingStatusPhase1"); + LOGCALL1("CSimPhone::GetCallForwardingStatusPhase1"); return ret; } @@ -461,7 +455,7 @@ @param aBufSize Size of the buffer the client has to allocate for the 2nd pahase */ - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_1, "CSimPhone::ProcessGetCallForwardingStatusPhase1L"); + LOGCALL1("CSimPhone::ProcessGetCallForwardingStatusPhase1L"); CMobilePhoneCFList* list=CMobilePhoneCFList::NewL(); CleanupStack::PushL(list); @@ -509,7 +503,7 @@ // Complete first phase of list retrieval iPhone->ReqCompleted(aTsyReqHandle,KErrNone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_2, "CSimPhone::ProcessGetCallForwardingStatusPhase1L"); + LOGCALL1("CSimPhone::ProcessGetCallForwardingStatusPhase1L"); return KErrNone; } @@ -522,7 +516,7 @@ @param aBuf buffer that contains the call forwarding list */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_1, "CSimPhone::GetCallForwardingStatusPhase2"); + LOGCALL1("CSimPhone::GetCallForwardingStatusPhase2"); CListReadAllAttempt* read=NULL; // Find the get detected network attempt from this client for (TInt i=0; iCount(); ++i) @@ -541,7 +535,7 @@ } } // Should handle error case of not finding the matching client from read all phase 1 - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_2, "CSimPhone::GetCallForwardingStatusPhase2"); + LOGCALL1("CSimPhone::GetCallForwardingStatusPhase2"); return KErrNotFound; } @@ -552,7 +546,7 @@ Cancel the request to retrieve the status of call forwarding @param aTsyReqHandle handle to the request */ - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_1, "CSimPhone::GetCallForwardingStatusCancel"); + LOGCALL1("CSimPhone::GetCallForwardingStatusCancel"); iPhone->ReqCompleted(aTsyReqHandle,KErrNone); // Remove the read all attempt from iGetCFStatus CListReadAllAttempt* read=NULL; @@ -567,7 +561,7 @@ } } iPhone->ReqCompleted(aTsyReqHandle,KErrCancel); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_2, "CSimPhone::GetCallForwardingStatusCancel"); + LOGCALL1("CSimPhone::GetCallForwardingStatusCancel"); return KErrNone; }