--- a/telephonyserverplugins/simtsy/src/CSimNetworkStatus.cpp Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimNetworkStatus.cpp Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -20,12 +20,18 @@
@file
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimNetworkStatusTraces.h"
+#endif
+
#include <e32property.h>
#include <testconfigfileparser.h>
#include <sacls.h>
#include "CSimNetworkStatus.h"
#include "CSimPhone.h"
-#include "Simlog.h"
#include "CSimPubSubChange.h"
#include "CSimTsyMode.h"
#include "etelmmerr.h"
@@ -107,7 +113,7 @@
* A number of these tags may be included to create a Cell Information Profile.
*/
{
- LOGNETWORK1("Starting to parse Network Status config parameters...");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_1, "Starting to parse Network Status config parameters...");
iRegStatTimer=CSimTimer::NewL(iPhone);
iNitzTimer=CSimTimer::NewL(iPhone);
iRadioModeTimer=CSimTimer::NewL(iPhone);
@@ -138,37 +144,37 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,countryCode);
if(ret!=KErrNone)
{
- LOGPARSERR("countryCode",ret,0,&KNetworkInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNTRYCODE returned %d (element no. %d) from tag %s.",ret,0,KNetworkInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,networkIdentify);
if(ret!=KErrNone)
{
- LOGPARSERR("networkIdentify",ret,1,&KNetworkInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element NETWORKIDENTIFY returned %d (element no. %d) from tag %S.",ret,1,KNetworkInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,displayTag);
if(ret!=KErrNone)
{
- LOGPARSERR("displayTag",ret,2,&KNetworkInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAYTAG returned %d (element no. %d) from tag %s.",ret,2,KNetworkInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,shortName);
if(ret!=KErrNone)
{
- LOGPARSERR("shortName",ret,3,&KNetworkInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element SHORTNAME returned %d (element no. %d) from tag %s.",ret,3,KNetworkInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,longName);
if(ret!=KErrNone)
{
- LOGPARSERR("longName",ret,4,&KNetworkInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element LONGNAME returned %d (element no. %d) from tag %s.",ret,4,KNetworkInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,status);
if(ret!=KErrNone)
{
- LOGPARSERR("status",ret,5,&KNetworkInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,5,KNetworkInfo);
continue;
}
RMobilePhone::TMobilePhoneNetworkInfoV2 networkInfo;
@@ -233,13 +239,13 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
if(ret!=KErrNone)
{
- LOGPARSERR("duration",ret,0,&KRegStatus);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KRegStatus);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,regStat);
if(ret!=KErrNone)
{
- LOGPARSERR("regStat",ret,1,&KRegStatus);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element REGSTAT returned %d (element no. %d) from tag %s.",ret,1,KRegStatus);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,networkIndex);
@@ -266,13 +272,13 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
if(ret!=KErrNone)
{
- LOGPARSERR("duration",ret,0,&KRadioMode);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KRadioMode);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,radioStatus);
if(ret!=KErrNone)
{
- LOGPARSERR("radioStatus",ret,1,&KRadioMode);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element RADIOSTATUS returned %d (element no. %d) from tag %s.",ret,1,KRadioMode);
continue;
}
@@ -296,61 +302,61 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
if(ret!=KErrNone)
{
- LOGPARSERR("duration",ret,0,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KNitzInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,year);
if(ret!=KErrNone)
{
- LOGPARSERR("year",ret,1,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element YEAR returned %d (element no. %d) from tag %s.",ret,1,KNitzInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,month);
if(ret!=KErrNone)
{
- LOGPARSERR("month",ret,2,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element MONTH returned %d (element no. %d) from tag %s.",ret,2,KNitzInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,day);
if(ret!=KErrNone)
{
- LOGPARSERR("day",ret,3,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element DAY returned %d (element no. %d) from tag %s.",ret,3,KNitzInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,hour);
if(ret!=KErrNone)
{
- LOGPARSERR("hour",ret,4,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element HOUR returned %d (element no. %d) from tag %s.",ret,4,KNitzInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,min);
if(ret!=KErrNone)
{
- LOGPARSERR("min",ret,5,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element MIN returned %d (element no. %d) from tag %s.",ret,5,KNitzInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,sec);
if(ret!=KErrNone)
{
- LOGPARSERR("sec",ret,6,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element SEC returned %d (element no. %d) from tag %s.",ret,6,KNitzInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,microsec);
if(ret!=KErrNone)
{
- LOGPARSERR("microsec",ret,7,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element MICROSEC returned %d (element no. %d) from tag %s.",ret,7,KNitzInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,tz);
if(ret!=KErrNone)
{
- LOGPARSERR("tz",ret,8,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element TZ returned %d (element no. %d) from tag %s.",ret,8,KNitzInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,dst);
if(ret!=KErrNone)
{
- LOGPARSERR("dst",ret,9,&KNitzInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element DST returned %d (element no. %d) from tag %s.",ret,9,KNitzInfo);
continue;
}
@@ -380,31 +386,31 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration);
if(ret!=KErrNone)
{
- LOGPARSERR("duration",ret,0,&KCellInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KCellInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,mode);
if(ret!=KErrNone)
{
- LOGPARSERR("mode",ret,1,&KCellInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element MODE returned %d (element no. %d) from tag %s.",ret,1,KCellInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,cellId);
if(ret!=KErrNone)
{
- LOGPARSERR("cellId",ret,2,&KCellInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element CELLID returned %d (element no. %d) from tag %s.",ret,2,KCellInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,timingAdvance);
if(ret!=KErrNone)
{
- LOGPARSERR("timingAdvance",ret,3,&KCellInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element TIMINGADVANCE returned %d (element no. %d) from tag %s.",ret,3,KCellInfo);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,cellInfoStatus);
if(ret!=KErrNone)
{
- LOGPARSERR("cellInfoStatus",ret,3,&KCellInfo);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element CELLINFOSTATUS returned %d (element no. %d) from tag %s.",ret,3,KCellInfo);
continue;
}
@@ -451,7 +457,7 @@
locationArea.iCellId= cellId;
iLocationArea->AppendL(locationArea);
}
- LOGNETWORK1("...Finished parsing Network Status config parameters...");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_27, "...Finished parsing Network Status config parameters...");
// If present load the first registration status settings and start the registration
// status timer.
@@ -460,7 +466,7 @@
iRegStatIndex=0;
iCurrentRegStatus=iRegStatusInfo->At(0).iRegStatus;
iCurrentNetworkIndex=iRegStatusInfo->At(0).iNetworkInfoIndex;
- LOGNETWORK2("Starting ETimerIdNtwkStatRegStat for duration:%d", iRegStatusInfo->At(0).iDuration);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_28, "Starting ETimerIdNtwkStatRegStat for duration:%d", iRegStatusInfo->At(0).iDuration);
iRegStatTimer->Start(iRegStatusInfo->At(0).iDuration,this,ETimerIdNtwkStatRegStat);
}
@@ -487,14 +493,14 @@
if(iRadioMode.iRadioOn==EFalse)
{
RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOff);
- LOGNETWORK1("Radio Mode = OFF (from config)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_29, "Radio Mode = OFF (from config)");
}
else
{
RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOn);
- LOGNETWORK1("Radio Mode = ON (from config)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_30, "Radio Mode = ON (from config)");
}
- LOGNETWORK2("Radio Mode duration = %d (from config)", iRadioModeInfo->At(0).iDuration);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_31, "Radio Mode duration = %d (from config)", iRadioModeInfo->At(0).iDuration);
iRadioModeTimer->Start(iRadioModeInfo->At(0).iDuration,this,ETimerIdNtwkStatRadioMode);
}
@@ -502,7 +508,7 @@
{
//default to on
RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOn);
- LOGNETWORK1("Radio Mode = ON (no config)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_32, "Radio Mode = ON (no config)");
}
//If present read in Service Provider settings
@@ -514,17 +520,17 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,displayreq);
if(ret!=KErrNone)
{
- LOGPARSERR("displayreq",ret,0,&KServiceProviderName);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAYREQ returned %d (element no. %d) from tag %s.",ret,0,KServiceProviderName);
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,spname);
if(ret!=KErrNone)
{
- LOGPARSERR("spname",ret,1,&KServiceProviderName);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element SPNAME returned %d (element no. %d) from tag %s.",ret,1,KServiceProviderName);
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,plmnfield);
if(ret!=KErrNone)
{
- LOGPARSERR("plmnfield",ret,2,&KServiceProviderName);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element PLMNFIELD returned %d (element no. %d) from tag %s.",ret,2,KServiceProviderName);
}
iServiceProvider.iDisplayReq = static_cast<RMobilePhone::TDisplayRequirements>(displayreq);
@@ -577,7 +583,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,getTimer);
if(ret!=KErrNone)
{
- LOGNETWORK1("WARNING: CSimNetworkStatus::FindRoamStatSettings found ERROR with Config");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_FINDROAMSTATSETTINGS_1, "WARNING: CSimNetworkStatus::FindRoamStatSettings found ERROR with Config");
}
iRoamStatGetTimeout = getTimer;
}
@@ -1437,7 +1443,7 @@
TimerCallBackCellInfo();
break;
default:
- LOGNETWORK3("CSimNetworkStatus::TimerCallBack(%d), OOR [%d]",aId, ETimerIdNtwkStatRegStat);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACK_1, "CSimNetworkStatus::TimerCallBack(%d), OOR [%d]",aId, ETimerIdNtwkStatRegStat);
SimPanic(EIllegalCallBackId);
break;
}
@@ -1487,7 +1493,7 @@
}
if(iCurrNetChangeV1NotificationPending)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_1, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1");
iCurrNetChangeV1NotificationPending = EFalse;
RMobilePhone::TMobilePhoneNetworkInfoV1* changeNetInfoV1 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV1*>(iCurrNetChangeV1NotificationNetInfo);
@@ -1497,7 +1503,7 @@
if(iCurrNetChangeV2NotificationPending)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_2, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2");
iCurrNetChangeV2NotificationPending = EFalse;
RMobilePhone::TMobilePhoneNetworkInfoV2* changeNetInfoV2 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV2*>(iCurrNetChangeV2NotificationNetInfo);
PopulateNetworkInfoV1(iCurrentNetworkIndex,*changeNetInfoV2);
@@ -1508,7 +1514,7 @@
if(iCurrNetChangeV5NotificationPending)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_3, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5");
iCurrNetChangeV5NotificationPending = EFalse;
RMobilePhone::TMobilePhoneNetworkInfoV5* changeNetInfoV5 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV5*>(iCurrNetChangeV5NotificationNetInfo);
PopulateNetworkInfoV1(iCurrentNetworkIndex,*changeNetInfoV5);
@@ -1521,7 +1527,7 @@
if(iCurrNetChangeV8NotificationPending)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_4, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8");
iCurrNetChangeV8NotificationPending = EFalse;
RMobilePhone::TMobilePhoneNetworkInfoV8* changeNetInfoV8 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV8*>(iCurrNetChangeV8NotificationNetInfo);
PopulateNetworkInfoV1(iCurrentNetworkIndex,*changeNetInfoV8);
@@ -1535,7 +1541,7 @@
if(iCurrNetChangeEtelIsvNotificationPending)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TEtel3rdPartyMobileNetworkInfoV1");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_5, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TEtel3rdPartyMobileNetworkInfoV1");
iCurrNetChangeEtelIsvNotificationPending = EFalse;
RMobilePhone::TEtel3rdPartyMobileNetworkInfoV1* changeNetInfoEtelIsv = reinterpret_cast<RMobilePhone::TEtel3rdPartyMobileNetworkInfoV1*>(iCurrNetChangeEtelIsvNotificationNetInfo);
@@ -1544,7 +1550,7 @@
}
if(iCurrNetChangeNoLocV1NotificationPending)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1 (No Location)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_6, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1 (No Location)");
iCurrNetChangeNoLocV1NotificationPending = EFalse;
RMobilePhone::TMobilePhoneNetworkInfoV1* changeNetInfoV1 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV1*>(iCurrNetChangeNoLocV1NotificationNetInfo);
@@ -1554,7 +1560,7 @@
if(iCurrNetChangeNoLocV2NotificationPending)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2 (No Location)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_7, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2 (No Location)");
iCurrNetChangeNoLocV2NotificationPending = EFalse;
RMobilePhone::TMobilePhoneNetworkInfoV2* changeNetInfoV2 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV2*>(iCurrNetChangeNoLocV2NotificationNetInfo);
@@ -1566,7 +1572,7 @@
if(iCurrNetChangeNoLocV5NotificationPending)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5 (No Location)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_8, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5 (No Location)");
iCurrNetChangeNoLocV5NotificationPending = EFalse;
RMobilePhone::TMobilePhoneNetworkInfoV5* changeNetInfoV5 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV5*>(iCurrNetChangeNoLocV5NotificationNetInfo);
@@ -1580,7 +1586,7 @@
if(iCurrNetChangeNoLocV8NotificationPending)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8 (No Location)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_9, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8 (No Location)");
iCurrNetChangeNoLocV8NotificationPending = EFalse;
RMobilePhone::TMobilePhoneNetworkInfoV8* changeNetInfoV8 = reinterpret_cast<RMobilePhone::TMobilePhoneNetworkInfoV8*>(iCurrNetChangeNoLocV8NotificationNetInfo);
@@ -1629,11 +1635,11 @@
* completes.
*/
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRadioModeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_1, "CSimNetworkStatus::TimerCallBackRadioModeL");
iRadioModeIndex++;
if(iRadioModeInfo->Count()<=iRadioModeIndex)
{
- LOGNETWORK1("CSimNetworkStatus::TimerCallBackRadioModeL returning, no more config");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_2, "CSimNetworkStatus::TimerCallBackRadioModeL returning, no more config");
return;
}
@@ -1641,15 +1647,15 @@
if(iRadioMode.iRadioOn==EFalse)
{
RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOff);
- LOGNETWORK1("Radio Mode = OFF (config duration passed)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_3, "Radio Mode = OFF (config duration passed)");
}
else
{
RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOn);
- LOGNETWORK1("Radio Mode = ON (config duration passed)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_4, "Radio Mode = ON (config duration passed)");
}
- LOGNETWORK2("Next radio Mode duration = %d (from config)", iRadioModeInfo->At(iRadioModeIndex).iDuration);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_5, "Next radio Mode duration = %d (from config)", iRadioModeInfo->At(iRadioModeIndex).iDuration);
iRadioModeTimer->Start(iRadioModeInfo->At(iRadioModeIndex).iDuration,this,ETimerIdNtwkStatRadioMode);
}