diff -r 630d2f34d719 -r 07a122eea281 smsprotocols/smsstack/smsprot/Src/smspmodm.cpp
--- a/smsprotocols/smsstack/smsprot/Src/smspmodm.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspmodm.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"
@@ -19,12 +19,6 @@
  @file
 */
 
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspmodmTraces.h"
-#endif
-
 #include "smspmodm.h"
 #include "smsuset.h"
 #include "smspmain.h"
@@ -51,7 +45,7 @@
  */
 void CSmsPhoneInitialization::Start()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_START_1, "CSmsPhoneInitialization::Start  Start initializing the phone");
+	LOGSMSPROT1("CSmsPhoneInitialization::Start  Start initializing the phone");
 
 	Cancel();
 
@@ -66,7 +60,7 @@
 
 void CSmsPhoneInitialization::DoRunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_1, "CSmsPhoneInitialization::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
+	LOGSMSPROT3("CSmsPhoneInitialization::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
 
 	switch (iState)
 		{
@@ -80,7 +74,7 @@
 			{
 			if (iStatus.Int() != KErrNone)
 				{
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_2, "ERROR - TSY failed to set bearer but initialisation will continue; bearer setting may be successful during send");
+				LOGSMSPROT1("ERROR - TSY failed to set bearer but initialisation will continue; bearer setting may be successful during send");
 				}
 
 			iState=ESmsPhoneInitializationGettingRegistrationStatus;
@@ -93,7 +87,7 @@
 			{
 			if(iStatus == KErrNone)
 				{
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_3, "CSmsPhoneInitialization::DoRunL registration status  : >%d<",iRegistrationStatus);
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL registration status  : >%d<",iRegistrationStatus);
 				if (iRegistrationStatus==RMobilePhone::ERegisteredOnHomeNetwork  ||
 					iRegistrationStatus == RMobilePhone::ERegisteredRoaming)
 					{
@@ -112,7 +106,7 @@
 				{
 				iState=ESmsPhoneInitializationCompleted;
 				iNetworkInfoAvailable =EFalse;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_4, "CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
 				iSmsPDURead.Start();
 				}
 			}
@@ -130,7 +124,7 @@
 				{
 				iState=ESmsPhoneInitializationCompleted;
 				iNetworkInfoAvailable =EFalse;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_5, "CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
 				iSmsPDURead.Start();
 				}
 			}
@@ -142,14 +136,14 @@
 			if(iStatus == KErrNone)
 				{
 				iNetworkInfoAvailable =ETrue;
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_6, "CSmsPhoneInitialization::DoRunL network longname : >%S<",iNetworkInfo.iLongName);
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_7, "CSmsPhoneInitialization::DoRunL network shortname : >%S<",iNetworkInfo.iShortName);
-				OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_8, "CSmsPhoneInitialization::DoRunL network shortname : >%S<",iNetworkInfo.iDisplayTag);
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL network longname : >%S<",&iNetworkInfo.iLongName);
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL network shortname : >%S<",&iNetworkInfo.iShortName);
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL network shortname : >%S<",&iNetworkInfo.iDisplayTag);
 				}
 			else
 				{
 				iNetworkInfoAvailable =EFalse;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_9, "CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
+				LOGSMSPROT2("CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
 				}
 			iSmsPDURead.Start();
 			}
@@ -174,7 +168,7 @@
  */
 void CSmsPhoneInitialization::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DOCANCEL_1, "CSmsPhoneInitialization::DoCancel()");
+	LOGSMSPROT1("CSmsPhoneInitialization::DoCancel()");
 
 	switch (iState)
 		{
@@ -233,7 +227,7 @@
  */
 void CSmsPhoneInitialization::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_COMPLETE_1, "CSmsPhoneInitialization::Complete()");
+	LOGSMSPROT1("CSmsPhoneInitialization::Complete()");
 
 	//
 	// Call the base function to perform the actual complete...
