--- a/telephonyserverplugins/simatktsy/src/CSatNotifyReceiveData.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyReceiveData.cpp Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2005-2009 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,12 +20,6 @@
// INCLUDES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CSatNotifyReceiveDataTraces.h"
-#endif
-
#include <satcs.h> // Etel SAT IPC definitions
#include "CSatTsy.h" // Tsy class header
#include "CSatNotifyReceiveData.h" // Class header
@@ -33,6 +27,7 @@
#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.
@@ -47,13 +42,13 @@
CSatNotificationsTsy* aNotificationsTsy
)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_NEWL_1, "CSAT: CSatNotifyMoreTime::NewL");
+ TFLOGSTRING("CSAT: CSatNotifyMoreTime::NewL");
CSatNotifyReceiveData* const satNotifyReceiveData =
new ( ELeave ) CSatNotifyReceiveData( aNotificationsTsy );
CleanupStack::PushL( satNotifyReceiveData );
satNotifyReceiveData->ConstructL();
CleanupStack::Pop( satNotifyReceiveData );
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_NEWL_2, "CSAT: CSatNotifyMoreTime::NewL, end of method");
+ TFLOGSTRING("CSAT: CSatNotifyMoreTime::NewL, end of method");
return satNotifyReceiveData;
}
@@ -67,7 +62,7 @@
// None
)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_DTOR_1, "CSAT: CSatNotifyMoreTime::~CSatNotifyReceiveData");
+ TFLOGSTRING("CSAT: CSatNotifyMoreTime::~CSatNotifyReceiveData");
}
// -----------------------------------------------------------------------------
@@ -93,7 +88,7 @@
// None
)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_CONSTRUCTL_1, "CSAT: CSatNotifyMoreTime::ConstructL, does nothing");
+ TFLOGSTRING("CSAT: CSatNotifyMoreTime::ConstructL, does nothing");
}
// -----------------------------------------------------------------------------
@@ -108,7 +103,7 @@
const TDataPackage& aPackage
)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_NOTIFY_1, "CSAT: CSatNotifyReceiveData::Notify");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::Notify");
// Save data pointer to client side for completion
iReceiveDataRspV2Pckg = reinterpret_cast<RSat::TReceiveDataV2Pckg*>(
aPackage.Des1n() );
@@ -131,7 +126,7 @@
const TTsyReqHandle aTsyReqHandle
)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_CANCELNOTIFICATION_1, "CSAT: CSatNotifyReceiveData::CancelNotification");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::CancelNotification");
// Reset the request handle
TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->
ResetTsyReqHandle( CSatTsy::ESatNotifyReceiveDataPCmdReqType );
@@ -154,7 +149,7 @@
TInt aErrorCode
)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_1, "CSAT: CSatNotifyReceiveData::CompleteNotifyL");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::CompleteNotifyL");
TInt ret( KErrNone );
TBuf<1> noAdditionalInfo( 0 );
// Unpack parameters
@@ -229,7 +224,8 @@
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_2, "CSAT: CSatNotifyReceiveData::CompleteNotifyL, Alpha ID is NULL");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::\
+ CompleteNotifyL, Alpha ID is NULL");
receiveDataV2.iAlphaId.iStatus = RSat::EAlphaIdNull;
}
}
@@ -241,7 +237,8 @@
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_3, "CSAT: CSatNotifyReceiveData::CompleteNotifyL, Required values missing");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::CompleteNotifyL, \
+ Required values missing");
// Required values missing
TUint8 channelDataLength( 0 );
CreateTerminalRespL(
@@ -260,7 +257,8 @@
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_4, "CSAT: CSatNotifyReceiveData::CompleteNotifyL, Request not ongoing");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::CompleteNotifyL, \
+ Request not ongoing");
// Request not on, returning response immediately
TUint8 channelDataLength( 0 );
TBuf16<1> additionalInfo;
@@ -284,7 +282,7 @@
TDes8* aRsp
)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_1, "CSAT: CSatNotifyReceiveData::TerminalResponseL");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::TerminalResponseL");
TInt ret( KErrNone );
@@ -311,7 +309,8 @@
&& ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult )
&& ( RSat::KBearerIndepProtocolError != rspV2.iGeneralResult ) )
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_2, "CSAT: CSatNotifyReceiveData::TerminalResponseL, Invalid general result");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::TerminalResponseL, \
+ Invalid general result");
ret = KErrCorrupt;
}
@@ -326,7 +325,8 @@
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_3, "CSAT: CSatNotifyReceiveData::TerminalResponseL, Additional Info is Corrupted");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::TerminalResponseL, \
+ Additional Info is Corrupted");
ret = KErrCorrupt;
}
}
@@ -351,7 +351,7 @@
TUint8 aChannelDataLength
)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_CREATETERMINALRESPL_1, "CSAT: CSatNotifyReceiveData::CreateTerminalRespL");
+ TFLOGSTRING("CSAT: CSatNotifyReceiveData::CreateTerminalRespL");
TTlv tlvSpecificData;
// Append general result tag
tlvSpecificData.AddTag( KTlvResultTag );