diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simatktsy/src/CSatNotifySendSs.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySendSs.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendSs.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" @@ -20,12 +20,6 @@ //INCLUDES - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "CSatNotifySendSsTraces.h" -#endif - #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatCCTsy.h" // Call Control Tsy class header @@ -34,6 +28,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. @@ -49,13 +44,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_NEWL_1, "CSAT: CSatNotifySendSs::NewL"); + TFLOGSTRING("CSAT: CSatNotifySendSs::NewL"); CSatNotifySendSs* const satNotifySendSs = new ( ELeave ) CSatNotifySendSs( aNotificationsTsy ); CleanupStack::PushL( satNotifySendSs ); satNotifySendSs->ConstructL(); CleanupStack::Pop( satNotifySendSs ); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_NEWL_2, "CSAT: CSatNotifySendSs::NewL, end of method"); + TFLOGSTRING("CSAT: CSatNotifySendSs::NewL, end of method"); return satNotifySendSs; } @@ -69,7 +64,7 @@ // None ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_DTOR_1, "CSAT: CSatNotifySendSs::~CSatNotifySendSs"); + TFLOGSTRING("CSAT: CSatNotifySendSs::~CSatNotifySendSs"); } // ----------------------------------------------------------------------------- @@ -95,7 +90,7 @@ // None ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CONSTRUCTL_1, "CSAT: CSatNotifySendSs::ConstructL"); + TFLOGSTRING("CSAT: CSatNotifySendSs::ConstructL"); } // ----------------------------------------------------------------------------- @@ -110,7 +105,7 @@ const TDataPackage& aPackage ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_NOTIFY_1, "CSAT: CSatNotifySendSs::Notify"); + TFLOGSTRING("CSAT: CSatNotifySendSs::Notify"); // Save data pointer to client side for completion iSendSsV1Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -135,7 +130,7 @@ const TTsyReqHandle aTsyReqHandle ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendSs::CancelNotification"); + TFLOGSTRING("CSAT: CSatNotifySendSs::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> @@ -161,7 +156,7 @@ TInt aErrorCode ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendSs::CompleteNotifyL"); + TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL"); TInt ret( KErrNone ); // Unpack parameters @@ -234,13 +229,15 @@ } else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendSs::CompleteNotifyL, Alpha ID is NULL"); + TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ + Alpha ID is NULL"); sendSsV1.iAlphaId.iStatus = RSat::EAlphaIdNull; } } else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendSs::CompleteNotifyL, Alpha ID not present"); + TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ + Alpha ID not present"); sendSsV1.iAlphaId.iStatus = RSat::EAlphaIdNotPresent; } @@ -296,7 +293,8 @@ } else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendSs::CompleteNotifyL, Data corrupted"); + TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ + Data corrupted"); CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood, KNullDesC16 ); ret = KErrCorrupt; @@ -305,7 +303,8 @@ } else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_5, "CSAT: CSatNotifySendSs::CompleteNotifyL, SS String length exceeded"); + TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ + SS String length exceeded"); // SS string is too long CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood, KNullDesC16 ); @@ -314,7 +313,8 @@ } else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_6, "CSAT: CSatNotifySendSs::CompleteNotifyL, SS String missing"); + TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ + SS String missing"); // Mandatory tlv is missing, returning response immediately CreateTerminalRespL( pCmdNumber, RSat::KErrorRequiredValuesMissing, @@ -337,7 +337,8 @@ } // End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown ) else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_7, "CSAT: CSatNotifySendSs::CompleteNotifyL, Request not ongoing"); + TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ + Request not ongoing"); // Request not on, returning response immediately TBuf<1> additionalInfo; additionalInfo.Append( RSat::KNoSpecificMeProblem ); @@ -359,7 +360,7 @@ TDes8* aRsp ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_TERMINALRESPONSEL_1, "CSAT:: CSatNotifySendSs::TerminalResponseL"); + TFLOGSTRING("CSAT:: CSatNotifySendSs::TerminalResponseL"); TInt ret( KErrNone ); // Buffer for additional information TBuf additionalInfo; @@ -386,7 +387,8 @@ && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) && ( RSat::KInteractionWithCCPermanentError != rspV2.iGeneralResult ) ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_TERMINALRESPONSEL_2, "CSAT:: CSatNotifySendSs::TerminalResponseL, Invalid General Result"); + TFLOGSTRING("CSAT:: CSatNotifySendSs::TerminalResponseL,\ + Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -445,7 +447,8 @@ if ( !isValidAddInfo ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_TERMINALRESPONSEL_3, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid Additional Info"); + TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\ + Invalid Additional Info"); ret = KErrCorrupt; } @@ -478,7 +481,7 @@ const TDesC16& aAdditionalInfo ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CREATETERMINALRESPL_1, "CSAT:: CSatNotifySendSs::CreateTerminalRespL"); + TFLOGSTRING("CSAT:: CSatNotifySendSs::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; tlvSpecificData.AddTag( KTlvResultTag ); @@ -514,7 +517,7 @@ RSat::TSsString& aSsString ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKCALLFORWARDING_1, "CSAT:: CSatNotifySendSs::CheckCallForwarding"); + TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckCallForwarding"); _LIT8(KCFU,"*21*"); // Call forwarding unconditional (CFU) _LIT8(KCFB,"*67*"); // Call forwarding on Mobile Subscriber Busy(CFB) _LIT8(KCFNRy, "*61*"); // Call forwarding on No Reply (CFNRy) @@ -536,7 +539,8 @@ } if ( KErrNotFound != pos ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKCALLFORWARDING_2, "CSAT:: CSatNotifySendSs::CheckCallForwarding, String is for call forwarding"); + TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckCallForwarding,\ + String is for call forwarding"); aSsString.iSsString.Zero(); aSsString.iSsString.Append( aSource.Left( pos + 4 ) ); aSsString.iSsString.Append( KPlusMarkCharacterCode ); @@ -557,12 +561,13 @@ TPtrC8 aSsString ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_1, "CSAT:: CSatNotifySendSs::CheckSsStringValidity"); + TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckSsStringValidity"); TInt ret( KErrNone ); if ( !aSsString.Length() ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_2, "CSAT:: CSatNotifySendSs::CheckSsStringValidity, String length is NULL"); + TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckSsStringValidity,\ + String length is NULL"); // If length is zero ret = KErrCorrupt; } @@ -576,7 +581,8 @@ || ( KErrNotFound != aSsString.Find( KWild ) ) || ( KErrNotFound != aSsString.Find( KExpansionDigit ) ) ) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_3, "CSAT:: CSatNotifySendSs::CheckSsStringValidity, Incompatible character found"); + TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckSsStringValidity,\ + Incompatible character found"); ret = KErrCorrupt; } return ret;