diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_dll/src/csignalindreq.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_dll/src/csignalindreq.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_dll/src/csignalindreq.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -21,12 +21,17 @@ #include "modemattrace.h" #include "modematclientsrv.h" #include "rmodematcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csignalindreqTraces.h" +#endif CSignalIndReq::CSignalIndReq( RModemAtController* aClient) : CActive(EPriorityNormal), iClient(aClient) { + OstTrace1( TRACE_NORMAL, CSIGNALINDREQ_CSIGNALINDREQ, "CSignalIndReq::CSignalIndReq;aClient=%x", aClient ); C_TRACE((_L("CSignalIndReq::CSignalIndReq(0x%x)"), aClient)); CActiveScheduler::Add( this ); aClient->SendReceiveSignalInd( iStatus ); @@ -35,28 +40,33 @@ CSignalIndReq::~CSignalIndReq() { + OstTrace0( TRACE_NORMAL, DUP1_CSIGNALINDREQ_CSIGNALINDREQ, "CSignalIndReq::~CSignalIndReq" ); C_TRACE((_L("CSignalIndReq::~CSignalIndReq()"))); Cancel(); } void CSignalIndReq::DoCancel() { + OstTrace0( TRACE_NORMAL, CSIGNALINDREQ_DOCANCEL, "CSignalIndReq::DoCancel" ); C_TRACE((_L("CSignalIndReq::DoCancel()"))); iClient->SendReceiveSignalIndCancel(); } void CSignalIndReq::RunL() { + OstTrace0( TRACE_NORMAL, CSIGNALINDREQ_RUNL, "CSignalIndReq::RunL" ); C_TRACE((_L("CSignalIndReq::RunL()"))); - if( iStatus.Int() == KErrNone ) + if( iStatus.Int() == KErrNone || iStatus.Int() > 0 ) { - C_TRACE((_L("KErrNone %d"), iStatus.Int())); + OstTrace1( TRACE_NORMAL, DUP1_CSIGNALINDREQ_RUNL, "CSignalIndReq::RunL - Completing with;iStatus.Int()=%d", iStatus.Int() ); + C_TRACE((_L("Completing with %d"), iStatus.Int())); iClient->SignalIndReceived( iStatus.Int() ); iClient->SendReceiveSignalInd( iStatus ); SetActive(); } - else + else { + OstTrace1( TRACE_NORMAL, DUP2_CSIGNALINDREQ_RUNL, "CSignalIndReq::RunL - delete;iStatus.Int()=%d", iStatus.Int() ); C_TRACE((_L("CSignalIndReq RunL delete %d"), iStatus.Int())); delete this; }