diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_dll/src/catcommandreq.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_dll/src/catcommandreq.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_dll/src/catcommandreq.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -21,6 +21,10 @@ #include "modemattrace.h" #include "modematclientsrv.h" #include "rmodematcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "catcommandreqTraces.h" +#endif CAtCommandReq::CAtCommandReq( RModemAtController* aClient, const TDesC8& aCommand, @@ -28,6 +32,8 @@ CActive(EPriorityNormal), iClient(aClient) { + OstTraceExt3( TRACE_NORMAL, CATCOMMANDREQ_CATCOMMANDREQ, "CAtCommandReq::CAtCommandReq;aClient=%p;aCommand=%p;aResponse=%p", aClient, &aCommand, &aResponse ); + OstTraceExt1( TRACE_NORMAL, DUP2_CATCOMMANDREQ_CATCOMMANDREQ, "CAtCommandReq::CAtCommandReq - ;aCommand=%s", aCommand ); C_TRACE((_L("CAtCommandReq::CAtCommandReq(0x%x, 0x%x, 0x%x) "), aClient, &aCommand, &aResponse)); DUMP_MESSAGE( aCommand ); CActiveScheduler::Add( this ); @@ -37,19 +43,22 @@ CAtCommandReq::~CAtCommandReq() { + OstTrace0( TRACE_NORMAL, DUP1_CATCOMMANDREQ_CATCOMMANDREQ, "CAtCommandReq::~CAtCommandReq" ); C_TRACE((_L("CAtCommandReq::~CAtCommandReq()"))); Cancel(); } void CAtCommandReq::RunL() { - C_TRACE((_L("CAtCommandReq::RunL()"))); + OstTrace1( TRACE_NORMAL, CATCOMMANDREQ_RUNL, "CAtCommandReq::RunL() complete;iStatus.Int()=%d", iStatus.Int() ); + C_TRACE((_L("CAtCommandReq::RunL() complete: %d"), iStatus.Int())); iClient->ATCommandResponseReceived( iStatus.Int() ); delete this; } void CAtCommandReq::DoCancel() { + OstTrace0( TRACE_NORMAL, CATCOMMANDREQ_DOCANCEL, "CAtCommandReq::DoCancel" ); C_TRACE((_L("CAtCommandReq::DoCancel()"))); iClient->SendReceiveAtCommandCancel(); C_TRACE((_L("Status: %d"), iStatus.Int()));