diff -r 630d2f34d719 -r 07a122eea281 smsprotocols/smsstack/smsprot/Src/smspsend.cpp
--- a/smsprotocols/smsstack/smsprot/Src/smspsend.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspsend.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -20,12 +20,6 @@
  @internalAll
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspsendTraces.h"
-#endif
-
 #include "smspsend.h"
 #include "smspstor.h"
 #include "smspmain.h"
@@ -54,7 +48,7 @@
 									   TInt aPriority,
 									   CSmspSetBearer& aSmspSetBearer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_NEWL_1, "CSmsMessageSend::NewL()");
+	LOGSMSPROT1("CSmsMessageSend::NewL()");
 
 	CSmsMessageSend*  self = new (ELeave) CSmsMessageSend(aSegmentationStore,
 														  aSmsSettings,
@@ -77,7 +71,7 @@
  */
 void CSmsMessageSend::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_CONSTRUCTL_1, "CSmsMessageSend::ConstructL()");
+	LOGSMSPROT1("CSmsMessageSend::ConstructL()");
 
 	iSmsEventLogger = CSmsEventLogger::NewL(iSegmentationStore.FileSession(),
 											Priority());
@@ -130,7 +124,7 @@
 void CSmsMessageSend::Start(CSmsMessage& aSmsMessage, TInt aOptions,
 							const TSmsAddr& aSmsAddr, TRequestStatus& aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_START_1, "CSmsMessageSend::Start()");
+	LOGSMSPROT1("CSmsMessageSend::Start()");
 
 	__ASSERT_DEBUG(iState == ESmsMessageSendIdle,SmspPanic(KSmspPanicUnexpectedState));
 
@@ -166,7 +160,7 @@
 
 void CSmsMessageSend::DoRunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_1, "CSmsMessageSend::RunL(): iStatus=%d, iState=%d", iStatus.Int(), iState);
+	LOGSMSPROT3("CSmsMessageSend::RunL(): iStatus=%d, iState=%d", iStatus.Int(), iState);
 
 	switch (iState)
 		{
@@ -254,15 +248,18 @@
 
 			if (iStatus.Int() == KErrNone  &&  !IsRPError())
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_2, "CSmsMessageSend::RunL(): Submit ACK'd MsgRef=%d",iMobileSmsSendAttributesV1.iMsgRef);
+				LOGSMSIF2("CSmsMessageSend::RunL(): Submit ACK'd MsgRef=%d",
+				          iMobileSmsSendAttributesV1.iMsgRef);
 				}
 			else if (IsRPError())
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_3, "CSmsMessageSend::RunL(): Submit N'ACK'D MsgRef=%d",iMobileSmsSendAttributesV1.iMsgRef);
+				LOGSMSIF2("CSmsMessageSend::RunL(): Submit N'ACK'D MsgRef=%d",
+				          iMobileSmsSendAttributesV1.iMsgRef);
 				}
 			else
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_4, "CSmsMessageSend::RunL(): MsgRef=%d",iMobileSmsSendAttributesV1.iMsgRef);
+				LOGSMSIF2("CSmsMessageSend::RunL(): MsgRef=%d",
+				          iMobileSmsSendAttributesV1.iMsgRef);
 				}
 
 			//
@@ -355,7 +352,7 @@
 
 void CSmsMessageSend::DoCancel()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOCANCEL_1, "CSmsMessageSend::DoCancel(): iState=%d", iState);
+	LOGSMSPROT2("CSmsMessageSend::DoCancel(): iState=%d", iState);
 
 	TimedSetActiveCancel();
 
@@ -425,7 +422,7 @@
  */
 void CSmsMessageSend::DecodeSubmitReportL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DECODESUBMITREPORTL_1, "CSmsMessageSend::DecodeSubmitReportL()");
+	LOGSMSPROT1("CSmsMessageSend::DecodeSubmitReportL()");
 
 	//
 	// Only try to decode the submit report if error is a RP-error, in which case there should be a valid PDU
@@ -453,7 +450,7 @@
 			}
 		else
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DECODESUBMITREPORTL_2, "Invalid PDU Type = %d with iStatus = %d",  smsMessage->SmsPDU().Type(),  iStatus.Int()  );
+			LOGSMSPROT3("Invalid PDU Type = %d with iStatus = %d",  smsMessage->SmsPDU().Type(),  iStatus.Int()  );
 			}
 
 		CleanupStack::PopAndDestroy(smsMessage);
@@ -468,7 +465,7 @@
  */
 TBool CSmsMessageSend::IsRPError() const
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_ISRPERROR_1, "CSmsMessageSend::IsRPError()");
+	LOGSMSPROT1("CSmsMessageSend::IsRPError()");
 	
 	TBool  isRPError = EFalse;
 
