FCL/sf/os/cellularsrv: comparison telephonyserverplugins/simtsy/src/csimsmsmess.cpp

equal deleted inserted replaced

-:630d2f34d719
+:07a122eea281
-// 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"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 /**
 @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"
 //macro
 #define UNPACK_PCKG(target,source,datatype)  datatype& target=  (*(TPckg<datatype>*)(source))()
 InitializeL();
 }
 void CSimSmsMessaging::InitializeL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_INITIALIZEL_1, "Starting to Load and Parse Sms Messaging Config ");
+	LOGSMS1("Starting to Load and Parse Sms Messaging Config ");
 	iRxTimer=CSimTimer::NewL(iPhone);
 	iTxTimer=CSimTimer::NewL(iPhone);
 	iSmspTimer=CSimTimer::NewL(iPhone);
 	iSmsRxParameterListGsm=new(ELeave) CArrayFixFlat<TSmsRxParametersGsm>(KSmsSettingGranularity);
 	FindAndCreateSmsParamsL();
 	// NOTE - no need to start iRxTimer; this will be started once a EMobileSmsMessagingReceiveMessage
 	// request is received and/or Send Sms contrainst satisfied (see CompleteTxPendingReq)
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_INITIALIZEL_2, "Finished parsing SMS Messaging config parameters");
+	LOGSMS1("Finished parsing SMS Messaging config parameters");
 	}
 void CSimSmsMessaging::Reset()
 {
 	TInt count=CfgFileSection()->ItemCount(KSmsRx);
 	const CTestConfigItem* item=NULL;
 	TInt i;
 	TSmsRxParametersGsm smsRxParameterGsm;
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_1, "CSimSmsMessaging::FindAndCreateRxAttributesL IN [count=%d]", count);
+	LOGSMS2("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).
 	iSmsControlCaps=RMobileSmsMessaging::TMobileSmsControlCaps(CfgFileSection()->ItemValue(KSmsControlCaps,KDefaultSmsControlCaps));
 		TPtrC8 smsPdu,sca;
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,smsPdu);
 		if(ret!=KErrNone)
 			{
-			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);
+			LOGPARSERR("smsPdu",ret,0,&KSmsRx);
 			continue;
 			}
 		else
 			{
 			smsRxParameterGsm.iPdu.Zero();
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,sca);
 		if(ret!=KErrNone)
 			{
-			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);
+			LOGPARSERR("sca",ret,1,&KSmsRx);
 			continue;
 			}
 		else
 			{
 			smsRxParameterGsm.iSca=sca;
 			{
 			TPtrC8 deliveryReportPdu;
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,deliveryReportPdu);
 			if( (ret!=KErrNone) && (ret!=KErrGeneral) )
 				{
-				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);
+				LOGPARSERR("deliveryReportPdu",ret,2,&KSmsRx);
 				}
 			else
 				{
 				if (CSimTsyMode::GetMode() != CSimTsyMode::ECdmaV1)
 					{
 	iResumeCompletePause=CfgFileSection()->ItemValue(KSmsResumePause,KDefaultSmsResumePause);
 	if (iSmsControlCaps & RMobileSmsMessaging::KCapsReceiveUnstoredClientAck)
 		iSmsReceiveMode=RMobileSmsMessaging::EReceiveUnstoredClientAck;
 	else iSmsReceiveMode=RMobileSmsMessaging::EReceiveModeUnspecified;
-	OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_5, "iSmsRxPeriod =%d, iAckNackCompletePause=%d, iResumeCompletePause=%d, iSmsControlCaps=%d",iSmsRxPeriod, iAckNackCompletePause, iResumeCompletePause, iSmsControlCaps);
+	LOGSMS5("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);
+	LOGSMS4("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());
+	LOGSMS2("CSimSmsMessaging::FindAndCreateRxAttributesL OUT [count=%d]", iSmsRxParameterListGsm->Count());
 	}
 void CSimSmsMessaging::FindAndCreateTxAttributesL()
 /**
 * Extract values from the tags
 		//get pdu
 		TPtrC8 smsTx;
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,smsTx);
 		if(ret!=KErrNone)
 			{
-			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);
+			LOGPARSERR("smsTx",ret,0,&KSmsTx);
 			continue;
 			}
 		else
 			{
 			smsTxParametersGsm.iPdu.Zero();
 		//get Sca
 		TPtrC8 sca;
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,sca);
 		if (ret!=KErrNone)
 			{
-			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);
+			LOGPARSERR("sca",ret,1,&KSmsTx);
 			continue;
 			}
 		else
 			{
 			smsTxParametersGsm.iSca.Copy(sca);
 		//get reference
 		TInt reference;
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,reference);
 		if(ret!=KErrNone)
 			{
-			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);
+			LOGPARSERR("reference",ret,2,&KSmsTx);
 			smsTxParametersGsm.iRef=KNoMessageReferenceInCofigurationFile;
 			}
 		else
 			{
 			smsTxParametersGsm.iRef=reference;
 		//get submit report pdu
 		TPtrC8 submitReportPdu;
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,submitReportPdu);
 		if(ret!=KErrNone)
 			{
-			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);
+			LOGPARSERR("submitReportPdu",ret,3,&KSmsTx);
 			continue;
 			}
 		else
 			{
 			smsTxParametersGsm.iSubmitReport.Zero();
 		//get expected error code
 		TInt errorCode;
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,errorCode);
 		if(ret!=KErrNone)
 			{
-			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);
+			LOGPARSERR("errorCode",ret,4,&KSmsTx);
 			continue;
 			}
 		else
 			{
 			smsTxParametersGsm.iExpectedError=errorCode;
 		TInt ipc,noBefore,noAfter;
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,ipc);//only :SendMessage() is supported
 		if(ret!=KErrNone || ipc!=4207)
 			{
-			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);
+			LOGPARSERR("ipc",ret,0,&KSmsStartRxDelay);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,noBefore);
 		if(ret==KErrNone)
 			constraint.iIpcCnt=noBefore;
 		else
 			{
-			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);
+			LOGPARSERR("noBefore",ret,1,&KSmsStartRxDelay);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,noAfter);
 		if(ret==KErrNone)
 			constraint.iRxCnt=noAfter;
 		else
 			{
-			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);
+			LOGPARSERR("noAfter",ret,2,&KSmsStartRxDelay);
 			continue;
 			}
 		__ASSERT_ALWAYS(iConstraints.Append(constraint) == KErrNone,SimPanic(EGeneral));
 		}
 		TPtrC8 storeName;
 		TInt maxNumSlots;
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,storeName);
 		if(ret!=KErrNone)
 			{
-			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);
+			LOGPARSERR("storeName",ret,0,&KSmsStore);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,maxNumSlots);
 		if(ret!=KErrNone)
 			{
-			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);
+			LOGPARSERR("maxNumSlots",ret,1,&KSmsStore);
 			continue;
 			}
 		CSimSmsStore* smsStore=CSimSmsStore::NewL(this,storeName,maxNumSlots,aPhone);
 		TCleanupItem newObjClose(CloseSmsObj,smsStore);
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,index);
 		if((ret==KErrNone)&&(index < maxSlots))
 			entry.iIndex=index;
 		else
 			{
-			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);
+			LOGPARSERR("index",ret,0,&KSmsParamEntry);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,smspName);
 		if(ret==KErrNone)
 			entry.iText.Copy(smspName);
 		else
 			{
-			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);
+			LOGPARSERR("smspName",ret,1,&KSmsParamEntry);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,pid);
 		if(ret==KErrNone)
 			entry.iProtocolId=TUint8(pid);
 			entry.iValidParams |= RMobileSmsMessaging::KProtocolIdIncluded;
 			}
 		else
 			{
-			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);
+			LOGPARSERR("pid",ret,2,&KSmsParamEntry);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,dcs);
 		if(ret==KErrNone)
 			entry.iDcs=TUint8(dcs);
 			entry.iValidParams |= RMobileSmsMessaging::KDcsIncluded;
 			}
 		else
 			{
-			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);
+			LOGPARSERR("dcs",ret,3,&KSmsParamEntry);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,validityPeriod);
 		if(ret==KErrNone)
 			entry.iValidityPeriod=TUint8(validityPeriod);
 			entry.iValidParams |= RMobileSmsMessaging::KValidityPeriodIncluded;
 			}
 		else
 			{
-			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);
+			LOGPARSERR("validityPeriod",ret,4,&KSmsParamEntry);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,destAddress);
 		if(ret==KErrNone)
 			{
 			RecordDestination(destAddress, entry);
 			}
 		else
 			{
-			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);
+			LOGPARSERR("destAddress",ret,5,&KSmsParamEntry);
 			continue;
 			}
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,sca);
 		if(ret==KErrNone)
 			{
 			RecordSca(sca, entry);
 			}
 		else
 			{
-			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);
+			LOGPARSERR("sca",ret,6,&KSmsParamEntry);
 			continue;
 			}
 		iSmspEntries->AddEntryL(entry);
 		}
 		aEntry.iDestination.iTelNumber.Copy(aAsciiAddr);
 		aEntry.iValidParams |= RMobileSmsMessaging::KDestinationIncluded;
 		}
 	}
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)	// to stop the UREL build warnings
+#ifdef _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*/)
 #endif
 /**
 			break;
 		}
 	if (aEntering!=EFalse)
 		{
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGREQUEST1_1, ">>%d,CSimSmsMessaging::%s",aIpc, ipcBuf );
+		LOGSMS3(">>%d,CSimSmsMessaging::%S",aIpc, &ipcBuf );
 		}
 	else
 		{
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)    // to stop the UREL build warnings
+		LOGSMS4("<<%d, CSimSmsMessaging::%S with error %d",aIpc, &ipcBuf, aError);
-		OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGREQUEST1_2, "<<%d, CSimSmsMessaging::%s with error %d",aIpc, ipcBuf, aError);
-#endif
 		}
 	}
 TInt CSimSmsMessaging::ExtFunc(const TTsyReqHandle aReqHandle,const TInt aIpc, const TDataPackage& aPckg)
 	for(i=0;i<count;++i)
 		{
 		if(iSmsTxCnt==(iConstraints[i].iIpcCnt))
 			{
 			iCurrentConstraint=i;
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_IPCMATCH_1, "New Constraint : %d", iCurrentConstraint);
+			LOGSMS2("New Constraint : %d", iCurrentConstraint);
 			if(i!=0)
 				{
 				if( !constraintEllapsed )
 					{
-					OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_IPCMATCH_2, "Panic The constraints are overlapping...Compare test code and config file");
+					LOGSMS1("Panic The constraints are overlapping...Compare test code and config file");
 					}
 				__ASSERT_ALWAYS(constraintEllapsed!=EFalse,SimPanic(EConstraintsOverlapping));
 				}
 			return ETrue;
 			}
 CTelObject* CSimSmsMessaging::OpenNewObjectByNameL(const TDesC& aName)
 /**
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_OPENNEWOBJECTBYNAMEL_1, ">>CSimSmsMessaging::OpenNewObjectByNameL");
+	LOGSMS1(">>CSimSmsMessaging::OpenNewObjectByNameL");
 	TBuf8<KMaxName> name;
 	name.Copy(aName);		// Do simple 16 bit to 8 bit conversion
 	for(TInt i=0;i<iSmsStores->Count();i++)
 		{
 		if(name.MatchF(iSmsStores->At(i)->Name())==0)
 *	This function, triggered by sms receive events, manages the stated machine of
 *  receiving Unstored clientacked sms messages
 *
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_1, ">>CSimSmsMessaging::ActionRxEventUnstoredClientAck [iRxState=%d aRxEvent=%d]", iRxState, aRxEvent);
+	LOGSMS3(">>CSimSmsMessaging::ActionRxEventUnstoredClientAck [iRxState=%d aRxEvent=%d]", iRxState, aRxEvent);
 	switch(iRxState)
 		{
 	case ESmsRxStateIdle:
 		{
 		if(aRxEvent==ESmsEventPostedRxReq)
 		if(aRxEvent==ESmsEventRxAckNack)
 			{
 			iRxState=ESmsRxStateWaitingForNetworkAckNackResponse;
 			if (!iRxTimer->IsActive() && !iRxTimer->Running())
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_2, ">>CSimSmsMessaging::ActionRxEventUnstoredClientAck Starting Rx Timer");
+				LOGSMS1(">>CSimSmsMessaging::ActionRxEventUnstoredClientAck Starting Rx Timer");
 				iRxTimer->Start(iAckNackCompletePause,this, ETimerIdSmsMessRx);
 				}
 			return KErrNone;
 			}
 *	This function, triggered by sms receive events, manages the stated machine of
 *  receiving Unstored Phone acked sms messages
 *
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDPHONEACK_1, ">> ActionRxEventUnstoredPhoneAck Enter function. Event=%d, State=%d",aRxEvent,iRxState);
+	LOGSMS3(">> ActionRxEventUnstoredPhoneAck Enter function. Event=%d, State=%d",aRxEvent,iRxState);
 	TInt ret = KErrGeneral;
 	switch(iRxState)
 		{
 *	This function, triggered by sms receive events, manages the stated machine of
 *  receiving stored Phone acked  sms messages
 *
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTSTORED_1, ">> ActionRxEventStored Enter function. Event=%d, State=%d",aRxEvent,iRxState);
+	LOGSMS3(">> ActionRxEventStored Enter function. Event=%d, State=%d",aRxEvent,iRxState);
 	TInt ret = KErrGeneral;
 	switch(iRxState)
 		{
 	case ESmsRxStateIdle:
 		return KErrNone;
 		}
 	iSmsRxAttrib=&attrib;
 	iSmsRxReqOutstanding=ETrue;
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_RECEIVEMESSAGEL_1, ">>ReceiveMessageL. aSmsPdu&=0x%x, aParam2&=0x%x",(TUint)aSmsPdu,(TUint)iSmsRxAttrib);
+	LOGSMS3(">>ReceiveMessageL. aSmsPdu&=%x, aParam2&=%x",aSmsPdu,iSmsRxAttrib);
 	//  Print received PDU to simTSY log.
 	__ASSERT_ALWAYS(iSmsReceiveMode!=RMobileSmsMessaging::EReceiveModeUnspecified,SimPanic(EMobileSmsMessagingPhoneNotSetToAReceiveMode));
 	TInt ret=0;
 	switch (iSmsReceiveMode)//swich which state machine to enter
 /**
 *  This function actions the sms message sending state machine. It is triggered by sms sending events
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONTXEVENT_1, ">>ActionTxEvent ");
+	LOGSMS1(">>ActionTxEvent ");
 	switch(iTxState)
 	{
 	case ESmsTxStateIdle:
 		__ASSERT_ALWAYS(aTxEvent!=ESmsEventSubmitReportReceived,SimPanic(EIllegalSmsTxEvent));
 		if(aTxEvent==ESmsEventSendReq)
 		iPhone->ReqCompleted(aReqHandle, err);
 		return KErrNone;
 		}
 	iSmsTxAttrib=&attrib;
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
 		LogTMobileSmsAttributesV1(*iSmsTxAttrib);
 #endif // _DEBUG
 	//check if messages defined in cfg file
 * Complete an outstanding SMS message receive request if one is outstanding.  If there is
 * no request outstanding, the message will be discared.
 * update the constraint count
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_1, ">>AttemptSmsRxComplete ");
+	LOGSMS1(">>AttemptSmsRxComplete ");
 	if (CSimTsyMode::GetMode() != CSimTsyMode::ECdmaV1)
 		{
 		iConstraintRxCnt++;
 		}
 	TInt ret=KErrNone;
 	if(iSmsRxReqOutstanding)
 		{
 		if (iSmsReceiveMode==RMobileSmsMessaging::EReceiveStored)
 			{
-			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);
+			LOGSMS4(">>Populating SMS Structures. iSmsRxPdu&=%x, iSmsRxAttrib&=%x, iSmsRxCnt=%d.",iSmsRxPdu,iSmsRxAttrib,iSmsRxCnt);
 			RMobileSmsStore::TMobileGsmSmsEntryV1 sms;
 			*iSmsRxPdu=iSmsRxParameterListGsm->At(iSmsRxCnt).iPdu;
 			sms.iMsgData=RMobileSmsMessaging::TMobileSmsGsmTpdu(*iSmsRxPdu);
 /**
 * Complete a SmsTx request and increments the SmsTx counter
 *
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_1, ">>CompleteTxPendingReq ");
+	LOGSMS1(">>CompleteTxPendingReq ");
 	iSmsTxCnt++;
 	if(IpcMatch())
 		{
 		iConstraintRxCnt=0;
 		if( iRxState == ESmsRxStateSuspend )
 			}
 		else
 			{
 			// No pending client receive request - need to wait for it before
 			// simulating received SMS from network.
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_2, " - no pending receive req from client - do not start Rx timer");
+			LOGSMS1(" - no pending receive req from client - do not start Rx timer");
 			}
 		}
 	ReqCompleted(iSmsTxReqHandle, aError);
 	}
 void CSimSmsMessaging::StartSmsMtTimer()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_1, ">>StartSmsMtTimer ");
+	LOGSMS1(">>StartSmsMtTimer ");
 	TInt count = 0;
 	count = iSmsRxCnt<iSmsRxParameterListGsm->Count();
 		if(count)		// Check that there are more messages defined in the config file.
 			{
 			if((iConstraints.Count()==0) ||	(iConstraintRxCnt<iConstraints[iCurrentConstraint].iRxCnt))	// If there are no constraints, or there are constraints and they're not exhausted.
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_2, ">>StartSmsMtTimer Starting");
+				LOGSMS1(">>StartSmsMtTimer Starting");
 				iRxTimer->Start(iSmsRxPeriod,this, ETimerIdSmsMessRx);
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_3, ">>StartSmsMtTimer Started");
+				LOGSMS1(">>StartSmsMtTimer Started");
 				}
 			}
 	}
 * Populate the SMS Rx Attributes from an ASCII respresentation, such as that stored in the configuration file.
 * This involves checking the address for a leading '+' character and setting the TON and NPI
 * accordingly.  The address can then be copied into the iTelNumber structure.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_POPULATESMSRXATTRIB_1, ">>PopulateSmsRxAttrib, ");
+	LOGSMS1(">>PopulateSmsRxAttrib, ");
 	aAttrib->iOriginator.iTelNumber.SetLength(0);
 	switch (iSmsReceiveMode)
 		{
 	case RMobileSmsMessaging::EReceiveUnstoredClientAck:
 		TRAPD(leaveCode,iSmspEntries->RestoreL(*aBuffer));
 		if (leaveCode)
 			return leaveCode;
 		iSmspReqHandle=aTsyReqHandle;
 		iSmspTimer->Start(iSmspBatchPause,this, ETimerIdSmsMessSmsp);
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STORESMSPLIST_1, "<<StoreSmsList,Exit function");
+		LOGSMS1("<<StoreSmsList,Exit function");
 		return KErrNone;
 		}
 	else
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STORESMSPLIST_2, "<<StoreSmsList,Exit function");
+		LOGSMS1("<<StoreSmsList,Exit function");
 		return KErrInUse;
 	}
 void CSimSmsMessaging::StoreSmspListCancel()
 * Process a timer call back event.
 * @param aId Contains the Id of the timer that triggered the event
 *
 */
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_1, ">>CSimSmsMesaging::TimerCallBack IN [aId=%d iSmsReceiveMode=%d]", aId, iSmsReceiveMode);
+	LOGSMS3(">>CSimSmsMesaging::TimerCallBack IN [aId=%d iSmsReceiveMode=%d]", aId, iSmsReceiveMode);
 	switch(aId)
 		{
 		case ETimerIdSmsMessTx:
 			{
 			TInt ret=ActionTxEvent(ESmsEventSubmitReportReceived);
 				break;
 			case RMobileSmsMessaging::EReceiveUnstoredPhoneAck:
 				ret=ActionRxEventUnstoredPhoneAck(ESmsEventRxTimer);
 				break;
 			case RMobileSmsMessaging::EReceiveStored:
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_2, "Recieve Stored SMS Rx Event.");
+				LOGSMS1("Recieve Stored SMS Rx Event.");
 				ret=ActionRxEventStored(ESmsEventRxTimer);
 				break;
 			default://other receive modes cannot be set
 				break;
 				}//end switch
 			if (ret != KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_3, "ERROR: Unexpected ret code %d", ret);
