diff -r 17af172ffa5f -r 630d2f34d719 smsprotocols/smsstack/smsprot/Src/smspfacadestor.cpp
--- a/smsprotocols/smsstack/smsprot/Src/smspfacadestor.cpp	Thu Aug 19 11:03:36 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspfacadestor.cpp	Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-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"
@@ -13,6 +13,12 @@
 // Description:
 //
 
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspfacadestorTraces.h"
+#endif
+
 #include "gsmubuf.h"
 #include "smspfacadestor.h"
 
@@ -32,7 +38,7 @@
 */
 CFacadeSmsReassemblyStore* CFacadeSmsReassemblyStore::NewL(RFs& aFs, MSmsComm& aSmsComm)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::NewL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_NEWL_1, "CFacadeSmsReassemblyStore::NewL()");
 
 	CFacadeSmsReassemblyStore*  self = new (ELeave) CFacadeSmsReassemblyStore(aFs, aSmsComm);
 	CleanupStack::PushL(self);
@@ -56,7 +62,7 @@
 */
 CFacadeSmsReassemblyStore::~CFacadeSmsReassemblyStore()
 	{
-	LOGSMSPROT1("~CFacadeSmsReassemblyStore()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DTOR_1, "~CFacadeSmsReassemblyStore()");
 	iReassemblyStore->Close();
 	delete iReassemblyStore;
 
@@ -82,7 +88,7 @@
 */
 void CFacadeSmsReassemblyStore::ConstructL()
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::ConstructL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_CONSTRUCTL_1, "CFacadeSmsReassemblyStore::ConstructL()");
 
 	iReassemblyStore = CSmsReassemblyStore::NewL(iFs);
 	/*
@@ -133,7 +139,7 @@
 */
 void CFacadeSmsReassemblyStore::OpenStoreL()
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::OpenStoreL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_OPENSTOREL_1, "CFacadeSmsReassemblyStore::OpenStoreL()");
 	iReassemblyStore->OpenStoreL();
 	if (iClass0ReassemblyStore)
 		{
@@ -148,7 +154,7 @@
 */
 void CFacadeSmsReassemblyStore::Close()
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::Close()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_CLOSE_1, "CFacadeSmsReassemblyStore::Close()");
 	// Close general Re-assembly store.
 	iReassemblyStore->Close();
 	// Close Class0 re-assembly store.
@@ -182,7 +188,7 @@
 */
 void CFacadeSmsReassemblyStore::InitL()
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::InitL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_INITL_1, "CFacadeSmsReassemblyStore::InitL()");
 	// Initialize Non-class 0 Re-assembly store.
 	InitializeNonClass0StoreL();
 	// Initialize Class0 re-assembly store.
@@ -202,7 +208,7 @@
 */
 void CFacadeSmsReassemblyStore::PurgeL(const TTimeIntervalMinutes& aTimeIntervalMinutes,TBool aPurgeIncompleteOnly)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::PurgeL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PURGEL_1, "CFacadeSmsReassemblyStore::PurgeL()");
 	iReassemblyStore->PurgeL(aTimeIntervalMinutes, aPurgeIncompleteOnly);
 	if (iClass0ReassemblyStore)
 		{
@@ -219,7 +225,7 @@
 */
 TBool CFacadeSmsReassemblyStore::IsFull()
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::IsFull()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ISFULL_1, "CFacadeSmsReassemblyStore::IsFull()");
 
 	//local variable for complete entries
 	TInt count( 0 );