@@ -517,7 +514,7 @@
 
 void CSmsMessageSend::SegmentMessage()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_SEGMENTMESSAGE_1, "CSmsMessageSend::SegmentMessage()");
+	LOGSMSPROT1("CSmsMessageSend::SegmentMessage()");
 
 	iState = ESmsMessageSendSegmentingMessage;
 
@@ -529,7 +526,7 @@
 
 void CSmsMessageSend::DoSegmentMessageL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOSEGMENTMESSAGEL_1, "CSmsMessageSend::DoSegmentMessageL()");
+	LOGSMSPROT1("CSmsMessageSend::DoSegmentMessageL()");
 
 	TInt reference=0;
 	if (iSmsMessage->Type()==CSmsPDU::ESmsCommand)
@@ -601,8 +598,8 @@
 			 	}
 			}
 
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOSEGMENTMESSAGEL_2, "CSmsMesageSend::DoSegmentMessageL [LogServerId=%d][iSentBefore=%d]",iSmsMessage->LogServerId(),iSentBefore);
-		OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOSEGMENTMESSAGEL_3, "CSmsMesageSend::DoSegmentMessageL [referenceNo=%d] [iCountOfSentBefore=%d ]",reference,iSmsPDUData.iSent);
+		LOGSMSPROT3("CSmsMesageSend::DoSegmentMessageL [LogServerId=%d][iSentBefore=%d]",iSmsMessage->LogServerId(),iSentBefore);
+		LOGSMSPROT3("CSmsMesageSend::DoSegmentMessageL [referenceNo=%d] [iCountOfSentBefore=%d ]",reference,iSmsPDUData.iSent);
 		if(!iSentBefore)
 			{
 			iSegmentationStore.AddSubmitL(iSmsAddr,*iSmsMessage);
@@ -613,7 +610,7 @@
 
 void CSmsMessageSend::CreateLogServerEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_CREATELOGSERVEREVENT_1, "CSmsMessageSend::CreateLogServerEvent()");
+	LOGSMSPROT1("CSmsMessageSend::CreateLogServerEvent()");
 
 	iState=ESmsMessageSendCreatingLogServerEvent;
 	TLogId logid=(TLogId) iSmsMessage->LogServerId();
@@ -633,7 +630,7 @@
 
 void CSmsMessageSend::SendNextPDU()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_SENDNEXTPDU_1, "CSmsMessageSend::SendNextPDU [sending pdu %d of count=%d]",iSmsPDUData.iSent, iSmsArray.Count() );
+	LOGSMSPROT3("CSmsMessageSend::SendNextPDU [sending pdu %d of count=%d]",iSmsPDUData.iSent, iSmsArray.Count() );
 
 	if (iSmsPDUData.iSent<iSmsArray.Count())
 		{
@@ -677,13 +674,10 @@
 		//
 		// Debug logging of the PDU we are sending...
 		//
-#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
-        LogSmsIfPDUL(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
-        LogSmsIfSendAttributes(_L8("SENDATTRIBS: "), iMobileSmsSendAttributesV1);
-        TBuf<40> timestamp;
-        SmsTimeStampL(timestamp);
-        OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSMESSAGESEND_SENDNEXTPDU_2, "%S",timestamp);
-#endif
+		LOGSMSIFPDU(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
+		LOGSMSIFSENDATTRIBUTES(_L8("SENDATTRIBS: "), iMobileSmsSendAttributesV1);
+		LOGSMSIFTIMESTAMP();
+
 		//
 		// Send the message and enter the correct state...
 		//
@@ -707,7 +701,7 @@
 
 void CSmsMessageSend::DoUpdateSegmentationStoreL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOUPDATESEGMENTATIONSTOREL_1, "CSmsMessageSend::DoUpdateSegmentationStoreL()");
+	LOGSMSPROT1("CSmsMessageSend::DoUpdateSegmentationStoreL()");
 
 	iSmsPDUData.iSent++;  //  This is the end of the sequence for sending an SMS PDU
 	
@@ -729,7 +723,7 @@
 
 void CSmsMessageSend::UpdateLogServerEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_UPDATELOGSERVEREVENT_1, "CSmsMessageSend::UpdateLogServerEvent()");
+	LOGSMSPROT1("CSmsMessageSend::UpdateLogServerEvent()");
 
 	//
 	//	Fill in log event...
@@ -743,7 +737,7 @@
 
 void CSmsMessageSend::Complete(TInt aStatus)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_COMPLETE_1, "CSmsMessageSend::Complete [iStatus=%d, iState=%d]", iStatus.Int(), iState );
+	LOGSMSPROT3("CSmsMessageSend::Complete [iStatus=%d, iState=%d]", iStatus.Int(), iState );
 
 	//
 	// For completion during log events, use the saved error code instead...