--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomSecurityTsy.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomSecurityTsy.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,13 +16,8 @@
// INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CMmCustomSecurityTsyTraces.h"
-#endif
-
#include "CMmCustomSecurityTsy.h"
+#include <ctsy/tflogger.h>
#include "cmmphonegsmwcdmaext.h"
#include <ctsy/serviceapi/mmtsy_ipcdefs.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
@@ -37,7 +32,7 @@
CMmCustomTsy* aMmCustomTsy,
CMmPhoneTsy* aMmPhoneTsy )
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_CONSTRUCTL_1, "TSY: CMmCustomSecurityTsy::ConstructL");
+TFLOGSTRING("TSY: CMmCustomSecurityTsy::ConstructL");
iMmCustomTsy = aMmCustomTsy;
iMmPhoneTsy = aMmPhoneTsy;
@@ -63,7 +58,7 @@
CMmCustomTsy* aMmCustomTsy,
CMmPhoneTsy* aPhoneTsy )
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_NEWL_1, "TSY: CMmCustomSecurityTsy::NewL");
+TFLOGSTRING("TSY: CMmCustomSecurityTsy::NewL");
CMmCustomSecurityTsy* self = new (ELeave) CMmCustomSecurityTsy();
CleanupStack::PushL( self );
@@ -337,7 +332,7 @@
TInt aReqHandleType,
TInt aError )
{
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETE_1, "CustomTSY: CMmCustomSecurityTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
+TFLOGSTRING3( "CustomTSY: CMmCustomSecurityTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
// All possible TSY req handle types are listed in the
// switch case below.
switch ( aReqHandleType )
@@ -375,7 +370,7 @@
{
return KErrServerBusy;
}
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_ISBLOCKED_1, "TSY: CMmPhoneTsy::IsBlocked - Code to check: %d", *aCode );
+TFLOGSTRING2( "TSY: CMmPhoneTsy::IsBlocked - Code to check: %d", *aCode );
switch ( *aCode )
{
@@ -501,7 +496,7 @@
CMmDataPackage aPackage;
aPackage.PackData( &iCodeID, &iSecCode );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_CHECKSECURITYCODEL_1, "TSY: CMmCustomSecurityTsy::CheckSecurityCodeL iSecCode: %S", iSecCode );
+TFLOGSTRING2( "TSY: CMmCustomSecurityTsy::CheckSecurityCodeL iSecCode: %S", &iSecCode );
TInt retValue ( iMmPhoneTsy->MessageManager()->HandleRequestL(
ECustomCheckSecurityCodeIPC, &aPackage ) );
@@ -528,7 +523,7 @@
void CMmCustomSecurityTsy::CompleteCheckSecurityCode(
TInt aErrorCode )
{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODE_1, "TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCode - Error code: %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCode - Error code: %d", aErrorCode );
// reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
ESecurityRequestTypeCheckSecurityCode );
@@ -582,7 +577,7 @@
//
void CMmCustomSecurityTsy::CompleteCheckSecurityCodeCancel()
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODECANCEL_1, "TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCodeCancel");
+TFLOGSTRING("TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCodeCancel");
}
// ---------------------------------------------------------------------------
@@ -601,7 +596,7 @@
iMmPhoneTsy->MessageManager()->HandleRequestL(
ECustomSecurityDeliverCodeIPC, &aPackage );
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_DELIVERCODEL_1, "TSY: CMmCustomSecurityTsy::DeliverCodeL iSecCode: %S", iSecCode );
+TFLOGSTRING2( "TSY: CMmCustomSecurityTsy::DeliverCodeL iSecCode: %S", &iSecCode );
return KErrNone;
}
@@ -652,7 +647,7 @@
void CMmCustomSecurityTsy::CompleteDisablePhoneLock(
TInt aErrorCode )
{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETEDISABLEPHONELOCK_1, "TSY: CMmCustomSecurityTsy::CompleteDisablePhoneLock - Error code: %d", aErrorCode );
+TFLOGSTRING2("TSY: CMmCustomSecurityTsy::CompleteDisablePhoneLock - Error code: %d", aErrorCode );
// reset req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
ESecurityRequestTypeDisablePhoneLock );