diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simtsy/src/CSimPacketContext.cpp --- a/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp Wed Sep 01 12:40:21 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -19,13 +19,7 @@ @file */ - - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "CSimPacketContextTraces.h" -#endif - +#include "Simlog.h" #include "CSimPhone.h" #include "CSimPacketContext.h" #include "CSimPacketService.h" @@ -128,7 +122,7 @@ * @leave Leaves no memory or any data member does not construct for any reason. */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_1, "CSimPacketContext: Entered constructor"); + LOGPACKET1("CSimPacketContext: Entered constructor"); iSetConfigData = new (ELeave) CArrayFixFlat(1); iNotifyContextConfigChangeArray = new (ELeave) CArrayFixFlat(1); @@ -145,7 +139,7 @@ iNotifyContextConfigChangeTimer= CSimTimer::NewL(iPhone); iContextStatusChange = CSimPubSubChange::NewL(this, CSimPubSub::TPubSubProperty(KUidPSSimTsyCategory, KPSSimtsyPacketContextStatusChange, KPSSimtsyPacketContextStatusChangeKeyType)); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_2, "Starting to Load and Parse Packet Context the Config File"); + LOGPACKET1("Starting to Load and Parse Packet Context the Config File"); GetCommSetupSettingsL(); GetContextConfigParamSettingsL(KSetContextConfigGPRS()); @@ -183,7 +177,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CTFTMEDIAAUTHORIZATIONV3::AUTHORIZATIONTOKEN returned %d (element no. %d) from tag %s.",ret,0,KAuthorizationToken); + LOGPARSERR("CTFTMediaAuthorizationV3::authorizationToken",ret,0,&KAuthorizationToken); CleanupStack::PopAndDestroy(mediaAuthorization); continue; } @@ -197,7 +191,7 @@ if(ret!=KErrNone || desiredResponse > 0) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DESIREDRESPONSE returned %d (element no. %d) from tag %s.",ret,1,KAuthorizationToken); + LOGPARSERR("desiredResponse",ret,1,&KAuthorizationToken); CleanupStack::PopAndDestroy(mediaAuthorization); continue; } @@ -225,7 +219,7 @@ if(ret!=KErrNone || mediaComponentNumber < 0) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CTFTMEDIAAUTHORIZATIONV3::MEDIACOMPONENTNUMBER returned %d (element no. %d) from tag %s.",ret,0,KFlowIdentifier); + LOGPARSERR("CTFTMediaAuthorizationV3::mediaComponentNumber",ret,0,&KFlowIdentifier); continue; } else @@ -237,7 +231,7 @@ if(ret!=KErrNone || IPFlowNumber < 0) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element CTFTMEDIAAUTHORIZATIONV3::IPFLOWNUMBER returned %d (element no. %d) from tag %s.",ret,1,KFlowIdentifier); + LOGPARSERR("CTFTMediaAuthorizationV3::IPFlowNumber",ret,1,&KFlowIdentifier); continue; } else @@ -252,7 +246,7 @@ CleanupStack::Pop(mediaAuthorization); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_7, "...Finished parsing Packet Context config parameters..."); + LOGPACKET1("...Finished parsing Packet Context config parameters..."); } void CSimPacketContext::GetCommSetupSettingsL() @@ -289,7 +283,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,csyName); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::CSYNAME returned %d (element no. %d) from tag %s.",ret,0,KCommSetup); + LOGPARSERR("CommSetUp::csyName",ret,0,&KCommSetup); comm.iCsyName.Copy(KDefaultCsyName); } else @@ -298,7 +292,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,portName); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::PORTNAME returned %d (element no. %d) from tag %s.",ret,1,KCommSetup); + LOGPARSERR("CommSetUp::portName",ret,1,&KCommSetup); comm.iPortName.Copy(KDefaultPortName); } else @@ -308,7 +302,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,dataRate); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::DATARATE returned %d (element no. %d) from tag %s.",ret,2,KCommSetup); + LOGPARSERR("CommSetUp::dataRate",ret,2,&KCommSetup); comm.iConfig.iRate=KDefaultCommPortRate; } else @@ -317,7 +311,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,handshake); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::HANDSHAKE returned %d (element no. %d) from tag %s.",ret,3,KCommSetup); + LOGPARSERR("CommSetUp::handShake",ret,3,&KCommSetup); comm.iConfig.iHandshake=KDefaultHandshake; } else @@ -327,7 +321,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,contextName); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,4,KCommSetup); + LOGPARSERR("CommSetUp::contextName",ret,4,&KCommSetup); comm.iContextName=KDefaultSetting; } else @@ -336,7 +330,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,commReset); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::COMMRESET returned %d (element no. %d) from tag %s.",ret,5,KCommSetup); + LOGPARSERR("CommSetUp::commReset",ret,5,&KCommSetup); comm.iCommReset=EFalse; } else @@ -428,7 +422,7 @@ if(ret != KErrNone || delay < 0) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGDELAY returned %d (element no. %d) from tag %s.",ret,0,KSetConfigDelay); + LOGPARSERR("SetConfigDelay",ret,0,&KSetConfigDelay); } else { @@ -445,7 +439,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KSetConfigFail); + LOGPARSERR("SetConfigFail::contextName",ret,0,&KSetConfigFail); } else { @@ -455,7 +449,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KSetConfigFail); + LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KSetConfigFail); } else { @@ -466,7 +460,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KSetConfigFail); + LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KSetConfigFail); } else { @@ -497,7 +491,7 @@ configChangeData.iDelay); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTCONFIGCHANGE::DELAY returned %d (element no. %d) from tag %s.",ret,0,KNotifyContextConfigChange); + LOGPARSERR("NotifyContextConfigChange::delay",ret,0,&KNotifyContextConfigChange); continue; } @@ -506,7 +500,8 @@ configChangeData.iNewContextConfigIndex); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTCONFIGCHANGE::NEWCONTEXTCONFIGINDEX returned %d (element no. %d) from tag %s.",ret,0,KNotifyContextConfigChange); + LOGPARSERR("NotifyContextConfigChange::NewContextConfigIndex", + ret,0,&KNotifyContextConfigChange); continue; } @@ -526,7 +521,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KDeleteTftFail); + LOGPARSERR("SetConfigFail::contextName",ret,0,&KDeleteTftFail); } else { @@ -536,7 +531,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KDeleteTftFail); + LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KDeleteTftFail); } else { @@ -547,7 +542,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KDeleteTftFail); + LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KDeleteTftFail); } else { @@ -565,7 +560,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KCreateTftConfig); + LOGPARSERR("SetConfigFail::contextName",ret,0,&KCreateTftConfig); } else { @@ -575,7 +570,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_5, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KCreateTftConfig); + LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KCreateTftConfig); } else { @@ -586,7 +581,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_6, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KCreateTftConfig); + LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KCreateTftConfig); } else { @@ -597,7 +592,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,delay); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_7, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,3,KCreateTftConfig); + LOGPARSERR("SetConfigFail::failErrorCode",ret,3,&KCreateTftConfig); } else { @@ -614,7 +609,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_8, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KAddPacketFilter); + LOGPARSERR("SetConfigFail::contextName",ret,0,&KAddPacketFilter); } else { @@ -624,7 +619,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_9, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KAddPacketFilter); + LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KAddPacketFilter); } else { @@ -635,7 +630,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_10, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KAddPacketFilter); + LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KAddPacketFilter); } else { @@ -667,7 +662,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KContextConfigRel99); + LOGPARSERR("ContextConfigRel99::contextName",ret,0,KContextConfigRel99); } else { @@ -677,7 +672,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,activatePause); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::ACTIVATEPAUSE returned %d (element no. %d) from tag %s.",ret,1,KContextConfigRel99); + LOGPARSERR("ContextConfigRel99::activatePause",ret,1,&KContextConfigRel99); continue; } else @@ -686,7 +681,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,activateErrorCode); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::ACTIVATEERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KContextConfigRel99); + LOGPARSERR("ContextConfigRel99::activateErrorCode",ret,2,&KContextConfigRel99); continue; } else @@ -695,7 +690,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,aDeactivatePause); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DEACTIVATEPAUSE returned %d (element no. %d) from tag %s.",ret,3,KContextConfigRel99); + LOGPARSERR("ContextConfigRel99::deactivatePause",ret,3,&KContextConfigRel99); continue; } else @@ -704,7 +699,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,deactivateErrorCode); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DEACTIVATEERRORCODE returned %d (element no. %d) from tag %s.",ret,4,KContextConfigRel99); + LOGPARSERR("ContextConfigRel99::deactivateErrorCode",ret,4,&KContextConfigRel99); continue; } else @@ -713,7 +708,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,deletionPause); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DELETETIONPAUSE returned %d (element no. %d) from tag %s.",ret,5,KContextConfigRel99); + LOGPARSERR("ContextConfigRel99::deletetionPause",ret,5,&KContextConfigRel99); continue; } else @@ -722,7 +717,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6, deletionErrorCode); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DELETIONERRORCODE returned %d (element no. %d) from tag %s.",ret,6,KContextConfigRel99); + LOGPARSERR("ContextConfigRel99::deletionErrorCode",ret,6,&KContextConfigRel99); continue; } else @@ -813,7 +808,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTSTATUSCHANGE::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KNotifyContextStatusChange); + LOGPARSERR("NotifyContextStatusChange::contextName",ret,0,&KNotifyContextStatusChange); continue; } else @@ -824,7 +819,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTSTATUSCHANGE::DURATION returned %d (element no. %d) from tag %s.",ret,1,KNotifyContextStatusChange); + LOGPARSERR("NotifyContextStatusChange::duration",ret,1,&KNotifyContextStatusChange); continue; } else @@ -833,7 +828,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,contextStatus); if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTSTATUSCHANGE::DURATION returned %d (element no. %d) from tag %s.",ret,2,KNotifyContextStatusChange); + LOGPARSERR("NotifyContextStatusChange::duration",ret,2,&KNotifyContextStatusChange); continue; } else @@ -884,7 +879,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::ID returned %d (element no. %d) from tag %s.",ret,0,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::id",ret,0,&KPacketFilterInfo); continue; } else @@ -896,7 +891,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::EVALUATIONPRECEDENCEINDEX returned %d (element no. %d) from tag %s.",ret,1,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::evaluationPrecedenceIndex",ret,1,&KPacketFilterInfo); continue; } else @@ -908,7 +903,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCADDR returned %d (element no. %d) from tag %s.",ret,2,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::srcAddr",ret,2,&KPacketFilterInfo); continue; } else @@ -1019,7 +1014,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCADDRSUBNETMASK returned %d (element no. %d) from tag %s.",ret,3,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::srcAddrSubnetMask",ret,3,&KPacketFilterInfo); continue; } else @@ -1129,7 +1124,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::PROTOCOLNUMBERORNEXTNUMBER returned %d (element no. %d) from tag %s.",ret,4,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::protocolNumberOrNextNumber",ret,4,&KPacketFilterInfo); packetFilter.iProtocolNumberOrNextHeader = KUnsetInteger; } else @@ -1141,7 +1136,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCPORTMIN returned %d (element no. %d) from tag %s.",ret,5,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::srcPortMin",ret,5,&KPacketFilterInfo); packetFilter.iSrcPortMin = KUnsetInteger; } else @@ -1153,7 +1148,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCPORTMAX returned %d (element no. %d) from tag %s.",ret,6,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::srcPortMax",ret,6,&KPacketFilterInfo); packetFilter.iSrcPortMax = KUnsetInteger; } else @@ -1165,7 +1160,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::DESTPORTMIN returned %d (element no. %d) from tag %s.",ret,7,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::destPortMin",ret,7,&KPacketFilterInfo); packetFilter.iDestPortMin = KUnsetInteger; } else @@ -1177,7 +1172,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCPORTMAX returned %d (element no. %d) from tag %s.",ret,8,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::srcPortMax",ret,8,&KPacketFilterInfo); packetFilter.iDestPortMax = KUnsetInteger; } else @@ -1189,7 +1184,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::IPSECSPI returned %d (element no. %d) from tag %s.",ret,9,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::ipSecSPI",ret,9,&KPacketFilterInfo); packetFilter.iIPSecSPI = KUnsetInteger; } else @@ -1201,7 +1196,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::TOSORTRAFFICCLASS returned %d (element no. %d) from tag %s.",ret,10,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::toSorTrafficClass",ret,10,&KPacketFilterInfo); continue; } else @@ -1213,7 +1208,7 @@ if(ret!=KErrNone) { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::FLOWLABEL returned %d (element no. %d) from tag %s.",ret,11,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::flowLabel",ret,11,&KPacketFilterInfo); packetFilter.iFlowLabel = KUnsetInteger; } else @@ -1227,12 +1222,12 @@ { if(ret == KErrNotFound) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_13, "CONFIGURATION FILE PARSING - PacketFilterInfo::TPacketFilterV2 info encountered"); + LOGCONFIG1("CONFIGURATION FILE PARSING - PacketFilterInfo::TPacketFilterV2 info encountered"); packetFilter.iFilterType = RPacketContext::EPacketFilterTypeUnknown; } else { - OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::FILTERTYPE returned %d (element no. %d) from tag %s.",ret,12,KPacketFilterInfo); + LOGPARSERR("PacketFilterInfo::filterType",ret,12,&KPacketFilterInfo); continue; } } @@ -1253,7 +1248,7 @@ * */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DTOR_1, "CSimPacketContext: Entered destructor"); + LOGPACKET1("CSimPacketContext: Entered destructor"); if (iContextConfigParams != NULL) { @@ -1456,7 +1451,7 @@ return KErrNone; default: // Unknown or invalid IPC - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_REGISTERNOTIFICATION_1, "CSimPacketContext: Register error, unknown IPC"); + LOGPACKET1("CSimPacketContext: Register error, unknown IPC"); return KErrNotSupported; } } @@ -1479,11 +1474,11 @@ case EPacketContextNotifyConfigChanged: case EPacketContextNotifyStatusChange: case EPacketContextNotifyDataTransferred: - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_1, "CSimPacketContext: DeregisterNotification"); + LOGPACKET1("CSimPacketContext: DeregisterNotification"); return KErrNone; default: // Unknown or invalid IPC - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_2, "CSimPacketContext: Deregister error, unknown IPC"); + LOGPACKET1("CSimPacketContext: Deregister error, unknown IPC"); return KErrNotSupported; } } @@ -1504,12 +1499,12 @@ case EPacketContextNotifyConfigChanged: case EPacketContextNotifyStatusChange: case EPacketContextNotifyDataTransferred: - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NUMBEROFSLOTSL_1, "CGprsDGprsTsy: Registered with 5 slots"); + LOGPACKET1("CGprsDGprsTsy: Registered with 5 slots"); numberOfSlots=5; break; default: // Unknown or invalid IPC - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NUMBEROFSLOTSL_2, "CSimPacketContext: Number of Slots error, unknown IPC"); + LOGPACKET1("CSimPacketContext: Number of Slots error, unknown IPC"); User::Leave(KErrNotSupported); break; } @@ -1558,7 +1553,7 @@ TRAPD(ret, iSetConfigData->AppendL(setConfigData) ); if (ret != KErrNone) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_EXTFUNC_1, "CSimPacketContext::ExtFunc AppendL call fail"); + LOGPACKET1("CSimPacketContext::ExtFunc AppendL call fail"); return ret; } @@ -1708,7 +1703,7 @@ * @return err KErrNone if request completes ok */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CANCELSERVICE_1, "CSimPacketContext: - CancelService called"); + LOGPACKET1("CSimPacketContext: - CancelService called"); switch (aIpc) { case EPacketContextSetConfig: @@ -1782,7 +1777,7 @@ */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_SETCONFIG_1, "CSimPacketContext::SetConfig called"); + LOGPACKET1("CSimPacketContext::SetConfig called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -1902,7 +1897,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONFIG_1, "CSimPacketContext::GetConfig called"); + LOGPACKET1("CSimPacketContext::GetConfig called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -2007,7 +2002,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYCONFIGCHANGEDCANCEL_1, "CSimPacketContext::NotifyConfigChangedCancel called"); + LOGPACKET1("CSimPacketContext::NotifyConfigChangedCancel called"); if(iNotifyConfigGPRS.iNotifyPending && iNotifyConfigGPRS.iNotifyHandle == aTsyReqHandle) { @@ -2114,7 +2109,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEACTIVATE_1, "CSimPacketContext::Deactivate called"); + LOGPACKET1("CSimPacketContext::Deactivate called"); iDeactivateRequestHandle = aTsyReqHandle; TInt ret; ret = ActionEvent(EContextEventDeactivate,KErrNone); @@ -2131,7 +2126,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEACTIVATECANCEL_1, "CSimPacketContext::DeactivateCancel called"); + LOGPACKET1("CSimPacketContext::DeactivateCancel called"); if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusDeactivating)) && (iCurrentEvent==EContextEventDeactivate)) { @@ -2231,7 +2226,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIVATECANCEL_1, "CSimPacketContext::ActivateCancel called"); + LOGPACKET1("CSimPacketContext::ActivateCancel called"); if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusActivating)) && (iCurrentEvent==EContextEventActivate)) { @@ -2282,7 +2277,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DELETE_1, "CSimPacketContext::Delete called"); + LOGPACKET1("CSimPacketContext::Delete called"); iDeleteRequestHandle = aTsyReqHandle; TInt ret; ret = ActionEvent(EContextEventDelete,KErrNone); @@ -2299,7 +2294,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DELETECANCEL_1, "CSimPacketContext::DeleteCancel called"); + LOGPACKET1("CSimPacketContext::DeleteCancel called"); if((iState == RPacketContext::EStatusInactive) && (iCurrentEvent==EContextEventDelete)) { iTimer->Cancel(); @@ -2318,7 +2313,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_LOANCOMMPORT_1, "CSimPacketContext::LoanCommPort called"); + LOGPACKET1("CSimPacketContext::LoanCommPort called"); if(iState != RPacketContext::EStatusActive) { @@ -2348,7 +2343,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_LOANCOMMPORTCANCEL_1, "CSimPacketContext::LoanCommPortCancel called"); + LOGPACKET1("CSimPacketContext::LoanCommPortCancel called"); return KErrNone; } @@ -2360,7 +2355,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_RECOVERCOMMPORT_1, "CSimPacketContext::RecoverCommPort called"); + LOGPACKET1("CSimPacketContext::RecoverCommPort called"); if (!iCommPortLoaned) { ReqCompleted(aTsyReqHandle, KErrEtelPortNotLoanedToClient); @@ -2380,7 +2375,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_RECOVERCOMMPORTCANCEL_1, "CSimPacketContext::RecoverCommPortCancel called"); + LOGPACKET1("CSimPacketContext::RecoverCommPortCancel called"); return KErrNone; } @@ -2393,7 +2388,7 @@ * @return KerrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSTATUS_1, "CSimPacketContext::GetStatus called"); + LOGPACKET1("CSimPacketContext::GetStatus called"); *aContextStatus = iState; ReqCompleted(aTsyReqHandle,KErrNone); return KErrNone; @@ -2411,7 +2406,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGE_1, "CSimPacketContext::NotifyStatusChange called"); + LOGPACKET1("CSimPacketContext::NotifyStatusChange called"); __ASSERT_ALWAYS(!iNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); iNotifyStatusChange.iNotifyPending = ETrue; iNotifyStatusChange.iNotifyHandle = aTsyReqHandle; @@ -2430,7 +2425,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGECANCEL_1, "CSimPacketContext::NotifyStatusChangeCancel called"); + LOGPACKET1("CSimPacketContext::NotifyStatusChangeCancel called"); if(iNotifyStatusChange.iNotifyPending) { iNotifyStatusChange.iNotifyPending=EFalse; @@ -2449,7 +2444,7 @@ * @return KErrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETDATAVOLUMETRANSFERRED_1, "CSimPacketContext::GetDataVolumeTransferred called"); + LOGPACKET1("CSimPacketContext::GetDataVolumeTransferred called"); ReqCompleted(aTsyReqHandle,KErrNotSupported); return KErrNone; } @@ -2477,7 +2472,7 @@ * @return KerrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYDATATRANSFERREDCANCEL_1, "CSimPacketContext::NotifyDataTransferredCancel called"); + LOGPACKET1("CSimPacketContext::NotifyDataTransferredCancel called"); return KErrNone; } @@ -2490,7 +2485,7 @@ * @return KerrNone */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETLASTERRORCAUSE_1, "CSimPacketContext::GetLastErrorCause called"); + LOGPACKET1("CSimPacketContext::GetLastErrorCause called"); *aError = iLastError; ReqCompleted(aTsyReqHandle,iErrorCodeForGetLastErrorCause); iErrorCodeForGetLastErrorCause = KErrNone; @@ -2552,7 +2547,7 @@ else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_TIMERCALLBACK_1, ">>CSimPacketContext.cpp: Invalid new context config param index"); + LOGMISC1(">>CSimPacketContext.cpp: Invalid new context config param index"); } //Delete the current NotifyContextConfigChange item and set the next one if possible @@ -2573,10 +2568,10 @@ break; default: { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_TIMERCALLBACK_2, ">>CSimPacketContext::TimerCallBack"); + LOGPACKET1(">>CSimPacketContext::TimerCallBack"); TInt ret=ActionEvent(EContextEventTimeOut,KErrNone); __ASSERT_ALWAYS(ret==KErrNone,SimPanic(ETimeOutEventActionFailed)); // Note: this is very crude error handling and should be replaced by something rather more elegant. - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_TIMERCALLBACK_3, "<>CSimPacketContext::ChangeState [newState=%d]", aNewState); + LOGPACKET2(">>CSimPacketContext::ChangeState [newState=%d]", aNewState); __ASSERT_ALWAYS(aNewState!=RPacketContext::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal)); if(iState==aNewState) @@ -2723,7 +2718,7 @@ } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CHANGESTATE_2, "<>CSimPacketContext::ActionEvent = [EContextEventActivate]"); + LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventActivate]"); if(iState==RPacketContext::EStatusInactive) { iCurrentEvent=EContextEventActivate; @@ -2776,7 +2771,7 @@ break; case EContextEventDeactivate: - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_2, ">>CSimPacketContext::ActionEvent = [EContextEventDeactivate]"); + LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventDeactivate]"); if(iState==RPacketContext::EStatusActive) { iCurrentEvent=EContextEventDeactivate; @@ -2796,7 +2791,7 @@ break; case EContextEventDelete: - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_3, ">>CSimPacketContext::ActionEvent = [EContextEventDelete]"); + LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventDelete]"); if(iState==RPacketContext::EStatusInactive) { iCurrentEvent=EContextEventDelete; @@ -2832,7 +2827,7 @@ break; case EContextEventTimeOut: - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_4, ">>CSimPacketContext::ActionEvent = [EContextEventTimeOut]"); + LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventTimeOut]"); switch(iCurrentEvent) { case EContextEventNone: @@ -3603,7 +3598,7 @@ TRAPD(ret, mediaAuthV3 = RPacketContext::CTFTMediaAuthorizationV3::NewL()); if (ret != KErrNone) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_1, "CSimPacketContext::GetAddMediaAuthorization NewL call fail"); + LOGPACKET1("CSimPacketContext::GetAddMediaAuthorization NewL call fail"); return ret; } @@ -3611,7 +3606,7 @@ if (ret != KErrNone) { delete mediaAuthV3; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_2, "CSimPacketContext::GetAddMediaAuthorization InternalizeL call fail"); + LOGPACKET1("CSimPacketContext::GetAddMediaAuthorization InternalizeL call fail"); return ret; }