--- a/smsprotocols/smsstack/smsprot/Src/smspmondsk.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspmondsk.cpp	Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -45,12 +45,6 @@
  @internalComponent 
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspmondskTraces.h"
-#endif
-
 #include <barsc.h>
 #include <bautils.h>
 
@@ -74,7 +68,7 @@
  */
 CSmsMonitorDiskSpace* CSmsMonitorDiskSpace::NewL(MSmsComm& aSmsComm, RMobileSmsMessaging& aSmsMessaging,RFs& aFs)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_NEWL_1, "CSmsMonitorDiskSpace::NewL()");
+	LOGSMSPROT1("CSmsMonitorDiskSpace::NewL()");
 
 	CSmsMonitorDiskSpace*  self = new(ELeave) CSmsMonitorDiskSpace(aSmsComm, aSmsMessaging, aFs);
 	CleanupStack::PushL(self);
@@ -163,12 +157,15 @@
 	//
 	// Log the filename in use and whether it is ROM based...
 	//
-	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_1, "CSmsMonitorDiskSpace::ConstructL(): fileName=\"%S\"", fileName);
-
+#ifdef _SMS_LOGGING_ENABLED
+	TBuf8<KMaxFileName>  buf8;
+	buf8.Copy(fileName);
+	LOGSMSPROT2("CSmsMonitorDiskSpace::ConstructL(): fileName=\"%S\"", &buf8);
+#endif
 
     if (iFs.IsFileInRom(fileName) == NULL)
     	{
-     	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_2, "CSmsMonitorDiskSpace::ConstructL(): Smsu.rsc not in ROM");
+     	LOGSMSPROT1("CSmsMonitorDiskSpace::ConstructL(): Smsu.rsc not in ROM");
      	}
 
 	//
@@ -202,13 +199,14 @@
         TInt ret = iFreeDiskSpaceProperty.Attach(KUidPSSMSStackCategory, KUidPSSMSStackFreeDiskSpaceKey);
         if (ret != KErrNone)
             {
-            OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_3, "iFreeDiskSpaceProperty.Attach(): error=%d", ret);
+            LOGSMSPROT2("iFreeDiskSpaceProperty.Attach(): error=%d", ret);
             User::Leave(ret);
             }                        
         }   
 #endif        
     
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_4, "CSmsMonitorDiskSpace::ConstructL(): iLowLimit=%u, iHighLimit=%u",iLowLimit, iHighLimit);
+	LOGSMSPROT3("CSmsMonitorDiskSpace::ConstructL(): iLowLimit=%d, iHighLimit=%d",
+			    iLowLimit, iHighLimit);
 	} // CSmsMonitorDiskSpace::ConstructL
 
 
@@ -217,7 +215,8 @@
  */
 void CSmsMonitorDiskSpace::RunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_RUNL_1, "CSmsMonitorDiskSpace:RunL(): iStatus=%d, iState=%d",iStatus.Int(), iState );
+	LOGSMSPROT3("CSmsMonitorDiskSpace:RunL(): iStatus=%d, iState=%d",
+	            iStatus.Int(), iState );
 
 	switch (iState)
 		{
@@ -301,7 +300,7 @@
  */
 void CSmsMonitorDiskSpace::DoCancel()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_DOCANCEL_1, "CSmsMonitorDiskSpace::DoCancel(): iState=%d", iState);
+	LOGSMSPROT2("CSmsMonitorDiskSpace::DoCancel(): iState=%d", iState);
 
     switch (iState)
 		{
@@ -349,7 +348,8 @@
  */
 void CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(TBool aPDUIsClass0)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CHECKDISKSPACEFORPDUL_1, "CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(): aPDUIsClass0=%d",aPDUIsClass0);
+	LOGSMSPROT2("CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(): aPDUIsClass0=%d",
+				aPDUIsClass0);
 
 	//
 	// First check the actual disk space before working out what to do.
@@ -438,7 +438,8 @@
 void CSmsMonitorDiskSpace::NotifyDiskSpace(TInt aLimit,
 										   TSmsMonitorDiskSpaceState aState)
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_NOTIFYDISKSPACE_1, "CSmsMonitorDiskSpace::NotifyDiskSpace(): aLimit=%d, aState=%d",aLimit, aState);
+	LOGSMSPROT3("CSmsMonitorDiskSpace::NotifyDiskSpace(): aLimit=%d, aState=%d",
+				aLimit, aState);
 
 	//
 	// Cancel any previously outstanding requests...
@@ -512,7 +513,7 @@
  */
 void CSmsMonitorDiskSpace::ResumeSmsReception()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_RESUMESMSRECEPTION_1, "CSmsMonitorDiskSpace::ResumeSmsReception");
+	LOGSMSPROT1("CSmsMonitorDiskSpace::ResumeSmsReception");
 
 	//
 	// Cancel any previously outstanding requests...
@@ -568,7 +569,7 @@
     
 	if (ret != KErrNone) 
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_GETFREEDISKSPACE_1, "CSmsMonitorDiskSpace::GetFreeDiskSpace(): error=%d", ret);
+		LOGSMSPROT2("CSmsMonitorDiskSpace::GetFreeDiskSpace(): error=%d", ret);
 		return KErrGeneral;
 		}
 
@@ -586,7 +587,7 @@
 		freeSpace = (TInt) volumeInfo.iFree;
 		}
 
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_GETFREEDISKSPACE_2, "CSmsMonitorDiskSpace::GetFreeDiskSpace(): freeSpace=%d", freeSpace);
+	LOGSMSPROT2("CSmsMonitorDiskSpace::GetFreeDiskSpace(): freeSpace=%d", freeSpace);
 
 	return freeSpace;
 	} // CSmsMonitorDiskSpace::GetFreeDiskSpace