--- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetChannelStatus.cpp Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetChannelStatus.cpp Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-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"
@@ -20,6 +20,12 @@
//INCLUDES
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSatNotifyGetChannelStatusTraces.h"
+#endif
+
#include <satcs.h> // Etel SAT IPC definitions
#include "CSatTsy.h" // Tsy class header
#include "CSatNotifyGetChannelStatus.h" // Class header
@@ -27,7 +33,6 @@
#include "CBerTlv.h" // Ber Tlv data handling
#include "TTlv.h" // TTlv class
#include "CSatDataPackage.h" // Parameter packing
-#include "TfLogger.h" // For TFLOGSTRING
#include "TSatUtility.h" // Utilities
#include "CSatTsyReqHandleStore.h" // Request handle class
#include "cmmmessagemanagerbase.h" // Message manager class for forwarding req.
@@ -42,13 +47,13 @@
CSatNotificationsTsy* aNotificationsTsy
)
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::NewL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_NEWL_1, "CSAT: CSatNotifyGetChannelStatus::NewL");
CSatNotifyGetChannelStatus* const satNotifyGetChannelStatus =
new ( ELeave ) CSatNotifyGetChannelStatus( aNotificationsTsy );
CleanupStack::PushL( satNotifyGetChannelStatus );
satNotifyGetChannelStatus->ConstructL();
CleanupStack::Pop( satNotifyGetChannelStatus );
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::NewL, end of method");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_NEWL_2, "CSAT: CSatNotifyGetChannelStatus::NewL, end of method");
return satNotifyGetChannelStatus;
}
@@ -62,8 +67,7 @@
// None
)
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::~CSatNotifyGetChannelStatus"
- );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_DTOR_1, "CSAT: CSatNotifyGetChannelStatus::~CSatNotifyGetChannelStatus");
}
// -----------------------------------------------------------------------------
@@ -89,7 +93,7 @@
// None
)
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::ConstructL, does nothing");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CONSTRUCTL_1, "CSAT: CSatNotifyGetChannelStatus::ConstructL, does nothing");
}
// -----------------------------------------------------------------------------
@@ -104,7 +108,7 @@
const TDataPackage& aPackage
)
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::Notify");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_NOTIFY_1, "CSAT: CSatNotifyGetChannelStatus::Notify");
// Save data pointers to client side for completion
iGetChannelStatusRspV2Pckg = reinterpret_cast<RSat::TGetChannelStatusV2Pckg*>(
aPackage.Des1n() );
@@ -127,7 +131,7 @@
const TTsyReqHandle aTsyReqHandle
)
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::CancelNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CANCELNOTIFICATION_1, "CSAT: CSatNotifyGetChannelStatus::CancelNotification");
// Reset the request handle
TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
ResetTsyReqHandle( CSatTsy::ESatNotifyGetChannelStatusPCmdReqType );
@@ -150,7 +154,7 @@
TInt aErrorCode
)
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_1, "CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL");
TInt ret( KErrNone );
// Unpack parameters
@@ -177,8 +181,7 @@
// Complete right away if error has occured, otherwise continue..
if ( KErrNone == aErrorCode )
{
- TFLOGSTRING2("CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL\
- aErrorCode: %d", aErrorCode );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_2, "CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL aErrorCode: %d", aErrorCode );
// Fill the Get Channel status structure
RSat::TGetChannelStatusV2& channelStatusV2 =
( *iGetChannelStatusRspV2Pckg )();
@@ -194,8 +197,7 @@
}
else
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL\
- Request not ongoing");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_3, "CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL Request not ongoing");
// Request not on, returning response immediately
TBuf16<1> additionalInfo;
additionalInfo.Append( RSat::KNoSpecificMeProblem );
@@ -217,7 +219,7 @@
TDes8* aRsp
)
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::TerminalResponseL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_1, "CSAT: CSatNotifyGetChannelStatus::TerminalResponseL");
TInt ret( KErrNone );
TBuf16<RSat::KAdditionalInfoMaxSize> additionalInfo;
@@ -241,8 +243,7 @@
&& ( RSat::KCmdNumberNotKnown != rspV2.iGeneralResult )
&& ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) )
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::TerminalResponseL,\
- Invalid General Result");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_2, "CSAT: CSatNotifyGetChannelStatus::TerminalResponseL, Invalid General Result");
// Invalid general result
ret = KErrCorrupt;
}
@@ -252,8 +253,7 @@
{
if ( !rspV2.iAdditionalInfo.Length() )
{
- TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::TerminalResponseL,\
- Invalid Additional Info");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_3, "CSAT: CSatNotifyGetChannelStatus::TerminalResponseL, Invalid Additional Info");
ret = KErrCorrupt;
}
else
@@ -287,7 +287,7 @@
const TDesC16& aAdditionalInfo
)
{
- TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_1, "CSAT: CSatMessHandler::CreateTerminalRespL");
TTlv tlvSpecificData;
// Append general result tag
tlvSpecificData.AddTag( KTlvResultTag );
@@ -319,8 +319,7 @@
}
else
{
- TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL - \
- mandatory channel status missing");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_2, "CSAT: CSatMessHandler::CreateTerminalRespL - mandatory channel status missing");
}
// Prepare data