@@ -246,7 +252,7 @@
 */
 void CFacadeSmsReassemblyStore::DeleteEnumeratedSIMEntries()
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::DeleteEnumeratedSIMEntries()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1, "CFacadeSmsReassemblyStore::DeleteEnumeratedSIMEntries()");
 	DeleteNonClass0EnumeratedSIMEntries();
 	if (iClass0ReassemblyStore)
 		{
@@ -267,7 +273,7 @@
 */
 TInt CFacadeSmsReassemblyStore::ExternalizeEnumeratedMessagesL(CSmsProvider& aProvider,TInt& aCount)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::ExternalizeEnumeratedMessagesL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDMESSAGESL_1, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedMessagesL()");
 	TInt numNewSegments(0);
 	numNewSegments = ExternalizeEnumeratedNonClass0SmsMessagesL(aProvider, aCount);
 	if (iClass0ReassemblyStore)
@@ -289,7 +295,7 @@
 */
 void CFacadeSmsReassemblyStore::ProcessCompleteSmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage* aCurrentSmsMessage)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::ProcessCompleteSmsMessagesL");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETESMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ProcessCompleteSmsMessagesL");
 
 	ProcessCompleteNonClass0SmsMessagesL(aSmsComm, aCurrentSmsMessage);
 	if (iClass0ReassemblyStore)
@@ -340,8 +346,7 @@
 */
 void CFacadeSmsReassemblyStore::AddSegmentToReassemblyStoreL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms, TInt& aIndex, TBool& aIsComplete, TBool aIsEnumeration, TInt& aCount, TInt& aTotal)
 	{
-	LOGSMSPROT2("CFacadeSmsReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",
-				aSmsMessage.IsComplete());
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1, "CFacadeSmsReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",aSmsMessage.IsComplete());
 
 	TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
 
@@ -376,7 +381,7 @@
 */
 void CFacadeSmsReassemblyStore::ForwardCompleteClass0SmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage& aSmsMessage,const TSmsAddr* aOriginalSmsAddr,const CSmsMessage* aOriginalSmsMessage,TDes& aDes)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::ForwardCompleteClass0SmsMessagesL");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_FORWARDCOMPLETECLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ForwardCompleteClass0SmsMessagesL");
 	if (iClass0ReassemblyStore)
 		{
 		iClass0ReassemblyStore->ForwardCompleteClass0SmsMessagesL(aSmsComm, aSmsMessage, aOriginalSmsAddr, aOriginalSmsMessage, aDes);
@@ -395,7 +400,7 @@
 */
 void CFacadeSmsReassemblyStore::ProcessMessageIfExceedLimitationL(MSmsComm& aSmsComm)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::ProcessMessageIfExceedLimitationL");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSMESSAGEIFEXCEEDLIMITATIONL_1, "CFacadeSmsReassemblyStore::ProcessMessageIfExceedLimitationL");
 	if (iClass0ReassemblyStore)
 		{
 		iClass0ReassemblyStore->ProcessMessageIfExceedLimitationL(aSmsComm);
@@ -415,7 +420,7 @@
 */
 void CFacadeSmsReassemblyStore::SetIncompleteMessageForwardedToClientL(const CSmsMessage& aSmsMessage)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1, "CFacadeSmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
 	if (iClass0ReassemblyStore)
 		{
 		iClass0ReassemblyStore->SetIncompleteMessageForwardedToClientL(aSmsMessage);
@@ -429,7 +434,7 @@
 */
 void CFacadeSmsReassemblyStore::SetDiskSpaceState(TSmsDiskSpaceMonitorStatus aDiskSpaceStatus)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::SetDiskSpaceState()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETDISKSPACESTATE_1, "CFacadeSmsReassemblyStore::SetDiskSpaceState()");
 	if (iClass0ReassemblyStore)
 		{
 		iClass0ReassemblyStore->SetDiskSpaceState(aDiskSpaceStatus);
@@ -447,7 +452,7 @@
 */
 void CFacadeSmsReassemblyStore::DeleteMessageL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::DeleteEntryL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETEMESSAGEL_1, "CFacadeSmsReassemblyStore::DeleteEntryL()");
 
 	TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
 
@@ -471,7 +476,7 @@
 */
 void CFacadeSmsReassemblyStore::UpdateLogServerIdL(const CSmsMessage& aSmsMessage, TInt aIndex)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::UpdateLogServerIdL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1, "CFacadeSmsReassemblyStore::UpdateLogServerIdL()");
 
 	TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
 
@@ -494,7 +499,7 @@
 */
 void CFacadeSmsReassemblyStore::SetMessagePassedToClientL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::SetMessagePassedToClientL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1, "CFacadeSmsReassemblyStore::SetMessagePassedToClientL()");
 
 	TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
 
