--- a/telephonyserverplugins/simtsy/src/csimsmsmess.cpp Mon May 24 18:38:31 2010 +0100
+++ b/telephonyserverplugins/simtsy/src/csimsmsmess.cpp Tue Jun 22 11:02:32 2010 +0100
@@ -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"
@@ -17,9 +17,15 @@
@file
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "csimsmsmessTraces.h"
+#endif
+
#include "csimsmsmess.h"
#include <testconfigfileparser.h>
-#include "Simlog.h"
#include <etelmm.h>
#include "CSimTsyMode.h"
@@ -74,7 +80,7 @@
void CSimSmsMessaging::InitializeL()
{
- LOGSMS1("Starting to Load and Parse Sms Messaging Config ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_INITIALIZEL_1, "Starting to Load and Parse Sms Messaging Config ");
iRxTimer=CSimTimer::NewL(iPhone);
iTxTimer=CSimTimer::NewL(iPhone);
iSmspTimer=CSimTimer::NewL(iPhone);
@@ -96,7 +102,7 @@
// NOTE - no need to start iRxTimer; this will be started once a EMobileSmsMessagingReceiveMessage
// request is received and/or Send Sms contrainst satisfied (see CompleteTxPendingReq)
- LOGSMS1("Finished parsing SMS Messaging config parameters");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_INITIALIZEL_2, "Finished parsing SMS Messaging config parameters");
}
@@ -178,7 +184,7 @@
TInt i;
TSmsRxParametersGsm smsRxParameterGsm;
- LOGSMS2("CSimSmsMessaging::FindAndCreateRxAttributesL IN [count=%d]", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_1, "CSimSmsMessaging::FindAndCreateRxAttributesL IN [count=%d]", count);
// Need to do this *before* entering the loop (so that we know
// whether or not to read a delivery report pdu off the config file).
@@ -194,7 +200,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,smsPdu);
if(ret!=KErrNone)
{
- LOGPARSERR("smsPdu",ret,0,&KSmsRx);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SMSPDU returned %d (element no. %d) from tag %s.",ret,0,KSmsRx);
continue;
}
else
@@ -206,7 +212,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,sca);
if(ret!=KErrNone)
{
- LOGPARSERR("sca",ret,1,&KSmsRx);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,1,KSmsRx);
continue;
}
else
@@ -222,7 +228,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,deliveryReportPdu);
if( (ret!=KErrNone) && (ret!=KErrGeneral) )
{
- LOGPARSERR("deliveryReportPdu",ret,2,&KSmsRx);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DELIVERYREPORTPDU returned %d (element no. %d) from tag %s.",ret,2,KSmsRx);
}
else
{
@@ -246,9 +252,9 @@
if (iSmsControlCaps & RMobileSmsMessaging::KCapsReceiveUnstoredClientAck)
iSmsReceiveMode=RMobileSmsMessaging::EReceiveUnstoredClientAck;
else iSmsReceiveMode=RMobileSmsMessaging::EReceiveModeUnspecified;
- LOGSMS5("iSmsRxPeriod =%d, iAckNackCompletePause=%d, iResumeCompletePause=%d, iSmsControlCaps=%d",iSmsRxPeriod, iAckNackCompletePause, iResumeCompletePause, iSmsControlCaps);
- LOGSMS4("iSmsModeCaps =%d, iSmsRxStartDelay = %d, iSmsReceiveMode = %d",iSmsModeCaps , iSmsRxStartDelay, iSmsReceiveMode);
- LOGSMS2("CSimSmsMessaging::FindAndCreateRxAttributesL OUT [count=%d]", iSmsRxParameterListGsm->Count());
+ OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_5, "iSmsRxPeriod =%d, iAckNackCompletePause=%d, iResumeCompletePause=%d, iSmsControlCaps=%d",iSmsRxPeriod, iAckNackCompletePause, iResumeCompletePause, iSmsControlCaps);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_6, "iSmsModeCaps =%d, iSmsRxStartDelay = %d, iSmsReceiveMode = %d",iSmsModeCaps , iSmsRxStartDelay, iSmsReceiveMode);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_7, "CSimSmsMessaging::FindAndCreateRxAttributesL OUT [count=%d]", iSmsRxParameterListGsm->Count());
}
void CSimSmsMessaging::FindAndCreateTxAttributesL()
@@ -275,7 +281,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,smsTx);
if(ret!=KErrNone)
{
- LOGPARSERR("smsTx",ret,0,&KSmsTx);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SMSTX returned %d (element no. %d) from tag %s.",ret,0,KSmsTx);
continue;
}
else
@@ -289,7 +295,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,sca);
if (ret!=KErrNone)
{
- LOGPARSERR("sca",ret,1,&KSmsTx);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,1,KSmsTx);
continue;
}
else
@@ -302,7 +308,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,reference);
if(ret!=KErrNone)
{
- LOGPARSERR("reference",ret,2,&KSmsTx);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element REFERENCE returned %d (element no. %d) from tag %s.",ret,2,KSmsTx);
smsTxParametersGsm.iRef=KNoMessageReferenceInCofigurationFile;
}
else
@@ -315,7 +321,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,submitReportPdu);
if(ret!=KErrNone)
{
- LOGPARSERR("submitReportPdu",ret,3,&KSmsTx);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SUBMITREPORTPDU returned %d (element no. %d) from tag %s.",ret,3,KSmsTx);
continue;
}
else
@@ -329,7 +335,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,errorCode);
if(ret!=KErrNone)
{
- LOGPARSERR("errorCode",ret,4,&KSmsTx);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element ERRORCODE returned %d (element no. %d) from tag %s.",ret,4,KSmsTx);
continue;
}
else
@@ -365,7 +371,7 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,ipc);//only :SendMessage() is supported
if(ret!=KErrNone || ipc!=4207)
{
- LOGPARSERR("ipc",ret,0,&KSmsStartRxDelay);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element IPC returned %d (element no. %d) from tag %s.",ret,0,KSmsStartRxDelay);
continue;
}
@@ -374,7 +380,7 @@
constraint.iIpcCnt=noBefore;
else
{
- LOGPARSERR("noBefore",ret,1,&KSmsStartRxDelay);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NOBEFORE returned %d (element no. %d) from tag %s.",ret,1,KSmsStartRxDelay);
continue;
}
@@ -383,7 +389,7 @@
constraint.iRxCnt=noAfter;
else
{
- LOGPARSERR("noAfter",ret,2,&KSmsStartRxDelay);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element NOAFTER returned %d (element no. %d) from tag %s.",ret,2,KSmsStartRxDelay);
continue;
}
@@ -413,14 +419,14 @@
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,storeName);
if(ret!=KErrNone)
{
- LOGPARSERR("storeName",ret,0,&KSmsStore);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element STORENAME returned %d (element no. %d) from tag %s.",ret,0,KSmsStore);
continue;
}
ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,maxNumSlots);
if(ret!=KErrNone)
{
- LOGPARSERR("maxNumSlots",ret,1,&KSmsStore);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXNUMSLOTS returned %d (element no. %d) from tag %s.",ret,1,KSmsStore);
continue;
}
@@ -472,7 +478,7 @@
entry.iIndex=index;
else
{
- LOGPARSERR("index",ret,0,&KSmsParamEntry);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element INDEX returned %d (element no. %d) from tag %s.",ret,0,KSmsParamEntry);
continue;
}
@@ -481,7 +487,7 @@
entry.iText.Copy(smspName);
else
{
- LOGPARSERR("smspName",ret,1,&KSmsParamEntry);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SMSPNAME returned %d (element no. %d) from tag %s.",ret,1,KSmsParamEntry);
continue;
}
@@ -493,7 +499,7 @@
}
else
{
- LOGPARSERR("pid",ret,2,&KSmsParamEntry);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PID returned %d (element no. %d) from tag %s.",ret,2,KSmsParamEntry);
continue;
}
@@ -505,7 +511,7 @@
}
else
{
- LOGPARSERR("dcs",ret,3,&KSmsParamEntry);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DCS returned %d (element no. %d) from tag %s.",ret,3,KSmsParamEntry);
continue;
}
@@ -517,7 +523,7 @@
}
else
{
- LOGPARSERR("validityPeriod",ret,4,&KSmsParamEntry);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element VALIDITYPERIOD returned %d (element no. %d) from tag %s.",ret,4,KSmsParamEntry);
continue;
}
@@ -528,7 +534,7 @@
}
else
{
- LOGPARSERR("destAddress",ret,5,&KSmsParamEntry);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTADDRESS returned %d (element no. %d) from tag %s.",ret,5,KSmsParamEntry);
continue;
}
@@ -539,7 +545,7 @@
}
else
{
- LOGPARSERR("sca",ret,6,&KSmsParamEntry);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,6,KSmsParamEntry);
continue;
}
@@ -581,7 +587,7 @@
}
}
-#ifdef _DEBUG // to stop the UREL build warnings
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to stop the UREL build warnings
void CSimSmsMessaging::LogRequest(const TBool aEntering, TInt aIpc, TInt aError)
#else
void CSimSmsMessaging::LogRequest(const TBool aEntering, TInt aIpc, TInt /*aError*/)
@@ -711,11 +717,13 @@
if (aEntering!=EFalse)
{
- LOGSMS3(">>%d,CSimSmsMessaging::%S",aIpc, &ipcBuf );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGREQUEST1_1, ">>%d,CSimSmsMessaging::%s",aIpc, ipcBuf );
}
else
{
- LOGSMS4("<<%d, CSimSmsMessaging::%S with error %d",aIpc, &ipcBuf, aError);
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to stop the UREL build warnings
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGREQUEST1_2, "<<%d, CSimSmsMessaging::%s with error %d",aIpc, ipcBuf, aError);
+#endif
}
}
@@ -849,12 +857,12 @@
if(iSmsTxCnt==(iConstraints[i].iIpcCnt))
{
iCurrentConstraint=i;
- LOGSMS2("New Constraint : %d", iCurrentConstraint);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_IPCMATCH_1, "New Constraint : %d", iCurrentConstraint);
if(i!=0)
{
if( !constraintEllapsed )
{
- LOGSMS1("Panic The constraints are overlapping...Compare test code and config file");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_IPCMATCH_2, "Panic The constraints are overlapping...Compare test code and config file");
}
__ASSERT_ALWAYS(constraintEllapsed!=EFalse,SimPanic(EConstraintsOverlapping));
}
@@ -869,7 +877,7 @@
*
*/
{
- LOGSMS1(">>CSimSmsMessaging::OpenNewObjectByNameL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_OPENNEWOBJECTBYNAMEL_1, ">>CSimSmsMessaging::OpenNewObjectByNameL");
TBuf8<KMaxName> name;
name.Copy(aName); // Do simple 16 bit to 8 bit conversion
for(TInt i=0;i<iSmsStores->Count();i++)
@@ -1031,7 +1039,7 @@
*
*/
{
- LOGSMS3(">>CSimSmsMessaging::ActionRxEventUnstoredClientAck [iRxState=%d aRxEvent=%d]", iRxState, aRxEvent);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_1, ">>CSimSmsMessaging::ActionRxEventUnstoredClientAck [iRxState=%d aRxEvent=%d]", iRxState, aRxEvent);
switch(iRxState)
{
case ESmsRxStateIdle:
@@ -1066,7 +1074,7 @@
iRxState=ESmsRxStateWaitingForNetworkAckNackResponse;
if (!iRxTimer->IsActive() && !iRxTimer->Running())
{
- LOGSMS1(">>CSimSmsMessaging::ActionRxEventUnstoredClientAck Starting Rx Timer");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_2, ">>CSimSmsMessaging::ActionRxEventUnstoredClientAck Starting Rx Timer");
iRxTimer->Start(iAckNackCompletePause,this, ETimerIdSmsMessRx);
}
@@ -1128,7 +1136,7 @@
*
*/
{
- LOGSMS3(">> ActionRxEventUnstoredPhoneAck Enter function. Event=%d, State=%d",aRxEvent,iRxState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDPHONEACK_1, ">> ActionRxEventUnstoredPhoneAck Enter function. Event=%d, State=%d",aRxEvent,iRxState);
TInt ret = KErrGeneral;
@@ -1169,7 +1177,7 @@
*
*/
{
- LOGSMS3(">> ActionRxEventStored Enter function. Event=%d, State=%d",aRxEvent,iRxState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTSTORED_1, ">> ActionRxEventStored Enter function. Event=%d, State=%d",aRxEvent,iRxState);
TInt ret = KErrGeneral;
switch(iRxState)
@@ -1238,7 +1246,7 @@
iSmsRxAttrib=&attrib;
iSmsRxReqOutstanding=ETrue;
- LOGSMS3(">>ReceiveMessageL. aSmsPdu&=%x, aParam2&=%x",aSmsPdu,iSmsRxAttrib);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_RECEIVEMESSAGEL_1, ">>ReceiveMessageL. aSmsPdu&=0x%x, aParam2&=0x%x",(TUint)aSmsPdu,(TUint)iSmsRxAttrib);
// Print received PDU to simTSY log.
__ASSERT_ALWAYS(iSmsReceiveMode!=RMobileSmsMessaging::EReceiveModeUnspecified,SimPanic(EMobileSmsMessagingPhoneNotSetToAReceiveMode));
@@ -1422,7 +1430,7 @@
*
*/
{
- LOGSMS1(">>ActionTxEvent ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONTXEVENT_1, ">>ActionTxEvent ");
switch(iTxState)
{
case ESmsTxStateIdle:
@@ -1471,7 +1479,7 @@
}
iSmsTxAttrib=&attrib;
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
LogTMobileSmsAttributesV1(*iSmsTxAttrib);
#endif // _DEBUG
@@ -1540,7 +1548,7 @@
* update the constraint count
*/
{
- LOGSMS1(">>AttemptSmsRxComplete ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_1, ">>AttemptSmsRxComplete ");
if (CSimTsyMode::GetMode() != CSimTsyMode::ECdmaV1)
{
@@ -1552,7 +1560,7 @@
{
if (iSmsReceiveMode==RMobileSmsMessaging::EReceiveStored)
{
- LOGSMS4(">>Populating SMS Structures. iSmsRxPdu&=%x, iSmsRxAttrib&=%x, iSmsRxCnt=%d.",iSmsRxPdu,iSmsRxAttrib,iSmsRxCnt);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_2, ">>Populating SMS Structures. iSmsRxPdu&=0x%x, iSmsRxAttrib&=0x%x, iSmsRxCnt=%d.",(TUint)iSmsRxPdu,(TUint)iSmsRxAttrib,iSmsRxCnt);
RMobileSmsStore::TMobileGsmSmsEntryV1 sms;
*iSmsRxPdu=iSmsRxParameterListGsm->At(iSmsRxCnt).iPdu;
@@ -1593,7 +1601,7 @@
*
*/
{
- LOGSMS1(">>CompleteTxPendingReq ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_1, ">>CompleteTxPendingReq ");
iSmsTxCnt++;
if(IpcMatch())
{
@@ -1623,7 +1631,7 @@
{
// No pending client receive request - need to wait for it before
// simulating received SMS from network.
- LOGSMS1(" - no pending receive req from client - do not start Rx timer");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_2, " - no pending receive req from client - do not start Rx timer");
}
}
ReqCompleted(iSmsTxReqHandle, aError);
@@ -1631,7 +1639,7 @@
void CSimSmsMessaging::StartSmsMtTimer()
{
- LOGSMS1(">>StartSmsMtTimer ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_1, ">>StartSmsMtTimer ");
TInt count = 0;
count = iSmsRxCnt<iSmsRxParameterListGsm->Count();
@@ -1639,9 +1647,9 @@
{
if((iConstraints.Count()==0) || (iConstraintRxCnt<iConstraints[iCurrentConstraint].iRxCnt)) // If there are no constraints, or there are constraints and they're not exhausted.
{
- LOGSMS1(">>StartSmsMtTimer Starting");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_2, ">>StartSmsMtTimer Starting");
iRxTimer->Start(iSmsRxPeriod,this, ETimerIdSmsMessRx);
- LOGSMS1(">>StartSmsMtTimer Started");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_3, ">>StartSmsMtTimer Started");
}
}
}
@@ -1654,7 +1662,7 @@
* accordingly. The address can then be copied into the iTelNumber structure.
*/
{
- LOGSMS1(">>PopulateSmsRxAttrib, ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_POPULATESMSRXATTRIB_1, ">>PopulateSmsRxAttrib, ");
aAttrib->iOriginator.iTelNumber.SetLength(0);
switch (iSmsReceiveMode)
@@ -2025,11 +2033,11 @@
return leaveCode;
iSmspReqHandle=aTsyReqHandle;
iSmspTimer->Start(iSmspBatchPause,this, ETimerIdSmsMessSmsp);
- LOGSMS1("<<StoreSmsList,Exit function");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STORESMSPLIST_1, "<<StoreSmsList,Exit function");
return KErrNone;
}
else
- LOGSMS1("<<StoreSmsList,Exit function");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STORESMSPLIST_2, "<<StoreSmsList,Exit function");
return KErrInUse;
}
@@ -2069,7 +2077,7 @@
*
*/
{
- LOGSMS3(">>CSimSmsMesaging::TimerCallBack IN [aId=%d iSmsReceiveMode=%d]", aId, iSmsReceiveMode);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_1, ">>CSimSmsMesaging::TimerCallBack IN [aId=%d iSmsReceiveMode=%d]", aId, iSmsReceiveMode);
switch(aId)
{
case ETimerIdSmsMessTx:
@@ -2097,7 +2105,7 @@
ret=ActionRxEventUnstoredPhoneAck(ESmsEventRxTimer);
break;
case RMobileSmsMessaging::EReceiveStored:
- LOGSMS1("Recieve Stored SMS Rx Event.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_2, "Recieve Stored SMS Rx Event.");
ret=ActionRxEventStored(ESmsEventRxTimer);
break;
default://other receive modes cannot be set
@@ -2106,7 +2114,7 @@
if (ret != KErrNone)
{
- LOGSMS2("ERROR: Unexpected ret code %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_3, "ERROR: Unexpected ret code %d", ret);
__ASSERT_ALWAYS(ret==KErrNone,SimPanic(EIllegalSmsRxEvent, __LINE__)); // There should be no error from this action, but to check...
}
@@ -2131,7 +2139,7 @@
default:
break;
}
- LOGSMS1(">>CSimSmsMesaging::TimerCallBack OUT");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_4, ">>CSimSmsMesaging::TimerCallBack OUT");
}
const CTestConfigSection* CSimSmsMessaging::CfgFileSection()
@@ -2141,7 +2149,7 @@
* @return CTestConfigSection a pointer to the configuration file data section
*/
{
- LOGSMS1(">>CSimSmsMessaging::CfgFileSection");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_CFGFILESECTION_1, ">>CSimSmsMessaging::CfgFileSection");
return iPhone->CfgFile();
}
@@ -2196,7 +2204,7 @@
return hexBuf;
}
-#ifdef _DEBUG // to prevent UREL build warnings
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to prevent UREL build warnings
void CSimSmsMessaging::DumpPdu(const TDesC8& aText, TDesC8& aSmsPdu, HBufC8* aPduInAscii)
#else
void CSimSmsMessaging::DumpPdu(const TDesC8& /*aText*/, TDesC8& aSmsPdu, HBufC8* aPduInAscii)
@@ -2208,7 +2216,9 @@
@param aPduInAscii - aSmsPdu in ASCII format (default NULL).
*/
{
- LOGSMS3("%S pdu length=%d", &aText, aSmsPdu.Length());
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to stop the UREL build warnings
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_DUMPPDU1_1, "%s pdu length=%d", aText, aSmsPdu.Length());
+#endif
if( !aSmsPdu.Length() )
return;
@@ -2224,14 +2234,14 @@
{
TInt len = Min(100, hexBuf->Mid(i).Length());
TPtrC8 pduChunk(hexBuf->Mid(i).Left(len).Ptr(), len);
- LOGSMS2("PDU Chunk: %S:", &pduChunk);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_DUMPPDU1_2, "PDU Chunk: %s:", pduChunk);
}
if (0 == aPduInAscii)
delete hexBuf;
}
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
/**
Appends Type of number and Numbering plan identification to TBuf8 buffer.
@@ -2357,30 +2367,30 @@
TBuf8<KTextWidth> buffer;
- LOGSMS1("Send Sms Attributes:");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_1, "Send Sms Attributes:");
buffer.Zero();
buffer.Copy(KFLAGS);
buffer.Append(_L8("0x"));
buffer.AppendFormat(_L8("%08X") , ((TInt)(aSmsAttributesV1.iFlags)));
- LOGSMS2("Buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_2, "Buffer: %s", buffer);
if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KGsmServiceCentre)
{
buffer.Zero();
buffer.Copy(KSCADDR);
buffer.Append(aSmsAttributesV1.iGsmServiceCentre.iTelNumber);
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_3, "Buffer: %s", buffer);
buffer.Zero();
buffer.Copy(KSCADDRTON);
AppendTonToBuffer(buffer,(aSmsAttributesV1.iGsmServiceCentre.iTypeOfNumber));
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_4, "Buffer: %s", buffer);;
buffer.Zero();
buffer.Copy(KSCADDRNPI);
AppendNpiToBuffer(buffer,(aSmsAttributesV1.iGsmServiceCentre.iNumberPlan));
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_5, "Buffer: %s", buffer);
}
if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KSmsDataFormat)
{
@@ -2394,7 +2404,7 @@
{
buffer.Append(_L("EFormatGsmTpdu"));
}
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_6, "Buffer: %s", buffer);
}
if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KRemotePartyInfo)
{
@@ -2403,17 +2413,17 @@
buffer.Zero();
buffer.Copy(KDEADDR);
buffer.Append(smsSendAttributesV1.iDestination.iTelNumber);
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_7, "Buffer: %s", buffer);
buffer.Zero();
buffer.Copy(KDEADDRTON);
AppendTonToBuffer(buffer,(smsSendAttributesV1.iDestination.iTypeOfNumber));
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_8, "Buffer: %s", buffer);
buffer.Zero();
buffer.Copy(KDEADDRNPI);
AppendNpiToBuffer(buffer,(smsSendAttributesV1.iDestination.iNumberPlan));
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_9, "Buffer: %s", buffer);
}
if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KMoreToSend)
{
@@ -2430,7 +2440,7 @@
{
buffer.Append(_L8("EFalse"));
}
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_10, "Buffer: %s", buffer);
}
if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KMessageReference)
{
@@ -2440,7 +2450,7 @@
buffer.Copy(KMSGREF);
buffer.Append(_L("0x"));
buffer.AppendFormat(_L8("%08X") , smsSendAttributesV1.iMsgRef);
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_11, "Buffer: %s", buffer);
}
if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KGsmSubmitReport)
@@ -2466,7 +2476,7 @@
buffer.AppendFormat(_L8("%X") , smsSendAttributesV1.iSubmitReport[j]);
j++;
}
- LOGSMS2("buffer: %S", &buffer);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_12, "Buffer: %s", buffer);
buffer.Zero();
i=0;
l+=KTextWidth;