--- a/telephonyserverplugins/simatktsy/src/CSatNotifySelectItem.cpp Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySelectItem.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 "CSatNotifySelectItemTraces.h"
+#endif
+
#include <satcs.h> // Etel SAT IPC definitions
#include "CSatTsy.h" // Tsy class header
#include "CSatNotifySelectItem.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: CSatNotifySelectItem::NewL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_NEWL_1, "CSAT: CSatNotifySelectItem::NewL");
CSatNotifySelectItem* const satNotifySelectItem =
new ( ELeave ) CSatNotifySelectItem( aNotificationsTsy );
CleanupStack::PushL( satNotifySelectItem );
satNotifySelectItem->ConstructL();
CleanupStack::Pop( satNotifySelectItem );
- TFLOGSTRING("CSAT: CSatNotifySelectItem::NewL, end of method");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_NEWL_2, "CSAT: CSatNotifySelectItem::NewL, end of method");
return satNotifySelectItem;
}
@@ -62,7 +67,7 @@
// None
)
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::~CSatNotifySelectItem");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_DTOR_1, "CSAT: CSatNotifySelectItem::~CSatNotifySelectItem");
}
// -----------------------------------------------------------------------------
@@ -88,7 +93,7 @@
// None
)
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::ConstructL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_CONSTRUCTL_1, "CSAT: CSatNotifySelectItem::ConstructL");
// Initiliaze Item Next Indicator flag
iItemNextIndicatorRemoved = EFalse;
}
@@ -105,7 +110,7 @@
const TDataPackage& aPackage
)
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::Notify");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_NOTIFY_1, "CSAT: CSatNotifySelectItem::Notify");
// Save data pointer to client side for completion
iSelectItemV2Pckg = reinterpret_cast<RSat::TSelectItemV2Pckg*>(
aPackage.Des1n() );
@@ -128,7 +133,7 @@
const TTsyReqHandle aTsyReqHandle
)
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::CancelNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_CANCELNOTIFICATION_1, "CSAT: CSatNotifySelectItem::CancelNotification");
// Reset the request handle
TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
ResetTsyReqHandle( CSatTsy::ESatNotifySelectItemPCmdReqType );
@@ -151,7 +156,7 @@
TInt aErrorCode
)
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_1, "CSAT: CSatNotifySelectItem::CompleteNotifyL");
TInt ret( KErrNone );
// Unpack parameters
TPtrC8* data;
@@ -223,8 +228,7 @@
}
else
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::\
- CompleteNotifyL, Alpha ID is NULL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_2, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Alpha ID is NULL");
selectItemV2.iAlphaId.iStatus = RSat::EAlphaIdNull;
}
}
@@ -232,8 +236,7 @@
// Alpha id not present
else
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL\
- Alpha ID not present");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_3, "CSAT: CSatNotifySelectItem::CompleteNotifyL Alpha ID not present");
selectItemV2.iAlphaId.iStatus = RSat::EAlphaIdNotPresent;
}
// Help information
@@ -244,8 +247,7 @@
}
else
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
- No Help available");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_4, "CSAT: CSatNotifySelectItem::CompleteNotifyL, No Help available");
// No help
selectItemV2.iHelp = RSat::ENoHelpAvailable;
}
@@ -324,14 +326,12 @@
}
else if ( KErrNotFound == retValue )
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
- No Icon ID");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_5, "CSAT: CSatNotifySelectItem::CompleteNotifyL, No Icon ID");
selectItemV2.iIconListQualifier = RSat::ENoIconId;
}
else
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL, \
- Return value not valid.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_6, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Return value not valid.");
}
ret = HandleItemsL( pCmdNumber, &berTlv, ret, iconIdList,
@@ -350,8 +350,7 @@
} // End of if ( CSatTsy::ESatReqHandleUnknown != reqHandle )
else
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
- Request not ongoing");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_7, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Request not ongoing");
// Request not on, returning response immediately
additionalInfo.Zero();
additionalInfo.Append( KNoCause );
@@ -372,7 +371,7 @@
TDes8* aRsp
)
{
- TFLOGSTRING("CSAT:: CSatNotifySelectItem::TerminalResponseL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_1, "CSAT:: CSatNotifySelectItem::TerminalResponseL");
TInt ret( KErrNone );
TBuf<1> additionalInfo;
@@ -392,8 +391,7 @@
&& ( RSat::KMeUnableToProcessCmd != rspV1.iGeneralResult )
&& ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ) )
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
- Invalid General Result");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_2, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Invalid General Result");
ret = KErrCorrupt;
}
// If there is ME (Mobile Entity) error or there there should be
@@ -406,17 +404,14 @@
// Check the length of additional info
if ( rspV1.iAdditionalInfo.Length() != 0 )
{
- TFLOGSTRING2("CSAT: CSatNotifySelectItem::TerminalResponseL, \
- Additional info: %S", &rspV1.iAdditionalInfo);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_3, "CSAT: CSatNotifySelectItem::TerminalResponseL, Additional info: %S", rspV1.iAdditionalInfo);
additionalInfo.Zero();
additionalInfo.Append( rspV1.iAdditionalInfo[0] );
- TFLOGSTRING2("CSAT: CSatNotifySelectItem::TerminalResponseL, \
- Additional info: %S", &additionalInfo);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_4, "CSAT: CSatNotifySelectItem::TerminalResponseL, Additional info: %S", additionalInfo);
}
else
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::CompleteNotifyL,\
- Invalid Additional Info");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_5, "CSAT: CSatNotifySelectItem::CompleteNotifyL, Invalid Additional Info");
ret = KErrCorrupt;
}
}
@@ -425,14 +420,12 @@
{
if (iItemNextIndicatorRemoved)
{
- TFLOGSTRING("CSatNotifySelectItem::TerminalResponseL, Partial Comprehension, \
- iItemNextIndicatorRemoved");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_6, "CSatNotifySelectItem::TerminalResponseL, Partial Comprehension, iItemNextIndicatorRemoved");
rspV1.iGeneralResult = RSat::KPartialComprehension;
}
if (iItemsIconIdListRemoved)
{
- TFLOGSTRING("CSatNotifySelectItem::TerminalResponseL, Partial Comprehension, \
- iItemsIconIdListRemoved");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_7, "CSatNotifySelectItem::TerminalResponseL, Partial Comprehension, iItemsIconIdListRemoved");
rspV1.iGeneralResult = RSat::KPartialComprehension;
}
}
@@ -460,8 +453,7 @@
TDesC16& aAdditionalInfo
)
{
- TFLOGSTRING2("CSAT: CSatNotifySelectItem::CreateTerminalRespL, \
- Additional info: %S", &aAdditionalInfo);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_CREATETERMINALRESPL_1, "CSAT: CSatNotifySelectItem::CreateTerminalRespL, Additional info: %S", aAdditionalInfo);
TTlv tlvSpecificData;
// Create General Result TLV here
@@ -530,7 +522,7 @@
RSat::TSelectItemV2* aSelectItemV2
)
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_1, "CSAT: CSatNotifySelectItem::HandleItemsL");
TInt ret( aRet );
CTlv item;
@@ -675,8 +667,7 @@
if ( KErrNoMemory == aSelectItemV2->AddItem(
newItem, itemNextIndicator[i], aIconIdList[i] ) )
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL,\
- Icon data length exceeded, AddItem1");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_2, "CSAT: CSatNotifySelectItem::HandleItemsL, Icon data length exceeded, AddItem1");
// Too many or long menu items
ret = KErrCorrupt;
}
@@ -685,8 +676,7 @@
else if ( KErrNoMemory == aSelectItemV2->AddItemIcon(
newItem, aIconIdList[i] ) )
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL,\
- Icon data length exceeded, AddItemIcon");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_3, "CSAT: CSatNotifySelectItem::HandleItemsL, Icon data length exceeded, AddItemIcon");
// Too many or long menu items
ret = KErrCorrupt;
}
@@ -700,8 +690,7 @@
if ( KErrNoMemory == aSelectItemV2->AddItem(
newItem, itemNextIndicator[i] ) )
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL,\
- Icon data length exceeded, AddItem2");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_4, "CSAT: CSatNotifySelectItem::HandleItemsL, Icon data length exceeded, AddItem2");
// Too many or long menu items
ret = KErrCorrupt;
}
@@ -712,8 +701,7 @@
TInt retAdd = aSelectItemV2->AddItem( newItem );
if ( KErrNoMemory == retAdd )
{
- TFLOGSTRING("CSAT: CSatNotifySelectItem::HandleItemsL,\
- AddItem failed -> KErrNoMemory");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSELECTITEM_HANDLEITEMSL_5, "CSAT: CSatNotifySelectItem::HandleItemsL, AddItem failed -> KErrNoMemory");
// Too many or long menu items
// If there is not enough space left in the buffer used
// by the menu KErrNoMemory is returned.