@@ -569,7 +574,7 @@
 */
 void CFacadeSmsReassemblyStore::InitializeNonClass0StoreL()
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::InitializeNonClass0StoreL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_INITIALIZENONCLASS0STOREL_1, "CFacadeSmsReassemblyStore::InitializeNonClass0StoreL()");
 	// Initialize Re-assembly store.
 	iReassemblyStore->OpenStoreL();
 	iReassemblyStore->BeginTransactionLC();
@@ -606,7 +611,7 @@
 	{
 	const TInt count = iReassemblyStore->Entries().Count();
 
-	LOGSMSPROT2("CFacadeSmsReassemblyStore::DeleteNonClass0EnumeratedSIMEntries(): %d messages in RAS", count);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0ENUMERATEDSIMENTRIES_1, "CFacadeSmsReassemblyStore::DeleteNonClass0EnumeratedSIMEntries(): %d messages in RAS", count);
 
 	TInt index;
 
@@ -634,7 +639,7 @@
 */
 void CFacadeSmsReassemblyStore::DeleteNonClass0MessageL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::DeleteNonClass0MessageL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0MESSAGEL_1, "CFacadeSmsReassemblyStore::DeleteNonClass0MessageL()");
 	TInt index(0);
 
 	if(!iReassemblyStore->InTransaction())
@@ -661,7 +666,7 @@
 */
 void CFacadeSmsReassemblyStore::SetNonClass0MessagePassedToClientL(const CSmsMessage& aSmsMessage, TBool aPassed)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::SetNonClass0MessagePassedToClientL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETNONCLASS0MESSAGEPASSEDTOCLIENTL_1, "CFacadeSmsReassemblyStore::SetNonClass0MessagePassedToClientL()");
 	TInt index(0);
 
 	iReassemblyStore->BeginTransactionLC();
@@ -677,8 +682,7 @@
 */
 TInt CFacadeSmsReassemblyStore::NumberOfCompleteNonClass0Messages()
 	{
-	LOGSMSPROT2("CFacadeSmsReassemblyStore::NumberOfCompleteMessages(): Entries().Count()=%d",
-				iReassemblyStore->Entries().Count());
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_NUMBEROFCOMPLETENONCLASS0MESSAGES_1, "CFacadeSmsReassemblyStore::NumberOfCompleteMessages(): Entries().Count()=%d",iReassemblyStore->Entries().Count());
 
 	//local variable for complete entries
 	TInt count( 0 );
