--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
@@ -16,12 +16,6 @@
//INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmfaxcalltsyTraces.h"
-#endif
-
#include "cmmfaxcalltsy.h"
#include "cmmfaxlinetsy.h"
#include "cmmphonetsy.h"
@@ -48,7 +42,7 @@
TDes& aName,
CMmMessageManagerBase* aMessageManager )
{
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_NEWL_1, "TSY: CMmFaxCallTsy::NewL. Call name: %S", aName);
+ TFLOGSTRING2("TSY: CMmFaxCallTsy::NewL. Call name: %S", &aName);
CMmFaxCallTsy* mmCall = NULL;
@@ -72,7 +66,8 @@
CMmFaxCallTsy::~CMmFaxCallTsy()
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DTOR_1, "TSY: CMmFaxCallTsy::~CMmFaxCallTsy. Call deleted \iCallId:%d iCallName:%S", iCallId, iCallName);
+ TFLOGSTRING3("TSY: CMmFaxCallTsy::~CMmFaxCallTsy. Call deleted \
+ iCallId:%d iCallName:%S", iCallId, &iCallName);
// If Dial fails, Symbian CSD agent will close the call immediately.
// This means that TSY has not yet received call status indications,
@@ -206,7 +201,8 @@
const TInt aIpc,
const TDataPackage& aPackage )
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DOEXTFUNCL_1, "TSY: CMmFaxCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+ TFLOGSTRING3("TSY: CMmFaxCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc,
+ aTsyReqHandle);
TInt ret( KErrNone );
@@ -310,7 +306,7 @@
CTelObject::TReqMode CMmFaxCallTsy::ReqModeL(
const TInt aIpc )
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_REQMODEL_1, "TSY: CMmFaxCallTsy::ReqModeL. IPC:%d",aIpc);
+ TFLOGSTRING2("TSY: CMmFaxCallTsy::ReqModeL. IPC:%d",aIpc);
CTelObject::TReqMode ret( 0 ); // default return value
@@ -553,7 +549,8 @@
const TInt aIpc,
const TTsyReqHandle aTsyReqHandle )
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_CANCELSERVICE_1, "TSY: CMmFaxCallTsy::CancelService. IPC: %d, Req handle: %d",aIpc, aTsyReqHandle);
+ TFLOGSTRING3("TSY: CMmFaxCallTsy::CancelService. IPC: %d, Req handle: %d",
+ aIpc, aTsyReqHandle);
TInt ret( KErrNone );
@@ -657,8 +654,10 @@
callDataPackage->UnPackData( callStatus );
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. aResult:%d",aResult );
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_COMPLETENOTIFYSTATUSCHANGE_2, "TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. \Call status:%d Call name:%S", callStatus, iCallName);
+ TFLOGSTRING2("TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. aResult:%d",
+ aResult );
+ TFLOGSTRING3("TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. \
+ Call status:%d Call name:%S", callStatus, &iCallName);
switch( callStatus )
{
@@ -974,7 +973,8 @@
const TDesC8* aCallParams,
TDesC* aTelNumber )
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_1, "TSY: CMmFaxCallTsy::Dial. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName);
+ TFLOGSTRING3("TSY: CMmFaxCallTsy::Dial. Req handle: %d, Call name: %S",
+ aTsyReqHandle, &iCallName);
CMmCallList* callList = iMmPhone->CallList();
TBool dialFlag( EFalse );
@@ -1003,7 +1003,7 @@
if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() )
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_2, "TSY: Offline mode ON, Dial request is not allowed" );
+ TFLOGSTRING("TSY: Offline mode ON, Dial request is not allowed" );
TInt ret = CMmCommonStaticUtility::EpocErrorCode(
KErrGeneral, KErrGsmOfflineOpNotAllowed );
@@ -1018,7 +1018,7 @@
//is still in use.
//Complete request with status value informing the client
//about the situation.
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_3, "TSY: CMmFaxCallTsy::Dial - KErrNotReady");
+ TFLOGSTRING("TSY: CMmFaxCallTsy::Dial - KErrNotReady");
ReqCompleted( aTsyReqHandle, KErrNotReady );
}
else if ( 0 < dialHandle )
@@ -1026,7 +1026,7 @@
//The request is already in processing because of previous request
//Complete request with status value informing the client about
//the situation.
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_4, "TSY: CMmFaxCallTsy::Dial - KErrServerBusy");
+ TFLOGSTRING("TSY: CMmFaxCallTsy::Dial - KErrServerBusy");
ReqCompleted( aTsyReqHandle, KErrServerBusy );
}
else
@@ -1117,7 +1117,8 @@
TInt CMmFaxCallTsy::DialCancel(
const TTsyReqHandle aTsyReqHandle )
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIALCANCEL_1, "TSY: CMmFaxCallTsy::DialCancel. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName);
+ TFLOGSTRING3("TSY: CMmFaxCallTsy::DialCancel. Req handle: %d, Call name: %S",
+ aTsyReqHandle, &iCallName);
TInt ret( KErrGeneral );
@@ -1143,7 +1144,8 @@
const TTsyReqHandle aTsyReqHandle,
const TDesC8* /*aCallParams*/ )
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_ANSWERINCOMINGCALL_1, "TSY: CMmFaxCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d",aTsyReqHandle);
+ TFLOGSTRING2("TSY: CMmFaxCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d",
+ aTsyReqHandle);
TTsyReqHandle iAnswerCallHandle = iTsyReqHandleStore->
GetTsyReqHandle( EMultimodeCallAnswer );
@@ -1225,7 +1227,8 @@
TInt CMmFaxCallTsy::HangUp(
const TTsyReqHandle aTsyReqHandle )
{
- OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_HANGUP_1, "TSY: CMmFaxCallTsy::HangUp. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName);
+ TFLOGSTRING3("TSY: CMmFaxCallTsy::HangUp. Req handle: %d, Call name: %S",
+ aTsyReqHandle, &iCallName);
TInt hangUpCause( KErrNone );
TInt ret( KErrNone );
@@ -1281,7 +1284,7 @@
//ownership.
if ( RCall::EStatusRinging == iCallStatus )
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_HANGUP_2, "TSY: CMmFaxCallTsy::HangUp - Reject incoming call");
+ TFLOGSTRING("TSY: CMmFaxCallTsy::HangUp - Reject incoming call");
}
//Phone Application is the first client that is started, it
//will always be the priority client and thus able to hangup calls
@@ -1729,7 +1732,8 @@
const TTsyReqHandle aTsyReqHandle,
RCall::TCommPort* aCommPort )
{
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_LOANDATAPORT_1, "TSY: CMmFaxCallTsy::LoanDataPort - Client taking control: %S",iCallName );
+TFLOGSTRING2("TSY: CMmFaxCallTsy::LoanDataPort - Client taking control: %S",
+ &iCallName );
TInt ret( KErrNone );
@@ -1835,7 +1839,8 @@
TInt CMmFaxCallTsy::RecoverDataPort(
const TTsyReqHandle aTsyReqHandle )
{
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_RECOVERDATAPORT_1, "TSY: CMmFaxCallTsy::RecoverDataPort - Client returning control: %S",iCallName );
+TFLOGSTRING2("TSY: CMmFaxCallTsy::RecoverDataPort - Client returning control: %S",
+ &iCallName );
TInt ret( KErrNone );
@@ -1890,7 +1895,8 @@
//
TInt CMmFaxCallTsy::RecoverDataPortAndRelinquishOwnership()
{
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_RECOVERDATAPORTANDRELINQUISHOWNERSHIP_1, "TSY: CMmFaxCallTsy::RecoverDataPortAndRelinquishOwnership - \Client returning control: %S", iCallName );
+TFLOGSTRING2("TSY: CMmFaxCallTsy::RecoverDataPortAndRelinquishOwnership - \
+ Client returning control: %S", &iCallName );
TInt ret( KErrNone );