--- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpIdleModeText.cpp Mon May 24 18:38:31 2010 +0100
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpIdleModeText.cpp Tue Jun 22 11:02:32 2010 +0100
@@ -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 "CSatNotifySetUpIdleModeTextTraces.h"
+#endif
+
#include <satcs.h> // Etel SAT IPC definitions
#include "CSatTsy.h" // Tsy class header
#include "CSatNotifySetUpIdleModeText.h"// Tsy 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: CSatNotifySetUpIdleModeText::NewL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_NEWL_1, "CSAT: CSatNotifySetUpIdleModeText::NewL");
CSatNotifySetUpIdleModeText* const satNotifySetUpIdleModeText =
new ( ELeave ) CSatNotifySetUpIdleModeText( aNotificationsTsy );
CleanupStack::PushL( satNotifySetUpIdleModeText );
satNotifySetUpIdleModeText->ConstructL();
CleanupStack::Pop( satNotifySetUpIdleModeText );
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::NewL, end of method");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_NEWL_2, "CSAT: CSatNotifySetUpIdleModeText::NewL, end of method");
return satNotifySetUpIdleModeText;
}
@@ -62,8 +67,7 @@
// None
)
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::\
- ~CSatNotifySetUpIdleModeText");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_DTOR_1, "CSAT: CSatNotifySetUpIdleModeText::~CSatNotifySetUpIdleModeText");
}
// -----------------------------------------------------------------------------
@@ -89,7 +93,7 @@
// None
)
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::ConstructL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_CONSTRUCTL_1, "CSAT: CSatNotifySetUpIdleModeText::ConstructL");
}
// -----------------------------------------------------------------------------
@@ -104,7 +108,7 @@
const TDataPackage& aPackage
)
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::Notify");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_NOTIFY_1, "CSAT: CSatNotifySetUpIdleModeText::Notify");
// Save data pointer to client side for completion
iSetUpIdleModeTextV1Pckg = reinterpret_cast<RSat::
TSetUpIdleModeTextV1Pckg*>( aPackage.Des1n() );
@@ -129,7 +133,7 @@
const TTsyReqHandle aTsyReqHandle
)
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CancelNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_CANCELNOTIFICATION_1, "CSAT: CSatNotifySetUpIdleModeText::CancelNotification");
// Reset the request handle
TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
@@ -154,7 +158,7 @@
TInt aErrorCode
)
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_1, "CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL");
TInt ret( KErrNone );
TInt returnValue( KErrNone );
TBuf<1> additionalInfo;
@@ -224,8 +228,7 @@
( ( RSat::ERemoveExistingIdleModeText == setUpIdleModeTextV1.iType) &&
( RSat::ENotSelfExplanatory==setUpIdleModeTextV1.iIconId.iQualifier)) )
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::\
- CompleteNotifyL, Invalid Data");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_2, "CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL, Invalid Data");
additionalInfo.Zero();
additionalInfo.Append( KNoCause );
CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood,
@@ -244,8 +247,7 @@
} // End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown )
else
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL,\
- Request not ongoing");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_3, "CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL, Request not ongoing");
// Request not on, returning response immediately
additionalInfo.Zero();
additionalInfo.Append( KNoCause );
@@ -268,7 +270,7 @@
TDes8* aRsp
)
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_1, "CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL");
TInt ret( KErrNone );
TBuf<1> additionalInfo;
@@ -289,8 +291,7 @@
( RSat::KCmdDataNotUnderstood != rspV1.iGeneralResult ) &&
( RSat::KSuccessRequestedIconNotDisplayed != rspV1.iGeneralResult ) )
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL,\
- Invalid General Result");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_2, "CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL, Invalid General Result");
// Invalid general result
ret = KErrCorrupt;
}
@@ -305,8 +306,7 @@
}
else
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL,\
- Invalid Additional Info");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_3, "CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL, Invalid Additional Info");
// Invalid additional info field
ret = KErrCorrupt;
}
@@ -331,7 +331,7 @@
TDesC16& aAdditionalInfo
)
{
- TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CreateTerminalRespL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_CREATETERMINALRESPL_1, "CSAT: CSatNotifySetUpIdleModeText::CreateTerminalRespL");
TTlv tlvSpecificData;
// Create General Result TLV here
tlvSpecificData.AddTag( KTlvResultTag );