@@ -706,7 +710,7 @@
 */
 void CFacadeSmsReassemblyStore::ProcessCompleteNonClass0SmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage* aCurrentSmsMessage)
 	{
-	LOGSMSPROT2("CFacadeSmsReassemblyStore::ProcessCompleteNonClass0SmsMessagesL [from %d to 0]", iReassemblyStore->Entries().Count()-1);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETENONCLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ProcessCompleteNonClass0SmsMessagesL [from %d to 0]", iReassemblyStore->Entries().Count()-1);
 
 	iReassemblyStore->BeginTransactionLC();
 	TInt count = iReassemblyStore->Entries().Count();
@@ -752,7 +756,7 @@
 */
 void CFacadeSmsReassemblyStore::ProcessCompleteClass0SmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage* aCurrentSmsMessage)
 	{
-	LOGSMSPROT2("CFacadeSmsReassemblyStore::ProcessCompleteClass0SmsMessagesL [from %d to 0]", iClass0ReassemblyStore->Entries().Count()-1);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETECLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ProcessCompleteClass0SmsMessagesL [from %d to 0]", iClass0ReassemblyStore->Entries().Count()-1);
 
 	iClass0ReassemblyStore->BeginTransactionLC();
 	TInt count = iClass0ReassemblyStore->Entries().Count();
@@ -802,7 +806,7 @@
 */
 TInt CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL(CSmsProvider& aProvider,TInt& aCount)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL()");
 	TInt count = iReassemblyStore->Entries().Count();
 	TInt index,numNewSegments(0);
 	for(index = count-1; index >=0; --index)
@@ -821,7 +825,7 @@
 				numNewSegments+=aProvider.ExternalizeMessageL(*smsMessage,EFalse);
 				for(TInt i=0; i< smsMessage->iSlotArray.Count() ;i++)
 					{
-					LOGSMSPROT2("CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL %d", smsMessage->iSlotArray[i].iIndex);
+					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_2, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL %d", smsMessage->iSlotArray[i].iIndex);
 					}
 				++aCount;
 				iReassemblyStore->BeginTransactionLC();
@@ -847,7 +851,7 @@
 */
 TInt CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL(CSmsProvider& aProvider,TInt& aCount)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL()");
 	TInt count = iClass0ReassemblyStore->Entries().Count();
 	TInt index,numNewSegments(0);
 	for(index = count-1; index >=0; --index)
@@ -866,7 +870,7 @@
 				numNewSegments+=aProvider.ExternalizeMessageL(*smsMessage,EFalse);
 				for(TInt i=0; i< smsMessage->iSlotArray.Count() ;i++)
 					{
-					LOGSMSPROT2("CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL() %d", smsMessage->iSlotArray[i].iIndex);
+					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_2, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL() %d", smsMessage->iSlotArray[i].iIndex);
 					}
 				++aCount;
 				iClass0ReassemblyStore->BeginTransactionLC();
@@ -913,8 +917,7 @@
 */
 void CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms, TInt& aIndex, TBool& aIsComplete, TBool aIsEnumeration, TInt& aCount, TInt& aTotal)
 	{
-	LOGSMSPROT2("CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): isComplete Message=%d",
-				aSmsMessage.IsComplete());
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_1, "CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): isComplete Message=%d",aSmsMessage.IsComplete());
 
 	if (aIsComplete ||  aSmsMessage.Type() == CSmsPDU::ESmsStatusReport)
 		{
@@ -938,8 +941,7 @@
 		TInt  segStoreIndex(KErrNotFound);
 
 		iReassemblyStore->MatchPDUToExistingMessage(aSmsMessage, segStoreIndex);
-		LOGSMSPROT2("CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): "
-					"segStoreIndex=%d", segStoreIndex);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_2, "CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): ""segStoreIndex=%d", segStoreIndex);
 
 		//
 		// If not yet complete, then we must be part of a multiple PDU message.
@@ -958,9 +960,7 @@
 			iReassemblyStore->UpdateExistingMessageL(aSmsMessage, aGsmSms, aIndex,
 													aIsComplete, isDuplicateMsgRef,
 													isDuplicateSlot);
-			LOGSMSPROT5("CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): "
-						"aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",
-						aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
+			OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_3, "CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): ""aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
 
 			if (isDuplicateMsgRef)
 				{
@@ -1050,8 +1050,7 @@
 		iReassemblyStore->CommitTransactionL();
 		}
 
-	LOGSMSPROT3("CFacadeSmsReassemblyStore::UpdateLogServerIdOfNonClass0MessageL(): found=%d, foundIndex=%d",
-				found, foundIndex);
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDOFNONCLASS0MESSAGEL_1, "CFacadeSmsReassemblyStore::UpdateLogServerIdOfNonClass0MessageL(): found=%d, foundIndex=%d",found, foundIndex);
 
 	//
 	// If found and the index is valid, then update the Log Server ID...
@@ -1069,7 +1068,7 @@
  */
 TBool CFacadeSmsReassemblyStore::IsWapSMS(const CSmsMessage& aSmsMessage)
 	{
-	LOGSMSPROT1("CFacadeSmsReassemblyStore::IsWapSMS()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ISWAPSMS_1, "CFacadeSmsReassemblyStore::IsWapSMS()");
 
 	return CSmsProtocol::IsAppPortSMS(aSmsMessage);
 	}