--- a/telephonyserverplugins/simtsy/src/CSimNtRas.cpp	Wed Jun 16 15:43:02 2010 +0100
+++ b/telephonyserverplugins/simtsy/src/CSimNtRas.cpp	Thu Jul 22 16:45:24 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -19,8 +19,14 @@
  @file
 */
 
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimNtRasTraces.h"
+#endif
+
 #include "CSimNtras.h"
-#include "Simlog.h"
 
 _LIT8(KNtRasWriteText,"CLIENT");			// < Solicitation text, send to start the NTRas server
 _LIT8(KNtRasReceiveText,"SERVER");			// < NTRas server response, indicating the PPP session can commence.
@@ -87,7 +93,7 @@
  * @return TInt		Standard error value.
  */
 	{
-	LOGDATA1("Starting to attempt a NT RAS Connection");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_CONNECT_1, "Starting to attempt a NT RAS Connection");
 	iReadBuf.Zero();
 	iInputBuf.Zero();
 
@@ -131,7 +137,7 @@
  * Transmit "CLIENT" and attempt a connection
  */
 	{
-	LOGDATA1("NTRAS Writing CLIENT...");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_ATTEMPTCONNECT_1, "NTRAS Writing CLIENT...");
 	iAttemptCnt++;
 	// Send the soliciting message, and await the NT Ras server's response.
 	CommWrite(KNtRasWriteText);
@@ -169,7 +175,7 @@
  * @param aStatus	Standard error value, indicating the result of the read request.
  */
 	{
-	LOGDATA2("NTRAS Rx Completion: %S",&iInputBuf);
+	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_COMMREADCOMPLETE_1, "NTRAS Rx Completion: %s",iInputBuf);
 	if(aStatus!=KErrNone)
 		{
 		iTimer->Cancel();
@@ -190,7 +196,7 @@
 		{
 		iTimer->Cancel();
 		iCallback->NTRasCallBack(KErrNone);
-		LOGDATA1("NTRAS Received SERVER!");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_COMMREADCOMPLETE_2, "NTRAS Received SERVER!");
 		return;
 		}
 
@@ -203,7 +209,7 @@
  * has occurred.
  */
 	{
-	LOGDATA1("NTRAS Write Completion");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_COMMWRITECOMPLETE_1, "NTRAS Write Completion");
 	if(aStatus!=KErrNone)
 		{
 		iTimer->Cancel();
@@ -216,7 +222,7 @@
  * Timer expired callback.  Give up the attempted connection with a time-out error.
  */
 	{
-	LOGDATA1("NTRAS Timeout Occurred");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_TIMERCALLBACK_1, "NTRAS Timeout Occurred");
 	CommWriteCancel();
 	if(iAttemptCnt<KTxMaxRetries)
 		AttemptConnect();