--- a/mmserv/radioutility/radioserver/Session/Src/RadioRequest.cpp	Tue Aug 31 15:43:02 2010 +0300
+++ b/mmserv/radioutility/radioserver/Session/Src/RadioRequest.cpp	Wed Sep 01 12:23:00 2010 +0100
@@ -21,7 +21,6 @@
 // INCLUDE FILES
 #include    "RadioRequest.h"
 #include    "RadioDebug.h"
-#include    "trace.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -44,7 +43,6 @@
 		iInt(0),
 		iIntPckg(iInt)
     {
-    FUNC_LOG;
     }
 
 // -----------------------------------------------------------------------------
@@ -54,7 +52,7 @@
 //
 void CRadioRequest::ConstructL()
     {
-    FUNC_LOG;
+	RADIO_RDEBUG(_L("[RADIO-SESS] CRadioRequest::ConstructL()"));
 	CActiveScheduler::Add(this);
     }
 
@@ -68,7 +66,6 @@
 	MRadioObserver& aObserver,
 	TRadioServerRequest aRequest )
     {
-    FUNC_LOG;
     CRadioRequest* self = new( ELeave ) CRadioRequest(aSession, aObserver, aRequest);
     CleanupStack::PushL( self );
     self->ConstructL();
@@ -78,8 +75,6 @@
 // Destructor
 CRadioRequest::~CRadioRequest()
     {
-    FUNC_LOG;
-    INFO_1("My pointer: 0x%x", this );
 	if ( IsActive() )
 		{
 		Cancel();
@@ -96,7 +91,6 @@
 	TRadioServerRequest aRequest,
 	TInt aError )
     {
-    FUNC_LOG;
 	iRequest = aRequest;
 
 	TRequestStatus* stat = &iStatus;
@@ -110,7 +104,6 @@
 //
 void CRadioRequest::DoCancel()
     {
-    FUNC_LOG;
 	iSession.CancelRequest(iRequest);
     }
 
@@ -120,12 +113,11 @@
 //
 void CRadioRequest::RunL()
     {
-    FUNC_LOG;
 	TInt err = iStatus.Int();
 	if ( err == KErrCancel )
 		{
 		// Ignore the cancelled request
-		INFO_1("cancelled iRequest [%d]", iRequest);
+		RADIO_RDEBUG_INT(_L("[RADIO-SESS] CRadioRequest::RunL():cancelled [%d]"), iRequest);
 		return;
 		}
 
@@ -135,31 +127,31 @@
 		case ERadioServStationSeek:
 			{
 			iInt = iIntPckg();
-			INFO_1("ERadioServStationSeek [%d]", iInt);
+			RADIO_RDEBUG_INT(_L("[RADIO-SESS] CRadioRequest::RunL(): ERadioServStationSeek [%d]"), iInt);
 			iObserver.StationSeekComplete(err, iInt);
 			}
 			break;
 		case ERadioServSetFrequency:
 			{
-			INFO("ERadioServSetFrequency");
+			RADIO_RDEBUG(_L("[RADIO-SESS] CRadioRequest::RunL(): ERadioServSetFrequency"));
 			iObserver.SetFrequencyComplete(err);
 			}
 			break;
 		case ERadioServRequestTunerControl:
 			{
-			INFO("ERadioServRequestTunerControl");
+			RADIO_RDEBUG(_L("[RADIO-SESS] CRadioRequest::RunL(): ERadioServRequestTunerControl"));
 			iObserver.RequestTunerControlComplete(err);
 			}
 			break;
 		case ERadioServSetFrequencyRange:
 			{
-			INFO("ERadioServSetFrequencyRange");
+			RADIO_RDEBUG(_L("[RADIO-SESS] CRadioRequest::RunL(): ERadioServSetFrequencyRange"));
 			iObserver.SetFrequencyRangeComplete(err);
 			}
 			break;
 		case ERadioServPlay:
 			{
-			INFO("INFOERadioServPlay");
+			RADIO_RDEBUG(_L("[RADIO-SESS] CRadioRequest::RunL(): ERadioServPlay"));
 			if ( err != KErrNone )
 				{
 				iObserver.RadioEventStateChange(EFalse, err);
@@ -169,21 +161,21 @@
 		case ERadioServStationSeekByPTY:
 			{
 			iInt = iIntPckg();
-			INFO_1("ERadioServStationSeekByPTY [%d]", iInt);
+			RADIO_RDEBUG_INT(_L("[RADIO-SESS] CRadioRequest::RunL(): ERadioServStationSeekByPTY [%d]"), iInt);
 			iObserver.StationSeekByPTYComplete(err, iInt);
 			}
 			break;
 		case ERadioServStationSeekByTA:
 			{
 			iInt = iIntPckg();
-			INFO_1("ERadioServStationSeekByTA [%d]", iInt);
+			RADIO_RDEBUG_INT(_L("[RADIO-SESS] CRadioRequest::RunL(): ERadioServStationSeekByTA [%d]"), iInt);
 			iObserver.StationSeekByTAComplete(err, iInt);
 			}
 			break;
 		case ERadioServStationSeekByTP:
 			{
 			iInt = iIntPckg();
-			INFO_1("ERadioServStationSeekByTP [%d]", iInt);
+			RADIO_RDEBUG_INT(_L("[RADIO-SESS] CRadioRequest::RunL(): ERadioServStationSeekByTP [%d]"), iInt);
 			iObserver.StationSeekByTPComplete(err, iInt);
 			}
 			break;
@@ -213,7 +205,7 @@
 			break;
 		default:
 			{
-			INFO("ERROR case default !!!");
+			RADIO_RDEBUG(_L("[RADIO-SESS] CRadioRequest::RunL(): ERROR case default !!!"));
 			User::Panic(_L("RadioServer"), KErrGeneral );
 			break;
 			}