+				LOGSMS2("ERROR: Unexpected ret code %d", ret);
 				__ASSERT_ALWAYS(ret==KErrNone,SimPanic(EIllegalSmsRxEvent, __LINE__));	// There should be no error from this action, but to check...
 				}
 			break;
 			}
 			}
 		default:
 			break;
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_4, ">>CSimSmsMesaging::TimerCallBack OUT");
+	LOGSMS1(">>CSimSmsMesaging::TimerCallBack OUT");
 	}
 const CTestConfigSection* CSimSmsMessaging::CfgFileSection()
 /**
 * Returns a pointer to the config file section
 *
 * @return CTestConfigSection a pointer to the configuration file data section
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_CFGFILESECTION_1, ">>CSimSmsMessaging::CfgFileSection");
+	LOGSMS1(">>CSimSmsMessaging::CfgFileSection");
 	return iPhone->CfgFile();
 	}
 void CSimSmsMessaging::ReloadConfigurationSettingsL()
 		}
 	des.Append(0);
 	return hexBuf;
 	}
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to prevent UREL build warnings
+#ifdef _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)
 #endif
 /**
 @param aText - a header line about the PDU.
 @param aSmsPdu - PDU to log.
 @param aPduInAscii - aSmsPdu in ASCII format (default NULL).
 */
 {
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)    // to stop the UREL build warnings
+	LOGSMS3("%S pdu length=%d", &aText, aSmsPdu.Length());
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_DUMPPDU1_1, "%s pdu length=%d", aText, aSmsPdu.Length());
-#endif
 if( !aSmsPdu.Length() )
 return;
 	// In sendPdu case, caller needs to call PduToAscii for comparison.
 	//Print the pdu in a loop because LOGTEXT can only print up to 150 characters
 	for (TInt i = 0; i < hexBuf->Length(); i+=100)
 	    {
 		TInt len = Min(100, hexBuf->Mid(i).Length());
 TPtrC8 pduChunk(hexBuf->Mid(i).Left(len).Ptr(), len);
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_DUMPPDU1_2, "PDU Chunk: %s:", pduChunk);
+		LOGSMS2("PDU Chunk: %S:", &pduChunk);
 		}
 	if (0 == aPduInAscii)
 	  delete hexBuf;
 }
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+#ifdef _DEBUG
 /**
 Appends Type of number and Numbering plan identification to TBuf8 buffer.
 @param aBuffer Name of aTon will be appended to this buffer.
 	_LIT8(KMSGREF,		"   iMsgRef:     ");
 	_LIT8(KSUBMITREP,	"   iSubmitRep:  ");
 	TBuf8<KTextWidth> buffer;
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_1, "Send Sms Attributes:");
+	LOGSMS1("Send Sms Attributes:");
 	buffer.Zero();
 	buffer.Copy(KFLAGS);
 	buffer.Append(_L8("0x"));
 	buffer.AppendFormat(_L8("%08X") , ((TInt)(aSmsAttributesV1.iFlags)));
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_2, "Buffer: %s", buffer);
+	LOGSMS2("Buffer: %S", &buffer);
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KGsmServiceCentre)
 		{
 		buffer.Zero();
 		buffer.Copy(KSCADDR);
 		buffer.Append(aSmsAttributesV1.iGsmServiceCentre.iTelNumber);
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_3, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		buffer.Zero();
 		buffer.Copy(KSCADDRTON);
 		AppendTonToBuffer(buffer,(aSmsAttributesV1.iGsmServiceCentre.iTypeOfNumber));
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_4, "Buffer: %s", buffer);;
+		LOGSMS2("buffer: %S", &buffer);
 		buffer.Zero();
 		buffer.Copy(KSCADDRNPI);
 		AppendNpiToBuffer(buffer,(aSmsAttributesV1.iGsmServiceCentre.iNumberPlan));
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_5, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KSmsDataFormat)
 		{
 		buffer.Zero();
 		buffer.Copy(KDATAFORMAT);
 			}
 		else if(aSmsAttributesV1.iDataFormat == RMobileSmsMessaging::EFormatGsmTpdu)
 			{
 			buffer.Append(_L("EFormatGsmTpdu"));
 			}
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_6, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KRemotePartyInfo)
 		{
 		const RMobileSmsMessaging::TMobileSmsSendAttributesV1& smsSendAttributesV1 = static_cast<const RMobileSmsMessaging::TMobileSmsSendAttributesV1&> (aSmsAttributesV1);
 		buffer.Zero();
 		buffer.Copy(KDEADDR);
 		buffer.Append(smsSendAttributesV1.iDestination.iTelNumber);
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_7, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		buffer.Zero();
 		buffer.Copy(KDEADDRTON);
 		AppendTonToBuffer(buffer,(smsSendAttributesV1.iDestination.iTypeOfNumber));
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_8, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		buffer.Zero();
 		buffer.Copy(KDEADDRNPI);
 		AppendNpiToBuffer(buffer,(smsSendAttributesV1.iDestination.iNumberPlan));
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_9, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KMoreToSend)
 		{
 		const RMobileSmsMessaging::TMobileSmsSendAttributesV1& smsSendAttributesV1 = static_cast<const RMobileSmsMessaging::TMobileSmsSendAttributesV1&> (aSmsAttributesV1);
 			}
 		else
 			{
 			buffer.Append(_L8("EFalse"));
 			}
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_10, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KMessageReference)
 		{
 		const RMobileSmsMessaging::TMobileSmsSendAttributesV1& smsSendAttributesV1 = static_cast<const RMobileSmsMessaging::TMobileSmsSendAttributesV1&> (aSmsAttributesV1);
 		buffer.Zero();
 		buffer.Copy(KMSGREF);
 		buffer.Append(_L("0x"));
 		buffer.AppendFormat(_L8("%08X") , smsSendAttributesV1.iMsgRef);
-		OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_11, "Buffer: %s", buffer);
+		LOGSMS2("buffer: %S", &buffer);
 		}
 	if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KGsmSubmitReport)
 		{
 		const RMobileSmsMessaging::TMobileSmsSendAttributesV1& smsSendAttributesV1 = static_cast<const RMobileSmsMessaging::TMobileSmsSendAttributesV1&> (aSmsAttributesV1);
 					break;
 					}
 				buffer.AppendFormat(_L8("%X") , smsSendAttributesV1.iSubmitReport[j]);
 				j++;
 				}
-			OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_12, "Buffer: %s", buffer);
+			LOGSMS2("buffer: %S", &buffer);
 			buffer.Zero();
 			i=0;
 			l+=KTextWidth;
 			}
 		while(l < k);

branch	RCL_3
changeset 66	07a122eea281
parent 65	630d2f34d719