@@ -251,7 +245,7 @@
  */
 void CSmsPhoneInitialization::AfterPhoneInitialize(TInt aStatus)
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_1, "CSmsPhoneInitialization::AfterPhoneIntialize [status=%d]", aStatus);
+    LOGSMSPROT2("CSmsPhoneInitialization::AfterPhoneIntialize [status=%d]", aStatus);
 
 	if (aStatus == KErrNone)
 		{
@@ -263,7 +257,7 @@
 		{
 		if (iMobileSmsCaps.iSmsMode != RMobileSmsMessaging::KCapsGsmSms)
 			{
-		    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_2, "TSY does not support GsmSms");
+		    LOGSMSPROT1("TSY does not support GsmSms");
 			aStatus = KErrNotSupported;
 			}
 		else
@@ -279,13 +273,13 @@
 		{
 	    if (++iNumberOfAttempts < iMaxNumberOfAttempts)
 			{
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_3, "CSmsPhoneInitialization Restarting [aStatus=%d]", aStatus);
+			LOGSMSPROT2("CSmsPhoneInitialization Restarting [aStatus=%d]", aStatus);
 			iGsmPhone.Initialise(iStatus);
 			SetActive();
 			}
 		else
 			{
-			OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_4, "CSmsPhoneInitialization Failed after %d attempts [aStatus=%d]", iNumberOfAttempts, aStatus);
+			LOGSMSPROT3("CSmsPhoneInitialization Failed after %d attempts [aStatus=%d]", iNumberOfAttempts, aStatus);
 			}
 		}
 
@@ -320,7 +314,7 @@
  */
 CSmsModemNotification* CSmsModemNotification::NewL(MSmsComm& aSmsComm)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_NEWL_1, "CSmsModemNotification::NewL");
+	LOGSMSPROT1("CSmsModemNotification::NewL");
 
 	CSmsModemNotification*	self=new(ELeave) CSmsModemNotification(aSmsComm);
 	CleanupStack::PushL(self);
@@ -333,7 +327,7 @@
 
 void CSmsModemNotification::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_CONSTRUCTL_1, "CSmsModemNotification::ConstructL()");
+	LOGSMSPROT1("CSmsModemNotification::ConstructL()");
 
 	User::LeaveIfError(iPhonePowerProperty.Attach(KUidSystemCategory, KUidPhonePwr.iUid));
 	
@@ -353,7 +347,7 @@
 
 RPhone::TModemDetection CSmsModemNotification::ModemState()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_MODEMSTATE_1, "CSmsModemNotification::ModemState()");
+	LOGSMSPROT1("CSmsModemNotification::ModemState()");
 
 	//
 	// Get the phone power state.
@@ -381,7 +375,7 @@
  */
 void CSmsModemNotification::Start()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_START_1, "CSmsModemNotification::Start");
+	LOGSMSPROT1("CSmsModemNotification::Start");
 
 	__ASSERT_DEBUG(iState==ESmsModemNotificationIdle,SmspPanic(KSmspPanicUnexpectedState));
 
@@ -400,7 +394,7 @@
  */
 void CSmsModemNotification::DoRunL()
 	{
-    OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_DORUNL_1, "CSmsModemNotification::RunL [iStatus=%d]", iStatus.Int() );
+    LOGSMSPROT2("CSmsModemNotification::RunL [iStatus=%d]", iStatus.Int() );
 
 	__ASSERT_DEBUG(iState==ESmsModemNotificationWaitingForNotification,SmspPanic(KSmspPanicUnexpectedState));
 
@@ -416,7 +410,7 @@
  */
 void CSmsModemNotification::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_DOCANCEL_1, "CSmsModemNotification::DoCancel()");
+	LOGSMSPROT1("CSmsModemNotification::DoCancel()");
 
 	__ASSERT_DEBUG(iState==ESmsModemNotificationWaitingForNotification,SmspPanic(KSmspPanicUnexpectedState));
 	
@@ -456,7 +450,7 @@
  */
 void CSmsModemNotification::Complete(TInt aStatus)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_COMPLETE_1, "CSmsModemNotification::Complete()");
+	LOGSMSPROT1("CSmsModemNotification::Complete()");
 
 	//
 	// Call the base function to perform the actual complete...