# HG changeset patch # User hgs # Date 1277200952 -3600 # Node ID 8b72faa1200f7a9e57707e26459811e35032084d # Parent 2473f5e227f9cde3443821a08b0de20d310c1425 201024_02 diff -r 2473f5e227f9 -r 8b72faa1200f basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp --- a/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp Mon May 24 18:38:31 2010 +0100 +++ b/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component networking_bca source \sf\os\cellularsrv\basebandabstraction\basebandchanneladaptor binary \sf\os\cellularsrv\basebandabstraction\basebandchanneladaptor\group all diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/bwins/c32bca2u.def --- a/basebandadaptationplugins/basebandchanneladaptorforc32/bwins/c32bca2u.def Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - NewBcaFactoryL @ 1 NONAME - diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/bwins/c32bca2u.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/bwins/c32bca2u.def Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,3 @@ +EXPORTS + NewBcaFactoryL @ 1 NONAME + diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/eabi/c32bca2u.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/eabi/c32bca2u.def Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +EXPORTS + NewBcaFactoryL @ 1 NONAME + _ZTIN26BasebandChannelAdaptation210C32BcaShim7CSenderE @ 2 NONAME + _ZTIN26BasebandChannelAdaptation210C32BcaShim9CReceiverE @ 3 NONAME + _ZTVN26BasebandChannelAdaptation210C32BcaShim7CSenderE @ 4 NONAME + _ZTVN26BasebandChannelAdaptation210C32BcaShim9CReceiverE @ 5 NONAME + diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/group/C32Bca2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/group/C32Bca2.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,47 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// @file +// Baseband Channel Adaptor for C32 component. +// +// + +TARGET c32bca2.dll +TARGETTYPE dll +UID 0x1000008D 0x10287032 +VENDORID 0x70000001 + +SOURCEPATH ../src +SOURCE C32Bca.cpp +SOURCE C32BcaFactory.cpp +SOURCE C32BcaDllMain.cpp +SOURCE MBca2Impl.cpp + +USERINCLUDE ../inc +USERINCLUDE ../traces + +OS_LAYER_SYSTEMINCLUDE_SYMBIAN + +LIBRARY euser.lib +LIBRARY c32.lib +LIBRARY commsdat.lib +LIBRARY commsbufs.lib + +// Do not add the non-callable exports to the DEF files +// Remove this line temporarily if we need to add new exports +//NOEXPORTLIBRARY + +CAPABILITY All -Tcb + +UNPAGED +SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,24 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Baseband Channel Adaptor for C32 component. +// +// + +/** + @file +*/ + +PRJ_MMPFILES + +C32Bca2.mmp diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/inc/C32Bca.h --- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/inc/C32Bca.h Mon May 24 18:38:31 2010 +0100 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/inc/C32Bca.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -29,7 +29,6 @@ #include #include using namespace CommsDat; -#include /** This namespace includes the BCA component names.*/ namespace BasebandChannelAdaptation @@ -95,9 +94,6 @@ /** Serial port we service for the iUser */ RComm& iPort; - - /** CommsDebug logger */ - __FLOG_DECLARATION_MEMBER; }; /** @@ -192,10 +188,6 @@ virtual void CommWriteComplete(TInt aErr); virtual void CommLinkDown(TInt aErr); -#ifdef __FLOG_ACTIVE - void LogCommConfig(TCommConfig& c); -#endif // __FLOG_ACTIVE - private: void CloseCommPort(); @@ -242,8 +234,6 @@ /** Should the next write be errored with this error code? */ TInt iErrorOnNextWrite; - /** Comms Debug Utility logger. */ - __FLOG_DECLARATION_MEMBER; }; /** * C32BCA Panic. diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/src/C32Bca.cpp --- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/src/C32Bca.cpp Mon May 24 18:38:31 2010 +0100 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/src/C32Bca.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -21,6 +21,12 @@ @internalComponent */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "C32BcaTraces.h" +#endif + #include "C32Bca.h" #include #include @@ -44,14 +50,12 @@ iPort(aPort) { CActiveScheduler::Add(this); - __FLOG_OPEN(KC32BcaLogFolder, KC32BcaLogFile); // Connect to the BCA logger } /** C++ destructor */ CCommBase::~CCommBase() { - __FLOG_CLOSE; } /** @@ -173,7 +177,7 @@ void CCommLinkMonitor::Setup(TUint32 aMask) { iNotifyChangeSignalMask = aMask; - __FLOG_1(_L8("CommLinkMonitor setup: Notify on signal mask [0x%X]"),iNotifyChangeSignalMask); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_SETUP1_1, "CommLinkMonitor setup: Notify on signal mask [0x%X]",iNotifyChangeSignalMask); } /** @@ -189,7 +193,7 @@ iSavedSignalState = iPort.Signals(iNotifyChangeSignalMask) & iNotifyChangeSignalMask; iPort.NotifySignalChange(iStatus, iSignals, iNotifyChangeSignalMask); - __FLOG_1(_L8("CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]"), iSavedSignalState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_NOTIFYLINKDOWN1_1, "CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]", iSavedSignalState); SetActive(); } @@ -199,7 +203,7 @@ */ void CCommLinkMonitor::RunL() { - __FLOG_2(_L8("CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]"), iSignals & (~0x1F), iSignals & 0x1F); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_RUNL1_1, "CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]", iSignals & (~0x1F), iSignals & 0x1F); // We report link failure if and only if a monitored line went from high to low. // Method: mask the saved signals using inverted monitored bits in the signal bitmask, @@ -220,7 +224,7 @@ Cancels notification request of link failure */ void CCommLinkMonitor::DoCancel() { - __FLOG(_L8("CommLinkMonitor::DoCancel: Cancelling signal change notification.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_DOCANCEL1_1, "CommLinkMonitor::DoCancel: Cancelling signal change notification."); iPort.NotifySignalChangeCancel(); } @@ -233,8 +237,7 @@ */ CC32Bca::CC32Bca() { - __FLOG_OPEN(KC32BcaLogFolder,KC32BcaLogFile); - __FLOG_2(_L8("====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======"), KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CTOR1_1, "====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======", KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber); } /** @@ -260,7 +263,7 @@ CC32Bca::~CC32Bca() { - __FLOG(_L8("CC32Bca::~CC32Bca: releasing resources...")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR1_1, "CC32Bca::~CC32Bca: releasing resources..."); CloseCommDbConnection(); CloseCommPort(); // Cancels reader / writer / monitor @@ -272,14 +275,13 @@ delete iWriter; delete iLinkMonitor; // Note: may have never been created. - __FLOG(_L8("CC32Bca::~CC32Bca: CC32Bca destroyed.")); - __FLOG_CLOSE; + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR1_2, "CC32Bca::~CC32Bca: CC32Bca destroyed."); } /** This method deletes the BCA itself.*/ void CC32Bca::Release() { - __FLOG(_L8("CC32Bca::Release")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_RELEASE1_1, "CC32Bca::Release"); delete this; } @@ -299,7 +301,7 @@ TRequestStatus* ptrStatus = &aStatus; if(iCommPortOpen) { - __FLOG(_L8("Warning: C32Bca is already Opened.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_1, "Warning: C32Bca is already Opened."); User::RequestComplete(ptrStatus,KErrNone); return; @@ -320,12 +322,12 @@ // So, we just log a warning. if(KErrNone == commPortErr && iCommPort.Size() == 0) { - __FLOG(_L8("Warning: Null string read from CommDB. Will try to open Comm Port anyway.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_2, "Warning: Null string read from CommDB. Will try to open Comm Port anyway."); } if(KErrNone != commPortErr) // Fatal: we do not have a port name. Can't open RComm. { - __FLOG(_L8("Error: Failed to get C32 PortName from CommDB ")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_3, "Error: Failed to get C32 PortName from CommDB "); CloseCommDbConnection(); User::RequestComplete(ptrStatus, commPortErr); return; @@ -338,7 +340,7 @@ if (len1 < KErrNone) { - __FLOG(_L8("** ERROR: No :: (Double Colon) in aChannelId **")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_4, "** ERROR: No :: (Double Colon) in aChannelId **"); User::RequestComplete(ptrStatus, KErrBadName); return; } @@ -369,7 +371,7 @@ { // We do not use a hardcoded value (e.g. ECUART), because the client code or the environment are // confused - it is better to fail them, rather than mask their problems. - __FLOG(_L8("Error: Failed to get CSY name from CommDB ")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_5, "Error: Failed to get CSY name from CommDB "); CloseCommDbConnection(); User::RequestComplete(ptrStatus,getCsyErr); return; @@ -399,13 +401,13 @@ TInt ret = iCommServ.Connect(); if(ret) { - __FLOG_1(_L8("Open: C32 Server connection error %d"), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_6, "Open: C32 Server connection error %d", ret); User::RequestComplete(ptrStatus,ret); return; } ret = iCommServ.LoadCommModule(iCsyName); - __FLOG_2(_L16("Open: CSY module [%S] loaded with error %d"), &iCsyName, ret); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_7, "Open: CSY module [%S] loaded with error %d", iCsyName, ret); if(ret) { @@ -422,7 +424,7 @@ ret = iComm.Open(iCommServ, iCommPort, ECommShared, iCommRole); } - __FLOG_2(_L16("Open: C32 port [%S] opened with error %d"), &iCommPort, ret); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN1_8, "Open: C32 port [%S] opened with error %d", iCommPort, ret); if(ret) { @@ -460,7 +462,7 @@ TRequestStatus* request = &aStatus; User::RequestComplete(request, KErrNone); - __FLOG_1(_L8("C32Bca::Shutdown: BCA shut down with error %d"), KErrNone); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_SHUTDOWN1_1, "C32Bca::Shutdown: BCA shut down with error %d", KErrNone); } /** @@ -470,7 +472,7 @@ void CC32Bca::Close() { CloseCommPort(); - __FLOG_1(_L8("C32Bca::Close:Close: BCA closed with error %d"), KErrNone); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSE1_1, "C32Bca::Close:Close: BCA closed with error %d", KErrNone); } /** @@ -525,7 +527,7 @@ void CC32Bca:: CancelRead() { - __FLOG(_L8("CancelRead: Read is cancelled by client.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELREAD_1, "CancelRead: Read is cancelled by client."); iReader->Cancel(); if(iReadRequest != NULL) @@ -540,7 +542,7 @@ void CC32Bca::CancelWrite() { - __FLOG(_L8("CancelWrite: Write is cancelled by client.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELWRITE1_1, "CancelWrite: Write is cancelled by client."); iWriter->Cancel(); @@ -552,7 +554,7 @@ // Debug dumps: -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE _LIT8(KLitOptLevelGeneric, "KBcaOptLevelGeneric"); _LIT8(KLitOptLevelExtSerial, "KBcaOptLevelExtSerial"); @@ -637,22 +639,9 @@ return KLitOptNameUnsupported; } } -#endif // __FLOG_ACTIVE +#endif // OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG -#ifdef __FLOG_ACTIVE -/** -Print debug output of the TCommComfig parameters. - -@param The configuration whose parameters should be logged. -*/ -void CC32Bca::LogCommConfig(TCommConfig& c) - { - __FLOG_5(_L8("Rate[%d] DataBits[%d] StopBits[%d] Parity[%d] Handshake[0x%x]"), c().iRate, c().iDataBits, c().iStopBits, c().iParity, c().iHandshake); - __FLOG_4(_L8("ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]"), c().iParityError, c().iFifo, c().iSpecialRate, c().iTerminatorCount); - __FLOG_1(_L8("Terminator[0x%x]"), c().iTerminator); - } -#endif // __FLOG_ACTIVE /** @@ -666,7 +655,7 @@ void CC32Bca::Ioctl(TRequestStatus& aStatus, TUint aOptLevel, TUint aOptName, TDes8& aOpt) { - __FLOG_4(_L8("Ioctl: Level[%S](0x%X) Name[%S](0x%X)."), &IoctlOptLevelStr(aOptLevel), aOptLevel, &IoctlOptNameStr(aOptName), aOptName); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_1, "Ioctl: Level[%s](0x%X) Name[%s](0x%X).", IoctlOptLevelStr(aOptLevel), aOptLevel, IoctlOptNameStr(aOptName), aOptName); aStatus = KRequestPending; @@ -696,7 +685,7 @@ { TUint32 tempIapId = *(reinterpret_cast(aOpt.Ptr())); - __FLOG_1(_L8("Ioctl: IAP ID [%d] specified."),tempIapId); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_2, "Ioctl: IAP ID [%d] specified.",tempIapId); if(tempIapId < 1 ) { @@ -745,14 +734,15 @@ case KSerialConfig: { - __FLOG(_L8("Ioctl: KSerialConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_3, "Ioctl: KSerialConfig"); TCommConfig cfg; iComm.Config(cfg); -#ifdef __FLOG_ACTIVE - LogCommConfig(cfg); -#endif // __FLOG_ACTIVE + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_4, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_5, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_6, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_7, "Terminator[0x%x]", cfg().iTerminator); TPckgBuf cfgBuf(cfg); aOpt.Copy(cfgBuf); @@ -761,13 +751,15 @@ case KSerialSetConfig: { - __FLOG(_L8("Ioctl: KSerialSetConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_8, "Ioctl: KSerialSetConfig"); TCommConfig cfg(*(reinterpret_cast(aOpt.Ptr()))); -#ifdef __FLOG_ACTIVE - LogCommConfig(cfg); -#endif // __FLOG_ACTIVE + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_9, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_10, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_11, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_12, "Terminator[0x%x]", cfg().iTerminator); + ret = iComm.SetConfig(cfg); break; @@ -787,11 +779,11 @@ reinterpret_cast(aOpt.Ptr()) )); iCsyNameOverride = ETrue; - __FLOG_1(_L8("Ioctl: CSY Name set to [%S]"), &iCsyName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_13, "Ioctl: CSY Name set to [%S]", iCsyName); } else { - __FLOG(_L8("Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_14, "Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open."); ret = KErrAlreadyExists; } @@ -804,11 +796,11 @@ { iCommRole = *(reinterpret_cast(aOpt.Ptr())); iCommRoleOverride = ETrue; - __FLOG_1(_L8("Ioctl: Comm Role set to [%d]"), iCommRole); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_15, "Ioctl: Comm Role set to [%d]", iCommRole); } else { - __FLOG(_L8("Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_16, "Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open."); ret = KErrAlreadyExists; } break; @@ -817,7 +809,7 @@ case KSerialSetTxRxBufferSize: { TInt bufSize = *(reinterpret_cast(aOpt.Ptr())); - __FLOG_1(_L8("Ioctl: Setting Rx Tx buffer size to [%d]"), bufSize); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_17, "Ioctl: Setting Rx Tx buffer size to [%d]", bufSize); iComm.SetReceiveBufferLength(bufSize); break; @@ -838,7 +830,7 @@ else { const TSerialSetControlLines& lines = *(reinterpret_cast(aOpt.Ptr())); - __FLOG_2(_L8("Ioctl: Setting/clearing control lines %x/%x"), lines.iSetMask, lines.iClearMask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_18, "Ioctl: Setting/clearing control lines %x/%x", lines.iSetMask, lines.iClearMask); iComm.SetSignals(lines.iSetMask, lines.iClearMask); ret = KErrNone; } @@ -855,7 +847,7 @@ } - __FLOG_1(_L8("Ioctl completed with error %d"), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL1_19, "Ioctl completed with error %d", ret); TRequestStatus* ptrStatus = &aStatus; User::RequestComplete(ptrStatus, ret); @@ -871,7 +863,7 @@ */ void CC32Bca::MonitorControlLinesL(TUint32 aArgMask) { - __FLOG_1(_L8("Ioctl: argument bitmask = [0x%X] "), aArgMask); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_1, "Ioctl: argument bitmask = [0x%X] ", aArgMask); if(iLinkMonitor) // We may have never started... { @@ -881,12 +873,12 @@ if(KMonitorOff == aArgMask) // Stop monitoring: { - __FLOG(_L8("MonitorControlLinesL: Stopping Control Lines monitoring.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_2, "MonitorControlLinesL: Stopping Control Lines monitoring."); // We either never started, or we just cancelled above. } else // Start Monitoring, or change the monitored lines. { - __FLOG(_L8("MonitorControlLinesL: Starting to monitor Control Lines.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_3, "MonitorControlLinesL: Starting to monitor Control Lines."); if(!iLinkMonitor) // We are starting to monitor for the first time { @@ -935,7 +927,7 @@ iLinkMonitor->Setup(lineMask); iLinkMonitor->NotifyLinkDown(); - __FLOG(_L8("MonitorControlLinesL: Control Lines monitoring started.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL1_4, "MonitorControlLinesL: Control Lines monitoring started."); } } @@ -953,7 +945,7 @@ @leave if the value could not be read */ void CC32Bca::ReadCommPortFromCommDbL(TDes& aPortName) { - __FLOG(_L8("CC32Bca::ReadCommPortFromCommDbL()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL1_1, "CC32Bca::ReadCommPortFromCommDbL()"); ConnectToCommDbBearerRecordL(); TInt ret(0); @@ -966,7 +958,7 @@ if(ret!=KErrNone) { - __FLOG_1(_L8("portField->LoadL(*iCommsDat) left with[%d] "), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL1_2, "portField->LoadL(*iCommsDat) left with[%d] ", ret); User::Leave(ret); } @@ -980,7 +972,7 @@ @leave if the value could not be read */ void CC32Bca::ReadCsyNameFromCommDbL(TDes& aCsyName) { - __FLOG(_L8("CC32Bca::ReadCsyNameFromCommDbL()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL1_1, "CC32Bca::ReadCsyNameFromCommDbL()"); ConnectToCommDbBearerRecordL(); TInt ret(0); @@ -993,7 +985,7 @@ if(ret!=KErrNone) { - __FLOG_1(_L8("csyField->LoadL(*iCommsDat) left with[%d] "), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL1_2, "csyField->LoadL(*iCommsDat) left with[%d] ", ret); User::Leave(ret); } @@ -1008,7 +1000,7 @@ @leave if the value could not be read */ void CC32Bca::ReadCommRoleFromCommDbL(TCommRole& aCommRole) { - __FLOG(_L8("CC32Bca::ReadCommRoleFromCommDbL()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL1_1, "CC32Bca::ReadCommRoleFromCommDbL()"); ConnectToCommDbBearerRecordL(); TUint32 role(0); @@ -1021,7 +1013,7 @@ if(ret!=KErrNone) { - __FLOG_1(_L8("roleField->LoadL(*iCommsDat) left with[%d] "), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL1_2, "roleField->LoadL(*iCommsDat) left with[%d] ", ret); User::Leave(ret); } @@ -1039,7 +1031,7 @@ */ void CC32Bca::ConnectToCommDbBearerRecordL() { - __FLOG(_L8("CC32Bca::ConnectToCommDbBearerRecordL()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_1, "CC32Bca::ConnectToCommDbBearerRecordL()"); if(iCommsDat != NULL) // CommDB is already open, we don't need to do anything { return; @@ -1047,7 +1039,7 @@ if(iIapId < 1) // Can't access CommDB if IAP ID is unknown { - __FLOG_1(_L8("iIapId[%d] is unknown"), iIapId); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_2, "iIapId[%d] is unknown", iIapId); User::Leave(KErrNotReady); } @@ -1080,7 +1072,7 @@ TRAPD(ret,iapRecord->LoadL(*iCommsDat)); if (ret != KErrNone) { - __FLOG_1(_L8("iapRecord->LoadL(*iCommsDat) left with[%d] "), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_3, "iapRecord->LoadL(*iCommsDat) left with[%d] ", ret); User::Leave(ret); } @@ -1100,7 +1092,7 @@ if(iModemId == 0) // ID not found. { - __FLOG_1(_L8("iModemId[%d] is not found"), iModemId); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_4, "iModemId[%d] is not found", iModemId); User::Leave(KErrNotFound); } } @@ -1109,7 +1101,7 @@ /** Cancels an outstanding Ioctl, if any. */ void CC32Bca::CancelIoctl() { - __FLOG(_L8("CancelIoctl(): Ioctl cancel request. No Ioctl to cancel.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELIOCTL1_1, "CancelIoctl(): Ioctl cancel request. No Ioctl to cancel."); } @@ -1136,7 +1128,7 @@ iCommServ.Close(); iCommPortOpen = EFalse; } - __FLOG(_L8("CloseCommPort(): Session with C32 & RComm closed.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSECOMMPORT1_1, "CloseCommPort(): Session with C32 & RComm closed."); } /** @@ -1145,7 +1137,7 @@ */ void C32Bca::Panic(TC32BcaPanic aPanic) { - __FLOG_STATIC2(KC32BcaLogFolder,KC32BcaLogFile,_L8("%S Panic %d"), &KC32BcaPanic(), aPanic); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_PANIC1_1, "%S Panic %d", KC32BcaPanic(), aPanic); User::Panic(KC32BcaPanic, aPanic); } @@ -1173,7 +1165,7 @@ // Upcall from the link monitor: Link has gone down. void CC32Bca::CommLinkDown(TInt aErr) { - __FLOG_1(_L8("CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write."), aErr); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_COMMLINKDOWN1_1, "CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write.", aErr); __ASSERT_DEBUG(KErrNone != aErr, Panic(EGeneralLogicError)); // If KErrNone, use has no way to know that the read has failed. if(iReader->IsActive()) diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,59 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELIOCTL1_1=0x36 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELREAD_1=0x13 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELWRITE1_1=0x14 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CLOSE1_1=0x12 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CLOSECOMMPORT1_1=0x37 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_COMMLINKDOWN1_1=0x39 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_1=0x32 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_2=0x33 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_3=0x34 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL1_4=0x35 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CTOR1_1=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_DTOR1_1=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_DTOR1_2=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_1=0x15 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_10=0x1e +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_11=0x1f +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_12=0x20 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_13=0x21 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_14=0x22 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_15=0x23 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_16=0x24 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_17=0x25 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_18=0x26 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_19=0x27 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_2=0x16 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_3=0x17 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_4=0x18 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_5=0x19 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_6=0x1a +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_7=0x1b +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_8=0x1c +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL1_9=0x1d +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL1_1=0x28 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL1_2=0x29 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL1_3=0x2a +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL1_4=0x2b +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_1=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_2=0xa +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_3=0xb +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_4=0xc +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_5=0xd +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_6=0xe +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_7=0xf +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN1_8=0x10 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_PANIC1_1=0x38 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMPORTFROMCOMMDBL1_1=0x2c +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMPORTFROMCOMMDBL1_2=0x2d +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMROLEFROMCOMMDBL1_1=0x30 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMROLEFROMCOMMDBL1_2=0x31 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCSYNAMEFROMCOMMDBL1_1=0x2e +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCSYNAMEFROMCOMMDBL1_2=0x2f +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_RELEASE1_1=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_SHUTDOWN1_1=0x11 +[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_DOCANCEL1_1=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_NOTIFYLINKDOWN1_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_RUNL1_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_SETUP1_1=0x1 diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca.mmp --- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca.mmp Mon May 24 18:38:31 2010 +0100 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -27,6 +27,7 @@ SOURCE C32BcaDllMain.cpp USERINCLUDE ../inc +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN @@ -34,8 +35,6 @@ LIBRARY c32.lib LIBRARY commsdat.lib -#include - // Do not add the non-callable exports to the DEF files // Remove this line temporarily if we need to add new exports //NOEXPORTLIBRARY diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca2.mmp --- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca2.mmp Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -// Copyright (c) 2004-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// @file -// Baseband Channel Adaptor for C32 component. -// -// - -TARGET c32bca2.dll -TARGETTYPE dll -UID 0x1000008D 0x10287032 -VENDORID 0x70000001 - -SOURCEPATH ../c32bca2/src -SOURCE C32Bca.cpp -SOURCE C32BcaFactory.cpp -SOURCE C32BcaDllMain.cpp -SOURCE MBca2Impl.cpp - -USERINCLUDE ../c32bca2/inc - -OS_LAYER_SYSTEMINCLUDE_SYMBIAN - -LIBRARY euser.lib -LIBRARY c32.lib -LIBRARY commsdat.lib -LIBRARY commsbufs.lib - -#include - -// Do not add the non-callable exports to the DEF files -// Remove this line temporarily if we need to add new exports -//NOEXPORTLIBRARY - -CAPABILITY All -Tcb - -UNPAGED -SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/group/bld.inf --- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/bld.inf Mon May 24 18:38:31 2010 +0100 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -33,7 +33,7 @@ C32Bca.mmp #ifdef SYMBIAN_ZERO_COPY_NETWORKING -C32Bca2.mmp +#include "../c32bca2/group/bld.inf" #endif diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp --- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp Mon May 24 18:38:31 2010 +0100 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component networking_c32bca source \sf\os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32 binary \sf\os\cellularsrv\basebandadaptationplugins\basebandchanneladaptorforc32\group all diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/inc/C32Bca.h --- a/basebandadaptationplugins/basebandchanneladaptorforc32/inc/C32Bca.h Mon May 24 18:38:31 2010 +0100 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/inc/C32Bca.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -29,7 +29,6 @@ #include #include using namespace CommsDat; -#include /** This namespace includes the BCA component names.*/ namespace BasebandChannelAdaptation @@ -42,9 +41,7 @@ _LIT(KChannelIdNotOverridden, ""); - _LIT8(KC32BcaLogFolder, "C32Bca"); - _LIT8(KC32BcaLogFile, "C32Bca.txt"); - + @@ -96,8 +93,7 @@ Serial port we service for the iUser */ RComm& iPort; - /** CommsDebug logger */ - __FLOG_DECLARATION_MEMBER; + }; /** @@ -192,10 +188,6 @@ virtual void CommWriteComplete(TInt aErr); virtual void CommLinkDown(TInt aErr); -#ifdef __FLOG_ACTIVE - void LogCommConfig(TCommConfig& c); -#endif // __FLOG_ACTIVE - private: void CloseCommPort(); @@ -242,8 +234,6 @@ /** Should the next write be errored with this error code? */ TInt iErrorOnNextWrite; - /** Comms Debug Utility logger. */ - __FLOG_DECLARATION_MEMBER; }; /** * C32BCA Panic. diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/src/C32Bca.cpp --- a/basebandadaptationplugins/basebandchanneladaptorforc32/src/C32Bca.cpp Mon May 24 18:38:31 2010 +0100 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/src/C32Bca.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -21,6 +21,12 @@ @internalComponent */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "C32BcaTraces.h" +#endif + #include "C32Bca.h" #include #include @@ -44,14 +50,12 @@ iPort(aPort) { CActiveScheduler::Add(this); - __FLOG_OPEN(KC32BcaLogFolder, KC32BcaLogFile); // Connect to the BCA logger } /** C++ destructor */ CCommBase::~CCommBase() { - __FLOG_CLOSE; } /** @@ -173,7 +177,7 @@ void CCommLinkMonitor::Setup(TUint32 aMask) { iNotifyChangeSignalMask = aMask; - __FLOG_1(_L8("CommLinkMonitor setup: Notify on signal mask [0x%X]"),iNotifyChangeSignalMask); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_SETUP_1, "CommLinkMonitor setup: Notify on signal mask [0x%X]",iNotifyChangeSignalMask); } /** @@ -189,7 +193,7 @@ iSavedSignalState = iPort.Signals(iNotifyChangeSignalMask) & iNotifyChangeSignalMask; iPort.NotifySignalChange(iStatus, iSignals, iNotifyChangeSignalMask); - __FLOG_1(_L8("CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]"), iSavedSignalState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_NOTIFYLINKDOWN_1, "CommLinkMonitor::NotifyLinkDown: initial signals: [0x%X]", iSavedSignalState); SetActive(); } @@ -199,7 +203,7 @@ */ void CCommLinkMonitor::RunL() { - __FLOG_2(_L8("CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]"), iSignals & (~0x1F), iSignals & 0x1F); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_RUNL_1, "CommLinkMonitor::RunL: Signals changed [0x%X]; new signals [0x%X]", iSignals & (~0x1F), iSignals & 0x1F); // We report link failure if and only if a monitored line went from high to low. // Method: mask the saved signals using inverted monitored bits in the signal bitmask, @@ -220,7 +224,7 @@ Cancels notification request of link failure */ void CCommLinkMonitor::DoCancel() { - __FLOG(_L8("CommLinkMonitor::DoCancel: Cancelling signal change notification.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCOMMLINKMONITOR_DOCANCEL_1, "CommLinkMonitor::DoCancel: Cancelling signal change notification."); iPort.NotifySignalChangeCancel(); } @@ -233,8 +237,7 @@ */ CC32Bca::CC32Bca() { - __FLOG_OPEN(KC32BcaLogFolder,KC32BcaLogFile); - __FLOG_2(_L8("====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======"), KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CTOR_1, "====== CC32Bca::CC32Bca: Shim BCA for C32 [Vesion: major= %d minor= %d] Constructed. ======", KC32BcaMajorVersionNumber, KC32BcaMinorVersionNumber); } /** @@ -260,7 +263,7 @@ CC32Bca::~CC32Bca() { - __FLOG(_L8("CC32Bca::~CC32Bca: releasing resources...")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR_1, "CC32Bca::~CC32Bca: releasing resources..."); CloseCommDbConnection(); CloseCommPort(); // Cancels reader / writer / monitor @@ -272,14 +275,13 @@ delete iWriter; delete iLinkMonitor; // Note: may have never been created. - __FLOG(_L8("CC32Bca::~CC32Bca: CC32Bca destroyed.")); - __FLOG_CLOSE; + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_DTOR_2, "CC32Bca::~CC32Bca: CC32Bca destroyed."); } /** This method deletes the BCA itself.*/ void CC32Bca::Release() { - __FLOG(_L8("CC32Bca::Release")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_RELEASE_1, "CC32Bca::Release"); delete this; } @@ -299,7 +301,7 @@ TRequestStatus* ptrStatus = &aStatus; if(iCommPortOpen) { - __FLOG(_L8("Warning: C32Bca is already Opened.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_1, "Warning: C32Bca is already Opened."); User::RequestComplete(ptrStatus,KErrNone); return; @@ -320,12 +322,12 @@ // So, we just log a warning. if(KErrNone == commPortErr && iCommPort.Size() == 0) { - __FLOG(_L8("Warning: Null string read from CommDB. Will try to open Comm Port anyway.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_2, "Warning: Null string read from CommDB. Will try to open Comm Port anyway."); } if(KErrNone != commPortErr) // Fatal: we do not have a port name. Can't open RComm. { - __FLOG(_L8("Error: Failed to get C32 PortName from CommDB ")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_3, "Error: Failed to get C32 PortName from CommDB "); CloseCommDbConnection(); User::RequestComplete(ptrStatus, commPortErr); return; @@ -338,7 +340,7 @@ if (len1 < KErrNone) { - __FLOG(_L8("** ERROR: No :: (Double Colon) in aChannelId **")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_4, "** ERROR: No :: (Double Colon) in aChannelId **"); User::RequestComplete(ptrStatus, KErrBadName); return; } @@ -369,7 +371,7 @@ { // We do not use a hardcoded value (e.g. ECUART), because the client code or the environment are // confused - it is better to fail them, rather than mask their problems. - __FLOG(_L8("Error: Failed to get CSY name from CommDB ")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_5, "Error: Failed to get CSY name from CommDB "); CloseCommDbConnection(); User::RequestComplete(ptrStatus,getCsyErr); return; @@ -399,13 +401,13 @@ TInt ret = iCommServ.Connect(); if(ret) { - __FLOG_1(_L8("Open: C32 Server connection error %d"), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_6, "Open: C32 Server connection error %d", ret); User::RequestComplete(ptrStatus,ret); return; } ret = iCommServ.LoadCommModule(iCsyName); - __FLOG_2(_L16("Open: CSY module [%S] loaded with error %d"), &iCsyName, ret); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_7,"Open: CSY module [%S] loaded with error %d", iCsyName, ret); if(ret) { @@ -422,7 +424,7 @@ ret = iComm.Open(iCommServ, iCommPort, ECommShared, iCommRole); } - __FLOG_2(_L16("Open: C32 port [%S] opened with error %d"), &iCommPort, ret); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_OPEN_8,"Open: C32 port [%S] opened with error %d", iCommPort, ret); if(ret) { @@ -460,7 +462,7 @@ TRequestStatus* request = &aStatus; User::RequestComplete(request, KErrNone); - __FLOG_1(_L8("C32Bca::Shutdown: BCA shut down with error %d"), KErrNone); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_SHUTDOWN_1, "C32Bca::Shutdown: BCA shut down with error %d", KErrNone); } /** @@ -470,7 +472,7 @@ void CC32Bca::Close() { CloseCommPort(); - __FLOG_1(_L8("C32Bca::Close:Close: BCA closed with error %d"), KErrNone); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSE_1, "C32Bca::Close:Close: BCA closed with error %d", KErrNone); } /** @@ -525,7 +527,7 @@ void CC32Bca:: CancelRead() { - __FLOG(_L8("CancelRead: Read is cancelled by client.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELREAD_1, "CancelRead: Read is cancelled by client."); iReader->Cancel(); if(iReadRequest != NULL) @@ -540,7 +542,7 @@ void CC32Bca::CancelWrite() { - __FLOG(_L8("CancelWrite: Write is cancelled by client.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELWRITE_1, "CancelWrite: Write is cancelled by client."); iWriter->Cancel(); @@ -552,7 +554,7 @@ // Debug dumps: -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE _LIT8(KLitOptLevelGeneric, "KBcaOptLevelGeneric"); _LIT8(KLitOptLevelExtSerial, "KBcaOptLevelExtSerial"); @@ -637,22 +639,11 @@ return KLitOptNameUnsupported; } } -#endif // __FLOG_ACTIVE +#endif // OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG -#ifdef __FLOG_ACTIVE -/** -Print debug output of the TCommComfig parameters. -@param The configuration whose parameters should be logged. -*/ -void CC32Bca::LogCommConfig(TCommConfig& c) - { - __FLOG_5(_L8("Rate[%d] DataBits[%d] StopBits[%d] Parity[%d] Handshake[0x%x]"), c().iRate, c().iDataBits, c().iStopBits, c().iParity, c().iHandshake); - __FLOG_4(_L8("ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]"), c().iParityError, c().iFifo, c().iSpecialRate, c().iTerminatorCount); - __FLOG_1(_L8("Terminator[0x%x]"), c().iTerminator); - } -#endif // __FLOG_ACTIVE + /** @@ -666,7 +657,7 @@ void CC32Bca::Ioctl(TRequestStatus& aStatus, TUint aOptLevel, TUint aOptName, TDes8& aOpt) { - __FLOG_4(_L8("Ioctl: Level[%S](0x%X) Name[%S](0x%X)."), &IoctlOptLevelStr(aOptLevel), aOptLevel, &IoctlOptNameStr(aOptName), aOptName); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_1, "Ioctl: Level[%s](0x%X) Name[%s](0x%X).", IoctlOptLevelStr(aOptLevel), aOptLevel, IoctlOptNameStr(aOptName), aOptName); aStatus = KRequestPending; @@ -696,7 +687,7 @@ { TUint32 tempIapId = *(reinterpret_cast(aOpt.Ptr())); - __FLOG_1(_L8("Ioctl: IAP ID [%d] specified."),tempIapId); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_2, "Ioctl: IAP ID [%d] specified.",tempIapId); if(tempIapId < 1 ) { @@ -745,14 +736,15 @@ case KSerialConfig: { - __FLOG(_L8("Ioctl: KSerialConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_3, "Ioctl: KSerialConfig"); TCommConfig cfg; iComm.Config(cfg); -#ifdef __FLOG_ACTIVE - LogCommConfig(cfg); -#endif // __FLOG_ACTIVE + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_4, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_5, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_6, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_7, "Terminator[0x%x]", cfg().iTerminator); TPckgBuf cfgBuf(cfg); aOpt.Copy(cfgBuf); @@ -761,14 +753,15 @@ case KSerialSetConfig: { - __FLOG(_L8("Ioctl: KSerialSetConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_8, "Ioctl: KSerialSetConfig"); TCommConfig cfg(*(reinterpret_cast(aOpt.Ptr()))); -#ifdef __FLOG_ACTIVE - LogCommConfig(cfg); -#endif // __FLOG_ACTIVE - + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_9, "Rate[%d] DataBits[%d] StopBits[%d]", cfg().iRate, cfg().iDataBits, cfg().iStopBits); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_10, "Parity[%d] Handshake[0x%x]", cfg().iParity, cfg().iHandshake); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_11, "ParityError[%d] Fifo[%d] SpecialRate[%d] terminatorCount[%d]", cfg().iParityError, cfg().iFifo, cfg().iSpecialRate, cfg().iTerminatorCount); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_12, "Terminator[0x%x]", cfg().iTerminator); + ret = iComm.SetConfig(cfg); break; } @@ -787,11 +780,11 @@ reinterpret_cast(aOpt.Ptr()) )); iCsyNameOverride = ETrue; - __FLOG_1(_L8("Ioctl: CSY Name set to [%S]"), &iCsyName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_13, "Ioctl: CSY Name set to [%S]", iCsyName); } else { - __FLOG(_L8("Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_14, "Ioctl: Warning: Cannot set the CSY name because the Comm Port is already open."); ret = KErrAlreadyExists; } @@ -804,11 +797,11 @@ { iCommRole = *(reinterpret_cast(aOpt.Ptr())); iCommRoleOverride = ETrue; - __FLOG_1(_L8("Ioctl: Comm Role set to [%d]"), iCommRole); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_15, "Ioctl: Comm Role set to [%d]", iCommRole); } else { - __FLOG(_L8("Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_16, "Ioctl: Warning: Cannot set Comm Role because the Comm Port is already open."); ret = KErrAlreadyExists; } break; @@ -817,7 +810,7 @@ case KSerialSetTxRxBufferSize: { TInt bufSize = *(reinterpret_cast(aOpt.Ptr())); - __FLOG_1(_L8("Ioctl: Setting Rx Tx buffer size to [%d]"), bufSize); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_17, "Ioctl: Setting Rx Tx buffer size to [%d]", bufSize); iComm.SetReceiveBufferLength(bufSize); break; @@ -838,7 +831,7 @@ else { const TSerialSetControlLines& lines = *(reinterpret_cast(aOpt.Ptr())); - __FLOG_2(_L8("Ioctl: Setting/clearing control lines %x/%x"), lines.iSetMask, lines.iClearMask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_18, "Ioctl: Setting/clearing control lines %x/%x", lines.iSetMask, lines.iClearMask); iComm.SetSignals(lines.iSetMask, lines.iClearMask); ret = KErrNone; } @@ -855,7 +848,7 @@ } - __FLOG_1(_L8("Ioctl completed with error %d"), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_IOCTL_19, "Ioctl completed with error %d", ret); TRequestStatus* ptrStatus = &aStatus; User::RequestComplete(ptrStatus, ret); @@ -871,7 +864,7 @@ */ void CC32Bca::MonitorControlLinesL(TUint32 aArgMask) { - __FLOG_1(_L8("Ioctl: argument bitmask = [0x%X] "), aArgMask); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL_1, "Ioctl: argument bitmask = [0x%X] ", aArgMask); if(iLinkMonitor) // We may have never started... { @@ -881,12 +874,12 @@ if(KMonitorOff == aArgMask) // Stop monitoring: { - __FLOG(_L8("MonitorControlLinesL: Stopping Control Lines monitoring.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL_2, "MonitorControlLinesL: Stopping Control Lines monitoring."); // We either never started, or we just cancelled above. } else // Start Monitoring, or change the monitored lines. { - __FLOG(_L8("MonitorControlLinesL: Starting to monitor Control Lines.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL_3, "MonitorControlLinesL: Starting to monitor Control Lines."); if(!iLinkMonitor) // We are starting to monitor for the first time { @@ -935,7 +928,7 @@ iLinkMonitor->Setup(lineMask); iLinkMonitor->NotifyLinkDown(); - __FLOG(_L8("MonitorControlLinesL: Control Lines monitoring started.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_MONITORCONTROLLINESL_4, "MonitorControlLinesL: Control Lines monitoring started."); } } @@ -953,7 +946,7 @@ @leave if the value could not be read */ void CC32Bca::ReadCommPortFromCommDbL(TDes& aPortName) { - __FLOG(_L8("CC32Bca::ReadCommPortFromCommDbL()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL_1, "CC32Bca::ReadCommPortFromCommDbL()"); ConnectToCommDbBearerRecordL(); TInt ret(0); @@ -966,7 +959,7 @@ if(ret!=KErrNone) { - __FLOG_1(_L8("portField->LoadL(*iCommsDat) left with[%d] "), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMPORTFROMCOMMDBL_2, "portField->LoadL(*iCommsDat) left with[%d] ", ret); User::Leave(ret); } @@ -980,7 +973,7 @@ @leave if the value could not be read */ void CC32Bca::ReadCsyNameFromCommDbL(TDes& aCsyName) { - __FLOG(_L8("CC32Bca::ReadCsyNameFromCommDbL()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL_1, "CC32Bca::ReadCsyNameFromCommDbL()"); ConnectToCommDbBearerRecordL(); TInt ret(0); @@ -993,7 +986,7 @@ if(ret!=KErrNone) { - __FLOG_1(_L8("csyField->LoadL(*iCommsDat) left with[%d] "), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCSYNAMEFROMCOMMDBL_2, "csyField->LoadL(*iCommsDat) left with[%d] ", ret); User::Leave(ret); } @@ -1008,7 +1001,7 @@ @leave if the value could not be read */ void CC32Bca::ReadCommRoleFromCommDbL(TCommRole& aCommRole) { - __FLOG(_L8("CC32Bca::ReadCommRoleFromCommDbL()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL_1, "CC32Bca::ReadCommRoleFromCommDbL()"); ConnectToCommDbBearerRecordL(); TUint32 role(0); @@ -1021,7 +1014,7 @@ if(ret!=KErrNone) { - __FLOG_1(_L8("roleField->LoadL(*iCommsDat) left with[%d] "), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_READCOMMROLEFROMCOMMDBL_2, "roleField->LoadL(*iCommsDat) left with[%d] ", ret); User::Leave(ret); } @@ -1039,7 +1032,7 @@ */ void CC32Bca::ConnectToCommDbBearerRecordL() { - __FLOG(_L8("CC32Bca::ConnectToCommDbBearerRecordL()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_1, "CC32Bca::ConnectToCommDbBearerRecordL()"); if(iCommsDat != NULL) // CommDB is already open, we don't need to do anything { return; @@ -1047,7 +1040,7 @@ if(iIapId < 1) // Can't access CommDB if IAP ID is unknown { - __FLOG_1(_L8("iIapId[%d] is unknown"), iIapId); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_2, "iIapId[%d] is unknown", iIapId); User::Leave(KErrNotReady); } @@ -1080,7 +1073,7 @@ TRAPD(ret,iapRecord->LoadL(*iCommsDat)); if (ret != KErrNone) { - __FLOG_1(_L8("iapRecord->LoadL(*iCommsDat) left with[%d] "), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_3, "iapRecord->LoadL(*iCommsDat) left with[%d] ", ret); User::Leave(ret); } @@ -1100,7 +1093,7 @@ if(iModemId == 0) // ID not found. { - __FLOG_1(_L8("iModemId[%d] is not found"), iModemId); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_4, "iModemId[%d] is not found", iModemId); User::Leave(KErrNotFound); } } @@ -1109,7 +1102,7 @@ /** Cancels an outstanding Ioctl, if any. */ void CC32Bca::CancelIoctl() { - __FLOG(_L8("CancelIoctl(): Ioctl cancel request. No Ioctl to cancel.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CANCELIOCTL_1, "CancelIoctl(): Ioctl cancel request. No Ioctl to cancel."); } @@ -1136,7 +1129,7 @@ iCommServ.Close(); iCommPortOpen = EFalse; } - __FLOG(_L8("CloseCommPort(): Session with C32 & RComm closed.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_CLOSECOMMPORT_1, "CloseCommPort(): Session with C32 & RComm closed."); } /** @@ -1145,7 +1138,7 @@ */ void C32Bca::Panic(TC32BcaPanic aPanic) { - __FLOG_STATIC2(KC32BcaLogFolder,KC32BcaLogFile,_L8("%S Panic %d"), &KC32BcaPanic(), aPanic); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_PANIC_1, "%S Panic %d", KC32BcaPanic(), aPanic); User::Panic(KC32BcaPanic, aPanic); } @@ -1173,7 +1166,7 @@ // Upcall from the link monitor: Link has gone down. void CC32Bca::CommLinkDown(TInt aErr) { - __FLOG_1(_L8("CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write."), aErr); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CC32BCA_COMMLINKDOWN_1, "CommLinkDown: Warning: serial link has gone down with error[%d]. Erroring the outstanding Read & Write.", aErr); __ASSERT_DEBUG(KErrNone != aErr, Panic(EGeneralLogicError)); // If KErrNone, use has no way to know that the read has failed. if(iReader->IsActive()) diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/configs/TE_C32BcaUnit.ini --- a/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/configs/TE_C32BcaUnit.ini Mon May 24 18:38:31 2010 +0100 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/configs/TE_C32BcaUnit.ini Tue Jun 22 11:02:32 2010 +0100 @@ -135,14 +135,19 @@ ExpectedCommRole = DCE [ValidChannelId] +PDD_Name = ECDRV +LDD_Name = ECOMM +CSY_Name = PKTLOOPBACK +Port_Name = PKTLOOPBACK::501 +BcaCSY_Name = PKTLOOPBACK UUT_Name = UUT Peer_Name = Peer UUT_PortName = BOGUS Peer_PortName = BOGUS -UUT_IapId = 4 +UUT_IapId = 1 Peer_IapId = 2 -Port_Name1 = ECUART::COMM::0 -Port_Name2 = COMM::0 +Port_Name1 = PKTLOOPBACK::PKTLOOPBACK::501 +Port_Name2 = PKTLOOPBACK::501 [HiddenIAPRecord] PDD_Name = ECDRV diff -r 2473f5e227f9 -r 8b72faa1200f basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/configs/te_c32BcaUnit.xml --- a/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/configs/te_c32BcaUnit.xml Mon May 24 18:38:31 2010 +0100 +++ b/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/configs/te_c32BcaUnit.xml Tue Jun 22 11:02:32 2010 +0100 @@ -1,6 +1,6 @@ \n"))); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_1, "<------------------------------------------------\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_2, "CImsPolicy::SetImsParameter"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_3, "\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_4, "IMS VALUE SUPPLIED BY CLIENT IS \n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_5, "\n"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_6, "[IMS Signalling Indicator value is : = %d]\n",aIms.GetIMSSigallingIndicator()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CIMSPOLICY_SETIMSPARAMETER_7, "------------------------------------------------>\n"); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/qosextnapi/src/sblpextn.cpp --- a/telephonyprotocols/qosextnapi/src/sblpextn.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/qosextnapi/src/sblpextn.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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" @@ -14,9 +14,14 @@ // sblpapi.cpp - SBLP QoS API // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sblpextnTraces.h" +#endif + #include "sblpextn.h" #include "qosextn_constants.h" -#include "qosextn_log.h" #include // Buffer size @@ -64,27 +69,39 @@ EXPORT_C CSblpParameters::TFlowIdentifier& CSblpParameters::GetFlowId(TInt aIndex) { - __ASSERT_DEBUG(aIndex &aFlowIds) { + //in case of low memory the function might not set all the ids iFlowIds.Reset(); TInt i; for(i=0; iiFlowIds.Append(aFlowIds[i]); + TInt errorCode = this->iFlowIds.Append(aFlowIds[i]); + if (errorCode != KErrNone) + { + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPARAMETERS_SETFLOWID, "Not Enough Memory"); + } } } EXPORT_C TInt CSblpParameters::GetFlowIds(RArray& aFlowIds) { + //in case of low memory the function might not get all the ids and returns an error code aFlowIds.Reset(); TInt i; + TInt errorCode = KErrNone; for(i=0; iiFlowIds[i]); + errorCode = aFlowIds.Append(this->iFlowIds[i]); + if (errorCode != KErrNone) + { + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPARAMETERS_GETFLOWID, "Not Enough Memory"); + return errorCode; + } } return KErrNone; } @@ -163,7 +180,7 @@ header.reserved = 0; header.protocol_id = 0; bufPtr.Append((TUint8*)&header, sizeof(pfqos_configure)); - + pfqos_extension extensionType; extensionType.pfqos_ext_len = 0; extensionType.pfqos_ext_type = EPfqosExtExtension; @@ -182,11 +199,11 @@ iSblp->GetMAT(authToken); SetStringBlockHeader(stringBlock,authToken,KDescSblpMediaAuthorizationToken); bufPtr.Append((TUint8*)&stringBlock, sizeof(pfqos_configblock)); + // put the string now authToken.ZeroTerminate(); bufPtr.Append((TUint8*)authToken.Ptr(),KAuthorizationTokenAdjustedStringLength); - // Flowids pfqos_configblock_int ext; TInt i; @@ -195,11 +212,13 @@ CSblpParameters::TFlowIdentifier& flowId = iSblp->GetFlowId(i); SetIntValue(ext,flowId.iMediaComponentNumber,KDescSblpMediaComponentNumber); bufPtr.Append((TUint8*)&ext, sizeof(pfqos_configblock_int)); + SetIntValue(ext,flowId.iIPFlowNumber,KDescSblpIPFlowNumber); bufPtr.Append((TUint8*)&ext, sizeof(pfqos_configblock_int)); } bufPtr.AppendFill(0, header.pfqos_configure_len * 8 - byte_len); + return *iData; } @@ -228,31 +247,32 @@ *iSblp = aSblp; - LOG( + // following code is to create logs TAuthorizationToken authToken; iSblp->GetMAT (authToken); - RArray flowIds; + RArray flowIds; iSblp->GetFlowIds(flowIds); + // in case of low memory GetFlowIds might return an error and flowIds might not have all the ids, but we still try to log as much as we can TBuf label; label.Copy(authToken); - Log::Printf(_L("<------------------------------------------------\n")); - Log::Printf(_L("CSblpPolicy::SetSblpParameters")); - Log::Printf(_L("\n")); - Log::Printf(_L("SBLP VALUES SUPPLIED BY CLIENT IS \n")); - Log::Printf(_L("\n")); - Log::Printf(_L("[MAT string : = %S]\n"),&label); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_1, "<------------------------------------------------\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_2, "CSblpPolicy::SetSblpParameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_3, "\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_4, "SBLP VALUES SUPPLIED BY CLIENT IS \n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_5, "\n"); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_6, "[MAT string : = %S]\n",label); TInt i; for(i=0; i\n")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_9, "------------------------------------------------>\n"); flowIds.Close(); - ) + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/qosextnapi/src/umtsextn.cpp --- a/telephonyprotocols/qosextnapi/src/umtsextn.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/qosextnapi/src/umtsextn.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2003-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" @@ -16,8 +16,12 @@ #include "umtsextn.h" #include "qosextn_constants.h" -#include "qosextn_log.h" #include + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "umtsextnTraces.h" +#endif // // TUmtsQoSParameters // @@ -607,48 +611,48 @@ EXPORT_C void CUmtsQoSPolicy::SetQoSRequested(const TUmtsQoSParameters& aRequested) { - LOG(Log::Printf(_L("<------------------------------------------------\n"))); - LOG(Log::Printf(_L("CUmtsQoSPolicy::SetQoSRequested"))); - LOG(Log::Printf(_L("\n"))); - LOG(Log::Printf(_L("REQUESTED R99 VALUES SUPPLIED BY CLIENT IS \n"))); - LOG(Log::Printf(_L("\n"))); - LOG(Log::Printf(_L(" [aRequested.iTrafficClass = %d]\n"),aRequested.iTrafficClass)); - LOG(Log::Printf(_L(" [aRequested.iDeliveryOrder = %d]\n"),aRequested.iDeliveryOrder)); - LOG(Log::Printf(_L(" [aRequested.iDeliveryOfErroneusSdu = %d]\n"),aRequested.iDeliveryOfErroneusSdu)); - LOG(Log::Printf(_L(" [aRequested.iMaxSduSize = %d]\n"),aRequested.iMaxSduSize)); - LOG(Log::Printf(_L(" [aRequested.iMaxBitrateUplink = %d]\n"),aRequested.iMaxBitrateUplink)); - LOG(Log::Printf(_L(" [aRequested.iMaxBitrateDownlink = %d]\n"),aRequested.iMaxBitrateDownlink)); - LOG(Log::Printf(_L(" [aRequested.iResidualBer = %d]\n"),aRequested.iResidualBer)); - LOG(Log::Printf(_L(" [aRequested.iErrorRatio = %d]\n"),aRequested.iErrorRatio)); - LOG(Log::Printf(_L(" [aRequested.iPriority = %d]\n"),aRequested.iPriority)); - LOG(Log::Printf(_L(" [aRequested.iTransferDelay = %d]\n"),aRequested.iTransferDelay)); - LOG(Log::Printf(_L(" [aRequested.iGuaBitrateUplink = %d]\n"),aRequested.iGuaBitrateUplink)); - LOG(Log::Printf(_L(" [aRequested.iGuaBitrateDownlink = %d]\n"),aRequested.iGuaBitrateDownlink)); - LOG(Log::Printf(_L("------------------------------------------------>\n"))); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_1, "<------------------------------------------------\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_2, "CUmtsQoSPolicy::SetQoSRequested"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_3, "\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_4, "REQUESTED R99 VALUES SUPPLIED BY CLIENT IS \n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_5, "\n"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_6, " [aRequested.iTrafficClass = %d]\n",aRequested.iTrafficClass); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_7, " [aRequested.iDeliveryOrder = %d]\n",aRequested.iDeliveryOrder); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_8, " [aRequested.iDeliveryOfErroneusSdu = %d]\n",aRequested.iDeliveryOfErroneusSdu); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_9, " [aRequested.iMaxSduSize = %d]\n",aRequested.iMaxSduSize); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_10, " [aRequested.iMaxBitrateUplink = %d]\n",aRequested.iMaxBitrateUplink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_11, " [aRequested.iMaxBitrateDownlink = %d]\n",aRequested.iMaxBitrateDownlink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_12, " [aRequested.iResidualBer = %d]\n",aRequested.iResidualBer); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_13, " [aRequested.iErrorRatio = %d]\n",aRequested.iErrorRatio); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_14, " [aRequested.iPriority = %d]\n",aRequested.iPriority); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_15, " [aRequested.iTransferDelay = %d]\n",aRequested.iTransferDelay); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_16, " [aRequested.iGuaBitrateUplink = %d]\n",aRequested.iGuaBitrateUplink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_17, " [aRequested.iGuaBitrateDownlink = %d]\n",aRequested.iGuaBitrateDownlink); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSREQUESTED_18, "------------------------------------------------>\n"); iRequested = aRequested; } EXPORT_C void CUmtsQoSPolicy::SetQoSMinimum(const TUmtsQoSParameters& aMinimum) { - LOG(Log::Printf(_L("<------------------------------------------------\n"))); - LOG(Log::Printf(_L("CUmtsQoSPolicy::SetQoSMinimum"))); - LOG(Log::Printf(_L("\n"))); - LOG(Log::Printf(_L("MINIMUM R99 VALUES SUPPLIED BY CLIENT IS \n"))); - LOG(Log::Printf(_L("\n"))); - LOG(Log::Printf(_L(" [aMinimum.iTrafficClass = %d]\n"),aMinimum.iTrafficClass)); - LOG(Log::Printf(_L(" [aMinimum.iDeliveryOrder = %d]\n"),aMinimum.iDeliveryOrder)); - LOG(Log::Printf(_L(" [aMinimum.iDeliveryOfErroneusSdu = %d]\n"),aMinimum.iDeliveryOfErroneusSdu)); - LOG(Log::Printf(_L(" [aMinimum.iMaxSduSize = %d]\n"),aMinimum.iMaxSduSize)); - LOG(Log::Printf(_L(" [aMinimum.iMaxBitrateUplink = %d]\n"),aMinimum.iMaxBitrateUplink)); - LOG(Log::Printf(_L(" [aMinimum.iMaxBitrateDownlink = %d]\n"),aMinimum.iMaxBitrateDownlink)); - LOG(Log::Printf(_L(" [aMinimum.iResidualBer = %d]\n"),aMinimum.iResidualBer)); - LOG(Log::Printf(_L(" [aMinimum.iErrorRatio = %d]\n"),aMinimum.iErrorRatio)); - LOG(Log::Printf(_L(" [aMinimum.iPriority = %d]\n"),aMinimum.iPriority)); - LOG(Log::Printf(_L(" [aMinimum.iTransferDelay = %d]\n"),aMinimum.iTransferDelay)); - LOG(Log::Printf(_L(" [aMinimum.iGuaBitrateUplink = %d]\n"),aMinimum.iGuaBitrateUplink)); - LOG(Log::Printf(_L(" [aMinimum.iGuaBitrateDownlink = %d]\n"),aMinimum.iGuaBitrateDownlink)); - LOG(Log::Printf(_L("------------------------------------------------>\n"))); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_1, "<------------------------------------------------\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_2, "CUmtsQoSPolicy::SetQoSMinimum"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_3, "\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_4, "MINIMUM R99 VALUES SUPPLIED BY CLIENT IS \n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_5, "\n"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_6, " [aMinimum.iTrafficClass = %d]\n",aMinimum.iTrafficClass); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_7, " [aMinimum.iDeliveryOrder = %d]\n",aMinimum.iDeliveryOrder); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_8, " [aMinimum.iDeliveryOfErroneusSdu = %d]\n",aMinimum.iDeliveryOfErroneusSdu); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_9, " [aMinimum.iMaxSduSize = %d]\n",aMinimum.iMaxSduSize); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_10, " [aMinimum.iMaxBitrateUplink = %d]\n",aMinimum.iMaxBitrateUplink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_11, " [aMinimum.iMaxBitrateDownlink = %d]\n",aMinimum.iMaxBitrateDownlink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_12, " [aMinimum.iResidualBer = %d]\n",aMinimum.iResidualBer); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_13, " [aMinimum.iErrorRatio = %d]\n",aMinimum.iErrorRatio); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_14, " [aMinimum.iPriority = %d]\n",aMinimum.iPriority); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_15, " [aMinimum.iTransferDelay = %d]\n",aMinimum.iTransferDelay); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_16, " [aMinimum.iGuaBitrateUplink = %d]\n",aMinimum.iGuaBitrateUplink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_17, " [aMinimum.iGuaBitrateDownlink = %d]\n",aMinimum.iGuaBitrateDownlink); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSQOSPOLICY_SETQOSMINIMUM_18, "------------------------------------------------>\n"); iMinimum = aMinimum; } @@ -1169,52 +1173,52 @@ EXPORT_C void CUmtsR5QoSPolicy::SetQoSRequested(const TUmtsR5QoSParameters& aRequested) { - LOG(Log::Printf(_L("<------------------------------------------------\n"))); - LOG(Log::Printf(_L("CUmtsR5QoSPolicy::SetQoSRequested"))); - LOG(Log::Printf(_L("\n"))); - LOG(Log::Printf(_L("REQUESTED R5 VALUES SUPPLIED BY CLIENT IS \n"))); - LOG(Log::Printf(_L("\n"))); - LOG(Log::Printf(_L(" [aRequested.iTrafficClass = %d]\n"),aRequested.iTrafficClass)); - LOG(Log::Printf(_L(" [aRequested.iDeliveryOrder = %d]\n"),aRequested.iDeliveryOrder)); - LOG(Log::Printf(_L(" [aRequested.iDeliveryOfErroneusSdu = %d]\n"),aRequested.iDeliveryOfErroneusSdu)); - LOG(Log::Printf(_L(" [aRequested.iMaxSduSize = %d]\n"),aRequested.iMaxSduSize)); - LOG(Log::Printf(_L(" [aRequested.iMaxBitrateUplink = %d]\n"),aRequested.iMaxBitrateUplink)); - LOG(Log::Printf(_L(" [aRequested.iMaxBitrateDownlink = %d]\n"),aRequested.iMaxBitrateDownlink)); - LOG(Log::Printf(_L(" [aRequested.iResidualBer = %d]\n"),aRequested.iResidualBer)); - LOG(Log::Printf(_L(" [aRequested.iErrorRatio = %d]\n"),aRequested.iErrorRatio)); - LOG(Log::Printf(_L(" [aRequested.iPriority = %d]\n"),aRequested.iPriority)); - LOG(Log::Printf(_L(" [aRequested.iTransferDelay = %d]\n"),aRequested.iTransferDelay)); - LOG(Log::Printf(_L(" [aRequested.iGuaBitrateUplink = %d]\n"),aRequested.iGuaBitrateUplink)); - LOG(Log::Printf(_L(" [aRequested.iGuaBitrateDownlink = %d]\n"),aRequested.iGuaBitrateDownlink)); - LOG(Log::Printf(_L(" [aRequested.iSignallingIndicator = %d]\n"),aRequested.iSignallingIndicator)); - LOG(Log::Printf(_L(" [aRequested.iSrcStatisticsDesc = %d]\n"),aRequested.iSrcStatisticsDesc)); - LOG(Log::Printf(_L("------------------------------------------------>\n"))); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_1, "<------------------------------------------------\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_2, "CUmtsR5QoSPolicy::SetQoSRequested"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_3, "\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_4, "REQUESTED R5 VALUES SUPPLIED BY CLIENT IS \n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_5, "\n"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_6, " [aRequested.iTrafficClass = %d]\n",aRequested.iTrafficClass); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_7, " [aRequested.iDeliveryOrder = %d]\n",aRequested.iDeliveryOrder); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_8, " [aRequested.iDeliveryOfErroneusSdu = %d]\n",aRequested.iDeliveryOfErroneusSdu); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_9, " [aRequested.iMaxSduSize = %d]\n",aRequested.iMaxSduSize); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_10, " [aRequested.iMaxBitrateUplink = %d]\n",aRequested.iMaxBitrateUplink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_11, " [aRequested.iMaxBitrateDownlink = %d]\n",aRequested.iMaxBitrateDownlink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_12, " [aRequested.iResidualBer = %d]\n",aRequested.iResidualBer); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_13, " [aRequested.iErrorRatio = %d]\n",aRequested.iErrorRatio); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_14, " [aRequested.iPriority = %d]\n",aRequested.iPriority); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_15, " [aRequested.iTransferDelay = %d]\n",aRequested.iTransferDelay); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_16, " [aRequested.iGuaBitrateUplink = %d]\n",aRequested.iGuaBitrateUplink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_17, " [aRequested.iGuaBitrateDownlink = %d]\n",aRequested.iGuaBitrateDownlink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_18, " [aRequested.iSignallingIndicator = %d]\n",aRequested.iSignallingIndicator); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_19, " [aRequested.iSrcStatisticsDesc = %d]\n",aRequested.iSrcStatisticsDesc); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSREQUESTED_20, "------------------------------------------------>\n"); iRequested = aRequested; } EXPORT_C void CUmtsR5QoSPolicy::SetQoSMinimum(const TUmtsR5QoSParameters& aMinimum) { - LOG(Log::Printf(_L("<------------------------------------------------\n"))); - LOG(Log::Printf(_L("CUmtsR5QoSPolicy::SetQoSMinimum"))); - LOG(Log::Printf(_L("\n"))); - LOG(Log::Printf(_L("MINIMUM R5 VALUES SUPPLIED BY CLIENT IS \n"))); - LOG(Log::Printf(_L("\n"))); - LOG(Log::Printf(_L(" [aMinimum.iTrafficClass = %d]\n"),aMinimum.iTrafficClass)); - LOG(Log::Printf(_L(" [aMinimum.iDeliveryOrder = %d]\n"),aMinimum.iDeliveryOrder)); - LOG(Log::Printf(_L(" [aMinimum.iDeliveryOfErroneusSdu = %d]\n"),aMinimum.iDeliveryOfErroneusSdu)); - LOG(Log::Printf(_L(" [aMinimum.iMaxSduSize = %d]\n"),aMinimum.iMaxSduSize)); - LOG(Log::Printf(_L(" [aMinimum.iMaxBitrateUplink = %d]\n"),aMinimum.iMaxBitrateUplink)); - LOG(Log::Printf(_L(" [aMinimum.iMaxBitrateDownlink = %d]\n"),aMinimum.iMaxBitrateDownlink)); - LOG(Log::Printf(_L(" [aMinimum.iResidualBer = %d]\n"),aMinimum.iResidualBer)); - LOG(Log::Printf(_L(" [aMinimum.iErrorRatio = %d]\n"),aMinimum.iErrorRatio)); - LOG(Log::Printf(_L(" [aMinimum.iPriority = %d]\n"),aMinimum.iPriority)); - LOG(Log::Printf(_L(" [aMinimum.iTransferDelay = %d]\n"),aMinimum.iTransferDelay)); - LOG(Log::Printf(_L(" [aMinimum.iGuaBitrateUplink = %d]\n"),aMinimum.iGuaBitrateUplink)); - LOG(Log::Printf(_L(" [aMinimum.iGuaBitrateDownlink = %d]\n"),aMinimum.iGuaBitrateDownlink)); - LOG(Log::Printf(_L(" [aMinimum.iSignallingIndicator = %d]\n"),aMinimum.iSignallingIndicator)); - LOG(Log::Printf(_L(" [aMinimum.iSrcStatisticsDesc = %d]\n"),aMinimum.iSrcStatisticsDesc)); - LOG(Log::Printf(_L("------------------------------------------------>\n"))); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_1, "<------------------------------------------------\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_2, "CUmtsR5QoSPolicy::SetQoSMinimum"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_3, "\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_4, "MINIMUM R5 VALUES SUPPLIED BY CLIENT IS \n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_5, "\n"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_6, " [aMinimum.iTrafficClass = %d]\n",aMinimum.iTrafficClass); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_7, " [aMinimum.iDeliveryOrder = %d]\n",aMinimum.iDeliveryOrder); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_8, " [aMinimum.iDeliveryOfErroneusSdu = %d]\n",aMinimum.iDeliveryOfErroneusSdu); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_9, " [aMinimum.iMaxSduSize = %d]\n",aMinimum.iMaxSduSize); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_10, " [aMinimum.iMaxBitrateUplink = %d]\n",aMinimum.iMaxBitrateUplink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_11, " [aMinimum.iMaxBitrateDownlink = %d]\n",aMinimum.iMaxBitrateDownlink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_12, " [aMinimum.iResidualBer = %d]\n",aMinimum.iResidualBer); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_13, " [aMinimum.iErrorRatio = %d]\n",aMinimum.iErrorRatio); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_14, " [aMinimum.iPriority = %d]\n",aMinimum.iPriority); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_15, " [aMinimum.iTransferDelay = %d]\n",aMinimum.iTransferDelay); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_16, " [aMinimum.iGuaBitrateUplink = %d]\n",aMinimum.iGuaBitrateUplink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_17, " [aMinimum.iGuaBitrateDownlink = %d]\n",aMinimum.iGuaBitrateDownlink); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_18, " [aMinimum.iSignallingIndicator = %d]\n",aMinimum.iSignallingIndicator); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_19, " [aMinimum.iSrcStatisticsDesc = %d]\n",aMinimum.iSrcStatisticsDesc); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CUMTSR5QOSPOLICY_SETQOSMINIMUM_20, "------------------------------------------------>\n"); iMinimum = aMinimum; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/qosextnapi/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/qosextnapi/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/qosextnapi/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/qosextnapi/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,96 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_BORDER=0x84 +[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_1=0x56 +[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_2=0x57 +[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_3=0x58 +[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_4=0x59 +[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_5=0x5a +[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_6=0x5b +[TRACE]TRACE_BORDER[0x84]_CIMSPOLICY_SETIMSPARAMETER_7=0x5c +[TRACE]TRACE_BORDER[0x84]_CSBLPPARAMETERS_GETFLOWID=0x5e +[TRACE]TRACE_BORDER[0x84]_CSBLPPARAMETERS_SETFLOWID=0x5d +[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_1=0x1 +[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_2=0x2 +[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_3=0x3 +[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_4=0x4 +[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_5=0x5 +[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_6=0x7 +[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_7=0x8 +[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_8=0x9 +[TRACE]TRACE_BORDER[0x84]_CSBLPPOLICY_SETSBLPPARAMETERS_9=0x6 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_1=0x11 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_10=0x4f +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_11=0x30 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_12=0x31 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_13=0x32 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_14=0x50 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_15=0x33 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_16=0x34 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_17=0x35 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_18=0x16 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_2=0x12 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_3=0x13 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_4=0x14 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_5=0x15 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_6=0x2c +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_7=0x2d +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_8=0x2e +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSMINIMUM_9=0x2f +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_1=0xa +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_10=0x4d +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_11=0x27 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_12=0x28 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_13=0x29 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_14=0x4e +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_15=0x2a +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_16=0x55 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_17=0x2b +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_18=0x10 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_2=0xb +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_3=0xc +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_4=0xd +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_5=0xe +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_6=0x24 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_7=0x25 +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_8=0xf +[TRACE]TRACE_BORDER[0x84]_CUMTSQOSPOLICY_SETQOSREQUESTED_9=0x26 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_1=0x1e +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_10=0x44 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_11=0x45 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_12=0x46 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_13=0x54 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_14=0x47 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_15=0x48 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_16=0x49 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_17=0x4a +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_18=0x4b +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_19=0x4c +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_2=0x1f +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_20=0x23 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_3=0x20 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_4=0x21 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_5=0x22 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_6=0x41 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_7=0x42 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_8=0x43 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSMINIMUM_9=0x53 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_1=0x17 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_10=0x39 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_11=0x51 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_12=0x3a +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_13=0x3b +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_14=0x3c +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_15=0x3d +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_16=0x3e +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_17=0x52 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_18=0x3f +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_19=0x40 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_2=0x18 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_20=0x1d +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_3=0x19 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_4=0x1a +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_5=0x1b +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_6=0x36 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_7=0x37 +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_8=0x1c +[TRACE]TRACE_BORDER[0x84]_CUMTSR5QOSPOLICY_SETQOSREQUESTED_9=0x38 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/group/BLD.INF --- a/telephonyprotocols/rawipnif/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -// 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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Network interface for supporting multiple primary PDP contexts on the telephony reference platform -// -// - -/** - @file -*/ - -#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY - -#include "../version1/group/bld.inf" - -#else - -PRJ_PLATFORMS - -DEFAULT - - -PRJ_EXPORTS - -RawIpNif.iby /epoc32/rom/include/rawipnif.iby - -PRJ_TESTEXPORTS - -// epoc.ini alternative and batchfile for replacement -../DATA/epocrawip.ini z:/testdata/configs/epocrawip.ini -../DATA/replaceepocrawipini.bat z:/testdata/configs/replaceepocrawipini.bat - -PRJ_MMPFILES - -RawIPNif.mmp - -#ifdef SYMBIAN_ZERO_COPY_NETWORKING -RawIPNif2.mmp -#endif - -#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/group/RawIPNif.mmp --- a/telephonyprotocols/rawipnif/group/RawIPNif.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/group/RawIPNif.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -37,6 +37,8 @@ // DEFFILE RawIp.def +MACRO __BTT_LOGGING__ + SOURCEPATH ../src SOURCE RawIPFlow.cpp @@ -48,7 +50,6 @@ SOURCE Sender.cpp SOURCE Receiver.cpp SOURCE IPTagHeader.cpp -SOURCE bttlog.cpp SOURCE rawipmcpr.cpp SOURCE rawipmcprfactory.cpp SOURCE RawIpAgentHandler.cpp @@ -56,6 +57,7 @@ USERINCLUDE ../inc +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/group/RawIPNif2.mmp --- a/telephonyprotocols/rawipnif/group/RawIPNif2.mmp Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -// Copyright (c) 2002-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// RAWIP.MMP -// -// - -TARGET rawip2.dll -TARGETTYPE PLUGIN -UID 0x10009D8D 0x10286AF7 - -// Used to specify if the rawip.dll should be specifically built to the -// functionality of TI basebands, where a two-byte header is appended -// to all incoming and outgoing packets (to specify the protocol being -// used). This macro is commented out as part of fix INC113695 propagation to v94 -// MACRO RAWIP_HEADER_APPENDED_TO_PACKETS - -// Do not add the non-callable exports to the DEF files -// Remove this line temporarily if we need to add new exports -NOEXPORTLIBRARY - -// DEFFILE RawIp2.def - -SOURCEPATH ../rawipnif2/src -SOURCE BcaController.cpp -SOURCE BinderBase.cpp -SOURCE bttlog.cpp -SOURCE ecom_impl.cpp -SOURCE IPTagHeader.cpp -SOURCE IPv4Binder.cpp -SOURCE IPv6Binder.cpp -SOURCE RawIP2Flow.cpp RawIP2FlowFactory.cpp - -USERINCLUDE ../rawipnif2/inc - -OS_LAYER_SYSTEMINCLUDE_SYMBIAN - -START RESOURCE 10286AF7.rss -TARGET rawip2.rsc -END - -//MI support -#include - -#include - -LIBRARY euser.lib -LIBRARY esock.lib -LIBRARY esocksvr.lib -LIBRARY netmeta.lib -LIBRARY mbufmgr.lib -LIBRARY commsbufs.lib -LIBRARY insock.lib -LIBRARY nodemessages.lib -LIBRARY netinterfaces.lib - -START WINS - BASEADDRESS 0x47E00000 -END - -CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData -VENDORID 0x70000001 - -UNPAGED -SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/rawipnif/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,51 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Network interface for supporting multiple primary PDP contexts on the telephony reference platform +// +// + +/** + @file +*/ + +#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY + +#include "../version1/group/bld.inf" + +#else + +PRJ_PLATFORMS + +DEFAULT + + +PRJ_EXPORTS + +RawIpNif.iby /epoc32/rom/include/rawipnif.iby + +PRJ_TESTEXPORTS + +// epoc.ini alternative and batchfile for replacement +../data/epocrawip.ini z:/testdata/configs/epocrawip.ini +../data/replaceepocrawipini.bat z:/testdata/configs/replaceepocrawipini.bat + +PRJ_MMPFILES + +RawIPNif.mmp + +#ifdef SYMBIAN_ZERO_COPY_NETWORKING +#include "../rawipnif2/group/bld.inf" +#endif + +#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/group/networking_rawipnif.mrp --- a/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component networking_rawipnif source \sf\os\cellularsrv\telephonyprotocols\rawipnif binary \sf\os\cellularsrv\telephonyprotocols\rawipnif\group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/BcaController.h --- a/telephonyprotocols/rawipnif/inc/BcaController.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/BcaController.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -26,22 +26,19 @@ #include #include "MControllerObserver.h" -#include "bttlog.h" #include "Constants.h" #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS #include "IPTagHeader.h" #endif // RAWIP_HEADER_APPENDED_TO_PACKETS -class CBttLogger; - /** @internalComponent */ class CBcaController : public CBase { public: - CBcaController(MControllerObserver& aObserver, CBttLogger* aTheLogger); + CBcaController(MControllerObserver& aObserver); void BaseConstructL(); ~CBcaController(); @@ -103,7 +100,6 @@ private: // Unowned data. MControllerObserver& iObserver; protected: - CBttLogger* iTheLogger; TInt iMaxTxPacketSize; TInt iMaxRxPacketSize; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/BcaIoController.h --- a/telephonyprotocols/rawipnif/inc/BcaIoController.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/BcaIoController.h Tue Jun 22 11:02:32 2010 +0100 @@ -33,7 +33,6 @@ using namespace BasebandChannelAdaptation; -class CBttLogger; class CSender; class CReceiver; class CBcaControl; @@ -57,7 +56,7 @@ class CBcaIoController : public CBase { public: - static CBcaIoController* NewL(MControllerObserver& aObserver, CBttLogger* aTheLogger); + static CBcaIoController* NewL(MControllerObserver& aObserver); ~CBcaIoController(); void StartL(); @@ -91,13 +90,12 @@ #endif // RAWIP_HEADER_APPENDED_TO_PACKETS protected: - CBttLogger* iTheLogger; TUint iMaxTxPacketSize; TUint iMaxRxPacketSize; private: - CBcaIoController(MControllerObserver& aObserver, CBttLogger* aTheLogger); + CBcaIoController(MControllerObserver& aObserver); void ConstructL(); enum TSendState @@ -256,7 +254,7 @@ class CBcaControl : public CActive { public: - CBcaControl(CBcaIoController& aObserver, CBttLogger* aTheLogger); + CBcaControl(CBcaIoController& aObserver); ~CBcaControl(); public: void StartLoadL(); @@ -268,7 +266,6 @@ virtual void DoCancel(); private: // Unowned data. CBcaIoController& iObserver; - CBttLogger* iTheLogger; private: enum TBcaState { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/BinderBase.h --- a/telephonyprotocols/rawipnif/inc/BinderBase.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/BinderBase.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -30,7 +30,6 @@ #include class CRawIPFlow; -class CBttLogger; class CRawIpProvision; class CRawIPFlow; @@ -38,7 +37,7 @@ { public: friend class CRawIPFlow; - CBinderBase(CRawIPFlow& aFlow, CBttLogger* aTheLogger); + CBinderBase(CRawIPFlow& aFlow); virtual ~CBinderBase(); public: @@ -71,7 +70,6 @@ ESock::MUpperControl* iUpperControl; ESock::MUpperDataReceiver* iUpperReceiver; - CBttLogger* iTheLogger; }; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/IPTagHeader.h --- a/telephonyprotocols/rawipnif/inc/IPTagHeader.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/IPTagHeader.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -24,23 +24,20 @@ #ifndef IPTAGHEADER_H__ #define IPTAGHEADER_H__ -#include "bttlog.h" #include "Constants.h" #include -class CBttLogger; class CIPTagHeader : public CBase { public: - CIPTagHeader(CBttLogger* aTheLogger); + CIPTagHeader(); ~CIPTagHeader(); void SetType(TUint16 aType); void AddHeader(TDes8& aDes); TUint16 RemoveHeader(RMBufChain& aPdu); private: // Unowned data. - CBttLogger* iTheLogger; //CLASSNAMEDECL(CIPTagHeader); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/IPv4Binder.h --- a/telephonyprotocols/rawipnif/inc/IPv4Binder.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/IPv4Binder.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -28,12 +28,11 @@ #include #endif -class CBttLogger; class CIPv4Binder : public CBinderBase { public: - CIPv4Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger); + CIPv4Binder(CRawIPFlow& aFlow); ~CIPv4Binder(); public: diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/IPv6Binder.h --- a/telephonyprotocols/rawipnif/inc/IPv6Binder.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/IPv6Binder.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -29,12 +29,11 @@ #include #endif -class CBttLogger; class CIPv6Binder : public CBinderBase { public: - CIPv6Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger); + CIPv6Binder(CRawIPFlow& aFlow); ~CIPv6Binder(); public: @@ -84,8 +83,6 @@ void LogPacket(const RMBufChain& aPacket); #endif // __BTT_LOGGING__ -private: //unowned - CBttLogger* iTheLogger; private: //owned TIPv6Settings iSettings; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/RawIPFlow.h --- a/telephonyprotocols/rawipnif/inc/RawIPFlow.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/RawIPFlow.h Tue Jun 22 11:02:32 2010 +0100 @@ -32,10 +32,8 @@ #include "BinderBase.h" #include "BcaIoController.h" #include "MControllerObserver.h" -#include "bttlog.h" #include // for TLinkMessageId -class CBttLogger; class CPacketLogger; class TRawIpAgentProvision; class CBCAProvision; @@ -112,7 +110,7 @@ inline RPacketContext::TContextStatus GetContextStatus(); protected: - CRawIPFlow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf, CBttLogger* aTheLogger); + CRawIPFlow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf); void ConstructL(); virtual ~CRawIPFlow(); @@ -150,8 +148,6 @@ private:// Unowned /** networking packet logger for debugging packets */ __PACKETLOG_DECLARATION_MEMBER; - CBttLogger* iTheLogger; - // Upstack bound protocol reference CProtocolBase* iProtocol; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/RawIPFlowFactory.h --- a/telephonyprotocols/rawipnif/inc/RawIPFlowFactory.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/RawIPFlowFactory.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -27,7 +27,6 @@ #include #include -#include "bttlog.h" /** RawIP Flow Implementation UID @@ -48,8 +47,6 @@ CRawIPFlowFactory(TUid aFactoryId, ESock::CSubConnectionFlowFactoryContainer& aParentContainer); virtual ESock::CSubConnectionFlowBase* DoCreateFlowL(ESock::CProtocolIntfBase* aProtocol, ESock::TFactoryQueryBase& aQuery); -private: - CBttLogger* iTheLogger; // only here to allow use of _LOG_LnCn() macros within factory - }; +}; #endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/RawIPNifMain.h --- a/telephonyprotocols/rawipnif/inc/RawIPNifMain.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/RawIPNifMain.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -30,18 +30,16 @@ #include "ProtocolIfBase.h" #include "BcaIoController.h" #include "MControllerObserver.h" -#include "bttlog.h" #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #include #endif -class CBttLogger; class CPacketLogger; class CRawIPNifMain : public CNifIfLink, public MControllerObserver { public: - CRawIPNifMain(CNifIfFactory& aFactory, MNifIfNotify* aNotify, CBttLogger* aTheLogger); + CRawIPNifMain(CNifIfFactory& aFactory, MNifIfNotify* aNotify); ~CRawIPNifMain(); void ConstructL(const TDesC& aName); // Used to be :Pure virtuals inherited from MContextSmObserver @@ -95,12 +93,8 @@ public: // Context status retrieval. inline RPacketContext::TContextStatus GetContextStatus(); - + private:// Unowned - /** networking packet logger for debugging packets */ - __PACKETLOG_DECLARATION_MEMBER; - CBttLogger* iTheLogger; - // Upstack bound protocol reference CProtocolBase* iProtocol; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/Receiver.h --- a/telephonyprotocols/rawipnif/inc/Receiver.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/Receiver.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -23,30 +23,29 @@ #define RECEIVER_H #include "BcaIoController.h" -#include "bttlog.h" #include "Constants.h" #include -class CBttLogger; class CReceiver : public CActive { public: - static CReceiver* NewL(CBcaIoController& aObserver, CBttLogger* aTheLogger, TUint aMaxPacketSize); + static CReceiver* NewL(CBcaIoController& aObserver, TUint aMaxPacketSize); ~CReceiver(); // Inherited from CActive. virtual void RunL(); + virtual TInt RunError(TInt aError); virtual void DoCancel(); + void StartListening(); private: - CReceiver(CBcaIoController& aObserver, CBttLogger* aTheLogger, TUint aMaxPacketSize); + CReceiver(CBcaIoController& aObserver, TUint aMaxPacketSize); void ConstructL(); private: // Unowned data. CBcaIoController& iObserver; - CBttLogger* iTheLogger; TUint iMaxPacketSize; RBuf8 iData; RMBufPacket iRMBufPacket; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/Sender.h --- a/telephonyprotocols/rawipnif/inc/Sender.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/inc/Sender.h Tue Jun 22 11:02:32 2010 +0100 @@ -23,18 +23,19 @@ #define SENDER_H #include "BcaIoController.h" -#include "bttlog.h" #include "Constants.h" -class CBttLogger; class CSender : public CActive { public: - CSender(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise); - static CSender* NewL(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise); - void ConstructL(); - ~CSender(); + CSender(CBcaIoController& aObserver, TInt aMaxPacketSise); + static CSender* NewL(CBcaIoController& aObserver, TInt aMaxPacketSise); + void ConstructL(); + ~CSender(); + + + // Inherited from CActive. virtual void RunL(); @@ -44,8 +45,7 @@ inline TInt SendBufferLength(); private: // Unowned data. - CBcaIoController& iObserver; - CBttLogger* iTheLogger; + CBcaIoController& iObserver; TInt iMaxPacketSize; RBuf8 iSendBuffer; }; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/inc/bttlog.h --- a/telephonyprotocols/rawipnif/inc/bttlog.h Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,136 +0,0 @@ -// Copyright (c) 2002-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Defines logger for RawIP NIF. -// -// - -/** - @file -*/ - -#ifndef BTTLOG_H__ -#define BTTLOG_H__ - -#include - -#if defined(__FLOG_ACTIVE) || defined(__DEBUGRAWIPSERIALPORT__) -// Uncomment any of these macros if you want logging. -// -> BTT_LOG_1 : For general logging -// -> BTT_LOG_2 : For error and warning logging -// -> BTT_LOG_3 : For IP packet information -#define __BTT_LOG_1__ 1 -//#define __BTT_LOG_2__ 1 -//#define __BTT_LOG_3__ 1 -#endif - -#ifdef __BTT_LOG_1__ -#define _LOG_L1C1(AAA) iTheLogger->Write(AAA) -#define _LOG_L1C2(AAA, BBB) iTheLogger->WriteFormat(AAA, BBB) -#define _LOG_L1C3(AAA, BBB, CCC) iTheLogger->WriteFormat(AAA, BBB, CCC) -#define _LOG_L1C4(AAA, BBB, CCC, DDD) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD) -#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE) -#else -#define _LOG_L1C1(AAA) -#define _LOG_L1C2(AAA, BBB) -#define _LOG_L1C3(AAA, BBB, CCC) -#define _LOG_L1C4(AAA, BBB, CCC, DDD) -#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE) -#endif // __BTT_LOG_1__ - -#ifdef __BTT_LOG_2__ -#define _LOG_L2C1(AAA) iTheLogger->Write(AAA) -#define _LOG_L2C2(AAA, BBB) iTheLogger->WriteFormat(AAA, BBB) -#define _LOG_L2C3(AAA, BBB, CCC) iTheLogger->WriteFormat(AAA, BBB, CCC) -#define _LOG_L2C4(AAA, BBB, CCC, DDD) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD) -#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE) -#else -#define _LOG_L2C1(AAA) -#define _LOG_L2C2(AAA, BBB) -#define _LOG_L2C3(AAA, BBB, CCC) -#define _LOG_L2C4(AAA, BBB, CCC, DDD) -#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE) -#endif // __BTT_LOG_2__ - -#ifdef __BTT_LOG_3__ -#define _LOG_L3C1(AAA) iTheLogger->Write(AAA) -#define _LOG_L3C2(AAA, BBB) iTheLogger->WriteFormat(AAA, BBB) -#define _LOG_L3C3(AAA, BBB, CCC) iTheLogger->WriteFormat(AAA, BBB, CCC) -#define _LOG_L3C4(AAA, BBB, CCC, DDD) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD) -#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE) -#else -#define _LOG_L3C1(AAA) -#define _LOG_L3C2(AAA, BBB) -#define _LOG_L3C3(AAA, BBB, CCC) -#define _LOG_L3C4(AAA, BBB, CCC, DDD) -#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE) -#endif // __BTT_LOG_3__ - -#ifdef __BTT_LOG_1__ -#define __BTT_LOGGING__ -#endif - -#ifdef __BTT_LOG_2__ -#define __BTT_LOGGING__ -#endif - -#ifdef __BTT_LOG_3__ -#define __BTT_LOGGING__ -#endif - -#ifdef __BTT_LOGGING__ -#define _BTT_LEAVEIFERROR(a) iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a) -#define _BTT_PANIC(CAT, CODE) iTheLogger->VerbosePanic(__FILE__, __LINE__, CODE, (TText8*)#CODE, CAT) -#else -#define _BTT_LEAVEIFERROR(a) User::LeaveIfError(a) -#define _BTT_PANIC(CAT, CODE) User::Panic(CAT, CODE) -#endif // __BTT_LOGGING__ - -/** - * static class containing methods for logging - * text to a logfile. - */ -class CBttLogger : public CBase - { -public: - static CBttLogger* NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId); - ~CBttLogger(); - -public: - void Write(const TDesC8& aText); - void WriteFormat(TRefByValue aFmt, ...); - void VerboseLeaveL(char* aFile, TInt aLine, TInt aReason); - void VerbosePanic(char* aFile, - TInt aLine, - TInt aPanicCode, - TText8* aPanicName, - const TDesC& aPanicCategory); - -protected: - CBttLogger(); - void ConstructL(const TDesC8& aSubDir, const TDesC8& aFileName, const TUint32 aInstanceId); - -private: - class TLogIgnoreOverflow8 : public TDes8Overflow - { - public: - void Overflow(TDes8& /*aDes*/) { } - }; - -private: // owned - - TUint32 iInstanceId; - __FLOG_DECLARATION_MEMBER; - }; - -#endif // BTTLOG_H__ diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/group/RawIPNif2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/rawipnif/rawipnif2/group/RawIPNif2.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,75 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// RAWIP.MMP +// +// + +TARGET rawip2.dll +TARGETTYPE PLUGIN +UID 0x10009D8D 0x10286AF7 + +// Used to specify if the rawip.dll should be specifically built to the +// functionality of TI basebands, where a two-byte header is appended +// to all incoming and outgoing packets (to specify the protocol being +// used). This macro is commented out as part of fix INC113695 propagation to v94 +// MACRO RAWIP_HEADER_APPENDED_TO_PACKETS + +// Do not add the non-callable exports to the DEF files +// Remove this line temporarily if we need to add new exports +NOEXPORTLIBRARY + +// DEFFILE RawIp2.def + +SOURCEPATH ../src +SOURCE BcaController.cpp +SOURCE BinderBase.cpp +SOURCE ecom_impl.cpp +SOURCE IPTagHeader.cpp +SOURCE IPv4Binder.cpp +SOURCE IPv6Binder.cpp +SOURCE RawIP2Flow.cpp RawIP2FlowFactory.cpp + +USERINCLUDE ../inc +USERINCLUDE ../traces + +OS_LAYER_SYSTEMINCLUDE_SYMBIAN + +START RESOURCE 10286AF7.rss +TARGET rawip2.rsc +END + +//MI support +#include + +#include + +LIBRARY euser.lib +LIBRARY esock.lib +LIBRARY esocksvr.lib +LIBRARY netmeta.lib +LIBRARY mbufmgr.lib +LIBRARY commsbufs.lib +LIBRARY insock.lib +LIBRARY nodemessages.lib +LIBRARY netinterfaces.lib + +START WINS + BASEADDRESS 0x47E00000 +END + +CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData +VENDORID 0x70000001 + +UNPAGED +SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/rawipnif/rawipnif2/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,25 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Network interface for supporting multiple primary PDP contexts on the telephony reference platform +// +// + +/** + @file +*/ + + +PRJ_MMPFILES + +RawIPNif2.mmp \ No newline at end of file diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/inc/BcaController.h --- a/telephonyprotocols/rawipnif/rawipnif2/inc/BcaController.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/inc/BcaController.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -30,7 +30,6 @@ using namespace BasebandChannelAdaptation2; -class CBttLogger; void Panic(TRawIP2NifPanic aPanic); typedef MBca2Factory* (*TNewBca2FactoryL)(); @@ -41,10 +40,10 @@ class CBcaController : public CActive { public: - CBcaController(CRawIP2Flow& aRawIPFlow, CBttLogger* aTheLogger); + CBcaController(CRawIP2Flow& aRawIPFlow); ~CBcaController(); - static CBcaController* NewL(CRawIP2Flow& aRawIPFlow,CBttLogger* aTheLogger); + static CBcaController* NewL(CRawIP2Flow& aRawIPFlow); void ConstructL(); public: void StartLoadL(const CBCAProvision* aBCAProvisionConfig,MUpperControl* aControl, @@ -60,8 +59,7 @@ // Inherited from CActive. virtual void RunL(); virtual void DoCancel(); -private: - CBttLogger* iTheLogger; // Unowned data. + private: enum TBcaState { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/inc/BinderBase.h --- a/telephonyprotocols/rawipnif/rawipnif2/inc/BinderBase.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/inc/BinderBase.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -32,14 +32,13 @@ #include class CRawIP2Flow; -class CBttLogger; class CBinderBase : public CBase, public ESock::MLowerDataSender, public ESock::MLowerControl, BasebandChannelAdaptation2::MUpperControl, BasebandChannelAdaptation2::MUpperDataReceiver { public: friend class CRawIP2Flow; - CBinderBase(CRawIP2Flow& aFlow, CBttLogger* aTheLogger); + CBinderBase(CRawIP2Flow& aFlow); virtual ~CBinderBase(); public: @@ -85,7 +84,6 @@ ESock::MUpperControl* iUpperControl; // not owned ESock::MUpperDataReceiver* iUpperReceiver; // not owned BasebandChannelAdaptation2::MLowerDataSender* iLowerDataSender; // not owned - CBttLogger* iTheLogger; #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS CIPTagHeader* iIPTagHeader; // owned diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/inc/IPTagHeader.h --- a/telephonyprotocols/rawipnif/rawipnif2/inc/IPTagHeader.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/inc/IPTagHeader.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -24,24 +24,20 @@ #ifndef IPTAGHEADER_H__ #define IPTAGHEADER_H__ -#include "bttlog.h" #include "Constants.h" #include -class CBttLogger; class CIPTagHeader : public CBase { public: - CIPTagHeader(CBttLogger* aTheLogger); + CIPTagHeader(); ~CIPTagHeader(); void SetType(TUint16 aType); void AddHeader(RCommsBufChain& aPdu); TUint16 RemoveHeader(RCommsBufChain& aPdu); -private: // Unowned data. - CBttLogger* iTheLogger; - +private: //Unowned data TBuf8 iHeaderByte; // Owned }; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/inc/IPv4Binder.h --- a/telephonyprotocols/rawipnif/rawipnif2/inc/IPv4Binder.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/inc/IPv4Binder.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -25,12 +25,11 @@ #include "BinderBase.h" -class CBttLogger; class CIPv4Binder : public CBinderBase { public: - CIPv4Binder(CRawIP2Flow& aFlow, CBttLogger* aTheLogger); + CIPv4Binder(CRawIP2Flow& aFlow); ~CIPv4Binder(); public: diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/inc/IPv6Binder.h --- a/telephonyprotocols/rawipnif/rawipnif2/inc/IPv6Binder.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/inc/IPv6Binder.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -26,12 +26,11 @@ #include "BinderBase.h" #include -class CBttLogger; class CIPv6Binder : public CBinderBase { public: - CIPv6Binder(CRawIP2Flow& aFlow, CBttLogger* aTheLogger); + CIPv6Binder(CRawIP2Flow& aFlow); ~CIPv6Binder(); public: @@ -87,9 +86,6 @@ void LogPacket(const RMBufChain& aPacket); #endif // __BTT_LOGGING__ -private: //unowned - CBttLogger* iTheLogger; - private: //owned TIPv6Settings iSettings; TUint iSpeedMetric; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2Flow.h --- a/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2Flow.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2Flow.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -30,11 +30,9 @@ #include #include #include "BinderBase.h" -#include "bttlog.h" #include // for TLinkMessageId class CBcaController; -class CBttLogger; class CPacketLogger; class CBCAProvision; @@ -100,7 +98,7 @@ inline RPacketContext::TContextStatus GetContextStatus(); protected: - CRawIP2Flow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf, CBttLogger* aTheLogger); + CRawIP2Flow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf); void ConstructL(); virtual ~CRawIP2Flow(); @@ -138,7 +136,7 @@ private:// Unowned /** networking packet logger for debugging packets */ __PACKETLOG_DECLARATION_MEMBER; - CBttLogger* iTheLogger; + // Upstack bound protocol reference // The protocol to use (IPv4).Note: This is not owned by this class. CBinderBase* iBinder; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2FlowFactory.h --- a/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2FlowFactory.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2FlowFactory.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -27,7 +27,6 @@ #include #include -#include "bttlog.h" /** RawIP Flow Implementation UID @@ -48,8 +47,6 @@ CRawIP2FlowFactory(TUid aFactoryId, ESock::CSubConnectionFlowFactoryContainer& aParentContainer); virtual ESock::CSubConnectionFlowBase* DoCreateFlowL(ESock::CProtocolIntfBase* aProtocol, ESock::TFactoryQueryBase& aQuery); -private: - CBttLogger* iTheLogger; // only here to allow use of _LOG_LnCn() macros within factory }; #endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/inc/bttlog.h --- a/telephonyprotocols/rawipnif/rawipnif2/inc/bttlog.h Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,135 +0,0 @@ -// Copyright (c) 2002-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Defines logger for RawIP NIF. -// -// - -/** - @file -*/ - -#ifndef BTTLOG_H__ -#define BTTLOG_H__ - -#include - -#if defined(__FLOG_ACTIVE) || defined(__DEBUGRAWIPSERIALPORT__) -// Uncomment any of these macros if you want logging. -// -> BTT_LOG_1 : For general logging -// -> BTT_LOG_2 : For error and warning logging -// -> BTT_LOG_3 : For IP packet information -#define __BTT_LOG_1__ 1 -//#define __BTT_LOG_2__ 1 -//#define __BTT_LOG_3__ 1 -#endif - -#ifdef __BTT_LOG_1__ -#define _LOG_L1C1(AAA) iTheLogger->Write(AAA) -#define _LOG_L1C2(AAA, BBB) iTheLogger->WriteFormat(AAA, BBB) -#define _LOG_L1C3(AAA, BBB, CCC) iTheLogger->WriteFormat(AAA, BBB, CCC) -#define _LOG_L1C4(AAA, BBB, CCC, DDD) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD) -#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE) -#else -#define _LOG_L1C1(AAA) -#define _LOG_L1C2(AAA, BBB) -#define _LOG_L1C3(AAA, BBB, CCC) -#define _LOG_L1C4(AAA, BBB, CCC, DDD) -#define _LOG_L1C5(AAA, BBB, CCC, DDD, EEE) -#endif // __BTT_LOG_1__ - -#ifdef __BTT_LOG_2__ -#define _LOG_L2C1(AAA) iTheLogger->Write(AAA) -#define _LOG_L2C2(AAA, BBB) iTheLogger->WriteFormat(AAA, BBB) -#define _LOG_L2C3(AAA, BBB, CCC) iTheLogger->WriteFormat(AAA, BBB, CCC) -#define _LOG_L2C4(AAA, BBB, CCC, DDD) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD) -#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE) -#else -#define _LOG_L2C1(AAA) -#define _LOG_L2C2(AAA, BBB) -#define _LOG_L2C3(AAA, BBB, CCC) -#define _LOG_L2C4(AAA, BBB, CCC, DDD) -#define _LOG_L2C5(AAA, BBB, CCC, DDD, EEE) -#endif // __BTT_LOG_2__ - -#ifdef __BTT_LOG_3__ -#define _LOG_L3C1(AAA) iTheLogger->Write(AAA) -#define _LOG_L3C2(AAA, BBB) iTheLogger->WriteFormat(AAA, BBB) -#define _LOG_L3C3(AAA, BBB, CCC) iTheLogger->WriteFormat(AAA, BBB, CCC) -#define _LOG_L3C4(AAA, BBB, CCC, DDD) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD) -#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE) iTheLogger->WriteFormat(AAA, BBB, CCC, DDD, EEE) -#else -#define _LOG_L3C1(AAA) -#define _LOG_L3C2(AAA, BBB) -#define _LOG_L3C3(AAA, BBB, CCC) -#define _LOG_L3C4(AAA, BBB, CCC, DDD) -#define _LOG_L3C5(AAA, BBB, CCC, DDD, EEE) -#endif // __BTT_LOG_3__ - -#ifdef __BTT_LOG_1__ -#define __BTT_LOGGING__ -#endif - -#ifdef __BTT_LOG_2__ -#define __BTT_LOGGING__ -#endif - -#ifdef __BTT_LOG_3__ -#define __BTT_LOGGING__ -#endif - -#ifdef __BTT_LOGGING__ -#define _BTT_LEAVEIFERROR(a) iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a) -#define _BTT_PANIC(CAT, CODE) iTheLogger->VerbosePanic(__FILE__, __LINE__, CODE, (TText8*)#CODE, CAT) -#else -#define _BTT_LEAVEIFERROR(a) User::LeaveIfError(a) -#define _BTT_PANIC(CAT, CODE) User::Panic(CAT, CODE) -#endif // __BTT_LOGGING__ - -/** - * static class containing methods for logging - * text to a logfile. - */ -class CBttLogger : public CBase - { -public: - static CBttLogger* NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId); - ~CBttLogger(); - -public: - void Write(const TDesC8& aText); - void WriteFormat(TRefByValue aFmt, ...); - void VerboseLeaveL(char* aFile, TInt aLine, TInt aReason); - void VerbosePanic(char* aFile, - TInt aLine, - TInt aPanicCode, - TText8* aPanicName, - const TDesC& aPanicCategory); - -protected: - CBttLogger(); - void ConstructL(const TDesC8& aSubDir, const TDesC8& aFileName, const TUint32 aInstanceId); - -private: - class TLogIgnoreOverflow8 : public TDes8Overflow - { - public: - void Overflow(TDes8& /*aDes*/) { } - }; - -private: // owned - TUint32 iInstanceId; - __FLOG_DECLARATION_MEMBER; - }; - -#endif // BTTLOG_H__ diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/src/BcaController.cpp --- a/telephonyprotocols/rawipnif/rawipnif2/src/BcaController.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/src/BcaController.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -19,21 +19,26 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "BcaControllerTraces.h" +#endif + #include #include #include "Constants.h" #include "BcaController.h" -CBcaController::CBcaController(CRawIP2Flow& aRawIPFlow,CBttLogger* aTheLogger) +CBcaController::CBcaController(CRawIP2Flow& aRawIPFlow) /** * Constructor. Performs standard active object initialisation. * * @param aRawIPFlow Reference to the RawIp2Flow - * @param aTheLogger The logging object + * */ : CActive(EPriorityStandard), - iTheLogger(aTheLogger), iMBca(NULL), iState(EIdling), iRawIPFlow(aRawIPFlow), @@ -45,17 +50,16 @@ CActiveScheduler::Add(this); } -CBcaController* CBcaController::NewL(CRawIP2Flow& aRawIPFlow,CBttLogger* aTheLogger) +CBcaController* CBcaController::NewL(CRawIP2Flow& aRawIPFlow) /** * Two-phase constructor. Creates a new CBcaController object, performs * second-phase construction, then returns it. * * @param aRawIPFlow Reference to the RawIp2Flow - * @param aTheLogger The logging object * @return A newly constructed CBcaController object */ { - CBcaController* self = new (ELeave) CBcaController(aRawIPFlow,aTheLogger); + CBcaController* self = new (ELeave) CBcaController(aRawIPFlow); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); @@ -67,7 +71,7 @@ * Second-phase constructor. Creates all the state objects it owns. */ { - _LOG_L1C1(_L8("CBcaController::ConstructL")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_CONSTRUCTL_1, "CBcaController::ConstructL"); } @@ -92,7 +96,7 @@ * */ { - _LOG_L1C1(_L8("CBcaControl::RunL() called")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_1, "CBcaControl::RunL() called"); switch (iState) { //in this state, Ioctl is called to set IAP ID, check the result of @@ -104,11 +108,11 @@ { if(iStatus == KErrNotSupported) { - _LOG_L1C1(_L8("This BCA does not support IAPID set")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_2, "This BCA does not support IAPID set"); } else { - _LOG_L2C1(_L8("This BCA supports IAPID set")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_3, "This BCA supports IAPID set"); } TPtrC bcaStack = iBCAProvisionConfig->GetBCAStack(); @@ -128,7 +132,7 @@ } else { - _LOG_L1C2(_L8("ERROR in BCA IAPID set = %d"), iStatus.Int()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_4, "ERROR in BCA IAPID set = %d", iStatus.Int()); Stop(iStatus.Int()); } @@ -142,18 +146,18 @@ { if(iStatus == KErrNotSupported) { - _LOG_L1C1(_L8("This BCA does not support BCA stacking")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_5, "This BCA does not support BCA stacking"); } else { - _LOG_L2C1(_L8("This BCA supports BCA stacking")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_6, "This BCA supports BCA stacking"); } iBcaParams = new(ELeave) MBca2::TBcaParams(const_cast(iBCAProvisionConfig)->GetCommsPond(), iBCAProvisionConfig->GetPortName()); TInt aErr = iMBca->Open(*iUpperControl,*iUpperDataReceiver,*iBcaParams); if ( aErr != KErrNone) { - _LOG_L2C2(_L8("ERROR in BCA Open = %d"), aErr); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_7, "ERROR in BCA Open = %d", aErr); Stop(iStatus.Int()); iState = EIdling; } @@ -164,7 +168,7 @@ } else { - _LOG_L2C2(_L8("ERROR in BCA stack set = %d"), iStatus.Int()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_8, "ERROR in BCA stack set = %d", iStatus.Int()); Stop(iStatus.Int()); } break; @@ -172,8 +176,9 @@ // Wrong state. default: { - _LOG_L1C1(_L8("ERROR CBcaControl::RunL(): Unknown state")); - _BTT_PANIC(KNifName, KBcaUnkownState); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_9, "ERROR CBcaControl::RunL(): Unknown state"); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RUNL_10, "PANIC: %S %d", KNifName, KBcaUnkownState); + User::Panic(KNifName, KBcaUnkownState); break; } } @@ -185,8 +190,8 @@ * cancel active request. */ { - _LOG_L1C1(_L8("CBcaControl::DoCancel called.")); - _LOG_L2C2(_L8("iState value is %d"), iState); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_DOCANCEL_1, "CBcaControl::DoCancel called."); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_DOCANCEL_2, "iState value is %d", iState); switch (iState) { case EIdling: @@ -198,8 +203,9 @@ iState = EIdling; break; default: - _LOG_L2C1(_L8("ERROR CBcaControl::DoCancel(): Unknown state")); - _BTT_PANIC(KNifName, KBcaUnkownState); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_DOCANCEL_3, "ERROR CBcaControl::DoCancel(): Unknown state"); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_DOCANCEL_4, "PANIC: %S %d", KNifName, KBcaUnkownState); + User::Panic(KNifName, KBcaUnkownState); break; } } @@ -215,7 +221,7 @@ * @return none */ { - _LOG_L1C1(_L8("CBcaControl::StartLoad")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STARTLOADL_1, "CBcaControl::StartLoad"); iBCAProvisionConfig = aBCAProvisionConfig; iUpperControl = aControl; @@ -226,7 +232,7 @@ TNewBca2FactoryL newBca2FactoryProcL = (TNewBca2FactoryL)iBcaDll.iObj.Lookup(1); if (NULL == newBca2FactoryProcL) { - _LOG_L1C2(_L8("Library entry point found error %d"), KErrBadLibraryEntryPoint); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STARTLOADL_2, "Library entry point found error %d", KErrBadLibraryEntryPoint); User::Leave(KErrBadLibraryEntryPoint); } @@ -234,7 +240,7 @@ if(!bcaFactory) { - _LOG_L1C2(_L8("BcaFactory creation error %d"), KErrCompletion); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STARTLOADL_3, "BcaFactory creation error %d", KErrCompletion); User::Leave(KErrCompletion); } CleanupReleasePushL(*bcaFactory); @@ -255,7 +261,7 @@ * requests on the active objects owned by this module and shutdown. */ { - _LOG_L1C1(_L8("CBcaController::Stop is called.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STOP_1, "CBcaController::Stop is called."); if(iMBca) { @@ -263,7 +269,7 @@ } else { - _LOG_L1C1(_L8("CBcaController::Stop Bca is not initialized. Bring the link layer down")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_STOP_2, "CBcaController::Stop Bca is not initialized. Bring the link layer down"); iRawIPFlow.LinkLayerDown(aError); } } @@ -274,7 +280,7 @@ * @param aPanic panic code */ void Panic(TRawIP2NifPanic aPanic) { - _LOG_L2C2(_L8("Panic code for RawIpNif = %d"), aPanic); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_PANIC_1, "Panic code for RawIpNif = %d", aPanic); User::Panic(KNifName,aPanic); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/src/BinderBase.cpp --- a/telephonyprotocols/rawipnif/rawipnif2/src/BinderBase.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/src/BinderBase.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -19,23 +19,28 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "BinderBaseTraces.h" +#endif + #include #include "BinderBase.h" #include "RawIP2Flow.h" #include "BcaController.h" -CBinderBase::CBinderBase(CRawIP2Flow& aFlow, CBttLogger* aTheLogger) +CBinderBase::CBinderBase(CRawIP2Flow& aFlow) /** * Constructor * * @param aNifMain A pointer to CRawIPFlow */ :iFlow(&aFlow), - iTheLogger(aTheLogger), iStarted(EFalse) { #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS - iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger); + iIPTagHeader = new (ELeave) CIPTagHeader(); #endif // RAWIP_HEADER_APPENDED_TO_PACKETS } @@ -55,7 +60,7 @@ /** * Used to specify the type of the IP header. */ - _LOG_L1C1(_L8("CBinderBase::SetType")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_SETTYPE_1, "CBinderBase::SetType"); iIPTagHeader->SetType(aType); } @@ -103,7 +108,7 @@ * @param aUpperControl A pointer to Upper layer control class */ { - _LOG_L1C1(_L8("CBinderBase:\tBind()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_BIND_1, "CBinderBase:\tBind()"); iUpperReceiver = aUpperReceiver; iUpperControl = aUpperControl; @@ -112,7 +117,7 @@ void CBinderBase::Unbind(ESock::MUpperDataReceiver* aUpperReceiver, ESock::MUpperControl* aUpperControl) { - _LOG_L1C1(_L8("CBinderBase:\tUnbind()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_UNBIND_1, "CBinderBase:\tUnbind()"); #ifndef _DEBUG (void) aUpperReceiver; @@ -132,7 +137,7 @@ * @param aProtocol A pointer to a protocol */ { - _LOG_L1C1(_L8("CBinderBase:\tStartSending()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_STARTSENDING_1, "CBinderBase:\tStartSending()"); if (!iStarted) { @@ -152,7 +157,7 @@ * @param aProtocol A pointer to a protocol */ { - _LOG_L1C1(_L8("CBinderBase:\tError()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_ERROR_1, "CBinderBase:\tError()"); // Default implementation. // Uses iProtocol instead aProtocol. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/src/IPTagHeader.cpp --- a/telephonyprotocols/rawipnif/rawipnif2/src/IPTagHeader.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPTagHeader.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -21,14 +21,19 @@ #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "IPTagHeaderTraces.h" +#endif + #include "IPTagHeader.h" #include "Constants.h" /** Default constructor. */ -CIPTagHeader::CIPTagHeader(CBttLogger* aTheLogger) - : iTheLogger(aTheLogger) +CIPTagHeader::CIPTagHeader() { iHeaderByte.SetMax(); iHeaderByte.FillZ(); @@ -48,7 +53,7 @@ */ void CIPTagHeader::SetType(TUint16 aType) { - _LOG_L1C1(_L8("CIPTagHeader::SetType")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_SETTYPE_1, "CIPTagHeader::SetType"); iHeaderByte[0] = (TUint8)(aType>>8); iHeaderByte[1] = (TUint8)(aType&0xff); @@ -63,7 +68,7 @@ */ void CIPTagHeader::AddHeader(RCommsBufChain& aPdu) { - _LOG_L1C1(_L8("CIPTagHeader::AddHeader")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_ADDHEADER_1, "CIPTagHeader::AddHeader"); // Add the protocol code as a header to the buffer aPdu.Write(iHeaderByte,0); @@ -79,7 +84,7 @@ */ TUint16 CIPTagHeader::RemoveHeader(RCommsBufChain& aPdu) { - _LOG_L1C1(_L8("CIPTagHeader::RemoveHeader")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_REMOVEHEADER_1, "CIPTagHeader::RemoveHeader"); if (aPdu.Length() > KIPTagHeaderLength) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/src/IPv4Binder.cpp --- a/telephonyprotocols/rawipnif/rawipnif2/src/IPv4Binder.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPv4Binder.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "IPv4BinderTraces.h" +#endif + #include #include #include "RawIP2Flow.h" @@ -30,14 +36,12 @@ #include #endif -#define LOG_IP_ADDRESS(desc,addr) _LOG_L1C5(_L8(" " desc " = %d.%d.%d.%d"), \ - addr >> 24, (addr >> 16) & 0xFF, (addr >> 8) & 0xFF, addr & 0xFF); -CIPv4Binder::CIPv4Binder(CRawIP2Flow& aFlow, CBttLogger* aTheLogger) +CIPv4Binder::CIPv4Binder(CRawIP2Flow& aFlow) /** * Constructor */ - : CBinderBase(aFlow,aTheLogger), + : CBinderBase(aFlow), iSpeedMetric(KDefaultSpeedMetric) { } @@ -73,8 +77,7 @@ * @return Standard error codes */ { - _LOG_L1C3(_L8("CIPv4Binder::Control [aLevel=%d, aName=%d]"), - aLevel, aName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_CONTROL_1, "CIPv4Binder::Control [aLevel=%d, aName=%d]",aLevel, aName); if (aLevel == KSOLInterface) { @@ -153,7 +156,7 @@ TInt CIPv4Binder::GetConfig(TBinderConfig& aConfig) { - _LOG_L1C1(_L8("CIPv4Binder::GetConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_GETCONFIG_1, "CIPv4Binder::GetConfig"); TBinderConfig4* config = TBinderConfig::Cast(aConfig); if(config == NULL) @@ -167,8 +170,9 @@ config->iInfo.iMtu = KDefaultMtu; /* Maximum transmission unit. */ config->iInfo.iRMtu = KDefaultMtu; /* Maximum transmission unit for receiving. */ config->iInfo.iSpeedMetric = iSpeedMetric; /* approximation of the interface speed in Kbps. */ - LOG_IP_ADDRESS("Local IP address from TBinderConfig", iSettings.iLocalAddr); - + + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_GETCONFIG_2, "Local IP address from TBinderConfig = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF); + config->iAddress.SetAddress(iSettings.iLocalAddr); /* Interface IP address. */ config->iNetMask.SetAddress(iSettings.iNetMask); /* IP netmask. */ config->iBrdAddr.SetAddress(iSettings.iBroadcastAddr); /* IP broadcast address. */ @@ -189,7 +193,7 @@ * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone */ { - _LOG_L1C1(_L8("CIPv4Binder::DeleteContext")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_DELETECONTEXT_1, "CIPv4Binder::DeleteContext"); if (aContextParameters.Length() != sizeof(TContextParameters)) { @@ -223,7 +227,7 @@ */ void CIPv4Binder::UpdateContextConfigL(const TPacketDataConfigBase& aConfig) { - _LOG_L1C1(_L8("CIPv4Binder::UpdateContextConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_1, "CIPv4Binder::UpdateContextConfig"); // Get our IP address from the GPRS context config. TInetAddr address; @@ -249,14 +253,13 @@ if (ret == KErrNone) { iSettings.iLocalAddr = address.Address(); - LOG_IP_ADDRESS("Got local IP address from context", iSettings.iLocalAddr); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_2, "Got local IP address from context = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF); iSettings.iDefGateway = address.Address(); - _LOG_L1C1(_L8("Set Default Gateway to local IP address")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_3, "Set Default Gateway to local IP address"); } else { - _LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_4, "Couldn't get IP address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -278,12 +281,11 @@ if (ret == KErrNone) { iSettings.iPrimaryDns = address.Address(); - LOG_IP_ADDRESS("Got primary DNS from context PCO", iSettings.iPrimaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_5, "Got primary DNS from context PCO = %u.%u.%u.%u",iSettings.iPrimaryDns >> 24, (iSettings.iPrimaryDns >> 16) & 0xFF, (iSettings.iPrimaryDns >> 8) & 0xFF, iSettings.iPrimaryDns & 0xFF); } else { - _LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_6, "Couldn't get primary DNS address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -295,12 +297,11 @@ if (ret == KErrNone) { iSettings.iSecondaryDns = address.Address(); - LOG_IP_ADDRESS("Got secondary DNS from context PCO", iSettings.iPrimaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_7, "Got secondary DNS from context PCO = %u.%u.%u.%u",iSettings.iSecondaryDns >> 24, (iSettings.iSecondaryDns >> 16) & 0xFF, (iSettings.iSecondaryDns >> 8) & 0xFF, iSettings.iSecondaryDns); } else { - _LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_8, "Couldn't get secondary DNS address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -308,8 +309,8 @@ } else { - LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns); - LOG_IP_ADDRESS(" - Secondary ", iSettings.iSecondaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_9, "Using CommDB DNS address - Primary = %u.%u.%u.%u",iSettings.iPrimaryDns >> 24, (iSettings.iPrimaryDns >> 16) & 0xFF, (iSettings.iPrimaryDns >> 8) & 0xFF, iSettings.iPrimaryDns & 0xFF); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_10, " - Secondary = %u.%u.%u.%u",iSettings.iSecondaryDns >> 24, (iSettings.iSecondaryDns >> 16) & 0xFF, (iSettings.iSecondaryDns >> 8) & 0xFF, iSettings.iSecondaryDns); } @@ -327,12 +328,11 @@ if (ret == KErrNone) { iSettings.iDefGateway = address.Address(); - LOG_IP_ADDRESS("Got default gateway", iSettings.iDefGateway); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_10, "Got default gateway = %u.%u.%u.%u",iSettings.iDefGateway >> 24, (iSettings.iDefGateway >> 16) & 0xFF, (iSettings.iDefGateway >> 8) & 0xFF, iSettings.iDefGateway); } else { - _LOG_L2C2(_L8("Couldn't get default gateway from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_6, "Couldn't get default gateway from GPRS config (err: %d)",ret); } }*/ } @@ -344,7 +344,7 @@ * @param aConnectionSpeed Our connection speed */ { - _LOG_L1C1(_L8("CIPv4Binder::UpdateConnectionSpeed")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONNECTIONSPEED_1, "CIPv4Binder::UpdateConnectionSpeed"); iSpeedMetric = aConnectionSpeed; } @@ -362,7 +362,7 @@ * @return Standard error codes */ { - _LOG_L1C1(_L8("CIPv4Binder::Send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SEND1_1, "CIPv4Binder::Send"); #ifdef __BTT_LOGGING__ LogPacket(static_cast(aPdu)); @@ -387,7 +387,7 @@ * @param aInfo Not used */ { - _LOG_L1C1(_L8("CIPv4Binder::Notification")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_NOTIFICATION_1, "CIPv4Binder::Notification"); return KErrNone; } @@ -399,7 +399,7 @@ * @param aProtocol A pointer to a protocol */ { - _LOG_L1C1(_L8("CIPv4Binder::StartSending()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_STARTSENDING_1, "CIPv4Binder::StartSending()"); CBinderBase::StartSending(); } @@ -411,8 +411,7 @@ * @param aProtocolCode The protocol type */ { - _LOG_L1C2(_L8("CIPv4Binder::WantsProtocol [aProtocolCode=%X]"), - aProtocolCode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_WANTSPROTOCOL_1, "CIPv4Binder::WantsProtocol [aProtocolCode=%X]",aProtocolCode); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS return ((aProtocolCode & 0x00FF) == KIp4FrameType); @@ -435,7 +434,7 @@ * @param aPdu The incoming packet */ { - _LOG_L1C1(_L8("CIPv4Binder::Process")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS1_1, "CIPv4Binder::Process"); #ifdef __BTT_LOGGING__ LogPacket(static_cast(aPdu)); @@ -452,12 +451,12 @@ // been bound yet. if (iUpperReceiver && WantsProtocol(protocolCode)) { - _LOG_L1C1(_L8("CIPv4Binder: Packet Sent to TCP/IP Protocol!!!")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS1_2, "CIPv4Binder: Packet Sent to TCP/IP Protocol!!!"); iUpperReceiver->Process(static_cast(aPdu)); } else { - _LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS1_3, "WARNING: dumping incoming packet, no protocol bound"); aPdu.Free(); } } @@ -487,7 +486,7 @@ @param aProvision Provisioning structure from Control side. */ { - _LOG_L1C1(_L8("CIPv4Binder::SetProvision")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SETPROVISION_1, "CIPv4Binder::SetProvision"); iSettings.iLocalAddr = aProvision.GetIpAddress(); iSettings.iNetMask = aProvision.GetIpNetMask(); iSettings.iBroadcastAddr = aProvision.GetBroadCastAddr(); @@ -496,7 +495,8 @@ iSettings.iSecondaryDns = aProvision.GetIp4NameServer2(); iSettings.iGetGatewayFromServer = aProvision.GetIpAddrFromServer(); iSettings.iGetDnsFromServer = aProvision.GetIp4DNSAddrFromServer(); - LOG_IP_ADDRESS("Local IP address from Provisioning", iSettings.iLocalAddr); + + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SETPROVISION_2, "Local IP address from Provisioning = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF); } #ifdef __BTT_LOGGING__ @@ -507,19 +507,18 @@ * @param aPacket The packet */ { - _LOG_L1C1(_L8("CIPv4Binder::LogPacket")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_1, "CIPv4Binder::LogPacket"); TInt mBufLength = aPacket.Length() - aPacket.First()->Length(); - _LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_2, "Analysis of %d byte packet:", mBufLength); //Note: All the constants used on this method are a pragmatic guess of the //IP header fields. The only porpose of this method is logging. if (mBufLength < 20) { - _LOG_L3C2(_L8(" -doesn't appear to be a valid IPv4 packet (length=%d)") - , mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_3, " -doesn't appear to be a valid IPv4 packet (length=%d)", mBufLength); return; } @@ -528,34 +527,28 @@ if ((payloadPtr[0] & 0xF0) != 0x40) { - _LOG_L3C2(_L8(" - doesn't appear to be an IPv4 packet (version=0x%X)"), - (payloadPtr[0] & 0xF0) >> 4); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_4, " - doesn't appear to be an IPv4 packet (version=0x%X)",(payloadPtr[0] & 0xF0) >> 4); return; } if ((payloadPtr[0] & 0xF) != 0x5) { - _LOG_L3C2(_L8(" - doesn't have a standard IP header (length=0x%X)"), - payloadPtr[0] & 0xF); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_5, " - doesn't have a standard IP header (length=0x%X)",payloadPtr[0] & 0xF); return; } - _LOG_L3C5(_L8(" - src addr: %d.%d.%d.%d"), payloadPtr[12], payloadPtr[13], - payloadPtr[14], payloadPtr[15]); - _LOG_L3C5(_L8(" - dst addr: %d.%d.%d.%d"), payloadPtr[16], payloadPtr[17], - payloadPtr[18], payloadPtr[19]); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_6, " - src addr: %u.%u.%u.%u", payloadPtr[12], payloadPtr[13],payloadPtr[14], payloadPtr[15]); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_7, " - dst addr: %u.%u.%u.%u", payloadPtr[16], payloadPtr[17],payloadPtr[18], payloadPtr[19]); if (payloadPtr[9] == 0x06) { - _LOG_L3C1(_L8(" - appears to be a TCP packet")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_8, " - appears to be a TCP packet"); if (mBufLength < 40) { - _LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_9, " - but is too short (length=0x%X)", mBufLength); return; } - _LOG_L3C3(_L8(" - src port: %d, dst port: %d"), - (payloadPtr[20] << 8) + payloadPtr[21], - (payloadPtr[22] << 8) + payloadPtr[23]); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_10, " - src port: %d, dst port: %d",(payloadPtr[20] << 8) + payloadPtr[21],(payloadPtr[22] << 8) + payloadPtr[23]); _LOG_L3C3(_L8(" - seq #: 0x%08X, ack #: 0x%08X"), (payloadPtr[24] << 24) + (payloadPtr[25] << 16) + (payloadPtr[26] << 8) + payloadPtr[27], @@ -590,7 +583,7 @@ { flagsSet.Append(_L8("URG ")); } - _LOG_L3C1(flagsSet); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_11, flagsSet); TInt dataOffset = payloadPtr[32] >> 2; // in bytes if ((dataOffset > 0) && (mBufLength > dataOffset + 30)) @@ -613,55 +606,50 @@ data.Append(TChar('?')); } } - _LOG_L3C1(data); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_12, data); } } else if (payloadPtr[9] == 0x01) { - _LOG_L3C1(_L8(" - appears to be an ICMP packet")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_13, " - appears to be an ICMP packet"); if (mBufLength < 24) { - _LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_14, " - but is too short (length=0x%X)", mBufLength); return; } if (payloadPtr[20] == 0x8) { - _LOG_L3C1(_L8(" - is an echo request")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_15, " - is an echo request"); } else if (payloadPtr[20] == 0x0) { - _LOG_L3C1(_L8(" - is an echo reply")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_16, " - is an echo reply"); } else { - _LOG_L3C2(_L8(" - unknown type (0x%02X)"), payloadPtr[20]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_17, " - unknown type (0x%02X)", payloadPtr[20]); return; } if (mBufLength >= 28) { - _LOG_L3C3(_L8(" - ID: 0x%04X, seq #: 0x%04X"), - (payloadPtr[24] << 8) + payloadPtr[25], - (payloadPtr[26] << 8) + payloadPtr[27]); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_18, " - ID: 0x%04X, seq #: 0x%04X",(payloadPtr[24] << 8) + payloadPtr[25],(payloadPtr[26] << 8) + payloadPtr[27]); } } else if (payloadPtr[9] == 0x11) { - _LOG_L3C1(_L8(" - appears to be a UDP packet")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_19, " - appears to be a UDP packet"); if (mBufLength < 28) { - _LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_20, " - but is too short (length=0x%X)", mBufLength); return; } - _LOG_L3C3(_L8(" - src port: %d, dst port: %d"), - (payloadPtr[20] << 8) + payloadPtr[21], - (payloadPtr[22] << 8) + payloadPtr[23]); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_21, " - src port: %d, dst port: %d",(payloadPtr[20] << 8) + payloadPtr[21],(payloadPtr[22] << 8) + payloadPtr[23]); } else { - _LOG_L3C2(_L8(" - appears to be for an unknown protocol (0x%X)"), - payloadPtr[9]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_22, " - appears to be for an unknown protocol (0x%X)",payloadPtr[9]); } } #endif // __BTT_LOGGING__ diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/src/IPv6Binder.cpp --- a/telephonyprotocols/rawipnif/rawipnif2/src/IPv6Binder.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPv6Binder.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "IPv6BinderTraces.h" +#endif + #include #include #include "RawIP2Flow.h" @@ -33,15 +39,12 @@ #include #endif -#define LOG_IP_ADDRESS(desc,addr) _LOG_L2C5(_L8(" " desc " = %d:%d:%d:%d from context"), \ - addr.u.iAddr32[3], addr.u.iAddr32[2], addr.u.iAddr32[1], addr.u.iAddr32[0]); -CIPv6Binder::CIPv6Binder(CRawIP2Flow& aFlow, CBttLogger* aTheLogger) +CIPv6Binder::CIPv6Binder(CRawIP2Flow& aFlow) /** * Constructor */ - : CBinderBase(aFlow,aTheLogger), - iTheLogger(aTheLogger), + : CBinderBase(aFlow), iSpeedMetric(KDefaultSpeedMetric) { } @@ -77,8 +80,7 @@ * @return Standard error codes */ { - _LOG_L1C3(_L8("CIPv6Binder::Control [aLevel=%d, aName=%d]"), - aLevel, aName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_CONTROL_1, "CIPv6Binder::Control [aLevel=%u, aName=%u]",aLevel, aName); if (aLevel == KSOLInterface) { @@ -189,7 +191,7 @@ * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone */ { - _LOG_L1C1(_L8("CIPv6Binder::DeleteContext")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_DELETECONTEXT_1, "CIPv6Binder::DeleteContext"); if (aContextParameters.Length() != sizeof(TContextParameters)) { @@ -223,7 +225,7 @@ */ void CIPv6Binder::UpdateContextConfigL(const TPacketDataConfigBase& aConfig) { - _LOG_L1C1(_L8("CIPv6Binder::UpdateContextConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_1, "CIPv6Binder::UpdateContextConfig"); // Get our IP address from the GPRS context config. TInetAddr address; @@ -249,12 +251,11 @@ if (ret == KErrNone) { iSettings.iLocalAddr = address.Ip6Address(); - LOG_IP_ADDRESS("Got local IP address", iSettings.iLocalAddr); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_2, "Got local IP address = %u:%u:%u:%u from context", iSettings.iLocalAddr.u.iAddr32[3], iSettings.iLocalAddr.u.iAddr32[2], iSettings.iLocalAddr.u.iAddr32[1], iSettings.iLocalAddr.u.iAddr32[0]); } else { - _LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_3, "Couldn't get IP address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -276,12 +277,11 @@ if (ret == KErrNone) { iSettings.iPrimaryDns = address.Ip6Address(); - LOG_IP_ADDRESS("Got primary DNS", iSettings.iPrimaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_4, "Got primary DNS = %u:%u:%u:%u from context", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]); } else { - _LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_5, "Couldn't get primary DNS address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -293,12 +293,11 @@ if (ret == KErrNone) { iSettings.iSecondaryDns = address.Ip6Address(); - LOG_IP_ADDRESS("Got secondary DNS", iSettings.iPrimaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_6, "Got secondary DNS = %u:%u:%u:%u from context", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]); } else { - _LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_7, "Couldn't get secondary DNS address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -306,8 +305,8 @@ } else { - LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns); - LOG_IP_ADDRESS(" - Secondary ", iSettings.iSecondaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_8, "Using CommDB DNS address - Primary = %u:%u:%u:%u", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_9, " - Secondary = %u:%u:%u:%u", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]); } } @@ -318,7 +317,7 @@ * @param aConnectionSpeed Our connection speed */ { - _LOG_L1C1(_L8("CIPv6Binder::UpdateConnectionSpeed")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONNECTIONSPEED_1, "CIPv6Binder::UpdateConnectionSpeed"); iSpeedMetric = aConnectionSpeed; } @@ -336,7 +335,7 @@ * @return Standard error codes */ { - _LOG_L1C1(_L8("CIPv6Binder::Send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_SEND1_1, "CIPv6Binder::Send"); #ifdef __BTT_LOGGING__ LogPacket(static_cast(aPdu)); @@ -362,7 +361,7 @@ * @param aInfo Not used */ { - _LOG_L1C1(_L8("CIPv6Binder::Notification")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_NOTIFICATION_1, "CIPv6Binder::Notification"); return KErrNone; } @@ -374,7 +373,7 @@ * @param aProtocol A pointer to a protocol */ { - _LOG_L1C1(_L8("CIPv6Binder::StartSending()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_STARTSENDING_1, "CIPv6Binder::StartSending()"); CBinderBase::StartSending(); } @@ -385,8 +384,7 @@ * @param aProtocolCode The protocol type */ { - _LOG_L1C2(_L8("CIPv6Binder::WantsProtocol [aProtocolCode=%X]"), - aProtocolCode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_WANTSPROTOCOL_1, "CIPv6Binder::WantsProtocol [aProtocolCode=%X]",aProtocolCode); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS return ((aProtocolCode & 0x00FF) == KIp6FrameType); @@ -409,7 +407,7 @@ * @param aPdu The incoming packet */ { - _LOG_L1C1(_L8("CIPv6Binder::Process")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS1_1, "CIPv6Binder::Process"); #ifdef __BTT_LOGGING__ LogPacket(static_cast(aPdu)); @@ -427,12 +425,12 @@ // been bound yet. if (iUpperReceiver && WantsProtocol(protocolCode)) { - _LOG_L1C1(_L8("CIPv6Binder: Packet Sent to TCP/IP Protocol!!!")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS1_2, "CIPv6Binder: Packet Sent to TCP/IP Protocol!!!"); iUpperReceiver->Process(static_cast(aPdu)); } else { - _LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS1_3, "WARNING: dumping incoming packet, no protocol bound"); aPdu.Free(); } @@ -511,19 +509,18 @@ * @param aPacket The packet */ { - _LOG_L1C1(_L8("CIPv6Binder::LogPacket")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_1, "CIPv6Binder::LogPacket"); TInt mBufLength = aPacket.Length() - aPacket.First()->Length(); - _LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_2, "Analysis of %d byte packet:", mBufLength); //Note: All the constants used on this method are a pragmatic guess of the //IP header fields. The only porpose of this method is logging. if (mBufLength < 40) { - _LOG_L3C2(_L8(" -doesn't appear to be a valid IPv6 packet (length=%d)") - , mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_3, " -doesn't appear to be a valid IPv6 packet (length=%d)", mBufLength); return; } @@ -532,18 +529,14 @@ if ((payloadPtr[0] & 0xF0) != 0x60) { - _LOG_L3C2(_L8(" - doesn't appear to be an IPv6 packet (version=0x%X)"), - (payloadPtr[0] & 0xF0) >> 4); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_4, " - doesn't appear to be an IPv6 packet (version=0x%X)",(payloadPtr[0] & 0xF0) >> 4); return; } - _LOG_L3C2(_L8(" - traffic class: 0x%X"), - ((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4)); - _LOG_L3C2(_L8(" - flow label: 0x%X"), - ((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]); - _LOG_L3C2(_L8(" - payload length: 0x%X"), - (payloadPtr[4] << 16) | payloadPtr[5]); - _LOG_L3C2(_L8(" - next header: 0x%08X"), payloadPtr[6]); - _LOG_L3C2(_L8(" - hop limit: 0x%08X"), payloadPtr[7]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_5, " - traffic class: 0x%X", ((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4)); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_6, " - flow label: 0x%X", ((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_7, " - payload length: 0x%X", (payloadPtr[4] << 16) | payloadPtr[5]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_8, " - next header: 0x%08X", payloadPtr[6]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_9, " - hop limit: 0x%08X", payloadPtr[7]); } #endif // __BTT_LOGGING__ diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/src/RawIP2Flow.cpp --- a/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2Flow.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2Flow.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -21,6 +21,12 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "RawIP2FlowTraces.h" +#endif + #include #include #include @@ -40,23 +46,16 @@ using namespace Messages; using namespace MeshMachine; -#ifdef __FLOG_ACTIVE -//These variables are used only if flog is active. -_LIT8(KTcpDumpFirstTag,"TcpDump"); -static const TUint16 KTcpDumpLinkType = 12; -#endif -CRawIP2Flow::CRawIP2Flow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf, CBttLogger* aTheLogger) +CRawIP2Flow::CRawIP2Flow(ESock::CSubConnectionFlowFactoryBase& aFactory, const Messages::TNodeId& aSubConnId, ESock::CProtocolIntfBase* aProtocolIntf) /** * Constructor. * * @param aFactory Reference to the factory which created this object. * @param aSubConnId Reference to the node id for sub connection. * @param aProtocolIntf pointer to the CProtocolIntfBase - * @param aTheLogger The logging object, ownership is passed to this object */ : CSubConnectionFlowBase(aFactory, aSubConnId, aProtocolIntf), - iTheLogger(aTheLogger), iInitError(KErrNone), iStarted(EFalse), iStopping(EFalse) @@ -72,10 +71,10 @@ * @param aName The name of the NIF (unused) */ { - _LOG_L1C2(_L8("CRawIP2Flow %08x:\tConstructL()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_CONSTRUCTL_1, "CRawIP2Flow %08x:\tConstructL()", this); iBinderControl = new (ELeave) TBinderControlProxy(*this); - iBcaController = CBcaController::NewL(*this, iTheLogger); + iBcaController = CBcaController::NewL(*this); } CRawIP2Flow::~CRawIP2Flow() @@ -85,15 +84,11 @@ { // Note that we don't delete iBinder because it's not owned by us. delete iBcaController; - // This class also deletes the logging object - delete iTheLogger; ASSERT(iBinder == NULL); delete iBinderControl; LOG_NODE_DESTROY(KNifSubDir, CRawIP2Flow); - // Cleanup when stop was not called - harmless as it null's the pointer - __PACKETLOG_DELETE; } void CRawIP2Flow::StartFlowL() @@ -107,7 +102,7 @@ { ASSERT(iStarting==EFalse); iStarting = ETrue; - _LOG_L1C2(_L8("CRawIP2Flow %08x:\tStartFlowL()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_STARTFLOWL_1, "CRawIP2Flow %08x:\tStartFlowL()", this); // If there were any errors during earlier processing of the ProvisionConfig message // then send an Error message in response to the StartFlow (because ProvisionConfig @@ -124,7 +119,7 @@ // associate the binder object with the lowersender iBinder->SetSender(&(iBcaController->Bca()->GetSender())); //the name calculation should be done only if logging is enabled -#ifdef __FLOG_ACTIVE +#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) const TUint KModemNameLen = KCommsDbSvrMaxColumnNameLength + 10; // need enough for ppp-XXX.txt - e.g. ppp-comm-1.txt, ppp-btcomm-10.txt etc TBuf8 modemName; @@ -145,12 +140,7 @@ TUint32 counter = User::FastCounter(); logFileName.Format(KTimeFormat, counter); - TRAPD(err,__PACKETLOG_NEWL(KTcpDumpFirstTag, logFileName, CPacketLogger::ETcpDump, KTcpDumpLinkType)); - if (err) - { - _LOG_L1C1(_L8("Trapped leave from __PACKETLOG_NEWL")); - } - + const TUint KLogTextLen = KModemNameLen+KTimeStampLen+30; TBuf8 logText; _LIT8(KLogTimeText, "TcpDump log file time stamp:"); @@ -159,7 +149,7 @@ logText.Append(logFileName); logText.Append(KLogModemText); logText.Append(modemName); - _LOG_L1C1(logText); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_STARTFLOWL_3, logText); #endif } @@ -171,7 +161,7 @@ * ready to go. */ { - _LOG_L1C2(_L8("CRawIP2Flow %08x:\tLinkLayerUp()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_LINKLAYERUP_1, "CRawIP2Flow %08x:\tLinkLayerUp()", this); iLastRequestOriginator.ReplyTo(Id(), ESock::TCFDataClient::TStarted().CRef()); @@ -188,8 +178,8 @@ * @param aError An error code to propagate to NifMan */ { - _LOG_L1C3(_L8("CRawIP2Flow %08x:\tLinkLayerDown(aError %d)"), this, aError); - __PACKETLOG_DELETE; + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_LINKLAYERDOWN_1, "CRawIP2Flow %08x:\tLinkLayerDown(aError %d)", (TUint)this, aError); + if (iStopping) { @@ -219,8 +209,7 @@ * @param aAction The action to take: disconnect or reconnect */ { - _LOG_L1C3(_L8("CRawIP2Flow %08x:\tStopFlow(aError %d)"), this, aError); - __PACKETLOG_DELETE; + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_STOPFLOW_1, "CRawIP2Flow %08x:\tStopFlow(aError %d)",(TUint) this, aError); iStopping = ETrue; ShutDown(aError); } @@ -237,7 +226,7 @@ * @param aError A possible error */ { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tInitialiseL"),this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_INITIALISEL_1, "CRawIPFlow %08x:\tInitialiseL",this); // Update local state from TSY information originally from Agent. GetBinder()->UpdateContextConfigL(*iAgentProvision->iGprsConfig); @@ -258,7 +247,7 @@ * @param aError A possible error (only during initialisation) */ { - _LOG_L1C3(_L8("CRawIPFlow %08x:\tShutDown(aError %d)"),this, aError); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_SHUTDOWN_1, "CRawIPFlow %08x:\tShutDown(aError %d)",(TUint)this, aError); if (aError != KErrNone) { @@ -301,7 +290,7 @@ * @param aError A possible error */ { - _LOG_L1C3(_L8("CRawIP2Flow %08x:\tUpdateContextState(aState %d)"), this, aState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_UPDATECONTEXTSTATE_1, "CRawIP2Flow %08x:\tUpdateContextState(aState %d)", (TUint)this, aState); // Note that we do not need to close the Flow down if there's been an // error, as the context state machine will do this for us. @@ -326,25 +315,22 @@ ESock::MLowerControl* CRawIP2Flow::GetControlL(const TDesC8& aProtocol) { -#ifdef __BTT_LOGGING__ - //TBuf8<256> debugBuffer; - //debugBuffer.Copy(aProtocol); - _LOG_L1C3(_L8("CRawIP2Flow %08x:\tGetControlL(aProtocol %S)"), this, &aProtocol); -#endif + + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_GETCONTROLL_1, "CRawIP2Flow %08x:\tGetControlL(aProtocol %s)", (TUint) this, aProtocol); // IPv4 and ICMP Protocols if (aProtocol.CompareF(KDescIp()) == 0 || aProtocol.CompareF(KDescIcmp()) == 0) { if (!iBinder) { - iBinder = new (ELeave) CIPv4Binder(*this, iTheLogger); + iBinder = new (ELeave) CIPv4Binder(*this); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS iBinder->SetType(KIp4FrameType); #endif // RAWIP_HEADER_APPENDED_TO_PACKETS } else { - _LOG_L1C2(_L8("CRawIP2Flow %08x:\tGetControlL(): IPv4 binder already exists"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_GETCONTROLL_2, "CRawIP2Flow %08x:\tGetControlL(): IPv4 binder already exists", this); } } // IPv6 Protocol @@ -352,14 +338,14 @@ { if (!iBinder) { - iBinder = new (ELeave) CIPv6Binder(*this, iTheLogger); + iBinder = new (ELeave) CIPv6Binder(*this); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS iBinder->SetType(KIp6FrameType); #endif // RAWIP_HEADER_APPENDED_TO_PACKETS } else { - _LOG_L1C2(_L8("CRawIP2Flow %08x:\tGetControlL(): IPv6 binder already exists"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_GETCONTROLL_3, "CRawIP2Flow %08x:\tGetControlL(): IPv6 binder already exists", this); } } else @@ -392,7 +378,7 @@ void CRawIP2Flow::Unbind(ESock::MUpperDataReceiver* aUpperReceiver, ESock::MUpperControl* aUpperControl) { - _LOG_L1C2(_L8("CRawIP2Flow %08x:\tUnbind()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_UNBIND_1, "CRawIP2Flow %08x:\tUnbind()", this); ASSERT(iBinder); iBinder->Unbind(aUpperReceiver, aUpperControl); @@ -505,7 +491,6 @@ //doesn't notice anything. It does that by swapping the //flows below the binders. CBinderBase* localBinder = iBinder; - CBttLogger* logger = localBinder->iTheLogger; TBinderControlProxy* localBinderControl = iBinderControl; iBinder = otherFlow->iBinder; @@ -517,7 +502,6 @@ otherFlow->iBinderControl->iFlow = otherFlow; iBinderControl->iFlow = this; - iBinder->iTheLogger = logger; iSubConnectionProvider.Close(); iSubConnectionProvider.Open(address_cast(rejoinMsg.iNodeId)); @@ -577,7 +561,7 @@ @param aData provisioning pointer from message */ { - _LOG_L1C2(_L8("CRawIP2Flow %08x:\tProvisionConfig()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_PROVISIONCONFIG_1, "CRawIP2Flow %08x:\tProvisionConfig()", this); iProvisionError = KErrNone; AccessPointConfig().Close(); @@ -588,7 +572,7 @@ if (iBCAProvisionConfig == NULL) { - _LOG_L1C1(_L8("CRawIP2Flow:\tProvisionConfigL() - CBCAProvision config incomplete")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_PROVISIONCONFIG_2, "CRawIP2Flow:\tProvisionConfigL() - CBCAProvision config incomplete"); iProvisionError = KErrCorrupt; return; } @@ -610,7 +594,7 @@ const CIPConfig* wcdmaIpProvision = static_cast(AccessPointConfig().FindExtension(STypeId::CreateSTypeId(CIPConfig::EUid, CIPConfig::ETypeId))); if (wcdmaIpProvision == NULL) { - _LOG_L1C2(_L8("CRawIP2Flow %08x:\tDynamicProvisionConfigL() - WCDMA config incomplete"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOW_DYNAMICPROVISIONCONFIGL_1, "CRawIP2Flow %08x:\tDynamicProvisionConfigL() - WCDMA config incomplete", this); iProvisionError = KErrCorrupt; return; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/src/RawIP2FlowFactory.cpp --- a/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2FlowFactory.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2FlowFactory.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -19,9 +19,14 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "RawIP2FlowFactoryTraces.h" +#endif + #include "RawIP2FlowFactory.h" #include "RawIP2Flow.h" -#include "bttlog.h" using namespace ESock; @@ -58,14 +63,11 @@ CSubConnectionFlowBase* CRawIP2FlowFactory::DoCreateFlowL(ESock::CProtocolIntfBase* aProtocol, ESock::TFactoryQueryBase& aQuery) { -#ifdef __BTT_LOGGING__ - iTheLogger = CBttLogger::NewL(KNifSubDir, KRefFile, User::FastCounter()); -#endif // __BTT_LOGGING__ - _LOG_L1C1(_L8("Raw IP logging started.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIP2FLOWFACTORY_DOCREATEFLOWL_1, "Raw IP logging started."); const TDefaultFlowFactoryQuery& query = static_cast(aQuery); - CRawIP2Flow* s = new (ELeave) CRawIP2Flow(*this, query.iSCprId, aProtocol, iTheLogger); + CRawIP2Flow* s = new (ELeave) CRawIP2Flow(*this, query.iSCprId, aProtocol); CleanupStack::PushL(s); s->ConstructL(); CleanupStack::Pop(s); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/src/bttlog.cpp --- a/telephonyprotocols/rawipnif/rawipnif2/src/bttlog.cpp Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,221 +0,0 @@ -// Copyright (c) 2002-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Implements CBttLogger. -// -// - -/** - @file -*/ - -#include "bttlog.h" - -#ifdef __BTT_LOGGING__ - -#ifdef __DEBUGRAWIPSERIALPORT__ -#include -#endif - -//Enable this if you want time stamps for each log statements. -//This is computation ineffective and not recommended. -//#define __TIME_STAMP_ENABLED__ - -CBttLogger* CBttLogger::NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId) -/** - * Factory method for CBttLogger. - * - * @param aSubDir The subdirectory of c:\logs\gprsbtt to log to. - * @param aFileName The filename to log to. - * @return Ownership of a new CBttLogger. - */ - { - CBttLogger* self = new(ELeave) CBttLogger; - CleanupStack::PushL(self); - self->ConstructL(aTag, aFileName, aInstanceId); - CleanupStack::Pop(self); - return self; - } - -#ifdef __FLOG_ACTIVE -void CBttLogger::ConstructL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId) -#else -void CBttLogger::ConstructL(const TDesC8&, const TDesC8&, const TUint32 aInstanceId) -#endif -/** - * 2nd-phase construction. - * Hurricane/Typhoon - we can log to a particular directory - */ - { - iInstanceId = aInstanceId; - __FLOG_OPEN(aTag, aFileName); - } - -//#endif - -CBttLogger::CBttLogger() -/** - * Constructor - */ - { - } - -CBttLogger::~CBttLogger() -/** - * Destructor - */ - { - __FLOG_CLOSE; - } - -void CBttLogger::Write(const TDesC8& aText) -/** - * Write an 8-bit descriptor to the log file - * - * @param aText The test to write - */ - { - TBuf8 buf; - TLogIgnoreOverflow8 overflowHandler; - // put the instance id to identify which nif we are - // logging from - _LIT8(KInstanceFormat, "RawIp 0x%08X: "); - buf.Format(KInstanceFormat, &overflowHandler, iInstanceId); - -#ifdef __TIME_STAMP_ENABLED__ - // log to our own file in Hurricane/Typhoon - _LIT8(KTimeFormat, "%02d.%02d:%02d:%06d "); - - TTime now; - now.UniversalTime(); - TDateTime dateTime; - dateTime = now.DateTime(); - buf.AppendFormat(KTimeFormat, - &overflowHandler, - dateTime.Hour(), - dateTime.Minute(), - dateTime.Second(), - dateTime.MicroSecond()); -#endif - - buf.Append(aText); - -#ifdef __DEBUGRAWIPSERIALPORT__ - TBuf buf2; - // TEMP: Do not print single % since appear as format char to RDebug::Print - for (TInt i = 0; i < buf.Length(); i++) - { - if (buf[i] == '%') - buf2.Append(_L(".")); - else - buf2.Append(buf[i]); - } - RDebug::Print(buf2); -#else - __FLOG(buf); -#endif - } - -void CBttLogger::WriteFormat(TRefByValue aFmt, ...) -/** - * Write an 8-bit format list to the log file - */ - { - //coverity[var_decl]; - VA_LIST list; - VA_START(list, aFmt); - - // log to our own file in Hurricane/Typhoon - TBuf8 buf; - TLogIgnoreOverflow8 overflowHandler; - //coverity[uninit_use_in_call]; - buf.AppendFormatList(aFmt, list, &overflowHandler); - Write(buf); - } - -void CBttLogger::VerboseLeaveL(char* aFile, TInt aLine, TInt aReason) -/** - * Make a verbose leave - write name of file and line number to the log just - * before leaving. - * - * @param aFile The file we're leaving from. - * @param aLine The line number we're leaving from. - * @param aReason The leave code. - */ - { - // only leave if non-zero value - if ( aReason == KErrNone ) - { - return; - } - - _LIT8(KLeavePrefix, "LEAVE: " ); - - TPtrC8 fullFileName((const TUint8*)aFile); - TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1); - - TBuf8<256> buf; - TLogIgnoreOverflow8 overflowHandler; - buf.AppendFormat(_L8("%S aReason=%d [file %S, line %d]"), - &overflowHandler, - &KLeavePrefix, - aReason, - &fileName, - aLine); - Write(buf); - - __FLOG_CLOSE; - - // finally - User::Leave(aReason); - } - -void CBttLogger::VerbosePanic(char* aFile, - TInt aLine, - TInt aPanicCode, - TText8* aPanicName, - const TDesC& aPanicCategory) -/** - * Make a verbose panic - write name of file and line number to the - * log just before panicking. - * - * @param aFile The file that's panicking. - * @param aLine The line number that's panicking. - * @param aReason The panic code. - * @param aPanicName The text of the panic code. - * @param aPanicCategory The panic category. - */ - { - _LIT8(KLeavePrefix, "PANIC: " ); - - TPtrC8 fullFileName((const TUint8*)aFile); - TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1); - - TBuf8<256> buf; - TLogIgnoreOverflow8 overflowHandler; - buf.AppendFormat(_L8("%S %d = %s [file %S, line %d]"), - &overflowHandler, - &KLeavePrefix, - aPanicCode, - aPanicName, - &fileName, - aLine); - Write(buf); - - __FLOG_CLOSE; - - // finally - User::Panic(aPanicCategory, aPanicCode); - } - -#endif // __BTT_LOGGING__ diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/rawipnif/rawipnif2/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/rawipnif2/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/rawipnif/rawipnif2/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,122 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_CONSTRUCTL_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_DOCANCEL_1=0xc +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_DOCANCEL_2=0xd +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_DOCANCEL_3=0xe +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_DOCANCEL_4=0xf +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_PANIC_1=0x15 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_10=0xb +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_2=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_3=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_4=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_5=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_6=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_7=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_8=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_RUNL_9=0xa +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STARTLOADL_1=0x10 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STARTLOADL_2=0x11 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STARTLOADL_3=0x12 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STOP_1=0x13 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROLLER_STOP_2=0x14 +[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_BIND_1=0x17 +[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_ERROR_1=0x1a +[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_SETTYPE_1=0x16 +[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_STARTSENDING_1=0x19 +[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_UNBIND_1=0x18 +[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_ADDHEADER_1=0x1c +[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_REMOVEHEADER_1=0x1d +[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_SETTYPE_1=0x1b +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_CONTROL_1=0x1e +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_DELETECONTEXT_1=0x21 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_GETCONFIG_1=0x1f +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_GETCONFIG_2=0x20 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_1=0x36 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_10=0x3f +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_11=0x40 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_12=0x41 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_13=0x42 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_14=0x43 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_15=0x44 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_16=0x45 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_17=0x46 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_18=0x47 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_19=0x48 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_2=0x37 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_20=0x49 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_21=0x4a +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_22=0x4b +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_3=0x38 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_4=0x39 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_5=0x3a +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_6=0x3b +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_7=0x3c +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_8=0x3d +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_9=0x3e +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_NOTIFICATION_1=0x2e +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS1_1=0x31 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS1_2=0x32 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS1_3=0x33 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SEND1_1=0x2d +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SETPROVISION_1=0x34 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SETPROVISION_2=0x35 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_STARTSENDING_1=0x2f +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONNECTIONSPEED_1=0x2c +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_1=0x22 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_10=0x2b +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_2=0x23 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_3=0x24 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_4=0x25 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_5=0x26 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_6=0x27 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_7=0x28 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_8=0x29 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_9=0x2a +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_WANTSPROTOCOL_1=0x30 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_CONTROL_1=0x4c +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_DELETECONTEXT_1=0x4d +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_1=0x5f +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_2=0x60 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_3=0x61 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_4=0x62 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_5=0x63 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_6=0x64 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_7=0x65 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_8=0x66 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_9=0x67 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_NOTIFICATION_1=0x59 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS1_1=0x5c +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS1_2=0x5d +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS1_3=0x5e +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_SEND1_1=0x58 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_STARTSENDING_1=0x5a +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONNECTIONSPEED_1=0x57 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_1=0x4e +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_2=0x4f +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_3=0x50 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_4=0x51 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_5=0x52 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_6=0x53 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_7=0x54 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_8=0x55 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_9=0x56 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_WANTSPROTOCOL_1=0x5b +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOWFACTORY_DOCREATEFLOWL_1=0x78 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_CONSTRUCTL_1=0x68 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_DYNAMICPROVISIONCONFIGL_1=0x77 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_GETCONTROLL_1=0x71 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_GETCONTROLL_2=0x72 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_GETCONTROLL_3=0x73 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_INITIALISEL_1=0x6e +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_LINKLAYERDOWN_1=0x6c +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_LINKLAYERUP_1=0x6b +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_PROVISIONCONFIG_1=0x75 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_PROVISIONCONFIG_2=0x76 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_SHUTDOWN_1=0x6f +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_STARTFLOWL_1=0x69 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_STARTFLOWL_3=0x6a +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_STOPFLOW_1=0x6d +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_UNBIND_1=0x74 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIP2FLOW_UPDATECONTEXTSTATE_1=0x70 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/BcaController.cpp --- a/telephonyprotocols/rawipnif/src/BcaController.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/BcaController.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -19,6 +19,12 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "BcaControllerTraces.h" +#endif + #include #include #include @@ -42,7 +48,6 @@ * Constructor. */ : iObserver(aObserver), - iTheLogger(aTheLogger), iTxFlowControl(EFlowControlOff), iTxContextActive(ETrue), iSendState(EIdle), @@ -68,11 +73,13 @@ void CBcaController::BaseConstructL() { - _LOG_L1C1(_L8("CBcaController::BaseConstructL")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_BASECONSTRUCTL_1, "CBcaController::BaseConstructL"); -#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS - iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger); -#endif // RAWIP_HEADER_APPENDED_TO_PACKETS + #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS + iIPTagHeader = new (ELeave) CIPTagHeader(); + #endif // RAWIP_HEADER_APPENDED_TO_PACKETS + + iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger); #if defined (__EABI__) // Default value for queue length @@ -91,6 +98,7 @@ UserSvr::HalFunction(EHalGroupEmulator,EEmulatorHalIntProperty,(TAny*)"rawip_KMaxTxIPPacketSize",&iMaxTxPacketSize); UserSvr::HalFunction(EHalGroupEmulator,EEmulatorHalIntProperty,(TAny*)"rawip_KMaxRxIPPacketSize",&iMaxRxPacketSize); #endif + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_BASECONSTRUCTL_2, "RawIp ini file %S not found. Default values will be used.", KRawIpIniFile); } void CBcaController::UpdateInternalFlowFlag(TFlowControl aValue) @@ -101,13 +109,12 @@ * @param aValue the new state of iInternalFlow */ { - _LOG_L1C3(_L8("CBcaController::UpdateInternalFlowFlag[NewValue=%d, iSendState=%d]"), - aValue, iSendState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_UPDATEINTERNALFLOWFLAG_1, "CBcaController::UpdateInternalFlowFlag[NewValue=%d, iSendState=%d]",aValue, iSendState); if(iTxFlowControl == aValue) { // C32 Sent the same indication signal twice. Nif will ignore it. - _LOG_L2C1(_L8("WARNING CBcaController: Received same indication twice")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_UPDATEINTERNALFLOWFLAG_2, "WARNING CBcaController: Received same indication twice"); return; } @@ -139,8 +146,7 @@ * @param aValue the new state of iTxContextState */ { - _LOG_L1C3(_L8("CBcaController::UpdateContextStateFlag[NewValue=%d, OldValue=%d]"), - aValue, iTxContextActive); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_UPDATECONTEXTSTATEFLAG_1, "CBcaController::UpdateContextStateFlag[NewValue=%d, OldValue=%d]",aValue, iTxContextActive); if(iTxContextActive == aValue) { @@ -175,12 +181,12 @@ * @param aPdu a data packet */ { - _LOG_L1C1(_L8(">>CBcaController::Send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_1, ">>CBcaController::Send"); // Check if NIF is shutting down if (iSendState == EShuttingDown) { - _LOG_L2C1(_L8(" ERROR: Nif is shutting down")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_2, " ERROR: Nif is shutting down"); aPdu.Free(); @@ -191,8 +197,8 @@ // add it to our queue if ((aPdu.Length() - aPdu.First()->Length()) > BcaSendBufferLength()) { - _LOG_L2C1(_L8("Packet is too large - discarding")); - _LOG_L1C1(_L8("< Error")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_3, "Packet is too large - discarding"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_4, "< Error"); aPdu.Free(); return KErrArgument; @@ -206,14 +212,14 @@ // queue becomes full the IP layer shouldnt send any more packets until it is told to if (!IsSendQueueFull()) { - _LOG_L1C1(_L8(" Sender busy, appending packet to queue")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_5, " Sender busy, appending packet to queue"); //We know that flow control is off and context isnt suspended so can add to queue AppendToSendQueue(aPdu); return IsSendQueueFull() ? KStopSending : KContinueSending; } - _LOG_L1C1(_L8(" Queue is full, upper layer is still sending packets, potential memory problems.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_6, " Queue is full, upper layer is still sending packets, potential memory problems."); AppendToSendQueue(aPdu); return KStopSending; } @@ -227,12 +233,12 @@ //make sure that we don't change the order of packets! //first send what has already been lined up RMBufChain tmpPdu; - _LOG_L1C1(_L8(" Packet removed from queue to send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_7, " Packet removed from queue to send"); RemoveFromSendQueue(tmpPdu); AppendToSendQueue(aPdu); // Update module state - _LOG_L2C1(_L8(" set State to ESending")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_8, " set State to ESending"); iSendState = ESending; BcaSend(tmpPdu); @@ -240,13 +246,13 @@ else { // Update module state - _LOG_L2C1(_L8(" set State to ESending")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_9, " set State to ESending"); iSendState = ESending; BcaSend(aPdu); } - _LOG_L2C1(_L8("<>CBcaController::Process")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_PROCESS_1, ">>CBcaController::Process"); TInt ret; @@ -299,7 +304,7 @@ if (ret != KErrNone) { // Couldn't create package. Packet will be ignored... - _LOG_L1C2(_L8("<SetType(aType); } @@ -368,7 +373,7 @@ * Used to add the IP header to the packet before sending to the BCA. */ { - _LOG_L1C1(_L8("CBcaController::AddHeader")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_ADDHEADER_1, "CBcaController::AddHeader"); iIPTagHeader->AddHeader(aDes); } @@ -380,7 +385,7 @@ * @return The IP header that has been removed from the packet */ { - _LOG_L1C1(_L8("CBcaController::RemoveHeader")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_REMOVEHEADER_1, "CBcaController::RemoveHeader"); return (iIPTagHeader->RemoveHeader(aPdu)); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/BcaIoController.cpp --- a/telephonyprotocols/rawipnif/src/BcaIoController.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/BcaIoController.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -19,6 +19,12 @@ @file BcaIoController.cpp */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "BcaIoControllerTraces.h" +#endif + #include #include #include @@ -38,16 +44,13 @@ extern const TInt KMaxRxIPPacketSize = KMaxIPPacket + KIPTagHeaderLength; #endif -CBcaIoController::CBcaIoController(MControllerObserver& aObserver, - CBttLogger* aTheLogger) +CBcaIoController::CBcaIoController(MControllerObserver& aObserver) /** * Constructor. * * @param aObserver Reference to the observer of this state machine - * @param aTheLogger The logging object */ - : iTheLogger(aTheLogger), - iSendState(EIdle), + : iSendState(EIdle), iFlowBlocked(EFalse), iNumPacketsInSendQueue(0), iObserver(aObserver), @@ -58,29 +61,28 @@ { } -CBcaIoController* CBcaIoController::NewL(MControllerObserver& aObserver, CBttLogger* aTheLogger) +CBcaIoController* CBcaIoController::NewL(MControllerObserver& aObserver) /** * Two-phase constructor. Creates a new CBcaIoController object, performs * second-phase construction, then returns it. * * @param aObserver The observer, to which events will be reported - * @param aTheLogger The logging object * @return A newly constructed CBcaIoController object */ - { - CBcaIoController* self = new (ELeave) CBcaIoController(aObserver, aTheLogger); - CleanupStack::PushL(self); - self->ConstructL(); - CleanupStack::Pop(self); - return self; - } + { + CBcaIoController* self = new (ELeave) CBcaIoController(aObserver); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } void CBcaIoController::ConstructL() /** * Second-phase constructor. Creates all the state objects it owns. */ { - _LOG_L1C1(_L8("CBcaIoController::ConstructL")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_CONSTRUCTL_1, "CBcaIoController::ConstructL"); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS iIPTagHeader = new (ELeave) CIPTagHeader(iTheLogger); @@ -106,10 +108,11 @@ // end note - iSender = CSender::NewL(*this, iTheLogger, iMaxTxPacketSize); - iReceiver = CReceiver::NewL(*this, iTheLogger, iMaxRxPacketSize); - iLoader = new (ELeave) CBcaControl(*this, iTheLogger); + iSender = CSender::NewL(*this, iMaxTxPacketSize); + iReceiver = CReceiver::NewL(*this, iMaxRxPacketSize); + iLoader = new (ELeave) CBcaControl(*this); } + CBcaIoController::~CBcaIoController() @@ -145,7 +148,7 @@ * Used to kick off the initialisation for this module */ { - _LOG_L1C1(_L8("CBcaIoController::StartL is called.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_STARTL_1, "CBcaIoController::StartL is called."); iLoader->StartLoadL(); } @@ -157,7 +160,7 @@ * @param aError the passed in error code as to why Stop has been called */ { - _LOG_L1C1(_L8("CBcaIoController::Stop is called.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_STOP_1, "CBcaIoController::Stop is called."); //Stop all the active objects iReceiver->Cancel(); @@ -182,12 +185,12 @@ * @param aPdu a data packet */ { - _LOG_L1C1(_L8(">>CBcaIoController::Send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_1, "<Length()) > iMaxTxPacketSize) { - _LOG_L2C1(_L8("Packet is too large - discarding")); - _LOG_L1C1(_L8("< Error")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_3, "Packet is too large - discarding"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_4, "< Error"); // in debug panic - this should not happen, MTU on the uplink should // be strictly enforced @@ -212,7 +215,7 @@ // may be counter intuitive, however the only options here are either // send accepted or blocked (MLowerDataSender). - _LOG_L2C1(_L8("<Send(aPdu); @@ -275,7 +278,7 @@ // otherwise, block this flow until we have room for the next // packet - _LOG_L2C1(_L8("<>CBcaIoController::SendComplete")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SENDCOMPLETE_1, ">>CBcaIoController::SendComplete"); // if we've been blocked while in the middle of a // send - don't continue sending, this will happen // when the flow is resumed. - + iSendState = EIdle; // are we available to transmit? @@ -321,11 +324,11 @@ iSendState = ESending; RMBufChain tmpPdu; - _LOG_L1C1(_L8(" Packet removed from queue to send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SENDCOMPLETE_2, " Packet removed from queue to send"); RemoveFromSendQueue(tmpPdu); // Update module state - _LOG_L2C1(_L8(" set State to ESending")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SENDCOMPLETE_3, " set State to ESending"); iSender->Send(tmpPdu); @@ -340,7 +343,7 @@ } } - _LOG_L1C1(_L8("<>CBcaIoController::ResumeSending")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_RESUMESENDING_1, ">>CBcaIoController::ResumeSending"); // allows for normal SendComplete behaviour if there is // a packet outstanding with BCA @@ -378,11 +381,11 @@ if ((resumeSending) || (!IsSendQueueEmpty())) { RMBufChain tmpPdu; - _LOG_L1C1(_L8(" Packet removed from queue to send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_RESUMESENDING_2, " Packet removed from queue to send"); RemoveFromSendQueue(tmpPdu); // Update module state - _LOG_L2C1(_L8(" set State to ESending")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_RESUMESENDING_3, " set State to ESending"); iSendState = ESending; iSender->Send(tmpPdu); @@ -398,7 +401,7 @@ } } - _LOG_L1C1(_L8("<SetType(aType); } @@ -417,7 +420,7 @@ * Used to add the IP header to the packet before sending to the BCA. */ { - _LOG_L1C1(_L8("CBcaController::AddHeader")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_ADDHEADER_1, "CBcaController::AddHeader"); iIPTagHeader->AddHeader(aDes); } @@ -429,23 +432,21 @@ * @return The IP header that has been removed from the packet */ { - _LOG_L1C1(_L8("CBcaController::RemoveHeader")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_REMOVEHEADER_1, "CBcaController::RemoveHeader"); return (iIPTagHeader->RemoveHeader(aPdu)); } #endif // RAWIP_HEADER_APPENDED_TO_PACKETS -CBcaControl::CBcaControl(CBcaIoController& aObserver, CBttLogger* aTheLogger) +CBcaControl::CBcaControl(CBcaIoController& aObserver) /** * Constructor. Performs standard active object initialisation. * * @param aObserver Reference to the observer of this state machine - * @param aTheLogger The logging object */ : CActive(EPriorityStandard), iObserver(aObserver), - iTheLogger(aTheLogger), iMBca(NULL), iState(EIdling), iError(KErrNone) @@ -479,7 +480,7 @@ * */ { - _LOG_L1C1(_L8("CBcaControl::RunL() called")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_1, "CBcaControl::RunL() called"); switch (iState) { //in this state, Ioctl is called to set IAP ID, check the result of @@ -491,11 +492,11 @@ { if(iStatus == KErrNotSupported) { - _LOG_L1C1(_L8("This BCA does not support IAPID set")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_2, "This BCA does not support IAPID set"); } else { - _LOG_L2C1(_L8("This BCA supports IAPID set")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_3, "This BCA supports IAPID set"); } TPtrC bcaStack = iObserver.BcaStack(); @@ -515,7 +516,7 @@ } else { - _LOG_L1C2(_L8("ERROR in BCA IAPID set = %d"), iStatus.Int()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_4, "ERROR in BCA IAPID set = %d", iStatus.Int()); iObserver.Stop(iStatus.Int()); } @@ -530,11 +531,11 @@ { if(iStatus == KErrNotSupported) { - _LOG_L1C1(_L8("This BCA does not support BCA stacking")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_5, "This BCA does not support BCA stacking"); } else { - _LOG_L2C1(_L8("This BCA supports BCA stacking")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_6, "This BCA supports BCA stacking"); } iMBca->Open(iStatus, iObserver.Port()); iState = EBcaStackSet; @@ -542,7 +543,7 @@ } else { - _LOG_L2C2(_L8("ERROR in BCA stack set = %d"), iStatus.Int()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_7, "ERROR in BCA stack set = %d", iStatus.Int()); iObserver.Stop(iStatus.Int()); } break; @@ -554,7 +555,7 @@ { if(iStatus != KErrNone && iStatus != KErrAlreadyExists) { - _LOG_L2C2(_L8("ERROR in BCA Open = %d"), iStatus.Int()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_8, "ERROR in BCA Open = %d", iStatus.Int()); iObserver.Stop(iStatus.Int()); } else @@ -562,11 +563,11 @@ iState = EBcaOpened; //Activate the receiver Active Object iObserver.Receiver().StartListening(); - _LOG_L1C1(_L8("CBcaIoController Is Initialised")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_9, "CBcaIoController Is Initialised"); TRAPD(err, iObserver.GetObserver().InitialiseL(MRawIPObserverBase::EBcaController,KErrNone)); if(err != KErrNone) { - _LOG_L2C2(_L8("ERROR in BCA Open Initialise observer = %d"), err); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_10, "ERROR in BCA Open Initialise observer = %d", err); iObserver.Stop(err); } } @@ -584,8 +585,9 @@ // Wrong state. default: { - _LOG_L1C1(_L8("ERROR CBcaControl::RunL(): Unknown state")); - _BTT_PANIC(KNifName, KBcaUnkownState); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_11, "ERROR CBcaControl::RunL(): Unknown state"); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_RUNL_12, "PANIC: %S %d", KNifName, KBcaUnkownState); + User::Panic(KNifName, KBcaUnkownState); break; } } @@ -597,8 +599,8 @@ * cancel active request. */ { - _LOG_L1C1(_L8("CBcaControl::DoCancel called.")); - _LOG_L2C2(_L8("iState value is %d"), iState); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_DOCANCEL_1, "CBcaControl::DoCancel called."); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_DOCANCEL_2, "iState value is %d", iState); switch (iState) { case EIdling: @@ -614,8 +616,9 @@ iState = EIdling; break; default: - _LOG_L2C1(_L8("ERROR CBcaControl::DoCancel(): Unknown state")); - _BTT_PANIC(KNifName, KBcaUnkownState); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_DOCANCEL_3, "ERROR CBcaControl::DoCancel(): Unknown state"); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_DOCANCEL_4, "PANIC: %S %d", KNifName, KBcaUnkownState); + User::Panic(KNifName, KBcaUnkownState); break; } } @@ -625,7 +628,7 @@ * This method loads the C32BCA library and uses Ioctl to set the Bca iIapId. */ { - _LOG_L1C1(_L8("CBcaControl::StartLoad")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_STARTLOADL_1, "CBcaControl::StartLoad"); //iMBca should not be initialized at this point __ASSERT_DEBUG(!iMBca,Panic(KBcaAlreadyExists)); @@ -647,7 +650,7 @@ TNewBcaFactoryL newBcaFactoryProcL = (TNewBcaFactoryL)iBcaDll.iObj.Lookup(1); if (NULL == newBcaFactoryProcL) { - _LOG_L1C2(_L8("Library entry point found error %d"), KErrBadLibraryEntryPoint); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_STARTLOADL_2, "Library entry point found error %d", KErrBadLibraryEntryPoint); User::Leave(KErrBadLibraryEntryPoint); } @@ -655,7 +658,7 @@ if(!bcaFactory) { - _LOG_L1C2(_L8("BcaFactory creation error %d"), KErrCompletion); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_STARTLOADL_3, "BcaFactory creation error %d", KErrCompletion); User::Leave(KErrCompletion); } CleanupReleasePushL(*bcaFactory); @@ -688,7 +691,7 @@ { if(aError == KErrConnectionTerminated ) { - _LOG_L1C1(_L8("This is an emergency shutdown, it kills the NIF immediately.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_SHUTDOWNBCA_1, "This is an emergency shutdown, it kills the NIF immediately."); // It is a emergency shutdown, it kills the NIF immediately. iMBca->Close(); iState = EIdling; @@ -696,7 +699,7 @@ } else { - _LOG_L1C1(_L8("This is a graceful termination which takes a while.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_SHUTDOWNBCA_2, "This is a graceful termination which takes a while."); //It is a graceful termination which takes a while. iError = aError; iState = EClosing; @@ -706,7 +709,7 @@ } else //nothing to shutdown, just notify linklayer down. { - _LOG_L1C1(_L8("Bca is not initialized or opened, bring the linklayer down")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROL_SHUTDOWNBCA_3, "Bca is not initialized or opened, bring the linklayer down"); iState = EIdling; iObserver.GetObserver().ShutDown(MControllerObserver::EBcaController, aError); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/BinderBase.cpp --- a/telephonyprotocols/rawipnif/src/BinderBase.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/BinderBase.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -19,20 +19,25 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "BinderBaseTraces.h" +#endif + #include #include "BinderBase.h" #include "RawIPFlow.h" using namespace ESock; -CBinderBase::CBinderBase(CRawIPFlow& aFlow, CBttLogger* aTheLogger) +CBinderBase::CBinderBase(CRawIPFlow& aFlow) /** * Constructor * * @param aNifMain A pointer to CRawIPFlow */ - :iFlow(&aFlow), - iTheLogger(aTheLogger) + :iFlow(&aFlow) { } @@ -63,7 +68,7 @@ * @param aUpperControl A pointer to Upper layer control class */ { - _LOG_L1C1(_L8("CBinderBase:\tBind()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_BIND_1, "CBinderBase:\tBind()"); iUpperReceiver = aUpperReceiver; iUpperControl = aUpperControl; @@ -72,7 +77,7 @@ void CBinderBase::Unbind(MUpperDataReceiver* aUpperReceiver, MUpperControl* aUpperControl) { - _LOG_L1C1(_L8("CBinderBase:\tUnbind()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_UNBIND_1, "CBinderBase:\tUnbind()"); #ifndef _DEBUG (void) aUpperReceiver; @@ -92,7 +97,7 @@ * @param aProtocol A pointer to a protocol */ { - _LOG_L1C1(_L8("CBinderBase:\tStartSending()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBINDERBASE_STARTSENDING_1, "CBinderBase:\tStartSending()"); // Default implementation. // Uses iProtocol instead aProtocol. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/IPTagHeader.cpp --- a/telephonyprotocols/rawipnif/src/IPTagHeader.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/IPTagHeader.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -21,14 +21,19 @@ #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "IPTagHeaderTraces.h" +#endif + #include "IPTagHeader.h" #include "Constants.h" /** Default constructor. */ -CIPTagHeader::CIPTagHeader(CBttLogger* aTheLogger) - : iTheLogger(aTheLogger) +CIPTagHeader::CIPTagHeader() { iHeaderByte.SetMax(); iHeaderByte.FillZ(); @@ -48,7 +53,7 @@ */ void CIPTagHeader::SetType(TUint16 aType) { - _LOG_L1C1(_L8("CIPTagHeader::SetType")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_SETTYPE_1, "CIPTagHeader::SetType"); iHeaderByte[0] = (TUint8)(aType>>8); iHeaderByte[1] = (TUint8)(aType&0xff); @@ -63,7 +68,7 @@ */ void CIPTagHeader::AddHeader(TDes8& aDes) { - _LOG_L1C1(_L8("CIPTagHeader::AddHeader")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_ADDHEADER_1, "CIPTagHeader::AddHeader"); // Add the protocol code as a header to the buffer aDes.Insert(0,iHeaderByte); @@ -79,7 +84,7 @@ */ TUint16 CIPTagHeader::RemoveHeader(RMBufChain& aPdu) { - _LOG_L1C1(_L8("CIPTagHeader::RemoveHeader")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPTAGHEADER_REMOVEHEADER_1, "CIPTagHeader::RemoveHeader"); if (aPdu.Length() > KIPTagHeaderLength) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/IPv4Binder.cpp --- a/telephonyprotocols/rawipnif/src/IPv4Binder.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/IPv4Binder.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -20,6 +20,12 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "IPv4BinderTraces.h" +#endif + #include #include #include "RawIPFlow.h" @@ -32,8 +38,6 @@ #include #endif -#define LOG_IP_ADDRESS(desc,addr) _LOG_L1C5(_L8(" " desc " = %d.%d.%d.%d"), \ - addr >> 24, (addr >> 16) & 0xFF, (addr >> 8) & 0xFF, addr & 0xFF); #ifdef __EABI__ // Patch data is used and KMtuIPv4 and KRMtuIPv4 can be modified to a different value in RawIpNif.iby file @@ -41,11 +45,11 @@ extern const TInt KRMtuIPv4 = KDefaultMtu; #endif -CIPv4Binder::CIPv4Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger) +CIPv4Binder::CIPv4Binder(CRawIPFlow& aFlow) /** * Constructor */ - : CBinderBase(aFlow,aTheLogger), + : CBinderBase(aFlow), iSpeedMetric(KDefaultSpeedMetric) { } @@ -81,8 +85,7 @@ * @return Standard error codes */ { - _LOG_L1C3(_L8("CIPv4Binder::Control [aLevel=%d, aName=%d]"), - aLevel, aName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_CONTROL_1, "CIPv4Binder::Control [aLevel=%d, aName=%d]",aLevel, aName); if (aLevel == KSOLInterface) { @@ -159,7 +162,7 @@ TInt CIPv4Binder::GetConfig(TBinderConfig& aConfig) { - _LOG_L1C1(_L8("CIPv4Binder::GetConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_GETCONFIG_1, "CIPv4Binder::GetConfig"); TBinderConfig4* config = TBinderConfig::Cast(aConfig); @@ -189,8 +192,8 @@ config->iInfo.iSpeedMetric = iSpeedMetric; /* approximation of the interface speed in Kbps. */ - LOG_IP_ADDRESS("Local IP address from TBinderConfig", iSettings.iLocalAddr); - + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_GETCONFIG_2, "Local IP address from TBinderConfig = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF); + config->iAddress.SetAddress(iSettings.iLocalAddr); /* Interface IP address. */ config->iNetMask.SetAddress(iSettings.iNetMask); /* IP netmask. */ config->iBrdAddr.SetAddress(iSettings.iBroadcastAddr); /* IP broadcast address. */ @@ -211,7 +214,7 @@ * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone */ { - _LOG_L1C1(_L8("CIPv4Binder::DeleteContext")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_DELETECONTEXT_1, "CIPv4Binder::DeleteContext"); if (aContextParameters.Length() != sizeof(TContextParameters)) { @@ -244,7 +247,7 @@ */ void CIPv4Binder::UpdateContextConfigL(const TPacketDataConfigBase& aConfig) { - _LOG_L1C1(_L8("CIPv4Binder::UpdateContextConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_1, "CIPv4Binder::UpdateContextConfig"); // Get our IP address from the GPRS context config. TInetAddr address; @@ -270,14 +273,13 @@ if (ret == KErrNone) { iSettings.iLocalAddr = address.Address(); - LOG_IP_ADDRESS("Got local IP address from context", iSettings.iLocalAddr); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_2, "Got local IP address from context = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF); iSettings.iDefGateway = address.Address(); - _LOG_L1C1(_L8("Set Default Gateway to local IP address")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_3, "Set Default Gateway to local IP address"); } else { - _LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_4, "Couldn't get IP address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -299,12 +301,11 @@ if (ret == KErrNone) { iSettings.iPrimaryDns = address.Address(); - LOG_IP_ADDRESS("Got primary DNS from context PCO", iSettings.iPrimaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_5, "Got primary DNS from context PCO = %u.%u.%u.%u",iSettings.iPrimaryDns >> 24, (iSettings.iPrimaryDns >> 16) & 0xFF, (iSettings.iPrimaryDns >> 8) & 0xFF, iSettings.iPrimaryDns & 0xFF); } else { - _LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_6, "Couldn't get primary DNS address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -316,12 +317,11 @@ if (ret == KErrNone) { iSettings.iSecondaryDns = address.Address(); - LOG_IP_ADDRESS("Got secondary DNS from context PCO", iSettings.iPrimaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_7, "Got secondary DNS from context PCO = %u.%u.%u.%u",iSettings.iSecondaryDns >> 24, (iSettings.iSecondaryDns >> 16) & 0xFF, (iSettings.iSecondaryDns >> 8) & 0xFF, iSettings.iSecondaryDns); } else { - _LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_8, "Couldn't get secondary DNS address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -329,8 +329,8 @@ } else { - LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns); - LOG_IP_ADDRESS(" - Secondary ", iSettings.iSecondaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_9, "Using CommDB DNS address - Primary = %u.%u.%u.%u",iSettings.iPrimaryDns >> 24, (iSettings.iPrimaryDns >> 16) & 0xFF, (iSettings.iPrimaryDns >> 8) & 0xFF, iSettings.iPrimaryDns & 0xFF); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_10, " - Secondary = %u.%u.%u.%u",iSettings.iSecondaryDns >> 24, (iSettings.iSecondaryDns >> 16) & 0xFF, (iSettings.iSecondaryDns >> 8) & 0xFF, iSettings.iSecondaryDns); } @@ -352,8 +352,7 @@ } else { - _LOG_L2C2(_L8("Couldn't get default gateway from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONTEXTCONFIGL_4, "Couldn't get default gateway from GPRS config (err: %d)",ret); } }*/ } @@ -365,7 +364,7 @@ * @param aConnectionSpeed Our connection speed */ { - _LOG_L1C1(_L8("CIPv4Binder::UpdateConnectionSpeed")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_UPDATECONNECTIONSPEED_1, "CIPv4Binder::UpdateConnectionSpeed"); iSpeedMetric = aConnectionSpeed; } @@ -379,7 +378,7 @@ * @return MLowerDataSender::ESendBlocked or ESendAccepted based on state of flow. */ { - _LOG_L1C1(_L8("CIPv4Binder::Send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SEND_1, "CIPv4Binder::Send"); #ifdef __BTT_LOGGING__ LogPacket(aPdu); @@ -400,7 +399,7 @@ * @param aInfo Not used */ { - _LOG_L1C1(_L8("CIPv4Binder::Notification")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_NOTIFICATION_1, "CIPv4Binder::Notification"); return KErrNone; } @@ -412,7 +411,7 @@ * @param aProtocol A pointer to a protocol */ { - _LOG_L1C1(_L8("CIPv4Binder::StartSending()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_STARTSENDING_1, "CIPv4Binder::StartSending()"); CBinderBase::StartSending(); } @@ -424,8 +423,7 @@ * @param aProtocolCode The protocol type */ { - _LOG_L1C2(_L8("CIPv4Binder::WantsProtocol [aProtocolCode=%X]"), - aProtocolCode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_WANTSPROTOCOL_1, "CIPv4Binder::WantsProtocol [aProtocolCode=%X]",aProtocolCode); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS return ((aProtocolCode & 0x00FF) == KIp4FrameType); @@ -443,7 +441,7 @@ * @param aPdu The incoming packet */ { - _LOG_L1C1(_L8("CIPv4Binder::Process")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS_1, "CIPv4Binder::Process"); #ifdef __BTT_LOGGING__ LogPacket(aPdu); @@ -453,12 +451,12 @@ // been bound yet. if (iUpperReceiver) // ASSERT(iUpperReceiver) ? { - _LOG_L1C1(_L8("CIPv4Binder: Packet Sent to TCP/IP Protocol!!!")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS_2, "CIPv4Binder: Packet Sent to TCP/IP Protocol!!!"); iUpperReceiver->Process(aPdu); } else { - _LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_PROCESS_3, "WARNING: dumping incoming packet, no protocol bound"); aPdu.Free(); } } @@ -488,7 +486,7 @@ @param aProvision Provisioning structure from Control side. */ { - _LOG_L1C1(_L8("CIPv4Binder::SetProvision")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SETPROVISION_1, "CIPv4Binder::SetProvision"); iSettings.iLocalAddr = aProvision.GetIpAddress(); iSettings.iNetMask = aProvision.GetIpNetMask(); @@ -499,7 +497,7 @@ iSettings.iGetGatewayFromServer = aProvision.GetIpAddrFromServer(); iSettings.iGetDnsFromServer = aProvision.GetIp4DNSAddrFromServer(); - LOG_IP_ADDRESS("Local IP address from Provisioning", iSettings.iLocalAddr); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_SETPROVISION_2, "Local IP address from Provisioning = %u.%u.%u.%u",iSettings.iLocalAddr >> 24, (iSettings.iLocalAddr >> 16) & 0xFF, (iSettings.iLocalAddr >> 8) & 0xFF, iSettings.iLocalAddr & 0xFF); } #ifdef __BTT_LOGGING__ @@ -510,19 +508,18 @@ * @param aPacket The packet */ { - _LOG_L1C1(_L8("CIPv4Binder::LogPacket")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_1, "CIPv4Binder::LogPacket"); TInt mBufLength = aPacket.Length() - aPacket.First()->Length(); - _LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_2, "Analysis of %d byte packet:", mBufLength); //Note: All the constants used on this method are a pragmatic guess of the //IP header fields. The only porpose of this method is logging. if (mBufLength < 20) { - _LOG_L3C2(_L8(" -doesn't appear to be a valid IPv4 packet (length=%d)") - , mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_3, " -doesn't appear to be a valid IPv4 packet (length=%d)", mBufLength); return; } @@ -531,39 +528,34 @@ if ((payloadPtr[0] & 0xF0) != 0x40) { - _LOG_L3C2(_L8(" - doesn't appear to be an IPv4 packet (version=0x%X)"), - (payloadPtr[0] & 0xF0) >> 4); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_4, " - doesn't appear to be an IPv4 packet (version=0x%X)",(payloadPtr[0] & 0xF0) >> 4); return; } if ((payloadPtr[0] & 0xF) != 0x5) { - _LOG_L3C2(_L8(" - doesn't have a standard IP header (length=0x%X)"), - payloadPtr[0] & 0xF); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_5, " - doesn't have a standard IP header (length=0x%X)",payloadPtr[0] & 0xF); return; } - _LOG_L3C5(_L8(" - src addr: %d.%d.%d.%d"), payloadPtr[12], payloadPtr[13], - payloadPtr[14], payloadPtr[15]); - _LOG_L3C5(_L8(" - dst addr: %d.%d.%d.%d"), payloadPtr[16], payloadPtr[17], - payloadPtr[18], payloadPtr[19]); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_6, " - src addr: %d.%d.%d.%d", payloadPtr[12], payloadPtr[13],payloadPtr[14], payloadPtr[15]); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_7, " - dst addr: %d.%d.%d.%d", payloadPtr[16], payloadPtr[17],payloadPtr[18], payloadPtr[19]); if (payloadPtr[9] == 0x06) { - _LOG_L3C1(_L8(" - appears to be a TCP packet")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_8, " - appears to be a TCP packet"); if (mBufLength < 40) { - _LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_9, " - but is too short (length=0x%X)", mBufLength); return; } - _LOG_L3C3(_L8(" - src port: %d, dst port: %d"), - (payloadPtr[20] << 8) + payloadPtr[21], - (payloadPtr[22] << 8) + payloadPtr[23]); - _LOG_L3C3(_L8(" - seq #: 0x%08X, ack #: 0x%08X"), - (payloadPtr[24] << 24) + (payloadPtr[25] << 16) + - (payloadPtr[26] << 8) + payloadPtr[27], - (payloadPtr[28] << 24) + (payloadPtr[29] << 16) + - (payloadPtr[30] << 8) + payloadPtr[31]); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_10, " - src port: %d, dst port: %d",(payloadPtr[20] << 8) + payloadPtr[21],(payloadPtr[22] << 8) + payloadPtr[23]); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_11, " - seq #: 0x%08X, ack #: 0x%08X", + (payloadPtr[24] << 24) + (payloadPtr[25] << 16) + + (payloadPtr[26] << 8) + payloadPtr[27], + (payloadPtr[28] << 24) + (payloadPtr[29] << 16) + + (payloadPtr[30] << 8) + payloadPtr[31]); + TBuf8<100> flagsSet; flagsSet.Copy(_L8(" - flags set: ")); @@ -593,7 +585,7 @@ { flagsSet.Append(_L8("URG ")); } - _LOG_L3C1(flagsSet); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_12, "%s", flagsSet); TInt dataOffset = payloadPtr[32] >> 2; // in bytes if ((dataOffset > 0) && (mBufLength > dataOffset + 30)) @@ -616,55 +608,50 @@ data.Append(TChar('?')); } } - _LOG_L3C1(data); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_13, "%s", data); } } else if (payloadPtr[9] == 0x01) { - _LOG_L3C1(_L8(" - appears to be an ICMP packet")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_14, " - appears to be an ICMP packet"); if (mBufLength < 24) { - _LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_15, " - but is too short (length=0x%X)", mBufLength); return; } if (payloadPtr[20] == 0x8) { - _LOG_L3C1(_L8(" - is an echo request")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_16, " - is an echo request"); } else if (payloadPtr[20] == 0x0) { - _LOG_L3C1(_L8(" - is an echo reply")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_17, " - is an echo reply"); } else { - _LOG_L3C2(_L8(" - unknown type (0x%02X)"), payloadPtr[20]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_18, " - unknown type (0x%02X)", payloadPtr[20]); return; } if (mBufLength >= 28) { - _LOG_L3C3(_L8(" - ID: 0x%04X, seq #: 0x%04X"), - (payloadPtr[24] << 8) + payloadPtr[25], - (payloadPtr[26] << 8) + payloadPtr[27]); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_19, " - ID: 0x%04X, seq #: 0x%04X",(payloadPtr[24] << 8) + payloadPtr[25],(payloadPtr[26] << 8) + payloadPtr[27]); } } else if (payloadPtr[9] == 0x11) { - _LOG_L3C1(_L8(" - appears to be a UDP packet")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_20, " - appears to be a UDP packet"); if (mBufLength < 28) { - _LOG_L3C2(_L8(" - but is too short (length=0x%X)"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_21, " - but is too short (length=0x%X)", mBufLength); return; } - _LOG_L3C3(_L8(" - src port: %d, dst port: %d"), - (payloadPtr[20] << 8) + payloadPtr[21], - (payloadPtr[22] << 8) + payloadPtr[23]); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_22, " - src port: %d, dst port: %d",(payloadPtr[20] << 8) + payloadPtr[21],(payloadPtr[22] << 8) + payloadPtr[23]); } else { - _LOG_L3C2(_L8(" - appears to be for an unknown protocol (0x%X)"), - payloadPtr[9]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV4BINDER_LOGPACKET_23, " - appears to be for an unknown protocol (0x%X)",payloadPtr[9]); } } #endif // __BTT_LOGGING__ diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/IPv6Binder.cpp --- a/telephonyprotocols/rawipnif/src/IPv6Binder.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/IPv6Binder.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -20,6 +20,12 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "IPv6BinderTraces.h" +#endif + #include #include #include "RawIPFlow.h" @@ -33,8 +39,6 @@ #include #endif -#define LOG_IP_ADDRESS(desc,addr) _LOG_L2C5(_L8(" " desc " = %d:%d:%d:%d from context"), \ - addr.u.iAddr32[3], addr.u.iAddr32[2], addr.u.iAddr32[1], addr.u.iAddr32[0]); #ifdef __EABI__ // Patch data is used and KMtuIPv6 and KRMtuIPv6 can be modified to a different value in RawIpNif.iby file @@ -42,12 +46,11 @@ extern const TInt KRMtuIPv6 = KDefaultMtu; #endif -CIPv6Binder::CIPv6Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger) +CIPv6Binder::CIPv6Binder(CRawIPFlow& aFlow) /** * Constructor */ - : CBinderBase(aFlow,aTheLogger), - iTheLogger(aTheLogger), + : CBinderBase(aFlow), iSpeedMetric(KDefaultSpeedMetric) { } @@ -83,8 +86,7 @@ * @return Standard error codes */ { - _LOG_L1C3(_L8("CIPv6Binder::Control [aLevel=%d, aName=%d]"), - aLevel, aName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_CONTROL_1, "CIPv6Binder::Control [aLevel=%u, aName=%u]",aLevel, aName); if (aLevel == KSOLInterface) { @@ -205,7 +207,7 @@ * @return KErrArgument if an incorrect structure is passed, otherwise KErrNone */ { - _LOG_L1C1(_L8("CIPv6Binder::DeleteContext")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_DELETECONTEXT_1, "CIPv6Binder::DeleteContext"); if (aContextParameters.Length() != sizeof(TContextParameters)) { @@ -239,7 +241,7 @@ */ void CIPv6Binder::UpdateContextConfigL(const TPacketDataConfigBase& aConfig) { - _LOG_L1C1(_L8("CIPv6Binder::UpdateContextConfig")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_1, "CIPv6Binder::UpdateContextConfig"); // Get our IP address from the GPRS context config. TInetAddr address; @@ -268,12 +270,11 @@ iSettings.iLocalIfId.SetAddr(addrTable, 8); - LOG_IP_ADDRESS("Got local IP address", address.Ip6Address()); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_2, "Got local IP address = %u:%u:%u:%u from context", address.Ip6Address().u.iAddr32[3], address.Ip6Address().u.iAddr32[2], address.Ip6Address().u.iAddr32[1], address.Ip6Address().u.iAddr32[0]); } else { - _LOG_L2C2(_L8("Couldn't get IP address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_3, "Couldn't get IP address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -295,12 +296,11 @@ if (ret == KErrNone) { iSettings.iPrimaryDns = address.Ip6Address(); - LOG_IP_ADDRESS("Got primary DNS", iSettings.iPrimaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_4, "Got primary DNS = %u:%u:%u:%u from context", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]); } else { - _LOG_L2C2(_L8("Couldn't get primary DNS address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_5, "Couldn't get primary DNS address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -312,12 +312,11 @@ if (ret == KErrNone) { iSettings.iSecondaryDns = address.Ip6Address(); - LOG_IP_ADDRESS("Got secondary DNS", iSettings.iPrimaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_6, "Got secondary DNS = %u:%u:%u:%u from context", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]); } else { - _LOG_L2C2(_L8("Couldn't get secondary DNS address from GPRS config (err: %d)"), - ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_7, "Couldn't get secondary DNS address from GPRS config (err: %d)",ret); // Don't leave on this error: we may still be OK if we read some // settings from CommDB. @@ -325,8 +324,8 @@ } else { - LOG_IP_ADDRESS("Using CommDB DNS address - Primary ", iSettings.iPrimaryDns); - LOG_IP_ADDRESS(" - Secondary ", iSettings.iSecondaryDns); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_8, "Using CommDB DNS address - Primary = %u:%u:%u:%u", iSettings.iPrimaryDns.u.iAddr32[3], iSettings.iPrimaryDns.u.iAddr32[2], iSettings.iPrimaryDns.u.iAddr32[1], iSettings.iPrimaryDns.u.iAddr32[0]); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONTEXTCONFIGL_9, " - Secondary = %u:%u:%u:%u", iSettings.iSecondaryDns.u.iAddr32[3], iSettings.iSecondaryDns.u.iAddr32[2], iSettings.iSecondaryDns.u.iAddr32[1], iSettings.iSecondaryDns.u.iAddr32[0]); } } @@ -337,7 +336,7 @@ * @param aConnectionSpeed Our connection speed */ { - _LOG_L1C1(_L8("CIPv6Binder::UpdateConnectionSpeed")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_UPDATECONNECTIONSPEED_1, "CIPv6Binder::UpdateConnectionSpeed"); iSpeedMetric = aConnectionSpeed; } @@ -351,7 +350,7 @@ * @return MLowerDataSender::ESendBlocked or ESendAccepted based on state of flow. */ { - _LOG_L1C1(_L8("CIPv6Binder::Send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_SEND_1, "CIPv6Binder::Send"); #ifdef __BTT_LOGGING__ LogPacket(aPdu); @@ -372,7 +371,7 @@ * @param aInfo Not used */ { - _LOG_L1C1(_L8("CIPv6Binder::Notification")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_NOTIFICATION_1, "CIPv6Binder::Notification"); return KErrNone; } @@ -384,7 +383,7 @@ * @param aProtocol A pointer to a protocol */ { - _LOG_L1C1(_L8("CIPv6Binder::StartSending()")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_STARTSENDING_1, "CIPv6Binder::StartSending()"); CBinderBase::StartSending(); } @@ -396,8 +395,7 @@ * @param aProtocolCode The protocol type */ { - _LOG_L1C2(_L8("CIPv6Binder::WantsProtocol [aProtocolCode=%X]"), - aProtocolCode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_WANTSPROTOCOL_1, "CIPv6Binder::WantsProtocol [aProtocolCode=%X]",aProtocolCode); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS return ((aProtocolCode & 0x00FF) == KIp6FrameType); @@ -415,7 +413,7 @@ * @param aPdu The incoming packet */ { - _LOG_L1C1(_L8("CIPv6Binder::Process")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS_1, "CIPv6Binder::Process"); #ifdef __BTT_LOGGING__ LogPacket(aPdu); @@ -425,12 +423,12 @@ // been bound yet. if (iUpperReceiver) // ASSERT(iUpperReceiver) ? { - _LOG_L1C1(_L8("CIPv6Binder: Packet Sent to TCP/IP Protocol!!!")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS_2, "CIPv6Binder: Packet Sent to TCP/IP Protocol!!!"); iUpperReceiver->Process(aPdu); } else { - _LOG_L2C1(_L8("WARNING: dumping incoming packet, no protocol bound")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_PROCESS_3, "WARNING: dumping incoming packet, no protocol bound"); aPdu.Free(); } } @@ -508,19 +506,18 @@ * @param aPacket The packet */ { - _LOG_L1C1(_L8("CIPv6Binder::LogPacket")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_1, "CIPv6Binder::LogPacket"); TInt mBufLength = aPacket.Length() - aPacket.First()->Length(); - _LOG_L3C2(_L8("Analysis of %d byte packet:"), mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_2, "Analysis of %d byte packet:", mBufLength); //Note: All the constants used on this method are a pragmatic guess of the //IP header fields. The only porpose of this method is logging. if (mBufLength < 40) { - _LOG_L3C2(_L8(" -doesn't appear to be a valid IPv6 packet (length=%d)") - , mBufLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_3, " -doesn't appear to be a valid IPv6 packet (length=%d)", mBufLength); return; } @@ -529,18 +526,14 @@ if ((payloadPtr[0] & 0xF0) != 0x60) { - _LOG_L3C2(_L8(" - doesn't appear to be an IPv6 packet (version=0x%X)"), - (payloadPtr[0] & 0xF0) >> 4); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_4, " - doesn't appear to be an IPv6 packet (version=0x%X)",(payloadPtr[0] & 0xF0) >> 4); return; } - _LOG_L3C2(_L8(" - traffic class: 0x%X"), - ((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4)); - _LOG_L3C2(_L8(" - flow label: 0x%X"), - ((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]); - _LOG_L3C2(_L8(" - payload length: 0x%X"), - (payloadPtr[4] << 16) | payloadPtr[5]); - _LOG_L3C2(_L8(" - next header: 0x%08X"), payloadPtr[6]); - _LOG_L3C2(_L8(" - hop limit: 0x%08X"), payloadPtr[7]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_5, " - traffic class: 0x%X", ((payloadPtr[0] & 0xF) << 4) | ((payloadPtr[1] & 0xF0) >> 4)); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_6, " - flow label: 0x%X", ((payloadPtr[1] & 0x0F) << 16) | (payloadPtr[2] << 8) | payloadPtr[3]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_7, " - payload length: 0x%X", (payloadPtr[4] << 16) | payloadPtr[5]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_8, " - next header: 0x%08X", payloadPtr[6]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CIPV6BINDER_LOGPACKET_9, " - hop limit: 0x%08X", payloadPtr[7]); } #endif // __BTT_LOGGING__ diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/RawIPFlow.cpp --- a/telephonyprotocols/rawipnif/src/RawIPFlow.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/RawIPFlow.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -21,6 +21,12 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "RawIPFlowTraces.h" +#endif + #include #include #include @@ -46,15 +52,13 @@ static const TUint16 KTcpDumpLinkType = 12; #endif -CRawIPFlow::CRawIPFlow(CSubConnectionFlowFactoryBase& aFactory, const TNodeId& aSubConnId, CProtocolIntfBase* aProtocolIntf, CBttLogger* aTheLogger) +CRawIPFlow::CRawIPFlow(CSubConnectionFlowFactoryBase& aFactory, const TNodeId& aSubConnId, CProtocolIntfBase* aProtocolIntf) /** * Constructor. * * @param aFactory Reference to the factory which created this object. - * @param aTheLogger The logging object, ownership is passed to this object */ : CSubConnectionFlowBase(aFactory, aSubConnId, aProtocolIntf), - iTheLogger(aTheLogger), iInitError(KErrNone), iStarted(EFalse), iStopping(EFalse) @@ -70,9 +74,9 @@ * @param aName The name of the NIF (unused) */ { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tConstructL()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_CONSTRUCTL_1, "CRawIPFlow %08x:\tConstructL()", this); iBinderControl = new (ELeave) TBinderControlProxy(*this); - iBcaController = CBcaIoController::NewL(*this, iTheLogger); + iBcaController = CBcaIoController::NewL(*this); } CRawIPFlow::~CRawIPFlow() @@ -82,8 +86,6 @@ { // Note that we don't delete iBinder because it's not owned by us. delete iBcaController; - // This class also deletes the logging object - delete iTheLogger; ASSERT(iBinder == NULL); @@ -105,7 +107,7 @@ { ASSERT(iStarting==EFalse); iStarting = ETrue; - _LOG_L1C2(_L8("CRawIPFlow %08x:\tStartFlowL()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_STARTFLOWL_1, "CRawIPFlow %08x:\tStartFlowL()", this); // If there were any errors during earlier processing of the ProvisionConfig message // then send an Error message in response to the StartFlow (because ProvisionConfig @@ -140,13 +142,13 @@ _LIT8(KTimeFormat, "%08X"); TUint32 counter = User::FastCounter(); logFileName.Format(KTimeFormat, counter); - - TRAPD(err,__PACKETLOG_NEWL(KTcpDumpFirstTag, logFileName, CPacketLogger::ETcpDump, KTcpDumpLinkType)); - if (err) - { - _LOG_L1C1(_L8("Trapped leave from __PACKETLOG_NEWL")); - } - + + TRAPD(err,__PACKETLOG_NEWL(KTcpDumpFirstTag, logFileName, CPacketLogger::ETcpDump, KTcpDumpLinkType)); + if (err) + { + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_STARTFLOWL_2, "Trapped leave from __PACKETLOG_NEWL"); + } + const TUint KLogTextLen = KModemNameLen+KTimeStampLen+30; TBuf8 logText; _LIT8(KLogTimeText, "TcpDump log file time stamp:"); @@ -155,7 +157,7 @@ logText.Append(logFileName); logText.Append(KLogModemText); logText.Append(modemName); - _LOG_L1C1(logText); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_STARTFLOWL_3, "%s", logText); #endif } @@ -167,7 +169,7 @@ * ready to go. */ { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tLinkLayerUp()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_LINKLAYERUP_1, "CRawIPFlow %08x:\tLinkLayerUp()", this); iLastRequestOriginator.ReplyTo(Id(), TCFDataClient::TStarted().CRef()); @@ -186,9 +188,10 @@ * @param aError An error code to propagate to NifMan */ { - _LOG_L1C3(_L8("CRawIPFlow %08x:\tLinkLayerDown(aError %d)"), this, aError); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_LINKLAYERDOWN_1, "CRawIPFlow %08x:\tLinkLayerDown(aError %d)", (TUint)this, aError); + __PACKETLOG_DELETE; - + if (iStopping) { iLastRequestOriginator.ReplyTo(Id(), TCFDataClient::TStopped(aError).CRef()); @@ -217,7 +220,7 @@ * @param aAction The action to take: disconnect or reconnect */ { - _LOG_L1C3(_L8("CRawIPFlow %08x:\tStopFlow(aError %d)"), this, aError); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_STOPFLOW_1, "CRawIPFlow %08x:\tStopFlow(aError %d)", (TUint)this, aError); __PACKETLOG_DELETE; iStopping = ETrue; ShutDown(MControllerObserver::EInitialised, aError); @@ -233,9 +236,7 @@ * @return MLowerDataSender::TSendResult */ { - _LOG_L1C3(_L8("CRawIPFlow %08x:\tSendPacket(): length=%d"), - this, aPdu.Length() - aPdu.First()->Length()); - + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_SENDPACKET_1, "CRawIPFlow %08x:\tSendPacket(): length=%d, blocked=%d", (TUint)this, aPdu.Length() - aPdu.First()->Length(),iBlocked); __PACKETLOG_WRITE_PACKET(aPdu, 0); return iBcaController->Send(aPdu); } @@ -249,13 +250,12 @@ * @param aPdu The incoming packet */ { - _LOG_L1C3(_L8("CRawIPFlow %08x:\tProcess() [aPdu length=%d]"), - this, aPdu.Length() - aPdu.First()->Length()); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROCESS_1, "CRawIPFlow %08x:\tProcess() [aPdu length=%d]",(TUint)this, aPdu.Length() - aPdu.First()->Length()); // If the packet has zero or negative length, bin it. if ((aPdu.Length() - aPdu.First()->Length()) <= 0) { - _LOG_L1C1(_L8("Dumped packet: illegal length")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROCESS_2, "Dumped packet: illegal length"); aPdu.Free(); return; } @@ -269,11 +269,10 @@ else { // The protocol didn't want the packet, so bin it. - _LOG_L1C2(_L8("Packet was not processed: freeing (protocol code: %X)"), - aProtocolCode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROCESS_3, "Packet was not processed: freeing (protocol code: %X)",aProtocolCode); if (iBinder == NULL) { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tProcess(): NOTE: Binder not present"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROCESS_4, "CRawIPFlow %08x:\tProcess(): NOTE: Binder not present", this); } aPdu.Free(); } @@ -284,7 +283,7 @@ * Notifies the protocol interface that it can resume sending packets. */ { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tResumeSending()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_RESUMESENDING_1, "CRawIPFlow %08x:\tResumeSending()", this); if (iBinder) { @@ -292,7 +291,7 @@ } else { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tResumeSending(): NOTE: Binder not present"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_RESUMESENDING_2, "CRawIPFlow %08x:\tResumeSending(): NOTE: Binder not present", this); } } @@ -307,12 +306,11 @@ * @param aError A possible error */ { - _LOG_L1C4(_L8("CRawIPFlow %08x:\tInitialiseL(aState %d, aError %d)"), - this, aState, aError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_1, "CRawIPFlow %08x:\tInitialiseL(aState %d, aError %d)",(TUint)this, aState, aError); if (aError != KErrNone) { - _LOG_L2C2(_L8(" *** FAILED to initialise NIF *** Error =%d"),aError); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_2, " *** FAILED to initialise NIF *** Error =%d",aError); // Initialise shutdown sequence switch (aState) @@ -321,7 +319,7 @@ ShutDown(MControllerObserver::EInitialised, aError); break; default: - _LOG_L2C3(_L8("ERROR CRawIPFlow: Unknown state:%d in NIF: %S"), aState, &KNifName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_3, "ERROR CRawIPFlow: Unknown state:%d in NIF: %S", aState, KNifName); User::Leave(KErrUnknown); break; } @@ -336,13 +334,13 @@ GetBinder()->UpdateContextConfigL(*iAgentProvision->iGprsConfig); GetBinder()->UpdateConnectionSpeed(iAgentProvision->iConnectionSpeed); - _LOG_L1C2(_L8("Port details %S"), &iProvision->GetPortName()); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_4, "Port details %S", iProvision->GetPortName()); iBcaController->SetPort(iProvision->GetPortName()); - _LOG_L1C3(_L8("bcaName details %S,%S"),&iProvision->GetBCAStack(), &iProvision->GetBCAName()); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_5, "bcaName details %S,%S",iProvision->GetBCAStack(), iProvision->GetBCAName()); iBcaController->SetBcaStackAndName(iProvision->GetBCAStack(), iProvision->GetBCAName()); - _LOG_L1C2(_L8("IAP ID details %u"), iProvision->GetIAPid()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_6, "IAP ID details %u", iProvision->GetIAPid()); iBcaController->SetIapId(iProvision->GetIAPid()); UpdateContextState(RPacketContext::EStatusActive, KErrNone); @@ -351,11 +349,11 @@ } break; case MControllerObserver::EBcaController: - _LOG_L1C1(_L8(" ***** NIF INITIALISED *****")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_7, " ***** NIF INITIALISED *****"); LinkLayerUp(); break; default: - _LOG_L2C3(_L8("ERROR CRawIPFlow: Unknown state:%d in NIF: %S"), aState, &KNifName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_INITIALISEL_8, "ERROR CRawIPFlow: Unknown state:%d in NIF: %S", aState, KNifName); User::Leave(KErrUnknown); break; } @@ -371,8 +369,7 @@ * @param aError A possible error (only during initialisation) */ { - _LOG_L1C4(_L8("CRawIPFlow %08x:\tShutDown(aState %d, aError %d)"), - this, aState, aError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_SHUTDOWN_1, "CRawIPFlow %08x:\tShutDown(aState %d, aError %d)",(TUint)this, aState, aError); if (aError != KErrNone) { @@ -391,8 +388,9 @@ LinkLayerDown(iInitError); break; default: - _LOG_L2C1(_L8("ERROR CRawIPFlow: Unknown Shutdown step")); - _BTT_PANIC(KNifName,KNifUnknownShutDownState); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_SHUTDOWN_2, "ERROR CRawIPFlow: Unknown Shutdown step"); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_SHUTDOWN_3, "PANIC: %S %d", KNifName, KNifUnknownShutDownState); + User::Panic(KNifName,KNifUnknownShutDownState); break; } } @@ -426,7 +424,7 @@ * @param aError A possible error */ { - _LOG_L1C3(_L8("CRawIPFlow %08x:\tUpdateContextState(aState %d)"), this, aState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_UPDATECONTEXTSTATE_1, "CRawIPFlow %08x:\tUpdateContextState(aState %d)",(TUint) this, aState); // Note that we do not need to close the Flow down if there's been an // error, as the context state machine will do this for us. @@ -451,25 +449,23 @@ MLowerControl* CRawIPFlow::GetControlL(const TDesC8& aProtocol) { -#ifdef __BTT_LOGGING__ - //TBuf8<256> debugBuffer; - //debugBuffer.Copy(aProtocol); - _LOG_L1C3(_L8("CRawIPFlow %08x:\tGetControlL(aProtocol %S)"), this, &aProtocol); -#endif + + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_GETCONTROLL_1, "CRawIPFlow %08x:\tGetControlL(aProtocol %s)", (TUint)this, aProtocol); + // IPv4 and ICMP Protocols if (aProtocol.CompareF(KDescIp()) == 0 || aProtocol.CompareF(KDescIcmp()) == 0) { if (!iBinder) { - iBinder = new (ELeave) CIPv4Binder(*this, iTheLogger); + iBinder = new (ELeave) CIPv4Binder(*this); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS iBcaController->SetType(KIp4FrameType); #endif // RAWIP_HEADER_APPENDED_TO_PACKETS } else { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tGetControlL(): IPv4 binder already exists"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_GETCONTROLL_2, "CRawIPFlow %08x:\tGetControlL(): IPv4 binder already exists", this); } } // IPv6 Protocol @@ -477,14 +473,14 @@ { if (!iBinder) { - iBinder = new (ELeave) CIPv6Binder(*this, iTheLogger); + iBinder = new (ELeave) CIPv6Binder(*this); #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS iBcaController->SetType(KIp6FrameType); #endif // RAWIP_HEADER_APPENDED_TO_PACKETS } else { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tGetControlL(): IPv6 binder already exists"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_GETCONTROLL_3, "CRawIPFlow %08x:\tGetControlL(): IPv6 binder already exists", this); } } else @@ -517,7 +513,7 @@ void CRawIPFlow::Unbind(MUpperDataReceiver* aUpperReceiver, MUpperControl* aUpperControl) { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tUnbind()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_UNBIND_1, "CRawIPFlow %08x:\tUnbind()", this); if (iBinder) { @@ -640,7 +636,6 @@ //doesn't notice anything. It does that by swapping the //flows below the binders. CBinderBase* localBinder = iBinder; - CBttLogger* logger = localBinder->iTheLogger; TBinderControlProxy* localBinderControl = iBinderControl; iBinder = otherFlow->iBinder; @@ -652,7 +647,6 @@ otherFlow->iBinderControl->iFlow = otherFlow; iBinderControl->iFlow = this; - iBinder->iTheLogger = logger; iSubConnectionProvider.Close(); iSubConnectionProvider.Open(address_cast(rejoinMsg.iNodeId)); @@ -726,7 +720,7 @@ @param aData provisioning pointer from message */ { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tProvisionConfig()"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_PROVISIONCONFIG_1, "CRawIPFlow %08x:\tProvisionConfig()", this); AccessPointConfig().Close(); AccessPointConfig().Open(aConfigData); @@ -743,7 +737,7 @@ { if (iProvision == NULL) { - _LOG_L1C1(_L8("CRawIPFlow:\tProvisionConfigL() - CBCAProvision config incomplete")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_DYNAMICPROVISIONCONFIGL_1, "CRawIPFlow:\tProvisionConfigL() - CBCAProvision config incomplete"); iProvisionError = KErrCorrupt; return; } @@ -761,7 +755,7 @@ STypeId::CreateSTypeId(CIPConfig::EUid, CIPConfig::ETypeId))); if (wcdmaIpProvision == NULL) { - _LOG_L1C2(_L8("CRawIPFlow %08x:\tDynamicProvisionConfigL() - WCDMA config incomplete"), this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_DYNAMICPROVISIONCONFIGL_2, "CRawIPFlow %08x:\tDynamicProvisionConfigL() - WCDMA config incomplete", this); iProvisionError = KErrCorrupt; return; } @@ -789,13 +783,13 @@ some historical understanding. */ { - _LOG_L1C3(_L8("CRawIPFlow %08x:\tNotification(aEvent %d)"), this, aEvent); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_1, "CRawIPFlow %08x:\tNotification(aEvent %d)", (TUint)this, aEvent); switch (aEvent) { - case EAgentToNifEventTypeDisableTimers: //GPRS suspension - { - _LOG_L1C1(_L8("CRawIPFlow::Received Suspend from Agent...")); + case EAgentToNifEventTypeDisableTimers: //GPRS suspension + { + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_2, "CRawIPFlow::Received Suspend from Agent..."); // Let the BCA controller know that data can no longer be sent over // the PDP context. @@ -806,7 +800,7 @@ case EAgentToNifEventTypeEnableTimers: //GPRS resumption { - _LOG_L1C1(_L8("CRawIPFlow::Received Resume from Agent...")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_3, "CRawIPFlow::Received Resume from Agent..."); iBcaController->ResumeSending(); break; @@ -814,13 +808,13 @@ case (EAgentToNifEventTypeDisableConnection) : { // This is handled by NIFMAN and passed to Flow as a Stop() call - _LOG_L1C1(_L8("CRawIPFlow::Received Disable connection from Agent...")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_4, "CRawIPFlow::Received Disable connection from Agent..."); break; } default : { - _LOG_L1C2(_L8("CRawIPFlow::Received Notification [%d] from Agent..."), aEvent); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOW_NOTIFICATION_5, "CRawIPFlow::Received Notification [%d] from Agent...", aEvent); break; } }//endswitch diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/RawIPFlowFactory.cpp --- a/telephonyprotocols/rawipnif/src/RawIPFlowFactory.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/RawIPFlowFactory.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -19,9 +19,14 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "RawIPFlowFactoryTraces.h" +#endif + #include "RawIPFlowFactory.h" #include "RawIPFlow.h" -#include "bttlog.h" using namespace ESock; @@ -58,14 +63,11 @@ CSubConnectionFlowBase* CRawIPFlowFactory::DoCreateFlowL(ESock::CProtocolIntfBase* aProtocol, ESock::TFactoryQueryBase& aQuery) { -#ifdef __BTT_LOGGING__ - iTheLogger = CBttLogger::NewL(KNifSubDir, KRefFile, User::FastCounter()); -#endif // __BTT_LOGGING__ - _LOG_L1C1(_L8("Raw IP logging started.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPFLOWFACTORY_DOCREATEFLOWL_1, "Raw IP logging started."); const TDefaultFlowFactoryQuery& query = static_cast(aQuery); - CRawIPFlow* s = new (ELeave) CRawIPFlow(*this, query.iSCprId, aProtocol, iTheLogger); + CRawIPFlow* s = new (ELeave) CRawIPFlow(*this, query.iSCprId, aProtocol); CleanupStack::PushL(s); s->ConstructL(); CleanupStack::Pop(s); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/Receiver.cpp --- a/telephonyprotocols/rawipnif/src/Receiver.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/Receiver.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -19,6 +19,12 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ReceiverTraces.h" +#endif + #include "Receiver.h" #include "Constants.h" #include @@ -26,32 +32,29 @@ const TUint KBufferIncreaseStep=500; const TUint K64k=65535; -CReceiver::CReceiver(CBcaIoController& aObserver, CBttLogger* aTheLogger, TUint aMaxPacketSize) +CReceiver::CReceiver(CBcaIoController& aObserver, TUint aMaxPacketSize) /** * Constructor. Performs standard active object initialisation. * * @param aObserver Reference to the observer of this state machine - * @param aTheLogger The logging object */ : CActive(EPriorityHigh), iObserver(aObserver), - iTheLogger(aTheLogger), iMaxPacketSize(aMaxPacketSize) { CActiveScheduler::Add(this); } -CReceiver* CReceiver::NewL(CBcaIoController& aObserver, CBttLogger* aTheLogger, TUint aMaxPacketSize) +CReceiver* CReceiver::NewL(CBcaIoController& aObserver, TUint aMaxPacketSize) /** * Two-phase constructor. Creates a new CBcaIoController object, performs * second-phase construction, then returns it. * * @param aObserver The observer, to which events will be reported - * @param aTheLogger The logging object * @return A newly constructed CBcaIoController object */ { - CReceiver* self = new (ELeave) CReceiver(aObserver, aTheLogger, aMaxPacketSize); + CReceiver* self = new (ELeave) CReceiver(aObserver, aMaxPacketSize); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); @@ -63,7 +66,7 @@ * Second-phase constructor. Creates all the state objects it owns. */ { - _LOG_L1C1(_L8("CReceiver::ConstructL")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_CONSTRUCTL_1, "CReceiver::ConstructL"); iData.CreateL(iMaxPacketSize); } @@ -71,10 +74,13 @@ /** * Destructor. */ - { - iData.Close(); - Cancel(); - } + { + Cancel(); + // iData is a shared bit of memory between raw ip and bca + // you cannot delete it while bca might be using it otherwise + // bad things may happen. + iData.Close(); + } void CReceiver::RunL() /** @@ -82,15 +88,14 @@ * packet in its buffer. */ { - _LOG_L1C2(_L8("CReceiver::RunL [iStatus=%d]"), iStatus.Int()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNL_1, "CReceiver::RunL [iStatus=%d]", iStatus.Int()); if (iStatus != KErrNone) { if (iStatus == KErrNoMemory) { - _LOG_L2C1( - _L8("WARNING! CReceiver: Read failed with KErrNoMemory. Increase buffer.")); - // Read operation failed!! Nif will re-issue the read request. Increase buffer. + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNL_2, "WARNING! CReceiver: Read failed with KErrNoMemory. Increase buffer."); + // Read operation failed!! Nif will re-issue the read request. Increase buffer. if ((iMaxPacketSize + KBufferIncreaseStep) > K64k) { // In theory IP packet can't be bigger than 64k, so if we come here something is wrong so stop observer. @@ -113,14 +118,14 @@ } else { - _LOG_L2C1(_L8("WARNING! CReceiver: Read failed")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNL_3, "WARNING! CReceiver: Read failed"); iObserver.Stop(iStatus.Int()); } return; } else { - _LOG_L1C1(_L8("CReceiver: Data Packet Received")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNL_4, "CReceiver: Data Packet Received"); iRMBufPacket.CreateL(iData); @@ -130,7 +135,7 @@ SetActive(); iRMBufPacket.Pack(); - + #ifdef RAWIP_HEADER_APPENDED_TO_PACKETS TUint16 protocolCode = iObserver.RemoveHeader(iRMBufPacket); #else @@ -143,12 +148,19 @@ } } +TInt CReceiver::RunError(TInt aError) + { + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNERROR_1, "WARNING! CReceiver::RunError Read failed"); + iObserver.Stop(aError); + return KErrNone; + } + void CReceiver::DoCancel() /** * Cancel active request */ { - _LOG_L1C1(_L8("CReceiver::DoCancel")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_DOCANCEL_1, "CReceiver::DoCancel"); (iObserver.Bca())->CancelRead(); } @@ -159,7 +171,7 @@ * packets from BCA. */ { - _LOG_L1C1(_L8("CReceiver::StartListening")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_STARTLISTENING_1, "CReceiver::StartListening"); // The BCA will complete this read once it has a full IP packet in its buffer. (iObserver.Bca())->Read(iStatus, iData); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/Sender.cpp --- a/telephonyprotocols/rawipnif/src/Sender.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/Sender.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -19,20 +19,24 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "SenderTraces.h" +#endif + #include "Sender.h" #include "Constants.h" #include -CSender::CSender(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise) +CSender::CSender(CBcaIoController& aObserver, TInt aMaxPacketSise) /** * Constructor. Performs standard active object initialisation. - * * @param aObserver Reference to the observer of this state machine */ : CActive(EPriorityUserInput), iObserver(aObserver), - iTheLogger(aTheLogger), iMaxPacketSize(aMaxPacketSise) { // EPriorityUserInput is higher than the default priority but lower than @@ -42,17 +46,16 @@ CActiveScheduler::Add(this); } -CSender* CSender::NewL(CBcaIoController& aObserver, CBttLogger* aTheLogger, TInt aMaxPacketSise) +CSender* CSender::NewL(CBcaIoController& aObserver, TInt aMaxPacketSise) /** * Two-phase constructor. Creates a new CBcaIoController object, performs * second-phase construction, then returns it. * * @param aObserver The observer, to which events will be reported - * @param aTheLogger The logging object * @return A newly constructed CBcaIoController object */ { - CSender* self = new (ELeave) CSender(aObserver, aTheLogger, aMaxPacketSise); + CSender* self = new (ELeave) CSender(aObserver, aMaxPacketSise); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); @@ -64,7 +67,7 @@ * Second-phase constructor. Creates all the state objects it owns. */ { - _LOG_L1C1(_L8("CSender::ConstructL")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_CONSTRUCTL_1, "CSender::ConstructL"); iSendBuffer.CreateL(iMaxPacketSize); } @@ -72,37 +75,40 @@ /** * Destructor. */ - { - iSendBuffer.Close(); - Cancel(); - } + { + Cancel(); + // iSendBuffer is a shared bit of memory between raw ip and bca + // you cannot delete it while bca might be using it otherwise + // bad things may happen. + iSendBuffer.Close(); + } void CSender::RunL() /** * This method checks if any error occured in the write operation. */ { - _LOG_L1C2(_L8("CSender::RunL [iStatus=%d]"), iStatus.Int()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_1, "CSender::RunL [iStatus=%d]", iStatus.Int()); if (iStatus!=KErrNone) { if(iStatus == KErrNoMemory) { - _LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNoMemory")); - _LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_2, "WARNING! CSender: Write failed with KErrNoMemory"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_3, "WARNING! CSender: Ignoring packet!!!!"); // Write operation failed!! Nif will ignore this packet. iObserver.SendComplete(); } else if (iStatus == KErrNotReady) { - _LOG_L2C1(_L8("WARNING! CSender: Write failed with KErrNotReady")); - _LOG_L2C1(_L8("WARNING! CSender: Ignoring packet!!!!")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_4, "WARNING! CSender: Write failed with KErrNotReady"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_5, "WARNING! CSender: Ignoring packet!!!!"); // Write operation failed!! Nif will ignore this packet. iObserver.SendComplete(); } else { - _LOG_L2C1(_L8("ERROR! CSender: Write failed!!!!")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_6, "ERROR! CSender: Write failed!!!!"); // Nif will shut down iObserver.Stop(iStatus.Int()); } @@ -112,7 +118,7 @@ else { // The Ip packet was sent successfuly - _LOG_L1C1(_L8("***** CSender: Packet Sent.")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_RUNL_7, "***** CSender: Packet Sent."); iObserver.SendComplete(); } } @@ -122,7 +128,7 @@ * Cancel active request */ { - _LOG_L1C1(_L8("CSender::DoCancel")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_DOCANCEL_1, "CSender::DoCancel"); (iObserver.Bca())->CancelWrite(); } @@ -135,7 +141,7 @@ * @return KStopSending, or KErrArgument if the packet is too large. */ { - _LOG_L1C1(_L8("CSender::Send")); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDER_SEND_1, "CSender::Send"); // Copy the IP portion of the RMBufChain to the buffer. iSendBuffer.SetMax(); @@ -148,7 +154,5 @@ aPdu.Free(); (iObserver.Bca())->Write(iStatus, iSendBuffer); - SetActive(); } - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/bttlog.cpp --- a/telephonyprotocols/rawipnif/src/bttlog.cpp Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,221 +0,0 @@ -// Copyright (c) 2002-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Implements CBttLogger. -// -// - -/** - @file -*/ - -#include "bttlog.h" - -#ifdef __BTT_LOGGING__ - -#ifdef __DEBUGRAWIPSERIALPORT__ -#include -#endif - -//Enable this if you want time stamps for each log statements. -//This is computation ineffective and not recommended. -//#define __TIME_STAMP_ENABLED__ - -CBttLogger* CBttLogger::NewL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId) -/** - * Factory method for CBttLogger. - * - * @param aSubDir The subdirectory of c:\logs\gprsbtt to log to. - * @param aFileName The filename to log to. - * @return Ownership of a new CBttLogger. - */ - { - CBttLogger* self = new(ELeave) CBttLogger; - CleanupStack::PushL(self); - self->ConstructL(aTag, aFileName, aInstanceId); - CleanupStack::Pop(self); - return self; - } - -#ifdef __FLOG_ACTIVE -void CBttLogger::ConstructL(const TDesC8& aTag, const TDesC8& aFileName, const TUint32 aInstanceId) -#else -void CBttLogger::ConstructL(const TDesC8&, const TDesC8&, const TUint32 aInstanceId) -#endif -/** - * 2nd-phase construction. - * Hurricane/Typhoon - we can log to a particular directory - */ - { - iInstanceId = aInstanceId; - __FLOG_OPEN(aTag, aFileName); - } - -//#endif - -CBttLogger::CBttLogger() -/** - * Constructor - */ - { - } - -CBttLogger::~CBttLogger() -/** - * Destructor - */ - { - __FLOG_CLOSE; - } - -void CBttLogger::Write(const TDesC8& aText) -/** - * Write an 8-bit descriptor to the log file - * - * @param aText The test to write - */ - { - TBuf8 buf; - TLogIgnoreOverflow8 overflowHandler; - // put the instance id to identify which nif we are - // logging from - _LIT8(KInstanceFormat, "RawIp 0x%08X: "); - buf.Format(KInstanceFormat, &overflowHandler, iInstanceId); - -#ifdef __TIME_STAMP_ENABLED__ - // log to our own file in Hurricane/Typhoon - _LIT8(KTimeFormat, "%02d.%02d:%02d:%06d "); - - TTime now; - now.UniversalTime(); - TDateTime dateTime; - dateTime = now.DateTime(); - buf.AppendFormat(KTimeFormat, - &overflowHandler, - dateTime.Hour(), - dateTime.Minute(), - dateTime.Second(), - dateTime.MicroSecond()); -#endif - - buf.Append(aText); - -#ifdef __DEBUGRAWIPSERIALPORT__ - TBuf buf2; - // TEMP: Do not print single % since appear as format char to RDebug::Print - for (TInt i = 0; i < buf.Length(); i++) - { - if (buf[i] == '%') - buf2.Append(_L(".")); - else - buf2.Append(buf[i]); - } - RDebug::Print(buf2); -#else - __FLOG(buf); -#endif - } - -void CBttLogger::WriteFormat(TRefByValue aFmt, ...) -/** - * Write an 8-bit format list to the log file - */ - { - //coverity[var_decl]; - VA_LIST list; - VA_START(list, aFmt); - - // log to our own file in Hurricane/Typhoon - TBuf8 buf; - TLogIgnoreOverflow8 overflowHandler; - //coverity[uninit_use_in_call]; - buf.AppendFormatList(aFmt, list, &overflowHandler); - Write(buf); - } - -void CBttLogger::VerboseLeaveL(char* aFile, TInt aLine, TInt aReason) -/** - * Make a verbose leave - write name of file and line number to the log just - * before leaving. - * - * @param aFile The file we're leaving from. - * @param aLine The line number we're leaving from. - * @param aReason The leave code. - */ - { - // only leave if non-zero value - if ( aReason == KErrNone ) - { - return; - } - - _LIT8(KLeavePrefix, "LEAVE: " ); - - TPtrC8 fullFileName((const TUint8*)aFile); - TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1); - - TBuf8<256> buf; - TLogIgnoreOverflow8 overflowHandler; - buf.AppendFormat(_L8("%S aReason=%d [file %S, line %d]"), - &overflowHandler, - &KLeavePrefix, - aReason, - &fileName, - aLine); - Write(buf); - - __FLOG_CLOSE; - - // finally - User::Leave(aReason); - } - -void CBttLogger::VerbosePanic(char* aFile, - TInt aLine, - TInt aPanicCode, - TText8* aPanicName, - const TDesC& aPanicCategory) -/** - * Make a verbose panic - write name of file and line number to the - * log just before panicking. - * - * @param aFile The file that's panicking. - * @param aLine The line number that's panicking. - * @param aReason The panic code. - * @param aPanicName The text of the panic code. - * @param aPanicCategory The panic category. - */ - { - _LIT8(KLeavePrefix, "PANIC: " ); - - TPtrC8 fullFileName((const TUint8*)aFile); - TPtrC8 fileName(fullFileName.Ptr()+fullFileName.LocateReverse('\\')+1); - - TBuf8<256> buf; - TLogIgnoreOverflow8 overflowHandler; - buf.AppendFormat(_L8("%S %d = %s [file %S, line %d]"), - &overflowHandler, - &KLeavePrefix, - aPanicCode, - aPanicName, - &fileName, - aLine); - Write(buf); - - __FLOG_CLOSE; - - // finally - User::Panic(aPanicCategory, aPanicCode); - } - -#endif // __BTT_LOGGING__ diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/rawipmcpr.cpp --- a/telephonyprotocols/rawipnif/src/rawipmcpr.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/rawipmcpr.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -20,6 +20,11 @@ @internalComponent */ +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "rawipmcprTraces.h" +#endif + #include #include "rawipmcpr.h" #include @@ -93,8 +98,7 @@ void CRawIpMetaConnectionProvider::ReceivedL(const TRuntimeCtxId& aSender, const TNodeId& aRecipient, TSignatureBase& aMessage) { - __CFLOG_VAR((KRawIPMCprTag, KRawIPMCprSubTag, _L8("CRawIpMetaConnectionProvider [this=%08x]::ReceivedL() aCFMessage=%d"), - this, aCFMessage.MessageId())); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPMETACONNECTIONPROVIDER_RECEIVEDL_1, "CRawIpMetaConnectionProvider [this=%08x]::ReceivedL() aCFMessage=%u",(TUint)this, aMessage.MessageId().MessageId()); ESOCK_DEBUG_MESSAGE_INTERCEPT(aSender, aMessage, aRecipient); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/src/rawipmcprfactory.cpp --- a/telephonyprotocols/rawipnif/src/rawipmcprfactory.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/src/rawipmcprfactory.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -20,6 +20,11 @@ @internalComponent */ +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "rawipmcprfactoryTraces.h" +#endif + #include "rawipmcprfactory.h" #include "rawipmcpr.h" #include @@ -27,10 +32,6 @@ #include -#ifdef __CFLOG_ACTIVE -#define KRawIPMCprFactoryTag KESockMetaConnectionTag -// _LIT8(KRawIPMCprFactorySubTag, "rawipmcprfactory"); -#endif // __CFLOG_ACTIVE using namespace ESock; @@ -41,14 +42,15 @@ //-========================================================= CRawIpMetaConnectionProviderFactory* CRawIpMetaConnectionProviderFactory::NewL(TAny* aParentContainer) { - __CFLOG_VAR((KRawIPMCprFactoryTag, KRawIPMCprFactorySubTag, _L8("CRawIpMetaConnectionProviderFactory ::\tNewL(%08x)"), aParentContainer)); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_1, "CRawIpMetaConnectionProviderFactory ::\tNewL(%08x)",(TUint)aParentContainer); return new (ELeave) CRawIpMetaConnectionProviderFactory(TUid::Uid(CRawIpMetaConnectionProviderFactory::iUid), *(reinterpret_cast(aParentContainer))); } CRawIpMetaConnectionProviderFactory::CRawIpMetaConnectionProviderFactory(TUid aFactoryId, CMetaConnectionFactoryContainer& aParentContainer) : CMetaConnectionProviderFactoryBase(aFactoryId,aParentContainer) { - __CFLOG_VAR((KRawIPMCprFactoryTag, KRawIPMCprFactorySubTag, _L8("CRawIpMetaConnectionProviderFactory %08x:\tCRawIpMetaConnectionProviderFactory Constructor"), this)); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_2, "CRawIpMetaConnectionProviderFactory %08x:\tCRawIpMetaConnectionProviderFactory Constructor",(TUint)this); + } ACommsFactoryNodeId* CRawIpMetaConnectionProviderFactory::DoCreateObjectL(ESock::TFactoryQueryBase& aQuery) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/rawipnif/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/rawipnif/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,190 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_DOCANCEL_1=0x30 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_DOCANCEL_2=0x31 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_DOCANCEL_3=0x32 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_DOCANCEL_4=0x33 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_1=0x24 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_10=0x2d +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_11=0x2e +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_12=0x2f +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_2=0x25 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_3=0x26 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_4=0x27 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_5=0x28 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_6=0x29 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_7=0x2a +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_8=0x2b +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_RUNL_9=0x2c +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_SHUTDOWNBCA_1=0x37 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_SHUTDOWNBCA_2=0x38 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_SHUTDOWNBCA_3=0x39 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_STARTLOADL_1=0x34 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_STARTLOADL_2=0x35 +[TRACE]TRACE_INTERNALS[0x88]_CBCACONTROL_STARTLOADL_3=0x36 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_ADDHEADER_1=0xdd +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_CONSTRUCTL_1=0x1c +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_REMOVEHEADER_1=0xde +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_RESUMESENDING_1=0xd7 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_RESUMESENDING_2=0xd8 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_RESUMESENDING_3=0xd9 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_RESUMESENDING_4=0xda +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SENDCOMPLETE_1=0xd2 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SENDCOMPLETE_2=0xe0 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SENDCOMPLETE_3=0xd3 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SENDCOMPLETE_4=0xd4 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_1=0xc6 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_10=0xcf +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_11=0xd0 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_12=0xd1 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_2=0xc7 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_3=0xc8 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_4=0xc9 +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_5=0xca +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_6=0xcb +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_7=0xcc +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_8=0xcd +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SEND_9=0xce +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_SETTYPE_1=0xdc +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_STARTL_1=0x1d +[TRACE]TRACE_INTERNALS[0x88]_CBCAIOCONTROLLER_STOP_1=0x1e +[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_BIND_1=0x3a +[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_STARTSENDING_1=0x3c +[TRACE]TRACE_INTERNALS[0x88]_CBINDERBASE_UNBIND_1=0x3b +[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_ADDHEADER_1=0x3e +[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_REMOVEHEADER_1=0x3f +[TRACE]TRACE_INTERNALS[0x88]_CIPTAGHEADER_SETTYPE_1=0x3d +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_CONTROL_1=0x40 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_DELETECONTEXT_1=0x43 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_GETCONFIG_1=0x41 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_GETCONFIG_2=0x42 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_1=0x58 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_10=0x61 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_11=0x62 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_12=0xe1 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_13=0xe2 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_14=0x65 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_15=0x66 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_16=0x67 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_17=0x68 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_18=0x69 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_19=0x6a +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_2=0x59 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_20=0x6b +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_21=0x6c +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_22=0x6d +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_23=0x6e +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_3=0x5a +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_4=0x5b +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_5=0x5c +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_6=0x5d +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_7=0x5e +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_8=0x5f +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_LOGPACKET_9=0x60 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_NOTIFICATION_1=0x50 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS_1=0x53 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS_2=0x54 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_PROCESS_3=0x55 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SEND_1=0x4f +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SETPROVISION_1=0x56 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_SETPROVISION_2=0x57 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_STARTSENDING_1=0x51 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONNECTIONSPEED_1=0x4e +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_1=0x44 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_10=0x4d +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_2=0x45 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_3=0x46 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_4=0x47 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_5=0x48 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_6=0x49 +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_7=0x4a +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_8=0x4b +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_UPDATECONTEXTCONFIGL_9=0x4c +[TRACE]TRACE_INTERNALS[0x88]_CIPV4BINDER_WANTSPROTOCOL_1=0x52 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_CONTROL_1=0x6f +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_DELETECONTEXT_1=0x70 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_1=0x82 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_2=0x83 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_3=0x84 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_4=0x85 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_5=0x86 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_6=0x87 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_7=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_8=0x89 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_LOGPACKET_9=0x8a +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_NOTIFICATION_1=0x7c +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS_1=0x7f +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS_2=0x80 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_PROCESS_3=0x81 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_SEND_1=0x7b +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_STARTSENDING_1=0x7d +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONNECTIONSPEED_1=0x7a +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_1=0x71 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_2=0x72 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_3=0x73 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_4=0x74 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_5=0x75 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_6=0x76 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_7=0x77 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_8=0x78 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_UPDATECONTEXTCONFIGL_9=0x79 +[TRACE]TRACE_INTERNALS[0x88]_CIPV6BINDER_WANTSPROTOCOL_1=0x7e +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOWFACTORY_DOCREATEFLOWL_1=0xb0 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_CONSTRUCTL_1=0x8b +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_DYNAMICPROVISIONCONFIGL_1=0xa9 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_DYNAMICPROVISIONCONFIGL_2=0xaa +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_GETCONTROLL_1=0xa4 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_GETCONTROLL_2=0xa5 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_GETCONTROLL_3=0xa6 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_1=0x98 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_2=0x99 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_3=0x9a +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_4=0x9b +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_5=0x9c +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_6=0x9d +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_7=0x9e +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_INITIALISEL_8=0x9f +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_LINKLAYERDOWN_1=0x8f +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_LINKLAYERUP_1=0x8e +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_1=0xab +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_2=0xac +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_3=0xad +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_4=0xae +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_NOTIFICATION_5=0xaf +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROCESS_1=0x92 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROCESS_2=0x93 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROCESS_3=0x94 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROCESS_4=0x95 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_PROVISIONCONFIG_1=0xa8 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_RESUMESENDING_1=0x96 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_RESUMESENDING_2=0x97 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_SENDPACKET_1=0xdf +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_SHUTDOWN_1=0xa0 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_SHUTDOWN_2=0xa1 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_SHUTDOWN_3=0xa2 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_STARTFLOWL_1=0x8c +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_STARTFLOWL_2=0xe3 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_STARTFLOWL_3=0xe4 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_STOPFLOW_1=0x90 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_UNBIND_1=0xa7 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPFLOW_UPDATECONTEXTSTATE_1=0xa3 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_1=0xc4 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPMETACONNECTIONPROVIDERFACTORY_NEWL_2=0xc5 +[TRACE]TRACE_INTERNALS[0x88]_CRAWIPMETACONNECTIONPROVIDER_RECEIVEDL_1=0xc3 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_CONSTRUCTL_1=0xb1 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_DOCANCEL_1=0xb6 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_RUNL_1=0xb2 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_RUNL_2=0xb3 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_RUNL_3=0xb4 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_RUNL_4=0xb5 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVER_STARTLISTENING_1=0xb7 +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_CONSTRUCTL_1=0xb8 +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_DOCANCEL_1=0xc0 +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_1=0xb9 +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_2=0xba +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_3=0xbb +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_4=0xbc +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_5=0xbd +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_6=0xbe +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_RUNL_7=0xbf +[TRACE]TRACE_INTERNALS[0x88]_CSENDER_SEND_1=0xc1 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/version1/group/BLD.INF --- a/telephonyprotocols/rawipnif/version1/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -// Copyright (c) 2002-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Network interface for supporting multiple primary PDP contexts on the telephony reference platform -// -// - -/** - @file -*/ - -PRJ_PLATFORMS - -DEFAULT - -PRJ_EXPORTS -RawIpNif.iby /epoc32/rom/include/rawipnif.iby - -PRJ_MMPFILES - -RawIPNif.mmp - -// Note that there is no PRJ_TESTMMPFILES here. This is intentional, because -// building the NIF unit test stops the other unit tests from working. If you -// want to run the NIF unit test, build it explicitly. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/version1/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/rawipnif/version1/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,35 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Network interface for supporting multiple primary PDP contexts on the telephony reference platform +// +// + +/** + @file +*/ + +PRJ_PLATFORMS + +DEFAULT + +PRJ_EXPORTS +RawIpNif.iby /epoc32/rom/include/rawipnif.iby + +PRJ_MMPFILES + +RawIPNif.mmp + +// Note that there is no PRJ_TESTMMPFILES here. This is intentional, because +// building the NIF unit test stops the other unit tests from working. If you +// want to run the NIF unit test, build it explicitly. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/version1/group/networking_rawipnif.mrp --- a/telephonyprotocols/rawipnif/version1/group/networking_rawipnif.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/version1/group/networking_rawipnif.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component networking_rawipnif source \sf\os\cellularsrv\telephonyprotocols\rawipnif binary \sf\os\cellularsrv\telephonyprotocols\rawipnif\group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/rawipnif/version1/inc/bttlog.h --- a/telephonyprotocols/rawipnif/version1/inc/bttlog.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/rawipnif/version1/inc/bttlog.h Tue Jun 22 11:02:32 2010 +0100 @@ -77,16 +77,22 @@ #endif // __BTT_LOG_3__ #ifdef __BTT_LOG_1__ +#ifndef __BTT_LOGGING__ #define __BTT_LOGGING__ #endif +#endif #ifdef __BTT_LOG_2__ +#ifndef __BTT_LOGGING__ #define __BTT_LOGGING__ #endif +#endif #ifdef __BTT_LOG_3__ +#ifndef __BTT_LOGGING__ #define __BTT_LOGGING__ #endif +#endif #ifdef __BTT_LOGGING__ #define _BTT_LEAVEIFERROR(a) iTheLogger->VerboseLeaveL(__FILE__, __LINE__, a) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/secondarypdpcontextumtsdriver/group/BLD.INF --- a/telephonyprotocols/secondarypdpcontextumtsdriver/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -// Copyright (c) 2004-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Secondary PDP Context UMTS Driver -// -// - -/** - @file -*/ - -#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY - -PRJ_PLATFORMS - -DEFAULT - -PRJ_EXPORTS -#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS -./spud.iby /epoc32/rom/include/spud.iby -#else -..\version1\inc\spud.h \epoc32\include\networking\spud.h -..\version1\inc\spudmanif.h \epoc32\include\networking\spudmanif.h -.\spud_v1.iby \epoc32\rom\include\spud.iby -#endif - - -PRJ_MMPFILES -../spudman/group/spud.mmp - -#endif //SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY - -PRJ_TESTEXPORTS - -../te_spudRSubConn/group/TE_spudRSubConn.iby /epoc32/rom/include/te_spudrsubconn.iby - -../te_spudRSubConn/scripts/TE_spudRSubConn.script z:/testdata/scripts/te_spudrsubconn.script -../te_spudRSubConn/configs/spudRSubConnPPP_loopback.xml z:/testdata/configs/spudrsubconnppp_loopback.xml -../te_spudRSubConn/configs/spudRSubConnPPP_loopback.ini z:/testdata/configs/spudrsubconnppp_loopback.ini -../te_spudRSubConn/configs/spudRSubConnPPP_pcktloopback.ini z:/testdata/configs/spudrsubconnppp_pcktloopback.ini -../te_spudRSubConn/configs/spudRSubConnPPP.ini z:/testdata/configs/spudrsubconnppp.ini -../te_spudRSubConn/configs/spudRSubConnPPP_config.txt z:/testdata/configs/spudrsubconnppp_config.txt -../te_spudRSubConn/configs/spudRSubConnPPP_qospolicies.ini z:/testdata/configs/spudrsubconnppp_qospolicies.ini - -../te_spudRSubConn/scripts/te_spud_staticip.script z:/testdata/scripts/te_spud_staticip.script - -../te_spudRSubConn/configs/spud_staticip/socketserv.ini z:/testdata/configs/spud_staticip/socketserv.ini -../te_spudRSubConn/configs/spud_staticip/connection.ini z:/testdata/configs/spud_staticip/connection.ini -../te_spudRSubConn/configs/spud_staticip/subconnection.ini z:/testdata/configs/spud_staticip/subconnection.ini -../te_spudRSubConn/configs/spud_staticip/simtsy.ini z:/testdata/configs/spud_staticip/simtsy.ini -../te_spudRSubConn/configs/spud_staticip/te_spud_staticip.xml z:/testdata/configs/spud_staticip/te_spud_staticip.xml -../te_spudRSubConn/configs/spud_staticip/te_spud_staticip_config.txt z:/testdata/configs/spud_staticip/te_spud_staticip_config.txt -../te_spudRSubConn/configs/spud_staticip/te_spud_staticip_loopback.ini z:/testdata/configs/spud_staticip/te_spud_staticip_loopback.ini - - -PRJ_TESTMMPFILES -#include "../te_spudNetworkSide/group/bld.inf" - -../te_spudRSubConn/group/TE_SpudRSubConn.mmp - - - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/secondarypdpcontextumtsdriver/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/secondarypdpcontextumtsdriver/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,72 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Secondary PDP Context UMTS Driver +// +// + +/** + @file +*/ + +#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY + +PRJ_PLATFORMS + +DEFAULT + +PRJ_EXPORTS +#ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS +./spud.iby /epoc32/rom/include/spud.iby +#else +..\version1\inc\spud.h \epoc32\include\networking\spud.h +..\version1\inc\spudmanif.h \epoc32\include\networking\spudmanif.h +.\spud_v1.iby \epoc32\rom\include\spud.iby +#endif + + +PRJ_MMPFILES +../spudman/group/spud.mmp + +#endif //SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY + +PRJ_TESTEXPORTS + +../te_spudRSubConn/group/TE_spudRSubConn.iby /epoc32/rom/include/te_spudrsubconn.iby + +../te_spudRSubConn/scripts/TE_spudRSubConn.script z:/testdata/scripts/te_spudrsubconn.script +../te_spudRSubConn/configs/spudRSubConnPPP_loopback.xml z:/testdata/configs/spudrsubconnppp_loopback.xml +../te_spudRSubConn/configs/spudRSubConnPPP_loopback.ini z:/testdata/configs/spudrsubconnppp_loopback.ini +../te_spudRSubConn/configs/spudRSubConnPPP_pcktloopback.ini z:/testdata/configs/spudrsubconnppp_pcktloopback.ini +../te_spudRSubConn/configs/spudRSubConnPPP.ini z:/testdata/configs/spudrsubconnppp.ini +../te_spudRSubConn/configs/spudRSubConnPPP_config.txt z:/testdata/configs/spudrsubconnppp_config.txt +../te_spudRSubConn/configs/spudRSubConnPPP_qospolicies.ini z:/testdata/configs/spudrsubconnppp_qospolicies.ini + +../te_spudRSubConn/scripts/te_spud_staticip.script z:/testdata/scripts/te_spud_staticip.script + +../te_spudRSubConn/configs/spud_staticip/socketserv.ini z:/testdata/configs/spud_staticip/socketserv.ini +../te_spudRSubConn/configs/spud_staticip/connection.ini z:/testdata/configs/spud_staticip/connection.ini +../te_spudRSubConn/configs/spud_staticip/subconnection.ini z:/testdata/configs/spud_staticip/subconnection.ini +../te_spudRSubConn/configs/spud_staticip/simtsy.ini z:/testdata/configs/spud_staticip/simtsy.ini +../te_spudRSubConn/configs/spud_staticip/te_spud_staticip.xml z:/testdata/configs/spud_staticip/te_spud_staticip.xml +../te_spudRSubConn/configs/spud_staticip/te_spud_staticip_config.txt z:/testdata/configs/spud_staticip/te_spud_staticip_config.txt +../te_spudRSubConn/configs/spud_staticip/te_spud_staticip_loopback.ini z:/testdata/configs/spud_staticip/te_spud_staticip_loopback.ini + + +PRJ_TESTMMPFILES +#include "../te_spudNetworkSide/group/bld.inf" + +../te_spudRSubConn/group/TE_SpudRSubConn.mmp + + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp --- a/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component networking_spud source \sf\os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver binary \sf\os\cellularsrv\telephonyprotocols\secondarypdpcontextumtsdriver\group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/BLD.INF --- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ -// 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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Network-side events / errors SPUD testing -// -// - -/** - @file -*/ - -PRJ_EXPORTS - -PRJ_TESTEXPORTS - -#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY -// script files -../scripts/version1/TE_spudNetworkSide.script z:/testdata/scripts/te_spudnetworkside.script -../scripts/version1/TE_spudNetworkSide_nifman.script z:/testdata/scripts/te_spudnetworkside_nifman.script -../scripts/version1/TE_PppSize_spud.script z:/testdata/scripts/te_pppsize_spud.script -../scripts/version1/TE_SpudNetworkside_Channel.script z:/testdata/scripts/Te_SpudNetworkside_Channel.script -#else -// script files -../scripts/TE_spudNetworkSide.script z:/testdata/scripts/te_spudnetworkside.script -../scripts/TE_spudNetworkSide_nifman.script z:/testdata/scripts/te_spudnetworkside_nifman.script -../scripts/TE_PppSize_spud.script z:/testdata/scripts/te_pppsize_spud.script -../scripts/TE_SpudNetworkside_Channel.script z:/testdata/scripts/Te_SpudNetworkside_Channel.script -../scripts/TE_spudNetworkSide_R4_and_R5.script z:/testdata/scripts/te_spudnetworkside_r4_and_r5.script -#endif - -../scripts/TE_spudNetworkSide_ppp_9x.script z:/testdata/scripts/te_spudnetworkside_ppp.script -../configs/te_spudNetworkSide_ppp_config_9x.txt z:/testdata/configs/te_spudnetworkside_ppp_config.txt -../configs/te_spudnetworkside_ppp_config2_9x.txt z:/testdata/configs/te_spudnetworkside_ppp_config2.txt -../configs/te_spudNetworkSide_nifman_config_9x.txt z:/testdata/configs/te_spudnetworkside_nifman_config.txt -../configs/te_spudNetworkSide_config_9x.txt z:/testdata/configs/te_spudnetworkside_config.txt -../configs/te_spudNetworkSide_config_r4_and_r5.txt z:/testdata/configs/te_spudnetworkside_config_r4_and_r5.txt - -#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY -../configs/version1/te_SpudNetworkSide.xml z:/testdata/configs/te_spudnetworkside.xml -../configs/version1/te_SpudNetworkSide_ppp.xml z:/testdata/configs/te_spudnetworkside_ppp.xml -../configs/version1/TE_SpudNetworkSide_PppLoopback.xml z:/testdata/configs/te_spudnetworkside_ppploopback.xml -../configs/version1/te_SpudNetworkSide_nifman.xml z:/testdata/configs/te_spudnetworkside_nifman.xml -../configs/version1/te_spudNetworkSide.ini z:/testdata/configs/te_spudnetworkside.ini -../configs/version1/TE_SpudNetworkSideLoopbackCSY.ini z:/testdata/configs/te_spudnetworksideloopbackcsy.ini -../configs/version1/TE_SpudNetworkSideLoopbackCSY_serial.ini z:/testdata/configs/te_spudnetworksideloopbackcsy_serial.ini -../configs/version1/te_spudNetworkSide_nifman.ini z:/testdata/configs/te_spudnetworkside_nifman.ini - -../configs/version1/TE_PppSize_spud.ini z:/testdata/configs/te_pppsize_spud.ini -../configs/version1/TE_PppSize_spud.xml z:/testdata/configs/te_pppsize_spud.xml -../configs/version1/TE_PppSize_config.txt z:/testdata/configs/te_pppsize_config.txt - -../configs/version1/TE_SpudNetworkSide_Channel_config.txt z:/testdata/configs/TE_SpudNetworkSide_Channel_config.txt - -// Some error codes are platsec dependent -../configs/version1/TE_SpudNetworkSide_9x.ini z:/testdata/configs/te_spudnetworkside_platsec.ini - -#else -// requires 399 config values -../configs/te_SpudNetworkSide.xml z:/testdata/configs/te_spudnetworkside.xml -../configs/te_SpudNetworkSide_ppp.xml z:/testdata/configs/te_spudnetworkside_ppp.xml -../configs/TE_SpudNetworkSide_PppLoopback.xml z:/testdata/configs/te_spudnetworkside_ppploopback.xml -../configs/te_SpudNetworkSide_nifman.xml z:/testdata/configs/te_spudnetworkside_nifman.xml -../configs/te_spudNetworkSide_r4_and_r5.xml z:/testdata/configs/te_spudnetworkside_r4_and_r5.xml -../configs/te_spudNetworkSide.ini z:/testdata/configs/te_spudnetworkside.ini -../configs/TE_SpudNetworkSideLoopbackCSY.ini z:/testdata/configs/te_spudnetworksideloopbackcsy.ini -../configs/TE_SpudNetworkSideLoopbackCSY_serial.ini z:/testdata/configs/te_spudnetworksideloopbackcsy_serial.ini -../configs/te_spudNetworkSide_nifman.ini z:/testdata/configs/te_spudnetworkside_nifman.ini -../configs/te_spudNetworkSide_r4_and_r5.ini z:/testdata/configs/te_spudnetworkside_r4_and_r5.ini - -../configs/TE_PppSize_spud.ini z:/testdata/configs/te_pppsize_spud.ini -../configs/TE_PppSize_spud.xml z:/testdata/configs/te_pppsize_spud.xml -../configs/TE_PppSize_config.txt z:/testdata/configs/te_pppsize_config.txt - -../configs/TE_SpudNetworkSide_Channel_config.txt z:/testdata/configs/TE_SpudNetworkSide_Channel_config.txt - -// Some error codes are platsec dependent -../configs/TE_SpudNetworkSide_9x.ini z:/testdata/configs/te_spudnetworkside_platsec.ini - -//Used to trigger GuQos to use Qospolicies.ini file for SetDefaultQoS -../configs/qospolicies.ini z:/testdata/configs/qospolicies.ini - -#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY - -TE_spudNetworkSide.iby /epoc32/rom/include/te_spudnetworkside.iby - -PRJ_MMPFILES - -PRJ_TESTMMPFILES - -TE_SpudNetworkSide.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/TE_spudNetworkSide.iby --- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/TE_spudNetworkSide.iby Mon May 24 18:38:31 2010 +0100 +++ b/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/TE_spudNetworkSide.iby Tue Jun 22 11:02:32 2010 +0100 @@ -20,7 +20,7 @@ REM Feature QoS is not included in this ROM REM Temporary patch #else -file=ABI_DIR\BUILD_DIR\TE_SpudNetworkSide.exe System\Libs\TE_SpudNetworkSide.exe +file=ABI_DIR\DEBUG_DIR\TE_SpudNetworkSide.exe System\Libs\TE_SpudNetworkSide.exe #endif data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudNetworkSide.script testdata\scripts\TE_SpudNetworkSide.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,100 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Network-side events / errors SPUD testing +// +// + +/** + @file +*/ + +PRJ_EXPORTS + +PRJ_TESTEXPORTS + +#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY +// script files +../scripts/version1/TE_spudNetworkSide.script z:/testdata/scripts/te_spudnetworkside.script +../scripts/version1/TE_spudNetworkSide_nifman.script z:/testdata/scripts/te_spudnetworkside_nifman.script +../scripts/version1/TE_PppSize_spud.script z:/testdata/scripts/te_pppsize_spud.script +../scripts/version1/TE_SpudNetworkside_Channel.script z:/testdata/scripts/te_spudnetworkside_channel.script +#else +// script files +../scripts/TE_spudNetworkSide.script z:/testdata/scripts/te_spudnetworkside.script +../scripts/TE_spudNetworkSide_nifman.script z:/testdata/scripts/te_spudnetworkside_nifman.script +../scripts/TE_PppSize_spud.script z:/testdata/scripts/te_pppsize_spud.script +../scripts/TE_SpudNetworkside_Channel.script z:/testdata/scripts/te_spudnetworkside_channel.script +../scripts/TE_spudNetworkSide_R4_and_R5.script z:/testdata/scripts/te_spudnetworkside_r4_and_r5.script +#endif + +../scripts/TE_spudNetworkSide_ppp_9x.script z:/testdata/scripts/te_spudnetworkside_ppp.script +../configs/te_spudNetworkSide_ppp_config_9x.txt z:/testdata/configs/te_spudnetworkside_ppp_config.txt +../configs/te_spudnetworkside_ppp_config2_9x.txt z:/testdata/configs/te_spudnetworkside_ppp_config2.txt +../configs/te_spudNetworkSide_nifman_config_9x.txt z:/testdata/configs/te_spudnetworkside_nifman_config.txt +../configs/te_spudNetworkSide_config_9x.txt z:/testdata/configs/te_spudnetworkside_config.txt +../configs/te_spudNetworkSide_config_r4_and_r5.txt z:/testdata/configs/te_spudnetworkside_config_r4_and_r5.txt + +#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY +../configs/version1/te_SpudNetworkSide.xml z:/testdata/configs/te_spudnetworkside.xml +../configs/version1/te_SpudNetworkSide_ppp.xml z:/testdata/configs/te_spudnetworkside_ppp.xml +../configs/version1/TE_SpudNetworkSide_PppLoopback.xml z:/testdata/configs/te_spudnetworkside_ppploopback.xml +../configs/version1/te_SpudNetworkSide_nifman.xml z:/testdata/configs/te_spudnetworkside_nifman.xml +../configs/version1/te_spudNetworkSide.ini z:/testdata/configs/te_spudnetworkside.ini +../configs/version1/TE_SpudNetworkSideLoopbackCSY.ini z:/testdata/configs/te_spudnetworksideloopbackcsy.ini +../configs/version1/TE_SpudNetworkSideLoopbackCSY_serial.ini z:/testdata/configs/te_spudnetworksideloopbackcsy_serial.ini +../configs/version1/te_spudNetworkSide_nifman.ini z:/testdata/configs/te_spudnetworkside_nifman.ini + +../configs/version1/TE_PppSize_spud.ini z:/testdata/configs/te_pppsize_spud.ini +../configs/version1/TE_PppSize_spud.xml z:/testdata/configs/te_pppsize_spud.xml +../configs/version1/TE_PppSize_config.txt z:/testdata/configs/te_pppsize_config.txt + +../configs/version1/TE_SpudNetworkSide_Channel_config.txt z:/testdata/configs/te_spudnetworkside_channel_config.txt + +// Some error codes are platsec dependent +../configs/version1/TE_SpudNetworkSide_9x.ini z:/testdata/configs/te_spudnetworkside_platsec.ini + +#else +// requires 399 config values +../configs/te_SpudNetworkSide.xml z:/testdata/configs/te_spudnetworkside.xml +../configs/te_SpudNetworkSide_ppp.xml z:/testdata/configs/te_spudnetworkside_ppp.xml +../configs/TE_SpudNetworkSide_PppLoopback.xml z:/testdata/configs/te_spudnetworkside_ppploopback.xml +../configs/te_SpudNetworkSide_nifman.xml z:/testdata/configs/te_spudnetworkside_nifman.xml +../configs/te_spudNetworkSide_r4_and_r5.xml z:/testdata/configs/te_spudnetworkside_r4_and_r5.xml +../configs/te_spudNetworkSide.ini z:/testdata/configs/te_spudnetworkside.ini +../configs/TE_SpudNetworkSideLoopbackCSY.ini z:/testdata/configs/te_spudnetworksideloopbackcsy.ini +../configs/TE_SpudNetworkSideLoopbackCSY_serial.ini z:/testdata/configs/te_spudnetworksideloopbackcsy_serial.ini +../configs/te_spudNetworkSide_nifman.ini z:/testdata/configs/te_spudnetworkside_nifman.ini +../configs/te_spudNetworkSide_r4_and_r5.ini z:/testdata/configs/te_spudnetworkside_r4_and_r5.ini + +../configs/TE_PppSize_spud.ini z:/testdata/configs/te_pppsize_spud.ini +../configs/TE_PppSize_spud.xml z:/testdata/configs/te_pppsize_spud.xml +../configs/TE_PppSize_config.txt z:/testdata/configs/te_pppsize_config.txt + +../configs/TE_SpudNetworkSide_Channel_config.txt z:/testdata/configs/te_spudnetworkside_channel_config.txt + +// Some error codes are platsec dependent +../configs/TE_SpudNetworkSide_9x.ini z:/testdata/configs/te_spudnetworkside_platsec.ini + +//Used to trigger GuQos to use Qospolicies.ini file for SetDefaultQoS +../configs/qospolicies.ini z:/testdata/configs/qospolicies.ini + +#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY + +TE_spudNetworkSide.iby /epoc32/rom/include/te_spudnetworkside.iby + +PRJ_MMPFILES + +PRJ_TESTMMPFILES + +TE_SpudNetworkSide.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/BLD.INF --- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -// 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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// SPUD- RSubConnection integration testing. -// -// - -/** - @file -*/ - -PRJ_TESTEXPORTS -../scripts/TE_SpudRSubConn.script z:/testdata/scripts/TE_SpudRSubConn.script - -../configs/spudRSubConnPPP_loopback.xml z:/testdata/configs/spudRSubConnPPP_loopback.xml -../configs/spudRSUbConnPPP_loopback.ini z:/testdata/configs/spudRSubConnPPP_loopback.ini -../configs/spudRSUbConnPPP_pcktloopback.ini z:/testdata/configs/spudRSubConnPPP_pcktloopback.ini -../configs/spudRSUbConnPPP.ini z:/testdata/configs/spudRSubConnPPP.ini -../configs/spudRSubConnPPP_config.txt z:/testdata/configs/spudRSubConnPPP_config.txt -../configs/spudRSubConnPPP_qospolicies.ini z:/testdata/configs/spudRSubConnPPP_qospolicies.ini - -../scripts/te_spud_staticip.script z:/testdata/scripts/te_spud_staticip.script - -../configs/spud_staticip/socketserv.ini z:/testdata/configs/spud_staticip/socketserv.ini -../configs/spud_staticip/connection.ini z:/testdata/configs/spud_staticip/connection.ini -../configs/spud_staticip/subconnection.ini z:/testdata/configs/spud_staticip/subconnection.ini -../configs/spud_staticip/simtsy.ini z:/testdata/configs/spud_staticip/simtsy.ini -../configs/spud_staticip/te_spud_staticip.xml z:/testdata/configs/spud_staticip/te_spud_staticip.xml -../configs/spud_staticip/te_spud_staticip_config.txt z:/testdata/configs/spud_staticip/te_spud_staticip_config.txt -../configs/spud_staticip/te_spud_staticip_loopback.ini z:/testdata/configs/spud_staticip/te_spud_staticip_loopback.ini - -TE_SpudRSubConn.iby /epoc32/rom/include/TE_SpudRSubConn.iby - -PRJ_TESTMMPFILES -TE_SpudRSubConn.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudRSubConn/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,45 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// SPUD- RSubConnection integration testing. +// +// + +/** + @file +*/ + +PRJ_TESTEXPORTS +../scripts/TE_SpudRSubConn.script z:/testdata/scripts/TE_SpudRSubConn.script + +../configs/spudRSubConnPPP_loopback.xml z:/testdata/configs/spudRSubConnPPP_loopback.xml +../configs/spudRSUbConnPPP_loopback.ini z:/testdata/configs/spudRSubConnPPP_loopback.ini +../configs/spudRSUbConnPPP_pcktloopback.ini z:/testdata/configs/spudRSubConnPPP_pcktloopback.ini +../configs/spudRSUbConnPPP.ini z:/testdata/configs/spudRSubConnPPP.ini +../configs/spudRSubConnPPP_config.txt z:/testdata/configs/spudRSubConnPPP_config.txt +../configs/spudRSubConnPPP_qospolicies.ini z:/testdata/configs/spudRSubConnPPP_qospolicies.ini + +../scripts/te_spud_staticip.script z:/testdata/scripts/te_spud_staticip.script + +../configs/spud_staticip/socketserv.ini z:/testdata/configs/spud_staticip/socketserv.ini +../configs/spud_staticip/connection.ini z:/testdata/configs/spud_staticip/connection.ini +../configs/spud_staticip/subconnection.ini z:/testdata/configs/spud_staticip/subconnection.ini +../configs/spud_staticip/simtsy.ini z:/testdata/configs/spud_staticip/simtsy.ini +../configs/spud_staticip/te_spud_staticip.xml z:/testdata/configs/spud_staticip/te_spud_staticip.xml +../configs/spud_staticip/te_spud_staticip_config.txt z:/testdata/configs/spud_staticip/te_spud_staticip_config.txt +../configs/spud_staticip/te_spud_staticip_loopback.ini z:/testdata/configs/spud_staticip/te_spud_staticip_loopback.ini + +TE_SpudRSubConn.iby /epoc32/rom/include/TE_SpudRSubConn.iby + +PRJ_TESTMMPFILES +TE_SpudRSubConn.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/BWINS/TE_SPUDUNITU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/BWINS/TE_SPUDUNITU.DEF Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,4 @@ +EXPORTS + ?NewServer@@YAHXZ @ 1 NONAME ; int NewServer(void) + ?NewPdpFsmInterfaceL@@YAPAVRPdpFsmInterface@@XZ @ 2 NONAME ; class RPdpFsmInterface * NewPdpFsmInterfaceL(void) + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.iby Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,25 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +#ifndef __TE_SPUD_UNIT_IBY__ +#define __TE_SPUD_UNIT_IBY__ + +file=ABI_DIR\DEBUG_DIR\TE_SpudUnit.exe System\Libs\TE_SpudUnit.exe + +data=EPOCROOT##epoc32\data\z\testdata\configs\Spud_config.txt TestData\configs\Spud_config.txt +data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SpudUnitTest.script TestData\scripts\TE_SpudUnitTest.script + +#endif // __TE_SPUD_UNIT_IBY__ diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,103 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// SpudTel and SpudFsm unit tests +// +// + +/** + @file +*/ + +TARGET te_spudunit.exe +CAPABILITY ReadDeviceData WriteDeviceData NetworkControl NetworkServices ReadUserData WriteUserData +TARGETTYPE exe +UID 0x1000007A 0x102075B1 +VENDORID 0x70000001 + +MACRO _INFO_LOG +MACRO _ERROR_LOG + +SOURCEPATH ../src +SOURCE SpudUnitTestServer.cpp +SOURCE SpudUnitTestStepBase.cpp +SOURCE SpudFsmUnitTestStep.cpp +SOURCE SpudTelUnitTestStep.cpp +SOURCE InputRequestListener.cpp +SOURCE ActiveSchedulerThread.cpp +SOURCE CompareContextParameters.cpp +SOURCE DefaultContextParameters.cpp +SOURCE PdpFsmInterfaceTest.cpp +SOURCE SpudManInterfaceTest.cpp +SOURCE CPdpFsmInterface.cpp + + +// UmtsGprsSCPR files +SOURCEPATH ../../../src +SOURCE RSpudManInterface.cpp + +// SpudFsm source files +SOURCEPATH ../../../spudfsm/src +SOURCE cpdpfsm.cpp +SOURCE cpdpfsmfactory.cpp +SOURCE tpdpstate.cpp +SOURCE tpdpstatesuspended.cpp +SOURCE tpdpstatechangingqos.cpp +SOURCE tpdpstatechangingtft.cpp +SOURCE tpdpstateopen.cpp +SOURCE tpdpstatesettingqos.cpp +SOURCE tpdpstateinitialised.cpp +SOURCE tpdpstatecreatingprimary.cpp +SOURCE tpdpstateopeningphone.cpp +SOURCE tpdpstatecreatingSecondary.cpp +SOURCE tpdpstateactivatingsecondary.cpp +SOURCE tpdpstatecreatedSecondary.cpp +SOURCE tpdpstateactivatingprimary.cpp +SOURCE tpdpstateclosing.cpp +SOURCE tpdpstatesettingtft.cpp +SOURCE tpdpstategettingnegqos.cpp +SOURCE tpdpstatemodifingactive.cpp +SOURCE tpdpstatestopping.cpp + +// SpudTel source files +SOURCEPATH ../../../spudtel/src +SOURCE ceteldrivercontext.cpp +SOURCE ceteldriverfactory.cpp +SOURCE cservicechangenotifier.cpp +SOURCE reteldriverinput.cpp +SOURCE eteldriverstrategies.cpp +SOURCE cspudcontextelem.cpp +SOURCE ceteldrivernotifier.cpp +SOURCE cpdpstatuschangenotifier.cpp +SOURCE cqoschangenotifier.cpp +SOURCE cpdpconfigchangenotifier.cpp + + +USERINCLUDE ../inc +USERINCLUDE ../../../inc +USERINCLUDE ../../../spudtel/inc +USERINCLUDE ../../../spudfsm/inc +USERINCLUDE ../../../spudfsm/src + +SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/test + +LIBRARY euser.lib +LIBRARY testexecuteutils.lib +LIBRARY testexecutelogclient.lib +LIBRARY umtsif.lib +LIBRARY etelpckt.lib +LIBRARY etel.lib +LIBRARY c32root.lib + +DEBUGLIBRARY comsdbgutil.lib diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,36 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Test SPUD +// +// + +/** + @file +*/ + +PRJ_EXPORTS + +PRJ_TESTEXPORTS + +// script files required to run tests +..\scripts\TE_SpudUnitTest.script z:\testdata\scripts\TE_SpudUnitTest.script +..\testdata\Spud_config.txt z:\TestData\Configs\Spud_config.txt + +..\group\TE_SpudUnit.iby \epoc32\rom\include\TE_SpudUnit.iby + +PRJ_MMPFILES + +PRJ_TESTMMPFILES + +..\group\TE_SpudUnit.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CPdpFsmInterface.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CPdpFsmInterface.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,124 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +/** + @file + @internalComponent +*/ + +// NOTE: This guard define is used to prevent the real PDPFSM.h from being included. +// This file MUST be included first in test code +#ifndef PDPFSM_H +#define PDPFSM_H + + +#include +#include "RSpudManInterface.h" +#include + +class CPdpFsmFactory; + +/** +Dummy implementation of the MPdpFsmInterface that is seperated from the UmtsGprsSCPR +*/ +class CPdpFsmInterface : public MPdpFsmInterface + { +public: + //-========================================================= + // custom methods + //-========================================================= + CPdpFsmInterface(); + ~CPdpFsmInterface(); + + // We need this 'factory' method since the test harness has to have a means (albeit indirect) of + // creating the CPdpFsm objects, but within the Active Scheduler Thread (terminology from the test's + // design document). and not within the test harness (which is what happens if they get created via + // 'MPdpFsmInterface' Set() or Get() methods in this test harness). Because the 'CEtelDriverContext' + // objects that are indirectly created are added to the test thread's ActiveScheduler + // + TInt NewFsmContext(TContextId aPdpId); + + void SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam); + + //-========================================================= + // MPdpFsmInterface methods + //-========================================================= + virtual void OpenL(MSpudManInterface * aSpudManInterface, TName& aName); + virtual void Close(); + + virtual TInt Input (TContextId aPdpId, const TInt aOperation, const TInt aParam=KErrNone); + + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + virtual void SetIMCNSignalling(TBool aImCnSignalling); + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam); + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const; + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam); + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const; +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + virtual TInt Set(TContextId aPdpId, const TTFTInfo& aParam); + virtual TInt Set(TContextId aPdpId, const TTFTOperationCode& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam); + + virtual TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const; + + virtual TInt Get(TContextId aPdpId, TTFTInfo& aParam) const; + virtual TInt Get(TContextId aPdpId, TTFTOperationCode& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const; + + virtual void Set(const RPacketService::TStatus aParam); // applies to all contexts + virtual void Get(RPacketService::TStatus& aParam);// applies to all contexts + + virtual const TName& TsyName(void); + + virtual void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode); + +protected: +private: + // DO NOT provide implementations to these methods: Copying this object should be disabled + CPdpFsmInterface(CPdpFsmInterface&); + CPdpFsmInterface& operator= (CPdpFsmInterface& aInput); + +public: +protected: +private: + // FSM Factory - churns out FSMs + CPdpFsmFactory * iPdpFsmFactory; + + RPacketService::TStatus iNetworkStatus; + + RSpudManInterface iSpudManInterface; + + TBool iSpudMainInterfaceSet; +}; + +#endif +// PDPFSM_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CompareContextParameters.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CompareContextParameters.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,45 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Declarations for methods that compare various packet context related structures +// +// + +/** + @file + @internalComponent +*/ + +#ifndef COMPARE_CONTEXT_PARAMETERS +#define COMPARE_CONTEXT_PARAMETERS + +#include +#include + +TBool CompareContextConfigGPRS(const RPacketContext::TContextConfigGPRS &aFirst, const RPacketContext::TContextConfigGPRS &aSecond); +TBool CompareContextParameters(const TContextParameters& aFirst, const TContextParameters& aSecond); + +TBool ComparePacketFilterV2(const RPacketContext::TPacketFilterV2 &aFirst, const RPacketContext::TPacketFilterV2 &aSecond); +TBool CompareDataChannel(const RPacketContext::TDataChannelV2& aFirst, const RPacketContext::TDataChannelV2& aSecond); +TBool CompareTFTInfo(TTFTInfo& aTFTInfo, RPacketContext& aPacketContext); +TBool CompareContextInfo(const RPacketService& aPacketService, const TDesC& aContextName, RPacketContext::TContextStatus aContextStatus); + +TBool CompareUMTSQoSNeg(const RPacketQoS::TQoSR99_R4Negotiated &aFirst, const RPacketQoS::TQoSR99_R4Negotiated &aSecond); +TBool CompareUMTSQoSNeg(const RPacketQoS::TQoSR99_R4Requested &aFirst, const RPacketQoS::TQoSR99_R4Requested &aSecond); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +TBool CompareUMTSQoSReq(const RPacketQoS::TQoSR5Requested &aFirst, const RPacketQoS::TQoSR5Requested &aSecond); +#endif + +#endif +// COMPARE_CONTEXT_PARAMETERS diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/DefaultContextParameters.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/DefaultContextParameters.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,52 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Declarations for methods that create default various packet context related structures +// +// + +/** + @file + @internalComponent +*/ + +#ifndef DEFAULT_CONTEXT_PARAMETERS +#define DEFAULT_CONTEXT_PARAMETERS + +#include +#include + +TName& SimTsyName(); + +void DefaultContextConfigGPRS(RPacketContext::TContextConfigGPRS& aParam); + +void DefaultQoSR99_R4Requested(RPacketQoS::TQoSR99_R4Requested& aQosRequested); +void SecondQoSR99_R4Requested(RPacketQoS::TQoSR99_R4Requested& aQosRequested); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +void DefaultQoSR5Requested(RPacketQoS::TQoSR5Requested& aQosRequested); +void SecondQoSR5Requested(RPacketQoS::TQoSR5Requested& aQosRequested); +#endif + +void DefaultQoSR99_R4Negotiated(RPacketQoS::TQoSR99_R4Negotiated& aQosNegotiated); +void SecondQoSR99_R4Negotiated(RPacketQoS::TQoSR99_R4Negotiated& aQosNegotiated); + +void DefaultTftInfo(TTFTInfo& aTTFTInfo); +void SecondDefaultTftInfo(TTFTInfo& aTTFTInfo); +void CombinedDefaultTftInfo(TTFTInfo& aTTFTInfo); +void DefaultContextStatus(RPacketContext::TContextStatus& aStatus); +void DefaultServiceStatus(RPacketService::TStatus& aStatus); +void DefaultDataChannel(RPacketContext::TDataChannelV2& aDataChannel); + +#endif +// DEFAULT_CONTEXT_PARAMETERS diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/InputRequestListener.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/InputRequestListener.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,239 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Declaration for CInputRequestListener +// +// + +/** + @file + @internalComponent +*/ + +#ifndef INPUT_REQUEST_LISTENER_H +#define INPUT_REQUEST_LISTENER_H + +#include +#include + +#include "CompareContextParameters.h" +#include "reteldriverinput.h" +#include "meteldriverstrategy.h" +#include "PdpFsmInterfaceTest.h" +#include "SpudManInterfaceTest.h" +#include "cpdpfsmfactory.h" + +/** + Storage for parameters that are passed to REtelDriverInput::Input + */ +class TEtelDriverInputRequestData + { + public: + TContextId iPdpId; + EtelDriver::TEtelInput iOperation; + }; + +/** + Storage for parameters that are passed to RPdpFsmInterfaceTest::Input by SpudTel + */ +class TEtelDriverInputResponseData + { + public: + TContextId iPdpId; + TInt iSignal; + }; + +/** + Storage for parameters that are passed during Etel driver notifications + */ +class TNotifyContextConfigData + { + public: + TContextId iPdpId; + RPacketContext::TContextConfigGPRS iContextConfigGPRS; + }; + +class TNotifyPacketQosData + { + public: + TContextId iPdpId; + TNegotiatedProfileBuffer iNegotiated; + }; + +class TNotifyContextStatusData + { + public: + TContextId iPdpId; + RPacketContext::TContextStatus iContextStatus; + }; + +class TNotifyContextDataChannelData + { + public: + TContextId iPdpId; + RPacketContext::TDataChannelV2 iDataChannelV2; + }; + +/** + Storage for parameters that are passed to RPdpFsmInterface::Input by Spud man + */ +class TFsmInputRequestData + { + public: + TContextId iPdpId; + TInt iOperation; + TInt iParam; + }; + +/** + Storage for parameters that are passed to RPdpFsmInterface::Input by Etel driver + */ +class TFsmInputResponseData + { + public: + TContextId iPdpId; + TInt iEvent; + TInt iParam; + }; + +/** + Storage for parameters used for a context change notification by the FSM + */ +class TNotifyContextParametersChangeData + { + public: + TContextId iPdpId; + TNegotiatedProfileBuffer iNegotiated; + RPacketContext::TContextConfigGPRS iContextConfig; + }; + +class CInputRequestListener : public CActive + { +public: + /** + Enum of the types of requests supported by CInputRequestListener. When the iStatus is completed with + these results, the associated method is called with the corresponding parameters. + */ + enum TRequestType + { + EEtelDriverInputRequest, + EEtelDriverCancelPdpRequest, + EFsmInputRequest, + ECleanup, + EFsmObjectCreate + }; + +public: + static CInputRequestListener* NewL(TBool aUseTestPdpFsmInterface); + virtual ~CInputRequestListener(); + void Activate(); + void RunL(); + void DoCancel(); + + void CreateUnitUnderTestL(); + void DeleteUnitUnderTest(); + +private: + CInputRequestListener(TBool aUseTestPdpFsmInterface); + void ConstructL(); + + void CreateEtelDriverL(); + void CreatePdpFsmL(); + +public: + /** Set to true when testing Etel driver, and as such the test FSM interface it used to interact with Etel driver + and set to false when the real FSM is used */ + TBool iUseTestPdpFsmInterface; + /** Contains the Etel driver under test */ + REtelDriverInput* iEtelDriver; + /** Contains the RPdpFsmInterface used for Etel driver tests */ + CPdpFsmInterfaceTest *iPdpFsmInterfaceTest; + + /** Contains the RPdpFsmInterface under test */ + CPdpFsmInterface *iPdpFsmInterface; + /** Contains the RSpudManInterface used for FSM tests */ + TSpudManInterfaceTest *iSpudManInterface; + + /** The thread that test execute is running in */ + RThread iParentThread; + /** This active scheduler will run the SPUD TEL, SPUD FSM and this CActive object */ + CActiveScheduler* iScheduler; + + // contains the data that is passed to REtelDriverInput interface + TEtelDriverInputRequestData iEtelDriverInputRequestData; + TEtelDriverInputResponseData iEtelDriverInputResponseData; + TContextId iEtelDriverCancelRequestPdpId; + + // contains the data that is passed to RPdpFsmInterface::Set + TNotifyContextConfigData iNotifyContextConfigData; + TNotifyContextStatusData iNotifyContextStatusData; + TNotifyPacketQosData iNotifyQosNegotiatedData; + TNotifyContextDataChannelData iNotifyContextDataChannelData; + RPacketService::TStatus iPacketServiceStatus; + + // Data stored for FSM input requests + TFsmInputRequestData iFsmInputRequestData; + TFsmInputResponseData iFsmInputResponseData; + TNotifyContextParametersChangeData iContextParametersEventData; + TContextId iContextBlockedEventPdpId; + TContextId iContextUnblockedEventPdpId; + + /** Completed when the Active Scheduler thread is initialized and ready to handle requests */ + TRequestStatus iThreadInitialized; + /** Completed when the Active Scheduler thread has cleaned up any resources and can be destroyed */ + TRequestStatus iThreadDestructed; + + /** Must be pending before any Input requests are completed */ + TRequestStatus iReadyForInputRequest; + + /** Completed when RPdpFsmInterfaceTest::Input is called (with a non-notification aOperation parameter) */ + TRequestStatus iEtelDriverInputResponseStatus; + /** Completed when RPdpFsmInterfaceTest::Input is called with a QoS notification as the aOperation parameter */ + TRequestStatus iEtelDriverQosNotificationStatus; + /** Completed when RPdpFsmInterfaceTest::Input is called with a GPRS config notification as the aOperation parameter */ + TRequestStatus iEtelDriverConfigGPRSNotificationStatus; + /** Completed when RPdpFsmInterfaceTest::Input is called with a context status change notification as the aOperation parameter */ + TRequestStatus iEtelDriverContextStatusNotificationStatus; + /** Completed when RPdpFsmInterfaceTest::Input is called with a service status change as the aOperation parameter */ + TRequestStatus iEtelDriverServiceNotificationStatus; + + /** Completed when RSpudManInterfaceTest::Input is called (with a non-notification aOperation parameter) */ + TRequestStatus iFsmInputResponseStatus; + /** Completed when RSpudManInterfaceTest::Input is called with a service status change as the aOperation parameter */ + TRequestStatus iFsmNetworkStatusStatus; + /** Completed when RSpudManInterfaceTest::Input is called with a context status change as the aOperation parameter */ + TRequestStatus iFsmContextParameterChangeStatus; + /** Completed when RSpudManInterfaceTest::Input is called with a context blocked event as the aOperation parameter */ + TRequestStatus iFsmContextSuspendedStatus; + /** Completed when RSpudManInterfaceTest::Input is called with a context unblocked event as the aOperation parameter */ + TRequestStatus iFsmContextResumedStatus; + + /** Completed by RunL() */ + TRequestStatus iFsmObjectCreateResponse; + + }; + +/** Contains the data passed from the test execute thread to the active object thread */ +class TActiveSchedulerThreadParams + { + public: + CInputRequestListener* iListener; + TThreadId iThreadId; + }; + +/** The start-up method for the thread running the active objects */ +TInt ActiveSchedulerThread(TAny* aActiveSchedulerParams); + +#endif +// INPUT_REQUEST_LISTENER_H + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/PdpFsmInterfaceTest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/PdpFsmInterfaceTest.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,91 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Declaration of the RPdpFsmInterface for SPUD TEL unit tests +// +// + +/** + @file + @internalComponent +*/ + +#ifndef PDPFSMINTERFACETEST_H +#define PDPFSMINTERFACETEST_H + +#include "CPdpFsmInterface.h" + +// forward declarations +class CInputRequestListener; + +/** Implementation of CPdpFsmInterface used to test the Etel driver */ +class CPdpFsmInterfaceTest : public CPdpFsmInterface + { +public: + CPdpFsmInterfaceTest(CInputRequestListener& aListener); + + virtual TInt Input(TContextId aPdpId, const TInt aOperation, const TInt aParam); + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam); + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const; + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam); + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const; + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + virtual TInt Set(TContextId aPdpId, const TTFTInfo& aParam); + virtual TInt Set(TContextId aPdpId, const TTFTOperationCode& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam); + + + virtual TInt Get(TContextId aPdpId, TTFTInfo& aParam) const; + virtual TInt Get(TContextId aPdpId, TTFTOperationCode& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const; + + virtual TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const; + + virtual void Set(const RPacketService::TStatus aParam); // applies to all contexts + virtual void Get(RPacketService::TStatus& aParam); // applies to all contexts + + const TName& TsyName(); + + virtual void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode); + +private: + /** Used as the interface between the thread running the active objects and the test execute thread. + Contains the data passed to/from Input requests */ + CInputRequestListener& iListener; + /** Holds the next TFT operation code and data to be used for TFT operations */ + TTFTOperationCode iTftOperationCode; + TTFTInfo iTftInfo; + + }; + +#endif +// PDPFSMINTERFACETEST_H + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudManInterfaceTest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudManInterfaceTest.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,49 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Declaration of the SpudManInterface for SPUD FSM unit tests +// +// + +/** + @file + @internalComponent +*/ + +#ifndef SPUDMANINTERFACETEST_H +#define SPUDMANINTERFACETEST_H + +#include + +// forward declarations +class CTestRequestListener; + +/** Implementation of MSpudManInterface used to test the FSM */ +class TSpudManInterfaceTest : public MSpudManInterface + { + public: + TSpudManInterfaceTest(CInputRequestListener& aListener); + + void Input(TContextId aPdpId, TInt aEvent, TInt aParam); + + void SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode); + +private: + /** Used as the interface between the thread running the active objects and the test execute thread. + Contains the data passed to/from Input requests */ + CInputRequestListener& iListener; + }; + +#endif +// SPUDMANINTERFACETEST_H + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestServer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestServer.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,39 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +/** + @file + @internalComponent +*/ + +#ifndef SPUD_UNIT_TEST_SERVER_H +#define SPUD_UNIT_TEST_SERVER_H + +#include +#include "reteldriverinput.h" + +class CSpudUnitTestServer : public CTestServer + { +public: + static CSpudUnitTestServer* NewL(); + virtual CTestStep* CreateTestStep(const TDesC& aStepName); +private: + }; + +REtelDriverInput* NewEtelDriverInputL(); + +#endif +// SPUD_UNIT_TEST_SERVER_H + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestStep.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestStep.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,208 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Declaration of test classes for SPUD TEL and SPUD FSM unit tests +// +// + +/** + @file + @internalComponent +*/ + +#ifndef SPUD_UNIT_TEST_STEP_H +#define SPUD_UNIT_TEST_STEP_H + +#include +#include +#include + +#include "CompareContextParameters.h" +#include "meteldriverstrategy.h" +#include "eteldrivernmspace.h" +#include "pdpfsmnmspace.h" +#include "InputRequestListener.h" + +#define TEST_SETRESULT(cond,result) if (!(cond)) SetTestStepResult((result)) + +/** Identifiers for each of the simtsy parameters that can be changed using publish and subscribe */ +enum TEtelRequestType + { + /** Change QoS parameters */ + ENetworkQoSChange, + /** Change network status */ + ENetworkChangeRegStatus, + /** Change context status */ + EContextStatusChange, + /** Change context config parameters */ + EContextConfigChange + }; + +/** Contains methods common to both SPUD FSM and SPUD TEL tests */ +class CSpudUnitTestStepBase : public CTestStep + { +public: + CSpudUnitTestStepBase(TInt aTestNumber, TBool aUseTestPdpFsmInterface); + TVerdict doTestStepPreambleL(); + TVerdict doTestStepPostambleL(); + static void SetSimTsyTestNumberL(TInt aTestNumber); + +protected: + void InitPhoneAndPacketServiceL(); + void DestroyPhoneAndPacketService(); + void EtelRequest(TEtelRequestType aCommand, TInt aNewValue); + TInt iTestNumber; + + /** Used as the interface between the thread running the active objects and the test execute thread. + Contains the data passed to/from Input requests */ + CInputRequestListener *iListener; + /** Set to true when testing Etel driver, and as such the test FSM interface it used to interact with Etel driver + and set to false when the real FSM is used */ + TBool iUseTestPdpFsmInterface; + /** The thread used to run the SPUD FSM and SPUD TEL active objects */ + RThread iActiveSchedulerThread; + + /** Etel parameters that can be used in test steps */ + RTelServer iTelServer; + RPhone iPhone; + RPacketService iPacketService; + RPacketContext iPrimaryPacketContext, iSecondaryPacketContext; + }; + +/** Contains methods for SPUD TEL tests */ +class CSpudTelUnitTestStepBase : public CSpudUnitTestStepBase + { +public: + CSpudTelUnitTestStepBase(TInt aTestNumber); + +protected: + void EtelDriverInputRequest(TContextId aPdpId, EtelDriver::TEtelInput aOperation); + void CancelPdpRequest(TContextId aPdpId); + void WaitForEtelDriverInputResponse(TContextId aPdpId, PdpFsm::TEtelSignal aSignal, TInt aError=KErrNone); + + void WaitForNextContextConfigNotification(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfigGPRS); + void WaitForGivenEtelContextStatusNotification(TContextId aPdpId, RPacketContext::TContextStatus aContextStatus); + + void WaitForNextQosNotification(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQoSR99_R4Negotiated); + + void WaitForNextServiceNotificationStatus(RPacketService::TStatus aServiceStatus); + void WaitForEtelDriverSetDataChannel(TContextId aPdpId, RPacketContext::TDataChannelV2 aDataChannelV2); + }; + +/** Contains methods for SPUD FSM tests */ +class CSpudFsmUnitTestStepBase : public CSpudUnitTestStepBase + { +public: + CSpudFsmUnitTestStepBase(TInt aTestNumber); + +protected: + void FsmInputRequest(TContextId aPdpId, TInt aOperation, TInt aParam); + void WaitForFsmInputResponse(TInt aPdpId, TInt aEvent, TInt aParam); + + void FsmObjectCreate(TContextId aPdpId); + void WaitForFsmObjectCreateResponse(TInt aPdpId); + + void WaitForFsmSuspendedNotification(TContextId aPdpId); + void WaitForFsmResumedNotification(TContextId aPdpId); + void WaitForFsmServiceNotificationStatus(); + void WaitForFsmContextConfigNotification(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfig); + + void WaitForFsmQosChangeNotification(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQosParams); + + void WaitForGivenContextStatus(RPacketContext& aPacketContext, RPacketContext::TContextStatus aStatus); + }; + +/* + Declarations for SPUD TEL unit tests - they all implement constructors, destructors and override doTestStep() + */ + +#define DEFINE_SPUD_TEL_UNIT_TEST_CLASS(state) class CSpudTelUnit##state : public CSpudTelUnitTestStepBase \ + { \ +public: \ + CSpudTelUnit##state(); \ + ~CSpudTelUnit##state(); \ + virtual TVerdict doTestStepL(); \ + }; + +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(NormalOperation) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(Notifications) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(CreatePrimaryError) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(SetQosError) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(SetTftError) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(ActivateError1) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(ActivateError2) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(DeleteError1) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(DeleteError2) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(MultipleContexts) +DEFINE_SPUD_TEL_UNIT_TEST_CLASS(Cancel) + +/* + Declarations for SPUD FSM unit tests - they all implement constructors, destructors and override doTestStep() + */ + +#define DEFINE_SPUD_FSM_UNIT_TEST_CLASS(state) class CSpudFsmUnit##state : public CSpudFsmUnitTestStepBase \ +{ \ +public: \ + CSpudFsmUnit##state(); \ + ~CSpudFsmUnit##state(); \ + virtual TVerdict doTestStepL(); \ +}; + +DEFINE_SPUD_FSM_UNIT_TEST_CLASS(NormalOperation) +DEFINE_SPUD_FSM_UNIT_TEST_CLASS(CreatePrimaryError1) +DEFINE_SPUD_FSM_UNIT_TEST_CLASS(CreatePrimaryError2) +DEFINE_SPUD_FSM_UNIT_TEST_CLASS(CreatePrimaryError3) +DEFINE_SPUD_FSM_UNIT_TEST_CLASS(SetQosAndTftError) +DEFINE_SPUD_FSM_UNIT_TEST_CLASS(ChangeQosAndTftError) +DEFINE_SPUD_FSM_UNIT_TEST_CLASS(Notifications) +DEFINE_SPUD_FSM_UNIT_TEST_CLASS(NetworkDelete) + +/* + Declarations for test names used by test execute script + */ +_LIT(KSpudTelUnitNormalOperation,"SpudTelUnitNormalOperation"); +_LIT(KSpudTelUnitNotifications,"SpudTelUnitNotifications"); +_LIT(KSpudTelUnitCreatePrimaryError,"SpudTelUnitCreatePrimaryError"); +_LIT(KSpudTelUnitSetQosError,"SpudTelUnitSetQosError"); +_LIT(KSpudTelUnitSetTftError,"SpudTelUnitSetTftError"); +_LIT(KSpudTelUnitActivateError1,"SpudTelUnitActivateError1"); +_LIT(KSpudTelUnitActivateError2,"SpudTelUnitActivateError2"); +_LIT(KSpudTelUnitDeleteError1,"SpudTelUnitDeleteError1"); +_LIT(KSpudTelUnitDeleteError2,"SpudTelUnitDeleteError2"); +_LIT(KSpudTelUnitMultipleContexts,"SpudTelUnitMultipleContexts"); +_LIT(KSpudTelUnitCancel,"SpudTelUnitCancel"); +_LIT(KSpudFsmUnitNormalOperation,"SpudFsmUnitNormalOperation"); +_LIT(KSpudFsmCreatePrimaryError1,"SpudFsmCreatePrimaryError1"); +_LIT(KSpudFsmCreatePrimaryError2,"SpudFsmCreatePrimaryError2"); +_LIT(KSpudFsmCreatePrimaryError3,"SpudFsmCreatePrimaryError3"); +_LIT(KSpudFsmSetQosAndTftError,"SpudFsmSetQosAndTftError"); +_LIT(KSpudFsmChangeQosAndTftError,"SpudFsmChangeQosAndTftError"); +_LIT(KSpudFsmTestNotifications,"SpudFsmTestNotifications"); +_LIT(KSpudFsmNetworkDelete,"SpudFsmNetworkDelete"); + +/* + Declarations for names generated by SIMTSY for different contexts + */ +_LIT(KFirstPrimaryContextName, "PRIMARY1"); +_LIT(KSecondPrimaryContextName, "PRIMARY2"); +_LIT(KThirdPrimaryContextName, "PRIMARY3"); +_LIT(KFirstSecondaryContextName, "SECONDARY1"); +_LIT(KSecondSecondaryContextName, "SECONDARY2"); +_LIT(KFirstQosName, "PACKET_QOS1"); + +const TInt KContextId0 = 0; +const TInt KContextId1 = 1; +const TInt KContextId2 = 2; +const TInt KContextId3 = 3; + +#endif // SPUD_UNIT_TEST_STEP_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/scripts/TE_SpudUnitTest.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/scripts/TE_SpudUnitTest.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,282 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Secondary PDP-context UMTS Driver unit tests for SpudTel and SpudFsm. +// + + +RUN_UTILS MkDir c:\simtsy\ +RUN_UTILS MakeReadWrite c:\simtsy\config.txt +RUN_UTILS MakeReadWrite c:\config.txt +RUN_UTILS DeleteFile c:\simtsy\config.txt +RUN_UTILS DeleteFile c:\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\Spud_config.txt c:\simtsy\config.txt +RUN_UTILS CopyFile z:\TestData\Configs\Spud_config.txt c:\config.txt + +LOAD_SUITE TE_SpudUnit + + +START_TESTCASE NET-UMTS-V1-Spud-0101 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0101 +//! @SYMTestCaseDesc Test all operations on Etel driver under non-failure conditions +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation +//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification +//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification +//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation +//! @SYMTestActions Create primary and secondary contexts, set their QoS and TFTs, test activating them, and test deleting them +//! @SYMTestExpectedResults Primary context and secondary context are created, with their QoS and TFTs set, and their status is activated. When they are deleted the contexts become deleted. +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitNormalOperation +END_TESTCASE NET-UMTS-V1-Spud-0101 + +START_TESTCASE NET-UMTS-V1-Spud-0102 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0102 +//! @SYMTestCaseDesc Test Etel driver notifications +//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification +//! @SYMTestActions Create a context and change its context configuration and QoS parameters +//! @SYMTestExpectedResults When the context is activated there is a service status change notification, when the context configuration is changed there is a context config change notification, and when the QoS is changed, there is a QoS change notification +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitNotifications +END_TESTCASE NET-UMTS-V1-Spud-0102 + +START_TESTCASE NET-UMTS-V1-Spud-0103 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0103 +//! @SYMTestCaseDesc Test creating a primary context with a SetConfig error +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Instruct Etel driver to create a primary context +//! @SYMTestExpectedResults The request completes with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitCreatePrimaryError +END_TESTCASE NET-UMTS-V1-Spud-0103 + +START_TESTCASE NET-UMTS-V1-Spud-0104 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0104 +//! @SYMTestCaseDesc Test an error setting QoS +//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification +//! @SYMTestActions Instruct Etel driver to create a primary context and set its QoS +//! @SYMTestExpectedResults The set QoS request completes with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitSetQosError +END_TESTCASE NET-UMTS-V1-Spud-0104 + +START_TESTCASE NET-UMTS-V1-Spud-0105 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0105 +//! @SYMTestCaseDesc Test an error setting TFT +//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification +//! @SYMTestActions Instruct Etel driver to create a primary context and set its TFT +//! @SYMTestExpectedResults The set TFT request completes with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitSetTftError +END_TESTCASE NET-UMTS-V1-Spud-0105 + +START_TESTCASE NET-UMTS-V1-Spud-0106 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0106 +//! @SYMTestCaseDesc Test an error activating a context +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Instruct Etel driver to create then activate a primary context +//! @SYMTestExpectedResults The activation completes with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitActivateError1 +END_TESTCASE NET-UMTS-V1-Spud-0106 + +START_TESTCASE NET-UMTS-V1-Spud-0107 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0107 +//! @SYMTestCaseDesc Test an error activating a context +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Instruct Etel driver to create then activate a primary context +//! @SYMTestExpectedResults The activation completes with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitActivateError2 +END_TESTCASE NET-UMTS-V1-Spud-0107 + +START_TESTCASE NET-UMTS-V1-Spud-0108 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0108 +//! @SYMTestCaseDesc Test deleting a context with a deactivate error +//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation +//! @SYMTestActions Instruct Etel driver to create then activate then delete a primary context +//! @SYMTestExpectedResults The delete completes with an error, and all resources are still closed +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitDeleteError1 +END_TESTCASE NET-UMTS-V1-Spud-0108 + +START_TESTCASE NET-UMTS-V1-Spud-0109 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0109 +//! @SYMTestCaseDesc Test deleting a context with a context delete error +//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation +//! @SYMTestActions Instruct Etel driver to create then activate then delete a primary context +//! @SYMTestExpectedResults The delete completes with an error, and all resources are still closed +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitDeleteError2 +END_TESTCASE NET-UMTS-V1-Spud-0109 + +START_TESTCASE NET-UMTS-V1-Spud-0110 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0110 +//! @SYMTestCaseDesc Test creating multiple primary contexts +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation +//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification +//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification +//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation +//! @SYMTestActions Create 2 primary contexts, create secondary contexts on each of them, set all the contexts' QoS and TFTs, activate the contexts and delete them +//! @SYMTestExpectedResults All requests are completed successfully +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitMultipleContexts +END_TESTCASE NET-UMTS-V1-Spud-0110 + +START_TESTCASE NET-UMTS-V1-Spud-0111 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0111 +//! @SYMTestCaseDesc Test cancelling all Etel driver actions +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation +//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification +//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification +//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation +//! @SYMTestActions Instruct Etel driver to create a context and cancel the operation. Wait over a second and make sure the request never completed. Do the same for creating secondary context, setting TFT, setting QoS, activating PDP, and deleting PDP +//! @SYMTestExpectedResults The request never completes +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudTelUnitCancel +END_TESTCASE NET-UMTS-V1-Spud-0111 + +// +// SPUD FSM Unit tests +// + +START_TESTCASE NET-UMTS-V1-Spud-0112 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0112 +//! @SYMTestCaseDesc Test all state transitions in the SPUD FSM +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMFssID NETWORKING/Spud/Control Plane/Secondary PDP Context Creation +//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification +//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification +//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation +//! @SYMTestActions Test creating a primay context before and after the phone is already opened, Test creating secondary context, Test setting QOS on secondary, Test setting TFT on secondary, Test activating secondary, Test network suspending/resuming context, Test SpudMan suspending/resuming context, Test changing TFT, Test changing QOS, Test deleting contexts, Test that we can still use a context that has been deleted +//! @SYMTestExpectedResults All operations complete successfully +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudFsmUnitNormalOperation +END_TESTCASE NET-UMTS-V1-Spud-0112 + +START_TESTCASE NET-UMTS-V1-Spud-0113 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0113 +//! @SYMTestCaseDesc Test creating a primary context with an error initialising the context +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Instruct FSM to create a primary context +//! @SYMTestExpectedResults The create primary completes with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudFsmCreatePrimaryError1 +END_TESTCASE NET-UMTS-V1-Spud-0113 + +START_TESTCASE NET-UMTS-V1-Spud-0114 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0114 +//! @SYMTestCaseDesc Test creating a primary context with setting QoS +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Instruct FSM to create a primary context +//! @SYMTestExpectedResults The create primary completes with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudFsmCreatePrimaryError2 +END_TESTCASE NET-UMTS-V1-Spud-0114 + +START_TESTCASE NET-UMTS-V1-Spud-0115 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0115 +//! @SYMTestCaseDesc Test creating a primary context with an error activating +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Instruct FSM to create a primary context +//! @SYMTestExpectedResults The create primary completes with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudFsmCreatePrimaryError3 +END_TESTCASE NET-UMTS-V1-Spud-0115 + +START_TESTCASE NET-UMTS-V1-Spud-0116 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0116 +//! @SYMTestCaseDesc Test error setting QoS, TFT and activating secondary context +//! @SYMFssID NETWORKING/Spud/Control Plane/Primary PDP Context Creation +//! @SYMTestActions Instruct FSM to create a primary then secondary context. Instruct FSM to set the secondary context's QoS then TFT, then instruct FSM to activate the secondary context. +//! @SYMTestExpectedResults The contexts are created successfully. The set QoS, set TFT and activate fail with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudFsmSetQosAndTftError +END_TESTCASE NET-UMTS-V1-Spud-0116 + +START_TESTCASE NET-UMTS-V1-Spud-0117 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0117 +//! @SYMTestCaseDesc Test error changing QoS and TFT +//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification +//! @SYMTestActions Instruct FSM to create a primary then secondary context, then to activate the secondary. Instruct FSM to change the secondary context's QoS then TFT +//! @SYMTestExpectedResults The contexts are created/activated successfully. The change QoS, and change TFT fail with an error +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudFsmChangeQosAndTftError +END_TESTCASE NET-UMTS-V1-Spud-0117 + +START_TESTCASE NET-UMTS-V1-Spud-0118 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0118 +//! @SYMTestCaseDesc Test FSM notifications +//! @SYMFssID NETWORKING/Spud/Control Plane/MS initiated PDP Context Modification +//! @SYMTestActions Instruct FSM to create a primary context. Call SetConfig on the RPacketContext and SetProfileParameters on its RPacketQoS +//! @SYMTestExpectedResults Creating the context generates a packet service status change notification. SetConfig generates a context config change notification. SetProfileParameters generates a QoS change notification +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudFsmTestNotifications +END_TESTCASE NET-UMTS-V1-Spud-0118 + +START_TESTCASE NET-UMTS-V1-Spud-0119 +//! @SYMTestCaseID NET-UMTS-V1-Spud-0119 +//! @SYMFssID NETWORKING/Spud/Control Plane/Network initiated PDP Context Modification +//! @SYMFssID NETWORKING/Spud/Control Plane/ PDP Context Deactivation +//! @SYMTestActions Instruct FSM to create a primary context. Trigger a deletion of the context from Etel while the context is activating. Instruct FSM to create another primary context. Trigger a deletion of the context from Etel when the context is open. +//! @SYMTestExpectedResults Context delete events are generated, and resources associated with the contexts are cleaned up +//! @SYMTestPriority Critical +//! @SYMTestStatus Implemented +//! @SYMTestType UT +RUN_TEST_STEP 100 TE_SpudUnit SpudFsmNetworkDelete +END_TESTCASE NET-UMTS-V1-Spud-0119 + + +RUN_UTILS MakeReadWrite c:\simtsy\config.txt +RUN_UTILS MakeReadWrite c:\config.txt +RUN_UTILS DeleteFile c:\simtsy\config.txt +RUN_UTILS DeleteFile c:\config.txt + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/ActiveSchedulerThread.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/ActiveSchedulerThread.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,88 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Thread entry point functions for the test framework's thread used to run the active scheduler +// +// + +/** + @file + @internalComponent +*/ + +#include "InputRequestListener.h" +#include +#include "reteldriverinput.h" +#include "ceteldriverfactory.h" +#include "cpdpfsmfactory.h" + +/** + Creates and starts the active scheduler, and initializes the units under test + */ +void ActiveSchedulerMainL(CInputRequestListener* aListener, TThreadId aParentThreadId) + { + CActiveScheduler *sched = new(ELeave) CActiveScheduler; + CleanupStack::PushL(sched); + CActiveScheduler::Install(sched); + + aListener->iParentThread.Open(aParentThreadId); + + __UHEAP_MARK; + + CActiveScheduler::Add(aListener); + + aListener->CreateUnitUnderTestL(); + + // listen for requests from the main test thread + aListener->Activate(); + + // notify the test execute thread that we are initialized and ready to handle FSM or Etel driver Input requests + TRequestStatus *readyStatus = &aListener->iReadyForInputRequest; + aListener->iParentThread.RequestComplete(readyStatus, KErrNone); + TRequestStatus *initStatus = &aListener->iThreadInitialized; + aListener->iParentThread.RequestComplete(initStatus, KErrNone); + + CActiveScheduler::Start(); + + // this could be done in the destructor, but we do it here so that the UHEAP macros work out for this thread + // (otherwise they would be deleted in the main test thread) + aListener->DeleteUnitUnderTest(); + + __UHEAP_MARKEND; + + CleanupStack::PopAndDestroy(sched); + + // inform the main test thread that this thread is finished and that there are no memory leaks + TRequestStatus *destuctedStatus = &aListener->iThreadDestructed; + aListener->iParentThread.RequestComplete(destuctedStatus, KErrNone); + aListener->iParentThread.Close(); + } + +/** + Create the trap cleanup and calls the main thread f'n + */ +TInt ActiveSchedulerThread(TAny* aActiveSchedulerParams) + { + CTrapCleanup* cleanup = CTrapCleanup::New(); + if(!cleanup) + { + return KErrNoMemory; + } + + TActiveSchedulerThreadParams *params = (TActiveSchedulerThreadParams*)aActiveSchedulerParams; + TRAPD(err, ActiveSchedulerMainL(params->iListener, params->iThreadId)); + + delete cleanup; + + return err; + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CPdpFsmInterface.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CPdpFsmInterface.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,754 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Implementation file for the PDP Context Finite State Machine - Equivalent to CPDPFSM.CPP in SpudFsm +// +// + +/** + @file +*/ + + + + +#include "CPdpFsmInterface.h" +#include "cpdpfsmfactory.h" +#include "spudfsmdebuglogger.h" + +//-========================================================= +// Custom methods +//-========================================================= +CPdpFsmInterface::CPdpFsmInterface() +:iPdpFsmFactory(NULL), + iNetworkStatus(RPacketService::EStatusUnattached), + iSpudMainInterfaceSet(EFalse) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()"); + } + +CPdpFsmInterface::~CPdpFsmInterface() + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()"); + + CPdpFsmInterface::Close(); + delete iPdpFsmFactory; + } + + +void CPdpFsmInterface::SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam) + { + if (iSpudMainInterfaceSet) + { + iSpudManInterface.Input(aPdpId, aNotification, aParam); + } + else + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::SpudInput(): No SpudMan Interface"); + SPUDFSMVERBOSE_LOG3(_L("CPdpFsmInterface::SpudInput(): [aPdpId=%d] [aNotification=%d] [aParam=%d]"), + aPdpId, aNotification, aParam); + } + } + + + + +//-========================================================= +// MPdpFsmInterface methods +//-========================================================= +/** request to open the FSM + +@param aSpudManInterface reference to SpudMan interface +*/ +void CPdpFsmInterface::OpenL(MSpudManInterface * aSpudManInterface, TName& aTsyName) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::OpenL()"); + + if (aSpudManInterface == NULL) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface - Opened with NULL SpudMan Interface"); + } + else + { + iSpudManInterface.Init(aSpudManInterface); + iSpudMainInterfaceSet = ETrue; + } + + + iPdpFsmFactory = CPdpFsmFactory::NewL(); + iPdpFsmFactory->InitL(aTsyName, this); + } + +/** closes the FSM and frees underlying resources +*/ +void CPdpFsmInterface::Close() + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()"); + + iSpudManInterface.Close (); + + if (iPdpFsmFactory) + { + iPdpFsmFactory->Close(); + } + } + + +TInt CPdpFsmInterface::NewFsmContext(TContextId aPdpId) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::NewFsmContext()"); + + ASSERT(iPdpFsmFactory); + + return iPdpFsmFactory->NewFsmContext(aPdpId); + } + + +/** + Performs and input action/notification for context ID aPdpId + If aPdpId is KAllContexts, the notification is sent to every context, unless it is of type EServiceStatusChangeNetwork + +@param aPdpId the PDP context ID, 0 to KMaxPdpContexts +@param aOperation the operation id to perform +@param aParam extra id for ETelDriver errors +@return error code for the synchronus patrt of the operation +*/ +TInt CPdpFsmInterface::Input(TContextId aPdpId, const TInt aOperation, const TInt aParam) + { + TInt ret = KErrNone; + + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)"); + + ASSERT(iPdpFsmFactory); + + + // Control structure is in order of the most frequent operation first (hopefully) + // + if (iPdpFsmFactory->ContextIsValid(aPdpId)) + { + // We have a valid PDP FSM Context, so go ahead with the operation... + // + ret = (iPdpFsmFactory->GetFsmContext(aPdpId))->Input(aOperation, aParam); + + // Recovering memory by deleting the Fsm Context + // + // Tricky, definitely don't try with 'SpudMan::EContextDelete' it's far too early. + // You can get a bit further deleting on 'PdpFsm::EContextDeleted' (and 'PdpFsm::EContextDeletedFailed') + // from TContextDeleteStrategy::NotifyFsm(), but you then find that GuQoS is calling into Spud in order to + // transfer data from the deleted context to another... + // + // Additionally, the spud unit test is expecting to be able to "reuse" deleted contexts... + } + else if (aPdpId == KAllContexts) + { + TInt err = KErrNone; + + // this has to be here to avoid sending it from every context + // + if (aOperation == PdpFsm::EServiceStatusChangeNetwork) + { + iPdpFsmFactory->SpudInput(KAllContexts, KNetworkStatusEvent, KErrNone); + } + else + { + for (TContextId i = 0; (i < KMaxPdpContexts) && iPdpFsmFactory->HaveFsmContext(i); i++) + { + // Process any current PDP contexts. + + err = (iPdpFsmFactory->GetFsmContext(i))->Input(aOperation, aParam); + + // See above about trials and tribulations of trying to recover the memory taken by these + // CPdpFsm objects. + + if (err != KErrNone) + { + // We return the last error found, ignoring any earlier ones + // + ret = err; + } + } + } + } + else + { + ret = KErrBadHandle; + } + + return ret; + } + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1 +@param aParam - RPacketQoS::TQoSR5Requested data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; +} + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR5Negotiated data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; +} + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +/** +Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Requested data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + + return KErrNone; + } + + + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + + + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TFTInfo data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TFTOperationCode to set to go with the data +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TDataChannelV2 data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextStatus data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextConfigGPRS& data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set network status + +@param aParam - RPacketService::TStatus data to set +*/ +void CPdpFsmInterface::Set(const RPacketService::TStatus aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)"); + + ASSERT(iPdpFsmFactory); + + iNetworkStatus = aParam; + } + +/** Set ETel termination error and stop context + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aErrorCode - the Etel error code detected on this context +*/ +void CPdpFsmInterface::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode)"); + + iSpudManInterface.SetContextTerminationErrorAndStop(aPdpId, aErrorCode); + + +} + + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR5Requested data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; +} + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1 +@param aParam - RPacketQoS::TQoSR5Negotiated data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; +} + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Requested data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1 +@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TTFTInfo data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TTFTOperationCode for the TFT data +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TDataChannelV2 data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextConfigGPRS data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextStatus data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextConfigGPRS data to set +@return - KErrBadHandle or KErrNone +*/ +void CPdpFsmInterface::Get(RPacketService::TStatus& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)"); + + ASSERT(iPdpFsmFactory); + + aParam = iNetworkStatus; + } + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +void CPdpFsmInterface::SetIMCNSignalling(TBool/* aImCnSignalling*/) + { + + } +#endif //SYMBIAN_NETWORKING_UMTSR5 + +TInt CPdpFsmInterface::GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::GetLastErrorCause(RPacketContext::GetLastErrorCause)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + + iPdpFsmFactory->GetFsmContext(aPdpId)->GetLastErrorCause(aLastErrorCause); + + return KErrNone; + } + +/** Get the TsyName + +@return - TsyName in a TName +*/ +const TName& CPdpFsmInterface::TsyName(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName"); + + ASSERT(iPdpFsmFactory); + + return iPdpFsmFactory->TsyName(); + } + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CompareContextParameters.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CompareContextParameters.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,727 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Compares various packet context related structures +// +// + +/** + @file + @internalComponent +*/ + +#include "CompareContextParameters.h" + +/** + @return ETrue if the TContextInfo parameters match, EFalse if they don't + */ +TBool CompareContextInfo(const TContextInfo& aFirst, const TContextInfo& aSecond) + { + if (aFirst.iContextId != aSecond.iContextId) + { + return EFalse; + } + if (aFirst.iStatus != aSecond.iStatus) + { + return EFalse; + } + return ETrue; + } + +/** + @return ETrue if the RPacketQoS::TBitRate parameters match, EFalse if they don't + */ +TBool CompareBitRate(const RPacketQoS::TBitRate &aFirst, const RPacketQoS::TBitRate &aSecond) + { + if (aFirst.iDownlinkRate != aSecond.iDownlinkRate) + { + return EFalse; + } + if (aFirst.iUplinkRate != aSecond.iUplinkRate) + { + return EFalse; + } + return ETrue; + } + +/** + @return ETrue if the RPacketQoS::TQoSR99_R4Requested parameters match, EFalse if they don't + */ +TBool CompareUMTSQoSReq(const RPacketQoS::TQoSR99_R4Requested &aFirst, const RPacketQoS::TQoSR99_R4Requested &aSecond) + { + if (aFirst.iReqTrafficClass != aSecond.iReqTrafficClass) + { + return EFalse; + } + if (aFirst.iMinTrafficClass != aSecond.iMinTrafficClass) + { + return EFalse; + } + if (aFirst.iReqDeliveryOrderReqd != aSecond.iReqDeliveryOrderReqd) + { + return EFalse; + } + if (aFirst.iMinDeliveryOrderReqd != aSecond.iMinDeliveryOrderReqd) + { + return EFalse; + } + if (aFirst.iReqDeliverErroneousSDU != aSecond.iReqDeliverErroneousSDU) + { + return EFalse; + } + if (aFirst.iMinDeliverErroneousSDU != aSecond.iMinDeliverErroneousSDU) + { + return EFalse; + } + if (aFirst.iReqMaxSDUSize != aSecond.iReqMaxSDUSize) + { + return EFalse; + } + if (aFirst.iMinAcceptableMaxSDUSize != aSecond.iMinAcceptableMaxSDUSize) + { + return EFalse; + } + if (!CompareBitRate(aFirst.iReqMaxRate, aSecond.iReqMaxRate)) + { + return EFalse; + } + if (!CompareBitRate(aFirst.iMinAcceptableMaxRate, aSecond.iMinAcceptableMaxRate)) + { + return EFalse; + } + if (aFirst.iReqBER != aSecond.iReqBER) + { + return EFalse; + } + if (aFirst.iMaxBER != aSecond.iMaxBER) + { + return EFalse; + } + if (aFirst.iReqSDUErrorRatio != aSecond.iReqSDUErrorRatio) + { + return EFalse; + } + if (aFirst.iMaxSDUErrorRatio != aSecond.iMaxSDUErrorRatio) + { + return EFalse; + } + if (aFirst.iReqTrafficHandlingPriority != aSecond.iReqTrafficHandlingPriority) + { + return EFalse; + } + if (aFirst.iMinTrafficHandlingPriority != aSecond.iMinTrafficHandlingPriority) + { + return EFalse; + } + if (aFirst.iReqTransferDelay != aSecond.iReqTransferDelay) + { + return EFalse; + } + if (aFirst.iMaxTransferDelay != aSecond.iMaxTransferDelay) + { + return EFalse; + } + if (aFirst.iReqGuaranteedRate.iDownlinkRate != aSecond.iReqGuaranteedRate.iDownlinkRate) + { + return EFalse; + } + if (aFirst.iReqGuaranteedRate.iUplinkRate != aSecond.iReqGuaranteedRate.iUplinkRate) + { + return EFalse; + } + if (aFirst.iMinGuaranteedRate.iDownlinkRate != aSecond.iMinGuaranteedRate.iDownlinkRate) + { + return EFalse; + } + if (aFirst.iMinGuaranteedRate.iUplinkRate != aSecond.iMinGuaranteedRate.iUplinkRate) + { + return EFalse; + } + return ETrue; + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +TBool CompareUMTSQoSReq(const RPacketQoS::TQoSR5Requested &aFirst, const RPacketQoS::TQoSR5Requested &aSecond) + { + TBool result = CompareUMTSQoSReq(static_cast(aFirst), + static_cast(aSecond)); + + if (!result) + { + return EFalse; + } + + if (aFirst.iSignallingIndication != aSecond.iSignallingIndication) + { + return EFalse; + } + + if (aFirst.iSourceStatisticsDescriptor != aSecond.iSourceStatisticsDescriptor) + { + return EFalse; + } + + return ETrue; + } +#endif + + +/** + @return ETrue if the TContextConfig parameters match, EFalse if they don't + */ +TBool CompareUMTSQoSReq(const TContextConfig& aFirst, const TContextConfig& aSecond) + { +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested firstUMTSQoSRequest, secondUMTSQoSRequest; + aFirst.GetUMTSQoSReq(firstUMTSQoSRequest); + aSecond.GetUMTSQoSReq(secondUMTSQoSRequest); + +#else + RPacketQoS::TQoSR99_R4Requested firstUMTSQoSRequest, secondUMTSQoSRequest; + aFirst.GetUMTSQoSReq(firstUMTSQoSRequest); + aSecond.GetUMTSQoSReq(secondUMTSQoSRequest); +#endif + + return CompareUMTSQoSReq(firstUMTSQoSRequest, secondUMTSQoSRequest); + } + + + + +/** + @return ETrue if the IP address parameters match, EFalse if they don't + */ +TBool CompareIPAddress(const TUint8* aFirst, const TUint8* aSecond) + { + for (TUint i = 0; i < RPacketContext::KIPAddressSize; i++) + { + if (aFirst[i] != aSecond[i]) + { + return EFalse; + } + } + return ETrue; + } + +/** + @return ETrue if the RPacketContext::TPacketFilterV2 parameters match, EFalse if they don't + */ +TBool ComparePacketFilterV2(const RPacketContext::TPacketFilterV2 &aFirst, const RPacketContext::TPacketFilterV2 &aSecond) + { + if (aFirst.iId != aSecond.iId) + { + return EFalse; + } + if (aFirst.iEvaluationPrecedenceIndex != aSecond.iEvaluationPrecedenceIndex) + { + return EFalse; + } + if (!CompareIPAddress((TUint8*)aFirst.iSrcAddr, (TUint8*)aSecond.iSrcAddr)) + { + return EFalse; + } + if (!CompareIPAddress((TUint8*)aFirst.iSrcAddrSubnetMask, (TUint8*)aSecond.iSrcAddrSubnetMask)) + { + return EFalse; + } + if (aFirst.iProtocolNumberOrNextHeader != aSecond.iProtocolNumberOrNextHeader) + { + return EFalse; + } + if (aFirst.iSrcPortMin != aSecond.iSrcPortMin) + { + return EFalse; + } + if (aFirst.iSrcPortMax != aSecond.iSrcPortMax) + { + return EFalse; + } + if (aFirst.iDestPortMin != aSecond.iDestPortMin) + { + return EFalse; + } + if (aFirst.iDestPortMax != aSecond.iDestPortMax) + { + return EFalse; + } + if (aFirst.iIPSecSPI != aSecond.iIPSecSPI) + { + return EFalse; + } + if (aFirst.iTOSorTrafficClass != aSecond.iTOSorTrafficClass) + { + return EFalse; + } + if (aFirst.iFlowLabel != aSecond.iFlowLabel) + { + return EFalse; + } + return ETrue; + } + +/** + @return ETrue if the TTFTInfo parameters match, EFalse if they don't + */ +TBool CompareTFTInfo(TTFTInfo &aFirst, TTFTInfo &aSecond) + { + if (aFirst.FilterCount() != aSecond.FilterCount()) + { + return EFalse; + } + + for (TUint8 i = 0; i < aFirst.FilterCount(); i++) + { + RPacketContext::TPacketFilterV2 firstPacketFilter, secondPacketFilter; + aFirst.GetPacketFilter(firstPacketFilter); + aSecond.GetPacketFilter(secondPacketFilter); + if (!ComparePacketFilterV2(firstPacketFilter, secondPacketFilter)) + { + return EFalse; + } + } + return ETrue; + } + +/** + @return ETrue if the TContextConfig parameters match, EFalse if they don't + */ +TBool CompareTFTInfo(const TContextConfig& aFirst, const TContextConfig& aSecond) + { + TTFTInfo firstTFTInfo, secondTFTInfo; + aFirst.GetTFTInfo(firstTFTInfo); + aSecond.GetTFTInfo(secondTFTInfo); + return CompareTFTInfo(firstTFTInfo, secondTFTInfo); + } + + +/** + @return ETrue if the RPacketQoS::TQoSR99_R4Negotiated parameters match, EFalse if they don't + */ +TBool CompareUMTSQoSNeg(const RPacketQoS::TQoSR99_R4Negotiated &aFirst, const RPacketQoS::TQoSR99_R4Negotiated &aSecond) + { + if (aFirst.iTrafficClass != aSecond.iTrafficClass) + { + return EFalse; + } + if (aFirst.iDeliveryOrderReqd != aSecond.iDeliveryOrderReqd) + { + return EFalse; + } + if (aFirst.iDeliverErroneousSDU != aSecond.iDeliverErroneousSDU) + { + return EFalse; + } + if (aFirst.iMaxSDUSize != aSecond.iMaxSDUSize) + { + return EFalse; + } + if (!CompareBitRate(aFirst.iMaxRate, aSecond.iMaxRate)) + { + return EFalse; + } + if (aFirst.iBER != aSecond.iBER) + { + return EFalse; + } + if (aFirst.iSDUErrorRatio != aSecond.iSDUErrorRatio) + { + return EFalse; + } + if (aFirst.iTrafficHandlingPriority != aSecond.iTrafficHandlingPriority) + { + return EFalse; + } + if (aFirst.iTransferDelay != aSecond.iTransferDelay) + { + return EFalse; + } + if (!CompareBitRate(aFirst.iGuaranteedRate, aSecond.iGuaranteedRate)) + { + return EFalse; + } + return ETrue; + } + +/** + @return ETrue if the RPacketQoS::TBitRate parameters match, EFalse if they don't + */ +TBool CompareUMTSQoSNeg(const TContextConfig& aFirst, const TContextConfig& aSecond) + { + RPacketQoS::TQoSR99_R4Negotiated firstUMTSQoS, secondUMTSQoS; + aFirst.GetUMTSQoSNeg(firstUMTSQoS); + aSecond.GetUMTSQoSNeg(secondUMTSQoS); + return CompareUMTSQoSNeg(firstUMTSQoS, secondUMTSQoS); + } + + + + + +/** + @return ETrue if the RPacketContext::TAuthInfo parameters match, EFalse if they don't + */ +TBool CompareAuthInfo(const RPacketContext::TAuthInfo &aFirst, const RPacketContext::TAuthInfo &aSecond) + { + if (aFirst.iProtocol != aSecond.iProtocol) + { + return EFalse; + } + if (aFirst.iUsername != aSecond.iUsername) + { + return EFalse; + } + if (aFirst.iPassword != aSecond.iPassword) + { + return EFalse; + } + return ETrue; + } + +/** + @return ETrue if the RPacketContext::TDnsInfoV2 parameters match, EFalse if they don't + */ +TBool CompareDnsInfoV2(const RPacketContext::TDnsInfoV2 &aFirst, const RPacketContext::TDnsInfoV2 &aSecond) + { + if (aFirst.iPrimaryDns != aSecond.iPrimaryDns) + { + return EFalse; + } + if (aFirst.iSecondaryDns != aSecond.iSecondaryDns) + { + return EFalse; + } + return ETrue; + } + +/** + @return ETrue if the RPacketContext::TProtocolConfigOptionV2 parameters match, EFalse if they don't + */ +TBool CompareProtocolConfigOptionV2(const RPacketContext::TProtocolConfigOptionV2 &aFirst, const RPacketContext::TProtocolConfigOptionV2 &aSecond) + { + if (!CompareAuthInfo(aFirst.iAuthInfo, aSecond.iAuthInfo)) + { + return EFalse; + } + if (aFirst.iChallenge != aSecond.iChallenge) + { + return EFalse; + } + if (aFirst.iResponse != aSecond.iResponse) + { + return EFalse; + } + if (aFirst.iId != aSecond.iId) + { + return EFalse; + } + if (!CompareDnsInfoV2(aFirst.iDnsAddresses, aSecond.iDnsAddresses)) + { + return EFalse; + } + if (aFirst.iMiscBuffer != aSecond.iMiscBuffer) + { + return EFalse; + } + return ETrue; + } + +/** + @return ETrue if the RPacketContext::TContextConfigGPRS parameters match, EFalse if they don't + */ +TBool CompareContextConfigGPRS(const RPacketContext::TContextConfigGPRS &aFirst, const RPacketContext::TContextConfigGPRS &aSecond) + { + if (aFirst.iPdpType != aSecond.iPdpType) + { + return EFalse; + } + if (aFirst.iAccessPointName != aSecond.iAccessPointName) + { + return EFalse; + } + if (aFirst.iPdpAddress != aSecond.iPdpAddress) + { + return EFalse; + } + if (aFirst.iPdpCompression != aSecond.iPdpCompression) + { + return EFalse; + } + if (aFirst.iAnonymousAccessReqd != aSecond.iAnonymousAccessReqd) + { + return EFalse; + } + if (aFirst.iUseEdge != aSecond.iUseEdge) + { + return EFalse; + } + if (!CompareProtocolConfigOptionV2(aFirst.iProtocolConfigOption, aSecond.iProtocolConfigOption)) + { + return EFalse; + } + if (aFirst.iNWIContext != aSecond.iNWIContext) + { + return EFalse; + } + return ETrue; + } + +/** + @return ETrue if the TContextConfig parameters match, EFalse if they don't + */ +TBool CompareContextConfigGPRS(const TContextConfig& aFirst, const TContextConfig& aSecond) + { + RPacketContext::TContextConfigGPRS firstUMTSConfig, secondUMTSConfig; + aFirst.GetContextConfig(firstUMTSConfig); + aSecond.GetContextConfig(secondUMTSConfig); + return CompareContextConfigGPRS(firstUMTSConfig, secondUMTSConfig); + } + +/** + @return ETrue if the RPacketQoS::TBitRate parameters match, EFalse if they don't + */ +TBool CompareAccessPointName(const RPacketContext::TGSNAddress &aFirst, const RPacketContext::TGSNAddress &aSecond) + { + if (aFirst.Compare(aSecond) == 0) + { + return ETrue; + } + else + { + return EFalse; + } + } + +/** + @return ETrue if the TContextConfig parameters match, EFalse if they don't + */ +TBool CompareAccessPointName(const TContextConfig& aFirst, const TContextConfig& aSecond) + { + RPacketContext::TGSNAddress firstAccessPointName, secondAccessPointName; + aFirst.GetAccessPointName(firstAccessPointName); + aSecond.GetAccessPointName(secondAccessPointName); + return CompareAccessPointName(firstAccessPointName, secondAccessPointName); + } + +/** + @return ETrue if the RPacketContext::TProtocolAddress parameters match, EFalse if they don't + */ +TBool ComparePdpAddress(const RPacketContext::TProtocolAddress &aFirst, const RPacketContext::TProtocolAddress &aSecond) + { + if (aFirst.Compare(aSecond) == 0) + { + return ETrue; + } + else + { + return EFalse; + } + } + +/** + @return ETrue if the TContextConfig parameters match, EFalse if they don't + */ +TBool ComparePdpAddress(const TContextConfig& aFirst, const TContextConfig& aSecond) + { + RPacketContext::TProtocolAddress firstPdpAddress, secondPdpAddress; + aFirst.GetPdpAddress(firstPdpAddress); + aSecond.GetPdpAddress(secondPdpAddress); + return ComparePdpAddress(firstPdpAddress, secondPdpAddress); + } + +/** + @return ETrue if the TContextConfig parameters match, EFalse if they don't + */ +TBool CompareContextConfig(const TContextConfig& aFirst, const TContextConfig& aSecond) + { + if (!CompareUMTSQoSReq(aFirst, aSecond)) + { + return EFalse; + } + + if (!CompareTFTInfo(aFirst, aSecond)) + { + return EFalse; + } + if (!CompareUMTSQoSNeg(aFirst, aSecond)) + { + return EFalse; + } + if (!CompareContextConfigGPRS(aFirst, aSecond)) + { + return EFalse; + } + + TUint firstPdpCompression, secondPdpCompression; + aFirst.GetPdpCompression(firstPdpCompression); + aSecond.GetPdpCompression(secondPdpCompression); + if (firstPdpCompression != secondPdpCompression) + { + return EFalse; + } + + RPacketContext::TProtocolType firstPdpType, secondPdpType; + aFirst.GetPdpType(firstPdpType); + aSecond.GetPdpType(secondPdpType); + if (firstPdpType != secondPdpType) + { + return EFalse; + } + + if (!CompareAccessPointName(aFirst, aSecond)) + { + return EFalse; + } + + if (!ComparePdpAddress(aFirst, aSecond)) + { + return EFalse; + } + + return ETrue; + } + +/** + @return ETrue if the TContextParameters parameters match, EFalse if they don't + */ +TBool CompareContextParameters(const TContextParameters& aFirst, const TContextParameters& aSecond) + { + if (aFirst.iContextType != aSecond.iContextType) + { + return EFalse; + } + + if (!CompareContextInfo(aFirst.iContextInfo, aSecond.iContextInfo)) + { + return EFalse; + } + + if (!CompareContextConfig(aFirst.iContextConfig, aSecond.iContextConfig)) + { + return EFalse; + } + + if (aFirst.iReasonCode != aSecond.iReasonCode) + { + return EFalse; + } + + if (aFirst.iTFTOperationCode != aSecond.iTFTOperationCode) + { + return EFalse; + } + + return ETrue; + } + +/** + @return ETrue if the RPacketContext::TDataChannelV2 parameters match, EFalse if they don't + */ +TBool CompareDataChannel(const RPacketContext::TDataChannelV2& aFirst, const RPacketContext::TDataChannelV2& aSecond) + { + if (aFirst.iCsy.Compare(aSecond.iCsy) != 0) + { + return EFalse; + } + if (aFirst.iPort.Compare(aSecond.iPort) != 0) + { + return EFalse; + } + if (aFirst.iChannelId.Compare(aSecond.iChannelId) != 0) + { + return EFalse; + } + return ETrue; + } + +/** + @return ETrue if the TTFTInfo parameter matches the TFTs of the packet context aPacketContext, EFalse if they don't + */ +TBool CompareTFTInfo(TTFTInfo& aTFTInfo, RPacketContext& aPacketContext) + { + RPacketContext::TPacketFilterV2 packetFilter; + RPacketContext::TPacketFilterV2Pckg packetFilterPckg(packetFilter); + RPacketContext::TPacketFilterV2 expectedTftInfo; + TRequestStatus status; + TInt count; + + // make sure the count matches up + aPacketContext.EnumeratePacketFilters(status, count); + User::WaitForRequest(status); + if (status != KErrNone) + { + return EFalse; + } + if (count != aTFTInfo.FilterCount()) + { + return EFalse; + } + + // The filters indexed by the second parameter of RPacketContext::GetPacketFilterInfo may not be contiguous, + // so we go through each filter assigned to context aPacketContext and try to find a match in aTFTInfo + TInt matchingCount = 0; + for (TUint packetContextIndex = 0; packetContextIndex < KMaxNumberOfPacketFilters; packetContextIndex++) + { + TBool foundMatch = EFalse; + aPacketContext.GetPacketFilterInfo(status, packetContextIndex, packetFilterPckg); + User::WaitForRequest(status); + aTFTInfo.SetToFirst(); + for (TInt tftInfoIndex = 0; tftInfoIndex < aTFTInfo.FilterCount() && !foundMatch; tftInfoIndex++) + { + aTFTInfo.NextPacketFilter(expectedTftInfo); + if (ComparePacketFilterV2(packetFilter, expectedTftInfo)) + { + matchingCount++; + if (matchingCount == aTFTInfo.FilterCount()) + { + return ETrue; + } + else + { + foundMatch = ETrue; + } + } + } + } + return EFalse; + } + +/** + @return ETrue if the context status of context aContext names matches that of aContextStatus, EFalse if they don't + */ +TBool CompareContextInfo(const RPacketService& aPacketService, const TDesC& aContextName, RPacketContext::TContextStatus aContextStatus) + { + TRequestStatus status; + RPacketService::TContextInfo contextInfo; + TInt numContexts, dummy; + aPacketService.EnumerateContexts(status, numContexts, dummy); + User::WaitForRequest(status); + for (TInt i = 0; i < numContexts; i++) + { + aPacketService.GetContextInfo(status, i, contextInfo); + User::WaitForRequest(status); + if (aContextName.Compare(contextInfo.iName) == 0) + { + if (status != KErrNone) + { + return EFalse; + } + if (contextInfo.iStatus != aContextStatus) + { + return EFalse; + } + return ETrue; + } + } + return EFalse; + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/DefaultContextParameters.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/DefaultContextParameters.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,281 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Assigns default values to various packet context related structures +// +// + +/** + @file + @internalComponent +*/ + +#include "DefaultContextParameters.h" + +_LIT(KTxtSimTsy,"SIM"); +TName KSimTsyName(KTxtSimTsy); +TName& SimTsyName() + { + return KSimTsyName; + } + +_LIT(apn, "ACME INTERNET PROVIDERS LTD"); +_LIT(protocolAddress, "i-MODE GATEWAY"); +_LIT(username, "USER1"); +_LIT(password, "PASSWORD1"); +_LIT(challenge, "CHALLENGE1"); +_LIT(response, "RESPONSE1"); +_LIT(primaryDNS, "PRIMARYSERVER1"); +_LIT(secondaryDNS, "SECONDARYSERVER1"); + +void DefaultContextConfigGPRS(RPacketContext::TContextConfigGPRS& aParam) + { + aParam.iPdpType = static_cast(1); + aParam.iAccessPointName.Copy(apn); + aParam.iPdpAddress.Copy(protocolAddress); + aParam.iPdpCompression = 1; + aParam.iAnonymousAccessReqd = static_cast(1); + aParam.iUseEdge = ETrue; + aParam.iProtocolConfigOption.iAuthInfo.iProtocol = static_cast(1); + aParam.iProtocolConfigOption.iAuthInfo.iUsername.Copy(username); + aParam.iProtocolConfigOption.iAuthInfo.iPassword.Copy(password); + aParam.iProtocolConfigOption.iChallenge.Copy(challenge); + aParam.iProtocolConfigOption.iResponse.Copy(response); + aParam.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Copy(primaryDNS); + aParam.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Copy(secondaryDNS); + aParam.iProtocolConfigOption.iId = 1; + } + +void DefaultQoSR99_R4Requested(RPacketQoS::TQoSR99_R4Requested& aQosRequested) + { + aQosRequested.iReqTrafficClass = static_cast(2); + aQosRequested.iMinTrafficClass = static_cast(2); + aQosRequested.iReqDeliveryOrderReqd = static_cast(2); + aQosRequested.iMinDeliveryOrderReqd = static_cast(2); + aQosRequested.iReqDeliverErroneousSDU = static_cast(2); + aQosRequested.iMinDeliverErroneousSDU = static_cast(2); + aQosRequested.iReqMaxSDUSize = 2; + aQosRequested.iMinAcceptableMaxSDUSize = 2; + aQosRequested.iReqMaxRate.iUplinkRate = 2; + aQosRequested.iReqMaxRate.iDownlinkRate = 2; + aQosRequested.iMinGuaranteedRate.iUplinkRate = 2; + aQosRequested.iMinGuaranteedRate.iDownlinkRate = 2; + aQosRequested.iReqBER = static_cast(2); + aQosRequested.iMaxBER = static_cast(2); + aQosRequested.iReqSDUErrorRatio = static_cast(2); + aQosRequested.iMaxSDUErrorRatio = static_cast(2); + aQosRequested.iReqTrafficHandlingPriority = static_cast(2); + aQosRequested.iMinTrafficHandlingPriority = static_cast(2); + aQosRequested.iReqTransferDelay = 2; + aQosRequested.iMaxTransferDelay = 2; + aQosRequested.iReqGuaranteedRate.iUplinkRate = 2; + aQosRequested.iReqGuaranteedRate.iDownlinkRate = 2; + aQosRequested.iMinGuaranteedRate.iUplinkRate = 2; + aQosRequested.iMinGuaranteedRate.iDownlinkRate = 2; + } + +void SecondQoSR99_R4Requested(RPacketQoS::TQoSR99_R4Requested& aQosRequested) + { + aQosRequested.iReqTrafficClass = static_cast(1); + aQosRequested.iMinTrafficClass = static_cast(1); + aQosRequested.iReqDeliveryOrderReqd = static_cast(1); + aQosRequested.iMinDeliveryOrderReqd = static_cast(1); + aQosRequested.iReqDeliverErroneousSDU = static_cast(1); + aQosRequested.iMinDeliverErroneousSDU = static_cast(1); + aQosRequested.iReqMaxSDUSize = 1; + aQosRequested.iMinAcceptableMaxSDUSize = 1; + aQosRequested.iReqMaxRate.iUplinkRate = 1; + aQosRequested.iReqMaxRate.iDownlinkRate = 1; + aQosRequested.iMinGuaranteedRate.iUplinkRate = 1; + aQosRequested.iMinGuaranteedRate.iDownlinkRate = 1; + aQosRequested.iReqBER = static_cast(1); + aQosRequested.iMaxBER = static_cast(1); + aQosRequested.iReqSDUErrorRatio = static_cast(1); + aQosRequested.iMaxSDUErrorRatio = static_cast(1); + aQosRequested.iReqTrafficHandlingPriority = static_cast(1); + aQosRequested.iMinTrafficHandlingPriority = static_cast(1); + aQosRequested.iReqTransferDelay = 1; + aQosRequested.iMaxTransferDelay = 1; + aQosRequested.iReqGuaranteedRate.iUplinkRate = 1; + aQosRequested.iReqGuaranteedRate.iDownlinkRate = 1; + aQosRequested.iMinGuaranteedRate.iUplinkRate = 1; + aQosRequested.iMinGuaranteedRate.iDownlinkRate = 1; + } + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +void DefaultQoSR5Requested(RPacketQoS::TQoSR5Requested& aQosRequested) + { + DefaultQoSR99_R4Requested (aQosRequested); + aQosRequested.iSignallingIndication = EFalse; + aQosRequested.iSignallingIndication = RPacketQoS::ESourceStatisticsDescriptorUnknown; + } + +void SecondQoSR5Requested(RPacketQoS::TQoSR5Requested& aQosRequested) + { + SecondQoSR99_R4Requested (aQosRequested); + aQosRequested.iSignallingIndication = EFalse; + aQosRequested.iSignallingIndication = RPacketQoS::ESourceStatisticsDescriptorUnknown; + } + +#endif + +void DefaultQoSR99_R4Negotiated(RPacketQoS::TQoSR99_R4Negotiated& aQosNegotiated) + { + aQosNegotiated.iTrafficClass = static_cast(1); + aQosNegotiated.iDeliveryOrderReqd = static_cast(1); + aQosNegotiated.iDeliverErroneousSDU = static_cast(1); + aQosNegotiated.iMaxSDUSize = 1; + aQosNegotiated.iBER = static_cast(1); + aQosNegotiated.iSDUErrorRatio = static_cast(1); + aQosNegotiated.iTrafficHandlingPriority = static_cast(1); + aQosNegotiated.iTransferDelay = 1; + aQosNegotiated.iGuaranteedRate.iUplinkRate = 1; + aQosNegotiated.iGuaranteedRate.iDownlinkRate = 1; + aQosNegotiated.iMaxRate.iUplinkRate = 1; + aQosNegotiated.iMaxRate.iDownlinkRate = 1; + } + +void SecondQoSR99_R4Negotiated(RPacketQoS::TQoSR99_R4Negotiated& aQosNegotiated) + { + aQosNegotiated.iTrafficClass = static_cast(2); + aQosNegotiated.iDeliveryOrderReqd = static_cast(2); + aQosNegotiated.iDeliverErroneousSDU = static_cast(2); + aQosNegotiated.iMaxSDUSize = 2; + aQosNegotiated.iBER = static_cast(2); + aQosNegotiated.iSDUErrorRatio = static_cast(2); + aQosNegotiated.iTrafficHandlingPriority = static_cast(2); + aQosNegotiated.iTransferDelay = 2; + aQosNegotiated.iGuaranteedRate.iUplinkRate = 2; + aQosNegotiated.iGuaranteedRate.iDownlinkRate = 2; + aQosNegotiated.iMaxRate.iUplinkRate = 2; + aQosNegotiated.iMaxRate.iDownlinkRate = 2; + } + + + + + +TUint8 defaultSrcAddr[RPacketContext::KIPAddressSize] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 1, 1, 1, 1}; +TUint8 defaultSrcAddrSubnetMask[RPacketContext::KIPAddressSize] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255}; + +static void DefaultPacketFilter1(RPacketContext::TPacketFilterV2& entry) + { + entry.iId = 0; + entry.iEvaluationPrecedenceIndex = 1; + + for (TUint i = 0; i < RPacketContext::KIPAddressSize; i++) + { + entry.iSrcAddr[i] = defaultSrcAddr[i]; + entry.iSrcAddrSubnetMask[i] = defaultSrcAddrSubnetMask[i]; + } + entry.iProtocolNumberOrNextHeader = 1; + entry.iSrcPortMin = 1; + entry.iSrcPortMax = 1; + entry.iDestPortMin = 1; + entry.iDestPortMax = 1; + entry.iIPSecSPI = 1; + entry.iTOSorTrafficClass = 1; + entry.iFlowLabel = 1; + } + +static void DefaultPacketFilter2(RPacketContext::TPacketFilterV2& entry) + { + entry.iId = 1; + entry.iEvaluationPrecedenceIndex = 2; + + for (TUint i = 0; i < RPacketContext::KIPAddressSize; i++) + { + entry.iSrcAddr[i] = defaultSrcAddr[i]; + entry.iSrcAddrSubnetMask[i] = defaultSrcAddrSubnetMask[i]; + } + entry.iProtocolNumberOrNextHeader = 2; + entry.iSrcPortMin = 2; + entry.iSrcPortMax = 2; + entry.iDestPortMin = 2; + entry.iDestPortMax = 2; + entry.iIPSecSPI = 2; + entry.iTOSorTrafficClass = 2; + entry.iFlowLabel = 2; + } + +static void DefaultPacketFilter3(RPacketContext::TPacketFilterV2& entry) + { + entry.iId = 2; + entry.iEvaluationPrecedenceIndex = 3; + + for (TUint i = 0; i < RPacketContext::KIPAddressSize; i++) + { + entry.iSrcAddr[i] = defaultSrcAddr[i]; + entry.iSrcAddrSubnetMask[i] = defaultSrcAddrSubnetMask[i]; + } + entry.iProtocolNumberOrNextHeader = 3; + entry.iSrcPortMin = 3; + entry.iSrcPortMax = 3; + entry.iDestPortMin = 3; + entry.iDestPortMax = 3; + entry.iIPSecSPI = 3; + entry.iTOSorTrafficClass = 3; + entry.iFlowLabel = 3; + } + +void DefaultTftInfo(TTFTInfo& aTTFTInfo) + { + RPacketContext::TPacketFilterV2 entry1, entry2; + + DefaultPacketFilter1(entry1); + DefaultPacketFilter2(entry2); + + aTTFTInfo.AddPacketFilter(entry1); + aTTFTInfo.AddPacketFilter(entry2); + } + +void SecondDefaultTftInfo(TTFTInfo& aTTFTInfo) + { + RPacketContext::TPacketFilterV2 entry; + + DefaultPacketFilter3(entry); + + aTTFTInfo.AddPacketFilter(entry); + } + +void CombinedDefaultTftInfo(TTFTInfo& aTTFTInfo) + { + RPacketContext::TPacketFilterV2 entry1, entry2, entry3; + + DefaultPacketFilter1(entry1); + DefaultPacketFilter2(entry2); + DefaultPacketFilter3(entry3); + + aTTFTInfo.AddPacketFilter(entry1); + aTTFTInfo.AddPacketFilter(entry2); + aTTFTInfo.AddPacketFilter(entry3); + } + +void DefaultContextStatus(RPacketContext::TContextStatus& aStatus) + { + aStatus = RPacketContext::EStatusInactive; + } + +void DefaultServiceStatus(RPacketService::TStatus& aStatus) + { + aStatus = RPacketService::EStatusAttached; + } + +_LIT(csy, "SIMTSYLOOPBACK.CSY"); +_LIT(port, "SIMTSYLOOPBACK::0"); +void DefaultDataChannel(RPacketContext::TDataChannelV2& aDataChannel) + { + aDataChannel.iCsy = csy; + aDataChannel.iPort = port; + aDataChannel.iChannelId = port; + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/InputRequestListener.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/InputRequestListener.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,239 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Implementation of CInputRequestListener +// +// + +/** + @file + @internalComponent +*/ + + +#include "CPdpFsmInterface.h" + +#include "SpudUnitTestServer.h" +#include "InputRequestListener.h" +#include +#include "reteldriverinput.h" +#include "ceteldriverfactory.h" +#include "cpdpfsmfactory.h" +#include "DefaultContextParameters.h" + +CInputRequestListener* CInputRequestListener::NewL(TBool aUseTestPdpInterface) + { + CInputRequestListener *me = new(ELeave) CInputRequestListener(aUseTestPdpInterface); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CInputRequestListener::CInputRequestListener(TBool aUseTestPdpFsmInterface) : CActive(EPriorityStandard), iUseTestPdpFsmInterface(aUseTestPdpFsmInterface) + { + iReadyForInputRequest = KRequestPending; + iThreadDestructed = KRequestPending; + iThreadInitialized = KRequestPending; + + iEtelDriverInputResponseStatus = KRequestPending; + iEtelDriverConfigGPRSNotificationStatus = KRequestPending; + iEtelDriverContextStatusNotificationStatus = KRequestPending; + iEtelDriverQosNotificationStatus = KRequestPending; + iEtelDriverServiceNotificationStatus = KRequestPending; + + iFsmInputResponseStatus = KRequestPending; + iFsmNetworkStatusStatus = KRequestPending; + iFsmContextParameterChangeStatus = KRequestPending; + iFsmContextSuspendedStatus = KRequestPending; + iFsmContextResumedStatus = KRequestPending; + iFsmObjectCreateResponse = KRequestPending; + } + +void CInputRequestListener::ConstructL() + { + iSpudManInterface = new(ELeave) TSpudManInterfaceTest(*this); + } + +CInputRequestListener::~CInputRequestListener() + { + Cancel(); + if (iEtelDriver) + { + iEtelDriver->Close(); + delete iEtelDriver; + iEtelDriver = NULL; + } + + if (iPdpFsmInterfaceTest) + { + iPdpFsmInterfaceTest->Close(); + delete iPdpFsmInterfaceTest; + iPdpFsmInterfaceTest = NULL; + } + + if (iPdpFsmInterface) + { + iPdpFsmInterface->Close(); + delete iPdpFsmInterface; + iPdpFsmInterface = NULL; + } + } + +void CInputRequestListener::DoCancel() + { + iStatus = KErrCancel; + } + +/** + Wrapper for private method CActive::SetActive() + */ +void CInputRequestListener::Activate() + { + iStatus = KRequestPending; + SetActive(); + } + +/** + If iStatus was completed with EEtelDriverInputRequest, REtelDriverInput::Input is called with the parameters supplied in iInputData + If iStatus was completed with EEtelDriverCancelPdpRequest, REtelDriverInput::Cancel is called with the parameters supplied in iEtelDriverCancelRequestData + If iStatus was completed with EFsmInputRequest, RPdpFsmInterface::Input is called with the parameters supplied in iFsmInputRequestData + If iStatus was completed with ECleanup, or anything else, the active scheduler is stopped + */ +void CInputRequestListener::RunL() + { + TRequestStatus status = iStatus; + iStatus = KRequestPending; + + if (status == EEtelDriverInputRequest || + status == EEtelDriverCancelPdpRequest || + status == EFsmInputRequest || + status == EFsmObjectCreate) + { + switch (status.Int()) + { + case EEtelDriverInputRequest: + { + // the main test thread requested a call to REtelDriverInput::Input + iEtelDriver->Input(iEtelDriverInputRequestData.iPdpId, iEtelDriverInputRequestData.iOperation); // error + break; + } + case EEtelDriverCancelPdpRequest: + { + iEtelDriver->CancelPdp(iEtelDriverCancelRequestPdpId); + break; + } + case EFsmInputRequest: + { + iPdpFsmInterface->Input(iFsmInputRequestData.iPdpId, iFsmInputRequestData.iOperation); + break; + } + case EFsmObjectCreate: + { + TInt err = iPdpFsmInterface->NewFsmContext(iFsmInputRequestData.iPdpId); + + // Reproduce completion as per 'SpudManInterfaceTest::Input()' + // - since we're not being called asynchronously from EtelPkt + + iFsmInputResponseData.iPdpId = iFsmInputRequestData.iPdpId; + + TRequestStatus *readyStatus = &iFsmObjectCreateResponse; + iParentThread.RequestComplete(readyStatus, err); + break; + } + default: + ASSERT(EFalse); + } + + // we are finished with the iInputData or iControlData parameters, so this signals to the main test thread + // that this data can be updated with new parameters + TRequestStatus *readyStatus = &iReadyForInputRequest; + iParentThread.RequestComplete(readyStatus, KErrNone); + + SetActive(); + } + else + { + // the status was ECleanup, or we don't recognize the status, so abort the active scheduler, and the thread will be exited + CActiveScheduler::Stop(); + } + } + +/** + Creates the unit under test - the FSM if iUseTestPdpFsmInterface is false, and the EtelDriver otherwise + */ +void CInputRequestListener::CreateUnitUnderTestL() + { + if (iUseTestPdpFsmInterface) + { + CreateEtelDriverL(); + } + else + { + CreatePdpFsmL(); + } + } + +/** + Create and initialize the SPUDTEL + */ +void CInputRequestListener::CreateEtelDriverL() + { + iEtelDriver = NewEtelDriverInputL(); + + iPdpFsmInterfaceTest = new(ELeave)CPdpFsmInterfaceTest(*this); + + iEtelDriver->OpenL(*iPdpFsmInterfaceTest); + iPdpFsmInterfaceTest->OpenL(NULL, SimTsyName()); + + for (TContextId i = 0; i < KMaxPdpContexts; i++) + { + iEtelDriver->CreatePdpL(i); + } + } + +/** + Create and initialize the SPUD FSM + */ +void CInputRequestListener::CreatePdpFsmL() + { + iPdpFsmInterface = new(ELeave)CPdpFsmInterface(); + iPdpFsmInterface->OpenL(iSpudManInterface, SimTsyName()); + } + +/** + Delete and cleanup and resources associated with SPUDTEL and SPUDFSM + */ +void CInputRequestListener::DeleteUnitUnderTest() + { + if (iEtelDriver) + { + iEtelDriver->Close(); + delete iEtelDriver; + iEtelDriver = NULL; + } + + if (iPdpFsmInterfaceTest) + { + iPdpFsmInterfaceTest->Close(); + delete iPdpFsmInterfaceTest; + iPdpFsmInterfaceTest = NULL; + } + + if (iPdpFsmInterface) + { + iPdpFsmInterface->Close(); + delete iPdpFsmInterface; + iPdpFsmInterface = NULL; + } + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/PdpFsmInterfaceTest.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/PdpFsmInterfaceTest.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,262 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// The implementation of the RPdpFsmInterface for SPUD TEL unit tests +// +// + +/** + @file + @internalComponent +*/ + +#include "PdpFsmInterfaceTest.h" +#include "InputRequestListener.h" +#include "DefaultContextParameters.h" +#include + + +CPdpFsmInterfaceTest::CPdpFsmInterfaceTest(CInputRequestListener& aListener) : iListener(aListener), iTftOperationCode(KAddFilters) + { + DefaultTftInfo(iTftInfo); + } + +const TName& CPdpFsmInterfaceTest::TsyName() + { + return SimTsyName(); + } + +/** + Signals to the test execute thread that RPdpFsmInterface::Input has been called + */ +TInt CPdpFsmInterfaceTest::Input(TContextId aPdpId, const TInt aOperation, const TInt aParam) + { + // The aOperation parameters are broken up into those that are notifications and those that aren't + // Since notifications can happen anytime, separate request status members need to be kept for each one + // Other input requests happen serially, so only one request can be pending at any time + TRequestStatus *status = NULL; + switch (aOperation) + { + case PdpFsm::EQoSProfileChangeNetwork: + status = &iListener.iEtelDriverQosNotificationStatus; + break; + case PdpFsm::EConfigGPRSChangeNetwork: + status = &iListener.iEtelDriverConfigGPRSNotificationStatus; + break; + case PdpFsm::EContextStatusChangeNetwork: + status = &iListener.iEtelDriverContextStatusNotificationStatus; + break; + case PdpFsm::EServiceStatusChangeNetwork: + status = &iListener.iEtelDriverServiceNotificationStatus; + break; + default: + iListener.iEtelDriverInputResponseData.iPdpId = aPdpId; + iListener.iEtelDriverInputResponseData.iSignal = aOperation; + status = &iListener.iEtelDriverInputResponseStatus; + break; + } + iListener.iParentThread.RequestComplete(status, aParam); + + return KErrNone; + } + + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +// Gets just return default values +TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketQoS::TQoSR5Negotiated& /*aParam*/) const + { + ASSERT(EFalse); + return KErrNone; + } + +TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketQoS::TQoSR5Requested& aQoSR5Requested) const + { + DefaultQoSR99_R4Requested(aQoSR5Requested); + aQoSR5Requested.iSignallingIndication = EFalse; + aQoSR5Requested.iSourceStatisticsDescriptor = RPacketQoS::ESourceStatisticsDescriptorUnknown; + return KErrNone; + } + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +// Gets just return default values +TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketQoS::TQoSR99_R4Negotiated& /*aParam*/) const + { + ASSERT(EFalse); + return KErrNone; + } + +TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketQoS::TQoSR99_R4Requested& aQoSR99_R4Requested) const + { + DefaultQoSR99_R4Requested(aQoSR99_R4Requested); + return KErrNone; + } + + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + +TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketContext::TContextConfigGPRS& aParam) const + { + DefaultContextConfigGPRS(aParam); + return KErrNone; + } + +TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, TTFTOperationCode& aParam) const + { + aParam = iTftOperationCode; + return KErrNone; + } + +TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, TTFTInfo& aTFTInfo) const + { + aTFTInfo = iTftInfo; + return KErrNone; + } + +TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketContext::TDataChannelV2& aDataChannelV2) const + { + DefaultDataChannel(aDataChannelV2); + return KErrNone; + } + +TInt CPdpFsmInterfaceTest::Get(TContextId /*aPdpId*/, RPacketContext::TContextStatus& aParam) const + { + aParam = RPacketContext::EStatusUnknown; + return KErrNone; + } + +void CPdpFsmInterfaceTest::Get(RPacketService::TStatus& aParam) + { + aParam = RPacketService::EStatusActive; + } + +TInt CPdpFsmInterfaceTest::GetLastErrorCause(TContextId /*aPdpId*/, TInt& /*aLastErrorCause*/) const + { + /*Placeholder for unused function*/ + return KErrNone; + } + +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +TInt CPdpFsmInterfaceTest::Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfigGPRS) + { + iListener.iNotifyContextConfigData.iPdpId = aPdpId; + iListener.iNotifyContextConfigData.iContextConfigGPRS = aContextConfigGPRS; + return KErrNone; + } + +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +TInt CPdpFsmInterfaceTest::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam) + { + iListener.iNotifyContextStatusData.iPdpId = aPdpId; + iListener.iNotifyContextStatusData.iContextStatus = aParam; + return KErrNone; + } + +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +void CPdpFsmInterfaceTest::Set(const RPacketService::TStatus aServiceStatus) + { + iListener.iPacketServiceStatus = aServiceStatus; + } + +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +TInt CPdpFsmInterfaceTest::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aDataChannelV2) + { + iListener.iNotifyContextDataChannelData.iPdpId = aPdpId; + iListener.iNotifyContextDataChannelData.iDataChannelV2 = aDataChannelV2; + return KErrNone; + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +TInt CPdpFsmInterfaceTest::Set(TContextId /*aPdpId*/, const RPacketQoS::TQoSR5Requested& /*aParam*/) + { + ASSERT(EFalse); + return KErrNone; + } + +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +TInt CPdpFsmInterfaceTest::Set(const TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aQoSR5Negotiated) + { + iListener.iNotifyQosNegotiatedData.iPdpId = aPdpId; + iListener.iNotifyQosNegotiatedData.iNegotiated = aQoSR5Negotiated; + return KErrNone; + } + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +TInt CPdpFsmInterfaceTest::Set(TContextId /*aPdpId*/, const RPacketQoS::TQoSR99_R4Requested& /*aParam*/) + { + ASSERT(EFalse); + return KErrNone; + } + +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +TInt CPdpFsmInterfaceTest::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQoSR99_R4Negotiated) + { + iListener.iNotifyQosNegotiatedData.iPdpId = aPdpId; + iListener.iNotifyQosNegotiatedData.iNegotiated = aQoSR99_R4Negotiated; + return KErrNone; + } + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + + +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +TInt CPdpFsmInterfaceTest::Set(TContextId /*aPdpId*/, const TTFTOperationCode& aParam) + { + iTftOperationCode = aParam; + return KErrNone; + } + +/** + Store the parameters passed to Set to be compared by the test execute thread + */ +TInt CPdpFsmInterfaceTest::Set(TContextId /*aPdpId*/, const TTFTInfo& aParam) + { + iTftInfo = aParam; + return KErrNone; + } + +void CPdpFsmInterfaceTest::SetContextTerminationErrorAndStop(TContextId /*aPdpId*/, TInt /*aErrorCode*/) + {/*Placeholder for unused function*/} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudFsmUnitTestStep.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudFsmUnitTestStep.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,818 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Unit tests for SPUD FSM +// +// + +/** + @file + @internalComponent +*/ + +#include +#include + +#include "SpudUnitTestStep.h" +#include "meteldriverstrategy.h" +#include "ceteldrivercontext.h" +#include "CompareContextParameters.h" +#include "DefaultContextParameters.h" + +using namespace EtelDriver; + +CSpudFsmUnitNormalOperation::~CSpudFsmUnitNormalOperation() + { + } + +// configure to use test step 1 from simtsy config file +CSpudFsmUnitNormalOperation::CSpudFsmUnitNormalOperation() : CSpudFsmUnitTestStepBase(1) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudFsmUnitNormalOperation); + } + +TVerdict CSpudFsmUnitNormalOperation::doTestStepL() +/** + Test normal operation + This test step goes through all of the states in the SPUD FSM + */ + { + INFO_PRINTF1(_L("Starting Spud Driver Test normal operation")); + + TRequestStatus status; + RPacketService::TContextInfo contextInfo; + + RPacketQoS::TQoSR99_R4Negotiated qos; + TQoSR99_R4NegotiatedPckg qosPckg(qos); + RPacketQoS::TQoSR99_R4Negotiated expectedTestQoSR99_R4Negotiated; + + InitPhoneAndPacketServiceL(); + + // Start by creating all the Spud FSM objects. + // They have to be created in the test's Active Scheduler Thread + // (terminology from the test's design document). + // + FsmObjectCreate(KContextId0); + WaitForFsmObjectCreateResponse(KContextId0); + FsmObjectCreate(KContextId1); + WaitForFsmObjectCreateResponse(KContextId1); + FsmObjectCreate(KContextId2); + WaitForFsmObjectCreateResponse(KContextId2); + + + // Set up context config and QoS parameters + + RPacketContext::TContextConfigGPRS contextConfigGPRS; + DefaultContextConfigGPRS(contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId1, contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId2, contextConfigGPRS); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested qosRequested; + DefaultQoSR5Requested(qosRequested); +#else + RPacketQoS::TQoSR99_R4Requested qosRequested; + DefaultQoSR99_R4Requested(qosRequested); +#endif + + iListener->iPdpFsmInterface->Set(KContextId0, qosRequested); + iListener->iPdpFsmInterface->Set(KContextId1, qosRequested); + iListener->iPdpFsmInterface->Set(KContextId2, qosRequested); + + + // + // Test creating first primary context + // This tests state transitions: + // Initialised -> OpeningPhone -> CreatingPrimary -> SettingQoSPrimary -> ActivatingPrimary -> Open + // + INFO_PRINTF1(_L("Test creating first primary context")); + FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, 0); + // Check that the context was created + TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone); + // Check that the QoS was created for the primary context + RPacketQoS primaryPacketQos; + TEST(primaryPacketQos.OpenExistingQoS(iPrimaryPacketContext, KFirstQosName) == KErrNone); + + // Check that the QoS parameters were set + primaryPacketQos.GetProfileParameters(status, qosPckg); + User::WaitForRequest(status); + SecondQoSR99_R4Negotiated(expectedTestQoSR99_R4Negotiated); + TEST(CompareUMTSQoSNeg(expectedTestQoSR99_R4Negotiated, qos)); + + // + // Test creating second primary context - since the phone is already open, there is no transition to OpeningPhone state + // This tests state transitions: + // Initialised -> CreatingPrimary -> SettingQoSPrimary -> ActivatingPrimary -> Open + // + INFO_PRINTF1(_L("Test creating second primary context")); + FsmInputRequest(KContextId1, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId1, KPrimaryContextCreated, 0); + RPacketContext secondPrimaryContext; + // Test that the context was created + TEST(secondPrimaryContext.OpenExistingContext(iPacketService, KSecondPrimaryContextName) == KErrNone); + + + // + // Test creating secondary context + // This tests state transitions: + // Initialised -> CreatingSecondary -> CreatedSecondary + // + INFO_PRINTF1(_L("Test creating secondary contexts")); + FsmInputRequest(KContextId2, SpudMan::ECreateSecondaryPDPContext, 0); + WaitForFsmInputResponse(KContextId2, KSecondaryContextCreated, 0); + // Test that the context was created + TEST(iSecondaryPacketContext.OpenExistingContext(iPacketService, KFirstSecondaryContextName) == KErrNone); + + + // + // Test setting QOS on secondary + // This tests state transitions: + // CreatedSecondary -> SettingQoS -> CreatedSecondary + // + INFO_PRINTF1(_L("Test setting QoS on secondary context")); + FsmInputRequest(KContextId2, SpudMan::EContextQoSSet, 0); + WaitForFsmInputResponse(KContextId2, KContextQoSSetEvent, 0); + // Check that the QoS was created for the secondary + RPacketQoS secondaryPacketQos; + TEST(secondaryPacketQos.OpenExistingQoS(iSecondaryPacketContext, KFirstQosName) == KErrNone); + + // Check that the QoS parameters were set + secondaryPacketQos.GetProfileParameters(status, qosPckg); + User::WaitForRequest(status); + SecondQoSR99_R4Negotiated(expectedTestQoSR99_R4Negotiated); + TEST(CompareUMTSQoSNeg(expectedTestQoSR99_R4Negotiated, qos)); + + // + // Test setting TFT on secondary + // This tests state transitions: + // CreatedSecondary -> SettingTFT -> CreatedSecondary + // + INFO_PRINTF1(_L("Test setting TFT on secondary context")); + TTFTOperationCode tftOperationCode = KAddFilters; + iListener->iPdpFsmInterface->Set(KContextId2, tftOperationCode); + TTFTInfo tftInfo; + DefaultTftInfo(tftInfo); + iListener->iPdpFsmInterface->Set(KContextId2, tftInfo); + FsmInputRequest(KContextId2, SpudMan::EContextTFTModify, 0); + WaitForFsmInputResponse(KContextId2, KContextTFTModifiedEvent, 0); + // check that TFT was set correctly + TEST(CompareTFTInfo(tftInfo, iSecondaryPacketContext)); + + + // + // Test activating secondary + // This tests state transitions: + // CreatedSecondary -> ActivatingSecondary -> Open + // + INFO_PRINTF1(_L("Test activating secondary context")); + FsmInputRequest(KContextId2, SpudMan::EContextActivate, 0); + WaitForFsmInputResponse(KContextId2, KContextActivateEvent, 0); + // Check that the context is active + iPacketService.GetContextInfo(status, KContextId2, contextInfo); + User::WaitForRequest(status); + TEST(status == KErrNone && contextInfo.iStatus == RPacketContext::EStatusActive); + + + INFO_PRINTF1(_L("Test Retrieving Negotiated QoSt")); + FsmInputRequest(KContextId2, SpudMan::EGetNegQoS, 0); + WaitForFsmInputResponse(KContextId2, KGetNegQoSEvent, 0); + + + // + // Test network suspending/resuming context + // This tests state transitions: + // Open -> Suspend -> Open + // + INFO_PRINTF1(_L("Test network suspend/resume context")); + EtelRequest(EContextStatusChange, 0); + WaitForFsmSuspendedNotification(KContextId0); + + EtelRequest(EContextStatusChange, 1); + WaitForFsmResumedNotification(KContextId0); + + + // + // Test SpudMan suspending/resuming context + // This tests state transitions: + // Open -> Suspend -> Open + // + INFO_PRINTF1(_L("Test SpudMan suspend/resume context")); + FsmInputRequest(KContextId0, SpudMan::ESuspend, 0); + WaitForFsmSuspendedNotification(KContextId0); + + FsmInputRequest(KContextId0, SpudMan::EResume, 0); + WaitForFsmResumedNotification(KContextId0); + + + // + // Test changing TFT + // This tests state transitions: + // Open -> ChangingTFT -> Open + // + INFO_PRINTF1(_L("Test changing TFT")); + TTFTInfo secondTftInfo; + SecondDefaultTftInfo(secondTftInfo); + iListener->iPdpFsmInterface->Set(KContextId2, KAddFilters); + iListener->iPdpFsmInterface->Set(KContextId2, secondTftInfo); + // The second TFT should be added to the existing TFT + FsmInputRequest(KContextId2, SpudMan::EContextTFTModify, 0); + WaitForFsmInputResponse(KContextId2, KContextTFTModifiedEvent, 0); + // check that TFT was changed + TTFTInfo combinedTftInfo; + CombinedDefaultTftInfo(combinedTftInfo); + TEST(CompareTFTInfo(combinedTftInfo, iSecondaryPacketContext)); + + + // + // Test changing QOS + // This tests state transitions: + // Open -> ChangingQoS -> Open + // + INFO_PRINTF1(_L("Test changing QoS")); + + SecondQoSR99_R4Requested(qosRequested); + + iListener->iPdpFsmInterface->Set(KContextId0, qosRequested); + FsmInputRequest(KContextId0, SpudMan::EContextQoSSet, 0); + WaitForFsmInputResponse(KContextId0, KContextQoSSetEvent, 0); + + // check that QOS was changed + DefaultQoSR99_R4Negotiated(expectedTestQoSR99_R4Negotiated); + primaryPacketQos.GetProfileParameters(status, qosPckg); + User::WaitForRequest(status); + TEST(CompareUMTSQoSNeg(expectedTestQoSR99_R4Negotiated, qos)); + + // + // Test modifying active + // This tests state transitions: + // Open -> ModifyingActive -> Open + // + INFO_PRINTF1(_L("Test modifying active context")); + FsmInputRequest(KContextId0, SpudMan::EContextModifyActive, 0); + WaitForFsmInputResponse(KContextId0, KContextModifyActiveEvent, 0); + + + secondaryPacketQos.Close(); + primaryPacketQos.Close(); + iSecondaryPacketContext.Close(); + secondPrimaryContext.Close(); + iPrimaryPacketContext.Close(); + + + // + // Test deleting contexts + // This tests state transitions: + // Open -> Closing -> Initialised + // + INFO_PRINTF1(_L("Test deleting contexts")); + for (TContextId deleteIndex = 0; deleteIndex < 3; deleteIndex++) + { + FsmInputRequest(deleteIndex, SpudMan::EContextDelete, 0); + WaitForFsmInputResponse(deleteIndex, KContextDeleteEvent, 0); + } + // Check that the contexts were deleted + for (TInt contextInfoIndex = 0; contextInfoIndex < 3; contextInfoIndex++) + { + iPacketService.GetContextInfo(status, contextInfoIndex, contextInfo); + User::WaitForRequest(status); + TEST(status == KErrNone && contextInfo.iStatus == RPacketContext::EStatusDeleted); + } + + + // + // Test that we can still use a context that has been deleted + // + INFO_PRINTF1(_L("Test re-using deleted contexts")); + FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, 0); + // Test that the context was created + TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KThirdPrimaryContextName) == KErrNone); + + // Clean-up + iPrimaryPacketContext.Close(); + FsmInputRequest(KContextId0, SpudMan::EContextDelete, 0); + WaitForFsmInputResponse(KContextId0, KContextDeleteEvent, 0); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudFsmUnitCreatePrimaryError1::~CSpudFsmUnitCreatePrimaryError1() + {} + +// configure to use test step 102 from simtsy config file +CSpudFsmUnitCreatePrimaryError1::CSpudFsmUnitCreatePrimaryError1() : CSpudFsmUnitTestStepBase(102) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudFsmCreatePrimaryError1); + } + +TVerdict CSpudFsmUnitCreatePrimaryError1::doTestStepL() +/** + Test errors creating primary context + */ + { + INFO_PRINTF1(_L("Starting Spud Driver Unit test error creating primary context 1")); + + // Start by creating all the Spud FSM objects. + // They have to be created in the test's Active Scheduler Thread + // (terminology from the test's design document). + // + FsmObjectCreate(KContextId0); + WaitForFsmObjectCreateResponse(KContextId0); + + // Set up context config and QoS parameters + RPacketContext::TContextConfigGPRS contextConfigGPRS; + DefaultContextConfigGPRS(contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested qosRequested; + DefaultQoSR5Requested(qosRequested); +#else + RPacketQoS::TQoSR99_R4Requested qosRequested; + DefaultQoSR99_R4Requested(qosRequested); +#endif + + iListener->iPdpFsmInterface->Set(KContextId0, qosRequested); + + // RPacketContext::SetConfig is configured to fail with error KErrGeneral + FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrGeneral); + + InitPhoneAndPacketServiceL(); + + // The primary context should have been cleaned up after the failure + TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone); + WaitForGivenContextStatus(iPrimaryPacketContext, RPacketContext::EStatusDeleted); + iPrimaryPacketContext.Close(); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudFsmUnitCreatePrimaryError2::~CSpudFsmUnitCreatePrimaryError2() + {} + +// configure to use test step 103 from simtsy config file +CSpudFsmUnitCreatePrimaryError2::CSpudFsmUnitCreatePrimaryError2() : CSpudFsmUnitTestStepBase(103) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudFsmCreatePrimaryError2); + } + +TVerdict CSpudFsmUnitCreatePrimaryError2::doTestStepL() +/** + Test errors setting QOS on primary context + */ + { + INFO_PRINTF1(_L("Starting Spud Driver Unit test error creating primary context 2")); + + // Start by creating all the Spud FSM objects. + // They have to be created in the test's Active Scheduler Thread + // (terminology from the test's design document). + // + FsmObjectCreate(KContextId0); + WaitForFsmObjectCreateResponse(KContextId0); + + // Set up context config and QoS parameters + RPacketContext::TContextConfigGPRS contextConfigGPRS; + DefaultContextConfigGPRS(contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested qosRequested; + DefaultQoSR5Requested(qosRequested); +#else + RPacketQoS::TQoSR99_R4Requested qosRequested; + DefaultQoSR99_R4Requested(qosRequested); +#endif + + iListener->iPdpFsmInterface->Set(KContextId0, qosRequested); + + // RPacketQoS::SetProfileParameters is configured to fail + FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrGeneral); + + InitPhoneAndPacketServiceL(); + + // The primary context should be cleaned up after the failure + TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone); + WaitForGivenContextStatus(iPrimaryPacketContext, RPacketContext::EStatusDeleted); + iPrimaryPacketContext.Close(); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudFsmUnitCreatePrimaryError3::~CSpudFsmUnitCreatePrimaryError3() + {} + +// configure to use test step 104 from simtsy config file +CSpudFsmUnitCreatePrimaryError3::CSpudFsmUnitCreatePrimaryError3() : CSpudFsmUnitTestStepBase(104) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudFsmCreatePrimaryError3); + } + +TVerdict CSpudFsmUnitCreatePrimaryError3::doTestStepL() +/** + Test errors activating primary context + */ + { + INFO_PRINTF1(_L("Starting Spud Driver Unit test error creating primary context 3")); + + // Start by creating all the Spud FSM objects. + // They have to be created in the test's Active Scheduler Thread + // (terminology from the test's design document). + // + FsmObjectCreate(KContextId0); + WaitForFsmObjectCreateResponse(KContextId0); + + // Set up context config and QoS parameters + RPacketContext::TContextConfigGPRS contextConfigGPRS; + DefaultContextConfigGPRS(contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested qosRequested; + DefaultQoSR5Requested(qosRequested); +#else + RPacketQoS::TQoSR99_R4Requested qosRequested; + DefaultQoSR99_R4Requested(qosRequested); +#endif + + iListener->iPdpFsmInterface->Set(KContextId0, qosRequested); + + // Activiating the context is configured to fail with KErrGeneral + FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrGeneral); + + InitPhoneAndPacketServiceL(); + + // The primary context should have been cleaned up after the failure + TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone); + WaitForGivenContextStatus(iPrimaryPacketContext, RPacketContext::EStatusDeleted); + iPrimaryPacketContext.Close(); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudFsmUnitSetQosAndTftError::~CSpudFsmUnitSetQosAndTftError() + {} + +// configure to use test step 106 from simtsy config file +CSpudFsmUnitSetQosAndTftError::CSpudFsmUnitSetQosAndTftError() : CSpudFsmUnitTestStepBase(106) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudFsmSetQosAndTftError); + } + +TVerdict CSpudFsmUnitSetQosAndTftError::doTestStepL() +/** + Test errors setting QoS and setting TFT and activating secondary + */ + { + INFO_PRINTF1(_L("Starting Spud Driver Unit test error creating QOS, setting TFT and activating")); + + // Start by creating all the Spud FSM objects. + // They have to be created in the test's Active Scheduler Thread + // (terminology from the test's design document). + // + FsmObjectCreate(KContextId0); + WaitForFsmObjectCreateResponse(KContextId0); + FsmObjectCreate(KContextId1); + WaitForFsmObjectCreateResponse(KContextId1); + + // Set up context config and QoS parameters + RPacketContext::TContextConfigGPRS contextConfigGPRS; + DefaultContextConfigGPRS(contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested qosRequested; + DefaultQoSR5Requested(qosRequested); +#else + RPacketQoS::TQoSR99_R4Requested qosRequested; + DefaultQoSR99_R4Requested(qosRequested); +#endif + + iListener->iPdpFsmInterface->Set(KContextId0, qosRequested); + + // Test creating primary + FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrNone); + + // Test creating secondary + FsmInputRequest(KContextId1, SpudMan::ECreateSecondaryPDPContext, 0); + WaitForFsmInputResponse(KContextId1, KSecondaryContextCreated, KErrNone); + + // RPacketQoS::SetProfileParameters is configured to fail for the secondary context + iListener->iPdpFsmInterface->Set(KContextId1, qosRequested); + FsmInputRequest(KContextId1, SpudMan::EContextQoSSet, 0); + WaitForFsmInputResponse(KContextId1, KContextQoSSetEvent, KErrGeneral); + + // RPacketQoS::CreateNewTFT is configured to fail with KErrGeneral for the secondary context + TTFTOperationCode tftOperationCode = KAddFilters; + iListener->iPdpFsmInterface->Set(KContextId1, tftOperationCode); + TTFTInfo tftInfo; + DefaultTftInfo(tftInfo); + iListener->iPdpFsmInterface->Set(KContextId1, tftInfo); + FsmInputRequest(KContextId1, SpudMan::EContextTFTModify, 0); + WaitForFsmInputResponse(KContextId1, KContextTFTModifiedEvent, KErrGeneral); + + // Activating the secondary context is configured to fail with KErrGeneral + FsmInputRequest(KContextId1, SpudMan::EContextActivate, 0); + WaitForFsmInputResponse(KContextId1, KContextActivateEvent, KErrGeneral); + + // Clean-up + FsmInputRequest(KContextId0, SpudMan::EContextDelete, 0); + WaitForFsmInputResponse(0, KContextDeleteEvent, 0); + + FsmInputRequest(KContextId1, SpudMan::EContextDelete, 0); + WaitForFsmInputResponse(KContextId1, KContextDeleteEvent, 0); + + return TestStepResult(); + } + +CSpudFsmUnitChangeQosAndTftError::~CSpudFsmUnitChangeQosAndTftError() + {} + +// configure to use test step 107 from simtsy config file +CSpudFsmUnitChangeQosAndTftError::CSpudFsmUnitChangeQosAndTftError() : CSpudFsmUnitTestStepBase(107) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudFsmChangeQosAndTftError); + } + +TVerdict CSpudFsmUnitChangeQosAndTftError::doTestStepL() +/** + Test errors changing QoS and changing TFT for secondary + */ + { + INFO_PRINTF1(_L("Starting Spud Driver Unit test error changing QOS and TFT")); + + // Start by creating all the Spud FSM objects. + // They have to be created in the test's Active Scheduler Thread + // (terminology from the test's design document). + // + FsmObjectCreate(KContextId0); + WaitForFsmObjectCreateResponse(KContextId0); + FsmObjectCreate(KContextId1); + WaitForFsmObjectCreateResponse(KContextId1); + + // Set up context config and QoS parameters + RPacketContext::TContextConfigGPRS contextConfigGPRS; + DefaultContextConfigGPRS(contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested qosRequested; + DefaultQoSR5Requested(qosRequested); +#else + RPacketQoS::TQoSR99_R4Requested qosRequested; + DefaultQoSR99_R4Requested(qosRequested); +#endif + + iListener->iPdpFsmInterface->Set(KContextId0, qosRequested); + + // Test creating primary + FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrNone); + + // Test creating and activating secondary + FsmInputRequest(KContextId1, SpudMan::ECreateSecondaryPDPContext, 0); + WaitForFsmInputResponse(KContextId1, KSecondaryContextCreated, KErrNone); + FsmInputRequest(KContextId1, SpudMan::EContextActivate, 0); + WaitForFsmInputResponse(KContextId1, KContextActivateEvent, KErrNone); + + FsmInputRequest(KContextId1, SpudMan::EGetNegQoS, 0); + WaitForFsmInputResponse(KContextId1, KGetNegQoSEvent, KErrNone); + + + + // RPacketQoS::SetProfileParameters is configured to fail for the secondary context + FsmInputRequest(KContextId1, SpudMan::EContextQoSSet, 0); + WaitForFsmInputResponse(KContextId1, KContextQoSSetEvent, KErrGeneral); + + // RPacketQoS::CreateNewTFT is configured to fail with KErrGeneral for the secondary context + TTFTOperationCode tftOperationCode = KAddFilters; + iListener->iPdpFsmInterface->Set(KContextId1, tftOperationCode); + TTFTInfo tftInfo; + DefaultTftInfo(tftInfo); + iListener->iPdpFsmInterface->Set(KContextId1, tftInfo); + FsmInputRequest(KContextId1, SpudMan::EContextTFTModify, 0); + WaitForFsmInputResponse(KContextId1, KContextTFTModifiedEvent, KErrGeneral); + + // Because the TFT and QoS have not changed, RPacketContext::ModifyActiveContext will fail + FsmInputRequest(KContextId1, SpudMan::EContextModifyActive, 0); + WaitForFsmInputResponse(KContextId1, KContextModifyActiveEvent, KErrNotReady); + + // Clean-up + FsmInputRequest(KContextId0, SpudMan::EContextDelete, 0); + WaitForFsmInputResponse(KContextId0, KContextDeleteEvent, 0); + + FsmInputRequest(KContextId1, SpudMan::EContextDelete, 0); + WaitForFsmInputResponse(KContextId1, KContextDeleteEvent, 0); + + return TestStepResult(); + } + +CSpudFsmUnitNotifications::~CSpudFsmUnitNotifications() + {} + +// configure to use test step 1 from simtsy config file +CSpudFsmUnitNotifications::CSpudFsmUnitNotifications() : CSpudFsmUnitTestStepBase(1) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudFsmTestNotifications); + } + +TVerdict CSpudFsmUnitNotifications::doTestStepL() +/** + Test that notifications are passed from etel driver + */ + { + INFO_PRINTF1(_L("Starting Spud Driver Unit test notifications")); + + // Start by creating all the Spud FSM objects. + // They have to be created in the test's Active Scheduler Thread + // (terminology from the test's design document). + // + FsmObjectCreate(KContextId0); + WaitForFsmObjectCreateResponse(KContextId0); + + TRequestStatus status; + + // Set up context config and QoS parameters + RPacketContext::TContextConfigGPRS contextConfigGPRS; + DefaultContextConfigGPRS(contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested qosRequested; + DefaultQoSR5Requested(qosRequested); +#else + RPacketQoS::TQoSR99_R4Requested qosRequested; + DefaultQoSR99_R4Requested(qosRequested); +#endif + + iListener->iPdpFsmInterface->Set(KContextId0, qosRequested); + + // Test creating primary + INFO_PRINTF1(_L("Create primary context")); + FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId0, KPrimaryContextCreated, KErrNone); + + RPacketQoS::TQoSR99_R4Negotiated qosNegotiated; + + // + // Test service status notification + // + // Creating/activating a primary context should change the network status + INFO_PRINTF1(_L("Wait for service status change notification")); + WaitForFsmServiceNotificationStatus(); + + + InitPhoneAndPacketServiceL(); + TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone); + + + // + // Test context config notifications + // + // Calling SetConfig to change the context config and trigger a context config notification + INFO_PRINTF1(_L("Trigger context config change notification")); + RPacketContext::TContextConfigGPRS contextConfig; + DefaultContextConfigGPRS(contextConfig); + TContextConfigGPRSPckg contextConfigPckg(contextConfig); + iPrimaryPacketContext.SetConfig(status, contextConfigPckg); + User::WaitForRequest(status); + // Wait for the notification + INFO_PRINTF1(_L("Wait for context config change notification")); + WaitForFsmContextConfigNotification(KContextId0, contextConfig); + + + // + // Test QoS notifications + // + // Calling SetProfileParameters to change the QoS and trigger a QoS change notification + INFO_PRINTF1(_L("Trigger QoS change notification")); + RPacketQoS primaryPacketQos; + TEST(primaryPacketQos.OpenExistingQoS(iPrimaryPacketContext, KFirstQosName) == KErrNone); + + RPacketQoS::TQoSR99_R4Requested qosChangeRequested; + SecondQoSR99_R4Requested(qosChangeRequested); + TQoSR99_R4RequestedPckg qosChangeRequestedPckg(qosChangeRequested); + primaryPacketQos.SetProfileParameters(status, qosChangeRequestedPckg); + User::WaitForRequest(status); + // Wait for the notification + INFO_PRINTF1(_L("Wait for QoS change notification")); + DefaultQoSR99_R4Negotiated(qosNegotiated); + WaitForFsmQosChangeNotification(KContextId0, qosNegotiated); + + // + // Clean-up + // + primaryPacketQos.Close(); + iPrimaryPacketContext.Close(); + + FsmInputRequest(KContextId0, SpudMan::EContextDelete, 0); + WaitForFsmInputResponse(KContextId0, KContextDeleteEvent, 0); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudFsmUnitNetworkDelete::~CSpudFsmUnitNetworkDelete() + {} + +// configure to use test step 108 from simtsy config file +CSpudFsmUnitNetworkDelete::CSpudFsmUnitNetworkDelete() : CSpudFsmUnitTestStepBase(108) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudFsmNetworkDelete); + } + +TVerdict CSpudFsmUnitNetworkDelete::doTestStepL() +/** + Test context delete from network + */ + { + INFO_PRINTF1(_L("Starting Spud Driver Unit test delete context from network")); + + // Start by creating all the Spud FSM objects. + // They have to be created in the test's Active Scheduler Thread + // (terminology from the test's design document). + // + FsmObjectCreate(KContextId0); + WaitForFsmObjectCreateResponse(KContextId0); + FsmObjectCreate(KContextId1); + WaitForFsmObjectCreateResponse(KContextId1); + + // Set up context config and QoS parameters + RPacketContext::TContextConfigGPRS contextConfigGPRS; + DefaultContextConfigGPRS(contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId0, contextConfigGPRS); + iListener->iPdpFsmInterface->Set(KContextId1, contextConfigGPRS); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested qosRequested; + DefaultQoSR5Requested(qosRequested); +#else + RPacketQoS::TQoSR99_R4Requested qosRequested; + DefaultQoSR99_R4Requested(qosRequested); +#endif + + iListener->iPdpFsmInterface->Set(KContextId0, qosRequested); + iListener->iPdpFsmInterface->Set(KContextId1, qosRequested); + + // + // Test context delete while an operation is pending + // + INFO_PRINTF1(_L("Test network delete context with pending operation")); + // Activating the primary context is configured to take a very long time + FsmInputRequest(KContextId0, SpudMan::ECreatePrimaryPDPContext, 0); + // The packet service status will become attached almost immediately, but the create + // primary context won't finish until it is active (which will take a long time) + WaitForFsmServiceNotificationStatus(); + + // This delete from the network will occur while the create primary is activating + EtelRequest(EContextStatusChange, 0); + WaitForFsmInputResponse(KContextId0, KContextDeleteEvent, KErrNotReady); + + + // + // Test context delete while an operation is not pending + // + INFO_PRINTF1(_L("Test network delete context from open state")); + // Activating this context is configured to take a short period of time + FsmInputRequest(KContextId1, SpudMan::ECreatePrimaryPDPContext, 0); + WaitForFsmInputResponse(KContextId1, KPrimaryContextCreated, KErrNone); + + EtelRequest(EContextStatusChange, 1); + WaitForFsmInputResponse(KContextId1, KContextDeleteEvent, KErrNotReady); + + // context should be deleted (and resources freed), so no need to delete here + + return TestStepResult(); + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudManInterfaceTest.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudManInterfaceTest.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,87 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// The implementation of the SpudManInterface for SPUD FSM unit tests +// +// + +/** + @file + @internalComponent +*/ + +#include "InputRequestListener.h" +#include + + +TSpudManInterfaceTest::TSpudManInterfaceTest(CInputRequestListener& aListener) : iListener(aListener) + {} + +/** + Signals to the test execute thread that MSpudManInterface::Input has been called + */ +void TSpudManInterfaceTest::Input(TContextId aPdpId, TInt aEvent, TInt aParam) + { + if (aEvent == KPdpFsmShuttingDown) + { + // This event requires no notification - In the real SpudMan it would cause SpudMan + // to close down (NULL) the pointer to the PdpFsmInterface provided by the UmtsGprsSCPR. + return; + } + + // The aOperation parameters are broken up into those that are notifications and those that aren't + // Since notifications can happen anytime, separate request status members need to be kept for each one + // Other input requests happen serially, so only one request can be pending at any time + TRequestStatus *status = NULL; + + // Here, rather than in the case statement due to rvct compiler warning +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Negotiated neg; +#else + RPacketQoS::TQoSR99_R4Negotiated neg; +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + switch (aEvent) + { + case KContextParametersChangeEvent: + iListener.iContextParametersEventData.iPdpId = aPdpId; + iListener.iPdpFsmInterface->Get(aPdpId, neg); + iListener.iContextParametersEventData.iNegotiated = neg; + + iListener.iPdpFsmInterface->Get(aPdpId, iListener.iContextParametersEventData.iContextConfig); + status = &iListener.iFsmContextParameterChangeStatus; + break; + case KNetworkStatusEvent: + status = &iListener.iFsmNetworkStatusStatus; + break; + case KContextBlockedEvent: + iListener.iContextBlockedEventPdpId = aPdpId; + status = &iListener.iFsmContextSuspendedStatus; + break; + case KContextUnblockedEvent: + iListener.iContextUnblockedEventPdpId = aPdpId; + status = &iListener.iFsmContextResumedStatus; + break; + default: + iListener.iFsmInputResponseData.iPdpId = aPdpId; + iListener.iFsmInputResponseData.iEvent = aEvent; + iListener.iFsmInputResponseData.iParam = aParam; + status = &iListener.iFsmInputResponseStatus; + break; + } + iListener.iParentThread.RequestComplete(status, KErrNone); + } + +void TSpudManInterfaceTest::SetContextTerminationErrorAndStop(TContextId /*aContextId*/, TInt /*aErrorCode*/) + {/*Placeholder for unused function*/} diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudTelUnitTestStep.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudTelUnitTestStep.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,881 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Unit tests for SPUD TEL +// +// + +/** + @file + @internalComponent +*/ + +#include +#include + +#include "SpudUnitTestStep.h" +#include "meteldriverstrategy.h" +#include "ceteldrivercontext.h" +#include "CompareContextParameters.h" +#include "DefaultContextParameters.h" + +using namespace EtelDriver; + +CSpudTelUnitNormalOperation::~CSpudTelUnitNormalOperation() + {} + +// configure to use test step 1 from simtsy config file +CSpudTelUnitNormalOperation::CSpudTelUnitNormalOperation() : CSpudTelUnitTestStepBase(1) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitNormalOperation); + } + +TVerdict CSpudTelUnitNormalOperation::doTestStepL() +/** + Test normal operation - test normal setqos (before and after context created) + - test normal settft (before and after context created) + - test normal create primary context + - test normal create secondary context + */ + { + INFO_PRINTF1(_L("Starting Spud Tel Test Normal Operation")); + + TRequestStatus status; + RPacketService::TContextInfo contextInfo; + + InitPhoneAndPacketServiceL(); + + // + // Test creating primary context + // + INFO_PRINTF1(_L("Test creating primary context")); + EtelDriverInputRequest( KContextId0, EOpenPhone); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPhoneOpened); + + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreated); + + // check that context was created - the simtsy creates the first primary context with name 'PRIMARY1' + TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone); + + // check that context config for GPRS was set correctly + RPacketContext::TContextConfigGPRS *contextConfig = new(ELeave) RPacketContext::TContextConfigGPRS; + CleanupStack::PushL(contextConfig); + TContextConfigGPRSPckg contextConfigPckg(*contextConfig); + iPrimaryPacketContext.GetConfig(status, contextConfigPckg); + User::WaitForRequest(status); + RPacketContext::TContextConfigGPRS *defaultContextConfigGPRS = new(ELeave) RPacketContext::TContextConfigGPRS; + CleanupStack::PushL(defaultContextConfigGPRS); + DefaultContextConfigGPRS(*defaultContextConfigGPRS); + TEST(CompareContextConfigGPRS(*defaultContextConfigGPRS, *contextConfig)); + CleanupStack::PopAndDestroy(defaultContextConfigGPRS); + CleanupStack::PopAndDestroy(contextConfig); + + + // + // Test creating secondary context + // + INFO_PRINTF1(_L("Test creating secondary context")); + EtelDriverInputRequest( KContextId1, ECreate2ryPdpContext); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::E2ryPdpContextCreated); + + // check that context was created - the simtsy creates the first secondary context with name 'SECONDARY1' + TEST(iSecondaryPacketContext.OpenExistingContext(iPacketService, KFirstSecondaryContextName) == KErrNone); + + + // + // Test setting and changing TFT + // + INFO_PRINTF1(_L("Test setting and changing TFT")); + TTFTInfo *firstTftInfo = new(ELeave) TTFTInfo; + CleanupStack::PushL(firstTftInfo); + TTFTInfo *secondTftInfo = new(ELeave) TTFTInfo; + CleanupStack::PushL(secondTftInfo); + TTFTInfo *combinedTftInfo = new(ELeave) TTFTInfo; + CleanupStack::PushL(combinedTftInfo); + DefaultTftInfo(*firstTftInfo); + SecondDefaultTftInfo(*secondTftInfo); + CombinedDefaultTftInfo(*combinedTftInfo); + + // Test setting TFT + iListener->iPdpFsmInterfaceTest->Set(KContextId0, KAddFilters); + iListener->iPdpFsmInterfaceTest->Set(KContextId0, *firstTftInfo); + EtelDriverInputRequest(KContextId0, ESetTft); + WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftSet); + // check that TFT was set + TTFTInfo expectedTftInfo; + TEST(CompareTFTInfo(*firstTftInfo, iPrimaryPacketContext)); + + // Test re-setting TFT + iListener->iPdpFsmInterfaceTest->Set(KContextId0, KAddFilters); + iListener->iPdpFsmInterfaceTest->Set(KContextId0, *secondTftInfo); + EtelDriverInputRequest(KContextId0, ESetTft); + WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftSet); + // check that TFT was set + TEST(CompareTFTInfo(*secondTftInfo, iPrimaryPacketContext)); + + // Test changing TFT (using KAddFilters) + iListener->iPdpFsmInterfaceTest->Set(KContextId0, KAddFilters); + iListener->iPdpFsmInterfaceTest->Set(KContextId0, *firstTftInfo); + EtelDriverInputRequest(KContextId0, EChangeTft); + WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftChanged); + // check that TFT was set + TEST(CompareTFTInfo(*combinedTftInfo, iPrimaryPacketContext)); + + // Test setting TFT (using KRemoveFilters) + iListener->iPdpFsmInterfaceTest->Set(KContextId0, KRemoveFilters); + iListener->iPdpFsmInterfaceTest->Set(KContextId0, *firstTftInfo); + EtelDriverInputRequest(KContextId0, EChangeTft); + WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftChanged); + // check that TFT was set + TEST(CompareTFTInfo(*secondTftInfo, iPrimaryPacketContext)); + + // Test setting TFT (using KDeleteTFT) + iListener->iPdpFsmInterfaceTest->Set(KContextId0, KDeleteTFT); + EtelDriverInputRequest(KContextId0, EChangeTft); + WaitForEtelDriverInputResponse(KContextId0, PdpFsm::ETftChanged); + // check that TFT was set + TInt count; + iPrimaryPacketContext.EnumeratePacketFilters(status, count); + User::WaitForRequest(status); + TEST(status == KErrNone); + TEST(count == 0); + CleanupStack::PopAndDestroy(combinedTftInfo); + CleanupStack::PopAndDestroy(secondTftInfo); + CleanupStack::PopAndDestroy(firstTftInfo); + + + // + // Test setting QOS + // + INFO_PRINTF1(_L("Test setting QOS")); + EtelDriverInputRequest( KContextId1, ESetQoS); + RPacketQoS::TQoSR99_R4Negotiated *defaultQoSR99_R4Negotiated = new(ELeave) RPacketQoS::TQoSR99_R4Negotiated; + CleanupStack::PushL(defaultQoSR99_R4Negotiated); + SecondQoSR99_R4Negotiated(*defaultQoSR99_R4Negotiated); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::EQoSSet); + RPacketQoS packetQos; + // check that QOS was created - the simtsy creates the first QOS with name KFirstQosName + TEST(packetQos.OpenExistingQoS(iSecondaryPacketContext, KFirstQosName) == KErrNone); + // qos was created ok + RPacketQoS::TQoSR99_R4Negotiated *qos = new(ELeave) RPacketQoS::TQoSR99_R4Negotiated; + CleanupStack::PushL(qos); + TQoSR99_R4NegotiatedPckg qosPckg(*qos); + packetQos.GetProfileParameters(status, qosPckg); + User::WaitForRequest(status); + TEST(CompareUMTSQoSNeg(*defaultQoSR99_R4Negotiated, *qos)); + CleanupStack::PopAndDestroy(qos); + CleanupStack::PopAndDestroy(defaultQoSR99_R4Negotiated); + packetQos.Close(); + iSecondaryPacketContext.Close(); + iPrimaryPacketContext.Close(); + + + // + // Test activating context + // + INFO_PRINTF1(_L("Test activating context")); + EtelDriverInputRequest( KContextId1, EActivatePdp); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::EPdpActivated); + + // test that context is set to activated + TEST(CompareContextInfo(iPacketService, KFirstSecondaryContextName, RPacketContext::EStatusActive)); + // make sure the data channel was set as well + RPacketContext::TDataChannelV2 dataChannel; + DefaultDataChannel(dataChannel); + TEST(CompareDataChannel(iListener->iNotifyContextDataChannelData.iDataChannelV2, dataChannel)); + + + // + // Test modifying active context + // + INFO_PRINTF1(_L("Test modifying activate context")); + EtelDriverInputRequest(KContextId1, EChangeTft); + WaitForEtelDriverInputResponse(KContextId1, PdpFsm::ETftChanged); + EtelDriverInputRequest( KContextId1, EModifyActive); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::EPdpContextModified); + + + // + // Test deleting secondary context + // + INFO_PRINTF1(_L("Test deleting secondary context")); + EtelDriverInputRequest( KContextId1, EContextDelete); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::EContextDeleted); + + // make sure it is marked as deleted + iPacketService.GetContextInfo(status, KContextId1, contextInfo); + User::WaitForRequest(status); + TEST(status == KErrNone && contextInfo.iStatus == RPacketContext::EStatusDeleted); + + + // + // Test deleting primary context + // + INFO_PRINTF1(_L("Test deleting primary context")); + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeleted); + + // make sure it is marked as deleted + iPacketService.GetContextInfo(status, KContextId0, contextInfo); + User::WaitForRequest(status); + TEST(status == KErrNone && contextInfo.iStatus == RPacketContext::EStatusDeleted); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitNotifications::~CSpudTelUnitNotifications() + {} + +// configure to use test step 1 from simtsy config file +CSpudTelUnitNotifications::CSpudTelUnitNotifications() : CSpudTelUnitTestStepBase(1) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitNotifications); + } + +TVerdict CSpudTelUnitNotifications::doTestStepL() +/** + Test notifications + */ + { + INFO_PRINTF1(_L("Starting Spud Test Notifications")); + + TRequestStatus status; + RPacketQoS packetQos; + + InitPhoneAndPacketServiceL(); + + // + // setup test - create primary context and start notifications + // + INFO_PRINTF1(_L("setup test - create primary context and start notifications")); + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreated); + + EtelDriverInputRequest( KContextId0, EActivatePdp); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPdpActivated); + + // check that context was created - the simtsy creates the first primary context with name 'PRIMARY1' + TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone); + + // + // Test service status notification + // + // the timing here may or may not allow us to recieve an 'activating' request + WaitForGivenEtelContextStatusNotification(KContextId0, RPacketContext::EStatusActive); + WaitForNextServiceNotificationStatus( RPacketService::EStatusActive); + + + // + // Test context config notification + // + INFO_PRINTF1(_L("Test context config notification")); + RPacketContext::TContextConfigGPRS contextConfig; + DefaultContextConfigGPRS(contextConfig); + TContextConfigGPRSPckg contextConfigPckg(contextConfig); + iPrimaryPacketContext.SetConfig(status, contextConfigPckg); + User::WaitForRequest(status); + + WaitForNextContextConfigNotification(KContextId0, contextConfig); + + // check that QOS was created - the simtsy creates the first QOS with name KFirstQosName + TEST(packetQos.OpenExistingQoS(iPrimaryPacketContext, KFirstQosName) == KErrNone); + + + // + // Test QOS notification + // + + INFO_PRINTF1(_L("Test QOS notification")); + RPacketQoS::TQoSR99_R4Requested qosRequested; + DefaultQoSR99_R4Requested(qosRequested); + RPacketQoS::TQoSR99_R4Negotiated qosNegotiated; + SecondQoSR99_R4Negotiated(qosNegotiated); + TQoSR99_R4RequestedPckg qosRequestedPckg(qosRequested); + packetQos.SetProfileParameters(status, qosRequestedPckg); + User::WaitForRequest(status); + WaitForNextQosNotification(KContextId0, qosNegotiated); + + // clean up + packetQos.Close(); + iPrimaryPacketContext.Close(); + + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeleted); + WaitForNextServiceNotificationStatus(RPacketService::EStatusAttached); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitCreatePrimaryError::~CSpudTelUnitCreatePrimaryError() + { + } + +// configure to use test step 3 from simtsy config file +CSpudTelUnitCreatePrimaryError::CSpudTelUnitCreatePrimaryError() : CSpudTelUnitTestStepBase(3) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitCreatePrimaryError); + } + +TVerdict CSpudTelUnitCreatePrimaryError::doTestStepL() +/** + Errors with creating primary + */ + { + INFO_PRINTF1(_L("Starting Spud Test Create Primary Context Error with SetConfig")); + + InitPhoneAndPacketServiceL(); + + EtelDriverInputRequest( KContextId0, EOpenPhone); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPhoneOpened); + + // simtsy is configured to fail second RPacketContext::SetConfig + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreatedFailed, KErrGeneral); + + // clean up + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeleted); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitSetQosError::~CSpudTelUnitSetQosError() + {} + +// configure to use test step 6 from simtsy config file +CSpudTelUnitSetQosError::CSpudTelUnitSetQosError() : CSpudTelUnitTestStepBase(6) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitSetQosError); + } + +TVerdict CSpudTelUnitSetQosError::doTestStepL() +/** + Errors with setting QoS + */ + { + INFO_PRINTF1(_L("Starting Spud Test Set QOS Error")); + + InitPhoneAndPacketServiceL(); + + // set test up + EtelDriverInputRequest( KContextId0, EOpenPhone); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPhoneOpened); + + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreatedFailed, KErrGeneral); + + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeleted); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitSetTftError::~CSpudTelUnitSetTftError() + { + } + +// configure to use test step 7 from simtsy config file +CSpudTelUnitSetTftError::CSpudTelUnitSetTftError() : CSpudTelUnitTestStepBase(7) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitSetTftError); + } + +TVerdict CSpudTelUnitSetTftError::doTestStepL() +/** + Errors with setting TFT + */ + { + INFO_PRINTF1(_L("Starting Spud Test Set TFT Error")); + + InitPhoneAndPacketServiceL(); + + // set test up + EtelDriverInputRequest( KContextId0, EOpenPhone); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPhoneOpened); + + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreated); + + // test error in RPacketQoS::CreateNewTFT + EtelDriverInputRequest( KContextId0, ESetTft); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::ETftSetFailed, KErrGeneral); + + // test error in RPacketQoS::AddPacketFilter + EtelDriverInputRequest( KContextId0, ESetTft); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::ETftSetFailed, KErrGeneral); + + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeleted); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitActivateError1::~CSpudTelUnitActivateError1() + { + } + +// configure to use test step 8 from simtsy config file +CSpudTelUnitActivateError1::CSpudTelUnitActivateError1() : CSpudTelUnitTestStepBase(8) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitActivateError1); + } + +TVerdict CSpudTelUnitActivateError1::doTestStepL() +/** + * Errors with activating + */ + { + INFO_PRINTF1(_L("Starting Spud Test Activate Error 1")); + + InitPhoneAndPacketServiceL(); + + // set test up + EtelDriverInputRequest( KContextId0, EOpenPhone); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPhoneOpened); + + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreated); + + // test error in RPacketContext::Activate + EtelDriverInputRequest( KContextId0, EActivatePdp); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPdpActivatedFailed, KErrGeneral); + + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeleted); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitActivateError2::~CSpudTelUnitActivateError2() + { + } + +// configure to use test step 8 from simtsy config file +CSpudTelUnitActivateError2::CSpudTelUnitActivateError2() : CSpudTelUnitTestStepBase(14) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitActivateError2); + } + +TVerdict CSpudTelUnitActivateError2::doTestStepL() +/** + * Errors with activating + */ + { + INFO_PRINTF1(_L("Starting Spud Test Activate Error 2")); + + InitPhoneAndPacketServiceL(); + + // set test up + EtelDriverInputRequest( KContextId0, EOpenPhone); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPhoneOpened); + + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreated); + + // test error in RPacketContext::InitialiseContext + EtelDriverInputRequest( KContextId0, EActivatePdp); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPdpActivatedFailed, KErrGeneral); + + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeleted); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitDeleteError1::~CSpudTelUnitDeleteError1() + { + } + +// configure to use test step 9 from simtsy config file +CSpudTelUnitDeleteError1::CSpudTelUnitDeleteError1() : CSpudTelUnitTestStepBase(9) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitDeleteError1); + } + +TVerdict CSpudTelUnitDeleteError1::doTestStepL() +/** + Errors with deleting + */ + { + INFO_PRINTF1(_L("Starting Spud Test Delete Error")); + + InitPhoneAndPacketServiceL(); + + // set test up phone, primary context, it's QoS parameters, and activate the context + EtelDriverInputRequest( KContextId0, EOpenPhone); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPhoneOpened); + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreated); + EtelDriverInputRequest( KContextId0, ESetQoS); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EQoSSet); + EtelDriverInputRequest( KContextId0, EActivatePdp); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPdpActivated); + + // test error in RPacketContext::Deactivate + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeletedFailed, KErrGeneral); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitDeleteError2::~CSpudTelUnitDeleteError2() + { + } + +// configure to use test step 13 from simtsy config file +CSpudTelUnitDeleteError2::CSpudTelUnitDeleteError2() : CSpudTelUnitTestStepBase(10) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitDeleteError2); + } + +TVerdict CSpudTelUnitDeleteError2::doTestStepL() +/** + Errors with deleting + */ + { + INFO_PRINTF1(_L("Starting Spud Test Delete Error 2")); + + InitPhoneAndPacketServiceL(); + + // set test up + EtelDriverInputRequest( KContextId0, EOpenPhone); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPhoneOpened); + + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreated); + EtelDriverInputRequest( KContextId0, EActivatePdp); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPdpActivated); + + // test error in RPacketContext::Delete + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeletedFailed, KErrGeneral); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitMultipleContexts::~CSpudTelUnitMultipleContexts() + { + } + +// configure to use test step 10 from simtsy config file +CSpudTelUnitMultipleContexts::CSpudTelUnitMultipleContexts() : CSpudTelUnitTestStepBase(11) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitMultipleContexts); + } + +TVerdict CSpudTelUnitMultipleContexts::doTestStepL() +/** + Test multiple primary contexts with multiple secondary contexts + */ + { + INFO_PRINTF1(_L("Starting Spud Test Multiple Contexts")); + + TRequestStatus status; + + InitPhoneAndPacketServiceL(); + RPacketContext primaryPacketContext2, secondaryPacketContext2; + + EtelDriverInputRequest( KContextId0, EOpenPhone); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EPhoneOpened); + + // + // Test creating multiple primary contexts + // + INFO_PRINTF1(_L("Test create first primary context")); + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::E1ryPdpContextCreated); + + // check that context was created - the simtsy creates the first primary context with name 'PRIMARY1' + TEST(iPrimaryPacketContext.OpenExistingContext(iPacketService, KFirstPrimaryContextName) == KErrNone); + + // check that context config for GPRS was set correctly + RPacketContext::TContextConfigGPRS *contextConfig = new(ELeave) RPacketContext::TContextConfigGPRS; + CleanupStack::PushL(contextConfig); + TContextConfigGPRSPckg contextConfigPckg(*contextConfig); + iPrimaryPacketContext.GetConfig(status, contextConfigPckg); + User::WaitForRequest(status); + RPacketContext::TContextConfigGPRS *defaultTestContextConfigGPRS = new(ELeave) RPacketContext::TContextConfigGPRS; + CleanupStack::PushL(defaultTestContextConfigGPRS); + DefaultContextConfigGPRS(*defaultTestContextConfigGPRS); + TEST(CompareContextConfigGPRS(*defaultTestContextConfigGPRS, *contextConfig)); + + INFO_PRINTF1(_L("Test create second primary context")); + EtelDriverInputRequest( KContextId1, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::E1ryPdpContextCreated); + + // check that context was created - the simtsy creates the first primary context with name 'PRIMARY2' + TEST(primaryPacketContext2.OpenExistingContext(iPacketService, KSecondPrimaryContextName) == KErrNone); + + // check that context config for GPRS was set correctly + primaryPacketContext2.GetConfig(status, contextConfigPckg); + User::WaitForRequest(status); + TEST(CompareContextConfigGPRS(*defaultTestContextConfigGPRS, *contextConfig)); + CleanupStack::PopAndDestroy(defaultTestContextConfigGPRS); + CleanupStack::PopAndDestroy(contextConfig); + + + // + // Test creating secondary contexts on each primary context + // + INFO_PRINTF1(_L("Test create first secondary context")); + EtelDriverInputRequest( KContextId2, ECreate2ryPdpContext); + WaitForEtelDriverInputResponse( KContextId2, PdpFsm::E2ryPdpContextCreated); + + // check that context was created - the simtsy creates the first secondary context with name 'SECONDARY1' + TEST(iSecondaryPacketContext.OpenExistingContext(iPacketService, KFirstSecondaryContextName) == KErrNone); + + INFO_PRINTF1(_L("Test create second secondary context")); + EtelDriverInputRequest( KContextId3, ECreate2ryPdpContext); + WaitForEtelDriverInputResponse( KContextId3, PdpFsm::E2ryPdpContextCreated); + + // check that context was created - the simtsy creates the first secondary context with name 'SECONDARY2' + TEST(secondaryPacketContext2.OpenExistingContext(iPacketService, KSecondSecondaryContextName) == KErrNone); + + + // + // Test setting TFT (this time on secondary context) + // + INFO_PRINTF1(_L("Test setting TFT")); + EtelDriverInputRequest( KContextId3, ESetTft); + WaitForEtelDriverInputResponse( KContextId3, PdpFsm::ETftSet); + + // check that TFT was set + TTFTInfo *expectedTftInfo = new(ELeave) TTFTInfo; + CleanupStack::PushL(expectedTftInfo); + DefaultTftInfo(*expectedTftInfo); + TEST(CompareTFTInfo(*expectedTftInfo, secondaryPacketContext2)); + CleanupStack::PopAndDestroy(expectedTftInfo); + + + // + // Test setting QOS (this time on primary context) + // + INFO_PRINTF1(_L("Test setting QOS")); + EtelDriverInputRequest( KContextId1, ESetQoS); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::EQoSSet); + RPacketQoS packetQos; + // check that QOS was created - the simtsy creates the first QOS with name KFirstQosName + TEST(packetQos.OpenExistingQoS(primaryPacketContext2, KFirstQosName) == KErrNone); + // qos was created ok + RPacketQoS::TQoSR99_R4Negotiated *qos = new(ELeave) RPacketQoS::TQoSR99_R4Negotiated; + CleanupStack::PushL(qos); + TQoSR99_R4NegotiatedPckg qosPckg(*qos); + packetQos.GetProfileParameters(status, qosPckg); + User::WaitForRequest(status); + RPacketQoS::TQoSR99_R4Negotiated *defaultTestTQoSR99_R4Negotiated = new(ELeave) RPacketQoS::TQoSR99_R4Negotiated; + CleanupStack::PushL(defaultTestTQoSR99_R4Negotiated); + SecondQoSR99_R4Negotiated(*defaultTestTQoSR99_R4Negotiated); + TEST(CompareUMTSQoSNeg(*defaultTestTQoSR99_R4Negotiated, *qos)); + packetQos.Close(); + CleanupStack::PopAndDestroy(defaultTestTQoSR99_R4Negotiated); + CleanupStack::PopAndDestroy(qos); + primaryPacketContext2.Close(); + secondaryPacketContext2.Close(); + iPrimaryPacketContext.Close(); + iSecondaryPacketContext.Close(); + + + // + // Test activating contexts + // + INFO_PRINTF1(_L("Test activating contexts")); + EtelDriverInputRequest( KContextId1, EActivatePdp); + // The service is now attached + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::EPdpActivated); + + // test that context is set to activated + TEST(CompareContextInfo(iPacketService, KSecondPrimaryContextName, RPacketContext::EStatusActive)); + RPacketContext::TDataChannelV2 dataChannel; + DefaultDataChannel(dataChannel); + TEST(CompareDataChannel(iListener->iNotifyContextDataChannelData.iDataChannelV2, dataChannel)); + + EtelDriverInputRequest( KContextId2, EActivatePdp); + WaitForEtelDriverInputResponse( KContextId2, PdpFsm::EPdpActivated); + + // test that context is set to activated + TEST(CompareContextInfo(iPacketService, KFirstSecondaryContextName, RPacketContext::EStatusActive)); + + + // + // Test deleting primary context before secondary contexts + // + INFO_PRINTF1(_L("Test deleting primary contexts before secondary contexts")); + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeleted); + + // make sure it is marked as deleted + TEST(CompareContextInfo(iPacketService, KFirstPrimaryContextName, RPacketContext::EStatusDeleted)); + + EtelDriverInputRequest( KContextId1, EContextDelete); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::EContextDeleted); + + // make sure it is marked as deleted + TEST(CompareContextInfo(iPacketService, KSecondPrimaryContextName, RPacketContext::EStatusDeleted)); + + + // + // Test deleting secondary contexts + // + INFO_PRINTF1(_L("Test deleting secondary contexts")); + EtelDriverInputRequest( KContextId2, EContextDelete); + WaitForEtelDriverInputResponse( KContextId2, PdpFsm::EContextDeleted); + + // make sure it is marked as deleted + TEST(CompareContextInfo(iPacketService, KFirstSecondaryContextName, RPacketContext::EStatusDeleted)); + + EtelDriverInputRequest( KContextId3, EContextDelete); + WaitForEtelDriverInputResponse( KContextId3, PdpFsm::EContextDeleted); + + // make sure it is marked as deleted + TEST(CompareContextInfo(iPacketService, KSecondSecondaryContextName, RPacketContext::EStatusDeleted)); + + DestroyPhoneAndPacketService(); + + return TestStepResult(); + } + +CSpudTelUnitCancel::~CSpudTelUnitCancel() + { + } + +// configure to use test step 12 from simtsy config file +CSpudTelUnitCancel::CSpudTelUnitCancel() : CSpudTelUnitTestStepBase(12) + { + // Call base class method to set up the human readable name for logging + SetTestStepName(KSpudTelUnitCancel); + } + +TVerdict CSpudTelUnitCancel::doTestStepL() +/** + Test cancelling operations + */ + { + INFO_PRINTF1(_L("Starting Spud Test Cancel on Input Operations")); + + TRequestStatus timerStatus; + RTimer timer; + timer.CreateLocal(); + + InitPhoneAndPacketServiceL(); + + // + // Test cancelling create primary request + // + INFO_PRINTF1(_L("Test cancelling create primary request")); + EtelDriverInputRequest( KContextId0, ECreate1ryPdpContext); + CancelPdpRequest(KContextId0); + timer.After(timerStatus, 1500000); + User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus); + TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending); + + + // + // Set up primary for upcoming tests + // + // + INFO_PRINTF1(_L("Create primary")); + EtelDriverInputRequest( KContextId1, ECreate1ryPdpContext); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::E1ryPdpContextCreated); + + // since creating secondary contains no asyncronous requests, the request cannot be cancelled + //EtelDriverInputRequest( KContextId2, ECreate2ryPdpContext); + //CancelPdpRequest(KContextId2); + //timer.After(timerStatus, 1500000); + //User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus); + //TEST(iListener->iEtelDriverInputResponseStatus == KErrNone); + + + // + // Test cancelling set TFT + // + INFO_PRINTF1(_L("Test cancelling set TFT")); + EtelDriverInputRequest( KContextId1, ESetTft); + CancelPdpRequest(KContextId1); + timer.After(timerStatus, 1500000); + User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus); + TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending); + + + // + // Test cancelling set QOS + // + //INFO_PRINTF1(_L("Test cancelling set QOS")); + //EtelDriverInputRequest( KContextId1, ESetQoS); + //CancelPdpRequest(KContextId1); + //timer.After(timerStatus, 1500000); + //User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus); + //TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending); + + + // + // Test cancelling activate PDP + // + INFO_PRINTF1(_L("Test cancelling create secondary request")); + EtelDriverInputRequest( KContextId1, EActivatePdp); + CancelPdpRequest(KContextId1); + timer.After(timerStatus, 1500000); + User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus); + TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending); + + + // + // Test cancelling context delete + // + INFO_PRINTF1(_L("Test cancelling context delete")); + EtelDriverInputRequest( KContextId1, EContextDelete); + CancelPdpRequest(KContextId1); + timer.After(timerStatus, 1500000); + User::WaitForRequest(iListener->iEtelDriverInputResponseStatus, timerStatus); + TEST(timerStatus == KErrNone && iListener->iEtelDriverInputResponseStatus == KRequestPending); + + // clean up + EtelDriverInputRequest( KContextId0, EContextDelete); + WaitForEtelDriverInputResponse( KContextId0, PdpFsm::EContextDeleted); + EtelDriverInputRequest( KContextId1, EContextDelete); + WaitForEtelDriverInputResponse( KContextId1, PdpFsm::EContextDeleted); + + DestroyPhoneAndPacketService(); + + timer.Close(); + + return TestStepResult(); + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestServer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestServer.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,203 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// for (WINS && !EKA2) versions will be xxxServer.Dll and require a thread to +// be started in the process of the client. The client initialises the server +// by calling the one and only ordinal. +// +// + +/** + @file + @internalComponent +*/ + +#include "SpudUnitTestServer.h" +#include "SpudUnitTestStep.h" + +_LIT(KServerName,"TE_SpudUnit"); + +CSpudUnitTestServer* CSpudUnitTestServer::NewL() +/** + * @return - Instance of the test server + * Called inside the MainL() function to create and start the + * CTestServer derived server. + */ + { + // Instantiate server class here + CSpudUnitTestServer * server = new (ELeave) CSpudUnitTestServer(); + CleanupStack::PushL(server); + // CServer base class call + server->StartL(KServerName); + CleanupStack::Pop(server); + return server; + } + +// EKA2 much simpler +// Just an E32Main and a MainL() +LOCAL_C void MainL() +/** + * Much simpler, uses the new Rendezvous() call to sync with the client + */ + { + _LIT(KPhbkSyncCMI, "phbsync.cmi"); + TInt err = StartC32WithCMISuppressions(KPhbkSyncCMI); + if (err != KErrNone && err != KErrAlreadyExists) + { + User::Leave(err); + } + + CActiveScheduler* sched=NULL; + sched=new(ELeave) CActiveScheduler; + CActiveScheduler::Install(sched); + + CSpudUnitTestServer* server = NULL; + // Create the CTestServer derived server + TRAP(err,server = CSpudUnitTestServer::NewL()); + if(!err) + { + // Sync with the client and enter the active scheduler + RProcess::Rendezvous(KErrNone); + sched->Start(); + } + delete server; + delete sched; + } + + +GLDEF_C TInt E32Main() +/** + * @return - Standard Epoc error code on exit + */ + { + CTrapCleanup* cleanup = CTrapCleanup::New(); + if(cleanup == NULL) + { + return KErrNoMemory; + } + TRAPD(err,MainL()); + delete cleanup; + return err; + } + +/** export function */ +REtelDriverInput* NewEtelDriverInputL() + { + return new(ELeave) REtelDriverInput(); + } + + +// Create a thread in the calling process +// Emulator typhoon and earlier + +CTestStep* CSpudUnitTestServer::CreateTestStep(const TDesC& aStepName) +/** + * @return - A CTestStep derived instance + * Implementation of CTestServer pure virtual + */ + { + CTestStep* testStep = NULL; + + TRAPD + (err, + + // SPUD TEL unit tests + if(aStepName == KSpudTelUnitNormalOperation) + { + testStep = new(ELeave) CSpudTelUnitNormalOperation(); + } + if(aStepName == KSpudTelUnitNotifications) + { + testStep = new(ELeave) CSpudTelUnitNotifications(); + } + if(aStepName == KSpudTelUnitCreatePrimaryError) + { + testStep = new(ELeave) CSpudTelUnitCreatePrimaryError(); + } + if(aStepName == KSpudTelUnitSetQosError) + { + testStep = new(ELeave) CSpudTelUnitSetQosError(); + } + if(aStepName == KSpudTelUnitSetTftError) + { + testStep = new(ELeave) CSpudTelUnitSetTftError(); + } + if(aStepName == KSpudTelUnitActivateError1) + { + testStep = new(ELeave) CSpudTelUnitActivateError1(); + } + if(aStepName == KSpudTelUnitActivateError2) + { + testStep = new(ELeave) CSpudTelUnitActivateError2(); + } + if(aStepName == KSpudTelUnitDeleteError1) + { + testStep = new(ELeave) CSpudTelUnitDeleteError1(); + } + if(aStepName == KSpudTelUnitDeleteError2) + { + testStep = new(ELeave) CSpudTelUnitDeleteError2(); + } + if(aStepName == KSpudTelUnitMultipleContexts) + { + testStep = new(ELeave) CSpudTelUnitMultipleContexts(); + } + if(aStepName == KSpudTelUnitCancel) + { + testStep = new(ELeave) CSpudTelUnitCancel(); + } + + // SPUD FSM unit tests + if(aStepName == KSpudFsmUnitNormalOperation) + { + testStep = new(ELeave) CSpudFsmUnitNormalOperation(); + } + if(aStepName == KSpudFsmCreatePrimaryError1) + { + testStep = new(ELeave) CSpudFsmUnitCreatePrimaryError1(); + } + if(aStepName == KSpudFsmCreatePrimaryError2) + { + testStep = new(ELeave) CSpudFsmUnitCreatePrimaryError2(); + } + if(aStepName == KSpudFsmCreatePrimaryError3) + { + testStep = new(ELeave) CSpudFsmUnitCreatePrimaryError3(); + } + if(aStepName == KSpudFsmSetQosAndTftError) + { + testStep = new(ELeave) CSpudFsmUnitSetQosAndTftError(); + } + if(aStepName == KSpudFsmChangeQosAndTftError) + { + testStep = new(ELeave) CSpudFsmUnitChangeQosAndTftError(); + } + if(aStepName == KSpudFsmTestNotifications) + { + testStep = new(ELeave) CSpudFsmUnitNotifications(); + } + if(aStepName == KSpudFsmNetworkDelete) + { + testStep = new(ELeave) CSpudFsmUnitNetworkDelete(); + } + + ); + + if (err != KErrNone) + { + return NULL; + } + + return testStep; + } + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestStepBase.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestStepBase.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,496 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Test framework for SPUD TEL and SPUD FSM unit tests +// +// + +/** + @file + @internalComponent +*/ + +#include +#include +#include +#include + +#include +#include + +#include "SpudUnitTestStep.h" +#include "InputRequestListener.h" + +using namespace EtelDriver; + +CSpudUnitTestStepBase::CSpudUnitTestStepBase(TInt aTestNumber, TBool aUseTestPdpFsmInterface) : iTestNumber(aTestNumber), iUseTestPdpFsmInterface(aUseTestPdpFsmInterface) + {} + +/** +Sets the section for the simtsy to use in its c:\config.txt file. +The section that will be used is testX, where X is the parameter +aTestNumber. + +@param aTestNumber Simtsy configuration section number, which will be + set to ensure simtsy loads the correct parameters on + when it is loaded. +@leave The function leaves if the Sim.TSY test number property is not + defined; e.g. make sure StartC32 has been called. +*/ +void CSpudUnitTestStepBase::SetSimTsyTestNumberL(TInt aTestNumber) + { + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, aTestNumber)); + } + +/** + Initializes the test framework, including creating the thread that will run the active + scheduler containing the components under test (SPUD or SPUDTEL) + */ +TVerdict CSpudUnitTestStepBase::doTestStepPreambleL() + { + SetSimTsyTestNumberL(iTestNumber); + + // create CTestRequestListener, to be used to contain parameters to be passed + // between the two threads + iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface); + + // creating and start the thread that will run the active scheduler containing SPUD or SPUDTEL + TActiveSchedulerThreadParams params; + params.iListener = iListener; + params.iThreadId = RThread().Id(); + _LIT(activeSchedulerThreadName, "ActiveSchedulerThread_"); + TBuf<255> buf(activeSchedulerThreadName); + buf.AppendNum(iTestNumber); + TInt ret = iActiveSchedulerThread.Create(buf, ActiveSchedulerThread, KDefaultStackSize, NULL, ¶ms); + TESTEL(ret == KErrNone, ret); + iActiveSchedulerThread.Resume(); + + // wait for the thread to initialize before sending it any requests + User::WaitForRequest(iListener->iThreadInitialized); + + return TestStepResult(); + } + +/** + Cleans up anything allocated in the preamble + */ +TVerdict CSpudUnitTestStepBase::doTestStepPostambleL() + { + // if we complete the listener's status with an error, the RunL will stop the + // active scheduler and the thread will clean up any resources and exit + TRequestStatus *status = &iListener->iStatus; + iActiveSchedulerThread.RequestComplete(status, KErrCancel); + + // wait until the thread has cleaned up then kill it + // if the iThreadDestructed is never completed, this is probably the result of the UHEAP_MARKEND macro failing + User::WaitForRequest(iListener->iThreadDestructed); + iActiveSchedulerThread.Kill(KErrNone); + iActiveSchedulerThread.Close(); + + delete iListener; + iListener = NULL; + + return EPass; + } + +/** + Initializes the packet service to query current parameters +*/ +void CSpudUnitTestStepBase::InitPhoneAndPacketServiceL() + { + TESTL(iTelServer.Connect() == KErrNone); + TESTL(iTelServer.LoadPhoneModule( _L("SIM") ) == KErrNone); + TESTL(iPhone.Open ( iTelServer, _L("SimulatorPhone") ) == KErrNone); + TESTL(iPacketService.Open(iPhone) == KErrNone); + } + +void CSpudUnitTestStepBase::DestroyPhoneAndPacketService() + { + iPacketService.Close(); + iPhone.Close(); + iTelServer.Close(); + } + +// Set up to not use Test PdpFsmInterface (and use the spud fsm's RPdpFsmInterface) +CSpudFsmUnitTestStepBase::CSpudFsmUnitTestStepBase(TInt aTestNumber) : CSpudUnitTestStepBase(aTestNumber, EFalse) + {} + +// Set up to use Test PdpFsmInterface +CSpudTelUnitTestStepBase::CSpudTelUnitTestStepBase(TInt aTestNumber) : CSpudUnitTestStepBase(aTestNumber, ETrue) + {} + +/** + Must be called after simtsy has been initialized. + Instructs the simtsy to complete a given request/notification. The supported commands are given in TEtelRequestType. + The parameter supplied in aNewValue instructs the simtsy what data from the config.txt to use in the completion of the request. + The aNewValue is the index to the entry to be used to complete the request for the current test step section, ie if aNewValue + is 0, iTestNumber is 3, and aEtelCommand is ENetworkQoSChange, the entry will complete any NotifyNetworkQoSChange calls + with data from the first QosProfileReqR99 entry of section [test3] in the config.txt file +*/ +void CSpudUnitTestStepBase::EtelRequest(TEtelRequestType aEtelCommand, TInt aNewValue) + { + INFO_PRINTF3(_L("CSpudUnitTestStepBase::EtelRequest: aEtelCommand = %d, aNewValue = %d"), aEtelCommand, aNewValue); + + TUint key(0); + + switch (aEtelCommand) + { + case ENetworkQoSChange: + key = KPSSimTsyNetworkQoSChange; + break; + case ENetworkChangeRegStatus: + key = KPSSimtsyPacketServiceNtwkRegStatusChange; + break; + case EContextStatusChange: + key = KPSSimtsyPacketContextStatusChange; + break; + default: + // log error + return; + } + + // simtsy will listen for any changes to the property, and complete the corresponding request + TInt ret = RProperty::Set(KUidPSSimTsyCategory, key, aNewValue); + TEST(ret == KErrNone); + } + +/** + Calling this will instruct the CTestRequestListener to call REtelDriverInput::CancelPdpNotifications on SPUDTEL +*/ +void CSpudTelUnitTestStepBase::CancelPdpRequest(TContextId aPdpId) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::EtelDriverCancelPdpRequest: aPdpId = %d"), aPdpId); + // wait until iListener to finish with the iControlData member so that 2 requests + // immediately after one another will still work + User::WaitForRequest(iListener->iReadyForInputRequest); + iListener->iReadyForInputRequest = KRequestPending; + + // set the parameters to pass to REtelDriverInput::Input + iListener->iEtelDriverCancelRequestPdpId = aPdpId; + + // complete iListener's status, causing its RunL to call CancelPdp on SPUDTEL + TRequestStatus *status = &iListener->iStatus; + iActiveSchedulerThread.RequestComplete(status, CInputRequestListener::EEtelDriverCancelPdpRequest); + } + +/** + Calling this will instruct the CTestRequestListener to call REtelDriverInput::Input on SPUDTEL +*/ +void CSpudTelUnitTestStepBase::EtelDriverInputRequest(TContextId aPdpId, TEtelInput aOperation) + { + INFO_PRINTF3(_L("CSpudUnitTestStepBase::EtelDriverInputRequest: aPdpId = %d, aOperation = %d"), aPdpId, aOperation); + // wait until iListener to finish with the iControlData member so that 2 requests + // immediately after one another will still work + User::WaitForRequest(iListener->iReadyForInputRequest); + iListener->iReadyForInputRequest = KRequestPending; + + // set the parameters to pass to REtelDriverInput::Input + iListener->iEtelDriverInputRequestData.iPdpId = aPdpId; + iListener->iEtelDriverInputRequestData.iOperation = aOperation; + + // complete iListener's status, causing its RunL to call Input on SPUDTEL + TRequestStatus *status = &iListener->iStatus; + iActiveSchedulerThread.RequestComplete(status, CInputRequestListener::EEtelDriverInputRequest); + } + +/** + Wait for RPdpFsmInterface::Input to be called with a non-notification event +*/ +void CSpudTelUnitTestStepBase::WaitForEtelDriverInputResponse(TContextId aPdpId, PdpFsm::TEtelSignal aSignal, TInt aError) + { + INFO_PRINTF3(_L("CSpudUnitTestStepBase::WaitForEtelDriverInputResponse: aPdpId = %d, aSignal = %d"), aPdpId, aSignal); + + // the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverInputResponseStatus request + User::WaitForRequest(iListener->iEtelDriverInputResponseStatus); + + // make sure the parameters are as expected + TEST(iListener->iEtelDriverInputResponseStatus == aError); + TEST(iListener->iEtelDriverInputResponseData.iPdpId == aPdpId); + TEST(iListener->iEtelDriverInputResponseData.iSignal == aSignal); + + iListener->iEtelDriverInputResponseStatus = KRequestPending; + } + +/** + Wait for RPdpFsmInterface::Input to be called with aOperation EConfigGPRSChangeNetwork +*/ +void CSpudTelUnitTestStepBase::WaitForNextContextConfigNotification(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfigGPRS) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextContextConfigNotification: aPdpId = %d"), aPdpId); + + // the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverConfigGPRSNotificationStatus request + User::WaitForRequest(iListener->iEtelDriverConfigGPRSNotificationStatus); + + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextContextConfigNotification: iListener->iNotifyContextConfigData.iPdpId = %d"), iListener->iNotifyContextConfigData.iPdpId); + // make sure the parameters are as expected + TEST(iListener->iEtelDriverConfigGPRSNotificationStatus == KErrNone); + TEST(iListener->iNotifyContextConfigData.iPdpId == aPdpId); + TEST(CompareContextConfigGPRS(iListener->iNotifyContextConfigData.iContextConfigGPRS, aContextConfigGPRS)); + + iListener->iEtelDriverConfigGPRSNotificationStatus = KRequestPending; + } + +/** + Wait for RPdpFsmInterface::Input to be called with aOperation EContextStatusChangeNetwork +*/ +void CSpudTelUnitTestStepBase::WaitForGivenEtelContextStatusNotification(TContextId aPdpId, RPacketContext::TContextStatus aContextStatus) + { + INFO_PRINTF3(_L("CSpudUnitTestStepBase::WaitForGivenContextStatusNotification: aPdpId = %d, aContextStatus = %d"), aPdpId, aContextStatus); + + do + { + // the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverContextStatusNotificationStatus request + User::WaitForRequest(iListener->iEtelDriverContextStatusNotificationStatus); + + INFO_PRINTF3(_L("CSpudUnitTestStepBase::WaitForGivenContextStatusNotification: iPdpId = %d, iContextStatus = %d"), iListener->iNotifyContextConfigData.iPdpId, iListener->iNotifyContextStatusData.iContextStatus); + } while (iListener->iNotifyContextStatusData.iPdpId != aPdpId || iListener->iNotifyContextStatusData.iContextStatus != aContextStatus); + + // make sure the parameters are as expected + TEST(iListener->iEtelDriverContextStatusNotificationStatus == KErrNone); + TEST(iListener->iNotifyContextStatusData.iPdpId == aPdpId); + TEST(iListener->iNotifyContextStatusData.iContextStatus == aContextStatus); + + iListener->iEtelDriverContextStatusNotificationStatus = KRequestPending; + } + +/** + Wait for RPdpFsmInterface::Input to be called with aOperation EQoSProfileChangeNetwork +*/ +void CSpudTelUnitTestStepBase::WaitForNextQosNotification(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQoSR99_R4Negotiated) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextQosNotification: aPdpId = %d"), aPdpId); + + // the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverQosNotificationStatus request + User::WaitForRequest(iListener->iEtelDriverQosNotificationStatus); + + // make sure the parameters are as expected + TEST(iListener->iEtelDriverQosNotificationStatus == KErrNone); + TEST(iListener->iNotifyQosNegotiatedData.iPdpId == aPdpId); + TEST(CompareUMTSQoSNeg(iListener->iNotifyQosNegotiatedData.iNegotiated.NegotiatedQoSR99_R4(), aQoSR99_R4Negotiated)); + iListener->iEtelDriverQosNotificationStatus = KRequestPending; + } + + +/** + Wait for RPdpFsmInterface::Input to be called with aOperation EServiceStatusChangeNetwork +*/ +void CSpudTelUnitTestStepBase::WaitForNextServiceNotificationStatus(RPacketService::TStatus aServiceStatus) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextServiceNotificationStatus: aServiceStatus = %d"), aServiceStatus); + + // the implementation of RPdpFsmInterface::Input that is called by the Etel driver will complete the iEtelDriverServiceNotificationStatus request + User::WaitForRequest(iListener->iEtelDriverServiceNotificationStatus); + + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForNextServiceNotificationStatus: aServiceStatus = %d"), aServiceStatus); + // make sure the parameters are as expected + TEST(iListener->iEtelDriverServiceNotificationStatus == KErrNone); + TEST(iListener->iPacketServiceStatus == aServiceStatus); + + iListener->iEtelDriverServiceNotificationStatus = KRequestPending; + } + +/** + Calling this will instruct the CTestRequestListener to call REtelDriverInput::Input on SPUDTEL +*/ +void CSpudFsmUnitTestStepBase::FsmInputRequest(TContextId aPdpId, TInt aOperation, TInt aParam) + { + INFO_PRINTF4(_L("CSpudUnitTestStepBase::FsmInputRequest: aPdpId = %d, aOperation = %d, aParam = %d"), aPdpId, aOperation, aParam); + + // wait until iListener to finish with the iControlData member so that 2 requests + // immediately after one another will still work + User::WaitForRequest(iListener->iReadyForInputRequest); + iListener->iReadyForInputRequest = KRequestPending; + + // set the parameters to pass to REtelDriverInput::Input + iListener->iFsmInputRequestData.iPdpId = aPdpId; + iListener->iFsmInputRequestData.iOperation = aOperation; + iListener->iFsmInputRequestData.iParam = aParam; + + // complete iListener's status, causing its RunL to call Input on SPUDTEL + TRequestStatus *status = &iListener->iStatus; + iActiveSchedulerThread.RequestComplete(status, CInputRequestListener::EFsmInputRequest); + } + +/** + Wait for MSpudManInterface::Input to be called with a non-notification event +*/ +void CSpudFsmUnitTestStepBase::WaitForFsmInputResponse(TInt aPdpId, TInt aEvent, TInt aParam) + { + INFO_PRINTF4(_L("CSpudUnitTestStepBase::WaitForFsmInputResponse: aPdpId = %d, aOperation = %d, aParam = %d"), aPdpId, aEvent, aParam); + + // the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmInputResponseStatus request + User::WaitForRequest(iListener->iFsmInputResponseStatus); + + // make sure the parameters are as expected + TEST(iListener->iFsmInputResponseStatus == KErrNone); + TEST(iListener->iFsmInputResponseData.iPdpId == aPdpId); + TEST(iListener->iFsmInputResponseData.iEvent == aEvent); + TEST(iListener->iFsmInputResponseData.iParam == aParam); + + iListener->iFsmInputResponseStatus = KRequestPending; + } + + +void CSpudFsmUnitTestStepBase::FsmObjectCreate(TContextId aPdpId) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::FsmObjectCreate(aPdpId = %d)"), aPdpId); + + // wait until iListener to finish with the iControlData member so that 2 requests + // immediately after one another will still work + // + User::WaitForRequest(iListener->iReadyForInputRequest); + iListener->iReadyForInputRequest = KRequestPending; + + // Set the parameters to pass to CPdpFsmFactory + // + iListener->iFsmInputRequestData.iPdpId = aPdpId; + + // complete iListener's status, causing its RunL to call Input on SPUDTEL + TRequestStatus *status = &iListener->iStatus; + iActiveSchedulerThread.RequestComplete(status, CInputRequestListener::EFsmObjectCreate); + } + + +void CSpudFsmUnitTestStepBase::WaitForFsmObjectCreateResponse(TInt aPdpId) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForEFsmObjectCreateRespons(aPdpId = %d)"), aPdpId); + + // The Test listener will complete the iFsmObjectCreateResponse request. + // + User::WaitForRequest(iListener->iFsmObjectCreateResponse); + + + // Make sure the parameters are as expected + + TEST(iListener->iFsmObjectCreateResponse == KErrNone); + + + TEST(iListener->iFsmInputResponseData.iPdpId == aPdpId); + + iListener->iFsmObjectCreateResponse = KRequestPending; + + } + + +/** + Wait for MSpudManInterface::Input to be called with aOperation KContextBlockedEvent +*/ +void CSpudFsmUnitTestStepBase::WaitForFsmSuspendedNotification(TContextId aPdpId) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForFsmSuspendedNotification: aPdpId = %d"), aPdpId); + + // the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmContextSuspendedStatus request + User::WaitForRequest(iListener->iFsmContextSuspendedStatus); + + // make sure the parameters are as expected + TEST(iListener->iFsmContextSuspendedStatus == KErrNone); + TEST(iListener->iContextBlockedEventPdpId == aPdpId); + + iListener->iFsmContextSuspendedStatus = KRequestPending; + } + +/** + Wait for MSpudManInterface::Input to be called with aOperation KContextUnblockedEvent +*/ +void CSpudFsmUnitTestStepBase::WaitForFsmResumedNotification(TContextId aPdpId) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForEtelDriverInputResponse: aPdpId = %d"), aPdpId); + + // the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmContextResumedStatus request + User::WaitForRequest(iListener->iFsmContextResumedStatus); + + // make sure the parameters are as expected + TEST(iListener->iFsmContextResumedStatus == KErrNone); + TEST(iListener->iContextUnblockedEventPdpId == aPdpId); + + iListener->iFsmContextResumedStatus = KRequestPending; + } + +/** + Wait for MSpudManInterface::Input to be called with aOperation KNetworkStatusEvent +*/ +void CSpudFsmUnitTestStepBase::WaitForFsmServiceNotificationStatus() + { + INFO_PRINTF1(_L("CSpudUnitTestStepBase::WaitForGivenFsmServiceNotificationStatus")); + + // the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmNetworkStatusStatus request + User::WaitForRequest(iListener->iFsmNetworkStatusStatus); + + // make sure the parameters are as expected + TEST(iListener->iFsmNetworkStatusStatus == KErrNone); + // already checked iPdpId and iStatus from exiting condition of do while loop + + iListener->iFsmNetworkStatusStatus = KRequestPending; + } + +/** + Wait for MSpudManInterface::Input to be called with aOperation KContextParametersChangeEvent +*/ +void CSpudFsmUnitTestStepBase::WaitForFsmContextConfigNotification(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aContextConfig) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForFsmContextConfigNotification: aPdpId = %d"), aPdpId); + + // the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmContextParameterChangeStatus request + User::WaitForRequest(iListener->iFsmContextParameterChangeStatus); + + // make sure the parameters are as expected + TEST(iListener->iFsmContextParameterChangeStatus == KErrNone); + TEST(iListener->iContextParametersEventData.iPdpId == aPdpId); + TEST(CompareContextConfigGPRS(aContextConfig, iListener->iContextParametersEventData.iContextConfig)); + + iListener->iFsmContextParameterChangeStatus = KRequestPending; + } + +/** + Wait for MSpudManInterface::Input to be called with aOperation KContextParametersChangeEvent +*/ +void CSpudFsmUnitTestStepBase::WaitForFsmQosChangeNotification(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aQosParams) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForFsmQosChangeNotification: aPdpId = %d"), aPdpId); + + // the implementation of MSpudManInterface::Input that is called by the Etel driver will complete the iFsmContextParameterChangeStatus request + User::WaitForRequest(iListener->iFsmContextParameterChangeStatus); + + // make sure the parameters are as expected + TEST(iListener->iFsmContextParameterChangeStatus == KErrNone); + TEST(iListener->iContextParametersEventData.iPdpId == aPdpId); + TEST(CompareUMTSQoSNeg(aQosParams, iListener->iContextParametersEventData.iNegotiated.NegotiatedQoSR99_R4())); + + iListener->iFsmContextParameterChangeStatus = KRequestPending; + } + + +/** + Wait for context aPacketContext to have the given status +*/ +void CSpudFsmUnitTestStepBase::WaitForGivenContextStatus(RPacketContext& aPacketContext, RPacketContext::TContextStatus aStatus) + { + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForGivenContextStatus: aStatus = %d"), aStatus); + + TRequestStatus status; + RPacketContext::TContextStatus contextStatus = RPacketContext::EStatusUnknown; + RPacketContext::TContextStatus contextStatus1 = RPacketContext::EStatusUnknown; + + aPacketContext.NotifyStatusChange(status, contextStatus); + aPacketContext.GetStatus(contextStatus1); + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForGivenContextStatus: contextStatus1 = %d"), contextStatus1); + if (contextStatus1 != RPacketContext::EStatusDeleted) + { + while (contextStatus != aStatus) + { + User::WaitForRequest(status); + INFO_PRINTF2(_L("CSpudUnitTestStepBase::WaitForGivenContextStatus: contextStatus = %d"), contextStatus); + TEST(status == KErrNone); + } + } + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/Test/te_spud/testdata/Spud_config.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/testdata/Spud_config.txt Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,559 @@ +[test1] +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# +# The context configuration items for this test step +# All of the contexts are set-up to have no pauses or errors when activating, deactivating or deleting +R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = PRIMARY2, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = PRIMARY3, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0 + +# +# The TTFTInfo TFT filters for this test step +# The following entry corresponds to values assigned by the method DefaultPacketFilter1 +TFTfilter = 0, 1, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 1, 1, 1, 1, 1, 1, 1, 1 +# The following entry corresponds to values assigned by the method DefaultPacketFilter2 +TFTfilter = 1, 2, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 2, 2, 2, 2, 2, 2, 2, 2 +# The following entry corresponds to values assigned by the method DefaultPacketFilter3 +TFTfilter = 2, 3, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 3, 3, 3, 3, 3, 3, 3, 3 + +# +# Configure the context's status to be changed using publish and subscribe +NotifyContextStatusChangeType = PublishSubscribe +# NotifyContextStatusChange , , +# When the value 0 is published to KPSSimtsyPacketContextStatusChange the context will be suspended (status = EStatusSuspended = 5) +NotifyContextStatusChange = PRIMARY1, 0, 5 +# When the value 1 is published to KPSSimtsyPacketContextStatusChange the context will be resumed (status = EStatusActive = 3) +NotifyContextStatusChange = PRIMARY1, 0, 3 + +# +# QoS profiles for this test step +# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for all 3 contexts +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 +QosProfileReqR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 +QosProfileReqR99 = PRIMARY3, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 +QosProfileReqR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 + +QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileReqR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileReqR5 = PRIMARY3, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileReqR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 + +# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for all 3 contexts +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = PRIMARY3, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 + +QosProfileNegR5= PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = PRIMARY3, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts +QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 +QosProfileNegR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 +QosProfileNegR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 + +QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileNegR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileNegR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 + + +# +# The InitialiseContext parameters for this test step +# The following entries correspond to the values assigned by the method DefaultTestDataChannel +CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0 + +[test3] +# +# Set-up calls to SetConfig to fail for the first primary context +# The -1 sets up SetConfig to fail every time, and the -2 causes SetConfig to fail with error KErrGeneral (-2) +SetConfigFail = PRIMARY1, -1, -2 + +[test6] +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# +# There are no QosProfileReqR99 entries. This will make a call to SetProfileParameters to fail. + +[test7] +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# +# QoS profiles for this test step +# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 + +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 + +# +# Set-up calls to modify the TFT to fail for the first primary context +# The first call to DeleteTFT will fail with error code KErrGeneral (-2) (and subsequent calls will pass) +DeleteTftFail = PRIMARY1, 1, -2 +# The first call to CreateNewTFT will fail with error code KErrGeneral (-2) (and subsequent calls will pass) +CreateTftConfig = PRIMARY1, 1, -2 +# The first call to AddPacketFilter will fail with error code KErrGeneral (-2) (and subsequent calls will pass) +AddPacketFilter = PRIMARY1, 1, -2 + +[test8] +# +# The context configuration items for this test step +# Set-up the first primary context to fail activating with error code KErrGeneral (-2) +R99ContextConfig = PRIMARY1, 0, -2, 0, 0, 0, 0, 0 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# +# QoS profiles for this test step +# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 + + +# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 + +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 + +[test14] +# +# The context configuration items for this test step +# Set-up the first primary context to fail activating with error code KErrGeneral (-2) +R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# +# QoS profiles for this test step +# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 + +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 + +# +# The InitialiseContext parameters for this test step +# The first 4 elements correspond to the values assigned by the method DefaultTestDataChannel +# The last two set up the first call to InitialiseContext for the first primary context to fail with error code KErrGeneral (-2) +CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, PRIMARY1, 0, 1, -2 + +[test9] +# +# The context configuration items for this test step +# Set-up the first primary context to fail de-activating with error code KErrGeneral (-2) +R99ContextConfig = PRIMARY1, 0, 0, 0, -2, 0, 0, 0 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# The following entry is the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +# The following entry is the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +[test10] +# +# The context configuration items for this test step +# Set-up the first primary context to fail deleting with error code KErrGeneral (-2) +R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, -2, 0 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# The following entry is the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +# The following entry is the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +[test11] +# +# The context configuration items for this test step +# All of the contexts are set-up to have no pauses or errors when activating, deactivating or deleting +R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = PRIMARY2, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = SECONDARY2, 0, 0, 0, 0, 0, 0, 0 + +# +# The TTFTInfo TFT filters for this test step +# The following entry corresponds to values assigned by the method DefaultPacketFilter1 +TFTfilter = 0, 1, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 1, 1, 1, 1, 1, 1, 1, 1 +# The following entry corresponds to values assigned by the method DefaultPacketFilter2 +TFTfilter = 1, 2, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 2, 2, 2, 2, 2, 2, 2, 2 + +# +# QoS profiles for this test step +# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for all 3 contexts +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = SECONDARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = SECONDARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 +QosProfileReqR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 +QosProfileReqR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 +QosProfileReqR99 = SECONDARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 + + +QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileReqR5= SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileReqR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileReqR5 = SECONDARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 + +# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for all 3 contexts +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = SECONDARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 + + +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = SECONDARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts +QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 +QosProfileNegR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 +QosProfileNegR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 +QosProfileNegR99 = SECONDARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 + +QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileNegR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileNegR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileNegR5 = SECONDARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 + +# +# The InitialiseContext parameters for this test step +# The following entries correspond to the values assigned by the method DefaultTestDataChannel +CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +[test12] + +# +# Set up the second primary to pause during activate and delete so there is a chance to cancel the request. Also, do not connect to NT Ras. +R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = PRIMARY2, 10, 0, 0, 0, 10, 0, 0 +R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0 + +# +# SetConfig delay is set to 1 so there is a chance to cancel setting QOS +SetConfigDelay=1 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# +# QoS profiles for this test step +# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 + + +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 + +# +# The TTFTInfo TFT filters for this test step +# The following entry corresponds to values assigned by the method DefaultPacketFilter1 +TFTfilter = 0, 1, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 1, 1, 1, 1, 1, 1, 1, 1 +# The following entry corresponds to values assigned by the method DefaultPacketFilter2 +TFTfilter = 1, 2, 0.0.0.0.0.0.0.0.0.0.255.255.1.1.1.1, 0.0.0.0.0.0.0.0.0.0.255.255.255.255.255.255, 2, 2, 2, 2, 2, 2, 2, 2 + +# +# The InitialiseContext parameters for this test step +# The first 4 elements (on all 3 entries) correspond to the values assigned by the method DefaultTestDataChannel +CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, PRIMARY1 +# The last element of the next 2 entries mean any calls to InitialiseContext will have a delay of 1 second so there is a chance to cancel creating contexts +CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, PRIMARY2, 0, 0, 0, 1 +CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, SECONDARY1, 0, 0, 0, 1 + +# +# The CreateNewTFT entries for this test step +# The last entry causes a call to CreateNewTFT to have a delay of 1 second so there is a chance to cancel setting TFT +CreateTftConfig = PRIMARY1, 0, 0, 1 + +[test102] +# +# Set-up calls to SetConfig to fail for the first primary context +# The -1 sets up SetConfig to fail every time, and the -2 causes SetConfig to fail with error KErrGeneral (-2) +SetConfigFail = PRIMARY1, -1, -2 + +[test103] +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# +# There are no QosProfileReqR99 entries. This will make a call to SetProfileParameters to fail. + +[test104] +# +# The context configuration items for this test step +# Set-up the first primary context to fail activating with error code KErrGeneral (-2) +R99ContextConfig = PRIMARY1, 0, -2, 0, 0, 0, 0, 0 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +[test105] +# +# QoS profiles for this test step +# The following entries are the requested profiles - they correspond to the values assigned by the method DefaultQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 + + +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 + +QosProfileNegR5= PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 + +# +# The context configuration items for this test step +# All of the contexts are set-up to have no pauses or errors when activating, deactivating or deleting +R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# +# The InitialiseContext parameters for this test step +# The first 4 elements (on both entries) correspond to the values assigned by the method DefaultTestDataChannel +CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, PRIMARY1 +# The last two elements set up the first call to InitialiseContext on the first secondary context to fail with error code KErrGeneral (-2) +CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0, SECONDARY1, 0, 1, -2 + +[test106] +SetProfileFail = SECONDARY1, -1, -2 + +# +# Set-up calls to modify the TFT to fail for the first primary context +# The first call to DeleteTFT will fail with error code KErrGeneral (-2) (and subsequent calls will pass) +DeleteTftFail = SECONDARY1, 1, -2 +# The first call to CreateNewTFT will fail with error code KErrGeneral (-2) (and subsequent calls will pass) +CreateTftFail = SECONDARY1, 1, -2 +# The first call to AddPacketFilter will fail with error code KErrGeneral (-2) (and subsequent calls will pass) +AddPacketFilter = SECONDARY1, 1, -2 + +# +# The context configuration items for this test step +# Set-up the first primary context to proceed normally +R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0 +# Set-up the first secondary context to fail activating with error code KErrGeneral (-2) +R99ContextConfig = SECONDARY1, 0, -2, 0, 0, 0, 0, 0 + +# +# QoS profiles for this test step +# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for both contexts +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 +QosProfileReqR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 + +QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileReqR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 + +# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for both contexts +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 + +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts +QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 +QosProfileNegR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 + +QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileNegR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 + + + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +[test107] +SetProfileFail = SECONDARY1, -1, -2 + +DeleteTftFail = SECONDARY1, 1, -2 +CreateTftFail = SECONDARY1, 1, -2 +AddPacketFilter = SECONDARY1, 1, -2 + +# +# The context configuration items for this test step +# All of the contexts are set-up to have no pauses or errors when activating, deactivating or deleting +R99ContextConfig = PRIMARY1, 0, 0, 0, 0, 0, 0, 0 +R99ContextConfig = SECONDARY1, 0, 0, 0, 0, 0, 0, 0 + +# +# The InitialiseContext parameters for this test step +# The following entries correspond to the values assigned by the method DefaultTestDataChannel +CommSetup= SIMTSYLOOPBACK.CSY, SIMTSYLOOPBACK::0, 18, 0 + +# +# QoS profiles for this test step +# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for both contexts +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 +QosProfileReqR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 + + +QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileReqR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 + +# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for both contexts +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 + +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = SECONDARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts +QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 +QosProfileNegR99 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 + +QosProfileNegR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileNegR5 = SECONDARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +[test108] +# +# Configure the context's status to be changed using publish and subscribe +NotifyContextStatusChangeType = PublishSubscribe +# NotifyContextStatusChange , , +# When the value 0 is published to KPSSimtsyPacketContextStatusChange the first primary context will be deleted (status = EStatusDeleted = 6) +NotifyContextStatusChange = PRIMARY1, 0, 6 +# When the value 1 is published to KPSSimtsyPacketContextStatusChange the second primary context will be deleted (status = EStatusDeleted = 6) +NotifyContextStatusChange = PRIMARY2, 0, 6 + +# +# The RPacketContext::TContextConfigGPRS parameters for this test step +# The parameters are identical to those assigned in the method DefaultTestContextConfigGPRS +SetContextConfigGPRS= 1, ACME INTERNET PROVIDERS LTD, i-MODE GATEWAY, 1, 1, 1, 1, USER1, PASSWORD1, CHALLENGE1, RESPONSE1, PRIMARYSERVER1, SECONDARYSERVER1, 1 + +# +# The context configuration items for this test step +# Set-up the first primary context to pause for a long period when activating, so that there is a pause where the simtsy can delete the context +R99ContextConfig = PRIMARY1, 999, 0, 0, 0, 0, 0, 0 +# Set-up the second primary context to have no pauses or errors when activating, deactivating or deleting +R99ContextConfig = PRIMARY2, 0, 0, 0, 0, 0, 0, 0 + +# +# QoS profiles for this test step +# The following entries are the requested profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Requested for all 3 contexts +QosProfileReqR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 +QosProfileReqR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2 + +QosProfileReqR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileReqR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Requested +QosProfileReqR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 +QosProfileReqR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1 + +QosProfileReqR5 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileReqR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 1, 0x00, 0x00 + +# The following entries are the negotiated profiles - they are identical and correspond to the values assigned by the method DefaultQoSR99_R4Negotiated for all 3 contexts +QosProfileNegR99 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 +QosProfileNegR99 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2 + +QosProfileNegR5 = PRIMARY1, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 +QosProfileNegR5 = PRIMARY2, 0x02, 0x02, 0x02, 0x02, 2, 0x02, 0x02, 0x02, 2, 2, 2, 2, 2, 0x00, 0x00 + +# The following entries correspond to the values assigned by the method SecondQoSR99_R4Negotiated for all 3 contexts +QosProfileNegR99 = PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 +QosProfileNegR99 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1 + +QosProfileNegR5= PRIMARY1, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 +QosProfileNegR5 = PRIMARY2, 0x01, 0x01, 0x01, 0x01, 1, 0x01, 0x01, 0x01, 1, 1, 1, 1, 1, 0x00, 0x00 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.iby Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,29 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef __UMTSGPRSSCPR_IBY__ +#define __UMTSGPRSSCPR_IBY__ + +REM Umts/Gprs Subconnection Provider + +#ifdef _DEBUG +ECOM_PLUGIN_UDEB(UmtsGprsSCPR.dll,1020D45E.rss) +#else +ECOM_PLUGIN(UmtsGprsSCPR.dll,1020D45E.rss) +#endif + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,95 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// UmtsGprsSCPR.MMP Umts/Gprs Subconnection Provider ECOM plugin +// +// + +/** + @file +*/ + + +TARGET umtsgprsscpr.dll +TARGETTYPE PLUGIN + +UID 0x10009D8D 0x1020D45E +VENDORID 0x70000001 + +MACRO _INFO_LOG + + +SOURCEPATH ../src +SOURCE UmtsGprs_defaultSubconnProv.cpp +SOURCE UmtsGprs_subconnProv.cpp +SOURCE UmtsGprs_subconnProvFactory.cpp +SOURCE PdpFsmRequest.cpp +SOURCE RSpudManInterface.cpp + +START RESOURCE 1020D45E.rss +TARGET umtsgprsscpr.rsc +END + +SOURCEPATH ../spudfsm/src +SOURCE PDPFSM.cpp +SOURCE cpdpfsm.cpp +SOURCE cpdpfsmfactory.cpp +SOURCE tpdpstate.cpp +SOURCE tpdpstatesuspended.cpp +SOURCE tpdpstatechangingqos.cpp +SOURCE tpdpstatechangingtft.cpp +SOURCE tpdpstateopen.cpp +SOURCE tpdpstatesettingqos.cpp +SOURCE tpdpstateinitialised.cpp +SOURCE tpdpstatecreatingprimary.cpp +SOURCE tpdpstateopeningphone.cpp +SOURCE tpdpstatecreatingSecondary.cpp +SOURCE tpdpstateactivatingsecondary.cpp +SOURCE tpdpstatecreatedSecondary.cpp +SOURCE tpdpstateactivatingprimary.cpp +SOURCE tpdpstateclosing.cpp +SOURCE tpdpstatesettingtft.cpp +SOURCE tpdpstategettingnegqos.cpp +SOURCE tpdpstatemodifingactive.cpp +SOURCE tpdpstatestopping.cpp + + +SOURCEPATH ../spudtel/src +SOURCE ceteldrivercontext.cpp +SOURCE ceteldriverfactory.cpp +SOURCE cservicechangenotifier.cpp +SOURCE reteldriverinput.cpp +SOURCE eteldriverstrategies.cpp +SOURCE cspudcontextelem.cpp +SOURCE ceteldrivernotifier.cpp +SOURCE cpdpstatuschangenotifier.cpp +SOURCE cqoschangenotifier.cpp +SOURCE cpdpconfigchangenotifier.cpp + +USERINCLUDE ../inc +USERINCLUDE ../spudfsm/inc +USERINCLUDE ../spudtel/inc + +SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/ecom +SYSTEMINCLUDE /epoc32/include/comms-infras +SYSTEMINCLUDE /epoc32/include/networking + +LIBRARY euser.lib esock.lib esocksvr.lib eintsock.lib insock.lib +LIBRARY netmeta.lib etelpckt.lib etel.lib umtsif.lib +#include "comms-infras/commsdebugutility.mmh" + +CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData + + +UNPAGED diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,144 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY + +PRJ_EXPORTS +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +../inc/MSpudManInterface.h /epoc32/include/networking/mspudmaninterface.h +#endif +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +../inc/MPdpFsmInterface.h /epoc32/include/networking/mpdpfsminterface.h +#endif +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +../inc/UmtsGprs_subconnProvFactory.h /epoc32/include/networking/umtsgprs_subconnprovfactory.h +#endif +../group/UmtsGprsSCPR.iby /epoc32/rom/include/umtsgprsscpr.iby + + +PRJ_TESTEXPORTS + + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScpr_CapTest.xml z:/testdata/configs/te_umtsgprsscpr_captest.xml +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScpr_NoDefaults.xml z:/testdata/configs/te_umtsgprsscpr_nodefaults.xml +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/TE_UmtsGprsScprLoopbackCSY.ini z:/testdata/configs/te_umtsgprsscprloopbackcsy.ini + + +// configuration 1 commdb settings // +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScpr.xml z:/testdata/configs/te_umtsgprsscpr.xml + + +// configuration 2 commdb settings // +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScpr_InvalidDefaults.xml z:/testdata/configs/te_umtsgprsscpr_invaliddefaults.xml + + +// configuration 3 commdb settings // +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_UmtsGprsScprNoSpud.xml z:/testdata/configs/te_umtsgprsscprnospud.xml + + +// main test scripts // +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1.script z:/testdata/scripts/te_umtsgprsscprconfig1.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2.script z:/testdata/scripts/te_umtsgprsscprconfig2.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig3.script z:/testdata/scripts/te_umtsgprsscprconfig3.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2QoSRemoved.script z:/testdata/scripts/te_umtsgprsscprconfig2qosremoved.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig3QoSRemoved.script z:/testdata/scripts/te_umtsgprsscprconfig3qosremoved.script + + +// main captest script // +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_Cap_UmtsGprsScpr.script z:/testdata/scripts/te_cap_umtsgprsscpr.script + + +// simtsy configs // +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_simtsy.ini z:/testdata/configs/te_simtsy.ini +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_umtsgprsscpr_config.txt z:/testdata/configs/te_umtsgprsscpr_config.txt +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/te_umtsgprsscpr_Config2.txt z:/testdata/configs/te_umtsgprsscpr_config2.txt + + +// Test case scripts and configs +//------------------------------ +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case1.script z:/testdata/scripts/te_umtsgprsscprconfig1case1.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case1.ini z:/testdata/configs/umtsgprsscpr/config1case1.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsSCPRconfig1case2.script z:/testdata/scripts/te_umtsgprsscprconfig1case2.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case2.ini z:/testdata/configs/umtsgprsscpr/config1case2.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprconfig1case3.script z:/testdata/scripts/te_umtsgprsscprconfig1case3.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case3.ini z:/testdata/configs/umtsgprsscpr/config1case3.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case4.script z:/testdata/scripts/te_umtsgprsscprconfig1case4.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case4.ini z:/testdata/configs/umtsgprsscpr/config1case4.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case5.script z:/testdata/scripts/te_umtsgprsscprconfig1case5.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case5.ini z:/testdata/configs/umtsgprsscpr/config1case5.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprconfig1case6.script z:/testdata/scripts/te_umtsgprsscprconfig1case6.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case6.ini z:/testdata/configs/umtsgprsscpr/config1case6.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprconfig1case7.script z:/testdata/scripts/te_umtsgprsscprconfig1case7.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case7.ini z:/testdata/configs/umtsgprsscpr/config1case7.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case8.script z:/testdata/scripts/te_umtsgprsscprconfig1case8.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case8.ini z:/testdata/configs/umtsgprsscpr/config1case8.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case9.script z:/testdata/scripts/te_umtsgprsscprconfig1case9.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case9.ini z:/testdata/configs/umtsgprsscpr/config1case9.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig1Case10.script z:/testdata/scripts/te_umtsgprsscprconfig1case10.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config1Case10.ini z:/testdata/configs/umtsgprsscpr/config1case10.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2Case1.script z:/testdata/scripts/te_umtsgprsscprconfig2case1.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config2Case1.ini z:/testdata/configs/umtsgprsscpr/config2case1.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2Case9.script z:/testdata/scripts/te_umtsgprsscprconfig2case9.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config2Case9.ini z:/testdata/configs/umtsgprsscpr/config2case9.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2Case10.script z:/testdata/scripts/te_umtsgprsscprconfig2case10.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config2Case10.ini z:/testdata/configs/umtsgprsscpr/config2case10.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprconfig3case1.script z:/testdata/scripts/te_umtsgprsscprconfig3case1.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Config3Case1.ini z:/testdata/configs/umtsgprsscpr/config3case1.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_Cap_UmtsGprsScprConfig1Case1.script z:/testdata/scripts/te_cap_umtsgprsscprconfig1case1.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Cap1Case1.ini z:/testdata/configs/umtsgprsscpr/cap1case1.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_Cap_UmtsGprsScprConfig1case2.script z:/testdata/scripts/te_cap_umtsgprsscprconfig1case2.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Cap1Case2.ini z:/testdata/configs/umtsgprsscpr/cap1case2.ini + +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/scripts/te_Cap_UmtsGprsScprConfig1Case4.script z:/testdata/scripts/te_cap_umtsgprsscprconfig1case4.script +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/configs/Cap1Case4.ini z:/testdata/configs/umtsgprsscpr/cap1case4.ini + +// IBY file +../../../../unref/orphan/comgen/networking/umts/test/Te_UmtsGprsSCPR/group/te_UmtsGprsScpr.iby /epoc32/rom/include/te_umtsgprsscpr.iby + + + +// Spud Unit Tests // +../Test/te_spud/scripts/TE_SpudUnitTest.script z:/testdata/scripts/te_spudunittest.script +../Test/te_spud/testdata/Spud_config.txt z:/testdata/configs/spud_config.txt + +../Test/te_spud/group/TE_SpudUnit.iby /epoc32/rom/include/te_spudunit.iby + + +PRJ_MMPFILES +UmtsGprsSCPR.mmp + + +PRJ_TESTMMPFILES +../Test/te_spud/group/TE_SpudUnit.mmp + + +PRJ_TESTMMPFILES + +#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,10 @@ +component networking_umtsgprsscpr +source \sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr +binary \sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\group all +exports \sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\group +notes_source \component_defs\release.src + + +ipr E +ipr T \sf\os\cellularsrv\telephonyprotocols\umtsgprsscpr\Test + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/group/networking_umtsgprsscpr.history.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/group/networking_umtsgprsscpr.history.xml Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,5 @@ + + + + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/inc/MPdpFsmInterface.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/inc/MPdpFsmInterface.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,163 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// The interface to the PDP Context Finite State Machine. +// +// + +/** + @file + @internalComponent +*/ + + +#ifndef MPDPFSMINTERFACE_H +#define MPDPFSMINTERFACE_H + + +#include +#include +#include + +#include +#include + +/** Maximum number of PDP contexts supported by SPUD + This is derived from the number of bits available for NSAPIs + Each PDP context corresponds with a NSAPI (and each NSAPI at most maps to one primary or secondary PDP Context) + There are 4 bits allocated for NSAPIs with values 0 - 4 being reserved, leaving 11 values for PDP contexts + @see GSM24.008 +*/ +const TContextId KMaxPdpContexts = 11; + +/** Internal pseudo-context ID meaning all contexts */ +const TContextId KAllContexts = -1; + +/** ID of the primary PDP context +Primary context is the first context created, and it can be +created only once during Spud lifetime. +There is a subltly here. There is always a default context. +This just happens to be the primary until it is deleted, at +which point one of the secondries will become the default. +This can happen in a network handover situation. +This is documented in the design spec. */ +const TContextId KPrimaryContextId = 0; + + +namespace SpudMan +{ + enum SpudManGuQoSSignal + { + EContextStart = 0x80, + EContextCreate, + EContextDelete, + EContextActivate, + ERegisterEventHandler, + EContextSetEvents, + EContextQoSSet, + EContextModifyActive, + EContextTFTModify, + ENifSetDefaultQoS, + EStartupPrimaryContextCreation, + + // sentinal + ESpudManGuQoSSignalSentinal + }; + + enum SpudManSignal + { + ESetDefaultQoS = ESpudManGuQoSSignalSentinal, + ECreatePrimaryPDPContext, + ECreateSecondaryPDPContext, + ESuspend, + EResume, + E1ryPdpActivate, + ECancelContextCreate, + + EGetNegQoS, + + // sentinal + ESpudManSignalSentinal + }; + +} + +class MPdpFsmInterface +/** + * Definition of PDP Context Finite State Machine interface. + * UmtsGprsSCPR comes with an implementation of this interface. + * The interface is to be used by SpudMan. + * + * @internalComponent + */ + { +public: + virtual void OpenL(MSpudManInterface* aSpudManInterface, TName& aName) = 0; + virtual void Close() = 0; + + virtual TInt Input (TContextId aPdpId, const TInt aOperation, const TInt aParam=KErrNone) = 0; + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + // This is to set the status of IM CN signalling parameter + + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam) = 0; + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam) = 0; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const = 0 ; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const = 0; + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam) = 0; + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam) = 0; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const = 0; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const = 0; +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + + virtual TInt Set(TContextId aPdpId, const TTFTInfo& aParam) = 0; + virtual TInt Set(TContextId aPdpId, const TTFTOperationCode& aParam) = 0; + virtual TInt Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam) = 0; + virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam) = 0; + virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam) = 0; + + virtual TInt Get(TContextId aPdpId, TTFTInfo& aParam) const = 0; + virtual TInt Get(TContextId aPdpId, TTFTOperationCode& aParam) const = 0; + virtual TInt Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const = 0; + virtual TInt Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const = 0; + virtual TInt Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const = 0; + + virtual TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const = 0; + + virtual void Set(const RPacketService::TStatus aParam) = 0; // applies to all contexts + virtual void Get(RPacketService::TStatus& aParam) = 0; // applies to all contexts + + // additional accessors + virtual const TName& TsyName(void) = 0; + + virtual void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode) = 0; + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + virtual void SetIMCNSignalling(TBool aImCnSignalling) = 0; +#endif //SYMBIAN_NETWORKING_UMTSR5 +protected: +private: + +}; + + +#endif +// MPDPFSMINTERFACE_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/inc/MSpudManInterface.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/inc/MSpudManInterface.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,59 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// The call-back interface of MPdpFsmInterface used by UmtsGprsSCPR to flag +// operation results to SpudMan. +// +// + +/** + @file + @internalComponent +*/ + +#ifndef MSPUDMANINTERFACE_H +#define MSPUDMANINTERFACE_H + +#include +#include + +/** +Identifier used in a Control call for initialising the RPdpFsmInterface (in SpudMan) with a +pointer to the real C-class (in the UmtsGprsSCPR). +*/ +const TInt KInitialisePdpFsm = 0x80; + +/** +Identifier used in a SpudInput call to signal the SpudMan that the UmtsGprsSCPR is shutting +down and that the real CPdpFsmInterface object will be deleted. +*/ +const TUint KPdpFsmShuttingDown = 0xff; + +/** Name of SPUD */ +_LIT(KSpudName, "spud"); + +/** +Interface class for SpudMan, to be used by SpudFsm. +*/ +class MSpudManInterface +{ +public: + virtual void Input(TContextId aContextId, TInt aEvent, TInt aParam) = 0; + + virtual void SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode) = 0; + +}; + +#endif +// MSPUDMANINTERFACE_H + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/inc/PdpFsmRequest.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/inc/PdpFsmRequest.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,113 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP Context control requests. +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CPDPFSMREQUEST_H +#define CPDPFSMREQUEST_H + +#include "UmtsGprs_subconnProv.h" + +/** The class commits previous modifications to an active PDP context. + +@internalTechnology +@released Since 9.3 +*/ +class CModifyActivePDPCtx : public CPdpFsmRequestBase +{ +public: + virtual TInt Start(); + virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam); + + CModifyActivePDPCtx(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner); + virtual ~CModifyActivePDPCtx(); +}; + + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +/** The class modifies R5 QoS on an active PDP context. + +@internalTechnology +@released Since 9.3 +*/ +class CModifyR5QoS : public CPdpFsmRequestBase, public MPdpFsmRequestOwner +{ +public: + virtual void Done( TInt aResult, CPdpFsmRequestBase& aThis ); + virtual TInt Start(); + virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam); + virtual ~CModifyR5QoS(); + static CModifyR5QoS* NewL(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR5Requested& aParams); + +protected: + CModifyR5QoS(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR5Requested& aParams); + + void ConstructL(); + +private: + void GrantedSetupL(); + void RejectedSetupL(TInt aResult); +private: + CModifyActivePDPCtx* iModifyActive; + RPacketQoS::TQoSR5Requested i5; +}; + + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +/** +The class modifies R99/R4 QoS on an active PDP context. + +@internalTechnology +@released Since 9.3 +*/ +class CModifyR4QoS : public CPdpFsmRequestBase, public MPdpFsmRequestOwner +{ +public: + virtual void Done( TInt aResult, CPdpFsmRequestBase& aThis ); + virtual TInt Start(); + virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam); + virtual ~CModifyR4QoS(); + + + static CModifyR4QoS* NewL(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR99_R4Requested aParams); + +protected: + CModifyR4QoS(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR99_R4Requested aParams); + + void ConstructL(); + +private: + void GrantedSetupL(); + void RejectedSetupL(TInt aResult); +private: + CModifyActivePDPCtx* iModifyActive; + RPacketQoS::TQoSR99_R4Requested i99; + +}; + + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + +#endif +// CPDPFSMREQUEST_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/inc/RSpudManInterface.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/inc/RSpudManInterface.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,62 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// The MSpudManInterface handle class definition. +// +// + +/** + @file + @internalComponent +*/ + + + +#ifndef RSPUDMANINTERFACE_H +#define RSPUDMANINTERFACE_H + +#include +#include + + +/** +Client side implementation of MSpudManInterface. +This is a very simplistic implementation that just holds a refernce to +the server side and forwards all the calls to it. This implementation +can be changed in the future to facilitate for IPC. +*/ +class RSpudManInterface : public MSpudManInterface +{ +public: + RSpudManInterface(); + void Init(MSpudManInterface* aSpudManImpl); + void Close (); + virtual void Input(TContextId aContextId, TInt aEvent, TInt aParam); + + virtual void SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode); + + inline ~RSpudManInterface () + { + __FLOG_CLOSE; + } + + +private: + MSpudManInterface* iSpudManImpl; + +public: + __FLOG_DECLARATION_MEMBER; +}; + +#endif +// RSPUDMANINTERFACE_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,120 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// UmtsGprs_subconnProv.h +// Umts/Gprs Default SubConnection Provider class definition. +// +// + +/** + @file + @internalComponent +*/ + + +#ifndef UMTSGPRS_DEFAULTSUBCONNPROV_H +#define UMTSGPRS_DEFAULTSUBCONNPROV_H + + +#include "UmtsGprs_subconnProv.h" + + +/** +Specialised subconnection provider for handling default UMTS contexts. + +@internalTechnology +@released Since 9.3 +*/ +class CUmtsGprsDefaultSubConnProvd : public CUmtsGprsSubConnProvd + { + friend class CUmtsGprsSubConnProvdFactory; //for the protected constructor. +public: + + /** Modifies iContextId of 'this' to aContextId. This method should be called + * in the handover scenario, where the current default is dropped and a new + * one is elected. + * @param aContextId the id of the new default PDP context. + */ + void NewDefaultElected(TContextId aContextId); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + + /** This parameter adds the IMCN information to the Default + * SubConnection Parameter Bundle + */ + TInt AddIMCNInformationToParameterBundleL(TBool aImCnInfo); + +#endif //SYMBIAN_NETWORKING_UMTSR5 + + virtual TBool ShouldIDeleteNow(); + + +protected: + + //-========================================================= + // CSubConnectionProviderBase methods + //-========================================================= + virtual void DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle); + virtual TInt DoControl(TUint aOptionLevel, TUint aOptionName, TDes8& aOption); + + //-========================================================= + // C'tor & D'tor methods + //-========================================================= + CUmtsGprsDefaultSubConnProvd(CSubConnectionProviderFactoryBase& aFactory, + CConnectionProviderBase& aConnProvider); + + static CUmtsGprsDefaultSubConnProvd* NewL(CSubConnectionProviderFactoryBase& aFactory, + CConnectionProviderBase& aConnProvider); + + void ConstructL(); + + // Don't allow clients to invoke the destructor. + // (Only the CCommsFactoryBase should do this) + virtual ~CUmtsGprsDefaultSubConnProvd(); + + + + //-========================================================= + // Custom methods + //-========================================================= + /** + @return the default CUmtsGprsSubConnProvd for 'this' + */ + virtual CUmtsGprsSubConnProvd& GetDefaultSubConnection(); + + + /** + Returns the PdpFsmInterface instance, which can be used to talk to SpudFsm + + @return the local instance (pertaining to this connection) of CPdpFsmInterface. + */ + virtual CPdpFsmInterface& GetPdpFsmInterface(); + + /** + Reads default QoS parameters from the database. + + @param aParams - The QoS parameter structure to be filled in by this method. + */ + void GetQoSDefaultsL(RPacketQoS::TQoSR99_R4Requested* aParams); + + //-========================================================= + // Members + //-========================================================= + CPdpFsmInterface* iPdpFsm; + + }; + + +#include "UmtsGprs_defaultSubconnProv.inl" +#endif +// UMTSGPRS_DEFAULTSUBCONNPROV_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.inl Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,28 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Inline methods for Umts/Gprs Default SubConnection Provider. +// +// + +/** + @file + @internalComponent +*/ + + +inline void CUmtsGprsDefaultSubConnProvd::NewDefaultElected(TContextId aContextId) + { + iContextId = aContextId; + } + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,361 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Umts/Gprs SubConnection Provider class definition. +// +// + +/** + @file + @internalComponent +*/ + + +#ifndef UMTSGPRS_SUBCONNPROV_H +#define UMTSGPRS_SUBCONNPROV_H + + +#include +#include + +#include +#include + +#include "PDPFSM.h" +#include + + +#ifdef __FLOG_ACTIVE +// Logging tags +_LIT8(KUmtsGprsLogTag1,"SubConn"); +_LIT8(KUmtsGprsLogTag2,"UmtsGprs"); +#endif + +class CPdpFsmRequestBase; + +void SubconEventCleanupFunction(TAny* aEvent); +void SubconParamSetCleanupFunction(TAny* aEvent); + + +/** The class represents an onwer/issuer of a CPdpFsmRequestBase + +@internalTechnology +@released Since 9.3 +*/ +class MPdpFsmRequestOwner +{ + public: + /** Called by the owned CPdpFsmRequestBase to flag the completion of the + * request back to 'this' + * + @param aResult - the request result indication. + @param aParam - the request completed (in case 'this' owns more requests). + */ + virtual void Done( TInt aResult, CPdpFsmRequestBase& aThis ) = 0; +}; + + + + + +class CUmtsGprsSubConnProvd : public CSubConnectionProviderBase, public MConnectionDataClient, public MPdpFsmRequestOwner +/** The class represents UMTS/GPRS-proprietary subconnection provider. + It is designed to operate in the near proximity to Etel and + convert downcalls to Etel's language. This class represents both + TSubConnTypes: { EAttachToDefault, ECreateNew } + +@internalTechnology +@released Since 9.3 +*/ + { +protected: + enum TQosParameterRelease + { + KParameterRelInvalid = 0, + KParameterRelGeneric = 1, + KParameterRel4Rel99 = 4, + KParameterRel5 = 5, + }; + + +public: + //-========================================================= + // Custom methods + //-========================================================= + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + + /** + Scans given parameter bundle for supported parameter sets + The first one found gets converted to RPacketQoS::TQoSR5Requested. + The supported parameter sets are (in order of priority): + 1) KSubConQosR5ParamsType + 2) KSubConQosR99ParamsType + 3) Generic QoS + + @param aIn CSubConParameterBundle to be converted. + @param aOut RPacketQoS::TQoSR5Requested to be populated from aIn + @exception KErrNotSupported - if CUmtsGprsSubConnProvd does not support conversion from what's + in the supplied parameter bundle. + */ + void MapQosParamBundleToEtelL(const CSubConParameterBundle& aIn, + RPacketQoS::TQoSR5Requested* aOut); + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + + /** Scans given parameter bundle for supported parameter sets + The first one found gets converted to RPacketQoS::TQoSR99_R4Requested. + The supported parameter sets are (in order of priority): + 1) KSubConQosR99ParamsType + 2) Generic QoS + + @param aIn CSubConParameterBundle to be converted. + @param aOut RPacketQoS::TQoSR99_R4Requested to be populated from aIn + @exception KErrNotSupported - if CUmtsGprsSubConnProvd does not support conversion from what's + in the supplied parameter bundle. + */ + void MapQosParamBundleToEtelL(const CSubConParameterBundle& aIn, + RPacketQoS::TQoSR99_R4Requested* aOut); + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + /** + Maps QoS parameters received from the network via Etel into a CSubConGenEventParamsGranted class + for client event notification. + + @param aNetworkQoS - A pointer to an Etel TPacketDataConfigBase class containing the + QoS to be mapped into the event. + @param aGranted - A reference to the CSubConGenEventParamsGranted object that should receive the mapped + QoS parameters. + */ + void MapQosEtelToGrantedParamsL (TPacketDataConfigBase* aNetworkQoS, + CSubConGenEventParamsGranted& aGranted); + + /** Returns the default CUmtsGprsSubConnProvd for 'this' + * IMPORTANT: This method is left pure virtual because its implementation, + although trivial, is not needed until CUmtsGprsSubConnProvd fully spports PDP + context management. + + @return the default CUmtsGprsSubConnProvd for 'this' + */ + virtual CUmtsGprsSubConnProvd& GetDefaultSubConnection() = 0; + + /** Called by SpudFsm to inform about events and responses regarding + * the PDP context 'this' represents. The event format complies to UmtsIf interface. + * CUmtsGprsSubConnProvd forwards the event to the active/pending request + * (iCurrentPdpFsmReq) or ignores the event if no request exists. + * + @param aEvent the event type + @param aParam additional data + */ + virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam); + + /** Returns the PdpFsmInterface instance, which can be used to talk to SpudFsm + * + @return the local instance (pertaining to this connection) of CPdpFsmInterface. + */ + virtual CPdpFsmInterface& GetPdpFsmInterface(); + + + /** Returns context id of the PDP context 'this' represents. + * + @return context id of the PDP context 'this' represents. + */ + TContextId GetContextId() const; + + /** Sends request to the control clients. This method is the overload of + * the CSubConnectionProviderBase protected counterpart. It's to be used + * by CPdpFsmRequestBase objects. + * + @param aEvent - the notification to be sent. + */ + TInt NotifyClientEvent(const CSubConNotificationEvent& aEvent); + + + //-========================================================= + // MPdpFsmRequestOwner methods + //-========================================================= + void Done(TInt aResult, CPdpFsmRequestBase& aThis); + + //-========================================================= + // MConnectionDataClient methods + //-========================================================= + virtual void Notify(TNotify aNotifyType, CConnectionProviderBase* aConnProvider, TInt aError, const CConNotificationEvent* aConNotificationEvent); + virtual void AttachToNext(CSubConnectionProviderBase* aSubConnProvider); + virtual void ConnectionGoingDown(CConnectionProviderBase& aConnProvider); + virtual void ConnectionError(TInt aStage, TInt aError); + + //-========================================================= + // CSubConnectionProviderBase methods + //-========================================================= + virtual void DoDataClientJoiningL(MSubConnectionDataClient& aDataClient); + virtual void DoDataClientLeaving(MSubConnectionDataClient& aDataClient); + virtual void DoControlClientJoiningL(MSubConnectionControlClient& aControlClient); + virtual void DoControlClientLeaving(MSubConnectionControlClient& aControlClient); + virtual void DoSourceAddressUpdate(MSubConnectionDataClient& aDataClient, const TSockAddr& aSource); + virtual void DoDestinationAddressUpdate(MSubConnectionDataClient& aDataClient, const TSockAddr& aDestination); + virtual void DoDataClientRouted(MSubConnectionDataClient& aDataClient, const TSockAddr& aSource, const TSockAddr& aDestination, const TDesC8& aConnectionInfo); + virtual void DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle); + virtual TInt DoControl(TUint aOptionLevel, TUint aOptionName, TDes8& aOption); + virtual CConnDataTransfer& DoDataTransferL(); + virtual MConnectionDataClient* DoSelfConnectionDataClient(); + virtual void DoStartL(); + virtual void DoStop(); + virtual CSubConnectionProviderBase* DoNextLayer(); + +protected: + + //-========================================================= + // Custom methods + //-========================================================= + CUmtsGprsSubConnProvd(CSubConnectionProviderFactoryBase& aFactory, + CConnectionProviderBase& aConnProvider); + + // Don't allow clients to invoke the destructor. + // (Only the CCommsFactoryBase should do this) + virtual ~CUmtsGprsSubConnProvd(); + + static void MapQosR99ExtensionSetToEtel(const CSubConQosR99ParamSet& aInRequested, + const CSubConQosR99ParamSet* aInAcceptable, + RPacketQoS::TQoSR99_R4Requested* aOut); + + static void MapQosGenericSetToEtel(const CSubConQosGenericParamSet& aInRequested, + const CSubConQosGenericParamSet* aInAcceptable, + RPacketQoS::TQoSR99_R4Requested* aOut); + + + static void MapQosEtelToGenericSetL (RPacketQoS::TQoSR99_R4Negotiated* aNetworkQoS, + CSubConGenEventParamsGranted& aGranted); + + static void MapQosEtelToR99SetL (RPacketQoS::TQoSR99_R4Negotiated* aNetworkQoS, + CSubConGenEventParamsGranted& aGranted); + + void NotifySubConDownL(TInt aError); + void NotifyParamsChangedL(TInt aError); + + inline void ResetQosRelease(); + inline TQosParameterRelease RequestedQosRelease(); + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + static void MapQosR5ExtensionSetToEtel(const CSubConQosR5ParamSet& aInRequested, + const CSubConQosR5ParamSet* aInAcceptable, + RPacketQoS::TQoSR5Requested* aOut); + + static void MapQosR99ExtensionSetToEtel(const CSubConQosR99ParamSet& aInRequested, + const CSubConQosR99ParamSet* aInAcceptable, RPacketQoS::TQoSR5Requested* aOut); + + static void MapQosEtelToR5SetL (RPacketQoS::TQoSR5Negotiated* aNetworkQoS, + CSubConGenEventParamsGranted& aGranted); +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + /** + Given a set of generic parameters, the method derives the R99 value for the traffic class. + + @param aIn requested CSubConQosGenericParamSet to be converted + @return the value of RPacketQoS::TTrafficClass + */ + static RPacketQoS::TTrafficClass DeriveTrafficClass(const CSubConQosGenericParamSet& aIn ); + + /** + Given a set of generic parameters, the method derives the R99 value for the traffic priority. + + @param aIn requested CSubConQosGenericParamSet to be converted + @return the value of RPacketQoS::TTrafficHandlingPriority + */ + static RPacketQoS::TTrafficHandlingPriority DeriveTrafficPriority(const CSubConQosGenericParamSet& aIn ); + + /* + The PDP context id 'this' represents. This is semantically equal to the SpudFSM PDP + Context identification scheme. + */ + TContextId iContextId; + + /* + Holds the current request towards PDPFSM + */ + CPdpFsmRequestBase* iCurrentPdpFsmReq; + + +private: + TQosParameterRelease iParameterRelease; + + +public: + __FLOG_DECLARATION_MEMBER; + }; + + + + + +/** +The base class for a PDP Context control asynchronous requests. + +@internalTechnology +@released Since 9.3 +*/ +class CPdpFsmRequestBase +{ +public: + + /** + C'tor + + @param aProvider - the sub connection provider 'this' is directly or indirectly owned by. + * Also represents a specific PDP context. + @param aOwner - the immediate owner of 'this' (could be same as aProvider or could be + * request (when nested). + */ + CPdpFsmRequestBase( CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner); + + virtual ~CPdpFsmRequestBase(); + + /** + The method should issue the request + + @return the immediate request result. + */ + virtual TInt Start() = 0; + + + /** + The callback method called by the direct owner of 'this' to forward events/results + caused by issuing 'this'. 'This' can interpret the events and decide whether to + flag the completion back to its owner. + + @param aContextId The context Id that the event occured on + @param aEvent The identifier of the event that occured + @param aParam Data relavent to the event. Usually a system-wide error code + @return ETrue if the event was of interested and handled, EFalse if wasn't + handled and should be passed on to SpudMan + */ + virtual TBool PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam) = 0; + +protected: + CUmtsGprsSubConnProvd& iProvider; + MPdpFsmRequestOwner& iOwner; + TContextId iContextId; + +public: + __FLOG_DECLARATION_MEMBER; +}; + + + +#include "UmtsGprs_subconnProv.inl" +#endif +// UMTSGPRS_SUBCONNPROV_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.inl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.inl Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,75 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Inline methods of the Umts/Gprs SubConnection Provider +// +// + +/** + @file + @internalComponent +*/ + + + +inline CUmtsGprsSubConnProvd::CUmtsGprsSubConnProvd( + CSubConnectionProviderFactoryBase& aFactory, + CConnectionProviderBase& aConnProvider) +:CSubConnectionProviderBase(aFactory, aConnProvider), + iContextId(KAllContexts), /*Initialising to an illegal value*/ + iCurrentPdpFsmReq(NULL) +/** +Constructs a UMTS SubConnection Provider + +@param aFactory CSubConnectionProviderFactoryBase that should own the reference to 'this' +@param aConnProvider a connection that 'this' subconnection belongs to +*/ + { + __FLOG_OPEN(KUmtsGprsLogTag1, KUmtsGprsLogTag2); + __FLOG_2(_L("CUmtsGprsSubConnProvd [this=%08x]:\tCUmtsGprsSubConnProvd() [MConnectionDataClient=%08x]"),this,(MConnectionDataClient*)this); + } + +inline void CUmtsGprsSubConnProvd::Done(TInt /*aResult*/, CPdpFsmRequestBase& aThis) + { + ASSERT(&aThis == iCurrentPdpFsmReq); + (void)aThis; + delete iCurrentPdpFsmReq; + iCurrentPdpFsmReq = NULL; + } + +inline TContextId CUmtsGprsSubConnProvd::GetContextId() const + { + return iContextId; + } + +inline TInt CUmtsGprsSubConnProvd::NotifyClientEvent(const CSubConNotificationEvent& aEvent) + { + return CSubConnectionProviderBase::NotifyClientEvent(aEvent); + } + + +inline CUmtsGprsSubConnProvd::TQosParameterRelease CUmtsGprsSubConnProvd::RequestedQosRelease() + { + return iParameterRelease; + } + +inline void CUmtsGprsSubConnProvd::ResetQosRelease () + { + iParameterRelease = CUmtsGprsSubConnProvd::KParameterRelInvalid; + } + + +inline CPdpFsmRequestBase::~CPdpFsmRequestBase () + { + __FLOG_CLOSE; + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProvFactory.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProvFactory.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,56 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Umts/Gprs SubConnection Provider Facory header file +// +// + +/** + @file + @internalComponent +*/ + + +#ifndef UMTSGPRS_SUBCONNPROVFACTORY_H +#define UMTSGPRS_SUBCONNPROVFACTORY_H + +#include +#include +#include + +// The ECOM DLL Uid and Factory Uid for the UmtsGprsSCPR + +const TUint KUmtsGprsSubConnectionProviderFactoryId = 0x1020D45F; + +class CUmtsGprsSubConnProvdFactory : public CSubConnectionProviderFactoryBase +/** + +@internalTechnology +@released Since 9.3 +*/ + { +public: + static CUmtsGprsSubConnProvdFactory* NewL(TAny* aConstructionParameters); + +protected: + CUmtsGprsSubConnProvdFactory(TUint aFactoryId, CSubConnectionFactoryContainer& aParentContainer); + virtual ~CUmtsGprsSubConnProvdFactory(); + + // methods to be overriden for CSubConnectionProviderFactory + virtual CSubConnectionProviderBase* DoCreateProviderL(CConnectionProviderBase& aConnProvider, RSubConnection::TSubConnType aType); + + }; + + +#endif +// UMTSGPRS_SUBCONNPROVFACTORY_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/inc/PDPFSM.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/inc/PDPFSM.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,122 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Interface to the PDP Context Finite State Machine +// +// + +/** + @file + @internalComponent +*/ + +#ifndef PDPFSM_H +#define PDPFSM_H + + +#include +#include "RSpudManInterface.h" + +class CPdpFsmFactory; +class CUmtsGprsDefaultSubConnProvd; + + +class CPdpFsmInterface : public MPdpFsmInterface +/** + * UmtsGprsSCPR implemenation for the MPdpFsmInterface + * + * @internalComponent + */ + { + public: + //-========================================================= + // custom methods + //-========================================================= + CPdpFsmInterface(CUmtsGprsDefaultSubConnProvd& aOwner); + virtual ~CPdpFsmInterface(); + + void SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam); + + //-========================================================= + // MPdpFsmInterface methods + //-========================================================= + virtual void OpenL(MSpudManInterface * aSpudManInterface, TName& aName); + virtual void Close(); + + virtual TInt Input (TContextId aPdpId, const TInt aOperation, const TInt aParam=KErrNone); + + virtual TInt Set(TContextId aPdpId, const TTFTInfo& aParam); + virtual TInt Set(TContextId aPdpId, const TTFTOperationCode& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam); + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + + // This is to set the status of IM CN signalling parameter + virtual void SetIMCNSignalling(TBool aImCnSignalling); + + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam); + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const; + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const; + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam); + virtual TInt Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam); + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + virtual TInt Get(TContextId aPdpId, TTFTInfo& aParam) const; + virtual TInt Get(TContextId aPdpId, TTFTOperationCode& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const; + virtual TInt Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const; + + virtual TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const; + + virtual void Set(const RPacketService::TStatus aParam); // applies to all contexts + virtual void Get(RPacketService::TStatus& aParam);// applies to all contexts + + virtual const TName& TsyName(void); + + void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode); + + protected: + private: + // DO NOT provide implementations to these methods: Copying this object should be disabled + CPdpFsmInterface(CPdpFsmInterface&); + CPdpFsmInterface& operator= (CPdpFsmInterface& aInput); + + public: + protected: + private: + // FSM Factory - churns out FSMs + CPdpFsmFactory* iPdpFsmFactory; + + RPacketService::TStatus iNetworkStatus; + + CUmtsGprsDefaultSubConnProvd& iDefaultSubConnProvd; + RSpudManInterface iSpudManInterface; + +}; + +#endif +// PDPFSM_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/inc/pdpfsmnmspace.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/inc/pdpfsmnmspace.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,309 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Common header for pdp FSM +// +// + +/** + @file + @internalComponent +*/ + +#ifndef PDPFSMNMSPACE_H +#define PDPFSMNMSPACE_H + +#include + +namespace PdpFsm +{ + +/** completion and notification signals */ +enum TEtelSignal + { + EPhoneOpened, + EPhoneOpenedFailed, + + EQoSSet, + EQoSSetFailed, + ETftSet, + ETftSetFailed, + ETftChanged, + ETftChangedFailed, + + E1ryPdpContextCreated, + E1ryPdpContextCreatedFailed, + E2ryPdpContextCreated, + E2ryPdpContextCreatedFailed, + + EPdpNegQoSRetrieved, + EPdpNegQoSRetrievedFailed, + EPdpContextModified, + EPdpContextModifiedFailed, + EPdpActivated, + EPdpActivatedFailed, + EContextDeleted, + EContextDeletedFailed, + // add new signals here + + // network signals + EQoSProfileChangeNetwork, + EConfigGPRSChangeNetwork, + EContextStatusChangeNetwork, + EServiceStatusChangeNetwork, + EPacketStatusChangeNetwork, + // add new signals here + + ESentinelSignal + }; +} // namespace PdpFsm + + + + +/** +A buffer to potentially hold one of the following: +Unfortuntely can't use a union for these since they have default ctors. + +RPacketQoS::TQoSR99_R4Negotiated +RPacketQoS::TQoSR5Negotiated + +@internalComponent +*/ +struct TNegotiatedProfileBuffer + { +private: +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Negotiated iNegotiatedBuffer; +#else + RPacketQoS::TQoSR99_R4Negotiated iNegotiatedBuffer; +#endif + +public: + inline TInt ExtensionId(); + + inline const RPacketQoS::TQoSR99_R4Negotiated& NegotiatedQoSR99_R4(); + inline TNegotiatedProfileBuffer& operator=(const RPacketQoS::TQoSR99_R4Negotiated& aParam); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + inline const RPacketQoS::TQoSR5Negotiated& NegotiatedQoSR5(); + inline TNegotiatedProfileBuffer& operator=(const RPacketQoS::TQoSR5Negotiated& aParam); +#endif + }; + + +struct TRequestedProfileBuffer + { +private: + // Use R5 since its the largest +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested iRequestedBuffer; +#else + RPacketQoS::TQoSR99_R4Requested iRequestedBuffer; +#endif + +public: + inline TInt ExtensionId(); + + inline const RPacketQoS::TQoSR99_R4Requested& RequestedQoSR99_R4(); + inline TRequestedProfileBuffer& operator=(const RPacketQoS::TQoSR99_R4Requested& aParam); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + inline const RPacketQoS::TQoSR5Requested& RequestedQoSR5(); + inline TRequestedProfileBuffer& operator=(const RPacketQoS::TQoSR5Requested& aParam); +#endif + }; + + +inline TInt TNegotiatedProfileBuffer::ExtensionId() + { + return (reinterpret_cast(iNegotiatedBuffer)).ExtensionId(); + } + + +inline const RPacketQoS::TQoSR99_R4Negotiated& TNegotiatedProfileBuffer::NegotiatedQoSR99_R4() + { + return reinterpret_cast(iNegotiatedBuffer); + } + + +inline TNegotiatedProfileBuffer& TNegotiatedProfileBuffer::operator=(const RPacketQoS::TQoSR99_R4Negotiated& aParam) + { + // Use this tmp value, since its ExtensionId is set when it is constructed. + // Can't trust the ExtensionId of struct passed in. + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + // If we support R5 then store as R5 + RPacketQoS::TQoSR5Negotiated tmp; + tmp.iSignallingIndication = EFalse; + tmp.iSourceStatisticsDescriptor = RPacketQoS::ESourceStatisticsDescriptorUnknown; + +#else + RPacketQoS::TQoSR99_R4Negotiated tmp; +#endif + + tmp.iBER = aParam.iBER; + tmp.iDeliverErroneousSDU = aParam.iDeliverErroneousSDU; + tmp.iDeliveryOrderReqd = aParam.iDeliveryOrderReqd; + tmp.iGuaranteedRate = aParam.iGuaranteedRate; + tmp.iMaxRate = aParam.iMaxRate; + tmp.iMaxSDUSize = aParam.iMaxSDUSize; + tmp.iSDUErrorRatio = aParam.iSDUErrorRatio; + tmp.iTrafficClass = aParam.iTrafficClass; + tmp.iTrafficHandlingPriority = aParam.iTrafficHandlingPriority; + tmp.iTransferDelay = aParam.iTransferDelay; + + iNegotiatedBuffer = tmp; + + return *this; + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +inline const RPacketQoS::TQoSR5Negotiated& TNegotiatedProfileBuffer::NegotiatedQoSR5() + { + return iNegotiatedBuffer; + } + + +inline TNegotiatedProfileBuffer& TNegotiatedProfileBuffer::operator=(const RPacketQoS::TQoSR5Negotiated& aParam) + { + // Use this tmp value, since its ExtensionId is set when it is constructed. + // Can't trust the ExtensionId of struct passed in. + RPacketQoS::TQoSR5Negotiated tmp; + + tmp.iBER = aParam.iBER; + tmp.iDeliverErroneousSDU = aParam.iDeliverErroneousSDU; + tmp.iDeliveryOrderReqd = aParam.iDeliveryOrderReqd; + tmp.iGuaranteedRate = aParam.iGuaranteedRate; + tmp.iMaxRate = aParam.iMaxRate; + tmp.iMaxSDUSize = aParam.iMaxSDUSize; + tmp.iSDUErrorRatio = aParam.iSDUErrorRatio; + tmp.iTrafficClass = aParam.iTrafficClass; + tmp.iTrafficHandlingPriority = aParam.iTrafficHandlingPriority; + tmp.iTransferDelay = aParam.iTransferDelay; + tmp.iSignallingIndication = aParam.iSignallingIndication; + tmp.iSourceStatisticsDescriptor = aParam.iSourceStatisticsDescriptor; + + iNegotiatedBuffer = tmp; + + return *this; + } +#endif + + + + +inline TInt TRequestedProfileBuffer::ExtensionId() + { + return (reinterpret_cast(iRequestedBuffer)).ExtensionId(); + } + + +inline const RPacketQoS::TQoSR99_R4Requested& TRequestedProfileBuffer::RequestedQoSR99_R4() + { + return reinterpret_cast(iRequestedBuffer); + } + + +inline TRequestedProfileBuffer& TRequestedProfileBuffer::operator=(const RPacketQoS::TQoSR99_R4Requested& aParam) + { + // Use this tmp value, since its ExtensionId is set when it is constructed. + // Can't trust the ExtensionId of struct passed in. +#ifdef SYMBIAN_NETWORKING_UMTSR5 + // If we support R5 then store as R5 + RPacketQoS::TQoSR5Requested tmp; + tmp.iSignallingIndication = EFalse; + tmp.iSourceStatisticsDescriptor = RPacketQoS::ESourceStatisticsDescriptorUnknown; + +#else + // If we don't support R5 then store as R4/R99 + RPacketQoS::TQoSR99_R4Requested tmp; +#endif + + tmp.iReqTrafficClass = aParam.iReqTrafficClass; + tmp.iMinTrafficClass = aParam.iMinTrafficClass; + tmp.iReqDeliveryOrderReqd = aParam.iReqDeliveryOrderReqd; + tmp.iMinDeliveryOrderReqd = aParam.iMinDeliveryOrderReqd; + tmp.iReqDeliverErroneousSDU = aParam.iReqDeliverErroneousSDU; + tmp.iMinDeliverErroneousSDU = aParam.iMinDeliverErroneousSDU; + tmp.iReqMaxSDUSize = aParam.iReqMaxSDUSize; + tmp.iMinAcceptableMaxSDUSize = aParam.iMinAcceptableMaxSDUSize; + tmp.iReqMaxRate = aParam.iReqMaxRate; + tmp.iMinAcceptableMaxRate = aParam.iMinAcceptableMaxRate; + tmp.iReqBER = aParam.iReqBER; + tmp.iMaxBER = aParam.iMaxBER; + tmp.iReqSDUErrorRatio = aParam.iReqSDUErrorRatio; + tmp.iMaxSDUErrorRatio = aParam.iMaxSDUErrorRatio; + tmp.iReqTrafficHandlingPriority = aParam.iReqTrafficHandlingPriority; + tmp.iMinTrafficHandlingPriority = aParam.iMinTrafficHandlingPriority; + tmp.iReqTransferDelay = aParam.iReqTransferDelay; + tmp.iMaxTransferDelay = aParam.iMaxTransferDelay; + tmp.iReqGuaranteedRate = aParam.iReqGuaranteedRate; + tmp.iMinGuaranteedRate = aParam.iMinGuaranteedRate; + + iRequestedBuffer = tmp; + + return *this; + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +inline const RPacketQoS::TQoSR5Requested& TRequestedProfileBuffer::RequestedQoSR5() + { + return iRequestedBuffer; + } + + +inline TRequestedProfileBuffer& TRequestedProfileBuffer::operator=(const RPacketQoS::TQoSR5Requested& aParam) + { + // Use this tmp value, since its ExtensionId is set when it is constructed. + // Can't trust the ExtensionId of struct passed in. + RPacketQoS::TQoSR5Requested tmp; + + tmp.iReqTrafficClass = aParam.iReqTrafficClass; + tmp.iMinTrafficClass = aParam.iMinTrafficClass; + tmp.iReqDeliveryOrderReqd = aParam.iReqDeliveryOrderReqd; + tmp.iMinDeliveryOrderReqd = aParam.iMinDeliveryOrderReqd; + tmp.iReqDeliverErroneousSDU = aParam.iReqDeliverErroneousSDU; + tmp.iMinDeliverErroneousSDU = aParam.iMinDeliverErroneousSDU; + tmp.iReqMaxSDUSize = aParam.iReqMaxSDUSize; + tmp.iMinAcceptableMaxSDUSize = aParam.iMinAcceptableMaxSDUSize; + tmp.iReqMaxRate = aParam.iReqMaxRate; + tmp.iMinAcceptableMaxRate = aParam.iMinAcceptableMaxRate; + tmp.iReqBER = aParam.iReqBER; + tmp.iMaxBER = aParam.iMaxBER; + tmp.iReqSDUErrorRatio = aParam.iReqSDUErrorRatio; + tmp.iMaxSDUErrorRatio = aParam.iMaxSDUErrorRatio; + tmp.iReqTrafficHandlingPriority = aParam.iReqTrafficHandlingPriority; + tmp.iMinTrafficHandlingPriority = aParam.iMinTrafficHandlingPriority; + tmp.iReqTransferDelay = aParam.iReqTransferDelay; + tmp.iMaxTransferDelay = aParam.iMaxTransferDelay; + tmp.iReqGuaranteedRate = aParam.iReqGuaranteedRate; + tmp.iMinGuaranteedRate = aParam.iMinGuaranteedRate; + tmp.iSignallingIndication = aParam.iSignallingIndication; + tmp.iSourceStatisticsDescriptor = aParam.iSourceStatisticsDescriptor; + + iRequestedBuffer = tmp; + + return *this; + } +#endif + + +typedef TPckg TNegotiatedProfileBufferPckg; +typedef TPckg TRequestedProfileBufferPckg; + + +#endif +// PDPFSMNMSPACE_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPFSM.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPFSM.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,814 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Implementation file for the PDP Context Finite State Machine +// +// + +/** + @file +*/ + + +#include "PDPFSM.h" +#include "cpdpfsmfactory.h" +#include "spudfsmdebuglogger.h" +#include "UmtsGprs_defaultSubconnProv.h" + + +//-========================================================= +// Custom methods +//-========================================================= +CPdpFsmInterface::CPdpFsmInterface(CUmtsGprsDefaultSubConnProvd& aOwner) +:iPdpFsmFactory(NULL), + iNetworkStatus(RPacketService::EStatusUnattached), + iDefaultSubConnProvd(aOwner) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()"); + } + +CPdpFsmInterface::~CPdpFsmInterface() + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()"); + + CPdpFsmInterface::Close(); + delete iPdpFsmFactory; + } + + +void CPdpFsmInterface::SpudInput(TContextId aPdpId, TInt aNotification, TInt aParam) + { + switch (aNotification) + { + //------------------------------ + // responses - these are explicitly responses to previously issued requests. + // These should only reach the entity that sent the request. + //------------------------------ + case KContextTFTModifiedEvent: + { + TTFTOperationCode opCode; + Get(aPdpId, opCode); + if (opCode == KDeleteTFT && aParam == KErrNone) + { + //captured response to a successful delete TFT request. We now + //have a new default. + #ifdef _DEBUG + TTFTInfo ttfinfo; + Get(aPdpId, ttfinfo); + ASSERT(ttfinfo.FilterCount() == 0); + #endif //_DEBUG + + iDefaultSubConnProvd.NewDefaultElected(aPdpId); + } + + iSpudManInterface.Input(aPdpId, aNotification, aParam); + } + break; + + case KSecondaryContextCreated: + case KContextQoSSetEvent: + case KContextActivateEvent: + case KContextModifyActiveEvent: + { + if (aPdpId == iDefaultSubConnProvd.GetContextId()) + { + TBool handled = iDefaultSubConnProvd.PdpFsmEvent(aPdpId, aNotification, aParam); + if (!handled) + { + // Chances are the default context is in fact a promoted secondary context + // We must be careful to make sure that GuQoS gets the notification it expects + // otherwise it can cause problems. On the other hand if it gets notifications + // or events its not expecting it will Panic. + iSpudManInterface.Input(aPdpId, aNotification, aParam); + } + } + else + { + iSpudManInterface.Input(aPdpId, aNotification, aParam); + } + } + break; + + //------------------------------ + // events - Received either as responses to previously sent requests + // or as indications of network initiated actions. + //------------------------------ + case KContextDeleteEvent: + case KNetworkStatusEvent: + case KContextParametersChangeEvent: + case KContextBlockedEvent: + case KContextUnblockedEvent: + case KPrimaryContextCreated: + case KGetNegQoSEvent: + { + if ( aPdpId == iDefaultSubConnProvd.GetContextId() || aPdpId == KAllContexts) + { + iDefaultSubConnProvd.PdpFsmEvent(iDefaultSubConnProvd.GetContextId(), aNotification, aParam); + } + iSpudManInterface.Input(aPdpId, aNotification, aParam); + } + break; + } + } + + + + +//-========================================================= +// MPdpFsmInterface methods +//-========================================================= +/** request to open the FSM + +@param aSpudManInterface reference to SpudMan interface +*/ +void CPdpFsmInterface::OpenL(MSpudManInterface * aSpudManInterface, TName& aTsyName) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::OpenL()"); + + if (aSpudManInterface == NULL) + { + User::Leave(KErrBadHandle); + } + + iSpudManInterface.Init(aSpudManInterface); + + iPdpFsmFactory = CPdpFsmFactory::NewL(); + + iPdpFsmFactory->InitL(aTsyName, this); + } + +/** closes the FSM and frees underlying resources +*/ +void CPdpFsmInterface::Close() + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()"); + + iSpudManInterface.Close (); + + if (iPdpFsmFactory) + { + iPdpFsmFactory->Close(); + } + } + + +/** + Performs and input action/notification for context ID aPdpId + If aPdpId is KAllContexts, the notification is sent to every context, unless it is of type EServiceStatusChangeNetwork + +@param aPdpId the PDP context ID, 0 to KMaxPdpContexts +@param aOperation the operation id to perform +@param aParam extra id for ETelDriver errors +@return error code for the synchronus patrt of the operation +*/ +TInt CPdpFsmInterface::Input(TContextId aPdpId, const TInt aOperation, const TInt aParam) + { + TInt ret = KErrNone; + + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)"); + + ASSERT(iPdpFsmFactory); + + + // Control structure is in order of the most frequent operation first (hopefully) + // + if (iPdpFsmFactory->ContextIsValid(aPdpId)) + { + // We have a valid PDP FSM Context, so go ahead with the operation... + // + ret = (iPdpFsmFactory->GetFsmContext(aPdpId))->Input(aOperation, aParam); + if (aOperation == PdpFsm::EContextStatusChangeNetwork && aParam != KErrNone) + { + SPUDFSMVERBOSE_LOG1(_L("iSpudManInterface.SetContextTerminationErrorAndStop %d"),aParam); + iSpudManInterface.SetContextTerminationErrorAndStop(aPdpId, aParam); + } + + // Recovering memory by deleting the Fsm Context + // + // Tricky, definitely don't try with 'SpudMan::EContextDelete' it's far too early. + // You can get a bit further deleting on 'PdpFsm::EContextDeleted' (and 'PdpFsm::EContextDeletedFailed') + // from TContextDeleteStrategy::NotifyFsm(), but you then find that GuQoS is calling into Spud in order to + // transfer data from the deleted context to another... + // + // Additionally, the spud unit test is expecting to be able to "reuse" deleted contexts... + } + else if (aPdpId == KAllContexts) + { + TInt err = KErrNone; + + // this has to be here to avoid sending it from every context + // + if (aOperation == PdpFsm::EServiceStatusChangeNetwork) + { + iPdpFsmFactory->SpudInput(KAllContexts, KNetworkStatusEvent, KErrNone); + } + else + { + for (TContextId i = 0; (i < KMaxPdpContexts) && iPdpFsmFactory->HaveFsmContext(i); i++) + { + // Process any current PDP contexts. + + err = (iPdpFsmFactory->GetFsmContext(i))->Input(aOperation, aParam); + + // See above about trials and tribulations of trying to recover the memory taken by these + // CPdpFsm objects. + + if (err != KErrNone) + { + // We return the last error found, ignoring any earlier ones + // + ret = err; + } + } + } + } + else + { + ret = KErrBadHandle; + } + + return ret; + } + + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + +void CPdpFsmInterface::SetIMCNSignalling(TBool aImCnSignalling) +/** +Sets the IM CN signalling Parameters + +@param aImCnSignalling The status of the IMCN signalling Flag +*/ + { + TRAP_IGNORE(iDefaultSubConnProvd.AddIMCNInformationToParameterBundleL(aImCnSignalling)); + } + + +/** +Set context parameters +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1 +@param aParam - RPacketQoS::TQoSR5Requested data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; +} + + +/** +Set context parameters +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1 +@param aParam - RPacketQoS::TQoSR5Negotiated data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; +} + + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +/** +Set context parameters +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Requested data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + + +/** +Set context parameters +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TFTInfo data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TFTOperationCode to set to go with the data +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TDataChannelV2 data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextStatus data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextConfigGPRS& data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set network status + +@param aParam - RPacketService::TStatus data to set +*/ +void CPdpFsmInterface::Set(const RPacketService::TStatus aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)"); + + ASSERT(iPdpFsmFactory); + + iNetworkStatus = aParam; + } + +/** Set ETel termination error and stop context + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aErrorCode - the Etel error code detected on this context +*/ +void CPdpFsmInterface::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode)"); + + iSpudManInterface.SetContextTerminationErrorAndStop(aPdpId, aErrorCode); + +} + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +/** +Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR5Requested data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; +} + + +/** +Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR5Negotiated data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; +} + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +/** +Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Requested data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + + +/** +Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TTFTInfo data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TTFTOperationCode for the TFT data +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + + + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TDataChannelV2 data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextConfigGPRS data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextStatus data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextConfigGPRS data to set +@return - KErrBadHandle or KErrNone +*/ +void CPdpFsmInterface::Get(RPacketService::TStatus& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)"); + + ASSERT(iPdpFsmFactory); + + aParam = iNetworkStatus; + } + + +TInt CPdpFsmInterface::GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::GetLastErrorCause(RPacketContext::GetLastErrorCause)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + + TInt ret; + if (!iPdpFsmFactory->HaveFsmContext(aPdpId)) + { + if ((ret = iPdpFsmFactory->NewFsmContext(aPdpId)) != KErrNone) + { + return ret; + } + } + + iPdpFsmFactory->GetFsmContext(aPdpId)->GetLastErrorCause(aLastErrorCause); + + return KErrNone; + } + +/** Get the TsyName + +@return - TsyName in a TName +*/ +const TName& CPdpFsmInterface::TsyName(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName"); + + ASSERT(iPdpFsmFactory); + + return iPdpFsmFactory->TsyName(); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPSCPRFSM.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPSCPRFSM.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,534 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Implementation file for the PDP Context Finite State Machine +// +// + +/** + @file +*/ + + +#include "PDPFSM.h" +#include "cpdpfsmfactory.h" +#include "spudfsmdebuglogger.h" +#include "PDPDeftSCPR.h" + + +//-========================================================= +// Custom methods +//-========================================================= +CPdpFsmInterface::CPdpFsmInterface(CPDPDefaultSubConnectionProvider& aOwner) +:iPdpFsmFactory(NULL), + iNetworkStatus(RPacketService::EStatusUnattached), + iDefaultSubConnProvd(aOwner) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()"); + } + +CPdpFsmInterface::~CPdpFsmInterface() + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()"); + + CPdpFsmInterface::Close(); + delete iPdpFsmFactory; + } + +TContextId CPdpFsmInterface::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler) + { + return iPdpFsmFactory->NewFsmContextL(aPdpFsmEventHandler); + } + + +/** request to open the FSM + +@param aSpudManInterface reference to SpudMan interface +*/ +void CPdpFsmInterface::OpenL(TName& aTsyName) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::OpenL()"); + + iPdpFsmFactory = CPdpFsmFactory::NewL(); + iPdpFsmFactory->InitL(aTsyName, this); + } + +/** closes the FSM and frees underlying resources +*/ +void CPdpFsmInterface::Close() + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()"); + + if (iPdpFsmFactory) + { + iPdpFsmFactory->Close(); + } + } + + +/** + Performs and input action/notification for context ID aPdpId + If aPdpId is KAllContexts, the notification is sent to every context, unless it is of type EServiceStatusChangeNetwork + +@param aPdpId the PDP context ID, 0 to KMaxPdpContexts +@param aOperation the operation id to perform +@param aParam extra id for ETelDriver errors +@return error code for the synchronus patrt of the operation +*/ +TInt CPdpFsmInterface::Input(TContextId aPdpId, const TInt aOperation, const TInt aParam) + { + TInt ret = KErrNone; + + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)"); + + ASSERT(iPdpFsmFactory); + + + // Control structure is in order of the most frequent operation first (hopefully) + // + if (iPdpFsmFactory->ContextIsValid(aPdpId)) + { + // We have a valid PDP FSM Context, so go ahead with the operation... + // + ret = (iPdpFsmFactory->GetFsmContext(aPdpId))->Input(aOperation, aParam); + + // Recovering memory by deleting the Fsm Context + // + // Tricky, definitely don't try with 'SpudMan::EContextDelete' it's far too early. + // You can get a bit further deleting on 'PdpFsm::EContextDeleted' (and 'PdpFsm::EContextDeletedFailed') + // from TContextDeleteStrategy::NotifyFsm(), but you then find that GuQoS is calling into Spud in order to + // transfer data from the deleted context to another... + // + // Additionally, the spud unit test is expecting to be able to "reuse" deleted contexts... + } + else if (aPdpId == KAllContexts) + { + TInt err = KErrNone; + + // this has to be here to avoid sending it from every context + // + if (aOperation == PdpFsm::EServiceStatusChangeNetwork) + { + iDefaultSubConnProvd.PdpFsmAllContextEvent(KNetworkStatusEvent, KErrNone); + } + else + { + for (TContextId i = 0; (i < KMaxPdpContexts) && iPdpFsmFactory->HaveFsmContext(i); i++) + { + // Process any current PDP contexts. + + err = (iPdpFsmFactory->GetFsmContext(i))->Input(aOperation, aParam); + + // See above about trials and tribulations of trying to recover the memory taken by these + // CPdpFsm objects. + + if (err != KErrNone) + { + // We return the last error found, ignoring any earlier ones + // + ret = err; + } + } + } + } + else + { + ret = KErrBadHandle; + } + + return ret; + } + + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + +/** +Set context parameters +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1 +@param aParam - RPacketQoS::TQoSR5Requested data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; +} + + +/** +Set context parameters +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts - 1 +@param aParam - RPacketQoS::TQoSR5Negotiated data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; +} + + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +/** +Set context parameters +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Requested data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + + +/** +Set context parameters +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TFTInfo data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TFTOperationCode to set to go with the data +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TDataChannelV2 data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextStatus data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextConfigGPRS& data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextConfigGPRS& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam); + return KErrNone; + } + +/** Set network status + +@param aParam - RPacketService::TStatus data to set +*/ +void CPdpFsmInterface::Set(const RPacketService::TStatus aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)"); + + ASSERT(iPdpFsmFactory); + + iNetworkStatus = aParam; + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +/** +Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR5Requested data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; +} + + +/** +Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR5Negotiated data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; +} + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +/** +Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Requested data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + + +/** +Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketQoS::TQoSR99_R4Negotiated data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TTFTInfo data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - TTFTOperationCode for the TFT data +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + + + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TDataChannelV2 data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextConfigGPRS data to set +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextConfigGPRS& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextStatus data to get +@return - KErrBadHandle or KErrNone +*/ +TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)"); + + ASSERT(iPdpFsmFactory); + ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId)); + ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId)); + iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam); + return KErrNone; + } + +/** Get context parameters + +@param aPdpId - the PDP context ID, 0 to KMaxPdpContexts +@param aParam - RPacketContext::TContextConfigGPRS data to set +@return - KErrBadHandle or KErrNone +*/ +void CPdpFsmInterface::Get(RPacketService::TStatus& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)"); + + ASSERT(iPdpFsmFactory); + + aParam = iNetworkStatus; + } + + +/** Get the TsyName + +@return - TsyName in a TName +*/ +const TName& CPdpFsmInterface::TsyName(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName"); + + ASSERT(iPdpFsmFactory); + + return iPdpFsmFactory->TsyName(); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,431 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP FSM implementation +// @internalTechnology +// +// + + +#include "tpdpstates.h" +#include "cpdpfsm.h" +#include "cpdpfsmfactory.h" +#include "spudfsmdebuglogger.h" +#include "eteldrivernmspace.h" + +void CPdpFsm::ConstructL() + { + // Create EtelDriver for this ID - does nothing on ETel + iEtelDriverInput->CreatePdpL(iPdpId); + + // we need a state + iState = &iPdpFsmFactory->iStateInitialised; + } + +CPdpFsm* CPdpFsm::NewL(TContextId aPdpId, CPdpFsmFactory * aPdpFsmFactory, REtelDriverInput * aEtelDriverInput) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::NewL()"); + CPdpFsm* self = new (ELeave)CPdpFsm(aPdpId, aPdpFsmFactory, aEtelDriverInput); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +CPdpFsm::CPdpFsm(TContextId aPdpId, CPdpFsmFactory * aPdpFsmFactory, REtelDriverInput * aEtelDriverInput) : + iPdpFsmFactory(aPdpFsmFactory), + iEtelDriverInput(aEtelDriverInput), + iPdpId(aPdpId) +// NOTE: Both pointers are valid when called - see CPdpFsmFactory and CPdpFsmInterface. +// No other caller is expected. + { + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + } + +CPdpFsm::~CPdpFsm() + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::~CPdpFsm()"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + } + + +TInt CPdpFsm::Input (const TInt aOperation, const TInt aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Input()"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + +#ifdef _DEBUG // NOT DEBUGRELEASE + SPUDFSMVERBOSE_LOG1(_L("State : %S"), &iState->iName); +#endif + + SPUDFSM_LOG3(_L("Pdp ID %d, State '%S', Operation '%S'"),iPdpId, &iState->iName, iState->LogOperation(*this, aOperation)); + + return iState->Input (*this, aOperation, aParam); + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +void CPdpFsm::Get(RPacketQoS::TQoSR5Requested& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSR5Req)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + ASSERT(iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5); + aParam = iQosRequested.RequestedQoSR5(); +} + +void CPdpFsm::Get(RPacketQoS::TQoSR5Negotiated& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSR5Neg)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + ASSERT(iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5); + aParam = iQosNegotiated.NegotiatedQoSR5(); +} + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +void CPdpFsm::Get(RPacketQoS::TQoSR99_R4Requested& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QosReq)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + aParam = iQosRequested.RequestedQoSR99_R4(); + } + +void CPdpFsm::Get(RPacketQoS::TQoSR99_R4Negotiated& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSNeg)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + aParam = iQosNegotiated.NegotiatedQoSR99_R4(); + } + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + +void CPdpFsm::Get(TTFTInfo& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TFTInfo)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + aParam = iTFT; + } + +void CPdpFsm::Get(TTFTOperationCode& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TFTOperationCode)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + aParam = iTFTOperationCode; + } + +void CPdpFsm::Get(RPacketContext::TDataChannelV2& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TDataChannelV2)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + aParam = iDataChannelV2; + } + +void CPdpFsm::Get(RPacketContext::TContextConfigGPRS& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TContextConfigGPRS)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + aParam = iGPRS; + } + +void CPdpFsm::Get(RPacketContext::TContextStatus& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TContextStatus)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + aParam = iContextStatus; + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +void CPdpFsm::Set(const RPacketQoS::TQoSR5Requested& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSR5Req)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iQosRequested = aParam; +} + +void CPdpFsm::Set(const RPacketQoS::TQoSR5Negotiated& aParam) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSR5Neg)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iQosNegotiated = aParam; +} + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + + +void CPdpFsm::Set(const RPacketQoS::TQoSR99_R4Requested& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSReq)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iQosRequested = aParam; + + } + + +void CPdpFsm::Set(const RPacketQoS::TQoSR99_R4Negotiated& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSNeg)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iQosNegotiated = aParam; + } + + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + +void CPdpFsm::Set(const TTFTInfo& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(TFT)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iTFT = aParam; + } + +void CPdpFsm::Set(const TTFTOperationCode& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(TFTOperationCode)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iTFTOperationCode = aParam; + } + +void CPdpFsm::Set(const RPacketContext::TDataChannelV2& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TDataChannelV2)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iDataChannelV2 = aParam; + } + +void CPdpFsm::Set(const RPacketContext::TContextStatus& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TContextStatus)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iContextStatus = aParam; + } + +void CPdpFsm::Set(const RPacketContext::TContextConfigGPRS& aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TContextConfigGPRS)"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iGPRS = aParam; + } + +void CPdpFsm::EtelInput (EtelDriver::TEtelInput aOperation) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::EtelInput"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iEtelDriverInput->Input (iPdpId, aOperation); + } + +void CPdpFsm::EtelCancel (void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::EtelCancel"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iEtelDriverInput->CancelPdp (iPdpId); + } + +void CPdpFsm::GetLastErrorCause (TInt& aLastErrorCause) +{ + SPUDFSMVERBOSE_FNLOG("CPdpFsm::GetLastErrorCause"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iEtelDriverInput->GetLastErrorCause (iPdpId, aLastErrorCause); +} + +void CPdpFsm::SpudInput (TInt aNotification, TInt aParam) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::SpudInput"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + + iPdpFsmFactory->SpudInput (iPdpId, aNotification, aParam); + } + +// state change members + +void CPdpFsm::ChangeStateToInitialised(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToInitialised"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : Initialised")); + + iState = &iPdpFsmFactory->iStateInitialised; + } + +void CPdpFsm::ChangeStateToOpeningPhone(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToOpeningPhone"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : OpeningPhone")); + + iState = &iPdpFsmFactory->iStateOpeningPhone; + } + +void CPdpFsm::ChangeStateToCreatingPrimary(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingPrimary"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : CreatingPrimary")); + + iState = &iPdpFsmFactory->iStateCreatingPrimary; + } + +void CPdpFsm::ChangeStateToActivatingPrimary(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingPrimary"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : ActivatingPrimary")); + + iState = &iPdpFsmFactory->iStateActivatingPrimary; + } + +void CPdpFsm::ChangeStateToCreatingSecondary(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingSecondary"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : CreatingSecondary")); + + iState = &iPdpFsmFactory->iStateCreatingSecondary; + } + +void CPdpFsm::ChangeStateToCreatedSecondary(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatedSecondary"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : CreatedSecondary")); + + iState = &iPdpFsmFactory->iStateCreatedSecondary; + } + +void CPdpFsm::ChangeStateToSettingTFT(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSettingTFT"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : SettingTFT")); + + iState = &iPdpFsmFactory->iStateSettingTFT; + } + +void CPdpFsm::ChangeStateToSettingQoS(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSettingQoS"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : SettingQoS")); + + iState = &iPdpFsmFactory->iStateSettingQoS; + } + +void CPdpFsm::ChangeStateToActivatingSecondary(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingSecondary"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : ActivatingSecondary")); + + iState = &iPdpFsmFactory->iStateActivatingSecondary; + } + +void CPdpFsm::ChangeStateToOpen(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToOpen"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : Open")); + + iState = &iPdpFsmFactory->iStateOpen; + } + +void CPdpFsm::ChangeStateToChangingQoS(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToChangingQoS"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : ChangingQoS")); + + iState = &iPdpFsmFactory->iStateChangingQoS; + } + +void CPdpFsm::ChangeStateToChangingTFT(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToChangingTFT"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : ChangingTFT")); + + iState = &iPdpFsmFactory->iStateChangingTFT; + } + +void CPdpFsm::ChangeStateToGettingNegQoS(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToGettingNegQoS"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : GettingNegQoS")); + + iState = &iPdpFsmFactory->iStateGettingNegQoS; + } + + + +void CPdpFsm::ChangeStateToModifingActive(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToModifingActive"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : ModifingActive")); + + iState = &iPdpFsmFactory->iStateModifyingActive; + } + +void CPdpFsm::ChangeStateToSuspended(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSuspended"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : Suspended")); + + iState = &iPdpFsmFactory->iStateSuspended; + } + +void CPdpFsm::ChangeStateToClosing(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToClosing"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : Closing")); + + iState = &iPdpFsmFactory->iStateClosing; + } + +void CPdpFsm::ChangeStateToStopping(void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToStopping"); + SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId); + SPUDFSM_LOG(_L("New State : Stopping")); + + iState = &iPdpFsmFactory->iStateStopping; + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,171 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP FSM header +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CPDPFSM_H +#define CPDPFSM_H + +#include +#include +#include +#include +#include "reteldriverinput.h" +#include "pdpfsmnmspace.h" + +#include "tpdpstates.h" + +class CPdpFsmFactory; +class RPacketQoS; + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +class TQoSR5Requested; +class TQoSR5Negotiated; +#else +class TQoSR99_R4Requested; +class TQoSR99_R4Negotiated; + +#endif +// SYMBIAN_NETWORKING_UMTSR5 +class TFTInfo; +class TFTOperationCode; + +class CPdpFsm : public CBase +{ + friend class TPdpState; + friend class TPdpStateInitialised; + friend class TPdpStateOpeningPhone; + friend class TPdpStateCreatingPrimary; + friend class TPdpStateActivatingPrimary; + friend class TPdpStateCreatingSecondary; + friend class TPdpStateCreatedSecondary; + friend class TPdpStateSettingQoS; + friend class TPdpStateSettingTFT; + friend class TPdpStateActivatingSecondary; + friend class TPdpStateOpen; + friend class TPdpStateChangingQoS; + friend class TPdpStateChangingTFT; + friend class TPdpStateGettingNegQoS; + friend class TPdpStateModifyingActive; + friend class TPdpStateSuspended; + friend class TPdpStateClosing; + friend class TPdpStateStopping; + +public: + static CPdpFsm* NewL(TContextId aPdpId, CPdpFsmFactory * aPdpFsmFactory, REtelDriverInput * aEtelDriverInput); + void ConstructL(); + ~CPdpFsm(); + + TInt Input (const TInt aOperation, const TInt aParam); + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + void Get(RPacketQoS::TQoSR5Requested& aParam); + void Get(RPacketQoS::TQoSR5Negotiated& aParam); + void Set(const RPacketQoS::TQoSR5Requested& aParam); + void Set(const RPacketQoS::TQoSR5Negotiated& aParam); + +#else + void Get(RPacketQoS::TQoSR99_R4Requested& aParam); + void Get(RPacketQoS::TQoSR99_R4Negotiated& aParam); + void Set(const RPacketQoS::TQoSR99_R4Requested& aParam); + void Set(const RPacketQoS::TQoSR99_R4Negotiated& aParam); +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + void Get(TTFTInfo& aParam); + void Get(TTFTOperationCode& aParam); + void Get(RPacketContext::TDataChannelV2& aParam); + void Get(RPacketContext::TContextConfigGPRS& aParam); + void Get(RPacketContext::TContextStatus& aParam); + + void GetLastErrorCause(TInt& aLastErrorCause); + + void Set(const TTFTInfo& aParam); + void Set(const TTFTOperationCode& aParam); + void Set(const RPacketContext::TDataChannelV2& aParam); + void Set(const RPacketContext::TContextConfigGPRS& aParam); + + void Set(const RPacketContext::TContextStatus& aParam); + + void EtelInput (EtelDriver::TEtelInput aOperation); + void EtelCancel (void); + void SpudInput (TInt aNotification, TInt aParam); + +protected: + CPdpFsm(TContextId aPdpId, CPdpFsmFactory * aPdpFsmFactory, REtelDriverInput * aEtelDriverInput); + +private: + void ChangeStateToInitialised(void); + void ChangeStateToOpeningPhone(void); + void ChangeStateToCreatingPrimary(void); + void ChangeStateToActivatingPrimary(void); + void ChangeStateToCreatingSecondary(void); + void ChangeStateToCreatedSecondary(void); + void ChangeStateToSettingQoS(void); + void ChangeStateToSettingTFT(void); + void ChangeStateToActivatingSecondary(void); + void ChangeStateToOpen(void); + void ChangeStateToChangingQoS(void); + void ChangeStateToChangingTFT(void); + void ChangeStateToGettingNegQoS(void); + void ChangeStateToModifingActive(void); + void ChangeStateToSuspended(void); + void ChangeStateToClosing(void); + void ChangeStateToStopping(void); + + +public: +protected: +private: + + // local data cache for this context + TRequestedProfileBuffer iQosRequested; + TNegotiatedProfileBuffer iQosNegotiated; + + RPacketContext::TDataChannelV2 iDataChannelV2; + RPacketContext::TContextStatus iContextStatus; + TTFTInfo iTFT; + TTFTOperationCode iTFTOperationCode; + RPacketContext::TContextConfigGPRS iGPRS; + + CPdpFsmFactory * iPdpFsmFactory; // need stuff from factory + REtelDriverInput * iEtelDriverInput; + + TPdpState * iState; // current state + + TContextId iPdpId; // our instance PDP context id - fixed when allocateed + + enum TContextType + { + ENone, + EPrimary, + ESecondary + } iContextType; + + +}; + + + +#endif // CPDPFSM_H + + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,152 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP FSM factory implementation +// +// + +/** + @file + @internalComponent +*/ + +#include "cpdpfsmfactory.h" +#include "spudfsmdebuglogger.h" + +// NewL +CPdpFsmFactory* CPdpFsmFactory::NewL () + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewL()"); + + return new (ELeave) CPdpFsmFactory (); + } + +#if defined(__VC32__) +#if (_MSC_VER >= 1200) +#pragma warning(disable:4355) +#endif +#endif +//Cpdpfsmfactory.cpp(22...) : warning C4355: 'this' : used in base member initializer list +// these warnings are benign unless the designed usage of SpudFsm changes such that SpudFsm is used +// as a base class to something else, in which case this code will have to change IFF the this pointer +// passed is used in the states c'tor. Currently, the pointer is just stored. +// In V9, e32def.h turns this warning off. + +CPdpFsmFactory::CPdpFsmFactory() +: iStateInitialised (this), + iStateOpeningPhone (this), + iStateCreatingPrimary (this), + iStateActivatingPrimary (this), + iStateCreatingSecondary (this), + iStateCreatedSecondary (this), + iStateSettingQoS (this), + iStateSettingTFT (this), + iStateActivatingSecondary (this), + iStateOpen (this), + iStateChangingQoS (this), + iStateChangingTFT (this), + iStateGettingNegQoS (this), + iStateModifyingActive (this), + iStateSuspended (this), + iStateClosing (this), + iStateStopping (this) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::CPdpFsmFactory()"); + } + + +CPdpFsmFactory::~CPdpFsmFactory() + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::~CPdpFsmFactory()"); + + delete iEtelDriverInput; + + iContexts.DeleteAll(); + iContexts.Reset(); + } + + +void CPdpFsmFactory::InitL(TName& aTsyName, CPdpFsmInterface * aPdpFsmInterface) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::InitL()"); + + iPdpFsmInterface = aPdpFsmInterface; + + iTsyName = aTsyName; + + // lets kick off the ETelDriver first then we only alloc FSMs if it works + // + iEtelDriverInput = new (ELeave) REtelDriverInput; + + iEtelDriverInput->OpenL (*iPdpFsmInterface); + + // Only create PDP contexts if specifically requested. + } + + +void CPdpFsmFactory::Close (void) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::Close()"); + iEtelDriverInput->Close(); + } + + +/** +@return may return NULL if there is no PDP context with that Id +*/ +CPdpFsm* CPdpFsmFactory::GetFsmContext (TContextId aPdpId) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::GetContext()"); + + return iContexts[aPdpId]; + } + + +const TName& CPdpFsmFactory::TsyName(void) + { + return iTsyName; + } + + +TInt CPdpFsmFactory::NewFsmContext(TContextId aPdpId) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewFsmContext()"); + ASSERT(ContextIdIsValid(aPdpId)); + + TInt ret = KErrNone; + + if (!HaveFsmContext(aPdpId)) + { + // Only ever called by non-leaving functions. We're going to have to trap at some point in the calling hierarchy... + // + TRAP(ret, + CPdpFsm* p = CPdpFsm::NewL(aPdpId, this, iEtelDriverInput); + iContexts[aPdpId] = p; + ); + } + + return ret; + } + + +TInt CPdpFsmFactory::DeleteFsmContext(TContextId aPdpId) + { + SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::DeleteFsmContext()"); + ASSERT(ContextIsValid(aPdpId)); + + delete iContexts[aPdpId]; + iContexts[aPdpId] = NULL; + + return KErrNone; + } + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,125 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP FSM factory header +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CPDPFSMFACTORY_H +#define CPDPFSMFACTORY_H + +#include + +#include "PDPFSM.h" +#include "reteldriverinput.h" +#include "cpdpfsm.h" +#include "tpdpstates.h" + +/** factory (and owner) of FSM objects */ +class CPdpFsmFactory : public CBase +{ + friend class CPdpFsm; + friend class TPdpState; + friend class TPdpStateInitialised; // Needs iEtelOpened + friend class TPdpStateOpeningPhone; // Needs iEtelOpened +public: + static CPdpFsmFactory * NewL(); + + virtual ~CPdpFsmFactory(); + void InitL(TName& aTsyName, CPdpFsmInterface * aPdpFsmInterface); + + TInt NewFsmContext(TContextId aPdpId); + TInt DeleteFsmContext(TContextId aPdpId); + + CPdpFsm* GetFsmContext(TContextId aPdpId); + + inline TBool HaveFsmContext(TContextId aPdpId) const; + inline TBool ContextIdIsValid(TContextId aPdpId) const; + inline TBool ContextIsValid(TContextId aPdpId) const; + + void Close (void); + + void SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam); + + void SetContextTerminationErrorAndStop(TContextId aPdpId, TInt aErrorCode); + + TInt GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause); + + const TName& TsyName(void); + +protected: +private: + CPdpFsmFactory(); + +public: +protected: +private: + TFixedArray iContexts; + + // the states + TPdpStateInitialised iStateInitialised; + TPdpStateOpeningPhone iStateOpeningPhone; + TPdpStateCreatingPrimary iStateCreatingPrimary; + TPdpStateActivatingPrimary iStateActivatingPrimary; + TPdpStateCreatingSecondary iStateCreatingSecondary; + TPdpStateCreatedSecondary iStateCreatedSecondary; + TPdpStateSettingQoS iStateSettingQoS; + TPdpStateSettingTFT iStateSettingTFT; + TPdpStateActivatingSecondary iStateActivatingSecondary; + TPdpStateOpen iStateOpen; + TPdpStateChangingQoS iStateChangingQoS; + TPdpStateChangingTFT iStateChangingTFT; + TPdpStateGettingNegQoS iStateGettingNegQoS; + TPdpStateModifyingActive iStateModifyingActive; + TPdpStateSuspended iStateSuspended; + TPdpStateClosing iStateClosing; + TPdpStateStopping iStateStopping; + + CPdpFsmInterface * iPdpFsmInterface; + REtelDriverInput * iEtelDriverInput; + + TBool iEtelOpened; + + TName iTsyName; +}; + + +inline void CPdpFsmFactory::SpudInput (TContextId aPdpId, TInt aNotification, TInt aParam) + { + iPdpFsmInterface->SpudInput (aPdpId, aNotification, aParam); + } + + +inline TBool CPdpFsmFactory::HaveFsmContext(TContextId aPdpId) const + { + return (iContexts[aPdpId] != NULL); + } + + +inline TBool CPdpFsmFactory::ContextIdIsValid(TContextId aPdpId) const + { + return (aPdpId >= 0 && aPdpId < KMaxPdpContexts); + } + + +inline TBool CPdpFsmFactory::ContextIsValid(TContextId aPdpId) const + { + return (ContextIdIsValid(aPdpId) && HaveFsmContext(aPdpId)); + } + +#endif // CPDPFSMFACTORY_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/spudfsmdebuglogger.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/spudfsmdebuglogger.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,87 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// SpudFsm Data and Event Logger header +// +// + +/** + @file + @internalComponent +*/ + +#ifndef SPUDFSMDEBUGLOGGER_H +#define SPUDFSMDEBUGLOGGER_H + +#include "comms-infras/commsdebugutility.h" + +#ifdef __FLOG_ACTIVE + +#include + +_LIT8(KSpudFsmLogFileVerbose,"SPUDFSMVERB.TXT"); +_LIT8(KSpudFsmLogFile,"SPUDFSM.TXT"); +_LIT8(KSpudFsmLogFolder,"SPUD"); + +// Static Output Logging Macros +#define SPUDFSMVERBOSE_LOG(text) __FLOG_STATIC0(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text) +#define SPUDFSMVERBOSE_LOG1(text,a) __FLOG_STATIC1(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text, a) +#define SPUDFSMVERBOSE_LOG2(text,a, b) __FLOG_STATIC2(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text,a,b) +#define SPUDFSMVERBOSE_LOG3(text,a, b, c) __FLOG_STATIC3(KSpudFsmLogFolder,KSpudFsmLogFileVerbose,text,a,b,c) +#define SPUDFSM_LOG(text) __FLOG_STATIC0(KSpudFsmLogFolder,KSpudFsmLogFile,text) +#define SPUDFSM_LOG1(text,a) __FLOG_STATIC1(KSpudFsmLogFolder,KSpudFsmLogFile,text, a) +#define SPUDFSM_LOG2(text,a, b) __FLOG_STATIC2(KSpudFsmLogFolder,KSpudFsmLogFile,text,a,b) +#define SPUDFSM_LOG3(text,a, b, c) __FLOG_STATIC3(KSpudFsmLogFolder,KSpudFsmLogFile,text,a,b,c) + + +_LIT(KSpudFsmMsgIn, ">>%S"); +_LIT(KSpudFsmMsgOut,"<<%S"); + +class TSpudFsmLogVerboseFn +{ + protected: + TBuf<100> iName; + + public: + TSpudFsmLogVerboseFn(const TDesC& aName) { iName = aName; SPUDFSMVERBOSE_LOG1(KSpudFsmMsgIn, &iName);}; + ~TSpudFsmLogVerboseFn() { SPUDFSMVERBOSE_LOG1(KSpudFsmMsgOut, &iName);}; +}; + +#define SPUDFSMVERBOSE_FNLOG(name) TSpudFsmLogVerboseFn spudFsmVerboseFnLog(_L(name)) + +// error logging +#if defined(_ERROR_LOG) +#define SPUDFSM_ERROR_LOG(errtext, err) { __FLOG_STATIC0(KSpudFsmLogFolder,KSpudFsmLogFile, _L("ERROR: ")); \ + __FLOG_STATIC1(KSpudFsmLogFolder,KSpudFsmLogFile, errtext, err); } +#else // defined(_ERROR_LOG) +#define SPUDFSM_ERROR_LOG(errtext, err) +#endif // defined(_ERROR_LOG) + +#else // __FLOG_ACTIVE + +#define SPUDFSM_LOG(t) +#define SPUDFSM_LOG1(t,a) +#define SPUDFSM_LOG2(t,a,b) +#define SPUDFSM_LOG3(t,a,b,c) +#define SPUDFSMVERBOSE_LOG(t) +#define SPUDFSMVERBOSE_LOG1(t,a) +#define SPUDFSMVERBOSE_LOG2(t,a,b) +#define SPUDFSMVERBOSE_LOG3(t,a,b,c) +#define SPUDFSMVERBOSE_FNLOG(name) +#define SPUDFSM_ERROR_LOG(errtext, err) + +#endif // __FLOG_ACTIVE + + +#endif +// SPUDFSMDEBUGLOGGER_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,269 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Base class to the various states required in Spud FSM. Each real state is derived from +// this base class. The bass class is never instanciated but it's base functionality is +// used for default handling in the most part. +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "cpdpfsmfactory.h" +#include "tpdpstate.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "reteldriverinput.h" +#include "PDPFSM.h" + +// Literals for TPdpState::LogOperation + +_LIT(KPdpFsm_EPhoneOpened, "PdpFsm::EPhoneOpened"); +_LIT(KPdpFsm_EPhoneOpenedFailed, "PdpFsm::EPhoneOpenedFailed"); +_LIT(KPdpFsm_EQoSSet, "PdpFsm::EQoSSet"); +_LIT(KPdpFsm_EQoSSetFailed, "PdpFsm::EQoSSetFailed"); +_LIT(KPdpFsm_ETftSet, "PdpFsm::ETftSet"); +_LIT(KPdpFsm_ETftSetFailed, "PdpFsm::ETftSetFailed"); +_LIT(KPdpFsm_ETftChanged, "PdpFsm::ETftChanged"); +_LIT(KPdpFsm_ETftChangedFailed, "PdpFsm::ETftChangedFailed"); +_LIT(KPdpFsm_E1ryPdpContextCreated, "PdpFsm::E1ryPdpContextCreated"); +_LIT(KPdpFsm_E1ryPdpContextCreatedFailed, "PdpFsm::E1ryPdpContextCreatedFailed"); +_LIT(KPdpFsm_E2ryPdpContextCreated, "PdpFsm::E2ryPdpContextCreated"); +_LIT(KPdpFsm_E2ryPdpContextCreatedFailed, "PdpFsm::E2ryPdpContextCreatedFailed"); +_LIT(KPdpFsm_EPdpActivated, "PdpFsm::EPdpActivated"); +_LIT(KPdpFsm_EPdpActivatedFailed, "PdpFsm::EPdpActivatedFailed"); +_LIT(KPdpFsm_EContextDeleted, "PdpFsm::EContextDeleted"); +_LIT(KPdpFsm_EContextDeletedFailed, "PdpFsm::EContextDeletedFailed"); +_LIT(KPdpFsm_EQoSProfileChangeNetwork, "PdpFsm::EQoSProfileChangeNetwork"); +_LIT(KPdpFsm_EConfigGPRSChangeNetwork, "PdpFsm::EConfigGPRSChangeNetwork"); +_LIT(KPdpFsm_EPacketStatusChangeNetwork, "PdpFsm::EPacketStatusChangeNetwork"); +_LIT(KPdpFsm_EPdpContextModified, "PdpFsm::EPdpContextModified"); +_LIT(KPdpFsm_EPdpContextModifiedFailed, "PdpFsm::EPdpContextModifiedFailed"); +_LIT(KRPacketContext_EStatusUnknown, "RPacketContext::EStatusUnknown"); +_LIT(KRPacketContext_EStatusInactive, "RPacketContext::EStatusInactive"); +_LIT(KRPacketContext_EStatusActivating, "RPacketContext::EStatusActivating"); +_LIT(KRPacketContext_EStatusActive, "RPacketContext::EStatusActive"); +_LIT(KRPacketContext_EStatusDeactivating, "RPacketContext::EStatusDeactivating"); +_LIT(KRPacketContext_EStatusSuspended, "RPacketContext::EStatusSuspended"); +_LIT(KRPacketContext_EStatusDeleted, "RPacketContext::EStatusDeleted"); +_LIT(KEContextStatusChangeNetwork_Unknown, "EContextStatusChangeNetwork_Unknown"); +_LIT(KRPacketService_EStatusUnattached, "RPacketService::EStatusUnattached"); +_LIT(KRPacketService_EStatusAttached, "RPacketService::EStatusAttached"); +_LIT(KRPacketService_EStatusActive, "RPacketService::EStatusActive"); +_LIT(KRPacketService_EStatusSuspended, "RPacketService::EStatusSuspended"); +_LIT(KEServiceStatusChangeNetwork_Unknown, "EServiceStatusChangeNetwork_Unknown"); +_LIT(KSpudMan_EContextCreate, "SpudMan::EContextCreate"); +_LIT(KSpudMan_EContextDelete, "SpudMan::EContextDelete"); +_LIT(KSpudMan_EContextActivate, "SpudMan::EContextActivate"); +_LIT(KSpudMan_ERegisterEventHandler, "SpudMan::ERegisterEventHandler"); +_LIT(KSpudMan_EContextSetEvents, "SpudMan::EContextSetEvents"); +_LIT(KSpudMan_EContextQoSSet, "SpudMan::EContextQoSSet"); +_LIT(KSpudMan_EContextModifyActive, "SpudMan::EContextModifyActive"); +_LIT(KSpudMan_EContextTFTModify, "SpudMan::EContextTFTModify"); +_LIT(KSpudMan_ENifSetDefaultQoS, "SpudMan::ENifSetDefaultQoS"); +_LIT(KSpudMan_EStartupPrimaryContextCreation, "SpudMan::EStartupPrimaryContextCreation"); +_LIT(KSpudMan_ESetDefaultQoS, "SpudMan::ESetDefaultQoS"); +_LIT(KSpudMan_ECreatePrimaryPDPContext, "SpudMan::ECreatePrimaryPDPContext"); +_LIT(KSpudMan_ECreateSecondaryPDPContext, "SpudMan::ECreateSecondaryPDPContext"); +_LIT(KSpudMan_ESuspend, "SpudMan::ESuspend"); +_LIT(KSpudMan_EResume, "SpudMan::EResume"); +_LIT(KSpudMan_E1ryPdpActivate, "SpudMan::E1ryPdpActivate"); +_LIT(KSpudMan_ECancelContextCreate, "SpudMan::ECancelContextCreate"); +_LIT(KSpudMan_EGetNegQoS, "SpudMan::EGetNegQoS"); +_LIT(KUnknown, "Unknown"); + + +TPdpState::TPdpState() +#ifdef _DEBUG + : iName() +#endif +{ + SPUDFSMVERBOSE_FNLOG("TPdpState::TPdpState()"); +} + +TInt TPdpState::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt /*aErrorCode*/) +{ + SPUDFSMVERBOSE_FNLOG("TPdpState::Input()"); + SPUDFSMVERBOSE_LOG1(_L("aOperation : %d"), aOperation); + + if (aOperation == PdpFsm::EContextDeleted || aOperation == SpudMan::EContextDelete || + (aOperation == PdpFsm::EContextStatusChangeNetwork && aFsm.iContextStatus == RPacketContext::EStatusDeleted)) + { + aFsm.ChangeStateToClosing(); + EtelDriverCancel (aFsm); + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + } + + SPUDFSMVERBOSE_LOG1(_L("!!! Unhandled Operation (%S)!!!"), LogOperation (aFsm, aOperation)); + return KErrGeneral; +} + +void TPdpState::EtelDriverInput (CPdpFsm& aFsm, EtelDriver::TEtelInput aOperation) +{ + SPUDFSMVERBOSE_LOG1(_L("EtelDriverInput : %d"), aOperation); + aFsm.EtelInput (aOperation); +} + +void TPdpState::EtelDriverCancel (CPdpFsm& aFsm) +{ + SPUDFSMVERBOSE_LOG(_L("EtelDriverCancel")); + aFsm.EtelCancel(); +} + +void TPdpState::SpudManNotify (CPdpFsm& aFsm, TInt aNotification, TInt aParam) +{ + SPUDFSMVERBOSE_LOG1(_L("SpudManNotify : %d"), aNotification); + aFsm.SpudInput (aNotification, aParam); +} + +const TDesC * TPdpState::LogOperation (CPdpFsm& aFsm, TInt aOperation) +{ + switch (aOperation) + { + // ETel notifications + case PdpFsm::EPhoneOpened: + return &KPdpFsm_EPhoneOpened; + case PdpFsm::EPhoneOpenedFailed: + return &KPdpFsm_EPhoneOpenedFailed; + case PdpFsm::EQoSSet: + return &KPdpFsm_EQoSSet; + case SpudMan::EGetNegQoS: + return &KSpudMan_EGetNegQoS; + case PdpFsm::EQoSSetFailed: + return &KPdpFsm_EQoSSetFailed; + case PdpFsm::ETftSet: + return &KPdpFsm_ETftSet; + case PdpFsm::ETftSetFailed: + return &KPdpFsm_ETftSetFailed; + case PdpFsm::ETftChanged: + return &KPdpFsm_ETftChanged; + case PdpFsm::ETftChangedFailed: + return &KPdpFsm_ETftChangedFailed; + case PdpFsm::E1ryPdpContextCreated: + return &KPdpFsm_E1ryPdpContextCreated; + case PdpFsm::E1ryPdpContextCreatedFailed: + return &KPdpFsm_E1ryPdpContextCreatedFailed; + case PdpFsm::E2ryPdpContextCreated: + return &KPdpFsm_E2ryPdpContextCreated; + case PdpFsm::E2ryPdpContextCreatedFailed: + return &KPdpFsm_E2ryPdpContextCreatedFailed; + case PdpFsm::EPdpActivated: + return &KPdpFsm_EPdpActivated; + case PdpFsm::EPdpActivatedFailed: + return &KPdpFsm_EPdpActivatedFailed; + case PdpFsm::EContextDeleted: + return &KPdpFsm_EContextDeleted; + case PdpFsm::EContextDeletedFailed: + return &KPdpFsm_EContextDeletedFailed; + case PdpFsm::EPdpContextModified: + return &KPdpFsm_EPdpContextModified; + case PdpFsm::EPdpContextModifiedFailed: + return &KPdpFsm_EPdpContextModifiedFailed; + +// +// // network signals + case PdpFsm::EQoSProfileChangeNetwork: + //RPacketQoS::TQoSR99_R4Negotiated + return &KPdpFsm_EQoSProfileChangeNetwork; + case PdpFsm::EConfigGPRSChangeNetwork: + //RPacketContext::TContextConfigGPRS + return &KPdpFsm_EConfigGPRSChangeNetwork; + case PdpFsm::EContextStatusChangeNetwork: + switch (aFsm.iContextStatus) + { + case RPacketContext::EStatusUnknown: + return &KRPacketContext_EStatusUnknown; + case RPacketContext::EStatusInactive: + return &KRPacketContext_EStatusInactive; + case RPacketContext::EStatusActivating: + return &KRPacketContext_EStatusActivating; + case RPacketContext::EStatusActive: + return &KRPacketContext_EStatusActive; + case RPacketContext::EStatusDeactivating: + return &KRPacketContext_EStatusDeactivating; + case RPacketContext::EStatusSuspended: + return &KRPacketContext_EStatusSuspended; + case RPacketContext::EStatusDeleted: + return &KRPacketContext_EStatusDeleted; + } + return &KEContextStatusChangeNetwork_Unknown; + case PdpFsm::EServiceStatusChangeNetwork: + { + RPacketService::TStatus ns; + + aFsm.iPdpFsmFactory->iPdpFsmInterface->Get(ns); + + switch (ns) + { + case RPacketService::EStatusUnattached: + return &KRPacketService_EStatusUnattached; + case RPacketService::EStatusAttached: + return &KRPacketService_EStatusAttached; + case RPacketService::EStatusActive: + return &KRPacketService_EStatusActive; + case RPacketService::EStatusSuspended: + return &KRPacketService_EStatusSuspended; + } + } + return &KEServiceStatusChangeNetwork_Unknown; + case PdpFsm::EPacketStatusChangeNetwork: // not used in eteldriver + return &KPdpFsm_EPacketStatusChangeNetwork; + + // spudman signals + case SpudMan::EContextCreate: + return &KSpudMan_EContextCreate; + case SpudMan::EContextDelete: + return &KSpudMan_EContextDelete; + case SpudMan::EContextActivate: + return &KSpudMan_EContextActivate; + case SpudMan::ERegisterEventHandler: + return &KSpudMan_ERegisterEventHandler; + case SpudMan::EContextSetEvents: + return &KSpudMan_EContextSetEvents; + case SpudMan::EContextQoSSet: + return &KSpudMan_EContextQoSSet; + case SpudMan::EContextModifyActive: + return &KSpudMan_EContextModifyActive; + case SpudMan::EContextTFTModify: + return &KSpudMan_EContextTFTModify; + case SpudMan::ENifSetDefaultQoS: + return &KSpudMan_ENifSetDefaultQoS; + case SpudMan::EStartupPrimaryContextCreation: + return &KSpudMan_EStartupPrimaryContextCreation; + + case SpudMan::ESetDefaultQoS: + return &KSpudMan_ESetDefaultQoS; + case SpudMan::ECreatePrimaryPDPContext: + return &KSpudMan_ECreatePrimaryPDPContext; + case SpudMan::ECreateSecondaryPDPContext: + return &KSpudMan_ECreateSecondaryPDPContext; + case SpudMan::ESuspend: + return &KSpudMan_ESuspend; + case SpudMan::EResume: + return &KSpudMan_EResume; + case SpudMan::E1ryPdpActivate: + return &KSpudMan_E1ryPdpActivate; + case SpudMan::ECancelContextCreate: + return &KSpudMan_ECancelContextCreate; + + default: + return &KUnknown; + } + + +} diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,68 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Base class to the various states required in Spud FSM. Each real state is derived from +// this base class. The bass class is never instanciated but it's base functionality is +// used for default handling in the most part. +// +// + +/** + @file + @internalComponent +*/ + +#ifndef TPDPSTATE_H +#define TPDPSTATE_H + +#include +#include "eteldrivernmspace.h" +#include "reteldriverinput.h" +#include "pdpfsmnmspace.h" + + +class CPdpFsm; +//class REtelDriverInput; +class CPdpFsmFactory; + +// parent class +class TPdpState +{ +public: + TPdpState(); + + // used as a default error handler + virtual TInt Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aParam); + + const TDesC * LogOperation (CPdpFsm& aFsm, TInt aOperation); + +protected: + // access helpers for use in the derived class + void EtelDriverInput (CPdpFsm& aFsm, EtelDriver::TEtelInput aOperation); + void EtelDriverCancel (CPdpFsm& aFsm); + void SpudManNotify (CPdpFsm& aFsm, TInt aNotification, TInt aParam); + +public: +#ifdef _DEBUG + TBuf<100> iName; +#endif + +protected: + CPdpFsmFactory * iPdpFsmFactory; + +private: + +}; + + +#endif // TPDPSTATE_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingprimary.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingprimary.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,63 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Activating primary state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" +#include "PDPFSM.h" + +TInt TPdpStateActivatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingPrimary::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EPdpActivated: + // GuQoS assumes the primary context becomes active when created, so the context status + // must be updated before sending the event + aFsm.Set(RPacketContext::EStatusActive); + aFsm.ChangeStateToOpen(); + SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone); + return KErrNone; + case PdpFsm::EPdpActivatedFailed: + SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***")); + aFsm.ChangeStateToClosing(); + + SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + case SpudMan::ECancelContextCreate: + aFsm.ChangeStateToStopping(); + EtelDriverCancel(aFsm); + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + // no default + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingsecondary.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingsecondary.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,56 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Activating secondary context state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" + +TInt TPdpStateActivatingSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingSecondary::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EPdpActivated: + // When a secondary context is activated, the context status must be updated before sending the activated event + // Normally this change in status is updated by a notify context status change event + aFsm.Set(RPacketContext::EStatusActive); + aFsm.ChangeStateToGettingNegQoS(); // Context was activated, but we don't necessarily have negotiated QoS yet; + // a TSY might wait for a successfull activation to report it to Etel. + SpudManNotify (aFsm, KContextActivateEvent, KErrNone); + return KErrNone; + case PdpFsm::EPdpActivatedFailed: + SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***")); + aFsm.ChangeStateToCreatedSecondary(); + SpudManNotify (aFsm, KContextActivateEvent, aErrorCode); + return KErrNone; + // no default + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingqos.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingqos.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,52 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// ChangingQoS state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" + +TInt TPdpStateChangingQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateChangingQoS::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EQoSSet: + aFsm.ChangeStateToOpen(); + SpudManNotify (aFsm, KContextQoSSetEvent, KErrNone); + return KErrNone; + case PdpFsm::EQoSSetFailed: + aFsm.ChangeStateToOpen(); + SpudManNotify (aFsm, KContextQoSSetEvent, aErrorCode); + return KErrNone; + + // no default + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingtft.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingtft.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,51 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Changing TFT state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" + +TInt TPdpStateChangingTFT::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateChangingTFT::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::ETftChanged: + aFsm.ChangeStateToOpen(); + SpudManNotify (aFsm, KContextTFTModifiedEvent, KErrNone); + return KErrNone; + case PdpFsm::ETftChangedFailed: + aFsm.ChangeStateToOpen(); + SpudManNotify (aFsm, KContextTFTModifiedEvent, aErrorCode); + return KErrNone; + + // no default + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateclosing.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateclosing.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,59 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Closing state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "PDPFSM.h" +#include "cpdpfsm.h" + +TInt TPdpStateClosing::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateClosing::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EContextDeleted: + aFsm.ChangeStateToInitialised(); + SpudManNotify (aFsm, KContextDeleteEvent, KErrNone); + return KErrNone; + case PdpFsm::EContextDeletedFailed: + // There isn't any corrective action that can be taken here. + // It is assumed when this context is used again, there will be a failure + // or a failure elsewhere down the line that will correct the situation, ultimately + // involving the user. FSM and ETelDriver are not in a position to take any corrective action. + SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****")); + aFsm.ChangeStateToInitialised(); + SpudManNotify (aFsm, KContextDeleteEvent, aErrorCode); + return KErrNone; + case SpudMan::EContextDelete: + // already doing this and don't want default action + return KErrInUse; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatedSecondary.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatedSecondary.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,56 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// State after secondary has been created, but not activated +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "pdpfsmnmspace.h" +#include "PDPFSM.h" +#include "cpdpfsm.h" + +TInt TPdpStateCreatedSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateCreatedSecondary::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case SpudMan::EContextActivate: + aFsm.ChangeStateToActivatingSecondary(); + EtelDriverInput(aFsm, EtelDriver::EActivatePdp); + return KErrNone; + case SpudMan::EContextQoSSet: + aFsm.ChangeStateToSettingQoS(); + EtelDriverInput(aFsm, EtelDriver::ESetQoS); + return KErrNone; + case SpudMan::EContextTFTModify: + aFsm.ChangeStateToSettingTFT(); + EtelDriverInput(aFsm, EtelDriver::ESetTft); + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingSecondary.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingSecondary.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,59 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Creating secondary context state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "PDPFSM.h" +#include "cpdpfsm.h" + +TInt TPdpStateCreatingSecondary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingSecondary::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::E2ryPdpContextCreated: + aFsm.ChangeStateToCreatedSecondary(); + SpudManNotify(aFsm, KSecondaryContextCreated, KErrNone); + return KErrNone; + case PdpFsm::E2ryPdpContextCreatedFailed: + iErrorCode = aErrorCode; + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + + case PdpFsm::EContextDeletedFailed: + SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****")); + // fall through + case PdpFsm::EContextDeleted: + aFsm.ChangeStateToInitialised(); + SpudManNotify(aFsm, KSecondaryContextCreated, iErrorCode); + iErrorCode = KErrNone; + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingprimary.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingprimary.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,57 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Creating primary context state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" +#include "PDPFSM.h" + +TInt TPdpStateCreatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingPrimary::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::E1ryPdpContextCreated: + aFsm.ChangeStateToActivatingPrimary(); + EtelDriverInput(aFsm, EtelDriver::EActivatePdp); + return KErrNone; + case PdpFsm::E1ryPdpContextCreatedFailed: + aFsm.ChangeStateToInitialised(); + SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); // or is it KContextActivateEvent? + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + case SpudMan::ECancelContextCreate: + aFsm.ChangeStateToStopping(); + EtelDriverCancel(aFsm); + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstategettingnegqos.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstategettingnegqos.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,63 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Retrieving Negotiated QoS state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "MPdpFsmInterface.h" +#include "cpdpfsm.h" + +TInt TPdpStateGettingNegQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) + { + SPUDFSMVERBOSE_FNLOG("TPdpStateGettingNegQoS::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case SpudMan::EGetNegQoS: + EtelDriverInput(aFsm, EtelDriver::ENegQoSGet); + return KErrNone; + + case PdpFsm::EPdpNegQoSRetrieved: + SPUDFSMVERBOSE_LOG(_L("*** SUCCESS ***")); + aFsm.ChangeStateToOpen(); + SpudManNotify(aFsm, KGetNegQoSEvent, KErrNone); + return KErrNone; + + case PdpFsm::EPdpNegQoSRetrievedFailed: + SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***")); + // As far as everybody is concerned, the context was activated: + // This makes it eligible for certain events. + // We have to move to Open state, so that that we can handle any operations + // on the activated PDP context correctly. + aFsm.ChangeStateToOpen(); + SpudManNotify(aFsm, KGetNegQoSEvent, aErrorCode); + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); + } + + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateinitialised.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateinitialised.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,80 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Initialised state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" +#include "cpdpfsmfactory.h" +#include "eteldrivernmspace.h" + +TInt TPdpStateInitialised::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateInitialised::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case SpudMan::ECreatePrimaryPDPContext: + aFsm.iContextType = CPdpFsm::EPrimary; + + // have to ensure EOpenPhone is called the first time a primary context is created + if (iPdpFsmFactory->iEtelOpened == EFalse) + { + aFsm.ChangeStateToOpeningPhone(); + EtelDriverInput(aFsm, EtelDriver::EOpenPhone); + } + else // just create the primary + { + aFsm.ChangeStateToCreatingPrimary(); + EtelDriverInput (aFsm, EtelDriver::ECreate1ryPdpContext); + } + + return KErrNone; + case SpudMan::ECreateSecondaryPDPContext: + aFsm.ChangeStateToCreatingSecondary(); + + aFsm.iContextType = CPdpFsm::ESecondary; + + EtelDriverInput (aFsm, EtelDriver::ECreate2ryPdpContext); + + return KErrNone; + + // these stop the default actions which aren't of value in the Initialised state, although we + // do not expect to see these here. + case PdpFsm::EContextDeleted: + return KErrNone; + case PdpFsm::EContextStatusChangeNetwork: + if (aFsm.iContextStatus == RPacketContext::EStatusDeleted) + { + return KErrNone; + } + break; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); + +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatemodifingactive.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatemodifingactive.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,51 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// tpdpstatemodifyingactive.cpp +// Modifying active context state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" + +TInt TPdpStateModifyingActive::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateModifyingActive::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EPdpContextModified: + aFsm.ChangeStateToOpen(); + SpudManNotify(aFsm, KContextModifyActiveEvent, KErrNone); + return KErrNone; + case PdpFsm::EPdpContextModifiedFailed: + aFsm.ChangeStateToOpen(); + SpudManNotify(aFsm, KContextModifyActiveEvent, aErrorCode); + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopen.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopen.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,89 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Open state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "PDPFSM.h" +#include "cpdpfsm.h" + +TInt TPdpStateOpen::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateOpen::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EQoSProfileChangeNetwork: +// //RPacketQoS::TQoSR99_R4Negotiated + SpudManNotify (aFsm, KContextParametersChangeEvent, KErrNone); + return KErrNone; + case PdpFsm::EConfigGPRSChangeNetwork: +// //RPacketContext::TContextConfigGPRS + SpudManNotify (aFsm, KContextParametersChangeEvent, KErrNone); + return KErrNone; + case PdpFsm::EContextStatusChangeNetwork: + if (aFsm.iContextStatus == RPacketContext::EStatusSuspended) + { + aFsm.ChangeStateToSuspended(); + SpudManNotify(aFsm, KContextBlockedEvent, KErrNone); + } + else if (aFsm.iContextStatus == RPacketContext::EStatusDeleted) + { + aFsm.ChangeStateToClosing(); + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + } + else + { + // no change in state - the upper layer must change the state if it needs to + SpudManNotify (aFsm, KContextParametersChangeEvent, aErrorCode); + } + return KErrNone; + case SpudMan::EContextDelete: + aFsm.ChangeStateToClosing(); + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + case SpudMan::EContextQoSSet: + aFsm.ChangeStateToChangingQoS(); + EtelDriverInput(aFsm, EtelDriver::ESetQoS); + return KErrNone; + case SpudMan::EContextModifyActive: + aFsm.ChangeStateToModifingActive(); + EtelDriverInput(aFsm, EtelDriver::EModifyActive); + return KErrNone; + case SpudMan::EContextTFTModify: + aFsm.ChangeStateToChangingTFT(); + EtelDriverInput(aFsm, EtelDriver::EChangeTft); + return KErrNone; + case SpudMan::ESuspend: // think this is superfluous - DAN will see at review :) + aFsm.ChangeStateToSuspended(); + SpudManNotify(aFsm, KContextBlockedEvent, KErrNone); + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopeningphone.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopeningphone.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,60 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Opening phone state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsmfactory.h" +#include "cpdpfsm.h" +#include "PDPFSM.h" + +TInt TPdpStateOpeningPhone::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateOpeningPhone::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + // ETel notifications + case PdpFsm::EPhoneOpened: + aFsm.ChangeStateToCreatingPrimary(); + iPdpFsmFactory->iEtelOpened = ETrue; + EtelDriverInput(aFsm, EtelDriver::ECreate1ryPdpContext); + return KErrNone; + case PdpFsm::EPhoneOpenedFailed: + aFsm.ChangeStateToInitialised(); + iPdpFsmFactory->iEtelOpened = EFalse; + SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); + return KErrNone; + case SpudMan::ECancelContextCreate: + aFsm.ChangeStateToStopping(); + EtelDriverCancel(aFsm); + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstates.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstates.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,79 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP FSM states header +// +// + +/** + @file + @internalComponent +*/ + +#ifndef TPDPSTATES_H +#define TPDPSTATES_H + +#include "tpdpstate.h" +#include "spudfsmdebuglogger.h" + +class CPdpFsm; + +#if _DEBUG +#define DEFINE_TPDPSTATE_CLASS(state) _LIT(KName##state, #state); \ +NONSHARABLE_CLASS(TPdpState##state) : public TPdpState \ +{ \ +public: \ + TPdpState##state (CPdpFsmFactory * aPdpFsmFactory) \ + { \ + SPUDFSMVERBOSE_FNLOG("TPdpState" L ## #state L"::TPdpState" L ## #state L"()"); \ + iName = KName##state; \ + iPdpFsmFactory = aPdpFsmFactory; \ + } \ + TInt Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aParam); \ +private: \ + TInt iErrorCode; \ +}; +#else +#define DEFINE_TPDPSTATE_CLASS(state) NONSHARABLE_CLASS(TPdpState##state) : public TPdpState \ +{ \ +public: \ + TPdpState##state (CPdpFsmFactory * aPdpFsmFactory) \ + { \ + SPUDFSMVERBOSE_FNLOG("TPdpState" L ## #state L"::TPdpState" L ## #state L"()"); \ + iPdpFsmFactory = aPdpFsmFactory; \ + } \ + TInt Input (CPdpFsm& aFsm, TInt aOperation, TInt aErrorCode); \ +private: \ + TInt iErrorCode; \ +}; +#endif + +DEFINE_TPDPSTATE_CLASS(Initialised) +DEFINE_TPDPSTATE_CLASS(OpeningPhone) +DEFINE_TPDPSTATE_CLASS(CreatingPrimary) +DEFINE_TPDPSTATE_CLASS(ActivatingPrimary) +DEFINE_TPDPSTATE_CLASS(CreatingSecondary) +DEFINE_TPDPSTATE_CLASS(CreatedSecondary) +DEFINE_TPDPSTATE_CLASS(SettingQoS) +DEFINE_TPDPSTATE_CLASS(SettingTFT) +DEFINE_TPDPSTATE_CLASS(ActivatingSecondary) +DEFINE_TPDPSTATE_CLASS(Open) +DEFINE_TPDPSTATE_CLASS(ChangingQoS) +DEFINE_TPDPSTATE_CLASS(ChangingTFT) +DEFINE_TPDPSTATE_CLASS(ModifyingActive) +DEFINE_TPDPSTATE_CLASS(Suspended) +DEFINE_TPDPSTATE_CLASS(Closing) +DEFINE_TPDPSTATE_CLASS(Stopping) +DEFINE_TPDPSTATE_CLASS(GettingNegQoS) + +#endif // TPDPSTATES_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqos.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqos.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,50 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Setting QoS state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" + +TInt TPdpStateSettingQoS::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateSettingQoS::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EQoSSet: + aFsm.ChangeStateToCreatedSecondary(); + SpudManNotify(aFsm, KContextQoSSetEvent, KErrNone); + return KErrNone; + case PdpFsm::EQoSSetFailed: + aFsm.ChangeStateToCreatedSecondary(); + SpudManNotify(aFsm, KContextQoSSetEvent, aErrorCode); + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqosprimary.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqosprimary.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,51 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Setting QoS on primary context state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" + +TInt TPdpStateSettingQoSPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateSettingQoSPrimary::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EQoSSet: + aFsm.ChangeStateToActivatingPrimary(); + EtelDriverInput(aFsm, EtelDriver::EActivatePdp); + return KErrNone; + case PdpFsm::EQoSSetFailed: + aFsm.ChangeStateToClosing(); + SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); // or is it KContextActivateEvent? + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingtft.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingtft.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,50 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Setting TFT state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" + +TInt TPdpStateSettingTFT::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateSettingTFT::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::ETftSet: + aFsm.ChangeStateToCreatedSecondary(); + SpudManNotify(aFsm, KContextTFTModifiedEvent, KErrNone); + return KErrNone; + case PdpFsm::ETftSetFailed: + aFsm.ChangeStateToCreatedSecondary(); + SpudManNotify(aFsm, KContextTFTModifiedEvent, aErrorCode); + return KErrNone; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatestopping.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatestopping.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,58 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Stopping state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "PDPFSM.h" +#include "cpdpfsm.h" + +TInt TPdpStateStopping::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateStopping::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EContextDeleted: + aFsm.ChangeStateToInitialised(); + SpudManNotify (aFsm, KPrimaryContextCreated, KErrGeneral); + return KErrNone; + case PdpFsm::EContextDeletedFailed: + // There isn't any corrective action that can be taken here. + SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****")); + SPUDFSM_LOG(_L("*** DELETE FAILURE ***")); + aFsm.ChangeStateToInitialised(); + EtelDriverCancel (aFsm); + SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone); + return KErrNone; + case SpudMan::EContextDelete: + // already doing this and don't want default action + return KErrInUse; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesuspended.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesuspended.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,56 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Suspended state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "PDPFSM.h" +#include "cpdpfsm.h" + +TInt TPdpStateSuspended::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateSuspended::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case SpudMan::EResume: + aFsm.ChangeStateToOpen(); + SpudManNotify(aFsm, KContextUnblockedEvent, KErrNone); + return KErrNone; + case PdpFsm::EContextStatusChangeNetwork: + if (aFsm.iContextStatus == RPacketContext::EStatusActive) + { + aFsm.ChangeStateToOpen(); + SpudManNotify(aFsm, KContextUnblockedEvent, KErrNone); + //SpudManNotify (aFsm, KNetworkStatusEvent, KErrNone); + return KErrNone; + } + break; + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivercontext.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivercontext.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,380 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Header for etel driver context class +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CETELDRIVERCONTEXT_H +#define CETELDRIVERCONTEXT_H + +#include +#include +#include +#include + +#include "eteldrivernmspace.h" +#include "PDPFSM.h" +#include "meteldriverstrategy.h" +#include "pdpfsmnmspace.h" + + +class CEtelDriverFactory; + +//using namespace EtelDriver; +/** + A data storage for pdp context + + @internalComponent +*/ +class CEtelDriverContext : public CActive + { +public: + CEtelDriverContext (TContextId aId, CEtelDriverFactory& aFactory); + virtual ~CEtelDriverContext(); + + TInt Input (EtelDriver::TEtelInput aOperation); + + void StartNotifications() const; + void StopNotifications() const; + + void PdpStatusChangeNotifierCancel(); + void QoSChangeNotifierCancel(); + void PdpConfigChangeNotifierCancel(); + + // CActive methods + + /** accessors, basic */ + inline TContextId Id() const; + inline TName& Name(); + inline TRequestStatus& CompletionStatus(); + MEtelDriverStrategy::TSequenceStep StrategyStep() const; + inline void SetStrategyStep (MEtelDriverStrategy::TSequenceStep aStep); + + + /** accessors, eTel objects */ + inline RPacketQoS& PacketQoS(); + inline RPacketContext& PacketContext(); + RPhone& Phone() const; + RPacketService& PacketService() const; + CPdpFsmInterface& PdpFsmInterface() const; + const TName& ExistingContextName() const; + + /** context data accessors */ + + inline TRequestedProfileBuffer& QosRequested(); + inline TNegotiatedProfileBuffer& QosNegotiated(); + + inline RPacketContext::TContextConfigGPRS& ContextConfigGPRS(); + + inline TRequestedProfileBufferPckg& QosRequestedPckg(); + inline TNegotiatedProfileBufferPckg& QosNegotiatedPckg(); + inline EtelDriver::TContextConfigGPRSPckg& ContextConfigGPRSPckg(); + inline RPacketContext::TDataChannelV2& DataChannelV2(); + inline RPacketContext::TDataChannelV2Pckg& DataChannelV2Pckg(); + inline TTFTInfo& TftInfo(); + inline RPacketContext::TPacketFilterV2& FilterV2(); + inline RPacketContext::TPacketFilterV2Pckg& FilterV2Pckg(); + inline TUint8 TftRequested() const; + inline TInt FirstFilterV2(); + inline TInt NextFilterV2(); + inline TTFTOperationCode& TftOperationCode(); + +#ifdef _DEBUG + void DumpReqProfileParameters (); + void DumpNegProfileParameters (); +#endif + +protected: + MEtelDriverStrategy& Strategy(EtelDriver::TEtelDriverStrategy aId) const; + + // CActive methods + virtual void RunL(); + virtual void DoCancel(); + +protected: + /** ID */ + TContextId iId; + /** tsy name of a context */ + TName iName; + /** request status */ + TRequestStatus iCompletionStatus; + /** active strategy step */ + MEtelDriverStrategy::TSequenceStep iStrategyStep; + /** id of active strategy */ + EtelDriver::TEtelDriverStrategy iStrategyId; + + /** packet QoS */ + RPacketQoS iPacketQoS; + /** packet context */ + RPacketContext iPacketContext; + + // factory data: + /** etel driver factory */ + CEtelDriverFactory& iFactory; + + // data from pdp fsm + // all members below contain valid data for limited time only, + // i.e. for the duration of a strategy OR a duration of a single call to etel + /** Requested QoS */ + TRequestedProfileBuffer iQosRequested; + TRequestedProfileBufferPckg iQosRequestedPckg; + + /** Negotiated QoS */ + TNegotiatedProfileBuffer iQosNegotiated; + TNegotiatedProfileBufferPckg iQosNegotiatedPckg; + + + /** context config */ + RPacketContext::TContextConfigGPRS iContextConfigGPRS; + /** packaged context config */ + EtelDriver::TContextConfigGPRSPckg iContextConfigGPRSPckg; + /** tft info */ + TTFTInfo iTftInfo; + /** data channel V2 */ + RPacketContext::TDataChannelV2 iDataChannelV2; + /** packaged data channel V2 */ + RPacketContext::TDataChannelV2Pckg iDataChannelV2Pckg; + +private: + // TFT data + /** local var for tft count */ + TUint8 iTftRequested; + /** local V2 filter */ + RPacketContext::TPacketFilterV2 iFilterV2; + /** local packaged V2 filter */ + EtelDriver::TPacketFilterV2Pckg iFilterV2Pckg; + /** TFT Operation Code */ + TTFTOperationCode iTftOperationCode; + }; + + +// inlines +/** accessor + +@return id of first V2 filter +*/ +inline TInt CEtelDriverContext::FirstFilterV2() + { + iTftInfo.SetToFirst(); + iTftRequested = 0; + return iTftInfo.NextPacketFilter(iFilterV2); + } + +/** accessor + +@return id of next V2 filter +*/ +inline TInt CEtelDriverContext::NextFilterV2() + { + TInt err = iTftInfo.NextPacketFilter(iFilterV2); + if (err == KErrNone) + { + ++iTftRequested; + } + return err; + } + +/** accessor + +@return context id +*/ +inline TContextId CEtelDriverContext::Id() const + { + return iId; + } + +/** accessor + +@return reference to name of pdp context +*/ +inline TName& CEtelDriverContext::Name() + { + return iName; + } + +/** accessor + +@return reference to request status +*/ +inline TRequestStatus& CEtelDriverContext::CompletionStatus() + { + return iCompletionStatus; + } + +/** accessor + +@return strategy sequence step +*/ +inline MEtelDriverStrategy::TSequenceStep CEtelDriverContext::StrategyStep() const + { + return iStrategyStep; + } + +/** sets strategy sequence step + +@param aStep - strategy sequence step +*/ +inline void CEtelDriverContext::SetStrategyStep(MEtelDriverStrategy::TSequenceStep aStep) + { + iStrategyStep = aStep; + } + +/** accessor + +@return reference to etel packet QoS +*/ +inline RPacketQoS& CEtelDriverContext::PacketQoS() + { + return iPacketQoS; + } + +/** accessor + +@return reference to etel packet context +*/ +inline RPacketContext& CEtelDriverContext::PacketContext() + { + return iPacketContext; + } + + +// context data accessors +/** +accessor +@return reference to QoSR5Requested +*/ + +inline TRequestedProfileBuffer& CEtelDriverContext::QosRequested() + { + return iQosRequested; + } + + +inline TNegotiatedProfileBuffer& CEtelDriverContext::QosNegotiated() + { + return iQosNegotiated; + } + + + + + + +/** accessor + +@return reference to TRequestedProfileBufferPckg +*/ +inline TRequestedProfileBufferPckg& CEtelDriverContext::QosRequestedPckg() + { + return iQosRequestedPckg; + } + +/** +accessor +@return reference to TNegotiatedProfileBufferPckg +*/ +inline TNegotiatedProfileBufferPckg& CEtelDriverContext::QosNegotiatedPckg() + { + return iQosNegotiatedPckg; + } + + +/** +accessor +@return reference to ContextConfigGPRS +*/ +inline RPacketContext::TContextConfigGPRS& CEtelDriverContext::ContextConfigGPRS() + { + return iContextConfigGPRS; + } + +/** accessor + +@return reference to ContextConfigGPRSPckg +*/ +inline EtelDriver::TContextConfigGPRSPckg& CEtelDriverContext::ContextConfigGPRSPckg() + { + return iContextConfigGPRSPckg; + } + +/** accessor + +@return reference to packet context' DataChannelV2 +*/ +inline RPacketContext::TDataChannelV2& CEtelDriverContext::DataChannelV2() + { + return iDataChannelV2; + } + +/** accessor + +@return reference to packet context' DataChannelV2Pckg +*/ +inline RPacketContext::TDataChannelV2Pckg& CEtelDriverContext::DataChannelV2Pckg() + { + return iDataChannelV2Pckg; + } + +/** accessor + +@return reference to TFT info +*/ +inline TTFTInfo& CEtelDriverContext::TftInfo() + { + return iTftInfo; + } + +/** accessor + +@return reference to packet context' PacketFilterV2 +*/ +inline RPacketContext::TPacketFilterV2& CEtelDriverContext::FilterV2() + { + return iFilterV2; + } + +/** accessor + +@return reference to packet context' PacketFilterV2Pckg +*/ +inline RPacketContext::TPacketFilterV2Pckg& CEtelDriverContext::FilterV2Pckg() + { + return iFilterV2Pckg; + } + +/** accessor + +@return requested TFT +*/ +inline TUint8 CEtelDriverContext::TftRequested() const + { + return iTftRequested; + } + +/** accessor + +@return reference to TFT operation code +*/ +inline TTFTOperationCode& CEtelDriverContext::TftOperationCode() + { + return iTftOperationCode; + } + + +#endif // CETELDRIVERCONTEXT_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldriverfactory.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldriverfactory.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,182 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// etel driver factory +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CETELDRIVERFACTORY_H +#define CETELDRIVERFACTORY_H + +#include +#include +#include + +#include "PDPFSM.h" +#include "cservicechangenotifier.h" +#include "eteldriverstrategies.h" +#include "eteldrivernmspace.h" + + +class CSpudContextElem; +class CEtelDriverContext; + +/** factory (and owner) of spud etel driver objects */ +class CEtelDriverFactory : public CBase + { +public: + static CEtelDriverFactory* NewL (CPdpFsmInterface& aPdpFsmInterface); + + virtual ~CEtelDriverFactory(); + + virtual void InitL(); + virtual void CreatePdpL (TContextId aPdpId); + virtual void FreePdp(TContextId aPdpId); + + virtual void StartPdpNotifications (TContextId aPdpId); + virtual void CancelPdpNotifications (TContextId aPdpId); + virtual void CancelAllPdpNotifications(); + + void PdpStatusChangeNotifierCancel(TContextId aPdpId); + void QoSChangeNotifierCancel(TContextId aPdpId); + void PdpConfigChangeNotifierCancel(TContextId aPdpId); + + void GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause); + + /** accessors */ + TBool HasContext(TContextId aId) const; + CEtelDriverContext& Context(TContextId aId); + inline TInt ContextCount() const; + inline RPacketService& PacketService(); + inline RPhone& Phone(); + inline MEtelDriverStrategy& Strategy(EtelDriver::TEtelDriverStrategy aId) const; + inline CPdpFsmInterface& PdpFsmInterface() const; + + + /** map etel input to strategy id */ + inline EtelDriver::TEtelDriverStrategy StrategyId(EtelDriver::TEtelInput aInput) const; + +private: + CEtelDriverFactory (CPdpFsmInterface& aPdpFsmInterface); + void ConstructL(); + +private: + // data common among all pdp contexts + /** reference to clients CPdpFsmInterface */ + CPdpFsmInterface& iPdpFsmInterface; + /** tel server */ + RTelServer iTelServer; + /** phone */ + RPhone iPhone; + /** packet service */ + RPacketService iPacketService; + /** service change notify */ + CServiceChangeNotifier iServiceChangeNotifier; + + /** global array of Etel Driver Stratergies */ + TFixedArray iStrategies; + /** map of input to strategy id */ + // Dev. note: we might have more Strategies then Inputs + TFixedArray iInputToStrategyMap; + + + /** array of pdp contexts and notifiers + Dev. note: primary and secondary contexts could be in arbitrary slots + */ + TFixedArray iContexts; + + /** open strategy */ + TOpenStrategy iOpenStrategy; + /** set QoS strategy */ + TSetQoSStrategy iSetQoSStrategy; + /** set TFT strategy */ + TSetTftStrategy iSetTftStrategy; + /** change TFT strategy */ + TChangeTftStrategy iChangeTftStrategy; + /** create primary pdp context strategy */ + TCreate1ryPdpContextStrategy iCreate1ryPdpContextStrategy; + /** create secondary pdp context strategy */ + TCreate2ryPdpContextStrategy iCreate2ryPdpContextStrategy; + /** activate pdp context strategy */ + TActivatePdpStrategy iActivatePdpStrategy; + /** retrieve negotiated qos strategy */ + TGetNegQoSStrategy iGetNegQoSStrategy; + /** modify active pdp context strategy */ + TModifyActiveStrategy iModifyActivePdpStrategy; + /** delete pdp context strategy */ + TContextDeleteStrategy iContextDeleteStrategy; + }; + + +// inlines +/** returns count of pdp contexts + +@return count of pdp contexts +*/ +inline TInt CEtelDriverFactory::ContextCount() const + { + return iContexts.Count(); + } + +/** accessor + +@return reference to etel RPacketService +*/ +inline RPacketService& CEtelDriverFactory::PacketService() + { + return iPacketService; + } + +/** accessor + +@return reference to etel RPhone +*/ +inline RPhone& CEtelDriverFactory::Phone() + { + return iPhone; + } + +/** accessor + +@return reference to etel driver strategy +*/ +inline MEtelDriverStrategy& CEtelDriverFactory::Strategy(EtelDriver::TEtelDriverStrategy aId) const + { + return *iStrategies[aId]; + } + +/** accessor + +@return reference to pdp fsm interface +*/ +inline CPdpFsmInterface& CEtelDriverFactory::PdpFsmInterface() const + { + return iPdpFsmInterface; + } + +/** map etel input to strategy id + +@param aInput - etel input id +@return id of etel driver strategy +*/ +inline EtelDriver::TEtelDriverStrategy CEtelDriverFactory::StrategyId(EtelDriver::TEtelInput aInput) const + { + return iInputToStrategyMap[aInput]; + } + +#endif // CETELDRIVERFACTORY_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivernotifier.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivernotifier.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,52 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// service change notify +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CETELDRIVERNOTIFIER_H +#define CETELDRIVERNOTIFIER_H + +#include + +class CPdpFsmInterface; + + +/** base notifier class */ +class CEtelDriverNotifier : public CActive + { +public: + CEtelDriverNotifier(CPdpFsmInterface& aPdpFsmInterface); + + /** starts notifications */ + virtual void Start() = 0; + +protected: + /** notifies SPUD FSM about network events */ + virtual void Notify(const TRequestStatus& aStatus) = 0; + + // CActive methods + virtual void RunL(); + +protected: + /** Pdp Fsm Interface for FSM notification */ + CPdpFsmInterface& iPdpFsmInterface; + }; + +#endif // CETELDRIVERNOTIFIER_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpconfigchangenotifier.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpconfigchangenotifier.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,59 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP config change notifier +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CPDPCONFIGCHAGENOTIFIER_H +#define CPDPCONFIGCHAGENOTIFIER_H + +#include +#include +#include + +#include "eteldrivernmspace.h" +#include "ceteldrivernotifier.h" + +/** notifier for packet context config */ +class CPdpConfigChangeNotifier : public CEtelDriverNotifier + { +public: + CPdpConfigChangeNotifier(TContextId aId, RPacketContext& aPacketContext, + CPdpFsmInterface& aPdpFsmInterface); + virtual ~CPdpConfigChangeNotifier(); + + virtual void Start(); + +protected: + virtual void Notify(const TRequestStatus& aStatus); + virtual void DoCancel(); + +private: + /** context id */ + TContextId iId; + /** underlying packet context */ + RPacketContext& iPacketContext; + + /** packet context config */ + RPacketContext::TContextConfigGPRS iConfigGPRS; + /** packaged packet context config */ + EtelDriver::TContextConfigGPRSPckg iConfigGPRSPckg; + }; + +#endif // CPDPCONFIGCHAGENOTIFIER_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpstatuschangenotifier.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpstatuschangenotifier.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,56 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP status change notifier +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CPDPSTATUSCHAGENOTIFIER_H +#define CPDPSTATUSCHAGENOTIFIER_H + +#include +#include + +#include +#include "ceteldrivernotifier.h" + +/** notifier for status of packet context */ +class CPdpStatusChangeNotifier : public CEtelDriverNotifier + { +public: + CPdpStatusChangeNotifier(TContextId aId, RPacketContext& aPacketContext, + CPdpFsmInterface& aPdpFsmInterface); + virtual ~CPdpStatusChangeNotifier(); + + virtual void Start(); + +protected: + virtual void Notify(const TRequestStatus& aStatus); + virtual void DoCancel(); + +private: + /** context id */ + TContextId iId; + /** underlying packet context */ + RPacketContext& iPacketContext; + + /** status of a packet context */ + RPacketContext::TContextStatus iContextStatus; + }; + +#endif // CPDPSTATUSCHAGENOTIFIER_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/cqoschangenotifier.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cqoschangenotifier.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,60 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// QoS profile change notifier +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CQOSCHAGENOTIFIER_H +#define CQOSCHAGENOTIFIER_H + +#include + +#include "ceteldrivernotifier.h" +#include "ceteldrivercontext.h" // definition of TQoSR99_R4NegotiatedPckg +#include "pdpfsmnmspace.h" + + +class RPacketQoS; + +/** QoS profile change notifier */ +class CQoSChangeNotifier : public CEtelDriverNotifier + { +public: + CQoSChangeNotifier (TContextId aId, RPacketQoS& aPacketQoS, + CPdpFsmInterface& aPdpFsmInterface); + virtual ~CQoSChangeNotifier(); + + virtual void Start(); + +protected: + virtual void Notify(const TRequestStatus& aStatus); + virtual void DoCancel(); + +private: + /** associated context id */ + TContextId iId; + /** ref to packet QoS */ + RPacketQoS& iPacketQoS; + + TNegotiatedProfileBuffer iProfileBuffer; + TNegotiatedProfileBufferPckg iProfilePckg; + }; + +#endif +// CQOSCHAGENOTIFIER_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/cservicechangenotifier.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cservicechangenotifier.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,53 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// service change notify +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CSERVICECHAGENOTIFIER_H +#define CSERVICECHAGENOTIFIER_H + +#include +#include + +#include "ceteldrivernotifier.h" + +/** notifier for status of packet service */ +class CServiceChangeNotifier : public CEtelDriverNotifier + { +public: + CServiceChangeNotifier(RPacketService& aPacketService, + CPdpFsmInterface& aPdpFsmInterface); + ~CServiceChangeNotifier(); + + virtual void Start(); + +protected: + virtual void Notify(const TRequestStatus& aStatus); + virtual void DoCancel(); + +private: + /** underlying packet service */ + RPacketService& iPacketService; + + /** status of a packet service */ + RPacketService::TStatus iServiceStatus; + }; + +#endif // CSERVICECHAGENOTIFY_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/cspudcontextelem.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cspudcontextelem.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,62 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// spud context element +// +// + +/** + @file + @internalComponent +*/ + +#ifndef CSPUDCONTEXTELEM_H +#define CSPUDCONTEXTELEM_H + +#include "ceteldrivercontext.h" +#include "cpdpstatuschangenotifier.h" +#include "cqoschangenotifier.h" +#include "cpdpconfigchangenotifier.h" + +class CEtelDriverFactory; + +/** structure to keep context object and associated notifiers */ +class CSpudContextElem : CBase + { +public: + static CSpudContextElem* NewL(TContextId aId, CEtelDriverFactory& aFactory, CPdpFsmInterface& aPdpFsmInterface); + virtual ~CSpudContextElem(); + + void Start(); + void Cancel(); + + void GetLastErrorCause(TInt& aLastErrorCause); + + void PdpStatusChangeNotifierCancel(); + void QoSChangeNotifierCancel(); + void PdpConfigChangeNotifierCancel(); + + /** etel driver context */ + CEtelDriverContext* iContext; + /** pdp status change notifier */ + CPdpStatusChangeNotifier* iPdpStatusChangeNotifier; + /** QoS profile change notifier */ + CQoSChangeNotifier* iQoSChangeNotifier; + /** pdp config change notifier */ + CPdpConfigChangeNotifier* iPdpConfigChangeNotifier; + +private: + void ConstructL(TContextId aId, CEtelDriverFactory& aFactory, CPdpFsmInterface& aPdpFsmInterface); + }; + +#endif // CSPUDCONTEXTELEM_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldrivernmspace.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldrivernmspace.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,86 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// etel driver namespace +// +// + +/** + @file + @internalComponent +*/ + +#ifndef ETELDRIVERNMSPACE_H +#define ETELDRIVERNMSPACE_H + +namespace EtelDriver +{ + +/** input operations, which are handled by etel driver input */ +enum TEtelInput + { + EOpenPhone, + + ESetQoS, + ESetTft, + EChangeTft, + ECreate1ryPdpContext, + ECreate2ryPdpContext, + + EActivatePdp, + ENegQoSGet, + EModifyActive, + EContextDelete, + + ESentinelInput + }; + +/** input operations, which are handled by etel driver input */ +enum TEtelDriverStrategy + { + EOpenPhoneStrategy = 0, + + ESetQoSStrategy, + ESetTftStrategy, + EChangeTftStrategy, + + ECreate1ryPdpContextStrategy, + ECreate2ryPdpContextStrategy, + + EActivatePdpStrategy, + EGetNegQoSStrategy, + EModifyActiveStrategy, + EContextDeleteStrategy, + + ESentinelStrategy + }; + + typedef TPckg TQoSR99_R4RequestedPckg; + typedef TPckg TQoSR99_R4NegotiatedPckg; + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + typedef TPckg TQoSR5RequestedPckg; + typedef TPckg TQoSR5NegotiatedPckg; +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + typedef TPckg TContextConfigGPRSPckg; + typedef TPckg TPacketFilterV2Pckg; + + +_LIT(KTxtSpudTel, "SPUDTEL"); + +} // namespace EtelDriver + + +#endif // ETELDRIVERNMSPACE_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldriverstrategies.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldriverstrategies.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,143 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Header for all etel driver strategies classes. +// Each class corresponds to an entry in TEtelInput +// +// + +/** + @file + @internalComponent +*/ + +#ifndef ETELDRIVERSTRATEGIES_H +#define ETELDRIVERSTRATEGIES_H + +#include "meteldriverstrategy.h" + + +/** +Strategy to prepare etel for subsequent manipulations with pdp contexts. +*/ +NONSHARABLE_CLASS(TOpenStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + + }; + +/** +Strategy to delete pdp context. +*/ +NONSHARABLE_CLASS(TContextDeleteStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + + }; + +/** +Strategy to set QoS for pdp context. +*/ +NONSHARABLE_CLASS(TSetQoSStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + }; + +/** +Strategy to set tft for pdp context. +*/ +NONSHARABLE_CLASS(TSetTftStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + }; + +/** +Strategy to change tft for pdp context. +*/ +NONSHARABLE_CLASS(TChangeTftStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + }; + +/** +Strategy to create primary pdp context. +*/ +NONSHARABLE_CLASS(TCreate1ryPdpContextStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + }; + +/** +Strategy to create secondary pdp context. +*/ +NONSHARABLE_CLASS(TCreate2ryPdpContextStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + }; + +/** +Strategy to activate pdp context, primary or secondary. +*/ +NONSHARABLE_CLASS(TActivatePdpStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + }; + +/** +Strategy to retrieve negotiated qos from TSY for secondary pdp context +*/ +NONSHARABLE_CLASS(TGetNegQoSStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + }; + + +/** +Strategy to modify an active PDP context, primary or secondary. +*/ +NONSHARABLE_CLASS(TModifyActiveStrategy) : public MEtelDriverStrategy + { +public: + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus); + virtual void NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ); + virtual void CancelAsyncRequest(CEtelDriverContext& aContext); + }; + +#endif // ETELDRIVERSTRATEGIES_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/meteldriverstrategy.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/meteldriverstrategy.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,89 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Header for etel driver strategy class +// +// + +/** + @file + @internalComponent +*/ + +#ifndef METELDRIVERSTRATEGY_H +#define METELDRIVERSTRATEGY_H + +// forward declarations +class CEtelDriverContext; + +/** base class for spud etel driver strategy */ +class MEtelDriverStrategy + { +public: + /** union of all elementary steps to be performed during execution of strategies */ + enum TSequenceStep + { + EStartStep, + EInitPhoneStep, + + EOpenNewQoSStep, + EGetConfigStep, + ESetConfigStep, + EInitialiseContextStep, + + ESetProfileParamsStep, + EGetProfileParamsStep, + + ECreateNewTFTStep, + EAddFirstTftStep, + EDeleteTftStep, + ERemoveFirstTftStep, + ERemoveTftStep, + EAddTftStep, + + EActivateStep, + EModifyActiveStep, + EDeactivateStep, + + EDeleteContextStep, + EChangeTftFinished, + EModifyActiveContext, + // add execution steps here + + EFinishStep + }; + +public: + /** Executes next asynchronous step in a strategy. + + @param aContext - pdp context + @param aStatus - request status of this step + */ + virtual void Next (CEtelDriverContext& aContext, TRequestStatus* aStatus) = 0; + + /** + Notifies SPUD FSM about execution results. + + @param aContext - pdp context + @param aCompletionStatus - completion request status + */ + virtual void NotifyFsm (CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus) = 0; + + /** Cancels last asynchronous request to eTel + + @param aContext - pdp context + */ + virtual void CancelAsyncRequest(CEtelDriverContext& aContext) = 0; + }; + +#endif // METELDRIVERSTRATEGY_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/reteldriverinput.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/reteldriverinput.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,92 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Header for etel driver input class +// +// + +/** + @file + @internalComponent +*/ + +#ifndef RETELDRIVERINPUT_H +#define RETELDRIVERINPUT_H + +#include +#include +#include // definition of TContextId + +#include "eteldrivernmspace.h" // definition of EtelDriver::TEtelInput + +class CEtelDriverFactory; +class CPdpFsmInterface; + +/** + Definition of an input interface for SPUD eTel driver + +@internalComponent +*/ +class REtelDriverInput + { +public: + REtelDriverInput(); + virtual ~REtelDriverInput(); + + virtual void OpenL (CPdpFsmInterface& aPdpFsmInterface); + virtual void Close(); + virtual void CreatePdpL (TContextId aPdpId); + virtual void DeletePdp (TContextId aPdpId); + virtual void Input(TContextId aPdpId, EtelDriver::TEtelInput aOperation); + virtual void CancelPdp (TContextId aPdpId); + virtual void StartPdpNotifications(TContextId aPdpId); + virtual void CancelPdpNotifications (TContextId aPdpId); + virtual void CancelAllPdps(); + virtual void CancelAllPdpNotifications(); + virtual void GetLastErrorCause (TContextId aPdpId, TInt& aLastErrorCause); + +protected: + +private: + // disable copy of an object + inline REtelDriverInput(REtelDriverInput&); + inline REtelDriverInput& operator= (REtelDriverInput& aInput); + +private: + /** etel driver factory */ + CEtelDriverFactory* iDriverFactory; + }; + + +// inlines +/** copy c'tor + not supported for this class +*/ +inline REtelDriverInput::REtelDriverInput(REtelDriverInput&) + { + // not supported + __ASSERT_ALWAYS(EFalse, User::Panic(EtelDriver::KTxtSpudTel, KErrNotSupported)); + } + +/** assignment operator + not supported for this class +*/ +inline REtelDriverInput& REtelDriverInput::operator= (REtelDriverInput& aInput) + { + // not supported + __ASSERT_ALWAYS(EFalse, User::Panic(EtelDriver::KTxtSpudTel,KErrNotSupported)); + return aInput; + } + +#endif +// RETELDRIVERINPUT_H diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/inc/spudteldebuglogger.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/spudteldebuglogger.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,114 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Event Logger header +// +// + +/** + @file + @internalComponent +*/ + +#ifndef SPUDTELDEBUGLOGGER_H +#define SPUDTELDEBUGLOGGER_H + + +#include "comms-infras/commsdebugutility.h" + +#ifdef __FLOG_ACTIVE + +#include +#include + + +_LIT8(KSpudTelLogFile,"SPUDTEL.TXT"); +_LIT8(KSpudTelLogFileVerbose,"SPUDTELVERB.TXT"); +_LIT8(KSpudTelLogFolder,"SPUD"); + +// pure informational logging +#if defined(_INFO_LOG) +// Static info Output Logging Macros +#define SPUDTEL_INFO_LOG(text) __FLOG_STATIC0(KSpudTelLogFolder,KSpudTelLogFile,text) +#define SPUDTEL_INFO_LOG1(text,a) __FLOG_STATIC1(KSpudTelLogFolder,KSpudTelLogFile,text, a) +#define SPUDTEL_INFO_LOG2(text,a, b) __FLOG_STATIC2(KSpudTelLogFolder,KSpudTelLogFile,text,a,b) +#define SPUDTEL_INFO_LOG3(text,a, b, c) __FLOG_STATIC3(KSpudTelLogFolder,KSpudTelLogFile,text,a,b,c) +#define SPUDTELVERBOSE_INFO_LOG(text) __FLOG_STATIC0(KSpudTelLogFolder,KSpudTelLogFileVerbose,text) +#define SPUDTELVERBOSE_INFO_LOG1(text,a) __FLOG_STATIC1(KSpudTelLogFolder,KSpudTelLogFileVerbose,text, a) +#define SPUDTELVERBOSE_INFO_LOG2(text,a, b) __FLOG_STATIC2(KSpudTelLogFolder,KSpudTelLogFileVerbose,text,a,b) +#define SPUDTELVERBOSE_INFO_LOG3(text,a, b, c) __FLOG_STATIC3(KSpudTelLogFolder,KSpudTelLogFileVerbose,text,a,b,c) + + +_LIT(KSpudTelMsgIn, ">>%S"); +_LIT(KSpudTelMsgOut,"<<%S"); + +class TSpudTelLogFn +{ +protected: + TName iName; + +public: + TSpudTelLogFn(const TDesC& aName) { iName = aName; SPUDTELVERBOSE_INFO_LOG1(KSpudTelMsgIn, &iName);}; + ~TSpudTelLogFn() { SPUDTELVERBOSE_INFO_LOG1(KSpudTelMsgOut, &iName);}; +}; + +#define SPUDTEL_FNLOG(name) TSpudTelLogFn spudTelLogFn(_L(name)) + +#else // defined(_INFO_LOG) + +#define SPUDTEL_INFO_LOG(text) +#define SPUDTEL_INFO_LOG1(text,a) +#define SPUDTEL_INFO_LOG2(text,a, b) +#define SPUDTEL_INFO_LOG3(text,a, b, c) +#define SPUDTEL_FNLOG(name) +#define SPUDTELVERBOSE_INFO_LOG(text) +#define SPUDTELVERBOSE_INFO_LOG1(text,a) +#define SPUDTELVERBOSE_INFO_LOG2(text,a, b) +#define SPUDTELVERBOSE_INFO_LOG3(text,a, b, c) + +#endif // defined(_INFO_LOG) + + +// error logging +#if defined(_ERROR_LOG) + +#define SPUDTEL_ERROR_LOG(errtext, err) __FLOG_STATIC1(KSpudTelLogFolder,KSpudTelLogFile, errtext, err) +#define SPUDTEL_ERROR_LOG0(errtext) __FLOG_STATIC0(KSpudTelLogFolder,KSpudTelLogFile, errtext) + +#else // defined(_ERROR_LOG) + +#define SPUDTEL_ERROR_LOG(errtext, err) +#define SPUDTEL_ERROR_LOG0(errtext) + +#endif // defined(_ERROR_LOG) + + +#else // __FLOG_ACTIVE + +#define SPUDTEL_INFO_LOG(t) +#define SPUDTEL_INFO_LOG1(t,a) +#define SPUDTEL_INFO_LOG2(t,a,b) +#define SPUDTEL_INFO_LOG3(t,a,b,c) +#define SPUDTEL_FNLOG(name) +#define SPUDTELVERBOSE_INFO_LOG(t) +#define SPUDTELVERBOSE_INFO_LOG1(t,a) +#define SPUDTELVERBOSE_INFO_LOG2(t,a,b) +#define SPUDTELVERBOSE_INFO_LOG3(t,a,b,c) +#define SPUDTEL_ERROR_LOG(errtext, err) +#define SPUDTEL_ERROR_LOG0(errtext) + + +#endif //__FLOG_ACTIVE +#endif +// SPUDTELDEBUGLOGGER_H + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivercontext.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivercontext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,327 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// implementation of etel driver context class +// +// + +/** + @file + @internalComponent +*/ + + +#include "ceteldrivercontext.h" +#include "ceteldriverfactory.h" +#include "spudteldebuglogger.h" + + +using namespace EtelDriver; + +CEtelDriverContext::CEtelDriverContext (TContextId aId, CEtelDriverFactory& aFactory) +: CActive(CActive::EPriorityStandard), + iId(aId), + iCompletionStatus(KErrNone), + iStrategyStep(MEtelDriverStrategy::EFinishStep), + iStrategyId(ESentinelStrategy), + iFactory(aFactory), + iQosRequestedPckg(iQosRequested), + iQosNegotiatedPckg(iQosNegotiated), + iContextConfigGPRS(), + iContextConfigGPRSPckg(iContextConfigGPRS), + iDataChannelV2(), + iDataChannelV2Pckg(iDataChannelV2), + iFilterV2(), + iFilterV2Pckg(iFilterV2) + { + SPUDTEL_FNLOG("CEtelDriverContext::CEtelDriverContext"); + CActiveScheduler::Add(this); + } + + + +CEtelDriverContext::~CEtelDriverContext() + { + SPUDTEL_FNLOG("CEtelDriverContext::~CEtelDriverContext()"); + Cancel(); // N.B. This cancels all outstanding operations on the context, including deletion! + + // Guarantees proper release of all handles. + // If everything is closed already, this does no harm. + iPacketQoS.Close(); // Close QoS first, a buggy TSY may not handle it the other way. + iPacketContext.Close(); // At this point the reference count on the context is zero. + // TSY should cleanly dispose of the context, if it had not done so already. + + // This is necessary only in a situtation where Spudman is destroyed while a strategy + // on a context is outstanding: in this case deletion of SpudTel results in cancellation + // of all outstanding operations, which is likely to result in handle leak. + // Under other circumstances, the handles will be closed via an appropriate strategy. + } + +/** initiates a new request + +@param aOperation - type of an etel driver request + +@return KErrInUse if pdp context has active strategy +*/ +TInt CEtelDriverContext::Input (TEtelInput aOperation) + { + SPUDTEL_FNLOG("CEtelDriverContext::Input()"); + SPUDTELVERBOSE_INFO_LOG1( _L("Operation %d"), aOperation ); + + if (MEtelDriverStrategy::EFinishStep != iStrategyStep) + { + SPUDTEL_ERROR_LOG(_L("ERROR: Pdp context is in use, return %d"), KErrInUse); + // I'm still doing something + ASSERT(EFalse); // shouldn't happen + return KErrInUse; + } + + iStrategyId = iFactory.StrategyId(aOperation); + iStrategyStep = MEtelDriverStrategy::EStartStep; + iCompletionStatus = KErrNone; + + SetActive(); + Strategy(iStrategyId).Next(*this, &iStatus); + + return KErrNone; + } + + +void CEtelDriverContext::RunL() + { + SPUDTEL_FNLOG("CEtelDriverContext::RunL()"); + ASSERT(iStrategyId < ESentinelStrategy); + + if(iStatus != KErrNone) + { + if(iCompletionStatus == KErrNone) + { + iCompletionStatus = iStatus; + SPUDTEL_ERROR_LOG(_L("Last async request completed with error %d"), iStatus.Int()); + } + // Don't continue with the strategy for all cases except Delete + // N.B.: deletion of a context has to be done till the very last step + // to ensure proper cleanup of resources. + if(EContextDeleteStrategy != iStrategyId) + { + iStrategyStep = MEtelDriverStrategy::EFinishStep; + } + SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed")); + } + + if(MEtelDriverStrategy::EFinishStep == iStrategyStep) + { + // we are done + SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed")); + Strategy(iStrategyId).NotifyFsm (*this, iCompletionStatus); + } + else + { + // continue with next step + SetActive(); + Strategy(iStrategyId).Next(*this, &iStatus); + } + } + +/** cancels last async request */ +void CEtelDriverContext::DoCancel() + { + SPUDTEL_FNLOG("CEtelDriverContext::DoCancel()"); + + if(IsActive()) + { + // delegate to strategy + Strategy(iStrategyId).CancelAsyncRequest(*this); + } + iStrategyStep = MEtelDriverStrategy::EFinishStep; + SPUDTELVERBOSE_INFO_LOG(_L("Strategy is cancelled")); + } + +/** accessor */ +const TName& CEtelDriverContext::ExistingContextName() const + { + SPUDTEL_FNLOG("CEtelDriverContext::ExistingContextName()"); + for (TContextId i = 0; i < static_cast(iFactory.ContextCount()); i++) + { + + if (iFactory.HasContext(i) && iFactory.Context(i).Name().Size()) + { + return iFactory.Context(i).Name(); + } + } + + // Unacceptable situation: we didn't create a single context yet + SPUDTEL_ERROR_LOG(_L("CEtelDriverContext::ExistingContextName - can't find existing context. return %S"), &iFactory.Context(0).Name()); + ASSERT(EFalse); + return iFactory.Context(0).Name(); + } + +/** accessor + +@return reference to etel RPhone +*/ +RPhone& CEtelDriverContext::Phone() const + { + return iFactory.Phone(); + } + +/** accessor + +@return reference to etel RPacketService +*/ +RPacketService& CEtelDriverContext::PacketService() const + { + return iFactory.PacketService(); + } + +/** accessor + +@return reference to etel driver strategy +*/ +MEtelDriverStrategy& CEtelDriverContext::Strategy(TEtelDriverStrategy aId) const + { + return iFactory.Strategy(aId); + } + +/** accessor + +@return reference to pdp fsm interface +*/ +CPdpFsmInterface& CEtelDriverContext::PdpFsmInterface() const + { + return iFactory.PdpFsmInterface(); + } + +/** start pdp notifications */ +void CEtelDriverContext::StartNotifications() const + { + iFactory.StartPdpNotifications(iId); + } + +/** stops pdp notifications */ +void CEtelDriverContext::StopNotifications() const + { + iFactory.CancelPdpNotifications(iId); + } + +void CEtelDriverContext::PdpStatusChangeNotifierCancel() + { + iFactory.PdpStatusChangeNotifierCancel(iId); + } + +void CEtelDriverContext::QoSChangeNotifierCancel() + { + iFactory.QoSChangeNotifierCancel(iId); + } + +void CEtelDriverContext::PdpConfigChangeNotifierCancel() + { + iFactory.PdpConfigChangeNotifierCancel(iId); + } + +#ifdef _DEBUG +void CEtelDriverContext::DumpReqProfileParameters () + { + SPUDTEL_INFO_LOG1( _L("Requested Profile Parameters Dump - Context Id = %d"), Id()); + SPUDTEL_INFO_LOG( _L("===========================================================")); + SPUDTEL_INFO_LOG1( _L("ExtensionId = %d"), iQosRequested.ExtensionId()); + + if (iQosRequested.ExtensionId() != TPacketDataConfigBase::KConfigRel99Rel4 + && iQosRequested.ExtensionId() != TPacketDataConfigBase::KConfigRel5) + { + SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId")); + return; + } + + if (iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4 + || iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5) + { + SPUDTEL_INFO_LOG1( _L("[1]iReqTrafficClass = %d"), iQosRequested.RequestedQoSR99_R4().iReqTrafficClass); + SPUDTEL_INFO_LOG1( _L("[2]iMinTrafficClass = %d"), iQosRequested.RequestedQoSR99_R4().iMinTrafficClass); + SPUDTEL_INFO_LOG1( _L("[3]iReqDeliveryOrderReqd = %d"), iQosRequested.RequestedQoSR99_R4().iReqDeliveryOrderReqd); + SPUDTEL_INFO_LOG1( _L("[4]iMinDeliveryOrderReqd = %d"), iQosRequested.RequestedQoSR99_R4().iMinDeliveryOrderReqd); + SPUDTEL_INFO_LOG1( _L("[5]iReqDeliverErroneousSDU = %d"), iQosRequested.RequestedQoSR99_R4().iReqDeliverErroneousSDU); + SPUDTEL_INFO_LOG1( _L("[6]iMinDeliverErroneousSDU = %d"), iQosRequested.RequestedQoSR99_R4().iMinDeliverErroneousSDU); + SPUDTEL_INFO_LOG1( _L("[7]iReqMaxSDUSize = %d"), iQosRequested.RequestedQoSR99_R4().iReqMaxSDUSize); + SPUDTEL_INFO_LOG1( _L("[8]iMinAcceptableMaxSDUSize = %d"), iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxSDUSize); + SPUDTEL_INFO_LOG1( _L("[9]iReqMaxRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iUplinkRate); + SPUDTEL_INFO_LOG1( _L("[10]iReqMaxRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iDownlinkRate); + SPUDTEL_INFO_LOG1( _L("[11]iMinAcceptableMaxRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iUplinkRate); + SPUDTEL_INFO_LOG1( _L("[12]iMinAcceptableMaxRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iDownlinkRate); + SPUDTEL_INFO_LOG1( _L("[13]iReqBER = %d"), iQosRequested.RequestedQoSR99_R4().iReqBER); + SPUDTEL_INFO_LOG1( _L("[14]iMaxBER = %d"), iQosRequested.RequestedQoSR99_R4().iMaxBER); + SPUDTEL_INFO_LOG1( _L("[15]iReqSDUErrorRatio = %d"), iQosRequested.RequestedQoSR99_R4().iReqSDUErrorRatio); + SPUDTEL_INFO_LOG1( _L("[16]iMaxSDUErrorRatio = %d"), iQosRequested.RequestedQoSR99_R4().iMaxSDUErrorRatio); + SPUDTEL_INFO_LOG1( _L("[17]iReqTrafficHandlingPriority = %d"), iQosRequested.RequestedQoSR99_R4().iReqTrafficHandlingPriority); + SPUDTEL_INFO_LOG1( _L("[18]iReqTrafficHandlingPriority = %d"), iQosRequested.RequestedQoSR99_R4().iMinTrafficHandlingPriority); + SPUDTEL_INFO_LOG1( _L("[19]iReqTransferDelay = %d"), iQosRequested.RequestedQoSR99_R4().iReqTransferDelay); + SPUDTEL_INFO_LOG1( _L("[20]iMaxTransferDelay = %d"), iQosRequested.RequestedQoSR99_R4().iMaxTransferDelay); + SPUDTEL_INFO_LOG1( _L("[21]iReqGuaranteedRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iUplinkRate); + SPUDTEL_INFO_LOG1( _L("[22]iReqGuaranteedRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iDownlinkRate); + SPUDTEL_INFO_LOG1( _L("[23]iMinGuaranteedRate.iUplinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinGuaranteedRate.iUplinkRate); + SPUDTEL_INFO_LOG1( _L("[24]iMinGuaranteedRate.iDownlinkRate = %d"), iQosRequested.RequestedQoSR99_R4().iMinGuaranteedRate.iDownlinkRate); + } + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + if (iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5) + { + SPUDTEL_INFO_LOG1( _L("[25]iSignallingIndication = %d"), iQosRequested.RequestedQoSR5().iSignallingIndication); + SPUDTEL_INFO_LOG1( _L("[26]iSourceStatisticsDescriptor = %d"), iQosRequested.RequestedQoSR5().iSourceStatisticsDescriptor); + } +#endif + } + + + +void CEtelDriverContext::DumpNegProfileParameters () + { + SPUDTEL_INFO_LOG1( _L("Negotiated Profile Parameters Dump - Context Id = %d"), Id()); + SPUDTEL_INFO_LOG( _L("===========================================================")); + SPUDTEL_INFO_LOG1( _L("ExtensionId = %d"), iQosNegotiated.ExtensionId()); + + if (iQosNegotiated.ExtensionId() != TPacketDataConfigBase::KConfigRel99Rel4 + && iQosNegotiated.ExtensionId() != TPacketDataConfigBase::KConfigRel5) + { + SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId")); + return; + } + + if (iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4 + || iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5) + { + SPUDTEL_INFO_LOG1( _L("[2]iTrafficClass = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iTrafficClass); + SPUDTEL_INFO_LOG1( _L("[3]iDeliveryOrderReqd = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iDeliveryOrderReqd); + SPUDTEL_INFO_LOG1( _L("[4]iDeliverErroneousSDU = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iDeliverErroneousSDU); + SPUDTEL_INFO_LOG1( _L("[5]iMaxSDUSize = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iMaxSDUSize); + SPUDTEL_INFO_LOG1( _L("[6]iBER = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iBER); + SPUDTEL_INFO_LOG1( _L("[7]iSDUErrorRatio = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iSDUErrorRatio); + SPUDTEL_INFO_LOG1( _L("[8]iTrafficHandlingPriority = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iTrafficHandlingPriority); + SPUDTEL_INFO_LOG1( _L("[9]iTransferDelay = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iTransferDelay); + SPUDTEL_INFO_LOG1( _L("[10]iGuaranteedRate.iUplinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iUplinkRate); + SPUDTEL_INFO_LOG1( _L("[11]iGuaranteedRate.iDownlinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iDownlinkRate); + SPUDTEL_INFO_LOG1( _L("[12]iMaxRate.iUplinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iMaxRate.iUplinkRate); + SPUDTEL_INFO_LOG1( _L("[13]iMaxRate.iDownlinkRate = %d"), iQosNegotiated.NegotiatedQoSR99_R4().iMaxRate.iDownlinkRate); + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + if (iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5) + { + SPUDTEL_INFO_LOG1( _L("[14]iSignallingIndication = %d"), iQosNegotiated.NegotiatedQoSR5().iSignallingIndication); + SPUDTEL_INFO_LOG1( _L("[15]iSourceStatisticsDescriptor = %d"), iQosNegotiated.NegotiatedQoSR5().iSourceStatisticsDescriptor); + } +#endif + } + +#endif +// _DEBUG diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldriverfactory.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldriverfactory.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,277 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// etel driver factory +// +// + +/** + @file + @internalComponent +*/ + +#include +#include + +#include "cspudcontextelem.h" +#include "ceteldriverfactory.h" +#include "spudteldebuglogger.h" + +using namespace EtelDriver; + +/** +@param aPdpFsmInterface - pdp fsm interface +*/ +CEtelDriverFactory::CEtelDriverFactory (CPdpFsmInterface& aPdpFsmInterface) +: iPdpFsmInterface(aPdpFsmInterface), + iServiceChangeNotifier(iPacketService, iPdpFsmInterface) + { + SPUDTELVERBOSE_INFO_LOG(_L("CEtelDriverFactory::CEtelDriverFactory()")); + } + +/** +@param aPdpFsmInterface - pdp fsm interface +*/ +CEtelDriverFactory* CEtelDriverFactory::NewL (CPdpFsmInterface& aPdpFsmInterface) + { + SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::NewL()")); + + return new (ELeave) CEtelDriverFactory (aPdpFsmInterface); + } + +CEtelDriverFactory::~CEtelDriverFactory() + { + SPUDTEL_FNLOG("CEtelDriverFactory::~CEtelDriverFactory()"); + SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::~CEtelDriverFactory()")); + + // cancel all notificators + iServiceChangeNotifier.Cancel(); + + // cleanup array of CEtelDriverContext objs + for (TInt i = 0; i < iContexts.Count(); i++ ) + { + delete iContexts[i]; + } + iContexts.Reset(); + + // common data cleanup... + // sync operations only + iPacketService.Close(); + iPhone.Close(); + + iTelServer.UnloadPhoneModule(iPdpFsmInterface.TsyName()); + + iTelServer.Close(); // Phone module unloaded automatically + + iStrategies.Reset(); + } + +/** +Function obtains the info on the phone object implemented in the TSY + +Assumes aloadedTsyName has no ".TSY" appendage +Finds the phone information for the TSY just loaded. +Assumes just one phone in that TSY - or that every phone in it is equally useful. + +@param aTelServer - tel server +@param aLoadedTsyName - name of the loaded Tsy. +@param aInfo - information about the phone. +*/ +static void GetPhoneInfoL(RTelServer& aTelServer, const TDesC& aLoadedTsyName, RTelServer::TPhoneInfo& aInfo) + { + // dev. note: leavescan reports an error in this method. + // But there is no visible ground for it. + SPUDTEL_FNLOG("GetPhoneInfoL()"); + TInt count; + User::LeaveIfError(aTelServer.EnumeratePhones(count)); + if (count<=0) + { + User::Leave(KErrNotFound); + } + + TBool found = EFalse; + for (TInt i=0; i < count; i++) + { + TBuf currentTsyName; + User::LeaveIfError(aTelServer.GetTsyName(i,currentTsyName)); + + TInt r=currentTsyName.Locate('.'); + if (r!=KErrNotFound) + { + currentTsyName.SetLength(r); + } + if (currentTsyName.CompareF(aLoadedTsyName)==KErrNone) + { + User::LeaveIfError(aTelServer.GetPhoneInfo(i,aInfo)); + found = ETrue; + break; + } + } + + if (!found) + { + User::Leave(KErrNotFound); + } + + } + +/** initializes factory objects */ +void CEtelDriverFactory::InitL() + { + SPUDTEL_FNLOG("CEtelDriverFactory::InitL()"); + SPUDTEL_INFO_LOG(_L("Initializing Etel driver")); + + iStrategies[EOpenPhoneStrategy] = &iOpenStrategy; + iStrategies[ESetQoSStrategy] = &iSetQoSStrategy; + iStrategies[ESetTftStrategy] = &iSetTftStrategy; + iStrategies[EChangeTftStrategy] = &iChangeTftStrategy; + + iStrategies[ECreate1ryPdpContextStrategy] = &iCreate1ryPdpContextStrategy; + iStrategies[ECreate2ryPdpContextStrategy] = &iCreate2ryPdpContextStrategy; + iStrategies[EActivatePdpStrategy] = &iActivatePdpStrategy; + iStrategies[EGetNegQoSStrategy] = &iGetNegQoSStrategy; + iStrategies[EModifyActiveStrategy] = &iModifyActivePdpStrategy; + iStrategies[EContextDeleteStrategy] = &iContextDeleteStrategy; + + // initialization of operator to strategy id map + iInputToStrategyMap[EOpenPhone] = EOpenPhoneStrategy; + iInputToStrategyMap[ESetQoS] = ESetQoSStrategy; + iInputToStrategyMap[ECreate1ryPdpContext] = ECreate1ryPdpContextStrategy; + iInputToStrategyMap[ECreate2ryPdpContext] = ECreate2ryPdpContextStrategy; + iInputToStrategyMap[ESetTft] = ESetTftStrategy; + iInputToStrategyMap[EChangeTft] = EChangeTftStrategy; + iInputToStrategyMap[EActivatePdp] = EActivatePdpStrategy; + iInputToStrategyMap[ENegQoSGet] = EGetNegQoSStrategy; + iInputToStrategyMap[EModifyActive] = EModifyActiveStrategy; + iInputToStrategyMap[EContextDelete] = EContextDeleteStrategy; + + + User::LeaveIfError (iTelServer.Connect()); + User::LeaveIfError(iTelServer.LoadPhoneModule(iPdpFsmInterface.TsyName())); + + User::LeaveIfError(iTelServer.SetExtendedErrorGranularity(RTelServer::EErrorExtended)); + + RTelServer::TPhoneInfo phoneInfo; + GetPhoneInfoL(iTelServer, iPdpFsmInterface.TsyName(), phoneInfo); + User::LeaveIfError (iPhone.Open (iTelServer, phoneInfo.iName) ); + User::LeaveIfError (iPacketService.Open (iPhone) ); + + // remaining async calls to phone are postponed to later async Input request + + iServiceChangeNotifier.Start(); + } + +/** creates pdp by id + dev. note: pdp context will NOT be opened during this call. + +@param aPdpId - id of a pdp context +*/ +void CEtelDriverFactory::CreatePdpL (TContextId aPdpId) + { + SPUDTEL_FNLOG("CEtelDriverFactory::CreatePdpL()"); + SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId); + __ASSERT_ALWAYS((NULL == iContexts[aPdpId]), User::Panic(KTxtSpudTel, KErrArgument)); + + iContexts[aPdpId] = CSpudContextElem::NewL(aPdpId, *this, iPdpFsmInterface); + } + + +/** frees pdp context by id + +@param aPdpId - id of a pdp context +*/ +void CEtelDriverFactory::FreePdp(TContextId aPdpId) + { + SPUDTELVERBOSE_INFO_LOG1(_L("Free pdp id : %d"), aPdpId); + // the context has to be closed before a call to FreePdp + __ASSERT_ALWAYS(!Context(aPdpId).PacketContext().SubSessionHandle(), User::Panic(KTxtSpudTel, KErrInUse)); + + delete iContexts[aPdpId]; + iContexts[aPdpId] = NULL; + } + + +/** starts etel notifications for pdp context + +@param aPdpId - id of a pdp context +*/ +void CEtelDriverFactory::StartPdpNotifications (TContextId aPdpId) + { + SPUDTELVERBOSE_INFO_LOG1(_L("StartPdpNotifications for pdp id : %d"), aPdpId); + // sanity check + ASSERT(iContexts[aPdpId]); + + iContexts[aPdpId]->Start(); + } + +/** cancels etel notifications for aPdpId context + +@param aPdpId - id of a pdp context +*/ +void CEtelDriverFactory::CancelPdpNotifications (TContextId aPdpId) + { + SPUDTELVERBOSE_INFO_LOG1(_L("CancelPdpNotifications for pdp id : %d"), aPdpId); + // sanity check + ASSERT(iContexts[aPdpId]); + + iContexts[aPdpId]->Cancel(); + } + +/** cancels notifications for all pdp contexts */ +void CEtelDriverFactory::CancelAllPdpNotifications() + { + SPUDTEL_INFO_LOG(_L("CancelAllPdpNotifications")); + for(TContextId i = 0; i < static_cast(ContextCount()); i++) + { + CancelPdpNotifications (i); + } + } + +void CEtelDriverFactory::PdpStatusChangeNotifierCancel(TContextId aPdpId) + { + iContexts[aPdpId]->PdpStatusChangeNotifierCancel(); + } + +void CEtelDriverFactory::QoSChangeNotifierCancel(TContextId aPdpId) + { + iContexts[aPdpId]->QoSChangeNotifierCancel(); + } + +void CEtelDriverFactory::PdpConfigChangeNotifierCancel(TContextId aPdpId) + { + iContexts[aPdpId]->PdpConfigChangeNotifierCancel(); + } + +TBool CEtelDriverFactory::HasContext(TContextId aId) const + { + return (iContexts[aId] != NULL); + } + + +/** context accessor + +@param aPdpId - id of a pdp context +@return etel driver context +*/ +CEtelDriverContext& CEtelDriverFactory::Context(TContextId aId) + { + // sanity check + __ASSERT_ALWAYS(iContexts[aId], User::Panic(KTxtSpudTel, KErrBadHandle)); + + return *iContexts[aId]->iContext; + } + +void CEtelDriverFactory::GetLastErrorCause(TContextId aPdpId, TInt& aLastErrorCause) + { + iContexts[aPdpId]->GetLastErrorCause(aLastErrorCause); + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivernotifier.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivernotifier.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,60 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// implementation of base spud etel driver notifier +// +// + +/** + @file + @internalComponent +*/ + +#include + +#include "ceteldrivernotifier.h" +#include "PDPFSM.h" +#include "spudteldebuglogger.h" + + +/** +@param aPdpFsmInterface - reference to pdp fsm interface +*/ +CEtelDriverNotifier::CEtelDriverNotifier(CPdpFsmInterface& aPdpFsmInterface) +: CActive(EPriorityStandard), + iPdpFsmInterface(aPdpFsmInterface) + { + CActiveScheduler::Add(this); + } + + +void CEtelDriverNotifier::RunL() + { + // notify fsm in any case + Notify(iStatus); + + if(iStatus == KErrNone) + { + // repost + Start(); + } + else // error + { + if(KErrCancel != iStatus.Int()) + { + SPUDTEL_ERROR_LOG(_L("CEtelDriverNotifier::RunL() reported an error: %d"), + iStatus.Int()); + } + } + } + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpconfigchangenotifier.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpconfigchangenotifier.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,95 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP config change notifier +// +// + +/** + @file + @internalComponent +*/ + +#include +#include + +#include "cpdpconfigchangenotifier.h" +#include "PDPFSM.h" +#include "spudteldebuglogger.h" +#include "pdpfsmnmspace.h" + + +/** +@param aId - pdp context id +@param aPacketContext - reference to etel packet context +@param aPdpFsmInterface - reference to pdp fsm interface +*/ +CPdpConfigChangeNotifier::CPdpConfigChangeNotifier(TContextId aId, + RPacketContext& aPacketContext, + CPdpFsmInterface& aPdpFsmInterface) +: CEtelDriverNotifier(aPdpFsmInterface), + iId(aId), + iPacketContext(aPacketContext), + iConfigGPRS(), + iConfigGPRSPckg(iConfigGPRS) + { + } + +CPdpConfigChangeNotifier::~CPdpConfigChangeNotifier() + { + Cancel(); + } + +/** initiate notification */ +void CPdpConfigChangeNotifier::Start() + { + if (!IsActive()) + { + iPacketContext.NotifyConfigChanged(iStatus, iConfigGPRSPckg); + SetActive(); + } + } + +/** stops notification */ +void CPdpConfigChangeNotifier::DoCancel() + { + if(IsActive()) + { + SPUDTELVERBOSE_INFO_LOG( + _L("CPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged")); + iPacketContext.CancelAsyncRequest(EPacketContextNotifyConfigChanged); + } + } + +/** notifies pdp fsm + +@param aStatus - request status +*/ +void CPdpConfigChangeNotifier::Notify(const TRequestStatus& aStatus) + { + if(aStatus == KErrNone) + { + SPUDTELVERBOSE_INFO_LOG(_L("FSM set ConfigGPRS")); + iPdpFsmInterface.Set(iId, iConfigGPRS); + SPUDTELVERBOSE_INFO_LOG(_L("FSM input EConfigGPRSChangeNetwork")); + iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork); + } + else + { + SPUDTEL_ERROR_LOG(_L("CPdpConfigChangeNotifier::Notify(), error: %d"), + aStatus.Int()); + // Not all TSYs support RPacketContext::NotifyConfigChanged so we handle + // KErrNotSupported silently (PDEF118981). + ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported)); + } + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpstatuschangenotifier.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpstatuschangenotifier.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,101 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// PDP status change notifier +// +// + +/** + @file + @internalComponent +*/ + +#include + +#include "cpdpstatuschangenotifier.h" +#include "PDPFSM.h" +#include "spudteldebuglogger.h" +#include "pdpfsmnmspace.h" + +#include + + +/** +@param aId - pdp context id +@param aPacketContext - reference to etel packet context +@param aPdpFsmInterface - reference to pdp fsm interface +*/ +CPdpStatusChangeNotifier::CPdpStatusChangeNotifier(TContextId aId, + RPacketContext& aPacketContext, + CPdpFsmInterface& aPdpFsmInterface) +: CEtelDriverNotifier(aPdpFsmInterface), + iId(aId), + iPacketContext(aPacketContext), + iContextStatus(RPacketContext::EStatusUnknown) + { + } + +CPdpStatusChangeNotifier::~CPdpStatusChangeNotifier() + { + Cancel(); + } + +/** initiates notification */ +void CPdpStatusChangeNotifier::Start() + { + if (!IsActive() && (iContextStatus != RPacketContext::EStatusDeleted)) + { + iPacketContext.NotifyStatusChange(iStatus, iContextStatus); + SetActive(); + } + } + +/** stops notification */ +void CPdpStatusChangeNotifier::DoCancel() + { + if(IsActive()) + { + SPUDTELVERBOSE_INFO_LOG( + _L("CPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange")); + iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange); + } + } + +/** notifies pdp fsm + +@param aStatus - request status +*/ +void CPdpStatusChangeNotifier::Notify(const TRequestStatus& aStatus) + { + if(aStatus == KErrNone) + { + SPUDTELVERBOSE_INFO_LOG(_L("Notified of context status change")); + RPacketContext::TContextStatus aOldContextStatus; + iPdpFsmInterface.Get(iId, aOldContextStatus); + // only notify of change if it has actually changed + if (iContextStatus != aOldContextStatus) + { + SPUDTELVERBOSE_INFO_LOG(_L("FSM input EContextStatusChangeNetwork")); + iPdpFsmInterface.Set(iId, iContextStatus); + TInt err = KErrNone; + iPacketContext.GetLastErrorCause(err); // Ignore error return code. + iPdpFsmInterface.Input(iId, PdpFsm::EContextStatusChangeNetwork, err); + } + } + else + { + SPUDTEL_ERROR_LOG(_L("CPdpStatusChangeNotifier::Notify(), error: %d"), + aStatus.Int()); + ASSERT(aStatus == KErrCancel); + } + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/cqoschangenotifier.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cqoschangenotifier.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,106 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// QoS change notifier implementation +// +// + +/** + @file + @internalComponent +*/ + +#include "cqoschangenotifier.h" +#include "spudteldebuglogger.h" +#include + + +/** c'tor + +@param aId - pdp context id +@param aPacketQoS - etel packet QoS +@param aPdpFsmInterface - pdp fsm interface +*/ +CQoSChangeNotifier::CQoSChangeNotifier(TContextId aId, + RPacketQoS& aPacketQoS, + CPdpFsmInterface& aPdpFsmInterface) +: CEtelDriverNotifier(aPdpFsmInterface), + iId(aId), + iPacketQoS(aPacketQoS), + iProfilePckg(iProfileBuffer) + + { + SPUDTEL_FNLOG("CQoSChangeNotifier::CQoSChangeNotifier()"); + } + +CQoSChangeNotifier::~CQoSChangeNotifier() + { + SPUDTEL_FNLOG("CQoSChangeNotifier::~CQoSChangeNotifier()"); + Cancel(); + } + +/** starts notification */ +void CQoSChangeNotifier::Start() + { + SPUDTEL_FNLOG("CQoSChangeNotifier::Start()"); + if (!IsActive()) + { + iPacketQoS.NotifyProfileChanged(iStatus, iProfilePckg); + SetActive(); + SPUDTEL_FNLOG("CQoSChangeNotifier::Start(), iPacketQoS.NotifyProfileChanged()"); + } + } + +/** stops notification */ +void CQoSChangeNotifier::DoCancel() + { + if (IsActive()) + { + SPUDTELVERBOSE_INFO_LOG( + _L("CQoSChangeNotifier::DoCancel EPacketQoSNotifyProfileChanged")); + iPacketQoS.CancelAsyncRequest(EPacketQoSNotifyProfileChanged); + } + } + +/** notifies pdp fsm + +@param aStatus - request status +*/ +void CQoSChangeNotifier::Notify(const TRequestStatus& aStatus) + { + if(aStatus == KErrNone) + { + SPUDTELVERBOSE_INFO_LOG(_L("FSM set QoSProfile")); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + iPdpFsmInterface.Set(iId, iProfileBuffer.NegotiatedQoSR5()); + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + + iPdpFsmInterface.Set(iId, iProfileBuffer.NegotiatedQoSR99_R4()); +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + SPUDTELVERBOSE_INFO_LOG(_L("FSM input EQoSProfileChangeNetwork")); + iPdpFsmInterface.Input(iId, PdpFsm::EQoSProfileChangeNetwork); + } + else + { + SPUDTEL_ERROR_LOG(_L("CQoSChangeNotifier::Notify(), error: %d"), aStatus.Int()); + ASSERT(aStatus == KErrCancel); + } + } + + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/cservicechangenotifier.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cservicechangenotifier.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,91 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// implementation for service change notifier +// +// + +/** + @file + @internalComponent +*/ + +#include + +#include "cservicechangenotifier.h" +#include "PDPFSM.h" +#include "spudteldebuglogger.h" +#include "pdpfsmnmspace.h" + +#include + +/** c'tor + +@param aPacketService - reference to packet service +@param aPdpFsmInterface - reference to pdp fsm interface +*/ +CServiceChangeNotifier::CServiceChangeNotifier(RPacketService& aPacketService, + CPdpFsmInterface& aPdpFsmInterface) +: CEtelDriverNotifier(aPdpFsmInterface), + iPacketService(aPacketService), + iServiceStatus(RPacketService::EStatusUnattached) + { + } + +CServiceChangeNotifier::~CServiceChangeNotifier() + { + Cancel(); + } + +/** initiates notification */ +void CServiceChangeNotifier::Start() + { + if (!IsActive()) + { + iPacketService.NotifyStatusChange(iStatus, iServiceStatus); + SetActive(); + } + } + +/** notifies pdp fsm + +@param aStatus - request status +*/ +void CServiceChangeNotifier::Notify(const TRequestStatus& aStatus) + { + if(aStatus == KErrNone) + { + SPUDTELVERBOSE_INFO_LOG(_L("FSM set ServiceStatus")); + iPdpFsmInterface.Set(iServiceStatus); + SPUDTELVERBOSE_INFO_LOG(_L("FSM input EServiceStatusChangeNetwork")); + iPdpFsmInterface.Input(KAllContexts, + PdpFsm::EServiceStatusChangeNetwork); + } + else + { + SPUDTEL_ERROR_LOG(_L("CServiceChangeNotifier::Notify(), error: %d"), + aStatus.Int()); + ASSERT(aStatus == KErrCancel); + } + } + +/** cancels notification */ +void CServiceChangeNotifier::DoCancel() + { + if(IsActive()) + { + SPUDTELVERBOSE_INFO_LOG( + _L("CServiceChangeNotifier::DoCancel EPacketNotifyStatusChange")); + iPacketService.CancelAsyncRequest(EPacketNotifyStatusChange); + } + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/cspudcontextelem.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cspudcontextelem.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,109 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// spud context element +// +// + +/** + @file + @internalComponent +*/ + +#include "cspudcontextelem.h" + +/** +@param aId - pdp context id +@param aFactory - reference to etel driver factory +@param aPdpFsmInterface reference to pdp fsm interface +@return new spud context element +*/ +CSpudContextElem* CSpudContextElem::NewL(TContextId aId, + CEtelDriverFactory& aFactory, + CPdpFsmInterface& aPdpFsmInterface) + { + CSpudContextElem *me = new(ELeave) CSpudContextElem(); + CleanupStack::PushL(me); + me->ConstructL(aId, aFactory, aPdpFsmInterface); + CleanupStack::Pop(me); + return me; + } + +/** +@param aId - pdp context id +@param aFactory - reference to etel driver factory +@param aPdpFsmInterface reference to pdp fsm interface +*/ +void CSpudContextElem::ConstructL(TContextId aId, + CEtelDriverFactory& aFactory, + CPdpFsmInterface& aPdpFsmInterface) + { + iContext = new(ELeave) CEtelDriverContext(aId, aFactory); + iPdpStatusChangeNotifier = new(ELeave) CPdpStatusChangeNotifier(aId, + iContext->PacketContext(), + aPdpFsmInterface); + iQoSChangeNotifier = new(ELeave) CQoSChangeNotifier(aId, + iContext->PacketQoS(), + aPdpFsmInterface); + iPdpConfigChangeNotifier = new(ELeave) CPdpConfigChangeNotifier(aId, + iContext->PacketContext(), + aPdpFsmInterface); + } + +CSpudContextElem::~CSpudContextElem() + { + delete iPdpStatusChangeNotifier; + delete iQoSChangeNotifier; + delete iPdpConfigChangeNotifier; + delete iContext; + } + +/** starts all notifiers */ +void CSpudContextElem::Start() + { + iPdpStatusChangeNotifier->Start(); + iQoSChangeNotifier->Start(); + iPdpConfigChangeNotifier->Start(); + } + +/** cancels all notifiers */ +void CSpudContextElem::Cancel() + { + iPdpStatusChangeNotifier->Cancel(); + iQoSChangeNotifier->Cancel(); + iPdpConfigChangeNotifier->Cancel(); + } + +/** Get LastErrorCause + +@param aLastErrorCause - LastErrorCause to get +*/ +void CSpudContextElem::GetLastErrorCause(TInt& aLastErrorCause) + { + RPacketContext &aPacketContext = iContext->PacketContext(); + aPacketContext.GetLastErrorCause(aLastErrorCause); + } + +void CSpudContextElem::PdpStatusChangeNotifierCancel() + { + iPdpStatusChangeNotifier->Cancel(); + } + +void CSpudContextElem::QoSChangeNotifierCancel() + { + iQoSChangeNotifier->Cancel(); + } +void CSpudContextElem::PdpConfigChangeNotifierCancel() + { + iPdpConfigChangeNotifier->Cancel(); + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/eteldriverstrategies.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/eteldriverstrategies.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,1364 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// A collection of etel driver strategies +// +// + +/** + @file + @internalComponent +*/ + +#include + +#include "ceteldrivercontext.h" +#include "eteldriverstrategies.h" +#include "spudteldebuglogger.h" +#include "pdpfsmnmspace.h" + +#include + + +// +// TOpenStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TOpenStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TOpenStrategy::Next()"); + + TInt err = KErrNone; + + switch(aContext.StrategyStep()) + { + case EStartStep: + { + aContext.Phone().Initialise (*aStatus); + aContext.SetStrategyStep(EInitPhoneStep); + break; + } + + case EInitPhoneStep: + { + aContext.SetStrategyStep(EFinishStep); + break; + } + + default: + // incorrect step + SPUDTEL_ERROR_LOG0(_L("Incorrect step")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + + } // switch + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + } + + +/** +Notifies SPUD FSM about execution results. + +@param aContext - pdp context +@param aCompletionStatus - completion request status +*/ +void TOpenStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus) + { + if(aCompletionStatus == KErrNone) + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: EPhoneOpened")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPhoneOpened); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: EPhoneOpenedFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPhoneOpenedFailed, aCompletionStatus.Int()); + } + } + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TOpenStrategy::CancelAsyncRequest(CEtelDriverContext& aContext) + { + switch(aContext.StrategyStep()) + { + case EInitPhoneStep: + { + SPUDTEL_INFO_LOG(_L("Cancel Phone::InitialiseCancel")); + aContext.Phone().InitialiseCancel(); + break; + } + + default: + // there're NO outstanding async requests + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TOpenStrategy::CancelAsyncRequest")); + ASSERT(EFalse); + break; + } + } + + +// +// TContextDeleteStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)"); + + TInt err = KErrNone; + + // steps: + // -- cancel notifications + // -- deactivate context + // -- close QoS + // -- close context + // -- delete context + switch(aContext.StrategyStep()) + { + case EStartStep: + { + // cancel associated notifications + // -- StatusChangeNotifier + // -- QoSChangeNotifier + // -- ConfigChangeNotifier + + if (aContext.PacketContext().SubSessionHandle()) + { + aContext.PacketContext().Deactivate(*aStatus); + aContext.SetStrategyStep (EDeactivateStep); + } + else + { + aContext.SetStrategyStep(EDeactivateStep); + User::RequestComplete(aStatus, err); + } + break; + } + + case EDeactivateStep: + { + if (aContext.PacketQoS().SubSessionHandle()) + { + aContext.QoSChangeNotifierCancel(); + aContext.PacketQoS().Close(); + } + + if (aContext.PacketContext().SubSessionHandle()) + { + aContext.PdpConfigChangeNotifierCancel(); + aContext.PdpStatusChangeNotifierCancel(); + aContext.PacketContext().Delete(*aStatus); + aContext.SetStrategyStep(EDeleteContextStep); + } + else + { + // jump to next step + aContext.SetStrategyStep(EDeleteContextStep); + User::RequestComplete( aStatus, err); + } + break; + } + + + case EDeleteContextStep: + { + aContext.PacketContext().Close(); + // clear the name + aContext.Name().Zero(); + aContext.SetStrategyStep (EFinishStep); + break; + } + + default: + // incorrect step + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + + } // switch + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + + } + + +/** +Notifies SPUD FSM about execution results. + +@param aContext - pdp context +@param aCompletionStatus - completion request status +*/ +void TContextDeleteStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus) + { + aContext.PdpFsmInterface().Set(aContext.Id(), RPacketContext::EStatusDeleted); + + if(aCompletionStatus == KErrNone) + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: EContextDeleted")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EContextDeleted); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: EContextDeletedFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EContextDeletedFailed, aCompletionStatus.Int()); + } + } + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TContextDeleteStrategy::CancelAsyncRequest(CEtelDriverContext& aContext) + { + SPUDTEL_FNLOG("TContextDeleteStrategy::CancelAsyncRequest()"); + + // When there is no sub-session, the strategy will not call DeactivateContext, but will be in the EDeactivateStep state + // In this case we don't want to cancel the deactivate request + if (aContext.iStatus != KRequestPending) + { + return; + } + + switch(aContext.StrategyStep()) + { + case EDeactivateStep: + { + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextDeactivate")); + aContext.PacketContext().CancelAsyncRequest(EPacketContextDeactivate); + break; + } + + case EDeleteContextStep: + { + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextDelete")); + aContext.PacketContext().CancelAsyncRequest(EPacketContextDelete); + break; + } + + default: + // there're NO outstanding async requests + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + break; + } + } + + +// +// TCreate1ryPdpContextStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TCreate1ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::Next()"); + + TInt err = KErrNone; + + // possible steps: + // -- open new context + // -- open new QoS + // -- initialise context + switch(aContext.StrategyStep()) + { + case EStartStep: + { + err = aContext.PacketContext().OpenNewContext (aContext.PacketService(), aContext.Name()); + if (err) + { + SPUDTEL_ERROR_LOG(_L("PacketContextOpenNewContext returned %d"), err); + break; + } + + // get packet config from fsm + aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextConfigGPRS()); + // async set config + aContext.PacketContext().SetConfig (*aStatus, aContext.ContextConfigGPRSPckg()); + // set next step + aContext.SetStrategyStep (ESetConfigStep); + break; + } + + case ESetConfigStep: + { + // QoS name is not used anywhere + TName newName; + err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName); + if (err) + { + SPUDTEL_ERROR_LOG(_L("PacketQoS OpenNewQoS returned %d"), err); + break; + } + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested r5; + aContext.PdpFsmInterface().Get (aContext.Id(), r5); + aContext.QosRequested() = r5; +#else + RPacketQoS::TQoSR99_R4Requested r4; + aContext.PdpFsmInterface().Get (aContext.Id(), r4); + aContext.QosRequested() = r4; +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + +#ifdef _DEBUG + aContext.DumpReqProfileParameters (); +#endif + aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg()); + aContext.SetStrategyStep (ESetProfileParamsStep); + break; + } + + case ESetProfileParamsStep: + { + aContext.SetStrategyStep (EFinishStep); + break; + } + + default: + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + + } + + +/** +Notifies SPUD FSM about execution results. + +@param aContext - pdp context +@param aCompletionStatus - completion request status +*/ +void TCreate1ryPdpContextStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus) +{ + if(aCompletionStatus == KErrNone) + { + // start notifications in case of normal creation of a context + // -- StatusChangeNotifier + // -- QoSChangeNotifier + // -- ConfigChangeNotifier + aContext.StartNotifications(); + + SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreated")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E1ryPdpContextCreated); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreatedFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E1ryPdpContextCreatedFailed, aCompletionStatus.Int()); + } +} + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TCreate1ryPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& aContext) + { + SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::CancelAsyncRequest()"); + + switch(aContext.StrategyStep()) + { + case ESetConfigStep: + { + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextSetConfig")); + aContext.PacketContext().CancelAsyncRequest(EPacketContextSetConfig); + break; + } + + case ESetProfileParamsStep: + { + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSSetProfileParams")); + aContext.PacketQoS().CancelAsyncRequest(EPacketQoSSetProfileParams); + break; + } + + default: + // there're NO outstanding async requests + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + break; + } + } + + +// +// TCreate2ryPdpContextStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TCreate2ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TCreate2ryPdpContextStrategy::Next()"); + + TInt err = KErrNone; + + // possible steps: + // -- open new secondary context + // -- open new QoS + // -- initialise context + switch(aContext.StrategyStep()) + { + case EStartStep: + { + const TName& existingContextName = aContext.ExistingContextName(); + aContext.PacketContext().OpenNewSecondaryContext(aContext.PacketService(), existingContextName, aContext.Name()); + + // QoS name is not used anywhere + TName newName; + err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName); + if (err) + { + SPUDTEL_ERROR_LOG(_L("PacketQoS OpenNewQoS returned %d"), err); + break; + } + + aContext.SetStrategyStep (EFinishStep); + break; + } + + default: + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + + } + + +/** +Notifies SPUD FSM about execution results. + +@param aContext - pdp context +@param aCompletionStatus - completion request status +*/ +void TCreate2ryPdpContextStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ) +{ + if(aCompletionStatus == KErrNone) + { + // start notifications in case of normal creation of a context + // -- StatusChangeNotifier + // -- QoSChangeNotifier + // -- ConfigChangeNotifier + aContext.StartNotifications(); + + SPUDTEL_INFO_LOG(_L("Notifying FSM: E2ryPdpContextCreated")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E2ryPdpContextCreated); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: E2ryPdpContextCreatedFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E2ryPdpContextCreatedFailed, aCompletionStatus.Int()); + } +} + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TCreate2ryPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& /*aContext*/) + { + SPUDTEL_FNLOG("TCreate2ryPdpContextStrategy::CancelAsyncRequest()"); + SPUDTEL_ERROR_LOG0(_L("ERROR: No outstanding requests")); + } + + +// +// TSetQoSStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TSetQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TSetQoSStrategy::Next()"); + + TInt err = KErrNone; + + // possible steps: + // -- set QoS profile parameters + switch(aContext.StrategyStep()) + { + case EStartStep: + { +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Requested req; +#else + RPacketQoS::TQoSR99_R4Requested req; +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + aContext.PdpFsmInterface().Get (aContext.Id(), req); + aContext.QosRequested() = req; + + +#ifdef _DEBUG + aContext.DumpReqProfileParameters (); +#endif + aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg()); + aContext.SetStrategyStep (ESetProfileParamsStep); + break; + } + + case ESetProfileParamsStep: + { + aContext.SetStrategyStep (EFinishStep); + break; + } + + default: + { + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + } + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + + } + + +/** +FSM completion notification +and setting QoSR99_R4Negotiated in spud FSM +*/ +void TSetQoSStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ) + { + if(aCompletionStatus == KErrNone) + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: EQoSSet")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EQoSSet); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: EQoSSetFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EQoSSetFailed, aCompletionStatus.Int()); + } + } + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TSetQoSStrategy::CancelAsyncRequest(CEtelDriverContext& aContext) + { + switch(aContext.StrategyStep()) + { + case ESetProfileParamsStep: + { + aContext.PacketQoS().CancelAsyncRequest(EPacketQoSSetProfileParams); + SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketQoSSetProfileParams")); + break; + } + + default: + // there're NO outstanding async requests + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TSetQoSStrategy::CancelAsyncRequest")); + ASSERT(EFalse); + break; + } + } + + +// +// TSetTftStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TSetTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TSetTftStrategy::Next()"); + + TInt err = KErrNone; + + // possible steps: + // -- add filters + switch(aContext.StrategyStep()) + { + case EStartStep: + { + aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftOperationCode()); + switch(aContext.TftOperationCode()) + { + case KAddFilters: + aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo()); + SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Add Filters"), aContext.TftInfo().FilterCount()); + // Set strategy assumes that TFT has to be created on a first place + SPUDTELVERBOSE_INFO_LOG(_L("Creating TFT...")); + aContext.PacketContext().CreateNewTFT(*aStatus, aContext.TftInfo().FilterCount()); + aContext.SetStrategyStep (ECreateNewTFTStep); + break; + + case KRemoveFilters: + err = KErrNotSupported; + SPUDTEL_ERROR_LOG(_L("TftOperationCode - Remove is not supported in a Set strategy, return %d"), err); + break; + + case KDeleteTFT: + err = KErrNotSupported; + SPUDTEL_ERROR_LOG(_L("TftOperationCode - Delete is not supported in a Set strategy, return %d"), err); + break; + + default: + // wrong case + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + break; + } + + case ECreateNewTFTStep: + { + TInt err1st = aContext.FirstFilterV2(); + if(err1st == KErrNone) + { + aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg()); + aContext.SetStrategyStep (EAddTftStep); + } + else // done + { + // internal check + ASSERT((aContext.TftRequested() <= aContext.TftInfo().FilterCount())); + aContext.SetStrategyStep (EFinishStep); + } + + break; + } + + case EAddTftStep: + { + TInt errV2 = aContext.NextFilterV2(); + if(errV2 == KErrNone) + { + aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg()); + aContext.SetStrategyStep (EAddTftStep); + } + else // done + { + // internal check + ASSERT((aContext.TftRequested() <= aContext.TftInfo().FilterCount())); + aContext.SetStrategyStep (EFinishStep); + } + + break; + } + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + + } + +/** +Notifies SPUD FSM about execution results. + +@param aContext - pdp context +@param aCompletionStatus - completion request status +*/ +void TSetTftStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ) + { + if(aCompletionStatus == KErrNone) + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftSet")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftSet); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftSetFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftSetFailed, aCompletionStatus.Int()); + } + } + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TSetTftStrategy::CancelAsyncRequest(CEtelDriverContext& aContext) + { + switch(aContext.StrategyStep()) + { + case ECreateNewTFTStep: + { + aContext.PacketQoS().CancelAsyncRequest(EPacketContextCreateNewTFT); + SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextCreateNewTFT")); + break; + } + + case EAddTftStep: + { + aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilter); + SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextAddPacketFilter")); + break; + } + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TSetTftStrategy::CancelAsyncRequest")); + ASSERT(EFalse); + break; + } + } + + +// +// TChangeTftStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TChangeTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TChangeTftStrategy::Next()"); + + TInt err = KErrNone; + + // special case. + if(EStartStep == aContext.StrategyStep()) + { + aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftOperationCode()); + switch(aContext.TftOperationCode()) + { + case KAddFilters: + aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo()); + SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Add Filters"), aContext.TftInfo().FilterCount()); + aContext.SetStrategyStep (EAddFirstTftStep); + break; + + case KRemoveFilters: + aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo()); + SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Remove %d Filters"), aContext.TftInfo().FilterCount()); + aContext.SetStrategyStep (ERemoveFirstTftStep); + break; + + case KDeleteTFT: + SPUDTELVERBOSE_INFO_LOG(_L("TftOperationCode - Delete TFT")); + // delete old TFT + aContext.PacketContext().DeleteTFT(*aStatus); + aContext.SetStrategyStep (EDeleteTftStep); + // DeleteTFT() ia an async operation => return + return; + + default: + // wrong case + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + } + + // possible steps: + // -- delete TFT + // -- add filters + // -- remove filters + if(!err) + { + switch(aContext.StrategyStep()) + { + case EDeleteTftStep: + { + aContext.SetStrategyStep (EChangeTftFinished); + User::RequestComplete( aStatus, KErrNone); + break; + } + + case EAddFirstTftStep: + { + TInt errV2 = aContext.FirstFilterV2(); + if(errV2 == KErrNone) + { + aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg()); + aContext.SetStrategyStep (EAddTftStep); + } + else // done + { + aContext.SetStrategyStep (EChangeTftFinished); + User::RequestComplete( aStatus, KErrNone); + } + + break; + } + + case EAddTftStep: + { + TInt errV2 = aContext.NextFilterV2(); + if(errV2 == KErrNone) + { + aContext.PacketContext().AddPacketFilter( *aStatus, aContext.FilterV2Pckg()); + aContext.SetStrategyStep (EAddTftStep); + } + else // done + { + aContext.SetStrategyStep (EChangeTftFinished); + User::RequestComplete( aStatus, KErrNone); + } + + break; + } + + case ERemoveFirstTftStep: + { + TInt errV2 = aContext.FirstFilterV2(); + if(errV2 == KErrNone) + { + aContext.PacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId); + aContext.SetStrategyStep (ERemoveTftStep); + } + else // done + { + aContext.SetStrategyStep (EChangeTftFinished); + User::RequestComplete( aStatus, KErrNone); + } + + break; + } + + case ERemoveTftStep: + { + TInt errV2 = aContext.NextFilterV2(); + if(errV2 == KErrNone) + { + aContext.PacketContext().RemovePacketFilter( *aStatus, aContext.FilterV2().iId); + aContext.SetStrategyStep (ERemoveTftStep); + } + else // done + { + aContext.SetStrategyStep (EChangeTftFinished); + User::RequestComplete( aStatus, KErrNone); + } + + break; + } + + case EChangeTftFinished: + { + aContext.SetStrategyStep (EFinishStep); + } + break; + + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + } + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + + } + + +/** +Notifies SPUD FSM about execution results. + +@param aContext - pdp context +@param aCompletionStatus - completion request status +*/ +void TChangeTftStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ) + { + if(aCompletionStatus == KErrNone) + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftChanged")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftChanged); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftChangedFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftChangedFailed, aCompletionStatus.Int()); + } + } + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TChangeTftStrategy::CancelAsyncRequest(CEtelDriverContext& aContext) + { + switch(aContext.StrategyStep()) + { + case EDeleteTftStep: + { + SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextDeleteTFTCancel")); + aContext.PacketQoS().CancelAsyncRequest(EPacketContextDeleteTFTCancel); + break; + } + + case ERemoveTftStep: + { + SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextRemovePacketFilterCancel")); + aContext.PacketQoS().CancelAsyncRequest(EPacketContextRemovePacketFilterCancel); + break; + } + + case EAddTftStep: + { + SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextAddPacketFilter")); + aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilterCancel); + break; + } + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TChangeTftStrategy::CancelAsyncRequest")); + ASSERT(EFalse); + break; + } + } + + +// +// TActivatePdpStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TActivatePdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TActivatePdpStrategy::Next()"); + + TInt err = KErrNone; + + switch(aContext.StrategyStep()) + { + case EStartStep: + { + aContext.PacketContext().Activate(*aStatus); + aContext.SetStrategyStep (EActivateStep); + break; + } + + case EActivateStep: + { + aContext.PdpFsmInterface().Get (aContext.Id(), aContext.ContextConfigGPRS()); + aContext.PacketContext().GetConfig (*aStatus, aContext.ContextConfigGPRSPckg()); + aContext.SetStrategyStep (EGetConfigStep); + break; + } + + case EGetConfigStep: + { + aContext.PdpFsmInterface().Set (aContext.Id(), aContext.ContextConfigGPRS()); + aContext.PacketContext().InitialiseContext(*aStatus, aContext.DataChannelV2Pckg()); + aContext.SetStrategyStep (EInitialiseContextStep); + break; + } + + case EInitialiseContextStep: + { + if (KPrimaryContextId == aContext.Id()) + { + aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg()); +#ifdef _DEBUG + aContext.DumpNegProfileParameters (); +#endif + aContext.SetStrategyStep (EGetProfileParamsStep); + } + else + { + aContext.SetStrategyStep (EFinishStep); + } + break; + } + + case EGetProfileParamsStep: + { + aContext.SetStrategyStep (EFinishStep); + break; + } + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + + } + + +/** +Notifies SPUD FSM about execution results. + +@param aContext - pdp context +@param aCompletionStatus - completion request status +*/ +void TActivatePdpStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ) + { + if(aCompletionStatus == KErrNone) + { + SPUDTELVERBOSE_INFO_LOG(_L("FSM set: DataChannelV2")); + aContext.PdpFsmInterface().Set(aContext.Id(), aContext.DataChannelV2()); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated")); + aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5()); + +#else + SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated")); + aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4()); +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivated")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivated); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivatedFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivatedFailed, aCompletionStatus.Int()); + } + } + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TActivatePdpStrategy::CancelAsyncRequest(CEtelDriverContext& aContext) + { + switch(aContext.StrategyStep()) + { + case EActivateStep: + { + aContext.PacketContext().CancelAsyncRequest(EPacketContextActivate); + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextActivate")); + break; + } + + case EGetConfigStep: + { + aContext.PacketContext().CancelAsyncRequest(EGetConfigStep); + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EGetConfigStep")); + break; + } + + case EInitialiseContextStep: + { + aContext.PacketContext().CancelAsyncRequest(EPacketContextInitialiseContext); + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextInitialiseContext")); + break; + } + + case EGetProfileParamsStep: + { + if(KPrimaryContextId == aContext.Id()) + { + aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams); + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams")); + break; + } + } + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest")); + ASSERT(EFalse); + break; + } + } + +// +// TGetNegQoSStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TGetNegQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TGetNegQoSStrategy::Next()"); + + TInt err = KErrNone; + + switch(aContext.StrategyStep()) + { + case EStartStep: + { + aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg()); +#ifdef _DEBUG + aContext.DumpNegProfileParameters (); +#endif + aContext.SetStrategyStep (EGetProfileParamsStep); + break; + } + + case EGetProfileParamsStep: + { + aContext.SetStrategyStep (EFinishStep); + break; + } + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + + } + + +/** +Notifies SPUD FSM about execution results. + +@param aContext - pdp context +@param aCompletionStatus - completion request status +*/ +void TGetNegQoSStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ) + { + if(aCompletionStatus == KErrNone) + { +#ifdef SYMBIAN_NETWORKING_UMTSR5 + SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated")); + aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5()); + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + + SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated")); + aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4()); +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpNegQoSRetrieved")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpNegQoSRetrieved); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpNegQoSRetrievedFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpNegQoSRetrievedFailed, aCompletionStatus.Int()); + } + } + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TGetNegQoSStrategy::CancelAsyncRequest(CEtelDriverContext& aContext) + { + switch(aContext.StrategyStep()) + { + case EGetProfileParamsStep: + { + aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams); + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams")); + break; + } + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TGetNegQoSStrategy::CancelAsyncRequest")); + ASSERT(EFalse); + break; + } + } + + +// +// TModifyActiveStrategy +// +/** Executes next asynchronous step in a strategy. + +@param aContext - pdp context +@param aStatus - request status of this step +*/ +void TModifyActiveStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus) + { + SPUDTEL_FNLOG("TModifyActiveStrategy::Next()"); + + TInt err = KErrNone; + + switch(aContext.StrategyStep()) + { + case EStartStep: + { + aContext.PacketContext().ModifyActiveContext(*aStatus); + aContext.SetStrategyStep (EModifyActiveStep); + break; + } + + case EModifyActiveStep: + { + aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg()); +#ifdef _DEBUG + aContext.DumpNegProfileParameters (); +#endif + aContext.SetStrategyStep (EGetProfileParamsStep); + break; + } + + case EGetProfileParamsStep: + { + aContext.SetStrategyStep (EFinishStep); + break; + } + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case")); + ASSERT(EFalse); + err = KErrNotSupported; + break; + } + + if(err || (EFinishStep == aContext.StrategyStep())) + { + User::RequestComplete( aStatus, err); + } + + } + + +/** +Notifies SPUD FSM about execution results. + +@param aContext - pdp context +@param aCompletionStatus - completion request status +*/ +void TModifyActiveStrategy::NotifyFsm(CEtelDriverContext& aContext, TRequestStatus& aCompletionStatus ) + { + if(aCompletionStatus == KErrNone) + { +#ifdef SYMBIAN_NETWORKING_UMTSR5 + SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated")); + aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5()); + +#else + SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated")); + aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4()); +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpContextModified")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpContextModified); + } + else + { + SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpContextModifiedFailed")); + aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpContextModifiedFailed, aCompletionStatus.Int()); + } + } + +/** Cancels last asynchronous request to eTel + +@param aContext - pdp context +*/ +void TModifyActiveStrategy::CancelAsyncRequest(CEtelDriverContext& aContext) + { + switch(aContext.StrategyStep()) + { + case EModifyActiveStep: + { + aContext.PacketContext().CancelAsyncRequest(EPacketContextModifyActiveContext); + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextModifyActiveContext")); + break; + } + + case EGetProfileParamsStep: + { + aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams); + SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams")); + break; + } + + default: + // unexpected + SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TModifyActiveStrategy::CancelAsyncRequest")); + ASSERT(EFalse); + break; + } + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/spudtel/src/reteldriverinput.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/reteldriverinput.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,196 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// implementation of etel driver input +// +// + +/** + @file + @internalComponent +*/ + +#include +#include + +#include "ceteldriverfactory.h" +#include "ceteldrivercontext.h" +#include "reteldriverinput.h" +#include "spudteldebuglogger.h" + +using namespace EtelDriver; + +REtelDriverInput::REtelDriverInput() +: iDriverFactory(NULL) + { + } + + +REtelDriverInput::~REtelDriverInput() + { + SPUDTEL_FNLOG("REtelDriverInput::~REtelDriverInput()"); + + if (iDriverFactory) + { + delete iDriverFactory; + } + } + + +/** requests to open etel driver + +@param aPdpFsmInterface - reference to pdp FSM interface +*/ +void REtelDriverInput::OpenL (CPdpFsmInterface& aPdpFsmInterface) + { + SPUDTEL_FNLOG("REtelDriverInput::OpenL()"); + ASSERT(iDriverFactory==NULL); + + // internal check + iDriverFactory = CEtelDriverFactory::NewL(aPdpFsmInterface); + if (iDriverFactory) + { + iDriverFactory->InitL(); + } + } + + +/** closes eTel driver and frees underlying resources +*/ +void REtelDriverInput::Close() + { + SPUDTEL_FNLOG("REtelDriverInput::Close()"); + + // cancel all outstanding requests + if (iDriverFactory) + { + CancelAllPdps(); + } + + delete iDriverFactory; + iDriverFactory = NULL; + } + +/** requests to create new pdp context + Note: this request will not open new primary or secondary context + But rather allocate necessary resources to do it. + Creation / deletion of eTel contexts should be done though Input method. + +@param aPdpId - id of new pdp context +*/ +void REtelDriverInput::CreatePdpL (TContextId aPdpId) + { + SPUDTEL_FNLOG("REtelDriverInput::CreatePdpL()"); + SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId); + + ASSERT(iDriverFactory); + iDriverFactory->CreatePdpL (aPdpId); + } + +/** deletes pdp context + +@param aPdpId - id of a pdp context +*/ +void REtelDriverInput::DeletePdp (TContextId aPdpId) + { + SPUDTEL_FNLOG("REtelDriverInput::DeletePdp()"); + SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId); + + ASSERT(iDriverFactory); + + iDriverFactory->FreePdp(aPdpId); + } + +/** requests to perform aOperation for aPdpId context + +@param aPdpId - id of a pdp context +@param aOperation - etel driver operation +*/ +void REtelDriverInput::Input(TContextId aPdpId, TEtelInput aOperation) + { + SPUDTEL_FNLOG("REtelDriverInput::Input()"); + SPUDTEL_INFO_LOG2(_L("REtelDriverInput::Input: pdp id : %d, operation %d"), aPdpId, aOperation); + ASSERT(iDriverFactory); + + iDriverFactory->Context(aPdpId).Input(aOperation); + } + +/** cancels last operation for aPdpId context + +@param aPdpId - id of a pdp context +*/ +void REtelDriverInput::CancelPdp (TContextId aPdpId) + { + SPUDTEL_FNLOG("REtelDriverInput::CancelPdp()"); + SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdp: pdp id : %d"), aPdpId); + ASSERT(iDriverFactory); + + iDriverFactory->Context(aPdpId).Cancel(); + } + +/** starts network notifications for aPdpId context + +@param aPdpId - id of a pdp context +*/ +void REtelDriverInput::StartPdpNotifications(TContextId aPdpId) + { + SPUDTEL_FNLOG("REtelDriverInput::StartPdpNotifications()"); + ASSERT(iDriverFactory); + + iDriverFactory->StartPdpNotifications(aPdpId); + } + +/** cancels network notifications for aPdpId context + +@param aPdpId - id of a pdp context +*/ +void REtelDriverInput::CancelPdpNotifications (TContextId aPdpId) + { + SPUDTEL_FNLOG("REtelDriverInput::CancelPdpNotifications()"); + SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdpNotifications: pdp id : %d"), aPdpId); + ASSERT(iDriverFactory); + + iDriverFactory->CancelPdpNotifications (aPdpId); + } + +/** cancels last operations for all created pdp contexts */ +void REtelDriverInput::CancelAllPdps () + { + SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdps()"); + ASSERT(iDriverFactory); + + for(TContextId i = 0; i < static_cast(iDriverFactory->ContextCount()); i++) + { + if (iDriverFactory->HasContext(i)) + { + iDriverFactory->Context(i).Cancel(); + } + } + } + +/** cancels all notifications for all pdp contexts */ +void REtelDriverInput::CancelAllPdpNotifications () + { + SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdpNotifications()"); + ASSERT(iDriverFactory); + + iDriverFactory->CancelAllPdpNotifications(); + } + +void REtelDriverInput::GetLastErrorCause (TContextId aPdpId, TInt& aLastErrorCause) + { + SPUDTEL_FNLOG("REtelDriverInput::GetLastErrorCause()"); + ASSERT(iDriverFactory); + + iDriverFactory->GetLastErrorCause(aPdpId, aLastErrorCause); + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/src/1020D45E.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/src/1020D45E.rss Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,45 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Registry info for Umts/Gprs Sub-Connection Provider plug-in +// +// + +/** + @file +*/ + +#include + +RESOURCE REGISTRY_INFO theInfo +{ +dll_uid = 0x1020D45E; +interfaces = + { + INTERFACE_INFO + { + interface_uid = 0x10204301; + implementations = + { + IMPLEMENTATION_INFO + { + implementation_uid = 0x1020D45F; + version_no = 1; + display_name = "Umts/Gprs Sub-Connection Provider Factory"; + default_data = "UmtsGprsSubConnProvdFactory"; + opaque_data = ""; + } + }; + } + }; +} diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/src/PdpFsmRequest.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/src/PdpFsmRequest.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,334 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// The implementation file for the PDP Context control requests. +// +// + +/** + @file + @internalComponent +*/ + + +#include "PdpFsmRequest.h" + + +//-========================================================= +// +//CModifyActivePDPCtx +// +//-========================================================= +CModifyActivePDPCtx::CModifyActivePDPCtx(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner) +:CPdpFsmRequestBase(aProvider, aOwner) +{ +} + +CModifyActivePDPCtx::~CModifyActivePDPCtx() +{ +} + + +TInt CModifyActivePDPCtx::Start() +{ + // Store the Context Id in order to check replies later + iContextId = iProvider.GetContextId(); + return iProvider.GetPdpFsmInterface().Input(iContextId, SpudMan::EContextModifyActive); +} + +/** +@param aEvent The event Id +@param aParam Data relavent to the event. Usually a system-wide error code +@return ETrue if the event was consumed, EFalse if it was of no interest and should +be passed on to SpudMan for processing. +*/ +TBool CModifyActivePDPCtx::PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam) +{ + if (aContextId == iContextId && aEvent == KContextModifyActiveEvent) + { + iOwner.Done(aParam, *this); + return ETrue; + } + + return EFalse; +} + + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +//-========================================================= +// +//CModifyR5QoS +// +//-========================================================= +CModifyR5QoS::CModifyR5QoS(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR5Requested& aParams) +:CPdpFsmRequestBase(aProvider, aOwner), + iModifyActive(NULL), + i5(aParams) +{ +} + +CModifyR5QoS::~CModifyR5QoS() +{ + ASSERT(iModifyActive == NULL || iContextId == 0); + //If we assert here is is becuase Start has been called (allocated iContextId), but Done has not been called (cleans iModifyActive) + delete iModifyActive; +} + +void CModifyR5QoS::GrantedSetupL() + { + CSubConGenEventParamsGranted* event = CSubConGenEventParamsGranted::NewL(); + CleanupStack::PushL (TCleanupItem(SubconEventCleanupFunction, event)); + event->SetFamily (KSubConQoSFamily); + RPacketQoS::TQoSR5Negotiated negotiatedQoS; + iProvider.GetPdpFsmInterface().Get(iProvider.GetContextId(), negotiatedQoS); + iProvider.MapQosEtelToGrantedParamsL(&negotiatedQoS, *event); + iProvider.NotifyClientEvent (*event); + CleanupStack::Pop(); + delete event; + + } + +void CModifyR5QoS::RejectedSetupL(TInt aResult) + { + CSubConGenEventParamsRejected* event = CSubConGenEventParamsRejected::NewL(); + CleanupStack::PushL (TCleanupItem(SubconEventCleanupFunction, event)); + event->SetFamilyId (KSubConQoSFamily); + event->SetError (aResult); + iProvider.NotifyClientEvent (*event); + CleanupStack::Pop(); + delete event; + } + +void CModifyR5QoS::Done( TInt aResult, CPdpFsmRequestBase& aThis ) +{ + __ASSERT_ALWAYS(iModifyActive == &aThis, User::Invariant()); + + if ( aResult == KErrNone ) + { + // QoS Modification complete with success. + __FLOG_1(_L("CModifyR5QoS [this=%08x]:\tDone(): QoS Params Granted"), this); + TRAP_IGNORE(GrantedSetupL()); + } + else + { + //QoS Modification complete with failure. + __FLOG_2(_L("CModifyR5QoS [this=%08x]:\tDone(): QoS Params Rejected [aResult=%d]"), this, aResult); + TRAP_IGNORE(RejectedSetupL(aResult)); + } + + + delete iModifyActive; + iModifyActive = NULL; + iOwner.Done(aResult, *this); +} + + +TInt CModifyR5QoS::Start() +{ + // Store the Context Id in order to check replies later + iContextId = iProvider.GetContextId(); + + TInt result; + result = iProvider.GetPdpFsmInterface().Set(iContextId, i5); + if (result == KErrNone) + { + result = iProvider.GetPdpFsmInterface().Input(iContextId, SpudMan::EContextQoSSet); + } + + return result; +} + + +TBool CModifyR5QoS::PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam) +{ + if (aContextId != iContextId) + { + return EFalse; + } + + TBool handled(EFalse); + if (aEvent == KContextQoSSetEvent) + { + if (aParam == KErrNone) + { + iModifyActive->Start(); + } + else + { + //QoS Modification complete with failure. + __FLOG_2(_L("CModifyR5QoS [this=%08x]:\tPdpFsmEvent(): QoS Params Rejected [aParam=%d]"), this, aParam); + + Done(aParam, *iModifyActive); + } + handled = ETrue; + } + else + { + handled = iModifyActive->PdpFsmEvent(aContextId, aEvent, aParam); + } + + return handled; +} + + +void CModifyR5QoS::ConstructL() +{ + iModifyActive = new(ELeave)CModifyActivePDPCtx(iProvider, *this); +} + + +CModifyR5QoS* CModifyR5QoS::NewL(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR5Requested& aParams) +{ + CModifyR5QoS* request = new(ELeave) CModifyR5QoS(aProvider, aOwner, aParams); + CleanupStack::PushL(request); + request->ConstructL(); + CleanupStack::Pop(request); + return request; +} + + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +//-========================================================= +// +//CModifyR4QoS +// +//-========================================================= +CModifyR4QoS::CModifyR4QoS(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR99_R4Requested aParams) +:CPdpFsmRequestBase(aProvider, aOwner), + iModifyActive(NULL), + i99(aParams) +{ +} + +CModifyR4QoS::~CModifyR4QoS() +{ + ASSERT(iModifyActive == NULL || iContextId == 0); + //If we assert here is is becuase Start has been called (allocated iContextId), but Done has not been called (cleans iModifyActive) + delete iModifyActive; + +} + +void CModifyR4QoS::GrantedSetupL() + { + CSubConGenEventParamsGranted* event = CSubConGenEventParamsGranted::NewL(); + CleanupStack::PushL (TCleanupItem(SubconEventCleanupFunction, event)); + event->SetFamily (KSubConQoSFamily); + RPacketQoS::TQoSR99_R4Negotiated negotiatedQoS; + iProvider.GetPdpFsmInterface().Get(iProvider.GetContextId(), negotiatedQoS); + iProvider.MapQosEtelToGrantedParamsL(&negotiatedQoS, *event); + iProvider.NotifyClientEvent (*event); + CleanupStack::Pop(); + delete event; + } + +void CModifyR4QoS::RejectedSetupL(TInt aResult) + { + CSubConGenEventParamsRejected* event = CSubConGenEventParamsRejected::NewL(); + CleanupStack::PushL (TCleanupItem(SubconEventCleanupFunction, event)); + event->SetFamilyId (KSubConQoSFamily); + event->SetError (aResult); + iProvider.NotifyClientEvent (*event); + CleanupStack::Pop(); + delete event; + } + +void CModifyR4QoS::Done( TInt aResult, CPdpFsmRequestBase& aThis ) +{ + + __ASSERT_ALWAYS(iModifyActive == &aThis, User::Invariant()); + if ( aResult == KErrNone ) + { + // QoS Modification complete with success. + __FLOG_1(_L("CModifyR4QoS [this=%08x]:\tDone(): QoS Params Granted"), this); + TRAP_IGNORE(GrantedSetupL()); + } + else + { + //QoS Modification complete with failure. + __FLOG_2(_L("CModifyR4QoS [this=%08x]:\tDone(): QoS Params Rejected [aResult=%d]"), this, aResult); + TRAP_IGNORE(RejectedSetupL(aResult)); + } + delete iModifyActive; + iModifyActive = NULL; + iOwner.Done(aResult, *this); +} + + +TInt CModifyR4QoS::Start() +{ + // Store the Context Id in order to check replies later + iContextId = iProvider.GetContextId(); + + TInt result; + result = iProvider.GetPdpFsmInterface().Set(iContextId, i99); + if (result == KErrNone) + { + result = iProvider.GetPdpFsmInterface().Input(iContextId, SpudMan::EContextQoSSet); + } + + return result; +} + +TBool CModifyR4QoS::PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam) +{ + if (aContextId != iContextId) + { + return EFalse; + } + + TBool handled(EFalse); + if (aEvent == KContextQoSSetEvent) + { + if (aParam == KErrNone) + { + iModifyActive->Start(); + } + else + { + //QoS Modification complete with failure. + __FLOG_2(_L("CModifyR4QoS [this=%08x]:\tPdpFsmEvent(): QoS Params Rejected [aParam=%d]"), this, aParam); + Done(aParam, *iModifyActive); + } + handled = ETrue; + } + else + { + handled = iModifyActive->PdpFsmEvent(aContextId, aEvent, aParam); + } + + return handled; +} + + +void CModifyR4QoS::ConstructL() +{ + iModifyActive = new(ELeave)CModifyActivePDPCtx(iProvider, *this); +} + +CModifyR4QoS* CModifyR4QoS::NewL(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner, RPacketQoS::TQoSR99_R4Requested aParams) +{ + CModifyR4QoS* request = new(ELeave) CModifyR4QoS(aProvider, aOwner, aParams); + CleanupStack::PushL(request); + request->ConstructL(); + CleanupStack::Pop(request); + return request; +} + + + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/src/RSpudManInterface.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/src/RSpudManInterface.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,92 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// The MSpudManInterface handle implementation. +// +// + +/** + @file + @internalComponent +*/ + +#include "RSpudManInterface.h" + + +RSpudManInterface::RSpudManInterface() + :iSpudManImpl(NULL) +{ +#ifdef __FLOG_ACTIVE + // Logging tags + _LIT8(KUmtsGprsLogTag1,"SubConn"); + _LIT8(KUmtsGprsLogTag2,"UmtsGprs"); + __FLOG_OPEN(KUmtsGprsLogTag1, KUmtsGprsLogTag2); +#endif +} + + +void RSpudManInterface::Init(MSpudManInterface* aSpudManImpl) +{ + __FLOG_2(_L("RSpudManInterface::Init: [this=%08x] [aSpudManImpl=%08x]"), this, aSpudManImpl); + iSpudManImpl = aSpudManImpl; +} + + +void RSpudManInterface::Input(TContextId aContextId, TInt aEvent, TInt aParam) +{ + if (iSpudManImpl) + { + //ignoring calls to an unitialised handle - apparently there is no + //SpudMan. + __FLOG_4(_L("RSpudManInterface::Input: Sending input. [this=%08x] [aContextId=%d] [aEvent=%d] [aParam=%d]"), + this, aContextId, aEvent, aParam); + iSpudManImpl->Input(aContextId, aEvent, aParam); + } + else + { + __FLOG_4(_L("RSpudManInterface::Input: Discarding input. [this=%08x] [aContextId=%d] [aEvent=%d] [aParam=%d]"), + this, aContextId, aEvent, aParam); + } +} + +void RSpudManInterface::SetContextTerminationErrorAndStop(TContextId aContextId, TInt aErrorCode) +{ + if (iSpudManImpl) + { + //ignoring calls to an unitialised handle - apparently there is no + //SpudMan. + __FLOG_3(_L("SetContextTerminationErrorAndStop: [this=%08x] [aContextId=%d] [aErrorCode=%d]"), + this, aContextId, aErrorCode); + iSpudManImpl->SetContextTerminationErrorAndStop(aContextId, aErrorCode); + } + else + { + __FLOG_3(_L("RSpudManInterface::SetContextTerminationErrorAndStop: Discarded! [this=%08x] [aContextId=%d] [aErrorCode=%d]"), + this, aContextId, aErrorCode); + } +} + +void RSpudManInterface::Close () +{ + __FLOG_1(_L("RSpudManInterface::Close: [this=%08x]"), this); + + if (iSpudManImpl) + { + // Clear the member first to avoid ping-ponging Close() messages + // between the PdpFsmInterface and SpudManInterface + MSpudManInterface* spudManImpl = iSpudManImpl; + iSpudManImpl = NULL; + spudManImpl->Input (0, KPdpFsmShuttingDown, 0); + } +} + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/src/UmtsGprs_defaultSubconnProv.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/src/UmtsGprs_defaultSubconnProv.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,299 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Implementation file for the Default Umts/Gprs SubConnection Provider +// +// + +/** + @file + @internalComponent +*/ + + +#include "UmtsGprs_defaultSubconnProv.h" +#include "UmtsGprs_subconnProvFactory.h" +#include "PdpFsmRequest.h" + +#include +#include + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +#include +#endif + +CUmtsGprsDefaultSubConnProvd* CUmtsGprsDefaultSubConnProvd::NewL(CSubConnectionProviderFactoryBase& aFactory, + CConnectionProviderBase& aConnProvider) + { + CUmtsGprsDefaultSubConnProvd* provider = new(ELeave)CUmtsGprsDefaultSubConnProvd(aFactory, aConnProvider); + CleanupStack::PushL(provider); + provider->ConstructL(); + CleanupStack::Pop(provider); + return provider; + } + + + +CUmtsGprsDefaultSubConnProvd::CUmtsGprsDefaultSubConnProvd( + CSubConnectionProviderFactoryBase& aFactory, + CConnectionProviderBase& aConnProvider) +:CUmtsGprsSubConnProvd(aFactory, aConnProvider), + iPdpFsm(NULL) +/** +Constructs a default UMTS SubConnection Provider + +@param aFactory CSubConnectionProviderFactoryBase that should own the reference to 'this' +@param aConnProvider a connection that 'this' subconnection belongs to +*/ + { + iContextId = KPrimaryContextId; + } + + +void CUmtsGprsDefaultSubConnProvd::ConstructL() + { + iPdpFsm = new(ELeave) CPdpFsmInterface(*this); + } + + +CUmtsGprsDefaultSubConnProvd::~CUmtsGprsDefaultSubConnProvd() + { + delete iPdpFsm; + } + + +CUmtsGprsSubConnProvd& CUmtsGprsDefaultSubConnProvd::GetDefaultSubConnection() + { + return *this; + } + +TBool CUmtsGprsDefaultSubConnProvd::ShouldIDeleteNow() + { + // Never allow client leaving events to destroy this default scpr + // The CPr will call ConnectionGoingDown when it is deleted + // and then we will delete this. + return EFalse; + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + +TInt CUmtsGprsDefaultSubConnProvd::AddIMCNInformationToParameterBundleL(TBool aImCnInfo) + +/** +Will add the information related to the IMCN Signalling Flag into the SubCon Parameter Bundle +so that it can be accessible by the IPSCPR while restricting the sockets + +@param aImCnInfo Grant status of the IMCN signalling flag +*/ + + { + // Check and create the parameter bundle if NULL + if (iParameterBundle == NULL) + { + iParameterBundle = CSubConParameterBundle::NewL(); + } + + // Add information Regarding the grant status to the parameter bundle with family + CSubConParameterFamily * imcnFamily = CSubConParameterFamily::NewL(*iParameterBundle,KSubConnContextDescrParamsFamily); + CleanupStack::PushL(imcnFamily); + CSubConImsExtParamSet *imcnFlag = CSubConImsExtParamSet::NewL(*imcnFamily,CSubConParameterFamily::EGranted); + CleanupStack::Pop(imcnFamily); + // Set the Signalling Indication + imcnFlag->SetImsSignallingIndicator(aImCnInfo); + + return KErrNone; + } + +#endif //SYMBIAN_NETWORKING_UMTSR5 + + +void CUmtsGprsDefaultSubConnProvd::DoParametersAboutToBeSetL(CSubConParameterBundle& aParameterBundle) +/** Should set parameters on the primary/default PDP context represented by 'this' + +@param +*/ +{ + __FLOG_1(_L("CUmtsGprsDefaultSubConnProvd [this=%08x]:\tDoParametersAboutToBeSetL()"), this); + + if (iCurrentPdpFsmReq) + { + User::Leave(KErrInUse); + } + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + // For PREQ 635, The information regarding the dedicated signalling indication is used to be stored in the + // iParameterBundle of the Base class. Since after this call and lower layer calls (if any) is completed then + // iParameterBundle will be replaced by aParameterBundle coming as formal function parameters. + + // To be able to save the information if somebody calls RSubConnection::SetParameters(...), which is there in + // existing Parameter Bundle we need to copy the information about IMCN Signalling flag which is already there + // iParameterBundle into aParameterBundle. + + // The catch here is that The layer above this must call the SetParameters() to get the parameter values, because + // This particular call adds the granted status + + // Check for the existance of the appropriate family + CSubConParameterFamily * imCnFamily = iParameterBundle != NULL ? iParameterBundle->FindFamily(KSubConnContextDescrParamsFamily): NULL; + if (imCnFamily) + { + // we have the Family, get the status of IMCN signalling Flag + CSubConImsExtParamSet *imCnSig = static_cast + (imCnFamily->FindExtensionSet(STypeId::CreateSTypeId(KSubConIPParamsUid,KSubConImsExtParamsType), + CSubConParameterFamily::EGranted)); + + // We have the variable, copy the contents + if(imCnSig) + { + CSubConParameterFamily * contextFamily = CSubConParameterFamily::NewL(aParameterBundle,KSubConnContextDescrParamsFamily); + CleanupStack::PushL(contextFamily); + CSubConImsExtParamSet *imCnFlag = CSubConImsExtParamSet::NewL(*contextFamily,CSubConParameterFamily::EGranted); + CleanupStack::Pop(contextFamily); + imCnFlag->SetImsSignallingIndicator(imCnSig->GetImsSignallingIndicator()); + } + } + +#endif // SYMBIAN_NETWORKING_UMTSR5 + + ResetQosRelease(); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + + RPacketQoS::TQoSR5Requested requestedParams; + MapQosParamBundleToEtelL(aParameterBundle, &requestedParams); + CModifyR5QoS* modifyR5QoS = CModifyR5QoS::NewL(*this, *this, requestedParams); + iCurrentPdpFsmReq = modifyR5QoS; + modifyR5QoS->Start(); + +#else + RPacketQoS::TQoSR99_R4Requested requestedParams; + MapQosParamBundleToEtelL(aParameterBundle, &requestedParams); + CModifyR4QoS* modifyR4QoS = CModifyR4QoS::NewL(*this, *this, requestedParams); + iCurrentPdpFsmReq = modifyR4QoS; + modifyR4QoS->Start(); + +#endif // SYMBIAN_NETWORKING_UMTSR5 + +} + + +void CUmtsGprsDefaultSubConnProvd::GetQoSDefaultsL(RPacketQoS::TQoSR99_R4Requested* aParams) +{ + CConnectionSettings& settingAccess = iConnectionProvider->SettingsAccessL(); + TUint32 data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqTrafficClass),data, NULL); + aParams->iReqTrafficClass = (RPacketQoS::TTrafficClass)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinTrafficClass),data, NULL); + aParams->iMinTrafficClass = (RPacketQoS::TTrafficClass)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqDeliveryOrder),data, NULL); + aParams->iReqDeliveryOrderReqd = (RPacketQoS::TDeliveryOrder)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinDeliveryOrder),data, NULL); + aParams->iMinDeliveryOrderReqd = (RPacketQoS::TDeliveryOrder)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqDeliverErroneousSDU),data, NULL); + aParams->iReqDeliverErroneousSDU = (RPacketQoS::TErroneousSDUDelivery)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinDeliverErroneousSDU),data, NULL); + aParams->iMinDeliverErroneousSDU = (RPacketQoS::TErroneousSDUDelivery)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMaxSDUSize),data, NULL); + aParams->iReqMaxSDUSize = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinAcceptableMaxSDUSize),data, NULL); + aParams->iMinAcceptableMaxSDUSize = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMaxUplinkRate),data, NULL); + aParams->iReqMaxRate.iUplinkRate = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMinUplinkRate),data, NULL); + aParams->iMinAcceptableMaxRate.iUplinkRate = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMaxDownlinkRate),data, NULL); + aParams->iReqMaxRate.iDownlinkRate = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqMinDownlinkRate),data, NULL); + aParams->iMinAcceptableMaxRate.iDownlinkRate = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqBER),data, NULL); + aParams->iReqBER = (RPacketQoS::TBitErrorRatio)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMaxBER),data, NULL); + aParams->iMaxBER = (RPacketQoS::TBitErrorRatio)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqSDUErrorRatio),data, NULL); + aParams->iReqSDUErrorRatio = (RPacketQoS::TSDUErrorRatio)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMaxSDUErrorRatio),data, NULL); + aParams->iMaxSDUErrorRatio = (RPacketQoS::TSDUErrorRatio)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqTrafficHandlingPriority),data, NULL); + aParams->iReqTrafficHandlingPriority = (RPacketQoS::TTrafficHandlingPriority)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinTrafficHandlingPriority),data, NULL); + aParams->iMinTrafficHandlingPriority = (RPacketQoS::TTrafficHandlingPriority)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqTransferDelay),data, NULL); + aParams->iReqTransferDelay = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMaxTransferDelay),data, NULL); + aParams->iMaxTransferDelay = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqGuaranteedUplinkRate),data, NULL); + aParams->iReqGuaranteedRate.iUplinkRate = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinGuaranteedUplinkRate),data, NULL); + aParams->iMinGuaranteedRate.iUplinkRate = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSReqGuaranteedDownlinkRate),data, NULL); + aParams->iMinGuaranteedRate.iDownlinkRate = (TInt)data; + + settingAccess.GetIntSettingL(TPtrC(KCDTypeNameGPRSMinGuaranteedDownlinkRate),data, NULL); + aParams->iMinGuaranteedRate.iDownlinkRate = (TInt)data; +} + + + + +/** +This override of the DoControl() method is used to initialise the RPdpFsmInterface object +in the SpudMan with a pointer to the real CPdpFsmInterface object owned by the +subconnection provider. + +@param aOptionLevel +@param aOptionName +@param aOption +*/ +TInt CUmtsGprsDefaultSubConnProvd::DoControl(TUint aOptionLevel, TUint aOptionName, TDes8& aOption) + { + __FLOG_1(_L("CUmtsGprsDefaultSubConnProvd::DoControl [%08x]"), this); + if (aOptionLevel == KSOLInterface && aOptionName == KInitialisePdpFsm) + { + CNifIfBase* nif = *reinterpret_cast(const_cast(aOption.Ptr())); + ASSERT(nif != NULL); + TPckg pdpfsm(iPdpFsm); + return nif->Control(KSOLInterface, KInitialisePdpFsm, pdpfsm); + } + + return CUmtsGprsSubConnProvd::Control(aOptionLevel, aOptionName, aOption); + } + + +CPdpFsmInterface& CUmtsGprsDefaultSubConnProvd::GetPdpFsmInterface() + { + return *iPdpFsm; + } + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProv.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProv.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,764 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Implementation file for the Umts/Gprs SubConnection Provider +// +// + +/** + @file + @internalComponent +*/ + + + +#include +#include "UmtsGprs_subconnProv.h" + +const TInt KQoSMappingBorderDelay = 250; + +#define IN_RANGE_INCLUSIVE(value, left, right) (value >= left && value <= right ) +#define MIN(left, right) (left < right ? left : right) + +//We need to use a cleanup item here becuase CSubConNotificationEvents are not CBase derived. This means that on cleanup, things are not cleaned up as expected +//We therefore need a TCleanupItem to deal with it. +void SubconEventCleanupFunction(TAny* aEvent) + { + CSubConNotificationEvent* ptr = static_cast(aEvent); + delete ptr; + } + +void SubconParamSetCleanupFunction(TAny* aEvent) + { + CSubConParameterSet* ptr = static_cast(aEvent); + delete ptr; + } + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +void CUmtsGprsSubConnProvd::MapQosParamBundleToEtelL(const CSubConParameterBundle& aIn, + RPacketQoS::TQoSR5Requested* aOut) + +#else +// !SYMBIAN_NETWORKING_UMTSR5 + +void CUmtsGprsSubConnProvd::MapQosParamBundleToEtelL(const CSubConParameterBundle& aIn, + RPacketQoS::TQoSR99_R4Requested* aOut) +#endif +// SYMBIAN_NETWORKING_UMTSR5 + { + ASSERT(aOut); + + //Note: There should probably be const and non-const versions of FindFamily. + //There is only non-const, hence casting below. + CSubConParameterFamily* family = const_cast(aIn).FindFamily(KSubConQoSFamily); + if (!family) + { + User::Leave(KErrArgument); + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + // check the UMTS R5 extension first + CSubConQosR5ParamSet* extRequestedR5 = NULL; + CSubConQosR5ParamSet* extAcceptableR5 = NULL; + + extRequestedR5 = static_cast(family->FindExtensionSet( + STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR5ParamsType), CSubConParameterFamily::ERequested)); + + extAcceptableR5 = static_cast(family->FindExtensionSet( + STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR5ParamsType), CSubConParameterFamily::EAcceptable)); + + if (extRequestedR5) + { + MapQosR5ExtensionSetToEtel (*extRequestedR5, extAcceptableR5, aOut); + iParameterRelease = KParameterRel5; + return; + } +#endif + + // No R5 so check the UMTS R99/R4 extension next + CSubConQosR99ParamSet* extRequestedR99 = NULL; + CSubConQosR99ParamSet* extAcceptableR99 = NULL; + extRequestedR99 = static_cast(family->FindExtensionSet( + STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR99ParamsType), CSubConParameterFamily::ERequested)); + + extAcceptableR99 = static_cast(family->FindExtensionSet( + STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR99ParamsType), CSubConParameterFamily::EAcceptable)); + + if (extRequestedR99) + { + MapQosR99ExtensionSetToEtel (*extRequestedR99, extAcceptableR99, aOut); + iParameterRelease = KParameterRel4Rel99; + return; + } + + + // Still nothing specific, try to use the generic params + CSubConQosGenericParamSet* genericRequested = + static_cast(family->GetGenericSet(CSubConParameterFamily::ERequested)); + CSubConQosGenericParamSet* genericAcceptable = + static_cast(family->GetGenericSet(CSubConParameterFamily::EAcceptable)); + + if (genericRequested) + { + MapQosGenericSetToEtel (*genericRequested, genericAcceptable, aOut); + iParameterRelease = KParameterRelGeneric; + return; + } + + // Nothing left that we support + User::Leave(KErrNotSupported); + } + + +/** +Maps given requested and acceptable sets of R99/R4 parameters as defined CSubConQosR99ParamSet +into the Etel format (RPacketQoS::TQoSR99_R4Requested). + +@param aInRequested requested CSubConQosR99ParamSet to be converted +@param aInAcceptable optional acceptable CSubConQosR99ParamSet to be converted +@param aOut RPacketQoS::TQoSR99_R4Requested derived class to be mapped into. +*/ +void CUmtsGprsSubConnProvd::MapQosR99ExtensionSetToEtel(const CSubConQosR99ParamSet& aInRequested, + const CSubConQosR99ParamSet* aInAcceptable, RPacketQoS::TQoSR99_R4Requested* aOut) + { + ASSERT (aOut); + + aOut->iReqTrafficClass = aInRequested.GetTrafficClass(); + aOut->iReqDeliveryOrderReqd = aInRequested.GetDeliveryOrder(); + aOut->iReqDeliverErroneousSDU = aInRequested.GetErroneousSDUDelivery(); + aOut->iReqBER = aInRequested.GetResidualBitErrorRatio(); + aOut->iReqSDUErrorRatio = aInRequested.GetSDUErrorRatio(); + aOut->iReqTrafficHandlingPriority = aInRequested.GetTrafficHandlingPriority(); + aOut->iReqTransferDelay = aInRequested.GetTransferDelay(); + aOut->iReqMaxSDUSize = aInRequested.GetMaxSduSize(); + aOut->iReqMaxRate.iUplinkRate = aInRequested.GetMaxBitrateUplink(); + aOut->iReqMaxRate.iDownlinkRate = aInRequested.GetMaxBitrateDownlink(); + aOut->iReqGuaranteedRate.iUplinkRate = aInRequested.GetGuaBitrateUplink(); + aOut->iReqGuaranteedRate.iDownlinkRate = aInRequested.GetGuaBitrateDownlink(); + + if (!aInAcceptable) + { + // when aInAcceptable is ommitted the minimum is the requested + aInAcceptable = &aInRequested; + } + + aOut->iMinTrafficClass = aInAcceptable->GetTrafficClass(); + aOut->iMinDeliveryOrderReqd = aInAcceptable->GetDeliveryOrder(); + aOut->iMinDeliverErroneousSDU = aInAcceptable->GetErroneousSDUDelivery(); + aOut->iMaxBER = aInAcceptable->GetResidualBitErrorRatio(); + aOut->iMaxSDUErrorRatio = aInAcceptable->GetSDUErrorRatio(); + aOut->iMinTrafficHandlingPriority = aInAcceptable->GetTrafficHandlingPriority(); + aOut->iMaxTransferDelay = aInAcceptable->GetTransferDelay(); + aOut->iMinAcceptableMaxSDUSize = aInAcceptable->GetMaxSduSize(); + aOut->iMinAcceptableMaxRate.iUplinkRate = aInAcceptable->GetMaxBitrateUplink(); + aOut->iMinAcceptableMaxRate.iDownlinkRate = aInAcceptable->GetMaxBitrateDownlink(); + aOut->iMinGuaranteedRate.iUplinkRate = aInAcceptable->GetGuaBitrateUplink(); + aOut->iMinGuaranteedRate.iDownlinkRate = aInAcceptable->GetGuaBitrateDownlink(); + } + + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +/** +Maps given requested and acceptable sets of R5 parameters as defined CSubConQosR5ParamSet +into the Etel format (RPacketQoS::TQoSR5Requested). + + +@param aInRequested requested CSubConQosR5ParamSet to be converted +@param aInAcceptable optional acceptable CSubConQosR5ParamSet to be converted +@param aOut RPacketQoS::TQoSR5Requested derived class to be mapped into. +*/ +void CUmtsGprsSubConnProvd::MapQosR5ExtensionSetToEtel(const CSubConQosR5ParamSet& aInRequested, + const CSubConQosR5ParamSet* aInAcceptable, RPacketQoS::TQoSR5Requested* aOut) + { + MapQosR99ExtensionSetToEtel(aInRequested,aInAcceptable,aOut); + aOut->iSourceStatisticsDescriptor = aInRequested.GetSourceStatisticsDescriptor(); + aOut->iSignallingIndication = aInRequested.GetSignallingIndicator(); + } + + +void CUmtsGprsSubConnProvd::MapQosR99ExtensionSetToEtel(const CSubConQosR99ParamSet& aInRequested, + const CSubConQosR99ParamSet* aInAcceptable, RPacketQoS::TQoSR5Requested* aOut) + { + MapQosR99ExtensionSetToEtel(aInRequested, aInAcceptable, static_cast(aOut)); + aOut->iSourceStatisticsDescriptor = RPacketQoS::ESourceStatisticsDescriptorUnknown; + aOut->iSignallingIndication = EFalse; + } + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + +/** +Given a set of generic parameters, the method derives the R99 value for the traffic class. + + +@param aIn requested CSubConQosGenericParamSet to be converted +@return the value of RPacketQoS::TTrafficClass +*/ +RPacketQoS::TTrafficClass CUmtsGprsSubConnProvd::DeriveTrafficClass(const CSubConQosGenericParamSet& aIn ) + { + //----------------------------------- + // Traffic class + //----------------------------------- + if (IN_RANGE_INCLUSIVE(aIn.GetUpLinkDelay(), 0, KQoSMappingBorderDelay-1) || + IN_RANGE_INCLUSIVE(aIn.GetDownLinkDelay(), 0, KQoSMappingBorderDelay-1) ) + { + return RPacketQoS::ETrafficClassConversational; + } + else if (aIn.GetUpLinkDelay() >= KQoSMappingBorderDelay || + aIn.GetDownLinkDelay() >= KQoSMappingBorderDelay ) + { + return RPacketQoS::ETrafficClassStreaming; + } + else if (IN_RANGE_INCLUSIVE(aIn.GetUpLinkPriority(), 1, 3) || + IN_RANGE_INCLUSIVE(aIn.GetDownLinkPriority(), 1, 3)) + { + return RPacketQoS::ETrafficClassInteractive; + } + + return RPacketQoS::ETrafficClassBackground; + } + + +/** +Given a set of generic parameters, the method derives the R99 value for the traffic priority. + + +@param aIn requested CSubConQosGenericParamSet to be converted +@return the value of RPacketQoS::TTrafficHandlingPriority +*/ +RPacketQoS::TTrafficHandlingPriority CUmtsGprsSubConnProvd::DeriveTrafficPriority(const CSubConQosGenericParamSet& aIn ) + { + // + // Traffic handling priority + // + if (aIn.GetUpLinkPriority() == 1 || aIn.GetDownLinkPriority() == 1) + { + return RPacketQoS::ETrafficPriority1; + } + else if (aIn.GetUpLinkPriority() == 2 || aIn.GetDownLinkPriority() == 2) + { + return RPacketQoS::ETrafficPriority2; + } + + return RPacketQoS::ETrafficPriority3; + } + + +/** +Maps given requested and acceptable sets of generic QoS parameters as defined CSubConQosGenericParamSet +into the Etel format (RPacketQoS::TQoSR99_R4Requested). + + +@param aInRequested requested CSubConQosGenericParamSet to be converted +@param aInAcceptable optional acceptable CSubConQosGenericParamSet to be converted +@param aOut RPacketQoS::TQoSR99_R4Requested to be produced. +*/ +void CUmtsGprsSubConnProvd::MapQosGenericSetToEtel(const CSubConQosGenericParamSet& aInRequested, + const CSubConQosGenericParamSet* aInAcceptable, RPacketQoS::TQoSR99_R4Requested* aOut) + { + ASSERT (aOut); + + aOut->iReqDeliveryOrderReqd = RPacketQoS::EDeliveryOrderNotRequired; + aOut->iReqDeliverErroneousSDU = RPacketQoS::EErroneousSDUDeliveryNotRequired;; + aOut->iReqBER = RPacketQoS::EBERUnspecified; + aOut->iReqSDUErrorRatio = RPacketQoS::ESDUErrorRatioUnspecified; + + aOut->iReqTrafficClass = DeriveTrafficClass(aInRequested); + aOut->iReqTrafficHandlingPriority = DeriveTrafficPriority(aInRequested); + aOut->iReqTransferDelay = MIN(aInRequested.GetUpLinkDelay(), aInRequested.GetDownLinkDelay()); + aOut->iReqMaxSDUSize = aInRequested.GetUpLinkMaximumPacketSize(); + aOut->iReqMaxRate.iUplinkRate = aInRequested.GetUplinkBandwidth(); + aOut->iReqMaxRate.iDownlinkRate = aInRequested.GetDownlinkBandwidth(); + aOut->iReqGuaranteedRate.iUplinkRate = aInRequested.GetUplinkBandwidth(); + aOut->iReqGuaranteedRate.iDownlinkRate = aInRequested.GetDownlinkBandwidth(); + + if (!aInAcceptable) + { + // when aInAcceptable is ommitted the minimum is the requested + aInAcceptable = &aInRequested; + } + + aOut->iMinDeliveryOrderReqd = RPacketQoS::EDeliveryOrderNotRequired; + aOut->iMinDeliverErroneousSDU = RPacketQoS::EErroneousSDUDeliveryNotRequired; + aOut->iMaxBER = RPacketQoS::EBERUnspecified; + aOut->iMaxSDUErrorRatio = RPacketQoS::ESDUErrorRatioUnspecified; + + aOut->iMinTrafficClass = DeriveTrafficClass(*aInAcceptable); + aOut->iMinTrafficHandlingPriority = DeriveTrafficPriority(*aInAcceptable); + aOut->iMaxTransferDelay = MIN(aInAcceptable->GetUpLinkDelay(), aInAcceptable->GetDownLinkDelay()); + aOut->iMinAcceptableMaxSDUSize = aInAcceptable->GetUpLinkMaximumPacketSize(); + aOut->iMinAcceptableMaxRate.iUplinkRate = aInAcceptable->GetUplinkBandwidth(); + aOut->iMinAcceptableMaxRate.iDownlinkRate = aInAcceptable->GetDownlinkBandwidth(); + aOut->iMinGuaranteedRate.iUplinkRate = aInAcceptable->GetUplinkBandwidth(); + aOut->iMinGuaranteedRate.iDownlinkRate = aInAcceptable->GetDownlinkBandwidth(); + } + + + +/** +Maps QoS parameters received from the network via Etel into a CSubConGenEventParamsGranted class +so that it is usable by the RSubConnection API. + +@param aNetworkQoS - A pointer to an Etel TPacketDataConfigBase class containing the +QoS to be mapped into the QoS event. +@param aGranted - A reference to the CSubConGenEventParamsGranted object that should receive the mapped +QoS parameters. +*/ +void CUmtsGprsSubConnProvd::MapQosEtelToGrantedParamsL (TPacketDataConfigBase* aNetworkQoS,CSubConGenEventParamsGranted& aGranted) + { + ASSERT (aNetworkQoS); + + // Always set the generic set + MapQosEtelToGenericSetL ((static_cast(aNetworkQoS)), aGranted); + + + + switch (iParameterRelease) + { +#ifdef SYMBIAN_NETWORKING_UMTSR5 + case KParameterRel5: + // Control client sent us an R5 qos request + MapQosEtelToR5SetL ((static_cast(aNetworkQoS)), aGranted); + break; +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + case KParameterRelInvalid: +#ifdef SYMBIAN_NETWORKING_UMTSR5 + // This will be the case if the client hasn't actually requested a level of QoS yet + // but the network has notified us of a QoS change. We don't know what the client might + // support so return both sets (if the define is set, else just what the code supports) + MapQosEtelToR5SetL ((static_cast(aNetworkQoS)), aGranted); +#endif + MapQosEtelToR99SetL ((static_cast(aNetworkQoS)), aGranted); + break; + + case KParameterRel4Rel99: + // Control client sent us an R4/R99 qos request + MapQosEtelToR99SetL ((static_cast(aNetworkQoS)), aGranted); + break; + + case KParameterRelGeneric: + // Generic set always returned. Done above. + break; + } + } + + +/** +Maps QoS parameters received from the network via Etel into a 3GPP Release R4/R99 set and +sets it in the given event. + +@param aNetworkQoS - A pointer to an Etel RPacketQoS::TQoSR99_R4Requested derived class containing +the QoS to be mapped. +@param aGranted - A reference to the CSubConGenEventParamsGranted object that should receive the +extension QoS parameters. +*/ +void CUmtsGprsSubConnProvd::MapQosEtelToR99SetL (RPacketQoS::TQoSR99_R4Negotiated* aNetworkQoS, + CSubConGenEventParamsGranted& aGranted) + { + ASSERT (aNetworkQoS); + + CSubConQosR99ParamSet* r99Extension = CSubConQosR99ParamSet::NewL (); + CleanupStack::PushL(TCleanupItem(SubconParamSetCleanupFunction,r99Extension)); + r99Extension->SetTrafficClass(aNetworkQoS->iTrafficClass); + r99Extension->SetDeliveryOrder(aNetworkQoS->iDeliveryOrderReqd); + r99Extension->SetErroneousSDUDelivery(aNetworkQoS->iDeliverErroneousSDU); + r99Extension->SetResidualBitErrorRatio(aNetworkQoS->iBER); + r99Extension->SetSDUErrorRatio(aNetworkQoS->iSDUErrorRatio); + r99Extension->SetTrafficHandlingPriority(aNetworkQoS->iTrafficHandlingPriority); + r99Extension->SetTransferDelay(aNetworkQoS->iTransferDelay); + r99Extension->SetMaxSduSize(aNetworkQoS->iMaxSDUSize); + r99Extension->SetMaxBitrateUplink(aNetworkQoS->iMaxRate.iUplinkRate); + r99Extension->SetMaxBitrateDownlink(aNetworkQoS->iMaxRate.iDownlinkRate); + r99Extension->SetGuaBitrateUplink(aNetworkQoS->iGuaranteedRate.iUplinkRate); + r99Extension->SetGuaBitrateDownlink(aNetworkQoS->iGuaranteedRate.iDownlinkRate); + + aGranted.AddExtensionSetL (r99Extension); + CleanupStack::Pop(); //r99Extension + } + +#ifdef SYMBIAN_NETWORKING_UMTSR5 +/** +Maps QoS parameters received from the network via Etel into a 3GPP Release R5 set and +sets it in the given event. + +@param aNetworkQoS - A pointer to an Etel RPacketQoS::TQoSR5Requested derived class containing +the QoS to be mapped. +@param aGranted - A reference to the CSubConGenEventParamsGranted object that should receive the +extension QoS parameters. +*/ +void CUmtsGprsSubConnProvd::MapQosEtelToR5SetL (RPacketQoS::TQoSR5Negotiated* aNetworkQoS, + CSubConGenEventParamsGranted& aGranted) + { + ASSERT (aNetworkQoS); + + CSubConQosR5ParamSet* r5Extension = CSubConQosR5ParamSet::NewL (); + CleanupStack::PushL(TCleanupItem(SubconParamSetCleanupFunction,r5Extension)); + r5Extension->SetTrafficClass(aNetworkQoS->iTrafficClass); + r5Extension->SetDeliveryOrder(aNetworkQoS->iDeliveryOrderReqd); + r5Extension->SetErroneousSDUDelivery(aNetworkQoS->iDeliverErroneousSDU); + r5Extension->SetResidualBitErrorRatio(aNetworkQoS->iBER); + r5Extension->SetSDUErrorRatio(aNetworkQoS->iSDUErrorRatio); + r5Extension->SetTrafficHandlingPriority(aNetworkQoS->iTrafficHandlingPriority); + r5Extension->SetTransferDelay(aNetworkQoS->iTransferDelay); + r5Extension->SetMaxSduSize(aNetworkQoS->iMaxSDUSize); + r5Extension->SetMaxBitrateUplink(aNetworkQoS->iMaxRate.iUplinkRate); + r5Extension->SetMaxBitrateDownlink(aNetworkQoS->iMaxRate.iDownlinkRate); + r5Extension->SetGuaBitrateUplink(aNetworkQoS->iGuaranteedRate.iUplinkRate); + r5Extension->SetGuaBitrateDownlink(aNetworkQoS->iGuaranteedRate.iDownlinkRate); + + r5Extension->SetSourceStatisticsDescriptor(aNetworkQoS->iSourceStatisticsDescriptor); + r5Extension->SetSignallingIndicator(aNetworkQoS->iSignallingIndication); + + aGranted.AddExtensionSetL (r5Extension); + CleanupStack::Pop(); //r5Extension + } + + +#endif +// SYMBIAN_NETWORKING_UMTSR5 + + +/** +Maps QoS parameters received from the network via Etel into a generic set and sets it in the given event. + +@param aNetworkQoS - A pointer to an Etel RPacketQoS::TQoSR99_R4Requested derived class containing the QoS +to be mapped. +@param aFamily - A reference to the CSubConGenEventParamsGranted object that should receive the +generic QoS parameters. +*/ +void CUmtsGprsSubConnProvd::MapQosEtelToGenericSetL (RPacketQoS::TQoSR99_R4Negotiated* aNetworkQoS, + CSubConGenEventParamsGranted& aGranted) + { + ASSERT (aNetworkQoS); + + CSubConQosGenericParamSet* genericQoS = CSubConQosGenericParamSet::NewL (); + + genericQoS->SetDownlinkBandwidth (aNetworkQoS->iGuaranteedRate.iDownlinkRate); + genericQoS->SetUplinkBandwidth (aNetworkQoS->iGuaranteedRate.iUplinkRate); + genericQoS->SetDownLinkDelay (aNetworkQoS->iTransferDelay); + genericQoS->SetUpLinkDelay (aNetworkQoS->iTransferDelay); + genericQoS->SetDownLinkMaximumPacketSize (aNetworkQoS->iMaxSDUSize); + genericQoS->SetUpLinkMaximumPacketSize (aNetworkQoS->iMaxSDUSize); + + switch (aNetworkQoS->iTrafficHandlingPriority) + { + case RPacketQoS::ETrafficPriority1: + genericQoS->SetDownLinkPriority (RPacketQoS::ETrafficPriority1); + genericQoS->SetUpLinkPriority (RPacketQoS::ETrafficPriority1); + break; + + case RPacketQoS::ETrafficPriority2: + genericQoS->SetDownLinkPriority (RPacketQoS::ETrafficPriority2); + genericQoS->SetUpLinkPriority (RPacketQoS::ETrafficPriority2); + break; + + case RPacketQoS::ETrafficPriority3: + genericQoS->SetDownLinkPriority (RPacketQoS::ETrafficPriority3); + genericQoS->SetUpLinkPriority (RPacketQoS::ETrafficPriority3); + break; + + default: + genericQoS->SetDownLinkPriority (RPacketQoS::ETrafficPriorityUnspecified); + genericQoS->SetUpLinkPriority (RPacketQoS::ETrafficPriorityUnspecified); + break; + } + + aGranted.SetGenericSet (genericQoS); + } + + + +CPdpFsmInterface& CUmtsGprsSubConnProvd::GetPdpFsmInterface() + { + return GetDefaultSubConnection().GetPdpFsmInterface(); + } + + +TBool CUmtsGprsSubConnProvd::PdpFsmEvent(TContextId aContextId, TInt aEvent, TInt aParam) + { + if (iCurrentPdpFsmReq) + { + TBool handled(EFalse); + handled = iCurrentPdpFsmReq->PdpFsmEvent(aContextId, aEvent, aParam); + return handled; + } + + // Any events that are not a result of a request that we've made must be forwarded to + // control clients. + + switch(aEvent) + { + case KContextParametersChangeEvent: + // For QoS Changed the event must be processed here, it doesn't occur as a response + // to something we've requested. + __FLOG_2(_L("CUmtsGprsSubConnProvd [this=%08x]:\tPdpFsmEvent(): QoS Params Changed [aParam=%d]"), this, aParam); + TRAP_IGNORE(NotifyParamsChangedL(aParam)); + break; + + case KContextDeleteEvent: + // For network-initiate close of PDP context. + __FLOG_2(_L("CUmtsGprsSubConnProvd [this=%08x]:\tPdpFsmEvent(): Context Delete Event [aParam=%d]"), this, aParam); + TRAP_IGNORE(NotifySubConDownL(aParam)); + break; + + case KContextBlockedEvent: // A PDP context becomes blocked + case KContextUnblockedEvent: // A PDP context becomes unblocked + case KNetworkStatusEvent: // For different network indications + case KContextQoSSetEvent: // Response to KContextQoSSet + case KContextTFTModifiedEvent: // Response to KContextTFTModify + case KPrimaryContextCreated: // Primary context at startup created + case KSecondaryContextCreated: // Secondary context created + case KContextModifyActiveEvent: // Response to KModifyActive + case KGetNegQoSEvent: // Response to KGetNegQoS. ** Used internally by NIF ** + default: + // Do nothing. + break; + } + + // Although we have notified the change of qos to the client application we haven't handled this + // event. We can get here because the network changed the QoS without a request from us, or + // because a secondary context (actually owned by GuQoS) has been promoted to default. + return EFalse; + } + +void CUmtsGprsSubConnProvd::NotifySubConDownL(TInt aError) + { + CSubConGenEventSubConDown* event = CSubConGenEventSubConDown::NewL(); + CleanupStack::PushL(TCleanupItem(SubconEventCleanupFunction, event)); + event->SetError(aError); + NotifyClientEvent(*event); + CleanupStack::PopAndDestroy (); //event + } + + +void CUmtsGprsSubConnProvd::NotifyParamsChangedL(TInt aError) + { + CSubConGenEventParamsChanged* event = CSubConGenEventParamsChanged::NewL(); + CleanupStack::PushL(TCleanupItem(SubconEventCleanupFunction, event)); + event->SetFamily (KSubConQoSFamily); + event->SetError (aError); + +#ifdef SYMBIAN_NETWORKING_UMTSR5 + RPacketQoS::TQoSR5Negotiated negotiatedQoS; +#else + RPacketQoS::TQoSR99_R4Negotiated negotiatedQoS; +#endif + + GetPdpFsmInterface().Get(GetContextId(), negotiatedQoS); + MapQosEtelToGrantedParamsL(&negotiatedQoS, *event); + NotifyClientEvent (*event); + CleanupStack::PopAndDestroy (); //event + } + + +MConnectionDataClient* CUmtsGprsSubConnProvd::DoSelfConnectionDataClient() + { + return this; + } + + +CPdpFsmRequestBase::CPdpFsmRequestBase(CUmtsGprsSubConnProvd& aProvider, MPdpFsmRequestOwner& aOwner) + :iProvider(aProvider), iOwner(aOwner) + { + __FLOG_OPEN(KUmtsGprsLogTag1, KUmtsGprsLogTag2); + } + + +CSubConnectionProviderBase* CUmtsGprsSubConnProvd::DoNextLayer() + { + __FLOG_1(_L("CUmtsGprsSubConnProvd::DoNextLayer [this=%08x] - this is (by design) the last layer"), this); + return NULL; + } + + +//-========================================================= +// +// Ignored overrides. +// +//-========================================================= + + + +/** Convert the given parameter budle to Etel language (r99) and if at the time possible, submit the request SPUDFSM. +@param +*/ +void CUmtsGprsSubConnProvd::DoParametersAboutToBeSetL(CSubConParameterBundle& /*aParameterBundle*/) + { + __FLOG_1(_L("CUmtsGprsSubConnProvd::DoParametersAboutToBeSetL [this=%08x]"), this); + + iParameterRelease = KParameterRelInvalid; + //TODO: implement set qos on secondaries when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + } + + +CConnDataTransfer& CUmtsGprsSubConnProvd::DoDataTransferL() + { + //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + User::Leave(KErrNotSupported); + return iNextLayer->DataTransferL(); + } + + + +/** +From MConnectionDataClient +*/ +void CUmtsGprsSubConnProvd::Notify(TNotify /*aNotifyType*/, CConnectionProviderBase* /*aConnProvider*/, + TInt /*aError*/, const CConNotificationEvent* /*aConNotificationEvent*/) + { + //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + } + +/** +From MConnectionDataClient +*/ +void CUmtsGprsSubConnProvd::AttachToNext(CSubConnectionProviderBase* /*aSubConnProvider*/) + { + //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + } + +/** +From MConnectionDataClient +*/ +void CUmtsGprsSubConnProvd::ConnectionGoingDown(CConnectionProviderBase& aConnProvider) + { + (void)aConnProvider; + __FLOG_2(_L("CUmtsGprsSubConnProvd [this=%08x]:\tConnectionGoingDown() [aConnProvider=%08x]"), this, &aConnProvider); + iConnectionProvider = NULL; + DeleteMeNow(); + } + +/** +From MConnectionDataClient +*/ +void CUmtsGprsSubConnProvd::ConnectionError(TInt /*aStage*/, TInt /*aError*/) + { + //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + } + +/** +Function called by Connection Provider when a socket is to be added to the QoS Flow ('this') + +@param aDataClient Data Client to add to the QoS Channel +*/ +void CUmtsGprsSubConnProvd::DoDataClientJoiningL(MSubConnectionDataClient& aDataClient) + { + (void)aDataClient; + __FLOG_3(_L("CUmtsGprsSubConnProvd [this=%08x]:\tDoDataClientJoiningL() [iDataClients.Count=%d] [aDataClient=%08x]"), this, iDataClients.Count(), &aDataClient); + //We're not interested in knowing about MSubConnectionDataClient joining this sub-connection + } + +/** +Function called by Connection Provider when a socket is to be removed from the QoS Flow ('this') + +@param aDataClient Data Client to remove from this QoS Channel +*/ +void CUmtsGprsSubConnProvd::DoDataClientLeaving(MSubConnectionDataClient& aDataClient) + { + (void)aDataClient; + __FLOG_3(_L("CUmtsGprsSubConnProvd [this=%08x]:\tDoDataClientLeaving() [iDataClients.Count=%d] [aDataClient=%08x]"), this, iDataClients.Count(), &aDataClient); + aDataClient.LeaveComplete (*this); + } + +/** +Function called by SubConnection Provider when a control client is to join to this the QoS Flow ('this') + +@param aControlClient Control Client to remove from this QoS Channel +*/ +void CUmtsGprsSubConnProvd::DoControlClientJoiningL(MSubConnectionControlClient& aControlClient) + { + (void)aControlClient; + __FLOG_3(_L("CUmtsGprsSubConnProvd [this=%08x]:\tDoControlClientJoiningL() [iControlClients.Count=%d] [aControlClient=%08x]"), this, iControlClients.Count(), &aControlClient); + //We're not interested in knowing about MSubConnectionControlClient joining this sub-connection + } + +/** +Function called by SubConnection Provider when a control client is to be removed from the QoS Flow ('this') + +@param aControlClient Control Client to remove from this QoS Channel +*/ +void CUmtsGprsSubConnProvd::DoControlClientLeaving(MSubConnectionControlClient& aControlClient) + { + (void)aControlClient; + __FLOG_3(_L("CUmtsGprsSubConnProvd [this=%08x]:\tDoControlClientLeaving() [iControlClients.Count=%d] [aControlClient=%08x]"), this, iControlClients.Count(), &aControlClient); + //We're not interested in knowing about MSubConnectionControlClient leaving this sub-connection + } + + +/** +@param +*/ +void CUmtsGprsSubConnProvd::DoSourceAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aSource*/) + { + //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + } + +/** +@param +*/ +void CUmtsGprsSubConnProvd::DoDestinationAddressUpdate(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aDestination*/) + { + //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + } + +void CUmtsGprsSubConnProvd::DoDataClientRouted(MSubConnectionDataClient& /*aDataClient*/, const TSockAddr& /*aSource*/, const TSockAddr& /*aDestination*/, const TDesC8& /*aConnectionInfo*/) +/** + +@param +*/ + { + //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + } + +TInt CUmtsGprsSubConnProvd::DoControl(TUint /*aOptionLevel*/, TUint /*aOptionName*/, TDes8& /*aOption*/) +/** + +@param +*/ + { + __FLOG_1(_L("CUmtsGprsSubConnProvd::DoControl [this=%08x]"), this); + return KErrNotSupported; + } + +void CUmtsGprsSubConnProvd::DoStartL() +/** + +@param +*/ + { + //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + } + +void CUmtsGprsSubConnProvd::DoStop() +/** + +@param +*/ + { + //TODO: implement when UmtsGprsSCPR enables ECreateNew SubConnection Providers. + } + + +CUmtsGprsSubConnProvd::~CUmtsGprsSubConnProvd () + { + __FLOG_1(_L("~CUmtsGprsSubConnProvd [this=%08x]"), this); + if (iConnectionProvider) + { + iConnectionProvider->Leave(*this); + } + delete iCurrentPdpFsmReq; + __FLOG_CLOSE; + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProvFactory.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProvFactory.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,99 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Implementation file for the Umts/Gprs SubConnection Provider Factory +// +// + +/** + @file + @internalComponent +*/ + +#include "UmtsGprs_subconnProvFactory.h" +#include +#include "UmtsGprs_defaultSubconnProv.h" +#include + +/** +Data required for instantiating ECOM Plugin +*/ +const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_PROXY_ENTRY(KUmtsGprsSubConnectionProviderFactoryId, CUmtsGprsSubConnProvdFactory::NewL), + }; + + +/** +ECOM Implementation Factory +*/ +EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) + { + aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); + + return ImplementationTable; + } + + +CUmtsGprsSubConnProvdFactory* CUmtsGprsSubConnProvdFactory::NewL(TAny* aConstructionParameters) +/** +Constructs a Umts/Gprs SubConnection Provider Factory + +@param aConstructionParameters construction data passed by ECOM + +@returns pointer to a constructed factory +*/ + { + CUmtsGprsSubConnProvdFactory* ptr = + new (ELeave) CUmtsGprsSubConnProvdFactory(KUmtsGprsSubConnectionProviderFactoryId, + *(reinterpret_cast(aConstructionParameters))); + + return ptr; + } + + + +CUmtsGprsSubConnProvdFactory::CUmtsGprsSubConnProvdFactory(TUint aFactoryId, + CSubConnectionFactoryContainer& aParentContainer) + : CSubConnectionProviderFactoryBase(aFactoryId, aParentContainer) +/** +Umts/Gprs SubConnection Provider Factory Constructor + +@param aFactoryId ECOM Implementation Id +@param aParentContainer Object Owner +*/ + { + } + + +CUmtsGprsSubConnProvdFactory::~CUmtsGprsSubConnProvdFactory() + { + } + + +CSubConnectionProviderBase* CUmtsGprsSubConnProvdFactory::DoCreateProviderL( + CConnectionProviderBase& aConnProvider, + RSubConnection::TSubConnType aType) + { + CSubConnectionProviderBase* provider = NULL; + if (aType == RSubConnection::EAttachToDefault) + { + provider = CUmtsGprsDefaultSubConnProvd::NewL(*this, aConnProvider); + } + else + { + User::Leave(KErrNotSupported); + } + return provider; + } + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelmultimode/group/BLD.INF --- a/telephonyserver/etelmultimode/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -// Copyright (c) 1999-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Telephony multimode API -// -// - -/** - @file -*/ - -PRJ_EXPORTS - -../INC/ETELMM.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelmm.h) -../INC/secure/ETELMMCS.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelmmcs.h) -../INC/mmretrieve.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmretrieve.h) -../INC/mmlist.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmlist.h) -../INC/etelmmerr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelmmerr.h) -../INC/mpbutil.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mpbutil.h) - -// ROMKIT include - -../group/etelmm.iby /epoc32/rom/include/etelmm.iby - -PRJ_TESTEXPORTS -// scripts files required to run tests -../TETEL/te_EtelMM/TE_EtelMM.script z:/testdata/scripts/te_etelmm.script -../TETEL/te_EtelMM/TE_EtelMM_LCS.script z:/testdata/scripts/te_etelmm_lcs.script -../TETEL/te_EtelMM/Te_EtelMM.iby /epoc32/rom/include/te_etelmm.iby -../TETEL/te_EtelMM/TE_mmLocationServices.ini z:/testdata/configs/te_mmlocationservices.ini - -PRJ_MMPFILES - -../group/etelmm.mmp - -PRJ_TESTMMPFILES - -// D* things are all dummy versions for the test code - -../DTsy/Dmmtsy.mmp support -../TETEL/te_EtelMM/TE_EtelMM.mmp manual - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelmultimode/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserver/etelmultimode/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,52 @@ +// Copyright (c) 1999-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Telephony multimode API +// +// + +/** + @file +*/ + +PRJ_EXPORTS + +../INC/ETELMM.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelmm.h) +../INC/secure/ETELMMCS.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelmmcs.h) +../INC/mmretrieve.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmretrieve.h) +../INC/mmlist.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mmlist.h) +../INC/etelmmerr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelmmerr.h) +../INC/mpbutil.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mpbutil.h) + +// ROMKIT include + +../group/etelmm.iby /epoc32/rom/include/etelmm.iby + +PRJ_TESTEXPORTS +// scripts files required to run tests +../TETEL/te_EtelMM/TE_EtelMM.script z:/testdata/scripts/te_etelmm.script +../TETEL/te_EtelMM/TE_EtelMM_LCS.script z:/testdata/scripts/te_etelmm_lcs.script +../TETEL/te_EtelMM/Te_EtelMM.iby /epoc32/rom/include/te_etelmm.iby +../TETEL/te_EtelMM/TE_mmLocationServices.ini z:/testdata/configs/te_mmlocationservices.ini + +PRJ_MMPFILES + +../group/etelmm.mmp + +PRJ_TESTMMPFILES + +// D* things are all dummy versions for the test code + +../DTsy/Dmmtsy.mmp support +../TETEL/te_EtelMM/TE_EtelMM.mmp manual + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelmultimode/group/telephony_etelmm.mrp --- a/telephonyserver/etelmultimode/group/telephony_etelmm.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelmultimode/group/telephony_etelmm.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_etelmm source \sf\os\cellularsrv\telephonyserver\etelmultimode diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelpacketdata/dtsy/dpcktlog.cpp --- a/telephonyserver/etelpacketdata/dtsy/dpcktlog.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelpacketdata/dtsy/dpcktlog.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -42,7 +42,7 @@ * In debug mode the logfile will not be deleted at start of new session */ { - iFs.Connect(); + User::LeaveIfError(iFs.Connect()); TInt ret=KErrNone; ret=iFile.Open(iFs,KLogFileName,EFileShareAny|EFileWrite); if(ret!=KErrNone) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp --- a/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_etelpckt source \sf\os\cellularsrv\telephonyserver\etelpacketdata binary \sf\os\cellularsrv\telephonyserver\etelpacketdata\group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/INC/ET_PHONE.H --- a/telephonyserver/etelserverandcore/INC/ET_PHONE.H Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/INC/ET_PHONE.H Tue Jun 22 11:02:32 2010 +0100 @@ -53,7 +53,10 @@ static TAny* operator new(TUint aSize,RHeap* aHeap) __NO_THROW; // for a priority client request, the // objects created must all be taken from // the priority heap. - static void operator delete(TAny* aPtr); + static void operator delete(TAny* aPtr); + static void operator delete(TAny* aPtr, TLeave aLeave); + static void operator delete(TAny* aPtr, TUint aExtraSize); + static void operator delete(TAny* aPtr, RHeap* aHeap); public: TTsyReqHandle iTsyReqHandle; @@ -111,7 +114,10 @@ static TAny* operator new(TUint aSize,TLeave aLeave); static TAny* operator new(TUint aSize,TUint aExtraSize) __NO_THROW; static TAny* operator new(TUint aSize,RHeap* aHeap) __NO_THROW; - static void operator delete(TAny* aPtr); + static void operator delete(TAny* aPtr); + static void operator delete(TAny* aPtr, TLeave aLeave); + static void operator delete(TAny* aPtr, TUint aExtraSize); + static void operator delete(TAny* aPtr, RHeap* aHeap); public: HEtelBufC8* iBuf8; // ptr to buffer if narrow diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/INC/ET_PHONE.INL --- a/telephonyserver/etelserverandcore/INC/ET_PHONE.INL Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/INC/ET_PHONE.INL Tue Jun 22 11:02:32 2010 +0100 @@ -43,3 +43,52 @@ return iBufferFull; } + +inline void CReqEntry::operator delete(TAny* aPtr, TLeave ) +// +// overloaded delete - to prevent warning +// + { + operator delete(aPtr); + } + +inline void CReqEntry::operator delete(TAny* aPtr, RHeap *) +// +// overloaded delete - to prevent warning +// + { + operator delete(aPtr); + } + +inline void CReqEntry::operator delete(TAny* aPtr, TUint ) +// +// overloaded delete - to prevent warning +// + { + operator delete(aPtr); + } + + +inline void CBuffer::operator delete(TAny* aPtr, TLeave ) +// +// overloaded delete - to prevent warning +// + { + operator delete(aPtr); + } + +inline void CBuffer::operator delete(TAny* aPtr, RHeap *) +// +// overloaded delete - to prevent warning +// + { + operator delete(aPtr); + } + +inline void CBuffer::operator delete(TAny* aPtr, TUint ) +// +// overloaded delete - to prevent warning +// + { + operator delete(aPtr); + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/INC/etelerr.ra --- a/telephonyserver/etelserverandcore/INC/etelerr.ra Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/INC/etelerr.ra Tue Jun 22 11:02:32 2010 +0100 @@ -1,104 +1,104 @@ -// Copyright (c) 1999-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// - -#include - -RESOURCE ARRAY r_error_res_etel_errors - { - items= - { - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2000 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2001 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2002 - }, - SINGLE_ERROR - { - text=r_error_res_etel_call_dropped; // -2003 - }, - SINGLE_ERROR - { - text=r_error_res_etel_number_busy; // -2004 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2005 - }, - SINGLE_ERROR - { - text= r_error_res_etel_phone_off; // -2006 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2007 - }, - SINGLE_ERROR - { - text=r_error_res_etel_call_not_answered; // -2008 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2009 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2010 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2011 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2012 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2013 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2014 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2015 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2016 - }, - SINGLE_ERROR - { - text=r_error_res_etel_phone_off; // -2017 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -2018 - } - }; - } - -RESOURCE TBUF r_error_res_etel_call_dropped { buf=STRING_r_error_res_etel_call_dropped ; } -RESOURCE TBUF r_error_res_etel_number_busy { buf=STRING_r_error_res_etel_number_busy ; } -RESOURCE TBUF r_error_res_etel_call_not_answered { buf=STRING_r_error_res_etel_call_not_answered; } -RESOURCE TBUF r_error_res_etel_phone_off { buf=STRING_r_error_res_etel_phone_off ; } +// Copyright (c) 1999-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include + +RESOURCE ARRAY r_error_res_etel_errors + { + items= + { + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2000 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2001 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2002 + }, + SINGLE_ERROR + { + text=r_error_res_etel_call_dropped; // -2003 + }, + SINGLE_ERROR + { + text=r_error_res_etel_number_busy; // -2004 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2005 + }, + SINGLE_ERROR + { + text= r_error_res_etel_phone_off; // -2006 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2007 + }, + SINGLE_ERROR + { + text=r_error_res_etel_call_not_answered; // -2008 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2009 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2010 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2011 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2012 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2013 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2014 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2015 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2016 + }, + SINGLE_ERROR + { + text=r_error_res_etel_phone_off; // -2017 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -2018 + } + }; + } + +RESOURCE TBUF r_error_res_etel_call_dropped { buf=STRING_r_error_res_etel_call_dropped ; } +RESOURCE TBUF r_error_res_etel_number_busy { buf=STRING_r_error_res_etel_number_busy ; } +RESOURCE TBUF r_error_res_etel_call_not_answered { buf=STRING_r_error_res_etel_call_not_answered; } +RESOURCE TBUF r_error_res_etel_phone_off { buf=STRING_r_error_res_etel_phone_off ; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/INC/gsmerr.ra --- a/telephonyserver/etelserverandcore/INC/gsmerr.ra Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/INC/gsmerr.ra Tue Jun 22 11:02:32 2010 +0100 @@ -1,1636 +1,1636 @@ -// Copyright (c) 1999-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// - -#include - -RESOURCE ARRAY r_error_res_gsm_errors1 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4001 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4002 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4003 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4004 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4005 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors2 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4065 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors3 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4095 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4096 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_no_network_support; // -4097 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4098 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4099 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4100 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors4 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4111 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors5 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4129 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_allowed; // -4130 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_phone_blacklisted; // -4131 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4132 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_phone_failure; // -4133 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_phone_blacklisted; // -4134 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors6 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4223 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4224 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_no_network_support; // -4225 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4226 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4227 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4228 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4229 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors7 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_invalid_phone_number; // -4257 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4258 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_invalid_phone_number; // -4259 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4260 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4261 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4262 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4263 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_allowed; // -4264 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4265 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4266 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4267 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4268 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4269 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4270 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4271 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4272 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_number_busy; // -4273 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_remote_user_not_available; // -4274 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_remote_user_not_available; // -4275 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4276 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_short_network_failure; // -4277 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_changed_number; // -4278 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4279 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4280 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4281 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_network_failure; // -4282 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4283 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_invalid_phone_number; // -4284 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4285 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4286 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_network_failure; // -4287 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4288 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4289 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_network_busy; // -4290 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4291 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4292 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4293 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_serious_network_failure; // -4294 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4295 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4296 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_short_network_failure; // -4297 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_network_busy; // -4298 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4299 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_network_busy; // -4300 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4301 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4302 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_network_busy; // -4303 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4304 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_service_cannot_be_provided; // -4305 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_check_services; // -4306 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4307 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4308 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4309 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4310 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_no_incoming_calls_in_cug; // -4311 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4312 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_unauthorised_operation; // -4313 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_requested_op_not_available; // -4314 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4315 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4316 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4317 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4318 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_check_services; // -4319 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4320 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_check_services; // -4321 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_check_services; // -4322 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4323 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4324 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_check_services; // -4325 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4326 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4327 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4328 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4329 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4330 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4331 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4332 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4333 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4334 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_check_services; // -4335 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4336 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4337 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4338 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4339 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4340 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4341 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4342 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_only_calls_in_cug; // -4343 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_check_connection_type; // -4344 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4345 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4346 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4347 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4348 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4349 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4350 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4351 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_check_services; // -4352 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4353 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4354 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4355 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4356 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4357 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4358 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4359 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4360 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4361 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4362 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4363 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4364 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4365 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4366 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4367 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors8 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4383 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4384 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_subscriber; // -4385 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4386 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4387 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4388 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4389 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4390 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4391 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4392 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_subscriber; // -4393 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_service_not_provisioned; // -4394 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_service_not_provisioned; // -4395 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4396 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_operator_has_barred_calls; // -4397 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4398 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4399 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4400 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4401 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4402 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4403 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_incompatible_supplementary; // -4404 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4405 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4406 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4407 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4408 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4409 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4410 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4411 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4412 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4413 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4414 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4415 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4416 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4417 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4418 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_missing_parameter; // -4419 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_parameter; // -4420 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_incorrect_service_password; // -4421 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_incorrect_service_password; // -4422 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4423 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4424 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4425 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4426 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_incorrect_password_too_many; // -4427 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors9 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_incorrect_alphabet; // -4455 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4456 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors10 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_too_many_participants; // -4510 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_no_network_resources; // -4511 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4512 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_invalid_phone_number; // -4513 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4514 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4515 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4516 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4517 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4518 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4519 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_allowed; // -4520 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4521 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_call_barred; // -4522 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4523 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4524 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4525 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4526 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4527 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4528 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4529 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4530 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4531 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4532 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_short_network_failure; // -4533 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4534 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4535 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4536 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4537 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4538 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4539 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_subscriber; // -4540 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support2; // -4541 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_subscriber; // -4542 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4543 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4544 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4545 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4546 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4547 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4548 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4549 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_serious_network_failure; // -4550 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4551 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4552 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4553 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_network_busy; // -4554 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4555 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4556 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4557 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4558 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_network_busy; // -4559 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4560 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4561 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_not_subscribed; // -4562 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors11 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_check_services; // -4581 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors12 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4593 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors13 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_network_failure; // -4607 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_error_in_message_content; // -4608 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4609 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4610 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_message_type_not_supported; // -4611 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors14 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_network_failure; // -4623 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors15 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4639 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4640 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_message_type_not_supported; // -4641 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_message_cannot_deliver; // -4642 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors16 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_network_failure; // -4655 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_incorrect_alphabet; // -4656 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_message_type_not_supported; // -4657 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors17 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_network_failure; // -4671 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_cannot_do_operation; // -4672 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4673 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors18 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_network_failure; // -4687 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_support; // -4688 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors19 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_service_centre_busy; // -4704 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_no_service_centre; // -4705 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_service_centre_failure; // -4706 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_service_centre_failure; // -4707 - }, - SINGLE_ERROR - { - flags=EErrorResUnknownErrorFlag; // -4708 - }, - SINGLE_ERROR - { - flags=EErrorResUnknownErrorFlag; // -4709 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_destination_barred; // -4710 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4711 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sms_validity_period; // -4712 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sms_validity_period; // -4713 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors20 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_sms_sim_full; // -4720 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sms_sim_no_storage; // -4721 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sms_error_receiving; // -4722 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sms_no_space; // -4723 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sms_sim_busy; // -4724 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors21 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_unknown_network_failure; // -4767 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors22 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_sms_error_receiving; // -4812 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sms_sim_busy_sms; // -4813 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_op_not_allowed; // -4814 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_phone_does_not_support; // -4815 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_invalid_pdu_mode_param; // -4816 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4817 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4818 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4819 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4820 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4821 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_insert_sim; // -4822 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_pin1_required; // -4823 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4824 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sim_failure; // -4825 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sms_sim_busy; // -4826 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_wrong_sim; // -4827 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_need_puk1; // -4828 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_pin2_required; // -4829 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_need_puk2; // -4830 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4831 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_memory_failure; // -4832 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_memory_failure; // -4833 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_memory_full; // -4834 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4835 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4836 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4837 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4838 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4839 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4840 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -4841 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4842 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_service_not_available; // -4843 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -4844 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors23 - { - items= - { - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -4852 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors24 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -5012 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors25 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_phone_failure; // -5024 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_phone_failure; // -5025 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_phone_busy; // -5026 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_phone_op_not_allowed; // -5027 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_phone_op_not_allowed; // -5028 - }, - SINGLE_ERROR - { - flags=EErrorResBlankErrorFlag; // -5029 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -5030 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -5031 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -5032 - }, - SINGLE_ERROR - { - flags=EErrorResPanicErrorFlag; // -5033 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_insert_sim; // -5034 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_pin1_required; // -5035 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_need_puk1; // -5036 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sim_failure; // -5037 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_sim_busy; // -5038 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_wrong_sim; // -5039 - }, - SINGLE_ERROR - { - text=r_error_res_incorrect_code; // -5040 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_pin2_required; // -5041 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_need_puk2; // -5042 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_memory_full; // -5043 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_memory_failure; // -5044 - }, - SINGLE_ERROR - { - text=r_error_res_cannot_find_information; // -5045 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_memory_failure; // -5046 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_string_too_long; // -5047 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_invalid_characters; // -5048 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_dial_string_too_long; // -5049 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_invalid_characters; // -5050 - }, - SINGLE_ERROR - { - flags=EErrorResUnknownErrorFlag; // -5051 - }, - SINGLE_ERROR - { - flags=EErrorResUnknownErrorFlag; // -5052 - }, - SINGLE_ERROR - { - flags=EErrorResUnknownErrorFlag; // -5053 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_service_not_available; // -5054 - }, - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -5055 - } - }; - } - -RESOURCE ARRAY r_error_res_gsm_errors26 - { - items= - { - SINGLE_ERROR - { - text=r_error_res_gsm_temporary_network_fail; // -5124 - } - }; - } - -RESOURCE TBUF r_error_res_gsm_temporary_network_fail { buf=STRING_r_error_res_gsm_temporary_network_fail ; } -RESOURCE TBUF r_error_res_gsm_no_network_support { buf=STRING_r_error_res_gsm_no_network_support ; } -RESOURCE TBUF r_error_res_gsm_op_not_allowed { buf=STRING_r_error_res_gsm_op_not_allowed ; } -RESOURCE TBUF r_error_res_gsm_phone_blacklisted { buf=STRING_r_error_res_gsm_phone_blacklisted ; } -RESOURCE TBUF r_error_res_gsm_phone_failure { buf=STRING_r_error_res_gsm_phone_failure ; } -RESOURCE TBUF r_error_res_gsm_no_roaming { buf=STRING_r_error_res_gsm_no_roaming ; } -RESOURCE TBUF r_error_res_gsm_network_busy { buf=STRING_r_error_res_gsm_network_busy ; } -RESOURCE TBUF r_error_res_gsm_op_not_support { buf=STRING_r_error_res_gsm_op_not_support ; } -RESOURCE TBUF r_error_res_gsm_op_not_support2 { buf=STRING_r_error_res_gsm_op_not_support2 ; } -RESOURCE TBUF r_error_res_gsm_not_subscribed { buf=STRING_r_error_res_gsm_not_subscribed ; } -RESOURCE TBUF r_error_res_gsm_service_temporarily_broke { buf=STRING_r_error_res_gsm_service_temporarily_broke ; } -RESOURCE TBUF r_error_res_gsm_invalid_phone_number { buf=STRING_r_error_res_gsm_invalid_phone_number ; } -RESOURCE TBUF r_error_res_gsm_number_busy { buf=STRING_r_error_res_gsm_number_busy ; } -RESOURCE TBUF r_error_res_gsm_remote_user_not_available { buf=STRING_r_error_res_gsm_remote_user_not_available ; } -RESOURCE TBUF r_error_res_gsm_short_network_failure { buf=STRING_r_error_res_gsm_short_network_failure ; } -RESOURCE TBUF r_error_res_gsm_changed_number { buf=STRING_r_error_res_gsm_changed_number ; } -RESOURCE TBUF r_error_res_gsm_unknown_network_failure { buf=STRING_r_error_res_gsm_unknown_network_failure ; } -RESOURCE TBUF r_error_res_gsm_serious_network_failure { buf=STRING_r_error_res_gsm_serious_network_failure ; } -RESOURCE TBUF r_error_res_gsm_service_cannot_be_provided { buf=STRING_r_error_res_gsm_service_cannot_be_provided; } -RESOURCE TBUF r_error_res_gsm_check_services { buf=STRING_r_error_res_gsm_check_services ; } -RESOURCE TBUF r_error_res_gsm_no_incoming_calls_in_cug { buf=STRING_r_error_res_gsm_no_incoming_calls_in_cug ; } -RESOURCE TBUF r_error_res_gsm_unauthorised_operation { buf=STRING_r_error_res_gsm_unauthorised_operation ; } -RESOURCE TBUF r_error_res_gsm_requested_op_not_available { buf=STRING_r_error_res_gsm_requested_op_not_available; } -RESOURCE TBUF r_error_res_gsm_only_calls_in_cug { buf=STRING_r_error_res_gsm_only_calls_in_cug ; } -RESOURCE TBUF r_error_res_gsm_check_connection_type { buf=STRING_r_error_res_gsm_check_connection_type ; } -RESOURCE TBUF r_error_res_gsm_unknown_subscriber { buf=STRING_r_error_res_gsm_unknown_subscriber ; } -RESOURCE TBUF r_error_res_gsm_service_not_provisioned { buf=STRING_r_error_res_gsm_service_not_provisioned ; } -RESOURCE TBUF r_error_res_gsm_operator_has_barred_calls { buf=STRING_r_error_res_gsm_operator_has_barred_calls ; } -RESOURCE TBUF r_error_res_gsm_incompatible_supplementary { buf=STRING_r_error_res_gsm_incompatible_supplementary; } -RESOURCE TBUF r_error_res_gsm_missing_parameter { buf=STRING_r_error_res_gsm_missing_parameter ; } -RESOURCE TBUF r_error_res_gsm_unknown_parameter { buf=STRING_r_error_res_gsm_unknown_parameter ; } -RESOURCE TBUF r_error_res_gsm_incorrect_service_password { buf=STRING_r_error_res_gsm_incorrect_service_password; } -RESOURCE TBUF r_error_res_gsm_incorrect_password_too_many { buf=STRING_r_error_res_gsm_incorrect_password_too_many; } -RESOURCE TBUF r_error_res_gsm_incorrect_alphabet { buf=STRING_r_error_res_gsm_incorrect_alphabet ; } -RESOURCE TBUF r_error_res_gsm_too_many_participants { buf=STRING_r_error_res_gsm_too_many_participants ; } -RESOURCE TBUF r_error_res_gsm_no_network_resources { buf=STRING_r_error_res_gsm_no_network_resources ; } -RESOURCE TBUF r_error_res_gsm_call_barred { buf=STRING_r_error_res_gsm_call_barred ; } -RESOURCE TBUF r_error_res_gsm_error_in_message_content { buf=STRING_r_error_res_gsm_error_in_message_content ; } -RESOURCE TBUF r_error_res_gsm_message_type_not_supported { buf=STRING_r_error_res_gsm_message_type_not_supported; } -RESOURCE TBUF r_error_res_gsm_message_cannot_deliver { buf=STRING_r_error_res_gsm_message_cannot_deliver ; } -RESOURCE TBUF r_error_res_gsm_cannot_do_operation { buf=STRING_r_error_res_gsm_cannot_do_operation ; } -RESOURCE TBUF r_error_res_gsm_service_centre_busy { buf=STRING_r_error_res_gsm_service_centre_busy ; } -RESOURCE TBUF r_error_res_gsm_no_service_centre { buf=STRING_r_error_res_gsm_no_service_centre ; } -RESOURCE TBUF r_error_res_gsm_service_centre_failure { buf=STRING_r_error_res_gsm_service_centre_failure ; } -RESOURCE TBUF r_error_res_gsm_destination_barred { buf=STRING_r_error_res_gsm_destination_barred ; } -RESOURCE TBUF r_error_res_gsm_sms_validity_period { buf=STRING_r_error_res_gsm_sms_validity_period ; } -RESOURCE TBUF r_error_res_gsm_sms_sim_full { buf=STRING_r_error_res_gsm_sms_sim_full ; } -RESOURCE TBUF r_error_res_gsm_sms_sim_no_storage { buf=STRING_r_error_res_gsm_sms_sim_no_storage ; } -RESOURCE TBUF r_error_res_gsm_sms_error_receiving { buf=STRING_r_error_res_gsm_sms_error_receiving ; } -RESOURCE TBUF r_error_res_gsm_sms_no_space { buf=STRING_r_error_res_gsm_sms_no_space ; } -RESOURCE TBUF r_error_res_gsm_sms_sim_busy { buf=STRING_r_error_res_gsm_sms_sim_busy ; } -RESOURCE TBUF r_error_res_gsm_sms_sim_busy_sms { buf=STRING_r_error_res_gsm_sms_sim_busy_sms ; } -RESOURCE TBUF r_error_res_gsm_phone_does_not_support { buf=STRING_r_error_res_gsm_phone_does_not_support ; } -RESOURCE TBUF r_error_res_gsm_insert_sim { buf=STRING_r_error_res_gsm_insert_sim ; } -RESOURCE TBUF r_error_res_gsm_pin1_required { buf=STRING_r_error_res_gsm_pin1_required ; } -RESOURCE TBUF r_error_res_gsm_sim_failure { buf=STRING_r_error_res_gsm_sim_failure ; } -RESOURCE TBUF r_error_res_gsm_wrong_sim { buf=STRING_r_error_res_gsm_wrong_sim ; } -RESOURCE TBUF r_error_res_gsm_need_puk1 { buf=STRING_r_error_res_gsm_need_puk1 ; } -RESOURCE TBUF r_error_res_gsm_pin2_required { buf=STRING_r_error_res_gsm_pin2_required ; } -RESOURCE TBUF r_error_res_gsm_need_puk2 { buf=STRING_r_error_res_gsm_need_puk2 ; } -RESOURCE TBUF r_error_res_gsm_memory_failure { buf=STRING_r_error_res_gsm_memory_failure ; } -RESOURCE TBUF r_error_res_gsm_memory_full { buf=STRING_r_error_res_gsm_memory_full ; } -RESOURCE TBUF r_error_res_gsm_service_not_available { buf=STRING_r_error_res_gsm_service_not_available ; } -RESOURCE TBUF r_error_res_gsm_phone_busy { buf=STRING_r_error_res_gsm_phone_busy ; } -RESOURCE TBUF r_error_res_gsm_phone_op_not_allowed { buf=STRING_r_error_res_gsm_phone_op_not_allowed ; } -RESOURCE TBUF r_error_res_gsm_phone_op_not_supported { buf=STRING_r_error_res_gsm_phone_op_not_supported ; } -RESOURCE TBUF r_error_res_gsm_sim_busy { buf=STRING_r_error_res_gsm_sim_busy ; } -RESOURCE TBUF r_error_res_incorrect_code { buf=STRING_r_error_res_incorrect_code ; } -RESOURCE TBUF r_error_res_cannot_find_information { buf=STRING_r_error_res_cannot_find_information ; } -RESOURCE TBUF r_error_res_gsm_string_too_long { buf=STRING_r_error_res_gsm_string_too_long ; } -RESOURCE TBUF r_error_res_gsm_invalid_characters { buf=STRING_r_error_res_gsm_invalid_characters ; } -RESOURCE TBUF r_error_res_gsm_dial_string_too_long { buf=STRING_r_error_res_gsm_dial_string_too_long ; } -RESOURCE TBUF r_error_res_gsm_invalid_pdu_mode_param { buf=STRING_r_error_res_gsm_invalid_pdu_mode_param ; } +// Copyright (c) 1999-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include + +RESOURCE ARRAY r_error_res_gsm_errors1 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4001 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4002 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4003 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4004 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4005 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors2 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4065 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors3 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4095 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4096 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_no_network_support; // -4097 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4098 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4099 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4100 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors4 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4111 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors5 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4129 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_allowed; // -4130 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_phone_blacklisted; // -4131 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4132 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_phone_failure; // -4133 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_phone_blacklisted; // -4134 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors6 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4223 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4224 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_no_network_support; // -4225 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4226 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4227 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4228 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4229 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors7 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_invalid_phone_number; // -4257 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4258 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_invalid_phone_number; // -4259 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4260 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4261 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4262 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4263 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_allowed; // -4264 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4265 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4266 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4267 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4268 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4269 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4270 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4271 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4272 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_number_busy; // -4273 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_remote_user_not_available; // -4274 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_remote_user_not_available; // -4275 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4276 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_short_network_failure; // -4277 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_changed_number; // -4278 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4279 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4280 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4281 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_network_failure; // -4282 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4283 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_invalid_phone_number; // -4284 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4285 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4286 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_network_failure; // -4287 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4288 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4289 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_network_busy; // -4290 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4291 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4292 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4293 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_serious_network_failure; // -4294 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4295 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4296 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_short_network_failure; // -4297 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_network_busy; // -4298 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4299 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_network_busy; // -4300 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4301 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4302 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_network_busy; // -4303 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4304 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_service_cannot_be_provided; // -4305 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_check_services; // -4306 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4307 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4308 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4309 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4310 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_no_incoming_calls_in_cug; // -4311 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4312 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_unauthorised_operation; // -4313 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_requested_op_not_available; // -4314 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4315 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4316 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4317 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4318 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_check_services; // -4319 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4320 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_check_services; // -4321 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_check_services; // -4322 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4323 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4324 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_check_services; // -4325 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4326 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4327 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4328 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4329 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4330 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4331 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4332 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4333 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4334 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_check_services; // -4335 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4336 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4337 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4338 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4339 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4340 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4341 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4342 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_only_calls_in_cug; // -4343 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_check_connection_type; // -4344 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4345 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4346 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4347 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4348 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4349 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4350 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4351 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_check_services; // -4352 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4353 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4354 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4355 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4356 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4357 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4358 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4359 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4360 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4361 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4362 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4363 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4364 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4365 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4366 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4367 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors8 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4383 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4384 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_subscriber; // -4385 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4386 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4387 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4388 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4389 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4390 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4391 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4392 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_subscriber; // -4393 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_service_not_provisioned; // -4394 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_service_not_provisioned; // -4395 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4396 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_operator_has_barred_calls; // -4397 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4398 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4399 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4400 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4401 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4402 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4403 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_incompatible_supplementary; // -4404 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4405 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4406 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4407 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4408 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4409 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4410 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4411 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4412 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4413 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4414 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4415 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4416 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4417 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4418 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_missing_parameter; // -4419 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_parameter; // -4420 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_incorrect_service_password; // -4421 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_incorrect_service_password; // -4422 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4423 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4424 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4425 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4426 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_incorrect_password_too_many; // -4427 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors9 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_incorrect_alphabet; // -4455 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4456 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors10 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_too_many_participants; // -4510 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_no_network_resources; // -4511 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4512 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_invalid_phone_number; // -4513 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4514 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4515 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4516 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4517 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4518 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4519 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_allowed; // -4520 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4521 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_call_barred; // -4522 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4523 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4524 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4525 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4526 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4527 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4528 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4529 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4530 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4531 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4532 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_short_network_failure; // -4533 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4534 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4535 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4536 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4537 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4538 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4539 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_subscriber; // -4540 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support2; // -4541 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_subscriber; // -4542 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4543 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4544 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4545 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4546 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4547 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4548 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4549 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_serious_network_failure; // -4550 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4551 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4552 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4553 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_network_busy; // -4554 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4555 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4556 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4557 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4558 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_network_busy; // -4559 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4560 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4561 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_not_subscribed; // -4562 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors11 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_check_services; // -4581 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors12 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4593 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors13 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_network_failure; // -4607 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_error_in_message_content; // -4608 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4609 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4610 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_message_type_not_supported; // -4611 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors14 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_network_failure; // -4623 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors15 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4639 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4640 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_message_type_not_supported; // -4641 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_message_cannot_deliver; // -4642 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors16 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_network_failure; // -4655 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_incorrect_alphabet; // -4656 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_message_type_not_supported; // -4657 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors17 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_network_failure; // -4671 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_cannot_do_operation; // -4672 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4673 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors18 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_network_failure; // -4687 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_support; // -4688 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors19 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_service_centre_busy; // -4704 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_no_service_centre; // -4705 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_service_centre_failure; // -4706 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_service_centre_failure; // -4707 + }, + SINGLE_ERROR + { + flags=EErrorResUnknownErrorFlag; // -4708 + }, + SINGLE_ERROR + { + flags=EErrorResUnknownErrorFlag; // -4709 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_destination_barred; // -4710 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4711 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sms_validity_period; // -4712 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sms_validity_period; // -4713 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors20 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_sms_sim_full; // -4720 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sms_sim_no_storage; // -4721 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sms_error_receiving; // -4722 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sms_no_space; // -4723 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sms_sim_busy; // -4724 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors21 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_unknown_network_failure; // -4767 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors22 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_sms_error_receiving; // -4812 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sms_sim_busy_sms; // -4813 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_op_not_allowed; // -4814 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_phone_does_not_support; // -4815 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_invalid_pdu_mode_param; // -4816 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4817 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4818 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4819 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4820 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4821 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_insert_sim; // -4822 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_pin1_required; // -4823 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4824 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sim_failure; // -4825 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sms_sim_busy; // -4826 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_wrong_sim; // -4827 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_need_puk1; // -4828 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_pin2_required; // -4829 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_need_puk2; // -4830 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4831 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_memory_failure; // -4832 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_memory_failure; // -4833 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_memory_full; // -4834 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4835 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4836 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4837 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4838 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4839 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4840 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -4841 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4842 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_service_not_available; // -4843 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -4844 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors23 + { + items= + { + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -4852 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors24 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -5012 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors25 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_phone_failure; // -5024 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_phone_failure; // -5025 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_phone_busy; // -5026 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_phone_op_not_allowed; // -5027 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_phone_op_not_allowed; // -5028 + }, + SINGLE_ERROR + { + flags=EErrorResBlankErrorFlag; // -5029 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -5030 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -5031 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -5032 + }, + SINGLE_ERROR + { + flags=EErrorResPanicErrorFlag; // -5033 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_insert_sim; // -5034 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_pin1_required; // -5035 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_need_puk1; // -5036 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sim_failure; // -5037 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_sim_busy; // -5038 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_wrong_sim; // -5039 + }, + SINGLE_ERROR + { + text=r_error_res_incorrect_code; // -5040 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_pin2_required; // -5041 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_need_puk2; // -5042 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_memory_full; // -5043 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_memory_failure; // -5044 + }, + SINGLE_ERROR + { + text=r_error_res_cannot_find_information; // -5045 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_memory_failure; // -5046 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_string_too_long; // -5047 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_invalid_characters; // -5048 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_dial_string_too_long; // -5049 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_invalid_characters; // -5050 + }, + SINGLE_ERROR + { + flags=EErrorResUnknownErrorFlag; // -5051 + }, + SINGLE_ERROR + { + flags=EErrorResUnknownErrorFlag; // -5052 + }, + SINGLE_ERROR + { + flags=EErrorResUnknownErrorFlag; // -5053 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_service_not_available; // -5054 + }, + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -5055 + } + }; + } + +RESOURCE ARRAY r_error_res_gsm_errors26 + { + items= + { + SINGLE_ERROR + { + text=r_error_res_gsm_temporary_network_fail; // -5124 + } + }; + } + +RESOURCE TBUF r_error_res_gsm_temporary_network_fail { buf=STRING_r_error_res_gsm_temporary_network_fail ; } +RESOURCE TBUF r_error_res_gsm_no_network_support { buf=STRING_r_error_res_gsm_no_network_support ; } +RESOURCE TBUF r_error_res_gsm_op_not_allowed { buf=STRING_r_error_res_gsm_op_not_allowed ; } +RESOURCE TBUF r_error_res_gsm_phone_blacklisted { buf=STRING_r_error_res_gsm_phone_blacklisted ; } +RESOURCE TBUF r_error_res_gsm_phone_failure { buf=STRING_r_error_res_gsm_phone_failure ; } +RESOURCE TBUF r_error_res_gsm_no_roaming { buf=STRING_r_error_res_gsm_no_roaming ; } +RESOURCE TBUF r_error_res_gsm_network_busy { buf=STRING_r_error_res_gsm_network_busy ; } +RESOURCE TBUF r_error_res_gsm_op_not_support { buf=STRING_r_error_res_gsm_op_not_support ; } +RESOURCE TBUF r_error_res_gsm_op_not_support2 { buf=STRING_r_error_res_gsm_op_not_support2 ; } +RESOURCE TBUF r_error_res_gsm_not_subscribed { buf=STRING_r_error_res_gsm_not_subscribed ; } +RESOURCE TBUF r_error_res_gsm_service_temporarily_broke { buf=STRING_r_error_res_gsm_service_temporarily_broke ; } +RESOURCE TBUF r_error_res_gsm_invalid_phone_number { buf=STRING_r_error_res_gsm_invalid_phone_number ; } +RESOURCE TBUF r_error_res_gsm_number_busy { buf=STRING_r_error_res_gsm_number_busy ; } +RESOURCE TBUF r_error_res_gsm_remote_user_not_available { buf=STRING_r_error_res_gsm_remote_user_not_available ; } +RESOURCE TBUF r_error_res_gsm_short_network_failure { buf=STRING_r_error_res_gsm_short_network_failure ; } +RESOURCE TBUF r_error_res_gsm_changed_number { buf=STRING_r_error_res_gsm_changed_number ; } +RESOURCE TBUF r_error_res_gsm_unknown_network_failure { buf=STRING_r_error_res_gsm_unknown_network_failure ; } +RESOURCE TBUF r_error_res_gsm_serious_network_failure { buf=STRING_r_error_res_gsm_serious_network_failure ; } +RESOURCE TBUF r_error_res_gsm_service_cannot_be_provided { buf=STRING_r_error_res_gsm_service_cannot_be_provided; } +RESOURCE TBUF r_error_res_gsm_check_services { buf=STRING_r_error_res_gsm_check_services ; } +RESOURCE TBUF r_error_res_gsm_no_incoming_calls_in_cug { buf=STRING_r_error_res_gsm_no_incoming_calls_in_cug ; } +RESOURCE TBUF r_error_res_gsm_unauthorised_operation { buf=STRING_r_error_res_gsm_unauthorised_operation ; } +RESOURCE TBUF r_error_res_gsm_requested_op_not_available { buf=STRING_r_error_res_gsm_requested_op_not_available; } +RESOURCE TBUF r_error_res_gsm_only_calls_in_cug { buf=STRING_r_error_res_gsm_only_calls_in_cug ; } +RESOURCE TBUF r_error_res_gsm_check_connection_type { buf=STRING_r_error_res_gsm_check_connection_type ; } +RESOURCE TBUF r_error_res_gsm_unknown_subscriber { buf=STRING_r_error_res_gsm_unknown_subscriber ; } +RESOURCE TBUF r_error_res_gsm_service_not_provisioned { buf=STRING_r_error_res_gsm_service_not_provisioned ; } +RESOURCE TBUF r_error_res_gsm_operator_has_barred_calls { buf=STRING_r_error_res_gsm_operator_has_barred_calls ; } +RESOURCE TBUF r_error_res_gsm_incompatible_supplementary { buf=STRING_r_error_res_gsm_incompatible_supplementary; } +RESOURCE TBUF r_error_res_gsm_missing_parameter { buf=STRING_r_error_res_gsm_missing_parameter ; } +RESOURCE TBUF r_error_res_gsm_unknown_parameter { buf=STRING_r_error_res_gsm_unknown_parameter ; } +RESOURCE TBUF r_error_res_gsm_incorrect_service_password { buf=STRING_r_error_res_gsm_incorrect_service_password; } +RESOURCE TBUF r_error_res_gsm_incorrect_password_too_many { buf=STRING_r_error_res_gsm_incorrect_password_too_many; } +RESOURCE TBUF r_error_res_gsm_incorrect_alphabet { buf=STRING_r_error_res_gsm_incorrect_alphabet ; } +RESOURCE TBUF r_error_res_gsm_too_many_participants { buf=STRING_r_error_res_gsm_too_many_participants ; } +RESOURCE TBUF r_error_res_gsm_no_network_resources { buf=STRING_r_error_res_gsm_no_network_resources ; } +RESOURCE TBUF r_error_res_gsm_call_barred { buf=STRING_r_error_res_gsm_call_barred ; } +RESOURCE TBUF r_error_res_gsm_error_in_message_content { buf=STRING_r_error_res_gsm_error_in_message_content ; } +RESOURCE TBUF r_error_res_gsm_message_type_not_supported { buf=STRING_r_error_res_gsm_message_type_not_supported; } +RESOURCE TBUF r_error_res_gsm_message_cannot_deliver { buf=STRING_r_error_res_gsm_message_cannot_deliver ; } +RESOURCE TBUF r_error_res_gsm_cannot_do_operation { buf=STRING_r_error_res_gsm_cannot_do_operation ; } +RESOURCE TBUF r_error_res_gsm_service_centre_busy { buf=STRING_r_error_res_gsm_service_centre_busy ; } +RESOURCE TBUF r_error_res_gsm_no_service_centre { buf=STRING_r_error_res_gsm_no_service_centre ; } +RESOURCE TBUF r_error_res_gsm_service_centre_failure { buf=STRING_r_error_res_gsm_service_centre_failure ; } +RESOURCE TBUF r_error_res_gsm_destination_barred { buf=STRING_r_error_res_gsm_destination_barred ; } +RESOURCE TBUF r_error_res_gsm_sms_validity_period { buf=STRING_r_error_res_gsm_sms_validity_period ; } +RESOURCE TBUF r_error_res_gsm_sms_sim_full { buf=STRING_r_error_res_gsm_sms_sim_full ; } +RESOURCE TBUF r_error_res_gsm_sms_sim_no_storage { buf=STRING_r_error_res_gsm_sms_sim_no_storage ; } +RESOURCE TBUF r_error_res_gsm_sms_error_receiving { buf=STRING_r_error_res_gsm_sms_error_receiving ; } +RESOURCE TBUF r_error_res_gsm_sms_no_space { buf=STRING_r_error_res_gsm_sms_no_space ; } +RESOURCE TBUF r_error_res_gsm_sms_sim_busy { buf=STRING_r_error_res_gsm_sms_sim_busy ; } +RESOURCE TBUF r_error_res_gsm_sms_sim_busy_sms { buf=STRING_r_error_res_gsm_sms_sim_busy_sms ; } +RESOURCE TBUF r_error_res_gsm_phone_does_not_support { buf=STRING_r_error_res_gsm_phone_does_not_support ; } +RESOURCE TBUF r_error_res_gsm_insert_sim { buf=STRING_r_error_res_gsm_insert_sim ; } +RESOURCE TBUF r_error_res_gsm_pin1_required { buf=STRING_r_error_res_gsm_pin1_required ; } +RESOURCE TBUF r_error_res_gsm_sim_failure { buf=STRING_r_error_res_gsm_sim_failure ; } +RESOURCE TBUF r_error_res_gsm_wrong_sim { buf=STRING_r_error_res_gsm_wrong_sim ; } +RESOURCE TBUF r_error_res_gsm_need_puk1 { buf=STRING_r_error_res_gsm_need_puk1 ; } +RESOURCE TBUF r_error_res_gsm_pin2_required { buf=STRING_r_error_res_gsm_pin2_required ; } +RESOURCE TBUF r_error_res_gsm_need_puk2 { buf=STRING_r_error_res_gsm_need_puk2 ; } +RESOURCE TBUF r_error_res_gsm_memory_failure { buf=STRING_r_error_res_gsm_memory_failure ; } +RESOURCE TBUF r_error_res_gsm_memory_full { buf=STRING_r_error_res_gsm_memory_full ; } +RESOURCE TBUF r_error_res_gsm_service_not_available { buf=STRING_r_error_res_gsm_service_not_available ; } +RESOURCE TBUF r_error_res_gsm_phone_busy { buf=STRING_r_error_res_gsm_phone_busy ; } +RESOURCE TBUF r_error_res_gsm_phone_op_not_allowed { buf=STRING_r_error_res_gsm_phone_op_not_allowed ; } +RESOURCE TBUF r_error_res_gsm_phone_op_not_supported { buf=STRING_r_error_res_gsm_phone_op_not_supported ; } +RESOURCE TBUF r_error_res_gsm_sim_busy { buf=STRING_r_error_res_gsm_sim_busy ; } +RESOURCE TBUF r_error_res_incorrect_code { buf=STRING_r_error_res_incorrect_code ; } +RESOURCE TBUF r_error_res_cannot_find_information { buf=STRING_r_error_res_cannot_find_information ; } +RESOURCE TBUF r_error_res_gsm_string_too_long { buf=STRING_r_error_res_gsm_string_too_long ; } +RESOURCE TBUF r_error_res_gsm_invalid_characters { buf=STRING_r_error_res_gsm_invalid_characters ; } +RESOURCE TBUF r_error_res_gsm_dial_string_too_long { buf=STRING_r_error_res_gsm_dial_string_too_long ; } +RESOURCE TBUF r_error_res_gsm_invalid_pdu_mode_param { buf=STRING_r_error_res_gsm_invalid_pdu_mode_param ; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP --- a/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -13,11 +13,18 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ET_CORETraces.h" +#endif + #include "ET_SSTD.H" #include "ETBUFFER.H" #include #include "etsvr_slots.h" #include "et_phone_util.h" + // // // CFaxBase @@ -179,7 +186,7 @@ // This is for all object inherit fron CSubSessionBase // { - LOGTEXT("~CCallBase"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CCALLBASE_DTOR_1, "~CCallBase"); } EXPORT_C TInt CCallBase::CancelService(const TInt aIpc,const TTsyReqHandle aTsyReqHandle) @@ -326,7 +333,7 @@ // if is owner then set to EUnOwned // { - LOGTEXT("CCallBase::CloseSubSessionPreProcessing() - about to create dummy session"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CCALLBASE_CLOSESUBSESSIONPREPROCESSING_1, "CCallBase::CloseSubSessionPreProcessing() - about to create dummy session"); CreateDummySession(aSession,aSubSessionHandle); RCall::TOwnershipStatus owner=CheckOwnershipBySession(aSession,aSubSessionHandle); if (owner==RCall::EOwnershipOwnedByThisClient) @@ -674,7 +681,7 @@ // D'Tor // { - LOGTEXT("~CLineBase"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CLINEBASE_DTOR_1, "~CLineBase"); } EXPORT_C TInt CLineBase::CancelService(const TInt aIpc,const TTsyReqHandle aTsyReqHandle) @@ -786,7 +793,7 @@ // // { - LOGTEXT("CLineBase::CloseSubSessionPreProcessing() - about to create dummy session"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CLINEBASE_CLOSESUBSESSIONPREPROCESSING_1, "CLineBase::CloseSubSessionPreProcessing() - about to create dummy session"); CreateDummySession(aSession,aSubSessionHandle); FlushReqs(aSession,aSubSessionHandle); } @@ -862,7 +869,7 @@ // This is for all object inherit fron CSubSesissionBase // { - LOGTEXT("~CPhoneBase"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CPHONEBASE_DTOR_1, "~CPhoneBase"); } // @@ -1051,7 +1058,7 @@ // Add reqEntry to the 'active list' // { - LOGTEXT2("CPhoneBase::AddReqToActive with TsyHandle of %d", aReqEntry->iTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_ADDREQTOACTIVE_1, "CPhoneBase::AddReqToActive with TsyHandle of %d", aReqEntry->iTsyReqHandle); iReqActiveList.AddLast(*aReqEntry); } @@ -1060,7 +1067,7 @@ // Add entry to the 'wait list' // { - LOGTEXT2("CPhoneBase::AddReqToWaiting with TsyHandle of %d", aReqEntry->iTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_ADDREQTOWAITING_1, "CPhoneBase::AddReqToWaiting with TsyHandle of %d", aReqEntry->iTsyReqHandle); iReqWaitList.AddLast(*aReqEntry); } @@ -1110,7 +1117,7 @@ // Find if any active request if so create a dummy session // { - LOGTEXT("CPhoneBase::CloseSubSessionPreProcessing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CPHONEBASE_CLOSESUBSESSIONPREPROCESSING_1, "CPhoneBase::CloseSubSessionPreProcessing"); CreateDummySession(aSession,aSubSessionHandle); FlushReqs(aSession,aSubSessionHandle); } @@ -1270,7 +1277,7 @@ // Increase iFlowControlCnt // { - LOGTEXT3("Incrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt+1); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_FLOWCONTROLINC_1, "Incrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt+1); iFlowControlCnt++; } @@ -1280,7 +1287,7 @@ // { __ASSERT_ALWAYS((iFlowControlCnt>0),Fault(EEtelFaultNegativeFlowcontrolCount)); - LOGTEXT3("Decrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt-1); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_FLOWCONTROLDEC_1, "Decrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt-1); iFlowControlCnt--; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/SETEL/ET_MAN.CPP --- a/telephonyserver/etelserverandcore/SETEL/ET_MAN.CPP Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/SETEL/ET_MAN.CPP Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -18,6 +18,12 @@ */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ET_MANTraces.h" +#endif + #include #include #include "ET_SSTD.H" @@ -250,22 +256,18 @@ TInt found=iTsyModulesCon->FindByName(findHandle,name,foundName); // Is already loaded? if(found==KErrNone) { // The TSY is already loaded, we'll just open, and bump up the reference count. - LOGTEXT("LoadPhoneModuleL\tTSY already loaded - inc ref count"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_1, "LoadPhoneModuleL\tTSY already loaded - inc ref count"); CPhoneFactoryBase* s=REINTERPRET_CAST(CPhoneFactoryBase*,iTsyModulesCon->At(findHandle)); s->Open(); return s; } RLibrary lib; -#ifdef _DEBUG - TBuf8<128> buf; - buf.Copy(aFileName); -#endif // _DEBUG - LOGTEXT2("Loading %S", &buf); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_2, "Loading %S", aFileName); TInt r=lib.Load(aFileName); if (r!=KErrNone) User::Leave(r); - LOGTEXT2("Loaded %S", &buf); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_3, "Loaded %S", aFileName); TCleanupItem libClose(CloseLibrary,&lib); CleanupStack::PushL(libClose); @@ -276,12 +278,12 @@ TPhoneFactoryBaseNewL libEntry=(TPhoneFactoryBaseNewL)lib.Lookup(1); if (libEntry==NULL) User::Leave(KErrBadLibraryEntryPoint); - LOGTEXT("About to get CPhoneFactoryBase ptr"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_4, "About to get CPhoneFactoryBase ptr"); CPhoneFactoryBase* s=NULL; s=(*libEntry)(); // libEntry may leave. if(s==NULL) User::Leave(KErrNoMemory); - LOGTEXT("Got CPhoneFactoryBase ptr"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_LOADPHONEMODULEL_5, "Got CPhoneFactoryBase ptr"); TRAPD(error, s->ConstructL(lib)); if(error) { @@ -471,9 +473,9 @@ TName newName(tsyName); newName.Append(KDash); newName.Append(infoToMatch.iName); // Create unique name - LOGTEXT2("new name = %S", &newName); - LOGTEXT2("tsy name = %S", &tsyName); - LOGTEXT2("old name = %S", &infoToMatch.iName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_1, "new name = %S", newName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_2, "tsy name = %S", tsyName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_3, "old name = %S", infoToMatch.iName); TRAPD(ret,StoreDuplicateNameL(tsyName,infoToMatch.iName,newName));// even if this returns with //KErrAlreadyExists, carry on searching for another match if (ret!=KErrNone && ret!=KErrAlreadyExists) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP --- a/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -17,6 +17,12 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ET_PHONETraces.h" +#endif + #include "ET_SSTD.H" #include "et_record.h" #include "et_phone_util.h" @@ -68,7 +74,7 @@ void CReqEntry::CompleteAndDeque(TInt aError) { - LOGTEXT("CReqEntry::CompleteAndDeque"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREQENTRY_COMPLETEANDDEQUE_1, "CReqEntry::CompleteAndDeque"); // if client does not interested in this request do not completed if (iClientInterested) { @@ -195,7 +201,7 @@ iRead=0; iOverFlow=EFalse; iBufferFull=EFalse; - LOGTEXT2("ETel:\tiRead incremented to %d", iRead); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBUFFER_INCREAD_1, "ETel:\tiRead incremented to %d", iRead); } void CBuffer::IncWrite() @@ -217,7 +223,7 @@ iOverFlow=ETrue; } } - LOGTEXT2("ETel:\tiWrite incremented to %d", iWrite); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBUFFER_INCWRITE_1, "ETel:\tiWrite incremented to %d", iWrite); } TUint8* CBuffer::CurrentSlotData1(TWhichSlot aWhichSlot) const @@ -349,12 +355,12 @@ { if (iDestroyDummySubSession==NULL) { - LOGTEXT("CDestroyDummySubSession object does not already exist and will be created."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_1, "CDestroyDummySubSession object does not already exist and will be created."); iDestroyDummySubSession = CDestroyDummySubSession::NewL(aTelSession->TelServer(),this); } else { - LOGTEXT("CDestroyDummySubSession object already exists and will not be created"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_2, "CDestroyDummySubSession object already exists and will not be created"); } } @@ -365,14 +371,14 @@ // function is called. // { - LOGTEXT2("CreateDummySession() with iDestroyDummySubSession = %x", iDestroyDummySubSession); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSION_1, "CreateDummySession() with iDestroyDummySubSession = %x", iDestroyDummySubSession); iCreateDummy=aCreateDummy; if (iDestroyDummySubSession->iOpen == EFalse) { if ( IsActiveReq(aSession,aSubSessionHandle) || aCreateDummy) { - LOGTEXT("About to create dummy session"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSION_2, "About to create dummy session"); __ASSERT_ALWAYS(aSession!=NULL,Fault(EEtelFaultBadTelSessionPointer)); CObject* theObj=this; while(theObj->Owner()) @@ -387,7 +393,7 @@ // has been previously allocated upon the CTelObject creation (by calling // CreateDummySessionObjectL() ) iTelServer->Inc(); - LOGTEXT2("Added a Dummy Session, producing server's session count of %d", iTelServer->Count()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CREATEDUMMYSESSION_3, "Added a Dummy Session, producing server's session count of %d", iTelServer->Count()); iDestroyDummySubSession->iTelServer = iTelServer; iDestroyDummySubSession->iTelObject = this; @@ -446,7 +452,7 @@ ret=ETrue; } } - LOGTEXT2("IsActiveReq found %d active reqs", iActiveReqCount); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_ISACTIVEREQ_1, "IsActiveReq found %d active reqs", iActiveReqCount); return ret; } @@ -457,7 +463,7 @@ // Only go through the list once set the count to zero at start to count number of requests // { - LOGTEXT("Entered CancelActiveReq"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CANCELACTIVEREQ_1, "Entered CancelActiveReq"); CReqEntry* reqEntry=NULL; TDblQueIter iter(PhoneOwner()->ReqActiveList()); while(reqEntry=iter++,reqEntry!=NULL) // go through the list from begin to end @@ -470,7 +476,7 @@ { if (reqEntry->iPlacedRequest) { - LOGTEXT2("Calling Cancel Service ActiveReq TsyReq=%d", reqEntry->iTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CANCELACTIVEREQ_2, "Calling Cancel Service ActiveReq TsyReq=%d", reqEntry->iTsyReqHandle); reqEntry->iCancelFnCalled=ETrue; CancelService(reqEntry->iFunction,reqEntry->iTsyReqHandle); @@ -496,7 +502,7 @@ } else { - LOGTEXT("Destroying request"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CANCELACTIVEREQ_3, "Destroying request"); DestroyReq(reqEntry); CheckAndDestroyDummySubSession(); } @@ -951,7 +957,7 @@ // { - LOGTEXT2("CTelObject::GeneralReq - IPC=%d", aMessage.Function()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_GENERALREQ_1, "CTelObject::GeneralReq - IPC=%d", aMessage.Function()); RECORD_IPC(aMessage,aSession,this,aFromFlowControlResume); if (aFromFlowControlResume && !aFromFlowControlResume){ ; } // avoid compiler warning when ETEL_RECORDER is not defined @@ -1121,7 +1127,7 @@ TInt error = ResolveError(updatedReqEntry->iSession,aError); // set error as either low or high byte ipc=updatedReqEntry->iFunction; - LOGTEXT4("CTelObject::ReqCompleted, IPC=%d, TsyHandle=%d, Error=%d", ipc, aTsyReqHandle, aError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTELOBJECT_REQCOMPLETED_1, "CTelObject::ReqCompleted, IPC=%d, TsyHandle=%d, Error=%d", ipc, aTsyReqHandle, aError); TReqMode reqMode = updatedReqEntry->iReqMode; TBool ret=EFalse; @@ -1269,7 +1275,7 @@ if (iActiveReqCount) { iActiveReqCount--; - LOGTEXT2("In CheckAndDestroyDummySubSession(), iActiveReqCount down to %d", iActiveReqCount); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_CHECKANDDESTROYDUMMYSUBSESSION_1, "In CheckAndDestroyDummySubSession(), iActiveReqCount down to %d", iActiveReqCount); if ((iActiveReqCount==0) && (iCreateDummy==FALSE)) { __ASSERT_ALWAYS(iDestroyDummySubSession!=NULL,Fault(EEtelFaultBadTelSessionPointer)); @@ -1486,7 +1492,7 @@ // { __ASSERT_ALWAYS(aReqEntry!=NULL,Fault(EEtelFaultCompleteReqWithoutReqEntry)); - LOGTEXT("CTelObject::WriteBackAndCompleteReq"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELOBJECT_WRITEBACKANDCOMPLETEREQ_1, "CTelObject::WriteBackAndCompleteReq"); TInt basicMessageType = (aReqEntry->iMessage.Int1() & ~KPriorityClientReq); switch (basicMessageType) @@ -1833,7 +1839,7 @@ __ASSERT_ALWAYS(aReqEntry!=NULL,Fault(EEtelFaultCallTsyServiceWithoutReqPackage)); TTsyReqHandle tsyReqHandle=aReqEntry->iTsyReqHandle; - LOGTEXT2("Entered ServiceExtFunc with TSY handle %d", tsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSUBSESSIONEXTBASE_SERVICEEXTFUNC_1, "Entered ServiceExtFunc with TSY handle %d", tsyReqHandle); TInt ret=KErrNone; TInt basicMessageType = aMessage.Int1() & ~(KPriorityClientReq); @@ -2033,7 +2039,7 @@ { if (iLibUnloader) { - LOGTEXT("About to call iLibUnloader"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CPHONEFACTORYBASE_DTOR_1, "About to call iLibUnloader"); iLibUnloader->Call(); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/SETEL/ET_SES.CPP --- a/telephonyserver/etelserverandcore/SETEL/ET_SES.CPP Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/SETEL/ET_SES.CPP Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -18,11 +18,16 @@ */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ET_SESTraces.h" +#endif + #include "ET_SSTD.H" #include "e32svr.h" #include "et_record.h" - #define DOUBLE_COLON _L("::") #define ETEL_NAME _L("Etel") #define TSY_EXTENSION _L(".TSY") @@ -98,7 +103,7 @@ CObject* theObj=NULL; TInt count=iObjectIx->Count(); - LOGTEXT2("CTelSession::~CTelSession iObjectIx->Count()=%d", count); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_DTOR_1, "CTelSession::~CTelSession iObjectIx->Count()=%d", count); for(TInt i=0;iOpenPhoneFromFactoryL(phoneFactory,name))); if(res!=KErrNone) { - LOGTEXT2("Open Phone from Factory returned %d", res); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_NEWTELOBJECT_1, "Open Phone from Factory returned %d", res); if(newObject) newObject->TelObjectClose(); else diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/SETEL/ET_SSTD.H --- a/telephonyserver/etelserverandcore/SETEL/ET_SSTD.H Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/SETEL/ET_SSTD.H Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -34,10 +34,6 @@ #include "ETELEXT.H" #endif -#if !defined(__SLOGGER_H__) -#include "ET_SLOG.H" -#endif - #if !defined(__ET_EMERGENCYCLIENT_H__) #include "et_emergencyclient.h" #endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/SETEL/ET_SVR.CPP --- a/telephonyserver/etelserverandcore/SETEL/ET_SVR.CPP Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/SETEL/ET_SVR.CPP Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ET_SVRTraces.h" +#endif + #include #include "ET_SSTD.H" #include @@ -57,7 +63,7 @@ // Destroy the tel object and the the server // { - LOGTEXT("In RunL and about to Destroy the Tel Objects"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDESTROYDUMMYSUBSESSION_RUNL_1, "In RunL and about to Destroy the Tel Objects"); iOpen=EFalse; iTelObject->TelObjectClose(); } @@ -97,18 +103,18 @@ { if((aMessage.Type()==EOptional) || (aMessage.Type()==EGraceful)) { - LOGTEXT("CTelServer received Shutdown. Scheduling shutdown when there's no sessions."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_CFMESSAGESHUTDOWN_1, "CTelServer received Shutdown. Scheduling shutdown when there's no sessions."); iShutGracefully = ETrue; - LOGTEXT2("Session Count is %d", iSessionCount); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_CFMESSAGESHUTDOWN_2, "Session Count is %d", iSessionCount); if(iSessionCount==0) { - LOGTEXT("Calling AsynOneShot::Call()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_CFMESSAGESHUTDOWN_3, "Calling AsynOneShot::Call()"); iSch->Call(); } } else { - LOGTEXT("CTelServer received Shutdown option EUnGraceful. Not supported, ignoring."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_CFMESSAGESHUTDOWN_4, "CTelServer received Shutdown option EUnGraceful. Not supported, ignoring."); } } @@ -143,7 +149,7 @@ // Stop the Active Scheduler (after any libraries have been unloaded) // { - LOGTEXT("In RunL and about to stop CActiveScheduler"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSCHEDULERSTOP_RUNL_1, "In RunL and about to stop CActiveScheduler"); CActiveScheduler::Stop(); } @@ -190,7 +196,7 @@ CTelServer::~CTelServer() { - LOGTEXT("CTelServer::~CTelServer()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DTOR_1, "CTelServer::~CTelServer()"); delete iChannelHandler; delete iPhoneManager; delete iSch; @@ -236,19 +242,19 @@ // Decrement a session stop scheduler if no session // { - LOGTEXT("Entered CTelServer::Dec"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DEC_1, "Entered CTelServer::Dec"); __ASSERT_ALWAYS((iSessionCount>0),Fault(EEtelFaultNegativeSessionCount)); iSessionCount--; - LOGTEXT2("Session Count is %d", iSessionCount); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DEC_2, "Session Count is %d", iSessionCount); // If iShutGracefully==ETrue the Rootserver has informed us that it wants us to shutdown // next time there is no sessions. If it is EFalse no such notification has arrived and // ETel continues running even though there are no sessions. if((iSessionCount==0) && (iShutGracefully)) { - LOGTEXT("Calling AsynOneShot::Call()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DEC_3, "Calling AsynOneShot::Call()"); iSch->Call(); } - LOGTEXT("Exited from CTelServer::Dec"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVER_DEC_4, "Exited from CTelServer::Dec"); } TBool CTelServer::IsPriorityClient(const CTelSession* aSession) const @@ -443,9 +449,9 @@ // RThread::SetProtected is superceded by the security model __UHEAP_MARK; - LOGTEXT("----------New Log----------\015\012"); - LOGTEXT("Entered ETel Server thread"); - LOGTEXTREL("Entered ETel Server thread"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_1, "----------New Log----------\015\012"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_2, "Entered ETel Server thread"); + OstTraceDef0(OST_TRACE_CATEGORY_PRODUCTION, TRACE_BORDERS, ETELSERVERTHREAD_3, "Entered ETel Server thread"); CTrapCleanup* pT; if ((pT=CTrapCleanup::New())==NULL) @@ -471,17 +477,17 @@ Fault(EEtelFaultSvrStartServer); } - LOGTEXT("ETel:\tMeeting rendezvous\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_4, "ETel:\tMeeting rendezvous\n"); RThread::Rendezvous(KErrNone); CTelScheduler::Start(); - LOGTEXT("ETel:\tScheduler has been stopped\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_5, "ETel:\tScheduler has been stopped\n"); delete pT; delete pServer; delete pScheduler; - LOGTEXT("ETel:\tAbout to exit ETel thread function\n"); - LOGTEXTREL("ETel:\tAbout to exit ETel thread function\n"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDERS, ETELSERVERTHREAD_6, "ETel:\tAbout to exit ETel thread function\n"); + OstTraceDef0(OST_TRACE_CATEGORY_PRODUCTION, TRACE_BORDERS, ETELSERVERTHREAD_7, "ETel:\tAbout to exit ETel thread function\n"); __UHEAP_MARKEND; return(KErrNone); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/TETEL/CapTestFramework/BLD.INF --- a/telephonyserver/etelserverandcore/TETEL/CapTestFramework/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -// Copyright (c) 2004-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// - -PRJ_TESTMMPFILES - -TestEtelSrv.mmp - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/TETEL/CapTestFramework/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserver/etelserverandcore/TETEL/CapTestFramework/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,19 @@ +// Copyright (c) 2004-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +PRJ_TESTMMPFILES + +TestEtelSrv.mmp + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/group/BLD.INF --- a/telephonyserver/etelserverandcore/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -// Copyright (c) 1999-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Telephony server and core API -// -// - -/** - @file -*/ - -PRJ_EXPORTS - -../INC/ETEL.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etel.h) -../INC/ETEL.INL SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(etel.inl) -../INC/TSY.RH SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(tsy.rh) -../INC/TSY.HRH /epoc32/include/tsy.hrh -../INC/ETELEXT.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelext.h) -../INC/ET_PHONE.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone.h) -../INC/et_phone_util.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone_util.h) -../INC/ET_PHONE.INL SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone.inl) -../INC/ET_TSY.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_tsy.h) -../INC/secure/ET_CLSVR.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_clsvr.h) -../INC/ET_STRUC.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_struc.h) -../INC/et_struct.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_struct.h) -../INC/EXTERROR.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(exterror.h) -../INC/ETBUFFER.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etbuffer.h) -../INC/etslotnum.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(etslotnum.h) -../INC/etsvr_slots.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etsvr_slots.h) -../INC/Etelutils.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelutils.h) - -../INC/FAXDEFN.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(faxdefn.h) -../INC/fax_reversebytes.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(fax_reversebytes.h) - -../INC/etelerr.ra SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/etelerr.ra) -../INC/gsmerr.ra SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/gsmerr.ra) -../INC/etelerr.rls SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/etelerr.rls) -../INC/gsmerr.rls SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/gsmerr.rls) - -../group/etel.iby /epoc32/rom/include/etel.iby -../group/telephony.iby /epoc32/rom/include/telephony.iby - -#include "../data/bld.inf" - - -PRJ_TESTEXPORTS -// scripts files required to run tests -../TETEL/TE_ETEL/TE_Etel.script z:/testdata/scripts/te_etel.script - -../TETEL/TE_ETEL/TE_Etel.iby /epoc32/rom/include/te_etel.iby - -// epoc.ini alterntive and batchfile for replacement -../TETEL/TE_ETEL/epocetel.ini z:/testdata/epocini/epocetel.ini -../TETEL/TE_ETEL/replaceepocinietel.bat z:/testdata/epocini/replaceepocinietel.bat - -PRJ_MMPFILES - -../group/ETEL.MMP - -PRJ_TESTMMPFILES - -// D* things are all dummy versions for the test code - -../group/DBAD.MMP support -../group/DSTD.MMP support -../group/DSTDNC.MMP support -../group/dstdiden.mmp support -../group/didenbad.mmp support -../group/dstaticcall.mmp support - -../TETEL/TE_ETEL/TE_Etel.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/group/ETEL.MMP --- a/telephonyserver/etelserverandcore/group/ETEL.MMP Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/group/ETEL.MMP Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -56,6 +56,7 @@ USERINCLUDE ../SETEL USERINCLUDE ../CETEL USERINCLUDE ../EtelRecorder/recorder/inc +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib c32root.lib commsfw.lib efsrv.lib diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserver/etelserverandcore/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,81 @@ +// Copyright (c) 1999-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Telephony server and core API +// +// + +/** + @file +*/ + +PRJ_EXPORTS + +../INC/ETEL.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etel.h) +../INC/ETEL.INL SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(etel.inl) +../INC/TSY.RH SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(tsy.rh) +../INC/TSY.HRH /epoc32/include/tsy.hrh +../INC/ETELEXT.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelext.h) +../INC/ET_PHONE.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone.h) +../INC/et_phone_util.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone_util.h) +../INC/ET_PHONE.INL SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_phone.inl) +../INC/ET_TSY.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_tsy.h) +../INC/secure/ET_CLSVR.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_clsvr.h) +../INC/ET_STRUC.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(et_struc.h) +../INC/et_struct.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(et_struct.h) +../INC/EXTERROR.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(exterror.h) +../INC/ETBUFFER.H SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etbuffer.h) +../INC/etslotnum.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(etslotnum.h) +../INC/etsvr_slots.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etsvr_slots.h) +../INC/Etelutils.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(etelutils.h) + +../INC/FAXDEFN.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(faxdefn.h) +../INC/fax_reversebytes.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(fax_reversebytes.h) + +../INC/etelerr.ra SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/etelerr.ra) +../INC/gsmerr.ra SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/gsmerr.ra) +../INC/etelerr.rls SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/etelerr.rls) +../INC/gsmerr.rls SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(errors/generic/gsmerr.rls) + +../group/etel.iby /epoc32/rom/include/etel.iby +../group/telephony.iby /epoc32/rom/include/telephony.iby + +#include "../data/bld.inf" + + +PRJ_TESTEXPORTS +// scripts files required to run tests +../TETEL/TE_ETEL/TE_Etel.script z:/testdata/scripts/te_etel.script + +../TETEL/TE_ETEL/TE_Etel.iby /epoc32/rom/include/te_etel.iby + +// epoc.ini alterntive and batchfile for replacement +../TETEL/TE_ETEL/epocetel.ini z:/testdata/epocini/epocetel.ini +../TETEL/TE_ETEL/replaceepocinietel.bat z:/testdata/epocini/replaceepocinietel.bat + +PRJ_MMPFILES + +../group/ETEL.MMP + +PRJ_TESTMMPFILES + +// D* things are all dummy versions for the test code + +../group/DBAD.MMP support +../group/DSTD.MMP support +../group/DSTDNC.MMP support +../group/dstdiden.mmp support +../group/didenbad.mmp support +../group/dstaticcall.mmp support + +../TETEL/TE_ETEL/TE_Etel.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/group/telephony_etel-config.mrp --- a/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,18 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# # telephony_etel-config # # Configuration files - source in is telephony_etel. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserver/etelserverandcore/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelserverandcore/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserver/etelserverandcore/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,63 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_BORDER=0x84 +[GROUP]TRACE_BORDERS=0xde +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_1=0x1 +[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_2=0x2 +[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_3=0x3 +[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_4=0x4 +[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_5=0x5 +[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_6=0x6 +[TRACE]TRACE_BORDERS[0xDE]_ETELSERVERTHREAD_7=0x7 +[TRACE]TRACE_BORDER[0x84]_CCALLBASE_CLOSESUBSESSIONPREPROCESSING_1=0x2 +[TRACE]TRACE_BORDER[0x84]_CCALLBASE_DTOR_1=0x1 +[TRACE]TRACE_BORDER[0x84]_CLINEBASE_CLOSESUBSESSIONPREPROCESSING_1=0x4 +[TRACE]TRACE_BORDER[0x84]_CLINEBASE_DTOR_1=0x3 +[TRACE]TRACE_BORDER[0x84]_CPHONEBASE_CLOSESUBSESSIONPREPROCESSING_1=0x6 +[TRACE]TRACE_BORDER[0x84]_CPHONEBASE_DTOR_1=0x5 +[TRACE]TRACE_BORDER[0x84]_CPHONEFACTORYBASE_DTOR_1=0x8 +[TRACE]TRACE_BORDER[0x84]_CTELOBJECT_REQCOMPLETED_1=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CBUFFER_INCREAD_1=0xe +[TRACE]TRACE_INTERNALS[0x88]_CBUFFER_INCWRITE_1=0xf +[TRACE]TRACE_INTERNALS[0x88]_CDESTROYDUMMYSUBSESSION_RUNL_1=0x22 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEBASE_ADDREQTOACTIVE_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEBASE_ADDREQTOWAITING_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEBASE_FLOWCONTROLDEC_1=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEBASE_FLOWCONTROLINC_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_1=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_2=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_3=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_4=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_LOADPHONEMODULEL_5=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_1=0xa +[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_2=0xb +[TRACE]TRACE_INTERNALS[0x88]_CPHONEMANAGER_RENAMEDUPLICATEPHONENAME_3=0xc +[TRACE]TRACE_INTERNALS[0x88]_CREQENTRY_COMPLETEANDDEQUE_1=0xd +[TRACE]TRACE_INTERNALS[0x88]_CSUBSESSIONEXTBASE_SERVICEEXTFUNC_1=0x1c +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CANCELACTIVEREQ_1=0x16 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CANCELACTIVEREQ_2=0x17 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CANCELACTIVEREQ_3=0x18 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CHECKANDDESTROYDUMMYSUBSESSION_1=0x1a +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_1=0x10 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSIONOBJECTL_2=0x11 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSION_1=0x12 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSION_2=0x13 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_CREATEDUMMYSESSION_3=0x14 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_GENERALREQ_1=0x19 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_ISACTIVEREQ_1=0x15 +[TRACE]TRACE_INTERNALS[0x88]_CTELOBJECT_WRITEBACKANDCOMPLETEREQ_1=0x1b +[TRACE]TRACE_INTERNALS[0x88]_CTELSCHEDULERSTOP_RUNL_1=0x27 +[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_CFMESSAGESHUTDOWN_1=0x23 +[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_CFMESSAGESHUTDOWN_2=0x24 +[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_CFMESSAGESHUTDOWN_3=0x25 +[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_CFMESSAGESHUTDOWN_4=0x26 +[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DEC_1=0x29 +[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DEC_2=0x2a +[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DEC_3=0x2b +[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DEC_4=0x2c +[TRACE]TRACE_INTERNALS[0x88]_CTELSERVER_DTOR_1=0x28 +[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_DTOR_1=0x1d +[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_DTOR_2=0x1e +[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_DTOR_3=0x1f +[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_NEWTELOBJECT_1=0x21 +[TRACE]TRACE_INTERNALS[0x88]_CTELSESSION_SERVICEL_1=0x20 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelsimtoolkit/dtsy/Dsatlog.cpp --- a/telephonyserver/etelsimtoolkit/dtsy/Dsatlog.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelsimtoolkit/dtsy/Dsatlog.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -46,7 +46,7 @@ * In debug mode the logfile will not be deleted at start of new session */ { - iFs.Connect(); + User::LeaveIfError(iFs.Connect()); TInt ret=KErrNone; ret=iFile.Open(iFs,KLogFileName,EFileShareAny|EFileWrite); if(ret!=KErrNone) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelsimtoolkit/group/release.txt --- a/telephonyserver/etelsimtoolkit/group/release.txt Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelsimtoolkit/group/release.txt Tue Jun 22 11:02:32 2010 +0100 @@ -27,7 +27,7 @@ 07/03/2001 ========== Add TIconId iIconId element to TGetInkeyV1 -Add related test code in test client and dummy TSY +Add related test code in test client and dummy TSY Create new API document version 3.2 17/01/2001 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp --- a/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_etelsat source \sf\os\cellularsrv\telephonyserver\etelsimtoolkit binary \sf\os\cellularsrv\telephonyserver\etelsimtoolkit\group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserver/etelsimtoolkit/tetel/TSatLog.cpp --- a/telephonyserver/etelsimtoolkit/tetel/TSatLog.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserver/etelsimtoolkit/tetel/TSatLog.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -44,7 +44,7 @@ void CTestLogger::ConstructL() { - iFs.Connect(); + User::LeaveIfError(iFs.Connect()); TInt ret=iFile.Open(iFs,KLogFileName,EFileShareAny|EFileWrite); if(ret!=KErrNone) ret=iFile.Create(iFs,KLogFileName,EFileShareAny|EFileWrite); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/buildgroups/g_group_with_dispatcher/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/buildgroups/g_group_with_dispatcher/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,20 @@ +// Copyright (c) 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "../../group/bld.inf" + + + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/buildgroups/g_group_without_dispatcher/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/buildgroups/g_group_without_dispatcher/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,25 @@ +// Copyright (c) 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#define CTSY_G_BUILD_WITHOUT_DISPATCHER + +//ROM +ctsy.iby /epoc32/rom/include/ctsy.iby + +#include "../../group/bld.inf" + + + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/buildgroups/g_group_without_dispatcher/ctsy.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/buildgroups/g_group_without_dispatcher/ctsy.iby Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,36 @@ +// Copyright (c) 2007-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef CTSY_IBY +#define CTSY_IBY + +//*** commontsy *** + +file=ABI_DIR\DEBUG_DIR\COMMONTSY.DLL Sys\Bin\COMMONTSY.DLL + +// c32.exe SID is 101F7989 +data=ZPRIVATE\101f7989\operatorVariants.ini private\101f7989\operatorVariants.ini + +//*** customapi *** +file=ABI_DIR\DEBUG_DIR\CUSTOMAPI.DLL Sys\Bin\CUSTOMAPI.DLL + +//*** phonetsy *** + +file=ABI_DIR\DEBUG_DIR\PHONETSY.TSY Sys\Bin\PHONETSY.TSY + +// System State plugin +#include + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/group/commontsy.mmh --- a/telephonyserverplugins/common_tsy/commontsy/group/commontsy.mmh Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/group/commontsy.mmh Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -181,6 +181,8 @@ USERINCLUDE ../../licenseetsy_lib/inc +USERINCLUDE ../traces + // Default system include paths for OS extension layer modules. OS_LAYER_SYSTEMINCLUDE_SYMBIAN #ifdef USING_DISPATCHER @@ -188,7 +190,6 @@ LIBRARY euser.lib // EPOC basics LIBRARY bafl.lib // Arrays -LIBRARY flogger.lib // Logging LIBRARY hash.lib // For sha functions LIBRARY efsrv.lib // File handling LIBRARY centralrepository.lib //Central Repository @@ -206,5 +207,3 @@ LIBRARY sysutil.lib // for using sysutil API for phone identity #endif -#include - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/inc/mmstorage/cmmphonebookstoretsy.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmstorage/cmmphonebookstoretsy.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmstorage/cmmphonebookstoretsy.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -25,7 +25,6 @@ #include #include #include "cmmgsmphonestorageprivateutility.h" -#include #include "MmTsy_timeoutdefs.h" // FORWARD DECLARATIONS diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmcalltsy.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmcalltsy.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmcalltsy.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -24,7 +24,6 @@ #include #include #include "MmTsy_timeoutdefs.h" -#include // FORWARD DECLARATIONS class CMmPhoneTsy; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmconferencecalltsy.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmconferencecalltsy.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmconferencecalltsy.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -24,7 +24,6 @@ #include #include #include "MmTsy_timeoutdefs.h" -#include #include "cmmcalltsy.h" // FORWARD DECLARATIONS diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmlinetsy.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmlinetsy.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmlinetsy.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -24,7 +24,6 @@ #include #include #include -#include // FORWARD DECLARATIONS class CMmPhoneTsy; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonefactorytsy.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonefactorytsy.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonefactorytsy.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,19 @@ /* -* Copyright (c) 2008-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" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ + * Copyright (c) 2008-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" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: + * + */ @@ -56,7 +56,7 @@ void ConstructL(); /** - * Returns Phone instance + * Returns a new Phone instance */ CPhoneBase* NewPhoneL( const TDesC& aName ); @@ -103,12 +103,21 @@ TBool IsSupported( const TInt aFunctionalUnit ); #ifdef USING_CTSY_DISPATCHER protected: - - TBool UsingCtsyDispatcher(); - MLtsyFactoryBase* LoadLibraryL(); + + TBool UsingCtsyDispatcher(); #endif // #endif USING_CTSY_DISPATCHER + MLtsyFactoryBase* LoadLibraryL(); + + private: + void InitCtsyL(MLtsyFactoryBase* aLtsyFactory); + TPtrC ReadDllNameFromConfigL(const TDesC& aConfigData); + TUint ReadDllUidFromConfigL(const TDesC& aConfigData); + static void ReadConfigFileL(RBuf* aConfigData); + static TPtrC GetValueForKeyL(const TDesC& aKeysValues, const TDesC& aKey); + private: // Data + MLtsyFactoryBase* iLtsyFactory; /** * Pointer to PhoneTSY * Not owned. @@ -120,17 +129,8 @@ * Not owned. */ MMessageRouter* iMessageRouter; - - /** - * Pointer to LTSY factory, used to retrieve LTSY and SIM ATK TSY - * Not owned. - */ - MLtsyFactoryBase* iLtsyFactory; -#ifdef USING_CTSY_DISPATCHER + RLibrary iLoadedLib; //can either be LicenseeTsy or CtsyDispatcher dlls -#endif // #ifdef USING_CTSY_DISPATCHER }; #endif // CMMPHONEFACTORYTSY_H - -// End of File diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h --- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-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" @@ -31,7 +31,6 @@ #include "cmmmessagemanagerbase.h" #include "MmTsy_timeoutdefs.h" #include -#include #include "CMmPrivateUtility.h" #include #include diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomSecurityTsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomSecurityTsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomSecurityTsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,8 +16,13 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CMmCustomSecurityTsyTraces.h" +#endif + #include "CMmCustomSecurityTsy.h" -#include #include "cmmphonegsmwcdmaext.h" #include #include @@ -32,7 +37,7 @@ CMmCustomTsy* aMmCustomTsy, CMmPhoneTsy* aMmPhoneTsy ) { -TFLOGSTRING("TSY: CMmCustomSecurityTsy::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_CONSTRUCTL_1, "TSY: CMmCustomSecurityTsy::ConstructL"); iMmCustomTsy = aMmCustomTsy; iMmPhoneTsy = aMmPhoneTsy; @@ -58,7 +63,7 @@ CMmCustomTsy* aMmCustomTsy, CMmPhoneTsy* aPhoneTsy ) { -TFLOGSTRING("TSY: CMmCustomSecurityTsy::NewL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_NEWL_1, "TSY: CMmCustomSecurityTsy::NewL"); CMmCustomSecurityTsy* self = new (ELeave) CMmCustomSecurityTsy(); CleanupStack::PushL( self ); @@ -332,7 +337,7 @@ TInt aReqHandleType, TInt aError ) { -TFLOGSTRING3( "CustomTSY: CMmCustomSecurityTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, 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 ); // All possible TSY req handle types are listed in the // switch case below. switch ( aReqHandleType ) @@ -370,7 +375,7 @@ { return KErrServerBusy; } -TFLOGSTRING2( "TSY: CMmPhoneTsy::IsBlocked - Code to check: %d", *aCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_ISBLOCKED_1, "TSY: CMmPhoneTsy::IsBlocked - Code to check: %d", *aCode ); switch ( *aCode ) { @@ -496,7 +501,7 @@ CMmDataPackage aPackage; aPackage.PackData( &iCodeID, &iSecCode ); -TFLOGSTRING2( "TSY: CMmCustomSecurityTsy::CheckSecurityCodeL iSecCode: %S", &iSecCode ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_CHECKSECURITYCODEL_1, "TSY: CMmCustomSecurityTsy::CheckSecurityCodeL iSecCode: %S", iSecCode ); TInt retValue ( iMmPhoneTsy->MessageManager()->HandleRequestL( ECustomCheckSecurityCodeIPC, &aPackage ) ); @@ -523,7 +528,7 @@ void CMmCustomSecurityTsy::CompleteCheckSecurityCode( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCode - Error code: %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODE_1, "TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCode - Error code: %d", aErrorCode ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ESecurityRequestTypeCheckSecurityCode ); @@ -577,7 +582,7 @@ // void CMmCustomSecurityTsy::CompleteCheckSecurityCodeCancel() { -TFLOGSTRING("TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCodeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODECANCEL_1, "TSY: CMmCustomSecurityTsy::CompleteCheckSecurityCodeCancel"); } // --------------------------------------------------------------------------- @@ -596,7 +601,7 @@ iMmPhoneTsy->MessageManager()->HandleRequestL( ECustomSecurityDeliverCodeIPC, &aPackage ); -TFLOGSTRING2( "TSY: CMmCustomSecurityTsy::DeliverCodeL iSecCode: %S", &iSecCode ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_DELIVERCODEL_1, "TSY: CMmCustomSecurityTsy::DeliverCodeL iSecCode: %S", iSecCode ); return KErrNone; } @@ -647,7 +652,7 @@ void CMmCustomSecurityTsy::CompleteDisablePhoneLock( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmCustomSecurityTsy::CompleteDisablePhoneLock - Error code: %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSECURITYTSY_COMPLETEDISABLEPHONELOCK_1, "TSY: CMmCustomSecurityTsy::CompleteDisablePhoneLock - Error code: %d", aErrorCode ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ESecurityRequestTypeDisablePhoneLock ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CMmCustomTsyTraces.h" +#endif + #include "CMmCustomTsy.h" #include "CMmCustomGsmExt.h" #include "cmmcalllist.h" @@ -25,7 +31,6 @@ #include "CMmCommonStaticUtility.h" #include "CMmSimLockTsy.h" #include "MmTsy_conf.h" -#include #include "cmmpblist.h" #include "cmmphonebookstoretsy.h" #include "CMmPacketTsy.h" @@ -55,7 +60,7 @@ void CMmCustomTsy::ConstructL( CMmPhoneTsy* aMmPhoneTsy ) { -TFLOGSTRING("TSY: CMmCustomTsy::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_1, "TSY: CMmCustomTsy::ConstructL"); iMmPhoneTsy = aMmPhoneTsy; iMmCustomExtInterface = CMmCustomGsmExt::NewL( aMmPhoneTsy, this ); @@ -98,7 +103,7 @@ // update/receive Icc Call forward information if( iMmPhoneTsy->NosBootState()->iSIMReady ) { -TFLOGSTRING("TSY: CMmCustomTsy::ConstructL -- GET ICC call forward indicators"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_2, "TSY: CMmCustomTsy::ConstructL -- GET ICC call forward indicators"); // Get Icc cfis values from LTSY Phone()->MessageManager()->HandleRequestL( ECustomGetIccCallForwardingStatusIPC ); @@ -108,20 +113,20 @@ // if not, query again if ( !iMmPhoneTsy->GetHomeZoneParamsChecked() ) { -TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - GetHomeZoneParamsChecked()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_3, "TSY: CMmCustomTsy::ConstructL - GetHomeZoneParamsChecked()"); CMmSIMTsy* simCustomTsy = NULL; simCustomTsy = ( CMmSIMTsy* )GetSIMTsyPtr(); -TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - pointer created"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_4, "TSY: CMmCustomTsy::ConstructL - pointer created"); if ( simCustomTsy ) { -TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_5, "TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL()"); simCustomTsy->CheckViagHomezoneParamsL(); iMmPhoneTsy->SetHomeZoneParamsChecked( ETrue ); } else { -TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL() False"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_6, "TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL() False"); iMmPhoneTsy->SetHomeZoneParamsChecked( EFalse ); } } @@ -130,7 +135,7 @@ CMmCustomTsy* CMmCustomTsy::NewL( CMmPhoneTsy* aMmPhoneTsy ) { -TFLOGSTRING("TSY: CMmCustomTsy::NewL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NEWL_1, "TSY: CMmCustomTsy::NewL"); CMmCustomTsy* mmCustomTsy = new ( ELeave ) CMmCustomTsy(); CleanupClosePushL( *mmCustomTsy ); mmCustomTsy->ConstructL( aMmPhoneTsy ); @@ -141,7 +146,7 @@ CMmCustomTsy::~CMmCustomTsy() { -TFLOGSTRING("TSY: CMmCustomTsy::~CMmCustomTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_DTOR_1, "TSY: CMmCustomTsy::~CMmCustomTsy"); iFeatureControl.Close(); @@ -211,7 +216,7 @@ if ( ERfsStateInfoInactive == iMmPhoneTsy->GetRfStateInfo() && !IsRequestPossibleInOffline( aIpc ) ) { -TFLOGSTRING2 ("TSY: Offline mode ON, request is not allowed: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_EXTFUNC_1, "TSY: Offline mode ON, request is not allowed: %d", aIpc ); ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); @@ -544,7 +549,7 @@ break; default: // ret is already set as KErrNotSupported -TFLOGSTRING2("TSY: CMmCustomTsy::DoExtFuncL unsupported ipc=%d", aIpc); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_DOEXTFUNCL_1, "TSY: CMmCustomTsy::DoExtFuncL unsupported ipc=%d", aIpc); break; } @@ -800,7 +805,7 @@ TSecurityPolicy CMmCustomTsy::GetRequiredPlatSecCaps( const TInt aIpc ) { -TFLOGSTRING2( "TSY: CMmCustomTsy::GetRequiredPlatSecCaps ipc=%d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_1, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps ipc=%d", aIpc ); // assume fail as default return value TSecurityPolicy policy( TSecurityPolicy::EAlwaysFail ); @@ -809,7 +814,7 @@ if (ipc >= KIpcCustomExt + EMobileCancelOffset) { ipc -= EMobileCancelOffset; -TFLOGSTRING2("TSY: CMmCustomTsy::GetRequiredPlatSecCaps cancel for ipc=%d", ipc); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_2, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps cancel for ipc=%d", ipc); } switch ( ipc ) @@ -843,7 +848,7 @@ case ECustomNotifyCellInfoChangeIPC: case ECustomGetBandSelectionIPC: case ECustomNotifyRemoteAlertingToneStatusChangeIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=None"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_3, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=None"); policy = TSecurityPolicy( TSecurityPolicy::EAlwaysPass ); break; @@ -852,14 +857,14 @@ case ECustomSetSystemNetworkModeIPC: case ECustomSimWarmResetIPC: case ECustomSetBandSelectionIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_4, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl"); policy = TSecurityPolicy( ECapabilityNetworkControl ); break; // NetworkControl, PowerMgmt case ECustomPowerSimOnIPC: case ECustomPowerSimOffIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, PowerMgmt"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_5, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, PowerMgmt"); policy = TSecurityPolicy( ECapabilityNetworkControl, ECapabilityPowerMgmt ); break; @@ -867,7 +872,7 @@ // NetworkControl, ReadDeviceData case ECustomReleaseFileIPC: case ECustomRestartFileIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, ReadDeviceData"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_6, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, ReadDeviceData"); policy = TSecurityPolicy( ECapabilityNetworkControl, ECapabilityReadDeviceData ); break; @@ -875,13 +880,13 @@ // NetworkServices case ECustomTerminateCallIPC: case ECustomCancelUssdSessionIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_7, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices"); policy = TSecurityPolicy( ECapabilityNetworkServices ); break; // NetworkServices, WriteDeviceData case ECustomSetDriveModeIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices, WriteDeviceData"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_8, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices, WriteDeviceData"); policy = TSecurityPolicy( ECapabilityNetworkServices, ECapabilityWriteDeviceData ); break; @@ -902,27 +907,27 @@ case ECustomReadHSxPAStatusIPC: case ECustomGetIccCallForwardingStatusIPC: case ECustomGetCellInfoIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_9, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData"); policy = TSecurityPolicy( ECapabilityReadDeviceData ); break; // ReadDeviceData, Location case EReadViagHomeZoneCacheIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, Location"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_10, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, Location"); policy = TSecurityPolicy( ECapabilityReadDeviceData, ECapabilityLocation ); break; // ReadDeviceData, ReadUserData case ECustomNotifySsNetworkEventIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy= ReadDeviceData, ReadUserData"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_11, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy= ReadDeviceData, ReadUserData"); policy = TSecurityPolicy( ECapabilityReadDeviceData, ECapabilityReadUserData ); break; // ReadDeviceData, ReadUserData, Location case ECustomReadSimFileIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, Location"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_12, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, Location"); policy = TSecurityPolicy( ECapabilityReadDeviceData, ECapabilityReadUserData, ECapabilityLocation ); @@ -930,7 +935,7 @@ // ReadDeviceData, ReadUserData, WriteUserData, NetworkControl case ECustomGetSimAuthenticationDataIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, WriteUserData, NetworkControl"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_13, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, WriteUserData, NetworkControl"); policy = TSecurityPolicy( ECapabilityReadDeviceData, ECapabilityReadUserData, ECapabilityWriteUserData, @@ -938,14 +943,14 @@ break; case ECustomGetServiceTableSupportbyApplicationIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_14, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData"); policy = TSecurityPolicy( ECapabilityReadDeviceData ); break; // ReadDeviceData, WriteDeviceData, ReadUserData, WriteUserData, // Location, NetworkServices, NetworkControl case ECustomSendAPDUReqIPC: case ECustomSendAPDUReqV2IPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, WriteDeviceData, ReadUserData, WriteUserData, Location, NetworkServices, NetworkControl"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_15, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, WriteDeviceData, ReadUserData, WriteUserData, Location, NetworkServices, NetworkControl"); policy = TSecurityPolicy( ECapabilityReadDeviceData, ECapabilityWriteDeviceData, ECapabilityReadUserData, @@ -959,7 +964,7 @@ case ECustomStartSimCbTopicBrowsingIPC: case ECustomGetNextSimCbTopicIPC: case ECustomGetAirTimeDurationIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadUserData"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_16, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadUserData"); policy = TSecurityPolicy( ECapabilityReadUserData ); break; @@ -974,32 +979,32 @@ case ECustomDisablePhoneLockIPC: case ECustomSetSimMessageStatusReadIPC: case ECustomWriteHSxPAStatusIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_17, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData"); policy = TSecurityPolicy( ECapabilityWriteDeviceData ); break; // WriteDeviceData, Location case EWriteViagHomeZoneCacheIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData, Location"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_18, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData, Location"); policy = TSecurityPolicy( ECapabilityWriteDeviceData, ECapabilityLocation ); break; // WriteUserData case ECustomDeleteSimCbTopicIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteUserData"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_19, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteUserData"); policy = TSecurityPolicy( ECapabilityWriteUserData ); break; // WriteDeviceData case EWriteViagHomeZoneUHZIUESettingsIPC: -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_20, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData"); policy = TSecurityPolicy( ECapabilityWriteDeviceData ); break; default: // if none of the above then we end up here, // as a default we already have caps as alwaysfail. -TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=AlwaysFail"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_21, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=AlwaysFail"); break; } @@ -1305,7 +1310,7 @@ TInt ret ( KErrNone ); TInt rfStateInfo ( ERfsStateInfoNormal ); -TFLOGSTRING( "CMmCustomTSY: CMmCustomTsy::SimAuthentication" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_1, "CMmCustomTSY: CMmCustomTsy::SimAuthentication" ); TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(ECustomTsyGetSimAuthenticationData); if(0 < reqHandle) @@ -1349,69 +1354,69 @@ else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrap" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_2, "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrap" ); iGbaBootstrap = REINTERPRET_CAST( RMmCustomAPI::TSimAuthenticationGbaBootstrap*, basePtr ); rand.Append( iGbaBootstrap->iRandomParameters ); authenticationDataPackage.PackData( iGbaBootstrap, &rfStateInfo ); -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrap" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_3, "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrap" ); } else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrapUpdate == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapUpdate" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_4, "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapUpdate" ); iGbaBootstrapUpdate = REINTERPRET_CAST( RMmCustomAPI::TSimAuthenticationGbaBootstrapUpdate*, basePtr ); authenticationDataPackage.PackData( iGbaBootstrapUpdate, &rfStateInfo ); -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapUpdate" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_5, "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapUpdate" ); } else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrapNafDerivation == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapNafDerivation" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_6, "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapNafDerivation" ); iGbaNafDerivation = REINTERPRET_CAST( RMmCustomAPI::TSimAuthenticationGbaNafDerivation*, basePtr ); authenticationDataPackage.PackData( iGbaNafDerivation, &rfStateInfo ); -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapNafDerivation" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_7, "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapNafDerivation" ); } else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMskUpdate == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EMgvMskUpdate" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_8, "CMmCustomTSY: SimAuthenticationL::in EMgvMskUpdate" ); iMgvMskUpdate = REINTERPRET_CAST( RMmCustomAPI::TSimAuthenticationMgvMskUpdate*, basePtr ); authenticationDataPackage.PackData( iMgvMskUpdate, &rfStateInfo ); -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EMgvMskUpdate" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_9, "CMmCustomTSY: SimAuthenticationL::out EMgvMskUpdate" ); } else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMtkGeneration == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EMgvMtkGeneration" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_10, "CMmCustomTSY: SimAuthenticationL::in EMgvMtkGeneration" ); iMgvMtkGeneration = REINTERPRET_CAST( RMmCustomAPI::TSimAuthenticationMgvMtkGeneration*, basePtr ); authenticationDataPackage.PackData( iMgvMtkGeneration, &rfStateInfo ); -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EMgvMtkGeneration" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_11, "CMmCustomTSY: SimAuthenticationL::out EMgvMtkGeneration" ); } else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMskDeletion == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EMgvMskDeletion" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_12, "CMmCustomTSY: SimAuthenticationL::in EMgvMskDeletion" ); iMgvMskDeletion = REINTERPRET_CAST( RMmCustomAPI::TSimAuthenticationMgvMskDeletion*, basePtr ); authenticationDataPackage.PackData( iMgvMskDeletion, &rfStateInfo ); -TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EMgvMskDeletion" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_13, "CMmCustomTSY: SimAuthenticationL::out EMgvMskDeletion" ); } else { -TFLOGSTRING2( "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_14, "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() ); ret = KErrNotSupported; iEapSim = NULL; @@ -1488,7 +1493,7 @@ CMmDataPackage* aDataPackage, TInt aResult ) { -TFLOGSTRING( "TSY: CMmCustomTsy::CompleteSimAuthentication" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_1, "TSY: CMmCustomTsy::CompleteSimAuthentication" ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyGetSimAuthenticationData ); @@ -1536,7 +1541,7 @@ else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrap" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_2, "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrap" ); RMmCustomAPI::TSimAuthenticationGbaBootstrap* gbaBootstrap; aDataPackage->UnPackData( &gbaBootstrap ); @@ -1548,13 +1553,13 @@ iGbaBootstrap = NULL; ReqCompleted( reqHandle, aResult ); -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrap" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_3, "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrap" ); } else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrapUpdate == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapUpdate" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_4, "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapUpdate" ); RMmCustomAPI::TSimAuthenticationGbaBootstrapUpdate* gbaBootstrapUpdate; @@ -1567,13 +1572,13 @@ iGbaBootstrapUpdate = NULL; ReqCompleted( reqHandle, aResult ); -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapUpdate" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_5, "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapUpdate" ); } else if ( RMmCustomAPI::TSimAuthenticationBase:: EGbaBootstrapNafDerivation == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapNafDerivation" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_6, "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapNafDerivation" ); RMmCustomAPI::TSimAuthenticationGbaNafDerivation* gbaNafDerivation; @@ -1586,12 +1591,12 @@ iGbaNafDerivation = NULL; ReqCompleted( reqHandle, aResult ); -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapNafDerivation" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_7, "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapNafDerivation" ); } else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMskUpdate == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EMgvMskUpdate" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_8, "CMmCustomTSY: CompleteSimAuthentication::in EMgvMskUpdate" ); RMmCustomAPI::TSimAuthenticationMgvMskUpdate* mgvMskUpdate; aDataPackage->UnPackData( &mgvMskUpdate ); @@ -1606,12 +1611,12 @@ iMgvMskUpdate = NULL; ReqCompleted( reqHandle, aResult ); -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EMgvMskUpdate" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_9, "CMmCustomTSY: CompleteSimAuthentication::out EMgvMskUpdate" ); } else if ( RMmCustomAPI::TSimAuthenticationBase:: EMgvMtkGeneration == basePtr->ExtensionId() ) { -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EMgvMtkGeneration" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_10, "CMmCustomTSY: CompleteSimAuthentication::in EMgvMtkGeneration" ); RMmCustomAPI::TSimAuthenticationMgvMtkGeneration* mgvMtkGeneration; @@ -1626,7 +1631,7 @@ iMgvMtkGeneration = NULL; ReqCompleted( reqHandle, aResult ); -TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EMgvMtkGeneration" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_11, "CMmCustomTSY: CompleteSimAuthentication::out EMgvMtkGeneration" ); } else if ( RMmCustomAPI::TSimAuthenticationBase:: EMgvMskDeletion == basePtr->ExtensionId() ) @@ -1635,7 +1640,7 @@ } else { -TFLOGSTRING2( "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_12, "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() ); aResult = KErrArgument; ReqCompleted( reqHandle, aResult ); } @@ -1677,7 +1682,7 @@ else if( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap == basePtr->ExtensionId() ) { -TFLOGSTRING( "TSYMH: CompleteSimAuthentication RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_13, "TSYMH: CompleteSimAuthentication RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap" ); RMmCustomAPI::TSimAuthenticationGbaBootstrap* gbabootstrap; aDataPackage->UnPackData( &gbabootstrap ); @@ -1762,7 +1767,7 @@ if ( KErrArgument == ret && 0 == iFreshBitCounter ) { -TFLOGSTRING( "CMmCustomTsy: RAND rejected" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKRANDVALIDITYL_1, "CMmCustomTsy: RAND rejected" ); } return ret; @@ -1801,7 +1806,7 @@ if ( KErrNone != ret ) { -TFLOGSTRING( "TSY: CMmCustomTsy: 'rand_db.cur' creation failed!" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_1, "TSY: CMmCustomTsy: 'rand_db.cur' creation failed!" ); } else if ( KErrNone == ret ) { @@ -1841,13 +1846,13 @@ if ( KErrNone != ret ) { -TFLOGSTRING( "TSY: CMmCustomTsy: 'rand_db.cur' initialization failed!" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_2, "TSY: CMmCustomTsy: 'rand_db.cur' initialization failed!" ); file.Close(); } } else { -TFLOGSTRING( "TSY: CMmCustomTsy: 'rand_db.cur' open failed!" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_3, "TSY: CMmCustomTsy: 'rand_db.cur' open failed!" ); } } @@ -1863,7 +1868,7 @@ } else { -TFLOGSTRING( "TSY: CMmCustomTsy: Could not connect to file server!" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_4, "TSY: CMmCustomTsy: Could not connect to file server!" ); } // Give some time for file.Close() and fs.Close() to complete @@ -1920,7 +1925,7 @@ EFileWrite ); if( KErrNone != ret ) { -TFLOGSTRING( "TSY: CMmCustomTsy: rand_db open failed" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_INSERTBLOBSTORANDDB_1, "TSY: CMmCustomTsy: rand_db open failed" ); } } if ( KErrNone != ret ) @@ -1985,7 +1990,7 @@ } else { -TFLOGSTRING( "TSY: CMmCustomTsy: Could not connect to file server!" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_INSERTBLOBSTORANDDB_2, "TSY: CMmCustomTsy: Could not connect to file server!" ); return ret; } @@ -2083,7 +2088,7 @@ } else { -TFLOGSTRING( "TSY: CMmCustomTsy: Could not connect to file server!" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_UPDATEBITCOUNTER_1, "TSY: CMmCustomTsy: Could not connect to file server!" ); } return ret; @@ -2331,7 +2336,7 @@ void CMmCustomTsy::CompleteTerminateCall( TInt aError ) { -TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteTerminateCall - aError: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETETERMINATECALL_1, "TSY: CMmCustomTsy::CompleteTerminateCall - aError: %d", aError ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -2356,7 +2361,7 @@ TInt CMmCustomTsy::NotifyDtmfEvent( RMmCustomAPI::TDtmfInfo* aInfo ) { -TFLOGSTRING("TSY: CMmCustomTsy::NotifyDtmfEvent"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYDTMFEVENT_1, "TSY: CMmCustomTsy::NotifyDtmfEvent"); // save pointer to client data iNotifyInfo = aInfo; @@ -2376,7 +2381,7 @@ RMmCustomAPI::TDtmfInfo aInfo, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyDtmfEvent"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYDTMFEVENT_1, "TSY: CMmCustomTsy::CompleteNotifyDtmfEvent"); // reset request handle. Returns the deleted req handle. TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyNotifyDtmfEvent ); @@ -2443,7 +2448,7 @@ if ( 0 != diags ) { -TFLOGSTRING3( "TSY:CMmCustomTsy::GetDiagnosticInfo: Diagnostic info=%d asked for call id=%d", diags, mmCall->CallId() ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_1, "TSY:CMmCustomTsy::GetDiagnosticInfo: Diagnostic info=%d asked for call id=%d", diags, mmCall->CallId() ); switch ( diags ) { case KDiagnosticInfoBarredWithCUG: @@ -2475,17 +2480,17 @@ break; } } -TFLOGSTRING2( "TSY: CMmCustomTsy::GetDiagnosticInfo - ReqCompleted - Error code: %d", errorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_2, "TSY: CMmCustomTsy::GetDiagnosticInfo - ReqCompleted - Error code: %d", errorValue ); // complete errorvalue to client - inform change ReqCompleted( aTsyReqHandle, errorValue ); } else { // call is not found -TFLOGSTRING("TSY: CMmCustomTsy::GetDiagnosticInfo - Call is not found"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_3, "TSY: CMmCustomTsy::GetDiagnosticInfo - Call is not found"); ReqCompleted( aTsyReqHandle, KErrNotFound ); } -TFLOGSTRING2( "TSY: CMmCustomTsy::GetDiagnosticInfo - Error code: %d", errorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_4, "TSY: CMmCustomTsy::GetDiagnosticInfo - Error code: %d", errorValue ); return KErrNone; } @@ -2521,7 +2526,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TRemoteAlertingToneStatus* aToneStatus ) { -TFLOGSTRING("TSY: CMmCustomTsy::GetRemoteAlertingToneStatus"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREMOTEALERTINGTONESTATUS_1, "TSY: CMmCustomTsy::GetRemoteAlertingToneStatus"); TInt ret = iMmCustomExtInterface->GetRemoteAlertingToneStatus( aToneStatus ); @@ -2580,7 +2585,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TGetAlsBlockStatus* aBlockStatus ) { -TFLOGSTRING3( "TSY: CMmCustomTsy::GetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSBLOCKEDL_1, "TSY: CMmCustomTsy::GetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus ); TTsyReqHandle getAlsBlockedHandle = iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyGetAlsBlocked ); @@ -2625,7 +2630,7 @@ RMmCustomAPI::TGetAlsBlockStatus aBlockStatus, TInt aErrorCode ) { -TFLOGSTRING3( "TSY: CMmCustomTsy::CompleteGetAlsBlocked - Block status: %d, Error code: %d", aBlockStatus, aErrorCode ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSBLOCKED_1, "TSY: CMmCustomTsy::CompleteGetAlsBlocked - Block status: %d, Error code: %d", aBlockStatus, aErrorCode ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyGetAlsBlocked ); @@ -2727,7 +2732,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TSetAlsBlock* aBlockStatus ) { -TFLOGSTRING3( "TSY: CMmCustomTsy::SetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETALSBLOCKEDL_1, "TSY: CMmCustomTsy::SetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus ); // get the handle TTsyReqHandle setAlsBlockedHandle = iTsyReqHandleStore->GetTsyReqHandle( ECustomTsySetAlsBlocked ); @@ -2777,7 +2782,7 @@ void CMmCustomTsy::CompleteSetAlsBlocked( TInt aErrorCode ) { -TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteSetAlsBlocked - Error code: %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESETALSBLOCKED_1, "TSY: CMmCustomTsy::CompleteSetAlsBlocked - Error code: %d", aErrorCode ); // get reaq handle for NotifyAlsBlockedChanged TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyNotifyAlsBlockedChanged ); @@ -2849,7 +2854,7 @@ { *iRetNotifyAlsBlockStatus = RMmCustomAPI::EBlockStatusInactive; } -TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteNotifyAlsBlockedChanged - Block status: %d", *iSetBlockStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYALSBLOCKEDCHANGED_1, "TSY: CMmCustomTsy::CompleteNotifyAlsBlockedChanged - Block status: %d", *iSetBlockStatus ); // reset the varible iRetNotifyAlsBlockStatus = NULL; @@ -2891,7 +2896,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TAlsSupport* aSupport ) { -TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTL_1, "TSY: CMmCustomTsy::GetAlsPpSupportL"); // save pointer to client space iAlsSupport = aSupport; @@ -2900,7 +2905,7 @@ if ( 0 < reqHandle ) { -TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportL - Already processing, save handle"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTL_2, "TSY: CMmCustomTsy::GetAlsPpSupportL - Already processing, save handle"); //The request is already in processing because of previous request //Complete request with status value informing the client about TCheckAlsPpSupportRequest* req = @@ -2921,7 +2926,7 @@ } else { -TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportL - Save handle"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTL_3, "TSY: CMmCustomTsy::GetAlsPpSupportL - Save handle"); // Save the req handle type iReqHandleType = ECustomTsyGetAlsPpSupport; // save request in queue for completion @@ -2944,7 +2949,7 @@ // TInt CMmCustomTsy::GetAlsPpSupportCancel() { -TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_1, "TSY: CMmCustomTsy::GetAlsPpSupportCancel"); // reset the pointer to client data iAlsSupport = NULL; @@ -2955,7 +2960,7 @@ // complete TInt checkAlsPpSupportRequestsCount = iCheckAlsPpSupportRequests.Count(); -TFLOGSTRING2( "TSY: CMmCustomTsy::GetAlsPpSupportCancel - Cancel %d requests", checkAlsPpSupportRequestsCount ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_2, "TSY: CMmCustomTsy::GetAlsPpSupportCancel - Cancel %d requests", checkAlsPpSupportRequestsCount ); for ( TInt i=0; i < checkAlsPpSupportRequestsCount ; i++ ) { @@ -2981,7 +2986,7 @@ RMmCustomAPI::TAlsSupport aAlsSupport, TInt aErrorCode ) { -TFLOGSTRING3( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS support: %d, Error: %d", aAlsSupport, aErrorCode ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_1, "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS support: %d, Error: %d", aAlsSupport, aErrorCode ); TBool status = EFalse; // Check if the get was called internally during boot @@ -2989,7 +2994,7 @@ { if( RMmCustomAPI::EAlsSupportOn == aAlsSupport ) { -TFLOGSTRING( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_2, "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" ); status = ETrue; } //Update ALS status from sim @@ -3012,7 +3017,7 @@ if( RMmCustomAPI::EAlsSupportOn == aAlsSupport ) { -TFLOGSTRING( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_3, "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" ); status = ETrue; } //Update ALS status from sim @@ -3024,7 +3029,7 @@ // complete TInt checkAlsPpSupportRequestsCount = iCheckAlsPpSupportRequests.Count(); -TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - Complete %d requests", checkAlsPpSupportRequestsCount ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_4, "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - Complete %d requests", checkAlsPpSupportRequestsCount ); for ( TInt i=0; i < checkAlsPpSupportRequestsCount ; i++ ) { @@ -3206,18 +3211,18 @@ TBool aCipherStatus, TInt aErrorCode ) { -TFLOGSTRING("TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange entered"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_1, "TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange entered"); // this is special case, only called when Ciphering indicator // is forced off for some operators if ( iMmPhoneTsy->GetNetTsy()->CipheringIndicatorForcedOff() ) { -TFLOGSTRING("TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_2, "TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off"); TTsyReqHandle handle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyNotifyCipheringInfoChange ); if ( ECustomTsyReqHandleUnknown != handle ) { -TFLOGSTRING("TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off, request completed"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_3, "TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off, request completed"); iRetNotifyCipheringInfoChange->iIndStatus = EFalse; iRetNotifyCipheringInfoChange->iCiphStatus = ETrue; @@ -3517,7 +3522,7 @@ TInt aError, TInt aIPC ) { -TFLOGSTRING3( "TSY: CMmCustomTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETE_1, "TSY: CMmCustomTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError ); TBool subTsyReqFound = EFalse; TInt max = GetMaxNumberOfSubsystems(); CMmSubTsyBase** subTsyPtr = GetSubsystemArrayPtr(); @@ -3742,7 +3747,7 @@ RMmCustomAPI::TEmerNumberCheckMode* aNumberMode, TBool* aResult ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CheckEmergencyNumberL number=%S", &(aNumberMode->iNumber) ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_1, "TSY: CMmCustomTsy::CheckEmergencyNumberL number=%S", (aNumberMode->iNumber) ); TInt ret(KErrGeneral); @@ -3752,7 +3757,7 @@ // 3rd Dial check number if( iISVDialNumberCheck && 0 == requestHandle ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CheckEmergencyNumberL - 3rd party client nbr check aResult = %d" , aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_2, "TSY: CMmCustomTsy::CheckEmergencyNumberL - 3rd party client nbr check aResult = %d" , aResult ); iEmergencyNumberCheckMode = aNumberMode; iEmergencyNumberCheckResult = aResult; @@ -3766,7 +3771,7 @@ //Normal case else { -TFLOGSTRING2("TSY: CMmCustomTsy::CheckEmergencyNumberL - aResult = %d" , aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_3, "TSY: CMmCustomTsy::CheckEmergencyNumberL - aResult = %d" , aResult ); if ( ( 0 < requestHandle || iISVDialNumberCheck ) && 0 != aTsyReqHandle ) { @@ -3814,7 +3819,7 @@ TInt aErrorValue ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteCheckEmergencyNumber" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_1, "TSY: CMmCustomTsy::CompleteCheckEmergencyNumber" ); // 3rd party number check completion0 if( iISVDialNumberCheck ) @@ -3836,7 +3841,7 @@ // check is the Dial cancel NULL if( iISVDialNumberCheckObject ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteCheckEmergencyNumber - Complete3rdPartyCallNbrCheck isEmergencyNbr = %d",isEmergencyNbr ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_2, "TSY: CMmCustomTsy::CompleteCheckEmergencyNumber - Complete3rdPartyCallNbrCheck isEmergencyNbr = %d",isEmergencyNbr ); iISVDialNumberCheckObject->Complete3rdPartyCallNbrCheck( isEmergencyNbr ); } @@ -3870,7 +3875,7 @@ *iEmergencyNumberCheckResult = EFalse; } } -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteCheckEmergencyNumber number=%S", &(iEmergencyNumberCheckMode->iNumber) ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_3, "TSY: CMmCustomTsy::CompleteCheckEmergencyNumber number=%S", (iEmergencyNumberCheckMode->iNumber) ); // reset the internal variable iEmergencyNumberCheckResult = NULL; @@ -3987,13 +3992,13 @@ // used phonebook is Adn if ( 0 == aPndName->CompareF( KETelIccAdnPhoneBook ) ) { -TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - ADN phonebook status: %d", iAdnCacheStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_1, "TSY: CMmCustomTsy::GetPndCacheStatus - ADN phonebook status: %d", iAdnCacheStatus); *aPndStatus = iAdnCacheStatus; } // used phonebook is Fdn else if ( 0 == aPndName->CompareF( KETelIccFdnPhoneBook ) ) { -TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - FDN phonebook status: %d", iFdnCacheStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_2, "TSY: CMmCustomTsy::GetPndCacheStatus - FDN phonebook status: %d", iFdnCacheStatus); *aPndStatus = iFdnCacheStatus; } // used phonebook doesn't have cache @@ -4001,12 +4006,12 @@ ( 0 == aPndName->CompareF( KETelIccSdnPhoneBook ) ) || ( 0 == aPndName->CompareF( KETelIccVoiceMailBox ) ) ) { -TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - No cache for: %S ", aPndName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_3, "TSY: CMmCustomTsy::GetPndCacheStatus - No cache for: %S ", *aPndName); *aPndStatus = RMmCustomAPI::ECacheNotUsed; } else { -TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - No cache found for: %S ", aPndName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_4, "TSY: CMmCustomTsy::GetPndCacheStatus - No cache found for: %S ", *aPndName); error = KErrArgument; } @@ -4025,7 +4030,7 @@ RMmCustomAPI::TPndCacheStatus aPndStatus, TName& aPndName ) { -TFLOGSTRING3("TSY: CMmCustomTsy::UpdateCacheStatus - Phonebook: %S status: %d", &aPndName, aPndStatus); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_UPDATECACHESTATUS_1, "TSY: CMmCustomTsy::UpdateCacheStatus - Phonebook: %S status: %d", aPndName, aPndStatus); // if used phonebook is Adn if ( 0 == aPndName.CompareF( KETelIccAdnPhoneBook ) ) { @@ -4133,7 +4138,7 @@ TInt CMmCustomTsy::SsAdditionalInfoNotification( RMmCustomAPI::TSsAdditionalInfo* aSsAdditionalInfo ) { -TFLOGSTRING("TSY: CMmCustomTsy::SsAdditionalInfoNotification"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATION_1, "TSY: CMmCustomTsy::SsAdditionalInfoNotification"); iRetSsAdditionalInfo = aSsAdditionalInfo; iReqHandleType = ECustomTsyNotifySsAdditionalInfo; @@ -4149,7 +4154,7 @@ TInt CMmCustomTsy::SsAdditionalInfoNotificationCancel( const TTsyReqHandle ) { -TFLOGSTRING("TSY: CMmCustomTsy::SsAdditionalInfoNotificationCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATIONCANCEL_1, "TSY: CMmCustomTsy::SsAdditionalInfoNotificationCancel"); iRetSsAdditionalInfo = NULL; // reset reqhandle @@ -4174,7 +4179,7 @@ RMmCustomAPI::TSsAdditionalInfo* aSsAdditionalInfo, TInt aError ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteSsAdditionalInfoNotification"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESSADDITIONALINFONOTIFICATION_1, "TSY: CMmCustomTsy::CompleteSsAdditionalInfoNotification"); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyNotifySsAdditionalInfo ); @@ -4205,7 +4210,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TTwoDigitDialSupport* aSupport ) { -TFLOGSTRING("TSY: CMmCustomTsy::CheckTwoDigitDialSupportL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKTWODIGITDIALSUPPORTL_1, "TSY: CMmCustomTsy::CheckTwoDigitDialSupportL"); // save pointer to client space iTwoDigitDialSupport = aSupport; @@ -4646,7 +4651,7 @@ TInt CMmCustomTsy::ResetNetServerL( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmCustomTsy::ResetNetServerL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_RESETNETSERVERL_1, "TSY: CMmCustomTsy::ResetNetServerL"); // call DOS (no packed parameters) TInt ret = Phone()->MessageManager()->HandleRequestL( ECustomResetNetServerIPC ); @@ -4673,7 +4678,7 @@ void CMmCustomTsy::CompleteResetNetServer( TInt aErrorValue ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteResetNetServer - Error: %d", aErrorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETERESETNETSERVER_1, "TSY: CMmCustomTsy::CompleteResetNetServer - Error: %d", aErrorValue ); // reset the reqhandle TTsyReqHandle tsyReqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyResetNetServer ); @@ -4689,7 +4694,7 @@ aErrorValue = KErrNotReady; } -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteResetNetServer - complete with error value: %d", aErrorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETERESETNETSERVER_2, "TSY: CMmCustomTsy::CompleteResetNetServer - complete with error value: %d", aErrorValue ); ReqCompleted( tsyReqHandle, aErrorValue ); } } @@ -4741,7 +4746,7 @@ // If SIM is inserted complete network connection failure if ( iMmPhoneTsy->NosBootState()->iSIMReady ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyNetworkConnectionFailure"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYNETWORKCONNECTIONFAILURE_1, "TSY: CMmCustomTsy::CompleteNotifyNetworkConnectionFailure"); // reset the reqhandle TTsyReqHandle tsyReqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -5007,7 +5012,7 @@ const TTsyReqHandle aTsyReqHandle, TUint32* aNetworkMode ) { -TFLOGSTRING("CMmCustomTsy::GetCurrentSystemNetworkModeL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODEL_1, "CMmCustomTsy::GetCurrentSystemNetworkModeL"); TTsyReqHandle reqhandle = iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyGetCurrentSystemNetworkMode ); @@ -5047,7 +5052,7 @@ TInt CMmCustomTsy::GetCurrentSystemNetworkModeCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("CMmCustomTsy::GetCurrentSystemNetworkModeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODECANCEL_1, "CMmCustomTsy::GetCurrentSystemNetworkModeCancel"); // reset pointer to client data iCurrentNetworkMode = NULL; @@ -5075,7 +5080,7 @@ TDes8* aSimFileInfoPckg, TDes8* aSimResponseBuffer ) { -TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOL_1, "TSY: CMmCustomTsy::GetSimFileInfoL" ); TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyGetSimFileInfo ); @@ -5096,7 +5101,7 @@ && ( iGetSimFileInfoReq.iOffSet == simFileInfo.iOffSet ) && ( iGetSimFileInfoReq.iSize == simFileInfo.iSize ) ) { -TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoL - Same info already requested" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOL_2, "TSY: CMmCustomTsy::GetSimFileInfoL - Same info already requested" ); TGetSimFileInfoRequest* req = new ( ELeave ) TGetSimFileInfoRequest(); req->iReqHandle = aTsyReqHandle; @@ -5126,7 +5131,7 @@ } else { -TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoL - Save handle" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOL_3, "TSY: CMmCustomTsy::GetSimFileInfoL - Save handle" ); // Save the req handle type iReqHandleType = ECustomTsyGetSimFileInfo; // Save request in queue for completion @@ -5148,7 +5153,7 @@ // TInt CMmCustomTsy::GetSimFileInfoCancel( TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOCANCEL_1, "TSY: CMmCustomTsy::GetSimFileInfoCancel" ); for ( TInt i = 0; i < iGetSimFileInfoRequests.Count(); i++ ) { @@ -5189,7 +5194,7 @@ TDesC8* aData, TInt aError ) { -TFLOGSTRING( "TSY: CMmCustomTsy::CompleteGetSimFileInfo" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_1, "TSY: CMmCustomTsy::CompleteGetSimFileInfo" ); // reset the reqhandle TTsyReqHandle tsyReqHandle = @@ -5200,7 +5205,7 @@ { // complete TInt getSimFileInfoRequestsCount = iGetSimFileInfoRequests.Count(); -TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteGetSimFileInfo - Complete %d requests", getSimFileInfoRequestsCount ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_2, "TSY: CMmCustomTsy::CompleteGetSimFileInfo - Complete %d requests", getSimFileInfoRequestsCount ); for ( TInt i = 0; i < getSimFileInfoRequestsCount; i++ ) { @@ -5244,10 +5249,10 @@ { TInt ret( KErrNone ); - TFLOGSTRING ("TSY: CMmCustomTsy::GetLifeTimeL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_1, "TSY: CMmCustomTsy::GetLifeTimeL"); if ( sizeof(RMmCustomAPI::TLifeTimeData) != aLifeTimerInfoPckg->MaxLength() ) { - TFLOGSTRING ("TSY: CMmCustomTsy::GetLifeTimeL bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_2, "TSY: CMmCustomTsy::GetLifeTimeL bad size argument"); // Complete the request with appropiate error return KErrArgument; } @@ -5255,7 +5260,7 @@ ECustomTsyGetLifeTimerInfo ); if ( ECustomTsyReqHandleUnknown != reqHandle ) { -TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - ECustomTsyReqHandleUnknown" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_3, "TSY: CMmCustomTsy::GetLifeTimeL - ECustomTsyReqHandleUnknown" ); // The request is already in processing because of previous request. // Complete request with status value informing the client about // the situation. @@ -5265,7 +5270,7 @@ { // save pointer to the packaged life timer info iLifeTimerInfoPckg = aLifeTimerInfoPckg; - TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - send request" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_4, "TSY: CMmCustomTsy::GetLifeTimeL - send request" ); iTsyReqHandleStore->SetTsyReqHandle( ECustomTsyGetLifeTimerInfo, aTsyReqHandle ); ret = Phone()->MessageManager()->HandleRequestL( @@ -5273,13 +5278,13 @@ // Check response of the extension if ( KErrNone != ret ) { - TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - DOS layer returned error " ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_5, "TSY: CMmCustomTsy::GetLifeTimeL - DOS layer returned error " ); TTsyReqHandle tsyReqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyGetLifeTimerInfo ); if ( ECustomTsyReqHandleUnknown != tsyReqHandle ) { - TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - DOS error - unknown handle" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_6, "TSY: CMmCustomTsy::GetLifeTimeL - DOS error - unknown handle" ); } ReqCompleted( aTsyReqHandle, ret ); } @@ -5365,7 +5370,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TSetDriveMode* aModeStatus ) { -TFLOGSTRING3("TSY: CMmCustomTsy::SetDriveModeL - Req handle: %d, Mode status: %d", aTsyReqHandle, *aModeStatus ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETDRIVEMODEL_1, "TSY: CMmCustomTsy::SetDriveModeL - Req handle: %d, Mode status: %d", aTsyReqHandle, *aModeStatus ); if ( (iUsingFeatureManager) && (iFeatureControl.FeatureSupported(NFeature::KDriveModeCanRestrictMtCalls) == KFeatureSupported) ) { // get the handle @@ -5420,7 +5425,7 @@ void CMmCustomTsy::CompleteSetDriveMode( TInt aErrorCode ) { -TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteSetDriveMode - Error code: %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESETDRIVEMODE_1, "TSY: CMmCustomTsy::CompleteSetDriveMode - Error code: %d", aErrorCode ); if ( (iUsingFeatureManager) && (iFeatureControl.FeatureSupported(NFeature::KDriveModeCanRestrictMtCalls) == KFeatureSupported) ) { //Reset req handle, returns the deleted req handle @@ -5593,7 +5598,7 @@ void CMmCustomTsy::SetObjectForISVDialNumberCheck( CMmVoiceCallTsy* aCallObject ) { -TFLOGSTRING2("TSY: CMmCustomTsy::SetObjectForISVDialNumberCheck aCallObject=%x", aCallObject ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETOBJECTFORISVDIALNUMBERCHECK_1, "TSY: CMmCustomTsy::SetObjectForISVDialNumberCheck aCallObject=0x%08x", aCallObject ); //Save pointer for completion of check emergency number iISVDialNumberCheckObject = aCallObject; //ISV dial has been requested @@ -5609,7 +5614,7 @@ TInt CMmCustomTsy::NotifyRauEvent( RMmCustomAPI::TRauEventStatus* aEventStatus ) { -TFLOGSTRING("TSY: CMmCustomTsy::NotifyRauEvent"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYRAUEVENT_1, "TSY: CMmCustomTsy::NotifyRauEvent"); // save pointer to client data iRauEventStatus = aEventStatus; @@ -5630,7 +5635,7 @@ RMmCustomAPI::TRauEventStatus aEventStatus, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyRauEvent"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYRAUEVENT_1, "TSY: CMmCustomTsy::CompleteNotifyRauEvent"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyNotifyRauEvent ); @@ -5686,7 +5691,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::THSxPAStatus* aHSxPAStatus ) { -TFLOGSTRING("TSY: CMmCustomTsy::ReadHSxPAStatusL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_READHSXPASTATUSL_1, "TSY: CMmCustomTsy::ReadHSxPAStatusL"); TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyReadHSxPAStatus ); @@ -5729,7 +5734,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteReadHSxPAStatus"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_1, "TSY: CMmCustomTsy::CompleteReadHSxPAStatus"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyReadHSxPAStatus ); @@ -5741,7 +5746,7 @@ RMmCustomAPI::THSxPAStatus status; aDataPackage->UnPackData( status ); -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteReadHSxPAStatus, status = %d", status); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_2, "TSY: CMmCustomTsy::CompleteReadHSxPAStatus, status = %d", status); // Save the status. iHSxPAStatus = status; @@ -5770,7 +5775,7 @@ // TInt CMmCustomTsy::ReadHSxPAStatusCancel() { -TFLOGSTRING("TSY: CMmCustomTsy::ReadHSxPAStatusCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_READHSXPASTATUSCANCEL_1, "TSY: CMmCustomTsy::ReadHSxPAStatusCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -5797,7 +5802,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::THSxPAStatus* aHSxPAStatus ) { -TFLOGSTRING2("TSY: CMmCustomTsy::WriteHSxPAStatusL. New status: %d", *aHSxPAStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_WRITEHSXPASTATUSL_1, "TSY: CMmCustomTsy::WriteHSxPAStatusL. New status: %d", *aHSxPAStatus); iSetHSxPAStatus = aHSxPAStatus; @@ -5840,7 +5845,7 @@ void CMmCustomTsy::CompleteWriteHSxPAStatus( TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteWriteHSxPAStatus"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEWRITEHSXPASTATUS_1, "TSY: CMmCustomTsy::CompleteWriteHSxPAStatus"); //reset req handle. TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -5869,7 +5874,7 @@ // TInt CMmCustomTsy::WriteHSxPAStatusCancel() { -TFLOGSTRING("TSY: CMmCustomTsy::WriteHSxPAStatusCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_WRITEHSXPASTATUSCANCEL_1, "TSY: CMmCustomTsy::WriteHSxPAStatusCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -5895,7 +5900,7 @@ TInt CMmCustomTsy::NotifyHSxPAStatus( RMmCustomAPI::THSxPAStatus* aHSxPAStatus ) { -TFLOGSTRING("TSY: CMmCustomTsy::NotifyHSxPAStatus"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYHSXPASTATUS_1, "TSY: CMmCustomTsy::NotifyHSxPAStatus"); // save pointer to client data iRetNotifyHSxPAStatus = aHSxPAStatus; @@ -5916,13 +5921,13 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, Error: %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_1, "TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, Error: %d", aErrorCode); RMmCustomAPI::THSxPAStatus status; aDataPackage->UnPackData( status ); -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, old status: %d", iHSxPAStatus); -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, new status: %d", status); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_2, "TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, old status: %d", iHSxPAStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_3, "TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, new status: %d", status); // check if status was changed if ( iHSxPAStatus != status ) @@ -5965,7 +5970,7 @@ // TInt CMmCustomTsy::NotifyHSxPAStatusCancel() { -TFLOGSTRING("TSY: CMmCustomTsy::NotifyHSxPAStatusCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYHSXPASTATUSCANCEL_1, "TSY: CMmCustomTsy::NotifyHSxPAStatusCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -5992,7 +5997,7 @@ TTsyReqHandle /*aTsyReqHandle*/, TDes8* aCFIndicators ) { -TFLOGSTRING("TSY: CMmCustomTsy::GetIccCallForwardingStatusL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSL_1, "TSY: CMmCustomTsy::GetIccCallForwardingStatusL"); TInt ret( KErrGeneral ); @@ -6038,7 +6043,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, aErrorCode=%d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_1, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, aErrorCode=%d", aErrorCode ); //reset req handle. TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -6053,7 +6058,7 @@ RMmCustomAPI::TCFIndicators& tcfIndicator = ( *tcfIndicatorPckg )(); aDataPackage->UnPackData( iCurrentTCFIndicator ); -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, indicator=%u", iCurrentTCFIndicator.iIndicator ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_2, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, indicator=%u", iCurrentTCFIndicator.iIndicator ); tcfIndicator.iIndicator = iCurrentTCFIndicator.iIndicator; tcfIndicator.iCFNumber.iTypeOfNumber = @@ -6066,7 +6071,7 @@ // Update CenRep with latest valid data if( &iCurrentTCFIndicator ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Update Central Repository"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_3, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Update Central Repository"); TPckg tempPckg( iCurrentTCFIndicator.iIndicator ); iCFISCentRep->Set( KCtsyCallForwardingIndicator, tempPckg ); @@ -6091,9 +6096,9 @@ { iGetIccCfStatusBootUp = EFalse; aDataPackage->UnPackData( iCurrentTCFIndicator ); -TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep key UnconditionalCFStatus not RESETED."); - -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Bootup case, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_4, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep key UnconditionalCFStatus not RESETED."); + +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_5, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Bootup case, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator ); TPckg tempPckg( iCurrentTCFIndicator.iIndicator ); iCFISCentRep->Set( KCtsyCallForwardingIndicator, tempPckg ); @@ -6103,7 +6108,7 @@ iCurrentTCFIndicator.iCFNumber.iTelNumber ); iCFISPrivateCentRep->Set( KCtsyCallForwardingMspId, iCurrentTCFIndicator.iMultipleSubscriberProfileID ); -TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep updated."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_6, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep updated."); } } } @@ -6117,7 +6122,7 @@ TInt CMmCustomTsy::GetIccCallForwardingStatusCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("CMmCustomTsy::GetIccCallForwardingStatusCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSCANCEL_1, "CMmCustomTsy::GetIccCallForwardingStatusCancel"); // reset reqhandle iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyGetIccCallForwardingStatus ); @@ -6179,7 +6184,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange, Error: %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_1, "TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange, Error: %d", aErrorCode); RMmCustomAPI::TCFIndicators tempNotifyCFIndicator; aDataPackage->UnPackData( tempNotifyCFIndicator ); @@ -6199,7 +6204,7 @@ TPckg tempPckg( iCurrentTCFIndicator.iIndicator ); iCFISCentRep->Set( KCtsyCallForwardingIndicator, tempPckg ); -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange : Update CenRep, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_2, "TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange : Update CenRep, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator ); iCFISPrivateCentRep->Set( KCtsyCallForwardingNumberPlan, iCurrentTCFIndicator.iCFNumber.iNumberPlan ); @@ -6210,7 +6215,7 @@ iCFISPrivateCentRep->Set( KCtsyCallForwardingMspId, iCurrentTCFIndicator.iMultipleSubscriberProfileID ); //CenRep updated -TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange CenRep updated."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_3, "TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange CenRep updated."); } // Check if notification was requested @@ -6309,7 +6314,7 @@ TInt CMmCustomTsy::GetCellInfoL( TDes8* aCellInfoPckg ) { -TFLOGSTRING("TSY: CMmCustomTsy::GetCellInfo"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCELLINFOL_1, "TSY: CMmCustomTsy::GetCellInfo"); TInt ret = KErrServerBusy; @@ -6349,7 +6354,7 @@ // TInt CMmCustomTsy::GetCellInfoCancel() { -TFLOGSTRING("TSY: CMmCustomTsy::GetCellInfoCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCELLINFOCANCEL_1, "TSY: CMmCustomTsy::GetCellInfoCancel"); // reset the req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -6377,7 +6382,7 @@ RMmCustomAPI::TMmCellInfo* aCellInfo, TInt aErrorValue ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetCellInfo - aErrorValue %d", aErrorValue); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETCELLINFO_1, "TSY: CMmCustomTsy::CompleteGetCellInfo - aErrorValue %d", aErrorValue); // reset the req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -6408,7 +6413,7 @@ TInt CMmCustomTsy::NotifyCellInfoChange( TDes8* aCellInfoPckg ) { -TFLOGSTRING("TSY: CMmCustomTsy::NotifyCellInfoChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYCELLINFOCHANGE_1, "TSY: CMmCustomTsy::NotifyCellInfoChange"); RMmCustomAPI::TMmCellInfo temp; RMmCustomAPI::TMmCellInfoPckg tempPckg(temp); @@ -6438,7 +6443,7 @@ RMmCustomAPI::TMmCellInfo* aCellInfo, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyCellInfoChange Error: %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCELLINFOCHANGE_1, "TSY: CMmCustomTsy::CompleteNotifyCellInfoChange Error: %d", aErrorCode); // Check if notification was requested TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -6470,7 +6475,7 @@ // TInt CMmCustomTsy::NotifyCellInfoChangeCancel() { -TFLOGSTRING("TSY: CMmCustomTsy::NotifyCellInfoChangeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYCELLINFOCHANGECANCEL_1, "TSY: CMmCustomTsy::NotifyCellInfoChangeCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -6496,7 +6501,7 @@ RMmCustomAPI::TPndCacheStatus CMmCustomTsy::GetPhonebookCacheStatus( TUint8 aPhoneBookType ) { -TFLOGSTRING("TSY: CMmCustomTsy::GetPhonebookCacheStatus"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPHONEBOOKCACHESTATUS_1, "TSY: CMmCustomTsy::GetPhonebookCacheStatus"); RMmCustomAPI::TPndCacheStatus ret( RMmCustomAPI::ECacheNotUsed ); switch ( aPhoneBookType ) @@ -6526,7 +6531,7 @@ void CMmCustomTsy::ReqCompleted( const TTsyReqHandle aTsyReqHandle, const TInt aError ) { -TFLOGSTRING3("TSY: CMmCustomTsy::ReqCompleted, aTsyReqHandle=%d, aError=%d", aTsyReqHandle, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_REQCOMPLETED_1, "TSY: CMmCustomTsy::ReqCompleted, aTsyReqHandle=%d, aError=%d", aTsyReqHandle, aError ); CTelObject::ReqCompleted ( aTsyReqHandle, aError ); } @@ -6542,7 +6547,7 @@ RMmCustomAPI::TBandSelection* aSystemNetworkBand, RMmCustomAPI::TNetworkModeCaps* aSystemNetworkMode ) { -TFLOGSTRING("TSY: CMmCustomTsy::GetSystemNetworkBandL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSYSTEMNETWORKBANDL_1, "TSY: CMmCustomTsy::GetSystemNetworkBandL"); TTsyReqHandle reqhandle = iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyGetSystemNetworkBand ); @@ -6588,7 +6593,7 @@ RMmCustomAPI::TNetworkModeCaps aSystemNetworkMode, TInt aResult ) { -TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetSystemNetworkBand. Result: %d", aResult); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETSYSTEMNETWORKBAND_1, "TSY: CMmCustomTsy::CompleteGetSystemNetworkBand. Result: %d", aResult); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyGetSystemNetworkBand ); @@ -6621,7 +6626,7 @@ TInt CMmCustomTsy::GetSystemNetworkBandCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmCustomTsy::GetSystemNetworkBandCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSYSTEMNETWORKBANDCANCEL_1, "TSY: CMmCustomTsy::GetSystemNetworkBandCancel"); // reset the pointer to client data iAvailableSystemNetworkBand = NULL; iSystemNetworkModeCaps = NULL; @@ -6647,7 +6652,7 @@ RMmCustomAPI::TBandSelection* aSystemNetworkBand, RMmCustomAPI::TNetworkModeCaps* aSystemNetworkModeCaps ) { -TFLOGSTRING("TSY: CMmCustomTsy::SetSystemNetworkBandL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETSYSTEMNETWORKBANDL_1, "TSY: CMmCustomTsy::SetSystemNetworkBandL"); TTsyReqHandle reqhandle = iTsyReqHandleStore->GetTsyReqHandle( ECustomTsySetSystemNetworkBand ); @@ -6697,7 +6702,7 @@ void CMmCustomTsy::CompleteSetSystemNetworkBand( TInt aResult ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteSetSystemNetworkBand"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESETSYSTEMNETWORKBAND_1, "TSY: CMmCustomTsy::CompleteSetSystemNetworkBand"); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsySetSystemNetworkBand ); @@ -6718,7 +6723,7 @@ // void CMmCustomTsy::SetIccCfBootUpFlag( TBool aBootUp ) { -TFLOGSTRING2("TSY: CMmCustomTsy::SetIccCfBootUpFlag, aBootUp=%d", aBootUp ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETICCCFBOOTUPFLAG_1, "TSY: CMmCustomTsy::SetIccCfBootUpFlag, aBootUp=%d", aBootUp ); iGetIccCfStatusBootUp = aBootUp; } @@ -6732,7 +6737,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TAppSupport* aAppSupport ) { -TFLOGSTRING("TSY: CMmCustomTsy::GetUSIMServiceSupportL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETUSIMSERVICESUPPORTL_1, "TSY: CMmCustomTsy::GetUSIMServiceSupportL"); TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyGetUSIMServiceSupport ); @@ -6779,7 +6784,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetUSIMServiceSupport"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETUSIMSERVICESUPPORT_1, "TSY: CMmCustomTsy::CompleteGetUSIMServiceSupport"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyGetUSIMServiceSupport ); @@ -6816,7 +6821,7 @@ // TInt CMmCustomTsy::GetUSIMServiceSupportCancel() { -TFLOGSTRING("TSY: CMmCustomTsy::GetUSIMServiceSupportCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETUSIMSERVICESUPPORTCANCEL_1, "TSY: CMmCustomTsy::GetUSIMServiceSupportCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -6842,7 +6847,7 @@ TInt CMmCustomTsy::NotifyRemoteAlertingToneStatusChange( RMmCustomAPI::TRemoteAlertingToneStatus* aToneStatus ) { -TFLOGSTRING("TSY: CMmCustomTsy::NotifyRemoteAlertingToneStatusChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYREMOTEALERTINGTONESTATUSCHANGE_1, "TSY: CMmCustomTsy::NotifyRemoteAlertingToneStatusChange"); // save pointer to client data iToneStatus = aToneStatus; @@ -6863,7 +6868,7 @@ RMmCustomAPI::TRemoteAlertingToneStatus aToneStatus, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyRemoteAlertingToneStatusChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYREMOTEALERTINGTONESTATUSCHANGE_1, "TSY: CMmCustomTsy::CompleteNotifyRemoteAlertingToneStatusChange"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyNotifyRemoteAlertingToneStatusChange ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -15,7 +15,11 @@ -#include + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CMmPacketTsyTraces.h" +#endif #include "CMmCustomTsy.h" #include "CMmPacketTsy.h" @@ -47,7 +51,7 @@ CMmCustomTsy* aMmCustomTsy, CMmPhoneTsy* aMmPhone ) { -TFLOGSTRING( "CustomTSY: CMmPacketTsy::NewL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_NEWL_1, "CustomTSY: CMmPacketTsy::NewL" ); CMmPacketTsy* mmPacketTsy = new ( ELeave ) CMmPacketTsy(); CleanupStack::PushL( mmPacketTsy ); mmPacketTsy->iMmCustomTsy = aMmCustomTsy; @@ -60,7 +64,7 @@ CMmPacketTsy::~CMmPacketTsy() { -TFLOGSTRING( "CustomTSY: CMmPacketTsy::~CMmPacketTsy" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_DTOR_1, "CustomTSY: CMmPacketTsy::~CMmPacketTsy" ); delete iTsyReqHandleStore; } @@ -160,7 +164,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3( "CustomTSY: CMmPacketTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_DOEXTFUNCL_1, "CustomTSY: CMmPacketTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle ); TInt ret( KErrNotSupported ); switch ( aIpc ) @@ -172,7 +176,7 @@ ret = GetEGprsInfo( aTsyReqHandle, aPackage.Des1n() ); break; case ECustomSetAlwaysOnMode: -TFLOGSTRING( "TSY:CMmPacketTsy::DoExtFuncL ECustomSetAlwaysOnMode"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_DOEXTFUNCL_2, "TSY:CMmPacketTsy::DoExtFuncL ECustomSetAlwaysOnMode"); ret = SetAlwaysOnL( aTsyReqHandle, ( REINTERPRET_CAST( RMmCustomAPI::TSetAlwaysOnMode*, aPackage.Ptr1() ) ) ); @@ -278,7 +282,7 @@ const TInt aIpc, const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2( "CustomTSY: CMmPacketTsy::CancelService IPC:%d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_CANCELSERVICE_1, "CustomTSY: CMmPacketTsy::CancelService IPC:%d", aIpc ); TInt ret( KErrNone ); // Req handle type @@ -334,7 +338,7 @@ const TTsyReqHandle aTsyReqHandle, const TInt aError ) { -TFLOGSTRING3( "CustomTSY: CMmPacketTsy::ReqCompleted Handle:%d Error:%d", aTsyReqHandle, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_REQCOMPLETED_1, "CustomTSY: CMmPacketTsy::ReqCompleted Handle:%d Error:%d", aTsyReqHandle, aError ); iMmCustomTsy->ReqCompleted( aTsyReqHandle, aError ); } @@ -348,7 +352,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aGprsInformation ) { -TFLOGSTRING( "CustomTSY: CMmPacketTsy::NotifyEGprsInfoChange" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_NOTIFYEGPRSINFOCHANGE_1, "CustomTSY: CMmPacketTsy::NotifyEGprsInfoChange" ); RMmCustomAPI::TGprsInformation temp; RMmCustomAPI::TGprsInformationPckg tempPckg(temp); @@ -382,7 +386,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aGprsInformation ) { -TFLOGSTRING( "CustomTSY: CMmPacketTsy::GetEGprsInfo" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_GETEGPRSINFO_1, "CustomTSY: CMmPacketTsy::GetEGprsInfo" ); RMmCustomAPI::TGprsInformation temp; RMmCustomAPI::TGprsInformationPckg tempPckg(temp); @@ -419,14 +423,14 @@ // if gprsSupportInCell is ETrue -> cell is supporting EGPRS connection if ( edgeGprsSupportInCell ) { - TFLOGSTRING( "CustomTSY: CMmPacketTsy::GetEGprsInfo RMmCustomAPI::EEdgeGprs" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_GETEGPRSINFO_2, "CustomTSY: CMmPacketTsy::GetEGprsInfo RMmCustomAPI::EEdgeGprs" ); gprsInformation.iGprsInfo = RMmCustomAPI::EEdgeGprs; } // else EGPRS connection is not supported else { - TFLOGSTRING( "CustomTSY: CMmPacketTsy::GetEGprsInfo RMmCustomAPI::EGprs" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_GETEGPRSINFO_3, "CustomTSY: CMmPacketTsy::GetEGprsInfo RMmCustomAPI::EGprs" ); gprsInformation.iGprsInfo = RMmCustomAPI::EGprs; } @@ -448,7 +452,7 @@ void CMmPacketTsy::CompleteNotifyEGprsInfoChange( const TBool aGprsSupportInCell ) { -TFLOGSTRING( "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_1, "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange" ); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePacketContextNotifyEGprsInfoChange ); @@ -461,14 +465,14 @@ // if aGprsSupportInCell is ETrue -> cell is supporting edge GPRS if ( aGprsSupportInCell ) { -TFLOGSTRING( "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange RMmCustomAPI::EEdgeGprs" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_2, "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange RMmCustomAPI::EEdgeGprs" ); gprsInformation.iGprsInfo = RMmCustomAPI::EEdgeGprs; } // if aGprsSupportInCell is EFalse -> cell is not supporting edge GPRS else { -TFLOGSTRING( "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange RMmCustomAPI::EGprs" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_3, "CustomTSY: CMmPacketTsy::CompleteNotifyEGprsInfoChange RMmCustomAPI::EGprs" ); gprsInformation.iGprsInfo = RMmCustomAPI::EGprs; } @@ -489,7 +493,7 @@ TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TSetAlwaysOnMode* aMode ) { -TFLOGSTRING2( "CMmPacketTsy::SetAlwaysOn Reg Handle = %d", aTsyReqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_SETALWAYSONL_1, "CMmPacketTsy::SetAlwaysOn Reg Handle = %d", aTsyReqHandle ); TInt ret( KErrGeneral ); @@ -506,7 +510,7 @@ } else { -TFLOGSTRING( "CMmPacketTsy::SetAlwaysOn packetDataSession is NULL " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_SETALWAYSONL_2, "CMmPacketTsy::SetAlwaysOn packetDataSession is NULL " ); } return ret; @@ -522,7 +526,7 @@ TTsyReqHandle aReqHandle, TInt aError ) { -TFLOGSTRING( "CMmPacketTsy::CompleteSetAlwaysOn" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_COMPLETESETALWAYSON_1, "CMmPacketTsy::CompleteSetAlwaysOn" ); ReqCompleted( aReqHandle, aError ); @@ -536,7 +540,7 @@ // void CMmPacketTsy::CancelSetAlwaysOn( TTsyReqHandle aReqHandle ) { -TFLOGSTRING( "CMmPacketTsy::CancelSetAlwaysOn" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETTSY_CANCELSETALWAYSON_1, "CMmPacketTsy::CancelSetAlwaysOn" ); //Direct request to Service Tsy iMmPhone->PacketDataSession()->CancelSetAlwaysOn( aReqHandle ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,9 +16,14 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CMmSIMTsyTraces.h" +#endif + #include "CMmSIMTsy.h" #include -#include // ======== MEMBER FUNCTIONS ======== @@ -30,7 +35,7 @@ void CMmSIMTsy::ConstructL( CMmCustomTsy* aMmCustomTsy ) { -TFLOGSTRING("TSY: CMmSIMTsy::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CONSTRUCTL_1, "TSY: CMmSIMTsy::ConstructL"); iMmCustomTsy = aMmCustomTsy; // Create req handle store @@ -59,7 +64,7 @@ ( KPhEngMaxViagHomeZones * KPhEngMaxCacheId ) ); ); if ( leaveCode ) { -TFLOGSTRING2("TSY: CMmSIMTsy::ConstructL: Could not construct o2 HomeZone dynamic cache, error=%d", leaveCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CONSTRUCTL_2, "TSY: CMmSIMTsy::ConstructL: Could not construct o2 HomeZone dynamic cache, error=%d", leaveCode); iViagDynamicCache = NULL; } else @@ -71,14 +76,14 @@ iViagDynamicCache->AppendL( zero, ( KPhEngMaxViagHomeZones * KPhEngMaxCacheId ) ); iViagHomeZoneCacheReady = EFalse; -TFLOGSTRING("TSY: CMmSIMTsy::ConstructL: o2 HomeZone dynamic cache array created."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CONSTRUCTL_3, "TSY: CMmSIMTsy::ConstructL: o2 HomeZone dynamic cache array created."); } } CMmSIMTsy* CMmSIMTsy::NewL( CMmCustomTsy* aMmCustomTsy ) { -TFLOGSTRING("TSY: CMmSIMTsy::NewL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_NEWL_1, "TSY: CMmSIMTsy::NewL"); CMmSIMTsy* self = new (ELeave) CMmSIMTsy(); CleanupStack::PushL( self ); @@ -90,7 +95,7 @@ CMmSIMTsy::~CMmSIMTsy() { -TFLOGSTRING("TSY: CMmSIMTsy::~CMmSIMTsy()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_DTOR_1, "TSY: CMmSIMTsy::~CMmSIMTsy()"); // delete all CB ID related ResetAndDestroySimCbTopics(); @@ -150,7 +155,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmSIMTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_DOEXTFUNCL_1, "TSY: CMmSIMTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle); TInt ret( KErrGeneral ); // Ensure the ReqHandleType is unset. @@ -370,7 +375,7 @@ RMmCustomAPI::TViagParams* aViagParameters, RMmCustomAPI::TViagElement* aViagElements ) { -TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneParamsL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONEPARAMSL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneParamsL"); TInt ret( KErrNone); if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle( @@ -419,7 +424,7 @@ // void CMmSIMTsy::CheckViagHomezoneParamsL() { -TFLOGSTRING("TSY: CMmSIMTsy::CheckViagHomezoneParamsL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_1, "TSY: CMmSIMTsy::CheckViagHomezoneParamsL"); // Check if the request is pending if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle( ESIMRequestTypeReadParams ) && iViagParamsReadRequested ) @@ -428,7 +433,7 @@ // read requests, set flag to EFalse. iViagParamsReadRequested = EFalse; -TFLOGSTRING("TSY: CMmSIMTsy::CheckViagHomezoneParamsL - Sending request" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_2, "TSY: CMmSIMTsy::CheckViagHomezoneParamsL - Sending request" ); // send request to DOS (no parameters) // Void return value, there is nothing to be done if request fails. (void) iMmCustomTsy->Phone()->MessageManager()->HandleRequestL( @@ -436,7 +441,7 @@ } else { -TFLOGSTRING("TSY: CMmSIMTsy::CheckViagHomezoneParamsL - VIAG homezone params not requested"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_3, "TSY: CMmSIMTsy::CheckViagHomezoneParamsL - VIAG homezone params not requested"); } StartDynamicCachingL(); @@ -454,7 +459,7 @@ RMmCustomAPI::TViagElements* aElems, TInt aError ) { -TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - aError: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_1, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - aError: %d", aError ); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ESIMRequestTypeReadParams ); if ( ESIMTsyReqHandleUnknown != reqHandle ) @@ -462,29 +467,29 @@ if ( aError == KErrNone && iViagParams && iViagElems ) { *iViagParams = *aParams; -TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSmsC: %S", &iViagParams->iSmsC ); -TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iScp: %S", &iViagParams->iScp ); -TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSubscribedZoneAndVersion: %d", iViagParams->iSubscribedZoneAndVersion ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_2, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSmsC: %S", iViagParams->iSmsC ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_3, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iScp: %S", iViagParams->iScp ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_4, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSubscribedZoneAndVersion: %d", iViagParams->iSubscribedZoneAndVersion ); for ( TUint8 i = 0; i < RMmCustomAPI::KViagElementCount; i++ ) { iViagElems[ i ].iCoordinates.iX = aElems->At(i).iCoordinates.iX; -TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iX: %d", i, aElems->At(i).iCoordinates.iX ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_5, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iX: %d", i, aElems->At(i).iCoordinates.iX ); iViagElems[ i ].iCoordinates.iY = aElems->At(i).iCoordinates.iY; -TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iY: %d", i, aElems->At(i).iCoordinates.iY ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_6, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iY: %d", i, aElems->At(i).iCoordinates.iY ); iViagElems[ i ].iCoordinates.iR2 = aElems-> At(i).iCoordinates.iR2; -TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iR2: %d", i, aElems->At(i).iCoordinates.iR2 ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_7, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iR2: %d", i, aElems->At(i).iCoordinates.iR2 ); iViagElems[ i ].iCoordinates.iZoneId = aElems-> At(i).iCoordinates.iZoneId; -TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iZoneId: %d", i, aElems->At(i).iCoordinates.iZoneId ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_8, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iZoneId: %d", i, aElems->At(i).iCoordinates.iZoneId ); iViagElems[ i ].iName.Copy( aElems->At(i).iName ); iViagElems[ i ].iActiveFlag = aElems->At(i).iActiveFlag; -TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iActiveFlag: %d", i, aElems->At(i).iActiveFlag ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_9, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iActiveFlag: %d", i, aElems->At(i).iActiveFlag ); } } iMmCustomTsy->ReqCompleted( reqHandle, aError ); @@ -499,7 +504,7 @@ // TInt CMmSIMTsy::ReadViagHomeZoneParamsCancel() { -TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneParamsCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONEPARAMSCANCEL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneParamsCancel"); // reset the pointer to client space iViagParams = NULL; iViagElems = NULL; @@ -527,7 +532,7 @@ RMmCustomAPI::TViagCacheRecordId* aViagRecordId, RMmCustomAPI::TViagCacheRecordContent* aViagRecordContent ) { -TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneCacheL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHEL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheL"); TInt ret( KErrGeneral ); if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle( @@ -564,7 +569,7 @@ RMmCustomAPI::TViagCacheRecordContent* aViagRecord, TInt aError ) { -TFLOGSTRING("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_1, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL"); iLastViagHomeZoneCacheError = aError; if (iCurrentlyRetrievedCache == NULL) { @@ -586,7 +591,7 @@ ( ( iCurrentlyRetrievedCache->iCacheId - 1 ) * 21 ) + iCurrentlyRetrievedCache->iRecordId; iViagDynamicCache->At( arrayIndex ) = *aViagRecord; -TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Entry at cacheId=%d, recordId=%d read.", iCurrentlyRetrievedCache->iCacheId,iCurrentlyRetrievedCache->iRecordId); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_2, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Entry at cacheId=%d, recordId=%d read.", iCurrentlyRetrievedCache->iCacheId,iCurrentlyRetrievedCache->iRecordId); TRAP_IGNORE( // loop. loop four caches times 21 entries! @@ -618,14 +623,14 @@ delete iCurrentlyRetrievedCache; iCurrentlyRetrievedCache = NULL; iViagHomeZoneCacheReady = ETrue; -TFLOGSTRING("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Caching completed successfully!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_3, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Caching completed successfully!"); if( 0 < iReadViagHomeZoneCacheRequests.Count() ) { for ( TInt i=0; i ReqCompleted(req->iReqHandle, aError); @@ -680,8 +685,8 @@ TInt CMmSIMTsy::ReadViagHomeZoneCacheCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel"); -TFLOGSTRING2("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Handle:%d",aTsyReqHandle); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel"); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_2, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Handle:%d",aTsyReqHandle); // Reset the pointer to client space iViagReadCacheRecord = NULL; @@ -696,7 +701,7 @@ ESIMRequestTypeReadCache ); if ( ESIMTsyReqHandleUnknown != reqHandle ) { -TFLOGSTRING2("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Completed with Cancel Handle:%d",reqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_3, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Completed with Cancel Handle:%d",reqHandle); // Complete request with cancel iMmCustomTsy->ReqCompleted( reqHandle, KErrCancel ); } @@ -714,7 +719,7 @@ if (aTsyReqHandle == req->iReqHandle) { // Complete the request if the request handle is found -TFLOGSTRING3("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Complete with Cancel from array Handle:%d Id=%d ", req->iReqHandle,i); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_4, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Complete with Cancel from array Handle:%d Id=%d ", req->iReqHandle,i); iMmCustomTsy->ReqCompleted( req->iReqHandle, KErrCancel ); delete iReadViagHomeZoneCacheRequests[ i ]; iReadViagHomeZoneCacheRequests.Remove(i); @@ -737,8 +742,8 @@ RMmCustomAPI::TViagCacheRecordId* aViagRecordId, RMmCustomAPI::TViagCacheRecordContent* aViagRecordContent ) { -TFLOGSTRING2("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache:Is ViagHomeZoneCache Ready =%d", iViagHomeZoneCacheReady); -TFLOGSTRING3("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_1, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache:Is ViagHomeZoneCache Ready =%d", iViagHomeZoneCacheReady); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_2, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId ); TInt err = KErrNone; // KPhEngMaxViagHomeZones(4) * KPhEngMaxCacheId(21) if ( 1 > aViagRecordId->iCacheId || 4 < aViagRecordId->iCacheId || @@ -748,7 +753,7 @@ } else if ( iViagDynamicCache && iViagHomeZoneCacheReady ) { -TFLOGSTRING("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is ready, Reading cache possible"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_3, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is ready, Reading cache possible"); // copy data from dynamic cache to client // some arithmetics: // cache ids range 1..4 @@ -761,7 +766,7 @@ } else if ( !iViagHomeZoneCacheReady ) { - TFLOGSTRING("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is NOT ready, Reading cache NOT possible"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_4, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is NOT ready, Reading cache NOT possible"); //The request is already in processing because of previous request //Complete request with status value informing the client about TReadViagHomeZoneCacheRequest* req = @@ -796,7 +801,7 @@ RMmCustomAPI::TViagCacheRecordId* aViagRecordId, RMmCustomAPI::TViagCacheRecordContent* aViagRecordContent ) { -TFLOGSTRING3("TSY: CCMmSIMTsy::WriteViagHomeZoneCacheL iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_WRITEVIAGHOMEZONECACHEL_1, "TSY: CCMmSIMTsy::WriteViagHomeZoneCacheL iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId ); TInt ret( KErrGeneral ); if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle( @@ -848,7 +853,7 @@ void CMmSIMTsy::CompleteWriteViagHomeZoneCacheResp( TInt aError ) { -TFLOGSTRING("TSY: CMmSIMTsy::CompleteWriteViagHomeZoneCacheResp"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONECACHERESP_1, "TSY: CMmSIMTsy::CompleteWriteViagHomeZoneCacheResp"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ESIMRequestTypeWriteCache ); @@ -869,7 +874,7 @@ void CMmSIMTsy::CompleteWriteViagHomeZoneUHZIUESettingsResp( TInt aError ) { -TFLOGSTRING2("TSY: CMmSIMTsy::CompleteWriteViagHomeZoneUHZIUESettingsResp error = %d",aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONEUHZIUESETTINGSRESP_1, "TSY: CMmSIMTsy::CompleteWriteViagHomeZoneUHZIUESettingsResp error = %d",aError); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ESIMRequestTypeWriteSettings ); @@ -908,12 +913,12 @@ // void CMmSIMTsy::StartDynamicCachingL() { -TFLOGSTRING("TSY: CMmSIMTsy::StartDynamicCachingL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_1, "TSY: CMmSIMTsy::StartDynamicCachingL"); iLastViagHomeZoneCacheError = KErrNone; // Make sure there are no ongoing dynamic caching requests.. if( iCurrentlyRetrievedCache ) { -TFLOGSTRING("TSY: CMmSIMTsy::StartDynamicCachingL - iCurrentlyRetrievedCache already exists - no new request done"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_2, "TSY: CMmSIMTsy::StartDynamicCachingL - iCurrentlyRetrievedCache already exists - no new request done"); return; } @@ -922,10 +927,10 @@ RMmCustomAPI::TViagCacheRecordId(); ); if ( trapError ) { -TFLOGSTRING2("TSY: CMmSIMTsy::StartDynamicCachingL:Could not start caching, error=%d", trapError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_3, "TSY: CMmSIMTsy::StartDynamicCachingL:Could not start caching, error=%d", trapError); return; } -TFLOGSTRING("TSY: CMmSIMTsy::StartDynamicCachingL:Starting caching now."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_4, "TSY: CMmSIMTsy::StartDynamicCachingL:Starting caching now."); iCurrentlyRetrievedCache->iCacheId = 1; // caches range from 1 to 4 iCurrentlyRetrievedCache->iRecordId = 0; // records range from 0 to 20 // send request to DOS @@ -946,7 +951,7 @@ TInt CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsL( RMmCustomAPI::TViagUHZIUESettings* aSettings ) { -TFLOGSTRING("TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSL_1, "TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsL"); TInt ret( KErrGeneral ); if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle( @@ -977,7 +982,7 @@ // TInt CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsCancel() { -TFLOGSTRING("TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSCANCEL_1, "TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsCancel"); // check if handle is not in use. TTsyReqHandle scFileHandle = iTsyReqHandleStore->GetTsyReqHandle( ESIMRequestTypeWriteSettings ); @@ -1009,7 +1014,7 @@ TInt CMmSIMTsy::StartSimCbTopicBrowsingL( const TTsyReqHandle /*aTsyReqHandle */) { -TFLOGSTRING("TSY: CMmSIMTsy::StartSimCbTopicBrowsingL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTSIMCBTOPICBROWSINGL_1, "TSY: CMmSIMTsy::StartSimCbTopicBrowsingL"); // reset variables ResetAndDestroySimCbTopics(); iGetNextSimCbTopicIndex = KNoCbIds; @@ -1050,7 +1055,7 @@ CArrayFixFlat* aTopics, TInt aError ) { -TFLOGSTRING("TSY: CMmSIMTsy::CompleteStartSimCbTopicBrowsing"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETESTARTSIMCBTOPICBROWSING_1, "TSY: CMmSIMTsy::CompleteStartSimCbTopicBrowsing"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ESIMRequestTypeStartSimCbTopicBrowsing ); @@ -1093,7 +1098,7 @@ TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TSimCbTopic *aSimCbTopic ) { -TFLOGSTRING("TSY: CMmSIMTsy::GetNextSimCbTopic"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_GETNEXTSIMCBTOPIC_1, "TSY: CMmSIMTsy::GetNextSimCbTopic"); // initialize ret with KErrNotFound TInt ret ( KErrNotFound ); @@ -1129,7 +1134,7 @@ const TTsyReqHandle /*aTsyReqHandle */, TUint* aSimCbTopicNumber ) { -TFLOGSTRING("TSY: CMmSIMTsy::DeleteSimCbTopicL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_DELETESIMCBTOPICL_1, "TSY: CMmSIMTsy::DeleteSimCbTopicL"); TInt ret( KErrNone ); TBool topicInSimMemoryDelete ( EFalse ); @@ -1188,7 +1193,7 @@ void CMmSIMTsy::CompleteDeleteSimCbTopic( TInt aError ) { -TFLOGSTRING2("TSY: CMmSIMTsy::CompleteDeleteSimCbTopic- aError: %d", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEDELETESIMCBTOPIC_1, "TSY: CMmSIMTsy::CompleteDeleteSimCbTopic- aError: %d", aError); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( ESIMRequestTypeDeleteSimCbTopic ); @@ -1298,7 +1303,7 @@ TInt aReqHandleType, TInt aError ) { -TFLOGSTRING3( "CustomTSY: CMmSIMTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETE_1, "CustomTSY: CMmSIMTsy::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. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSimLockTsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSimLockTsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSimLockTsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,8 +16,13 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CMmSimLockTsyTraces.h" +#endif + #include "CMmSimLockTsy.h" -#include #include // ======== MEMBER FUNCTIONS ======== @@ -448,7 +453,7 @@ TInt aReqHandleType, TInt aError ) { -TFLOGSTRING3( "CMmCustomTsy: CMmSimLockTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMLOCKTSY_COMPLETE_1, "CMmCustomTsy: CMmSimLockTsy::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. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmWimTsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmWimTsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmWimTsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,9 +16,14 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CMmWimTsyTraces.h" +#endif + #include "CMmWimTsy.h" #include -#include #include // ======== MEMBER FUNCTIONS ======== @@ -503,7 +508,7 @@ TInt aReqHandleType, TInt aError ) { -TFLOGSTRING3( "CustomTSY: CMmWimTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETE_1, "CustomTSY: CMmWimTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError ); iMmCustomTsy->ReqCompleted( iTsyReqHandleStore->ResetTsyReqHandle( aReqHandleType ), aError ); } @@ -519,7 +524,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8 *aATR ) { -TFLOGSTRING( "TSY: CMmWimTsy::GetATRL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETATRL_1, "TSY: CMmWimTsy::GetATRL" ); TTsyReqHandle getAtrHandle = iTsyReqHandleStore-> GetTsyReqHandle( EWIMRequestTypeGetATR ); @@ -529,7 +534,7 @@ // The request is already in processing because of previous request // Complete request with status value informing the client about // the situation. -TFLOGSTRING( "TSY: CMmWimTsy::GetATRL - KErrServerBusy" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETATRL_2, "TSY: CMmWimTsy::GetATRL - KErrServerBusy" ); iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -572,7 +577,7 @@ TPtrC8& aData, TInt aError ) { -TFLOGSTRING( "TSY: CMmWimTsy::CompleteGetATR "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETEGETATR_1, "TSY: CMmWimTsy::CompleteGetATR "); // reset the reqhandle TTsyReqHandle tsyReqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeGetATR ); @@ -606,7 +611,7 @@ // TInt CMmWimTsy::GetATRCancel() { -TFLOGSTRING( "CMmWimTsy::GetATRCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETATRCANCEL_1, "CMmWimTsy::GetATRCancel" ); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeGetATR ); @@ -632,7 +637,7 @@ TInt CMmWimTsy::SimWarmResetL( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING( "CMmWimTsy::SimWarmResetL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SIMWARMRESETL_1, "CMmWimTsy::SimWarmResetL"); TTsyReqHandle simWarmResetHandle = iTsyReqHandleStore->GetTsyReqHandle( EWIMRequestTypeSimWarmReset ); @@ -641,7 +646,7 @@ // The request is already in processing because of previous request // Complete request with status value informing the client about // the situation. -TFLOGSTRING( "TSY: CMmWimTsy::SimWarmResetL - KErrServerBusy" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SIMWARMRESETL_2, "TSY: CMmWimTsy::SimWarmResetL - KErrServerBusy" ); iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -678,7 +683,7 @@ void CMmWimTsy::CompleteSimWarmReset( TInt aError ) { -TFLOGSTRING( "CMmWimTsy::CompleteSimWarmReset" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETESIMWARMRESET_1, "CMmWimTsy::CompleteSimWarmReset" ); // reset the reqhandle TTsyReqHandle tsyReqHandle = @@ -699,7 +704,7 @@ // TInt CMmWimTsy::SimWarmResetCancel() { -TFLOGSTRING( "TSY: CMmWimTsy::SimWarmResetCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SIMWARMRESETCANCEL_1, "TSY: CMmWimTsy::SimWarmResetCancel" ); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeSimWarmReset ); @@ -723,7 +728,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TSimCardReaderStatus* aSimCardReaderStatus ) { -TFLOGSTRING( "TSY: CMmWimTsy::GetSimCardReaderStatusL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETSIMCARDREADERSTATUSL_1, "TSY: CMmWimTsy::GetSimCardReaderStatusL" ); TTsyReqHandle getSimCardReaderStatusHandle = iTsyReqHandleStore->GetTsyReqHandle( EWIMRequestTypeGetSimCardReaderStatus ); @@ -733,7 +738,7 @@ // The request is already in processing because of previous request // Complete request with status value informing the client about // the situation. -TFLOGSTRING( "TSY: CMmWimTsy::GetSimCardReaderStatusL - KErrServerBusy" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETSIMCARDREADERSTATUSL_2, "TSY: CMmWimTsy::GetSimCardReaderStatusL - KErrServerBusy" ); iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -776,7 +781,7 @@ TPtrC8& aData, TInt aError ) { -TFLOGSTRING( "CMmWimTsy::CompleteGetSimCardReaderStatus" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETEGETSIMCARDREADERSTATUS_1, "CMmWimTsy::CompleteGetSimCardReaderStatus" ); // reset the reqhandle TTsyReqHandle tsyReqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -811,7 +816,7 @@ // TInt CMmWimTsy::GetSimCardReaderStatusCancel() { -TFLOGSTRING( "TSY: CMmWimTsy::GetSimCardReaderStatusCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_GETSIMCARDREADERSTATUSCANCEL_1, "TSY: CMmWimTsy::GetSimCardReaderStatusCancel" ); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeGetSimCardReaderStatus ); @@ -838,7 +843,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TSIMCardStatus* aCardStatus ) { -TFLOGSTRING( "TSY: CMmWimTsy::NotifySimCardStatus" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_NOTIFYSIMCARDSTATUS_1, "TSY: CMmWimTsy::NotifySimCardStatus" ); if ( NULL != aCardStatus ) { // save pointer to client for response data @@ -862,7 +867,7 @@ void CMmWimTsy::CompleteNotifySimCardStatus( RMmCustomAPI::TSIMCardStatus aCardStatus ) { -TFLOGSTRING( "CMmWimTsy::CompleteNotifySimCardStatus" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETENOTIFYSIMCARDSTATUS_1, "CMmWimTsy::CompleteNotifySimCardStatus" ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeNotifySimCardStatus ); @@ -888,7 +893,7 @@ // TInt CMmWimTsy::NotifySimCardStatusCancel() { -TFLOGSTRING( "TSY: CMmWimTsy::NotifySimCardStatusCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_NOTIFYSIMCARDSTATUSCANCEL_1, "TSY: CMmWimTsy::NotifySimCardStatusCancel" ); // reset pointer to client data iNotifiedSimCardStatus = NULL; @@ -915,7 +920,7 @@ const TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TApduParameters* aApduParameters ) { -TFLOGSTRING( "TSY: CMmWimTsy::SendAPDUReqV2L" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SENDAPDUREQV2L_1, "TSY: CMmWimTsy::SendAPDUReqV2L" ); TTsyReqHandle sendApduReqV2Handle = iTsyReqHandleStore->GetTsyReqHandle( EWIMRequestTypeSendAPDUReqV2 ); TInt ret = KErrNone; @@ -925,7 +930,7 @@ // The request is already in processing because of previous request // Complete request with status value informing the client about // the situation. -TFLOGSTRING( "TSY: CMmWimTsy::SendAPDUReqV2L - KErrServerBusy" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SENDAPDUREQV2L_2, "TSY: CMmWimTsy::SendAPDUReqV2L - KErrServerBusy" ); iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy ); return ret; } @@ -963,7 +968,7 @@ TPtrC8 &aData, TInt aError ) { -TFLOGSTRING( "TSY: CMmWimTsy::CompleteSendAPDUReqV2" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETESENDAPDUREQV2_1, "TSY: CMmWimTsy::CompleteSendAPDUReqV2" ); // reset the reqhandle TTsyReqHandle tsyReqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeSendAPDUReqV2 ); @@ -997,7 +1002,7 @@ // TInt CMmWimTsy::SendAPDUReqV2Cancel() { -TFLOGSTRING( "TSY: CMmWimTsy::SendAPDUReqV2Cancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_SENDAPDUREQV2CANCEL_1, "TSY: CMmWimTsy::SendAPDUReqV2Cancel" ); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypeSendAPDUReqV2 ); @@ -1023,7 +1028,7 @@ TInt CMmWimTsy::PowerSimOnL( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOnL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMONL_1, "TSY: CMmWimTsy::PowerSimOnL" ); TTsyReqHandle powerSimOnHandle = iTsyReqHandleStore->GetTsyReqHandle( EWIMRequestTypePowerSimOn ); @@ -1032,7 +1037,7 @@ // The request is already in processing because of previous request // Complete request with status value informing the client about // the situation. -TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOnL - KErrServerBusy" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMONL_2, "TSY: CMmWimTsy::PowerSimOnL - KErrServerBusy" ); iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -1068,7 +1073,7 @@ void CMmWimTsy::CompletePowerSimOn( TInt aError ) { -TFLOGSTRING( "TSY: CMmWimTsy::CompletePowerSimOn" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETEPOWERSIMON_1, "TSY: CMmWimTsy::CompletePowerSimOn" ); // reset the reqhandle TTsyReqHandle tsyReqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypePowerSimOn ); @@ -1088,7 +1093,7 @@ // TInt CMmWimTsy::PowerSimOnCancel() { -TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOnCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMONCANCEL_1, "TSY: CMmWimTsy::PowerSimOnCancel" ); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypePowerSimOn ); @@ -1111,7 +1116,7 @@ TInt CMmWimTsy::PowerSimOffL( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOffL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMOFFL_1, "TSY: CMmWimTsy::PowerSimOffL" ); TTsyReqHandle powerSimOffHandle = iTsyReqHandleStore->GetTsyReqHandle( EWIMRequestTypePowerSimOff ); @@ -1120,7 +1125,7 @@ // The request is already in processing because of previous request // Complete request with status value informing the client about // the situation. -TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOffL - KErrServerBusy" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMOFFL_2, "TSY: CMmWimTsy::PowerSimOffL - KErrServerBusy" ); iMmCustomTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -1156,7 +1161,7 @@ void CMmWimTsy::CompletePowerSimOff( TInt aError ) { -TFLOGSTRING( "TSY: CMmWimTsy::CompletePowerSimOff" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_COMPLETEPOWERSIMOFF_1, "TSY: CMmWimTsy::CompletePowerSimOff" ); // reset the reqhandle TTsyReqHandle tsyReqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypePowerSimOff ); @@ -1176,7 +1181,7 @@ // TInt CMmWimTsy::PowerSimOffCancel() { -TFLOGSTRING( "TSY: CMmWimTsy::PowerSimOffCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMWIMTSY_POWERSIMOFFCANCEL_1, "TSY: CMmWimTsy::PowerSimOffCancel" ); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EWIMRequestTypePowerSimOff ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,7 +16,6 @@ // INCLUDE FILES -#include #include "cmmfaxcompletion.h" #include "cmmcalltsy.h" @@ -25,15 +24,15 @@ CMmFaxCompletion::CMmFaxCompletion() : CBase(), iTsyReqHandle ( 0 ), iTelObject( NULL ) { -TFLOGSTRING("TSY: CMmFaxCompletion::CMmFaxCompletion" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_CTOR_1, "TSY: CMmFaxCompletion::CMmFaxCompletion" ); } CMmFaxCompletion::~CMmFaxCompletion() { -TFLOGSTRING("TSY: CMmFaxCompletion::~CMmFaxCompletion"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_DTOR_1, "TSY: CMmFaxCompletion::~CMmFaxCompletion"); if ( iTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmFaxCompletion::~CMmFaxCompletion: request %d not completed!", iTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_DTOR_2, "TSY: CMmFaxCompletion::~CMmFaxCompletion: request %d not completed!", iTsyReqHandle); // Completion should not be done here, because in some cases // operations are completed automatically by ETel! // CompleteOperation(KErrCancel); @@ -50,7 +49,7 @@ void CMmFaxCompletion::CompleteOperation( TInt aError ) // error Value { -TFLOGSTRING2("TSY: CMmFaxCompletion::CompleteOperation iTsyReqHandle: %d", iTsyReqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_COMPLETEOPERATION_1, "TSY: CMmFaxCompletion::CompleteOperation iTsyReqHandle: %d", iTsyReqHandle ); if ( 0 < iTsyReqHandle ) { iTelObject->ReqCompleted( iTsyReqHandle, aError ); @@ -70,8 +69,7 @@ { if ( 0 < iTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmFaxCompletion::Configure overwriting previous request %d with %d", - iTsyReqHandle, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_CONFIGURE_1, "TSY: CMmFaxCompletion::Configure overwriting previous request %d with %d",iTsyReqHandle, aTsyReqHandle); } iTsyReqHandle = aTsyReqHandle; @@ -88,7 +86,7 @@ TTimeIntervalMicroSeconds& /*aCadence*/, // cadence time TTime& /*aTime*/ ) // time { -TFLOGSTRING("TSY: CMmFaxCompletion::GetCadenceAndTimeOfLastRing"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_GETCADENCEANDTIMEOFLASTRING_1, "TSY: CMmFaxCompletion::GetCadenceAndTimeOfLastRing"); // Checking the usage of aCadence and aTime in the calling function // (fax server) shows that we don't need to change the values. // REINTERPRET_CAST(CTsyPhone*,iMmCall->Owner()->Owner())-> @@ -104,7 +102,7 @@ void CMmFaxCompletion::RxConnectComplete( TInt aError ) { -TFLOGSTRING2("TSY: CMmFaxCompletion::RXConnectComplete ErrorValue: %d", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_RXCONNECTCOMPLETE_1, "TSY: CMmFaxCompletion::RXConnectComplete ErrorValue: %d", aError); CMmCallTsy* mmCall = REINTERPRET_CAST(CMmCallTsy*, iTelObject); // This is a good place to fill missing remote party phone number. @@ -140,7 +138,7 @@ void CMmFaxCompletion::RxFaxDataComplete( TInt aError ) // in: an error value { -TFLOGSTRING2("TSY: CMmFaxCompletion::RxFaxDataComplete ErrorValue: %d", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_RXFAXDATACOMPLETE_1, "TSY: CMmFaxCompletion::RxFaxDataComplete ErrorValue: %d", aError); if ( 0 < iTsyReqHandle ) { iTelObject->ReqCompleted( iTsyReqHandle, aError ); @@ -158,7 +156,7 @@ TInt aError ) { -TFLOGSTRING2("TSY: CMmFaxCompletion::RxPostPageComplete ErrorValue: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_RXPOSTPAGECOMPLETE_1, "TSY: CMmFaxCompletion::RxPostPageComplete ErrorValue: %d", aError ); if ( 0 < iTsyReqHandle) { iTelObject->ReqCompleted( iTsyReqHandle, aError ); @@ -175,7 +173,7 @@ void CMmFaxCompletion::TxConnectComplete( TInt aError ) { -TFLOGSTRING2("TSY: CMmFaxCompletion::TXConnectComplete ErrorValue: %d", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_TXCONNECTCOMPLETE_1, "TSY: CMmFaxCompletion::TXConnectComplete ErrorValue: %d", aError); CMmCallTsy* mmCall = REINTERPRET_CAST(CMmCallTsy*,iTelObject); @@ -201,7 +199,7 @@ void CMmFaxCompletion::TxFaxDataComplete( TInt aError ) { -TFLOGSTRING2("TSY: CMmFaxCompletion::TxFaxDataComplete ErrorValue: %d", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_TXFAXDATACOMPLETE_1, "TSY: CMmFaxCompletion::TxFaxDataComplete ErrorValue: %d", aError); if ( 0 < iTsyReqHandle ) { @@ -219,7 +217,7 @@ void CMmFaxCompletion::TxPostPageComplete( TInt aError ) { -TFLOGSTRING2("TSY: CMmFaxCompletion::TxPostPageComplete ErrorValue: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_TXPOSTPAGECOMPLETE_1, "TSY: CMmFaxCompletion::TxPostPageComplete ErrorValue: %d", aError ); if ( 0 < iTsyReqHandle ) { @@ -237,7 +235,7 @@ void CMmFaxCompletion::FillAnswerback( CMmCallTsy* aMmCall ) { -TFLOGSTRING("TSY: CMmFaxCompletion::FillAnswerback"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_FILLANSWERBACK_1, "TSY: CMmFaxCompletion::FillAnswerback"); if ( aMmCall ) { @@ -248,7 +246,7 @@ if ( 0 == faxProgress->iAnswerback.Length() ) { -TFLOGSTRING("TSY: CMmFaxCompletion::FillAnswerback Getting missing remote number from call info"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCOMPLETION_FILLANSWERBACK_2, "TSY: CMmFaxCompletion::FillAnswerback Getting missing remote number from call info"); // Copy remote party phone number to Progress chunk's // answerback field. Answerback will hold only leftmost 20 // numbers if the number is longer than that. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxExt.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxExt.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxExt.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,7 +16,6 @@ // INCLUDE FILES -#include #include "cmmfaxext.h" #include "cmmphonetsy.h" #include "cmmlinelist.h" @@ -32,7 +31,7 @@ CMmCallTsy* aMmCall ) // call that owns this object : iMmCall( reinterpret_cast( aMmCall ) ) { -TFLOGSTRING2("TSY: CMmFaxExt::CMmFaxExt: Call Id:%d", iMmCall->CallId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_CTOR_1, "TSY: CMmFaxExt::CMmFaxExt: Call Id:%d", iMmCall->CallId() ); iFax = NULL; iFaxSession = NULL; iFaxCompletion = NULL; @@ -40,7 +39,7 @@ void CMmFaxExt::ConstructL() { -TFLOGSTRING("TSY: CMmFaxExt::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_CONSTRUCTL_1, "TSY: CMmFaxExt::ConstructL"); // Create CMmFaxCompletion class for Fax Server. iFaxCompletion = new (ELeave) CMmFaxCompletion(); @@ -50,7 +49,7 @@ CMmFaxExt* CMmFaxExt::NewL( CMmCallTsy* aMmCall ) // The call object which owns CMmFaxExt { -TFLOGSTRING("TSY: CMmFaxExt::NewL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_NEWL_1, "TSY: CMmFaxExt::NewL"); CMmFaxExt* self = new ( ELeave ) CMmFaxExt( aMmCall ); CleanupStack::PushL( self ); @@ -69,14 +68,14 @@ if ( iFax ) { -TFLOGSTRING("TSY: CMmFaxExt::~CMmFaxExt: deleting iFax"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DTOR_1, "TSY: CMmFaxExt::~CMmFaxExt: deleting iFax"); delete iFax; iFax = NULL; } if (iFaxCompletion) { -TFLOGSTRING("TSY: CMmFaxExt::~CMmFaxExt: deleting iFaxCompletion"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DTOR_2, "TSY: CMmFaxExt::~CMmFaxExt: deleting iFaxCompletion"); delete iFaxCompletion; iFaxCompletion = NULL; } @@ -101,7 +100,7 @@ void CMmFaxExt::CompleteOperation( TInt aError ) { -TFLOGSTRING("TSY: CMmFaxExt::CompleteOperation"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_COMPLETEOPERATION_1, "TSY: CMmFaxExt::CompleteOperation"); if ( iFaxCompletion ) { @@ -119,7 +118,7 @@ const TTsyReqHandle aTsyReqHandle, CTelObject* aTelObject ) { -TFLOGSTRING("TSY: CMmFaxExt::Configure"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_CONFIGURECOMPLETION_1, "TSY: CMmFaxExt::Configure"); iFaxCompletion->Configure( aTsyReqHandle, aTelObject ); } @@ -133,7 +132,7 @@ CTelObject* CMmFaxExt::OpenNewObjectByNameL( const TDesC& aName ) { -TFLOGSTRING("TSY: CMmFaxExt::OpenNewObjectByNameL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmFaxExt::OpenNewObjectByNameL"); // check the name of opened object.. _LIT(KFaxObjectName, "FAX"); @@ -180,7 +179,7 @@ // TInt CMmFaxExt::FaxConnectHandler() { -TFLOGSTRING("TSY: CMmFaxExt::FaxConnectHandler"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_FAXCONNECTHANDLER_1, "TSY: CMmFaxExt::FaxConnectHandler"); TInt errorCode( KErrNone ); @@ -210,7 +209,7 @@ TInt CMmFaxExt::AnswerIncomingCall( const TTsyReqHandle& aTsyReqHandle ) // function identification handle { -TFLOGSTRING("TSY: CMmFaxExt::AnswerIncomingCall"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_ANSWERINCOMINGCALL_1, "TSY: CMmFaxExt::AnswerIncomingCall"); TInt ret( KErrGeneral ); @@ -255,7 +254,7 @@ const TTsyReqHandle& aTsyReqHandle, TDesC* aTelNumber ) { -TFLOGSTRING("TSY: CMmFaxExt::Dial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DIAL_1, "TSY: CMmFaxExt::Dial"); TInt ret( KErrGeneral ); @@ -294,12 +293,12 @@ ConfigureCompletion( aTsyReqHandle, iMmCall ); if( EDialAndTransmit == faxMode ) { -TFLOGSTRING("TSY: CMmFaxExt::FaxDial:TxConnect"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DIAL_2, "TSY: CMmFaxExt::FaxDial:TxConnect"); iFaxSession->TxConnect(); } else { -TFLOGSTRING("TSY: CMmFaxExt::FaxDial:RxConnect"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DIAL_3, "TSY: CMmFaxExt::FaxDial:RxConnect"); iFaxSession->RxConnect(); } } @@ -322,7 +321,7 @@ // void CMmFaxExt::HangUp() { -TFLOGSTRING("TSY: CMmFaxExt::HangUp"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_HANGUP_1, "TSY: CMmFaxExt::HangUp"); CleanUpFaxServer(); } @@ -345,7 +344,7 @@ // void CMmFaxExt::GetFaxBaseL() { -TFLOGSTRING("TSY: CMmFaxExt::GetFaxBaseL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_GETFAXBASEL_1, "TSY: CMmFaxExt::GetFaxBaseL"); TInt errorCode = iFaxServerLib.Load( KFaxServerName ); @@ -411,7 +410,7 @@ const TDesC* aTelNumber, // phone number const TFaxMode aFaxMode ) // fax mode { -TFLOGSTRING("TSY: CMmFaxExt::OpenFaxServer"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_OPENFAXSERVER_1, "TSY: CMmFaxExt::OpenFaxServer"); TInt errorCode ( KErrNone ); TFaxServerSessionSettings faxSettings; @@ -516,7 +515,7 @@ // void CMmFaxExt::CleanUpFaxServer() { -TFLOGSTRING("TSY: CMmFaxExt::CleanUpFaxServer"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_CLEANUPFAXSERVER_1, "TSY: CMmFaxExt::CleanUpFaxServer"); if ( iFaxSession ) { @@ -562,7 +561,7 @@ TInt CMmFaxExt::GetFaxSettings( RCall::TFaxSessionSettings* aSettings ) { -TFLOGSTRING("TSY: CMmFaxExt::GetFaxSettings"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_GETFAXSETTINGS_1, "TSY: CMmFaxExt::GetFaxSettings"); *aSettings = iFaxSettings; return KErrNone; } @@ -576,7 +575,7 @@ TInt CMmFaxExt::SetFaxSettings( const RCall::TFaxSessionSettings* aSettings ) // in: fax settings. { -TFLOGSTRING("TSY: CMmFaxExt::SetFaxSettings"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_SETFAXSETTINGS_1, "TSY: CMmFaxExt::SetFaxSettings"); iFaxSettings = *aSettings; return KErrNone; } @@ -600,7 +599,7 @@ // void CMmFaxExt::DialCancel() { - TFLOGSTRING("TSY: CMmFaxExt::DialCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXEXT_DIALCANCEL_1, "TSY: CMmFaxExt::DialCancel"); if ( iFax ) { iFax->Terminate(); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmTsyFax.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmTsyFax.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmTsyFax.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,7 +16,6 @@ // INCLUDE FILES -#include #include "cmmtsyfax.h" #include "cmmfaxext.h" @@ -28,12 +27,12 @@ : iFaxExt( aFaxExt ) { -TFLOGSTRING("TSY: CMmTsyFax::CMmTsyFax" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_CTOR_1 "TSY: CMmTsyFax::CMmTsyFax" ); } void CMmTsyFax::ConstructL() { -TFLOGSTRING("TSY: CMmTsyFax::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_CONSTRUCTL_1, "TSY: CMmTsyFax::ConstructL"); iTerminate = EFalse; iDataDirection = EUnknown; @@ -58,7 +57,7 @@ CMmTsyFax* CMmTsyFax::NewL( CMmFaxExt* aFaxExt ) { -TFLOGSTRING("TSY: CMmTsyFax::NewL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_NEWL_1, "TSY: CMmTsyFax::NewL"); // Completes successfully if fax call has already been dialled creating // a CFaxSession instance, and is not called if that is not true. CMmTsyFax* fax = new ( ELeave ) CMmTsyFax( aFaxExt ); @@ -72,7 +71,7 @@ CMmTsyFax::~CMmTsyFax() { -TFLOGSTRING("TSY: CMmTsyFax::~CMmTsyFax" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_DTOR_1, "TSY: CMmTsyFax::~CMmTsyFax" ); if( iFaxExt ) { @@ -90,7 +89,7 @@ void CMmTsyFax::CloseFax( TAny* aObj ) { -TFLOGSTRING("TSY: CMmTsyFax::CloseFax"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_CLOSEFAX_1, "TSY: CMmTsyFax::CloseFax"); ( ( CObject* )aObj )->Close(); } @@ -104,7 +103,7 @@ TInt CMmTsyFax:: DeregisterNotification( const TInt /*aIpc*/ ) { -TFLOGSTRING("TSY: CMmTsyFax::DeregisterNotification"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, DEREGISTERNOTIFICATION_1, "TSY: CMmTsyFax::DeregisterNotification"); return KErrNone; } @@ -116,7 +115,7 @@ // void CMmTsyFax::Init() { -TFLOGSTRING("TSY: CMmTsyFax::Init"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_INIT_1, "TSY: CMmTsyFax::Init"); } // --------------------------------------------------------------------------- @@ -129,7 +128,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aDes ) { -TFLOGSTRING2("TSY: CMmTsyFax::Read : %d" , aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_READ_1, "TSY: CMmTsyFax::Read : %d" , aTsyReqHandle); TInt errorCode( KErrNone ); @@ -173,7 +172,7 @@ const TInt /*aIpc*/ ) { -TFLOGSTRING("TSY: CMmTsyFax::RegisterNotification"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_REGISTERNOTIFICATION_1, "TSY: CMmTsyFax::RegisterNotification"); return KErrNone; } // --------------------------------------------------------------------------- @@ -194,7 +193,7 @@ // void CMmTsyFax::Terminate() { -TFLOGSTRING("TSY: CMmTsyFax::Terminate"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_TERMINATE_1, "TSY: CMmTsyFax::Terminate"); iTerminate = ETrue; } @@ -207,7 +206,7 @@ TInt CMmTsyFax::TerminateFaxSession( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmTsyFax::TerminateFaxSession Handle: %d", aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_TERMINATEFAXSESSION_1, "TSY: CMmTsyFax::TerminateFaxSession Handle: %d", aTsyReqHandle); CFaxSession* session = iFaxExt->GetFaxSession(); @@ -236,7 +235,7 @@ TInt CMmTsyFax::WaitForEndOfPage( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmTsyFax::WaitForEndOfPage Handle:%d", aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_WAITFORENDOFPAGE_1, "TSY: CMmTsyFax::WaitForEndOfPage Handle:%d", aTsyReqHandle); if ( !iFaxExt->GetFaxSession() || iFaxExt->GetCallStatus() != RCall::EStatusConnected ) @@ -274,7 +273,7 @@ const TTsyReqHandle aTsyReqHandle, TDesC8* aDes ) { -TFLOGSTRING2("TSY: CMmTsyFax::Write : %d" , aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYFAX_WRITE_1, "TSY: CMmTsyFax::Write : %d" , aTsyReqHandle); TInt errorCode( KErrNone ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmfax/cmmfaxextinterface.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/cmmfaxextinterface.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/cmmfaxextinterface.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,7 +16,6 @@ // INCLUDE FILES -#include #include "CMmFaxExtInterface.h" #ifdef FAX_IS_SUPPORTED diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -15,6 +15,12 @@ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmcallgsmwcdmaextTraces.h" +#endif + #include "cmmcallgsmwcdmaext.h" #include #include "cmmphonetsy.h" @@ -23,7 +29,6 @@ #include "cmmconferencecallgsmwcdmaext.h" #include #include "cmmmessagemanagerbase.h" -#include #include "cmmvoicecalltsy.h" @@ -237,7 +242,7 @@ const TDesC* aTelNumber, TInt aExtensionId ) { -TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::DialL extensionid %d", aExtensionId ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_1, "TSY: CMmCallGsmWcdmaExt::DialL extensionid %d", aExtensionId ); // Reset iCallParams extended members iCallParams.iAlphaId.Zero(); @@ -263,12 +268,12 @@ RCall::TCallParams& callParams = ( *callParamsPckg )(); TInt extensionId( callParams.ExtensionId() ); -TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::DialL callParams.extensionId %d ", extensionId); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_2, "TSY: CMmCallGsmWcdmaExt::DialL callParams.extensionId %d ", extensionId); if( ( RMobileCall::KETelMobileCallParamsV1 == extensionId ) || ( RMobileCall::KETelMobileCallParamsV2 == extensionId )) { -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams V1, V2"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_3, "TSY: CMmCallGsmWcdmaExt::DialL callparams V1, V2"); iCallParams.iSpeakerControl = callParams.iSpeakerControl; @@ -288,7 +293,7 @@ if ( RMobileCall::KETelMobileCallParamsV2 == extensionId ) { - TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams V2"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_4, "TSY: CMmCallGsmWcdmaExt::DialL callparams V2"); RMobileCall::TMobileCallParamsV2Pckg* paramsPckgV2 = reinterpret_cast( const_cast( aCallParams ) ); @@ -300,7 +305,7 @@ else if( RMobileCall::KETelMobileCallParamsV7 == extensionId ) { -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams V7"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_5, "TSY: CMmCallGsmWcdmaExt::DialL callparams V7"); RMobileCall::TMobileCallParamsV7Pckg* paramsPckgV7 = reinterpret_cast( const_cast( aCallParams ) ); @@ -309,7 +314,7 @@ } else { -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams version unknown"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_6, "TSY: CMmCallGsmWcdmaExt::DialL callparams version unknown"); iCallParams.iSpeakerControl = callParams.iSpeakerControl; iCallParams.iSpeakerVolume = callParams.iSpeakerVolume; iCallParams.iInterval = callParams.iInterval; @@ -348,7 +353,7 @@ //Pack call parameters and mobile call info // Use argument parameters since TMobileCallParamsV7 does not inherit from 3rd party params. package.PackData(const_cast(aCallParams), &iMobileCallInfo); -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL: KETelExt3rdPartyV1"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_7, "TSY: CMmCallGsmWcdmaExt::DialL: KETelExt3rdPartyV1"); //if it is a 3rd party client return iMessageManager->HandleRequestL( EMobileCallDialISV, &package ); @@ -360,7 +365,7 @@ //Pack call parameters and mobile call info TPckg pckgToSend(iCallParams); package.PackData( &pckgToSend , &iMobileCallInfo ); -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL: KMultimodeCallTypeIDNoFdnCheck"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_8, "TSY: CMmCallGsmWcdmaExt::DialL: KMultimodeCallTypeIDNoFdnCheck"); return iMessageManager->HandleRequestL( EMobileCallDialNoFdnCheck, &package ); } @@ -369,7 +374,7 @@ //Pack call parameters and mobile call info TPckg pckgToSend(iCallParams); package.PackData( &pckgToSend , &iMobileCallInfo ); -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL: EEtelCallDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_9, "TSY: CMmCallGsmWcdmaExt::DialL: EEtelCallDial"); return iMessageManager->HandleRequestL( EEtelCallDial, &package ); } @@ -1155,7 +1160,7 @@ } else { - TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCALLPARAMS_1, "TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown"); } } @@ -1306,7 +1311,7 @@ hscsdParams8.iBCRepeatIndicator = hscsdCallParamsV8->iBCRepeatIndicator; } - TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCALLPARAMS_2, "TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown"); } @@ -1550,8 +1555,7 @@ if ( mmCall ) { // Held call Id -TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", \ - mmCall->CallId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_TRANSFERL_1, "TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", mmCall->CallId() ); //Create package CCallDataPackage package; @@ -1600,7 +1604,7 @@ TInt CMmCallGsmWcdmaExt::FillMobileCallInfoV3( RMobileCall::TMobileCallInfoV3* aInfoV3 ) { -TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV3 - extensionid=%d", aInfoV3->ExtensionId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV3_1, "TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV3 - extensionid=%d", aInfoV3->ExtensionId() ); // V3 info parameters aInfoV3->iSecurity = iMobileCallInfo.iSecurity; @@ -1617,7 +1621,7 @@ TInt CMmCallGsmWcdmaExt::FillMobileCallInfoV7( RMobileCall::TMobileCallInfoV7* aInfoV7 ) { -TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV7 - extensionid=%d", aInfoV7->ExtensionId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV7_1, "TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV7 - extensionid=%d", aInfoV7->ExtensionId() ); // V7 info parameters // TCallParamOrigin iCallParamOrigin; @@ -1643,7 +1647,7 @@ TInt CMmCallGsmWcdmaExt::FillMobileCallInfoV8( RMobileCall::TMobileCallInfoV8* aInfoV8 ) { -TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV8 - extensionid=%d", aInfoV8->ExtensionId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV8_1, "TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV8 - extensionid=%d", aInfoV8->ExtensionId() ); // V8 info parameters aInfoV8->iSubAddress = iMobileCallInfo.iSubAddress; @@ -1685,7 +1689,7 @@ MCtsySsmPluginCallback* aSsmPluginCallback, TCtsySsmCallbackData& aCallbackData ) { -TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::SetRfState - state=%d", aMtcState ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETRFSTATE_1, "TSY: CMmCallGsmWcdmaExt::SetRfState - state=%d", aMtcState ); TInt err ( KErrNotSupported ); if ( (iUsingFeatureManager) && (iFeatureControl.FeatureSupported(NFeature::KEmergencyCallsEnabledInOfflineMode ) == KFeatureSupported) ) @@ -1711,7 +1715,7 @@ } else { - TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetRfState - bad state"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETRFSTATE_2, "TSY: CMmCallGsmWcdmaExt::SetRfState - bad state"); // pass this error to callback SsmPluginCallback (KErrArgument, aCallbackData); } @@ -1822,7 +1826,7 @@ { // V3 parameters iMobileCallInfo.iSecurity = mobileCallInfoV3->iSecurity; -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetMobileCallData V3 params copied"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_1, "TSY: CMmCallGsmWcdmaExt::SetMobileCallData V3 params copied"); } } @@ -1861,7 +1865,7 @@ } -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetMobileCallData V7 params copied"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_2, "TSY: CMmCallGsmWcdmaExt::SetMobileCallData V7 params copied"); } // TMobileCallInfoV8 @@ -1892,7 +1896,7 @@ iMobileCallInfo.iBCRepeatIndicator = mobileCallInfoV8->iBCRepeatIndicator; } -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetMobileCallData V8 params copied"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_3, "TSY: CMmCallGsmWcdmaExt::SetMobileCallData V8 params copied"); } //update validity flags @@ -2023,7 +2027,7 @@ if (KETelExtMultimodeV1 == extensionId ) { -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV1"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_1, "TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV1"); RMobileCall::TMobileCallHscsdInfoV1Pckg* hscsdInfoPckg = REINTERPRET_CAST( RMobileCall::TMobileCallHscsdInfoV1Pckg*, aHSCSDInfo ); @@ -2039,7 +2043,7 @@ else if (KEtelExtMultimodeV7 == extensionId ) { -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV7"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_2, "TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV7"); RMobileCall::TMobileCallHscsdInfoV7Pckg* hscsdInfoPckg7 = ( RMobileCall::TMobileCallHscsdInfoV7Pckg* )aHSCSDInfo; RMobileCall::TMobileCallHscsdInfoV7& hscsdInfoV7 = @@ -2064,7 +2068,7 @@ else if (KEtelExtMultimodeV8 == extensionId ) { -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV8"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_3, "TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV8"); RMobileCall::TMobileCallHscsdInfoV8Pckg* hscsdInfoPckg8 = ( RMobileCall::TMobileCallHscsdInfoV8Pckg* )aHSCSDInfo; RMobileCall::TMobileCallHscsdInfoV8& hscsdInfoV8 = @@ -2128,8 +2132,8 @@ const TDesC8* aCallParams, const TDesC* aTelNumber ) { -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialDataCallL"); -TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::DialDataCallL aCallMode: %d", aCallMode); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_1, "TSY: CMmCallGsmWcdmaExt::DialDataCallL"); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_2, "TSY: CMmCallGsmWcdmaExt::DialDataCallL aCallMode: %d", aCallMode); iMobileCallInfo.iDialledParty.iTelNumber.Copy( *aTelNumber ); iMobileCallInfo.iDialledParty.iNumberPlan = @@ -2369,13 +2373,13 @@ if( KMultimodeCallTypeIDNoFdnCheck == iMmCallTsy->GetDialTypeId() ) { -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialDataCallL: EMobileCallDialNoFdnCheck"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_3, "TSY: CMmCallGsmWcdmaExt::DialDataCallL: EMobileCallDialNoFdnCheck"); //Send request to the Domestic OS layer. return iMessageManager->HandleRequestL( EMobileCallDialNoFdnCheck, &package ); } else { -TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialDataCallL: EEtelCallDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_4, "TSY: CMmCallGsmWcdmaExt::DialDataCallL: EEtelCallDial"); //Send request to the Domestic OS layer. return iMessageManager->HandleRequestL( EEtelCallDial, &package ); } @@ -2982,7 +2986,7 @@ if ( KErrNone == aResult ) { - TFLOGSTRING ("TSY:CMmCallGsmWcdmaExt::SsmPluginCallback: Dialing..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SSMPLUGINCALLBACK_1, "TSY:CMmCallGsmWcdmaExt::SsmPluginCallback: Dialing..."); //at this point the RF should be enabled in all cases TRAPD(err, result = iMessageManager->HandleRequestL( diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaextwithdispatcher.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaextwithdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaextwithdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -15,6 +15,11 @@ #ifdef USING_CTSY_DISPATCHER +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmcallgsmwcdmaextwithdispatcherTraces.h" +#endif + /** * This file contains additional function definitions for the CMmCallGsmWcdmaExt class * in CTSY for use when the CTSY is used with the CTSY Dispatcher. @@ -128,8 +133,7 @@ if ( mmCall ) { // Held call Id -TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", \ - mmCall->CallId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_TRANSFERL1_1, "TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", mmCall->CallId() ); // With the CTSY dispatcher, there are two call IDs sent from the CTSY // The first (packed in iCallId of the data package is the call ID diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmconferencecallgsmwcdmaext.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmconferencecallgsmwcdmaext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmconferencecallgsmwcdmaext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmconferencecallgsmwcdmaextTraces.h" +#endif + #include "cmmconferencecallgsmwcdmaext.h" #include "cmmphonetsy.h" #include "cmmconferencecalltsy.h" @@ -180,7 +186,7 @@ RMobileConferenceCall::TMobileConferenceStatus aStatus, CMmCallList* aCallList ) { -TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::SwapL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_1, "TSY: CMmConferenceCallGsmWcdmaExt::SwapL"); TInt ret = KErrArgument; // conference must be active or held @@ -208,7 +214,7 @@ iNumberOfCallsToBeSwapped++; } } -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::SwapL - Number of calls in conference: %d", iNumberOfCallsToBeSwapped); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_2, "TSY: CMmConferenceCallGsmWcdmaExt::SwapL - Number of calls in conference: %d", iNumberOfCallsToBeSwapped); // Find active and held call objects: CMmCallTsy* mmActiveCall = @@ -332,7 +338,7 @@ RMobileCall::TMobileCallStatus aNewStatus, TInt aCallId ) { -TFLOGSTRING3("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, aNewStatus:%d, aCallId:%d", aNewStatus, aCallId ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_1, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, aNewStatus:%d, aCallId:%d", aNewStatus, aCallId ); TBool statusChanged( EFalse ); @@ -340,8 +346,8 @@ RMobileConferenceCall::TMobileConferenceStatus status = iMmConferenceCallTsy->Status(); -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conf call iMmConferenceCallTsy->Status:%d ", status); -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conference extension iNewStatus:%d ", iNewStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_2, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conf call iMmConferenceCallTsy->Status:%d ", status); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_3, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, Current conference extension iNewStatus:%d ", iNewStatus); //get call list CMmCallList* callList = iMmConferenceCallTsy->Phone()->CallList(); @@ -466,9 +472,9 @@ { // -1 indicates that there is no unhandled ghost operation anymore iCurrentGhostOperation = -1; -TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, statusChanged!! "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_4, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged, statusChanged!! "); } -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged END, current conference extension iNewStatus:%d ", iNewStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_5, "TSY: CMmConferenceCallGsmWcdmaExt::CallStatusChanged END, current conference extension iNewStatus:%d ", iNewStatus); return statusChanged; } @@ -498,7 +504,7 @@ RMobileConferenceCall::TMobileConferenceStatus aStatus, CMmCallList* aCallList ) { -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CheckConferenceCapability. aStatus:%d ", aStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_CHECKCONFERENCECAPABILITY_1, "TSY: CMmConferenceCallGsmWcdmaExt::CheckConferenceCapability. aStatus:%d ", aStatus); //Check if conference creation is possible. CC has to be in Idle state if ( RMobileConferenceCall::EConferenceIdle == aStatus ) { @@ -702,7 +708,7 @@ RMobileConferenceCall::TMobileConferenceStatus aStatus, CMmCallList& aCallList ) { -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleSwap. aStatus:%d ", aStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLESWAP_1, "TSY: CMmConferenceCallGsmWcdmaExt::HandleSwap. aStatus:%d ", aStatus); TBool statusChanged( EFalse ); //increment counter telling how many calls will still change state @@ -744,8 +750,8 @@ CMmCallList& aCallList, RMobileCall::TMobileCallStatus aNewStatus ) { -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aStatus:%d ", aStatus); -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aNewStatus:%d ", aNewStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_1, "TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aStatus:%d ", aStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_2, "TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. aNewStatus:%d ", aNewStatus); TBool statusChanged( EFalse ); //Handle adding a call to conference call @@ -810,7 +816,7 @@ UpdateCapsAfterJoin( aCallList ); } } -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. statusChanged:%d ", statusChanged); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_3, "TSY: CMmConferenceCallGsmWcdmaExt::HandleAddCall. statusChanged:%d ", statusChanged); return statusChanged; } @@ -880,8 +886,8 @@ TBool callFound( EFalse ); CMmCallTsy* mmCall = NULL; - TFLOGSTRING3("TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease aNewStatus %d, aCallId %d",aNewStatus , aCallId ); - TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Calls in CC %d",iMmConferenceCallTsy->NumberOfCallsInConference()); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_1, "TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease aNewStatus %d, aCallId %d",aNewStatus , aCallId ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_2, "TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Calls in CC %d",iMmConferenceCallTsy->NumberOfCallsInConference()); //first find the call object which has gone to idle state for ( TInt i = 0; i < aCallList.GetNumberOfObjects(); i++ ) @@ -890,14 +896,14 @@ if(mmCall) { - TFLOGSTRING2("TSY: Previous Call ID: %d", mmCall->PreviousCallId() ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_3, "TSY: Previous Call ID: %d", mmCall->PreviousCallId() ); if ( mmCall->PreviousCallId() == aCallId ) { if ( 2 == iMmConferenceCallTsy->NumberOfCallsInConference() && mmCall->IsPartOfConference() && iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy::EMultimodeConferenceCallAddCall ) ) { - TFLOGSTRING("TSY: STOP handling this case"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_4, "TSY: STOP handling this case"); return EFalse; } mmCall->ResetPreviousCallId(); @@ -982,7 +988,7 @@ if( remainingCall->MobileCallStatus() == RMobileCall::EStatusHold ) { callStatus = RMobileCall::EStatusHold; - TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Call with Hold status found" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_5, "TSY: CMmConferenceCallGsmWcdmaExt::HandleCallRelease Call with Hold status found" ); break; } } @@ -1268,7 +1274,7 @@ TInt CMmConferenceCallGsmWcdmaExt::GetNewStatus( RMobileConferenceCall::TMobileConferenceStatus* aNewStatus ) { -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::GetNewStatus. iNewStatus:%d ", iNewStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_GETNEWSTATUS_1, "TSY: CMmConferenceCallGsmWcdmaExt::GetNewStatus. iNewStatus:%d ", iNewStatus ); //copy new status *aNewStatus = iNewStatus; //delete new status from GSM extension @@ -1284,7 +1290,7 @@ // void CMmConferenceCallGsmWcdmaExt::ResetAttributes() { -TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::ResetAttributes. " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_RESETATTRIBUTES_1, "TSY: CMmConferenceCallGsmWcdmaExt::ResetAttributes. " ); //Flag telling if this is not the first hold/active status indication //caused by client asking hold/resume for a single call. iCallControlStarted = EFalse; @@ -1541,7 +1547,7 @@ //get current conference call status RMobileConferenceCall::TMobileConferenceStatus status = iMmConferenceCallTsy->Status(); -TFLOGSTRING2("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent. iMmConferenceCallTsy->Status():%d ", status ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_1, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent. iMmConferenceCallTsy->Status():%d ", status ); switch( confEvent ) { @@ -1552,7 +1558,7 @@ !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy:: EMultimodeConferenceCallCreateConference ) ) { -TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_2, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build"); //We have to get 2 active status indications before the //conference has really gone to active state. iCreateConferenceCounter = 2; @@ -1564,7 +1570,7 @@ !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy:: EMultimodeConferenceCallAddCall ) ) { -TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build/Add"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_3, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Build/Add"); iCurrentGhostOperation = confEvent; } break; @@ -1575,7 +1581,7 @@ !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy:: EMultimodeConferenceCallAddCall ) ) { -TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Add"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_4, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Add"); iCurrentGhostOperation = confEvent; } break; @@ -1585,7 +1591,7 @@ !iMmConferenceCallTsy->ServiceRequested( CMmConferenceCallTsy::EMultimodeConferenceCallSwap ) ) { -TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Swap"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_5, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Swap"); iNumberOfCallsToBeSwapped = iMmConferenceCallTsy->NumberOfCallsInConference(); @@ -1596,14 +1602,14 @@ case RMobileConferenceCall::EConferenceSplit: if ( !iGoOneToOneHandlingStarted ) { -TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Split"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_6, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - Split"); iGoOneToOneHandlingStarted = ETrue; iCurrentGhostOperation = confEvent; iGoOneToOneCallId = callId; } break; default: -TFLOGSTRING("TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - No Actions"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_7, "TSY: CMmConferenceCallGsmWcdmaExt::CompleteNotifyConferenceEvent - No Actions"); break; } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmphonegsmwcdmaext.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmphonegsmwcdmaext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmphonegsmwcdmaext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmphonegsmwcdmaextTraces.h" +#endif + #include #include "cmmphonegsmwcdmaext.h" #include "cmmphonetsy.h" @@ -153,7 +159,7 @@ // TInt CMmPhoneGsmWcdmaExt::InitSimL() { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::InitSimL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_INITSIML_1, "TSY: CMmPhoneGsmWcdmaExt::InitSimL"); TInt ret( KErrGeneral ); @@ -178,7 +184,7 @@ TInt CMmPhoneGsmWcdmaExt::GetNetworkCaps( TUint32* aCaps ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetNetworkCaps"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETNETWORKCAPS_1, "TSY: CMmPhoneGsmWcdmaExt::GetNetworkCaps"); *aCaps = RMobilePhone::KCapsGetRegistrationStatus | RMobilePhone::KCapsNotifyRegistrationStatus @@ -206,7 +212,7 @@ RMobilePhone::TMobilePhoneNetworkInfoV1* aNetInfo, RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV1"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV1_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV1"); if ( NULL != aNetInfo ) { @@ -242,7 +248,7 @@ RMobilePhone::TMobilePhoneNetworkInfoV2* aNetInfo, RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV2"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV2_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV2"); if ( NULL != aNetInfo ) { @@ -280,7 +286,7 @@ RMobilePhone::TMobilePhoneNetworkInfoV5* aNetInfo, RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV5" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV5_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkV5" ); if ( NULL != aNetInfo ) { @@ -323,7 +329,7 @@ RMobilePhone::TMobilePhoneNetworkInfoV8* aNetInfo, RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetwork" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORK_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetwork" ); if ( NULL != aNetInfo ) { @@ -368,7 +374,7 @@ TInt CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV1( RMobilePhone::TMobilePhoneNetworkInfoV1* aNetInfo ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV1" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV1_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV1" ); if ( NULL != aNetInfo ) { @@ -398,7 +404,7 @@ TInt CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV2( RMobilePhone::TMobilePhoneNetworkInfoV2* aNetInfo ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV2" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV2_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV2" ); if ( NULL != aNetInfo ) { @@ -430,7 +436,7 @@ TInt CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV5( RMobilePhone::TMobilePhoneNetworkInfoV5* aNetInfo ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV5" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV5_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocationV5" ); if ( NULL != aNetInfo ) { @@ -467,7 +473,7 @@ TInt CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocation( RMobilePhone::TMobilePhoneNetworkInfoV8* aNetInfo ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocation" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATION_1, "TSY: CMmPhoneGsmWcdmaExt::GetCurrentNetworkNoLocation" ); if ( NULL != aNetInfo ) { @@ -509,7 +515,7 @@ const RMobilePhone::TMobilePhoneLocationAreaV1& aArea ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::SetCurrentNetwork" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_SETCURRENTNETWORK_1, "TSY: CMmPhoneGsmWcdmaExt::SetCurrentNetwork" ); *iCurrentNwInfo = aNetInfo; *iCurrentLocationArea = aArea; @@ -526,7 +532,7 @@ TInt CMmPhoneGsmWcdmaExt::GetNITZInfo( RMobilePhone::TMobilePhoneNITZ* aNwtTimeInfo ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetNITZInfo" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETNITZINFO_1, "TSY: CMmPhoneGsmWcdmaExt::GetNITZInfo" ); TInt ret( KErrNotFound ); @@ -568,7 +574,7 @@ void CMmPhoneGsmWcdmaExt::ReceivedNITZInfo( RMobilePhone::TMobilePhoneNITZ& aNITZInfo ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::ReceivedNITZInfo" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_RECEIVEDNITZINFO_1, "TSY: CMmPhoneGsmWcdmaExt::ReceivedNITZInfo" ); // This information is not necessarily available if network time // indication is received only once in bootup, before registration to NW. @@ -601,7 +607,7 @@ // TInt CMmPhoneGsmWcdmaExt::GetCellInfoL() { - TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetCellInfoL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETCELLINFOL_1, "TSY: CMmPhoneGsmWcdmaExt::GetCellInfoL" ); TInt ret = iMessageManager->HandleRequestL( ECtsyPhoneCellInfoReq ); return ret; } @@ -614,7 +620,7 @@ // TInt CMmPhoneGsmWcdmaExt::NotifyCellInfoChangeL() { - TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::NotifyCellInfoChangeL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_NOTIFYCELLINFOCHANGEL_1, "TSY: CMmPhoneGsmWcdmaExt::NotifyCellInfoChangeL" ); TInt ret = iMessageManager->HandleRequestL( ECtsyPhoneCellInfoIndReq ); return ret; } @@ -630,7 +636,7 @@ RMobilePhone::TMobilePhoneRegistrationStatus aRegistrationStatus ) // New registration status from network { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::CompleteNotifyNetworkRegistrationStatusChange" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_1, "TSY: CMmPhoneGsmWcdmaExt::CompleteNotifyNetworkRegistrationStatusChange" ); // If registration status not registered, then reset network information switch( aRegistrationStatus ) @@ -666,7 +672,7 @@ TInt CMmPhoneGsmWcdmaExt::GetHomeNetworkV1( RMobilePhone::TMobilePhoneNetworkInfoV1* aHomeNetInfo ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV1" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV1_1, "TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV1" ); TInt ret( KErrNone ); @@ -704,7 +710,7 @@ TInt CMmPhoneGsmWcdmaExt::GetHomeNetworkV2( RMobilePhone::TMobilePhoneNetworkInfoV2* aHomeNetInfo ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV2" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV2_1, "TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV2" ); TInt ret( KErrNone ); @@ -745,7 +751,7 @@ RMobilePhone::TMobilePhoneNetworkInfoV5* aHomeNetInfo ) // pointer to HomeNetInfo { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV5" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV5_1, "TSY: CMmPhoneGsmWcdmaExt::GetHomeNetworkV5" ); TInt ret( KErrNone ); @@ -791,7 +797,7 @@ RMobilePhone::TMobilePhoneNetworkInfoV8* aHomeNetInfo ) // pointer to HomeNetInfo { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::GetHomeNetwork" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_GETHOMENETWORK_1, "TSY: CMmPhoneGsmWcdmaExt::GetHomeNetwork" ); TInt ret( KErrNone ); @@ -1234,7 +1240,7 @@ { iSecCode.Copy( aCodes.iCode ); -TFLOGSTRING2( "TSY: CMmPhoneGsmWcdmaExt::DeliverCode iSecCode: %S", &iSecCode ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_DELIVERCODE_1, "TSY: CMmPhoneGsmWcdmaExt::DeliverCode iSecCode: %S", iSecCode ); return KErrNone; } @@ -1354,7 +1360,7 @@ TInt CMmPhoneGsmWcdmaExt::SetLockSettingL( CMmDataPackage* aPackage ) { -TFLOGSTRING("LTSY: CMmPhoneGsmWcdmaExt::SetLockSettingL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_SETLOCKSETTINGL_1, "LTSY: CMmPhoneGsmWcdmaExt::SetLockSettingL" ); TLockAndSetting lockAndSetting; aPackage->UnPackData( &lockAndSetting.iLock, &lockAndSetting.iSetting ); @@ -1510,7 +1516,7 @@ void CMmPhoneGsmWcdmaExt::CompleteGetHomeNetwork( CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmPhoneGsmWcdmaExt::CompleteGetHomeNetwork" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEGSMWCDMAEXT_COMPLETEGETHOMENETWORK_1, "TSY: CMmPhoneGsmWcdmaExt::CompleteGetHomeNetwork" ); RMobilePhone::TMobilePhoneNetworkInfoV8* homeInfo = NULL; aDataPackage->UnPackData ( &homeInfo ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontextlist.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontextlist.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontextlist.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CmmpacketcontextlistTraces.h" +#endif + #include "Cmmpacketcontextlist.h" #include "Cmmpacketservicetsy.h" #include "Cmmpacketcontexttsy.h" @@ -36,7 +42,7 @@ CMmPacketServiceTsy* const aPacketService ) { -TFLOGSTRING("TSY: CMmPacketContextList* CMmPacketContextList::NewL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_NEWL_1, "TSY: CMmPacketContextList* CMmPacketContextList::NewL." ); CMmPacketContextList* const contextList = new ( ELeave ) CMmPacketContextList(); @@ -114,7 +120,7 @@ const TUint8 /* aObjectId */, const TInfoName& aContextName ) { -TFLOGSTRING3("TSY: CMmPacketContextList::AddObject. Context Name: %S Channel Id: %d", &aContextName, aChannelId ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_ADDOBJECT_1, "TSY: CMmPacketContextList::AddObject. Context Name: %S Channel Id: %d", aContextName, aChannelId ); TInt ret( KErrArgument ); @@ -184,7 +190,7 @@ CMmPacketContextTsy* const aContext ) { -TFLOGSTRING("TSY: CMmPacketContextList::RemoveObject." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_REMOVEOBJECT_1, "TSY: CMmPacketContextList::RemoveObject." ); // Set ret to KErrArgument to check that context is in list TInt ret( KErrArgument ); @@ -212,7 +218,7 @@ if ( KErrNone == ret ) { -TFLOGSTRING2("TSY: CMmPacketContextList::RemoveObject. Context Name: %S", &iContextInfoArray[i].iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_REMOVEOBJECT_2, "TSY: CMmPacketContextList::RemoveObject. Context Name: %S", iContextInfoArray[i].iContextName ); // Release Proxy id iProxyIdList[j].iIsFree = ETrue; @@ -500,7 +506,7 @@ *aCount = count; -TFLOGSTRING2("TSY: CMmPacketContextList::EnumerateNifs. Number of Nifs: %d", aCount ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_ENUMERATENIFS_1, "TSY: CMmPacketContextList::EnumerateNifs. Number of Nifs: %d", aCount ); } // --------------------------------------------------------------------------- @@ -514,7 +520,7 @@ RPacketService::TNifInfoV2* aNifInfoV2 ) { -TFLOGSTRING("TSY: CMmPacketContextList::GetNifInfo." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_GETNIFINFO_1, "TSY: CMmPacketContextList::GetNifInfo." ); TInt index = *aIndex; @@ -625,7 +631,7 @@ const TInfoName aExistingContextName, TInt* aCount ) { -TFLOGSTRING("TSY: CMmPacketContextList::EnumerateContextsInNif." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_ENUMERATECONTEXTSINNIF_1, "TSY: CMmPacketContextList::EnumerateContextsInNif." ); TInt count( 0 ); @@ -701,7 +707,7 @@ const RPacketService::TContextNameInNif* aContextNameInNif, TDes* aContextName ) { -TFLOGSTRING("TSY: CMmPacketContextList::GetContextNameInNif." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTLIST_GETCONTEXTNAMEINNIF_1, "TSY: CMmPacketContextList::GetContextNameInNif." ); TInt index = aContextNameInNif->iIndex; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CmmpacketqostsyTraces.h" +#endif + #include "Cmmpacketservicetsy.h" #include "Cmmpacketqostsy.h" #include "Cmmpacketcontexttsy.h" @@ -36,7 +42,7 @@ CMmPacketServiceTsy* aMmPacketService, CMmPacketContextTsy* aMmPacketContext ) { -TFLOGSTRING("TSY: CMmPacketQoSTsy::NewL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_NEWL_1, "TSY: CMmPacketQoSTsy::NewL." ); CMmPacketQoSTsy* mmPacketQoS = new ( ELeave ) CMmPacketQoSTsy(); CleanupClosePushL( *mmPacketQoS ); @@ -70,7 +76,7 @@ CMmPacketQoSTsy::~CMmPacketQoSTsy() { -TFLOGSTRING("TSY: CMmPacketQoSTsy::~CMmPacketQoSTsy." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_DTOR_1, "TSY: CMmPacketQoSTsy::~CMmPacketQoSTsy." ); if( iMmPacketContext ) { iMmPacketContext->RemoveQoS(); @@ -118,7 +124,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING2("TSY: CMmPacketQoSTsy::ExtFunc. aIpc: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_EXTFUNC_1, "TSY: CMmPacketQoSTsy::ExtFunc. aIpc: %d", aIpc ); TInt ret( KErrNone ); TInt trapError( KErrNone ); @@ -168,7 +174,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmPacketQoSTsy::DoExtFuncL. IPC: %d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_DOEXTFUNCL_1, "TSY: CMmPacketQoSTsy::DoExtFuncL. IPC: %d Handle:%u", aIpc, (TUint)aTsyReqHandle); TInt ret( KErrNotSupported ); switch ( aIpc ) @@ -201,7 +207,7 @@ CTelObject::TReqMode CMmPacketQoSTsy::ReqModeL( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmPacketQoSTsy::ReqModeL. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_REQMODEL_1, "TSY: CMmPacketQoSTsy::ReqModeL. IPC: %d", aIpc ); CTelObject::TReqMode reqMode( 0 ); switch ( aIpc ) @@ -235,7 +241,7 @@ const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmPacketQoSTsy::NumberOfSlotsL. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_NUMBEROFSLOTSL_1, "TSY: CMmPacketQoSTsy::NumberOfSlotsL. IPC: %d", aIpc ); TInt numberOfSlots( 0 ); @@ -263,7 +269,7 @@ const TInt aIpc, const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmPacketQoSTsy::CancelService. IPC: %d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_CANCELSERVICE_1, "TSY: CMmPacketQoSTsy::CancelService. IPC: %d Handle:%u", aIpc, (TUint)aTsyReqHandle); TInt ret( KErrNone ); switch ( aIpc ) @@ -301,7 +307,7 @@ TInt CMmPacketQoSTsy::RegisterNotification( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmPacketQoSTsy::RegisterNotification. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_REGISTERNOTIFICATION_1, "TSY: CMmPacketQoSTsy::RegisterNotification. IPC: %d", aIpc ); if ( EPacketQoSNotifyProfileChanged == aIpc ) { @@ -321,7 +327,7 @@ TInt CMmPacketQoSTsy::DeregisterNotification( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmPacketQoSTsy::DeregisterNotification. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_DEREGISTERNOTIFICATION_1, "TSY: CMmPacketQoSTsy::DeregisterNotification. IPC: %d", aIpc ); if ( EPacketQoSNotifyProfileChanged == aIpc ) { @@ -341,7 +347,7 @@ CTelObject* CMmPacketQoSTsy::OpenNewObjectL( TDes& /* aNewName*/ ) { -TFLOGSTRING("TSY: CMmPacketQoSTsy::OpenNewObjectL. Leaves with:KErrNotSupported" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_OPENNEWOBJECTL_1, "TSY: CMmPacketQoSTsy::OpenNewObjectL. Leaves with:KErrNotSupported" ); User::Leave( KErrNotSupported ); return NULL; } @@ -358,7 +364,7 @@ CTelObject* CMmPacketQoSTsy::OpenNewObjectByNameL( const TDesC& /* aName */ ) { -TFLOGSTRING("TSY: CMmPacketQoSTsy::OpenNewObjectByNameL. Leaves with:KErrNotSupported" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmPacketQoSTsy::OpenNewObjectByNameL. Leaves with:KErrNotSupported" ); // Otherwise we can leave... User::Leave( KErrNotSupported ); return NULL; @@ -388,7 +394,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aProfileCaps ) { -TFLOGSTRING3("TSY: CMmPacketQoSTsy::GetProfileCapabilities. TsyReqHandle: %d aProfileCaps: %d", aTsyReqHandle, aProfileCaps ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_GETPROFILECAPABILITIES_1, "TSY: CMmPacketQoSTsy::GetProfileCapabilities. TsyReqHandle: %u aProfileCaps: 0x%08x", (TUint)aTsyReqHandle, (TUint)aProfileCaps); // Call GetProfileCapabilities from GSM/WCDMA extension TInt ret = iMmPacketQoSGsmWcdmaExt->GetProfileCapabilities( @@ -409,7 +415,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aProfile ) { -TFLOGSTRING3("TSY: CMmPacketQoSTsy::GetProfileParameters. TsyReqHandle: %d aProfile: %d", aTsyReqHandle, aProfile ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_GETPROFILEPARAMETERS_1, "TSY: CMmPacketQoSTsy::GetProfileParameters. TsyReqHandle: %u aProfile: 0x%08x", (TUint)aTsyReqHandle, (TUint)aProfile ); // Call GetProfileParameters method from GSM/WCDMA extension TInt ret = iMmPacketQoSGsmWcdmaExt->GetProfileParameters( aProfile ); @@ -430,7 +436,7 @@ TInt CMmPacketQoSTsy::NotifyProfileChanged( TDes8* aProfile ) { -TFLOGSTRING2("TSY: CMmPacketQoSTsy::NotifyProfileChanged. aProfile: %d", aProfile ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_NOTIFYPROFILECHANGED_1, "TSY: CMmPacketQoSTsy::NotifyProfileChanged. aProfile: 0x%08x", (TUint)aProfile); // Set Req Handle iReqHandleType = EMultimodePacketQoSNotifyParameterChanged; @@ -448,7 +454,7 @@ void CMmPacketQoSTsy::CompleteNotifyProfileChanged() { -TFLOGSTRING("TSY: CMmPacketQoSTsy::CompleteNotifyProfileChanged." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_COMPLETENOTIFYPROFILECHANGED_1, "TSY: CMmPacketQoSTsy::CompleteNotifyProfileChanged." ); // Reset tsy request handle. TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -472,7 +478,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aProfile ) { -TFLOGSTRING3("TSY: CMmPacketQoSTsy::SetProfileParametersL. TsyReqHandle: %d aProfile: %d", aTsyReqHandle, &aProfile ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_SETPROFILEPARAMETERSL_1, "TSY: CMmPacketQoSTsy::SetProfileParametersL. TsyReqHandle: %u aProfile: 0x%08x", (TUint)aTsyReqHandle, (TUint)aProfile ); // Call SetProfileParametersL from GSM/WCDMA extension TInt ret = iMmPacketQoSGsmWcdmaExt->SetProfileParametersL( aProfile ); @@ -512,7 +518,7 @@ void CMmPacketQoSTsy::CompleteSetProfileParameters( const TInt aError ) { -TFLOGSTRING2("TSY: CMmPacketQoSTsy::CompleteSetProfileParameters. Error: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_COMPLETESETPROFILEPARAMETERS_1, "TSY: CMmPacketQoSTsy::CompleteSetProfileParameters. Error: %d", aError ); // Reset the request handle. TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -603,7 +609,7 @@ const TInt aError ) { -TFLOGSTRING3("TSY: CMmPacketQoSTsy::Request Completed. Handle: %d Error:%d", aTsyReqHandle, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSTSY_REQCOMPLETED_1, "TSY: CMmPacketQoSTsy::Request Completed. Handle: %d Error:%d", aTsyReqHandle, aError ); CTelObject::ReqCompleted( aTsyReqHandle, aError ); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,8 +16,13 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CmmpacketservicetsyTraces.h" +#endif + #include "Cmmpacketservicetsy.h" -#include #include #include "MmTsy_timeoutdefs.h" #include "MmTsy_numberOfSlots.h" @@ -46,7 +51,7 @@ CMmMessageManagerBase* const aMessageManager, MLtsyFactoryBase* aFactory ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::NewL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NEWL_1, "TSY: CMmPacketServiceTsy::NewL" ); CMmPacketServiceTsy* const packetService = new ( ELeave ) CMmPacketServiceTsy(); @@ -56,7 +61,7 @@ packetService->ConstructL( aFactory ); CleanupStack::Pop(); -TFLOGSTRING("TSY: CMmPacketServiceTsy::NewL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NEWL_2, "TSY: CMmPacketServiceTsy::NewL." ); return packetService; } @@ -78,7 +83,7 @@ CMmPacketServiceTsy::~CMmPacketServiceTsy() { -TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_1, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy" ); if ( iMmPhone ) { @@ -108,19 +113,19 @@ if ( NULL != iDialUpContext ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Dial-up Object." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_2, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Dial-up Object." ); iDialUpContext->Close(); } if ( NULL != iSecondaryDialUpContext ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Secondary Dial-up Object." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_3, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Secondary Dial-up Object." ); iSecondaryDialUpContext->Close(); } -TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Closing iMutex Object." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_4, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Closing iMutex Object." ); iMutex.Close(); #ifdef USING_CTSY_DISPATCHER @@ -302,7 +307,7 @@ RPacketService::EStatusAttached, KErrNone ); } -TFLOGSTRING2("TSY: CMmPacketServiceTsy::UpdateAttachedPacketStatus. Service Status: %d", iInternalSavedData.iServiceStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_UPDATEATTACHEDPACKETSTATUS_1, "TSY: CMmPacketServiceTsy::UpdateAttachedPacketStatus. Service Status: %d", iInternalSavedData.iServiceStatus ); } //---------------------------------------------------------------------------- @@ -362,14 +367,14 @@ if ( iDialUpContext != NULL ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. DialUp Context Resumed" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_1, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. DialUp Context Resumed" ); iDialUpContext->ContextResumed(); } if ( iSecondaryDialUpContext != NULL ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Secondary DialUp Context Resumed" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_2, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Secondary DialUp Context Resumed" ); iSecondaryDialUpContext->ContextResumed(); } @@ -510,13 +515,13 @@ if ( iDialUpContext != NULL ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. DialUp Context Suspended" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_3, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. DialUp Context Suspended" ); iDialUpContext->ContextSuspended(); } if ( iSecondaryDialUpContext != NULL ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. DialUp Context Suspended" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_4, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. DialUp Context Suspended" ); iSecondaryDialUpContext->ContextSuspended(); } @@ -532,7 +537,7 @@ break; } } -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Service Status: %d", iInternalSavedData.iServiceStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_5, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Service Status: %d", iInternalSavedData.iServiceStatus ); } //---------------------------------------------------------------------------- @@ -547,7 +552,7 @@ void CMmPacketServiceTsy::ContextStatusChanged( const RPacketContext::TContextStatus aContextStatus ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::ContextStatusChanged. Context Status: %d", aContextStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_CONTEXTSTATUSCHANGED_1, "TSY: CMmPacketServiceTsy::ContextStatusChanged. Context Status: %d", aContextStatus ); if ( !iSuspended && ( RPacketService::EStatusUnattached != iInternalSavedData.iServiceStatus ) ) @@ -604,7 +609,7 @@ aPackage->UnPackData( preferredBearer ); -TFLOGSTRING2("TSY: CMmPacketServiceTsy::PreferredBearerChanged. PreferredBearer: %d", preferredBearer ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_PREFERREDBEARERCHANGED_1, "TSY: CMmPacketServiceTsy::PreferredBearerChanged. PreferredBearer: %d", preferredBearer ); iInternalSavedData.iPreferredBearer = preferredBearer; @@ -620,7 +625,7 @@ // TInt CMmPacketServiceTsy::AttachL() { -TFLOGSTRING("TSY: CMmPacketServiceTsy::AttachL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ATTACHL_1, "TSY: CMmPacketServiceTsy::AttachL." ); TInt ret( KErrAlreadyExists ); @@ -665,7 +670,7 @@ void CMmPacketServiceTsy::CompleteAttach( const TInt aError ) //error value { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteAttach. Error Value: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEATTACH_1, "TSY: CMmPacketServiceTsy::CompleteAttach. Error Value: %d", aError ); // Reset request handle. Returns the deleted request handle const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -689,7 +694,7 @@ // TInt CMmPacketServiceTsy::DetachL() { -TFLOGSTRING("TSY: CMmPacketServiceTsy::DetachL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DETACHL_1, "TSY: CMmPacketServiceTsy::DetachL." ); TInt ret( KErrAlreadyExists ); @@ -762,7 +767,7 @@ void CMmPacketServiceTsy::CompleteDetachL( const TInt aError ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteDetachL. Error Value: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEDETACHL_1, "TSY: CMmPacketServiceTsy::CompleteDetachL. Error Value: %d", aError ); // Reset request handle. Returns the deleted request handle const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -797,7 +802,7 @@ *aCount = iPacketContextList->NumberOfContexts(); *aMaxAllowed = KMmMaxNumberOfContexts; -TFLOGSTRING3("TSY: CMmPacketServiceTsy::EnumerateContexts. Count: %d Max Allowed: %d", *aCount, *aMaxAllowed ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATECONTEXTS_1, "TSY: CMmPacketServiceTsy::EnumerateContexts. Count: %d Max Allowed: %d", *aCount, *aMaxAllowed ); // Complete the request with KErrNone CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone ); @@ -812,7 +817,7 @@ TInt CMmPacketServiceTsy::GetAttachModeL( RPacketService::TAttachMode* const aMode ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetAttachModeL. Mode:%d", *aMode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETATTACHMODEL_1, "TSY: CMmPacketServiceTsy::GetAttachModeL. Mode:%d", *aMode ); TInt ret( KErrServerBusy ); @@ -843,7 +848,7 @@ void CMmPacketServiceTsy::CompleteGetAttachMode( const RPacketService::TAttachMode aAttachMode, TInt aResult ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteGetAttachMode. Attach Mode: %d", aAttachMode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEGETATTACHMODE_1, "TSY: CMmPacketServiceTsy::CompleteGetAttachMode. Attach Mode: %d", aAttachMode ); // Reset request handle. Returns the deleted request handle const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -880,7 +885,7 @@ ret = iPacketContextList->GetContextNameByIndex( *aIndex, aInfo->iName ); -TFLOGSTRING3("TSY: CMmPacketServiceTsy::GetContextInfo. Context Status: %d Context Name: %S", aInfo->iStatus, &aInfo->iName ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETCONTEXTINFO_1, "TSY: CMmPacketServiceTsy::GetContextInfo. Context Status: %d Context Name: %S", aInfo->iStatus, aInfo->iName ); } // Complete request with ret @@ -902,7 +907,7 @@ { // Call DynamicCaps() from extension iMmPacketServiceGsmWcdmaExt->GetDynamicCaps( aCaps ); -TFLOGSTRING("TSY: CMmPacketServiceTsy::GetDynamicCaps." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETDYNAMICCAPS_1, "TSY: CMmPacketServiceTsy::GetDynamicCaps." ); // Complete the request with KErrNone CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone ); @@ -925,7 +930,7 @@ { *aCurrentClass = iInternalSavedData.iMsClass; *aMaxClass = KMaxMsClass; -TFLOGSTRING3("TSY: CMmPacketServiceTsy::GetMSClass. Current Class: %d Max Class: %d", *aCurrentClass, *aMaxClass ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMSCLASS_1, "TSY: CMmPacketServiceTsy::GetMSClass. Current Class: %d Max Class: %d", *aCurrentClass, *aMaxClass ); // Complete the request with KErrNone CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone ); @@ -944,7 +949,7 @@ TInt CMmPacketServiceTsy::GetNtwkRegStatusL( RPacketService::TRegistrationStatus* const aRegistrationStatus ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetNtwkRegStatusL. Tsy Req Handle: %d", iTsyReqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETNTWKREGSTATUSL_1, "TSY: CMmPacketServiceTsy::GetNtwkRegStatusL. Tsy Req Handle: %d", iTsyReqHandle ); const TTsyReqHandle regHandle( iTsyReqHandleStore->GetTsyReqHandle( EMultimodePacketServiceGetNtwkRegStatus ) ); @@ -1000,7 +1005,7 @@ CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus( aRegistrationStatus ); } -TFLOGSTRING3("TSY: CMmPacketServiceTsy::CompleteGetNtwkRegStatus. TSY Req Handle: %d Registration Status: %d", reqHandle, aRegistrationStatus ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEGETNTWKREGSTATUS_1, "TSY: CMmPacketServiceTsy::CompleteGetNtwkRegStatus. TSY Req Handle: %d Registration Status: %d", reqHandle, aRegistrationStatus ); } //---------------------------------------------------------------------------- @@ -1016,7 +1021,7 @@ RPacketService::TPreferredBearer* const aBearer ) { *aBearer = iInternalSavedData.iPreferredBearer; -TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetPreferredBearer. Preferred Bearer: %d", *aBearer ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETPREFERREDBEARER_1, "TSY: CMmPacketServiceTsy::GetPreferredBearer. Preferred Bearer: %d", *aBearer ); // Complete the request with KErrNone CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone ); @@ -1044,7 +1049,7 @@ case RPacketContext::EPdpTypePPP: case RPacketContext::EPdpTypeCDPD: iMmPacketServiceGsmWcdmaExt->GetStaticCaps( aCaps ); - TFLOGSTRING("TSY: CMmPacketServiceTsy::GetStaticCaps." ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSTATICCAPS_1, "TSY: CMmPacketServiceTsy::GetStaticCaps." ); // Complete the request with KErrNone CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret ); @@ -1067,7 +1072,7 @@ { *aPacketStatus = iInternalSavedData.iServiceStatus; -TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetStatus. Service Status: %d", *aPacketStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSTATUS_1, "TSY: CMmPacketServiceTsy::GetStatus. Service Status: %d", *aPacketStatus ); // Complete the request with KErrNone CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone ); @@ -1085,7 +1090,7 @@ TInt CMmPacketServiceTsy::NotifyChangeOfNtwkRegStatus( RPacketService::TRegistrationStatus* const aRegistrationStatus ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyChangeOfNtwkRegStatus." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYCHANGEOFNTWKREGSTATUS_1, "TSY: CMmPacketServiceTsy::NotifyChangeOfNtwkRegStatus." ); // Set request handle and save pointer to aRegistrationStatus iNotifyDataPointers.iChangeOfNtwkRegStatus = aRegistrationStatus; @@ -1102,7 +1107,7 @@ void CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus( const RPacketService::TRegistrationStatus aRegistrationStatus ) { -TFLOGSTRING3("TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus. Current reg Status: %d New reg Status: %d", iInternalSavedData.iRegistrationStatus, aRegistrationStatus ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS_1, "TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus. Current reg Status: %d New reg Status: %d", iInternalSavedData.iRegistrationStatus, aRegistrationStatus ); // If registration status changed if ( aRegistrationStatus != iInternalSavedData.iRegistrationStatus ) @@ -1136,7 +1141,7 @@ void CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus( CMmDataPackage* aDataPackage, TInt aResult ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS1_1, "TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus."); //Unpack necessary data from datapackage RPacketService::TRegistrationStatus registrationStatus; @@ -1181,7 +1186,7 @@ TInt CMmPacketServiceTsy::NotifyContextActivationRequested( TPacketDataConfigBase* const aContextParameters ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyContextActivationRequested." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYCONTEXTACTIVATIONREQUESTED_1, "TSY: CMmPacketServiceTsy::NotifyContextActivationRequested." ); TInt ret = KErrNone; @@ -1241,7 +1246,7 @@ void CMmPacketServiceTsy::CompleteNotifyContextActivationRequested( CMmDataPackage* aDataPackage ) //contains initial data { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextActivationRequested."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTACTIVATIONREQUESTED_1, "TSY: CMmPacketServiceTsy::CompleteNotifyContextActivationRequested."); //Check if there is client request if ( EMultimodePacketServiceReqHandleUnknown != @@ -1474,7 +1479,7 @@ TInt CMmPacketServiceTsy::NotifyContextAdded( const TDataPackage& aPackage ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyContextAdded." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYCONTEXTADDED_1, "TSY: CMmPacketServiceTsy::NotifyContextAdded." ); TDes* const context = aPackage.Des1u(); @@ -1507,7 +1512,7 @@ aPackage->UnPackData( contextName, result ); -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_1, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded." ); if ( KErrNone != result ) { @@ -1518,7 +1523,7 @@ // Context name forced to External2. contextName.Copy( KStringExternal2 ); -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Secondary Dial-up Object." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_2, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Secondary Dial-up Object." ); // Create object for externally created dial-up context TRAP( trapError, iSecondaryDialUpContext = CMmPacketContextTsy::NewL( @@ -1531,7 +1536,7 @@ // Context name forced to External. contextName.Copy( KStringExternal ); -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Dial-up Object." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_3, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Dial-up Object." ); // Create object for externally created dial-up context TRAP( trapError, iDialUpContext = CMmPacketContextTsy::NewL( @@ -1581,7 +1586,7 @@ //Check if dial-up context is created, and set default params if ( contextName.Compare( KStringExternal2 ) == 0 ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Secondary Dial-up Object." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_4, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Secondary Dial-up Object." ); // Reset secondary dial-up context if(iSecondaryDialUpContext) { @@ -1591,7 +1596,7 @@ } else if ( contextName.Compare( KStringExternal ) == 0 ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Dial-up Object." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_5, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Dial-up Object." ); // Reset dial-up context if(iDialUpContext) { @@ -1610,7 +1615,7 @@ // Add context name to the etel side memory *iNotifyDataPointers.iContextAdded = contextName; iNotifyDataPointers.iContextAdded = NULL; -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded. Context Name: %S", &contextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_6, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded. Context Name: %S", contextName ); // Complete request with KErrNone CMmPacketServiceTsy::ReqCompleted( reqHandle, KErrNone ); @@ -1631,7 +1636,7 @@ TInt CMmPacketServiceTsy::NotifyDynamicCapsChange( RPacketService::TDynamicCapsFlags* const aCaps ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyDynamicCapsChange." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYDYNAMICCAPSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyDynamicCapsChange." ); // Save pointer to aCaps iNotifyDataPointers.iDynamicCapsChange = aCaps; @@ -1650,7 +1655,7 @@ void CMmPacketServiceTsy::CompleteNotifyDynamicCapsChange( const RPacketService::TDynamicCapsFlags aCaps ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyDynamicCapsChange." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYDYNAMICCAPSCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyDynamicCapsChange." ); // Reset request handle. Returns the deleted request handle const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -1676,7 +1681,7 @@ TInt CMmPacketServiceTsy::NotifyMSClassChange( RPacketService::TMSClass* const aNewClass ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyMSClassChange." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYMSCLASSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMSClassChange." ); // Save aNewClass internally iNotifyDataPointers.iMSClassChange = aNewClass; @@ -1694,7 +1699,7 @@ void CMmPacketServiceTsy::CompleteNotifyMSClassChange( CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange." ); RPacketService::TMSClass newClass; aDataPackage->UnPackData( newClass ); @@ -1714,7 +1719,7 @@ *iNotifyDataPointers.iMSClassChange = newClass; iNotifyDataPointers.iMSClassChange = NULL; -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange. New Ms Class: %d", newClass ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_2, "TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange. New Ms Class: %d", newClass ); // Complete request with KErrNone CMmPacketServiceTsy::ReqCompleted( reqHandle, KErrNone ); } @@ -1732,7 +1737,7 @@ TInt CMmPacketServiceTsy::NotifyStatusChange( RPacketService::TStatus* const aPacketStatus ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyStatusChange." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYSTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyStatusChange." ); // Save aPacketStatus to internal memory iNotifyDataPointers.iStatusChange = aPacketStatus; @@ -1752,7 +1757,7 @@ const RPacketService::TStatus& aPacketStatus, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange." ); if ( aPacketStatus != iInternalSavedData.iServiceStatus ) { iInternalSavedData.iServiceStatus = aPacketStatus; @@ -1766,7 +1771,7 @@ *iNotifyDataPointers.iStatusChange = aPacketStatus; iNotifyDataPointers.iStatusChange = NULL; -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange. Service Status:%d", aPacketStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_2, "TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange. Service Status:%d", aPacketStatus ); CMmPacketServiceTsy::ReqCompleted( reqHandle, aErrorCode ); } } @@ -1786,7 +1791,7 @@ // TInt CMmPacketServiceTsy::RejectActivationRequestL() { -TFLOGSTRING("TSY: CMmPacketServiceTsy::RejectActivationRequestL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REJECTACTIVATIONREQUESTL_1, "TSY: CMmPacketServiceTsy::RejectActivationRequestL." ); const TTsyReqHandle tsyRegHandle( iTsyReqHandleStore->GetTsyReqHandle( EMultimodePacketServiceRejectActivationRequest ) ); @@ -1816,7 +1821,7 @@ // void CMmPacketServiceTsy::CompleteRejectActivationRequest() { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteRejectActivationRequest." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEREJECTACTIVATIONREQUEST_1, "TSY: CMmPacketServiceTsy::CompleteRejectActivationRequest." ); // Reset request handle. Returns the deleted request handle const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -1837,7 +1842,7 @@ TInt CMmPacketServiceTsy::SetAttachModeL( const RPacketService::TAttachMode* aMode ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::SetAttachModeL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETATTACHMODEL_1, "TSY: CMmPacketServiceTsy::SetAttachModeL." ); iAttachMode = *aMode; @@ -1868,7 +1873,7 @@ void CMmPacketServiceTsy::CompleteSetAttachMode( const TInt aError ) //error value { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetAttachMode. Error Value: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETATTACHMODE_1, "TSY: CMmPacketServiceTsy::CompleteSetAttachMode. Error Value: %d", aError ); // Reset request handle. Returns the deleted request handle const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -1896,7 +1901,7 @@ { TAny* const dataPtr = aPackage.Ptr1(); -TFLOGSTRING2("TSY: CMmPacketServiceTsy::SetPreferredBearerL. Preferred Bearer: %d", &dataPtr ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETPREFERREDBEARERL_1, "TSY: CMmPacketServiceTsy::SetPreferredBearerL. Preferred Bearer: %d", &dataPtr ); const TTsyReqHandle reqHandle( iTsyReqHandleStore->GetTsyReqHandle( EMultimodePacketServiceSetPreferredBearer ) ); @@ -1931,7 +1936,7 @@ void CMmPacketServiceTsy::CompleteSetPreferredBearer( const TInt aError ) //epoc error code { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Error: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_1, "TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Error: %d", aError ); // Reset request handle. Returns the deleted request handle const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -1943,7 +1948,7 @@ { iInternalSavedData.iPreferredBearer = iTemporarySavedData.iPreferredBearer; -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Preferred Bearer: %d", iInternalSavedData.iPreferredBearer ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_2, "TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Preferred Bearer: %d", iInternalSavedData.iPreferredBearer ); } // Complete the client request @@ -1963,7 +1968,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::ExtFunc. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_EXTFUNC_1, "TSY: CMmPacketServiceTsy::ExtFunc. IPC: %d", aIpc ); TInt ret( KErrNone ); TInt trapError( KErrNone ); @@ -2022,7 +2027,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmPacketServiceTsy::DoExtFuncL. IPC: %d TSY Req Handle:%d", aIpc, iTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DOEXTFUNCL_1, "TSY: CMmPacketServiceTsy::DoExtFuncL. IPC: %d TSY Req Handle:%d", aIpc, iTsyReqHandle); TInt ret( KErrNotSupported ); @@ -2229,7 +2234,7 @@ CTelObject::TReqMode CMmPacketServiceTsy::ReqModeL( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::ReqModeL. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REQMODEL_1, "TSY: CMmPacketServiceTsy::ReqModeL. IPC: %d", aIpc ); CTelObject::TReqMode reqMode( 0 ); switch ( aIpc ) @@ -2307,7 +2312,7 @@ TInt CMmPacketServiceTsy::NumberOfSlotsL( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::NumberOfSlotsL. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NUMBEROFSLOTSL_1, "TSY: CMmPacketServiceTsy::NumberOfSlotsL. IPC: %d", aIpc ); TInt numberOfSlots( 0 ); switch ( aIpc ) @@ -2360,7 +2365,7 @@ const TInt aIpc, const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmPacketServiceTsy::CancelService. IPC: %d Tsy Req Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_CANCELSERVICE_1, "TSY: CMmPacketServiceTsy::CancelService. IPC: %d Tsy Req Handle:%d", aIpc, aTsyReqHandle); TInt ret( KErrNone ); @@ -2482,12 +2487,12 @@ // Reset tsy request handle iTsyReqHandleStore->ResetTsyReqHandle( iReqHandleType ); - // Complete request with KErrCancel - CMmPacketServiceTsy::ReqCompleted( aTsyReqHandle, KErrCancel ); - // We've finished with this value now. Clear it so it doesn't leak // up to any other instances of this method down the call stack iReqHandleType = EMultimodePacketServiceReqHandleUnknown; + + // Complete request with KErrCancel + CMmPacketServiceTsy::ReqCompleted( aTsyReqHandle, KErrCancel ); } return ret; @@ -2502,7 +2507,7 @@ TInt CMmPacketServiceTsy::RegisterNotification( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::RegisterNotification. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REGISTERNOTIFICATION_1, "TSY: CMmPacketServiceTsy::RegisterNotification. IPC: %d", aIpc ); TInt ret( KErrNone ); @@ -2535,7 +2540,7 @@ TInt CMmPacketServiceTsy::DeregisterNotification( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::DeregisterNotification. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DEREGISTERNOTIFICATION_1, "TSY: CMmPacketServiceTsy::DeregisterNotification. IPC: %d", aIpc ); TInt ret( KErrNone ); @@ -2570,7 +2575,7 @@ TBool aAttemptAttach, TMbmsNetworkServiceStatus* aMBMSServiceStatus ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy:: TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSNETWORKSERVICESTATUS_1, "TSY: CMmPacketServiceTsy:: TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus ); const TTsyReqHandle regHandle( iTsyReqHandleStore->GetTsyReqHandle( EMultimodePacketServiceGetMBMSStatus ) ); @@ -2622,7 +2627,7 @@ void CMmPacketServiceTsy::CompleteGetMbmsNetworkServiceStatus( CMmDataPackage* aDataPackage, TInt aError ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteGetMbmsNetworkServiceStatus."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEGETMBMSNETWORKSERVICESTATUS_1, "TSY: CMmPacketServiceTsy::CompleteGetMbmsNetworkServiceStatus."); //Update the cache TMbmsNetworkServiceStatus mbmsNetworkServiceStatus = EMbmsSupportUnknown; @@ -2663,7 +2668,7 @@ TInt CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange( TMbmsNetworkServiceStatus* aMBMSServiceStatus ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus ); // Set request handle and save pointer to aMBMSServiceStatus iNotifyDataPointers.iMBMSStatusChange = aMBMSServiceStatus; @@ -2680,7 +2685,7 @@ void CMmPacketServiceTsy::CompleteNotifyMbmsNetworkServiceStatusChange( CMmDataPackage* aDataPackage, TInt aResult ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange."); TInt result = aResult; if (aResult == KErrNone) @@ -2734,7 +2739,7 @@ // TInt CMmPacketServiceTsy::NotifyMbmsServiceAvailabilityChange() { -TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyMbmsServiceAvailabilityChange."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYMBMSSERVICEAVAILABILITYCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMbmsServiceAvailabilityChange."); // Set request handle iReqHandleType = EMultimodePacketServiceNotifyMbmsServiceAvailabilityChange; @@ -2819,7 +2824,7 @@ } aMaxAllowed = iMaxMonitoredServices; -TFLOGSTRING("TSY: CMmPacketServiceTsy::EnumerateMonitorServiceList." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMONITORSERVICELIST_1, "TSY: CMmPacketServiceTsy::EnumerateMonitorServiceList." ); // Complete the request with KErrNone CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone ); @@ -2892,7 +2897,7 @@ } //---------------------------------------------------------------------------- -// CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceList +// CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL // Completes update monitored service list request //---------------------------------------------------------------------------- // @@ -2900,7 +2905,7 @@ CMmDataPackage* aDataPackage, const TInt aResult) { - TFLOGSTRING( "TSY: CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL." ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEUPDATEMBMSMONITORSERVICELIST_1, "TSY: CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL." ); TInt result= aResult; TInt err(KErrNone); @@ -2950,7 +2955,7 @@ // TInt CMmPacketServiceTsy::UpdateMbmsMonitorServiceListCancel( TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING2( "TSY: CMmPacketServiceTsy::UpdateMbmsMonitorServiceListCancel ReqHandle %d", aTsyReqHandle ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_UPDATEMBMSMONITORSERVICELISTCANCEL_1, "TSY: CMmPacketServiceTsy::UpdateMbmsMonitorServiceListCancel ReqHandle %d", aTsyReqHandle ); if ( aTsyReqHandle != EMultimodePacketServiceReqHandleUnknown ) { @@ -2973,7 +2978,7 @@ // TInt CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1L(RMobilePhone::TClientId* aClient, TUint& aBufSize) { - TFLOGSTRING("TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1L called."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE1L_1, "TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1L called."); // Initialize ret value TInt ret( KErrNone ); TInt leaveCode( KErrNone ); @@ -3009,7 +3014,7 @@ TInt CMmPacketServiceTsy::GetSizeOfMonitoredServiceListL(RMobilePhone::TClientId* aClient, TUint& aBufSize) { // read the list, store its content and then return size of this buffer to client - TFLOGSTRING("TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList called."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_1, "TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList called."); // create new list CPcktMbmsMonitoredServiceList* currentList=CPcktMbmsMonitoredServiceList::NewL(); CleanupStack::PushL(currentList); @@ -3041,7 +3046,7 @@ // return the CBufFlat's size to client aBufSize=(read->iListBuf)->Size(); -TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList: size=%d",aBufSize); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_2, "TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList: size=%d",aBufSize); // Complete first phase of list retrieval ReqCompleted( iTsyReqHandle, KErrNone ); CleanupStack::PopAndDestroy( currentList ); // Pop & destroy list @@ -3058,7 +3063,7 @@ // Initialize ret value TInt ret( KErrNotFound ); - TFLOGSTRING("TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase2 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE2_1, "TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase2 called"); CListReadAllAttempt* read=NULL; // Find the get Mbms monitored services from this client @@ -3108,7 +3113,7 @@ TInt CMmPacketServiceTsy::GetMbmsMonitoredServicesCancel( TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1LCancel called"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESCANCEL_1, "TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1LCancel called"); // Remove the read all attempt CListReadAllAttempt* read = NULL; @@ -3148,7 +3153,7 @@ CTelObject* CMmPacketServiceTsy::OpenNewObjectL( TDes& aNewName ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. %S", &aNewName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_1, "TSY: CMmPacketServiceTsy::OpenNewObjectL. %S", aNewName ); CTelObject* newContext = NULL; TUint8 proxyId( 0 ); TInt ret( KErrNone ); @@ -3159,7 +3164,7 @@ if( KErrNone != ret ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves with: %d", ret ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_2, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves with: %d", ret ); User::Leave( ret ); } @@ -3171,12 +3176,12 @@ // Call Close() to context to remove it completely context->Close(); context = NULL; -TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves with: %d", ret ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_3, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves with: %d", ret ); User::Leave( ret ); } else { -TFLOGSTRING3("TSY: CMmPacketServiceTsy::OpenNewObjectL. New MBMS Context Name: %S Proxy Id: %d",&aNewName, proxyId ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_4, "TSY: CMmPacketServiceTsy::OpenNewObjectL. New MBMS Context Name: %S Proxy Id: %d",aNewName, proxyId ); newContext = context; } } @@ -3191,7 +3196,7 @@ // of context supported by this phone ( value KMmMaxNumberOfContexts ) ret = CMmCommonStaticUtility::EpocErrorCode( KErrOverflow, KErrUmtsMaxNumOfContextExceededByPhone ); -TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_5, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret ); User::Leave( ret ); } CMmPacketContextTsy* context = CMmPacketContextTsy::NewL( this, iHostCID, aNewName, proxyId ); @@ -3205,12 +3210,12 @@ // Call Close() to context to remove it completely context->Close(); context = NULL; -TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_6, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret ); User::Leave( ret ); } else { -TFLOGSTRING3("TSY: CMmPacketServiceTsy::OpenNewObjectL. New Context Name: %S Proxy Id: %d",&aNewName, proxyId ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_7, "TSY: CMmPacketServiceTsy::OpenNewObjectL. New Context Name: %S Proxy Id: %d",aNewName, proxyId ); newContext = context; } } @@ -3225,12 +3230,12 @@ CTelObject* CMmPacketServiceTsy::OpenNewObjectByNameL( const TDesC& aName ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Context Name: %S", &aName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Context Name: %S", aName ); // length of object's name cannot be over 16 chars if ( 16 < aName.Length() ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrOverflow ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_2, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrOverflow ); User::Leave( KErrOverflow ); } @@ -3239,12 +3244,12 @@ if ( mmPacketContextName.Compare( KStringExternal ) == 0 ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Dial-up Object." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_3, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Dial-up Object." ); mmPacketContext = iDialUpContext; } else if ( mmPacketContextName.Compare( KStringExternal2 ) == 0 ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Secondary Dial-up Object." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_4, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Secondary Dial-up Object." ); mmPacketContext = iSecondaryDialUpContext; } else @@ -3256,7 +3261,7 @@ // If not found, Leaves if ( NULL == mmPacketContext ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_5, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound ); User::Leave( KErrNotFound ); } @@ -3425,14 +3430,14 @@ } else if ( aObject == iDialUpContext && NULL != iDialUpContext ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETE_1, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." ); iDialUpContext->Complete( aReqHandleType, aError ); } else if ( aObject == iSecondaryDialUpContext && NULL != iSecondaryDialUpContext ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETE_2, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." ); iSecondaryDialUpContext->Complete( aReqHandleType, aError ); @@ -3571,7 +3576,7 @@ const TTsyReqHandle aTsyReqHandle, const TInt aError ) { -TFLOGSTRING3("TSY: CMmPacketServiceTsy::Request Completed. TSY Req Handle: %d Error:%d", aTsyReqHandle, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REQCOMPLETED_1, "TSY: CMmPacketServiceTsy::Request Completed. TSY Req Handle: %d Error:%d", aTsyReqHandle, aError ); CTelObject::ReqCompleted( aTsyReqHandle, aError ); } @@ -3621,7 +3626,7 @@ TInt CMmPacketServiceTsy::EnumerateNifs( TInt* aCount ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::EnumerateNifs." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATENIFS_1, "TSY: CMmPacketServiceTsy::EnumerateNifs." ); iPacketContextList->EnumerateNifs( aCount ); @@ -3639,7 +3644,7 @@ TInt* aIndex, RPacketService::TNifInfoV2* aNifInfoV2 ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::GetNifInfo." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETNIFINFO_1, "TSY: CMmPacketServiceTsy::GetNifInfo." ); TInt ret = iPacketContextList->GetNifInfo( aIndex, aNifInfoV2 ); @@ -3661,7 +3666,7 @@ TDesC* aExistingContextName, TInt* aCount ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::EnumerateContextsInNif." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATECONTEXTSINNIF_1, "TSY: CMmPacketServiceTsy::EnumerateContextsInNif." ); TInt ret = KErrNone; if (aExistingContextName->Length() > KMaxInfoName) @@ -3689,7 +3694,7 @@ RPacketService::TContextNameInNif* aContextNameInNif, TDes* aContextName ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::GetContextNameInNif." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETCONTEXTNAMEINNIF_1, "TSY: CMmPacketServiceTsy::GetContextNameInNif." ); TInt ret = iPacketContextList->GetContextNameInNif( aContextNameInNif, aContextName ); @@ -3707,7 +3712,7 @@ TInt CMmPacketServiceTsy::SetDefaultContextParamsL( const TDataPackage& aPackage ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::SetDefaultContextParamsL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETDEFAULTCONTEXTPARAMSL_1, "TSY: CMmPacketServiceTsy::SetDefaultContextParamsL." ); TInt ret(KErrServerBusy); @@ -3737,7 +3742,7 @@ void CMmPacketServiceTsy::CompleteSetDefaultContextParams( TInt aCause ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetDefaultContextParams. aCause: %d", aCause ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETDEFAULTCONTEXTPARAMS_1, "TSY: CMmPacketServiceTsy::CompleteSetDefaultContextParams. aCause: %d", aCause ); // Reset request handle. Returns the deleted request handle const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( @@ -3758,7 +3763,7 @@ TInt CMmPacketServiceTsy::GetDefaultContextParams( TPacketDataConfigBase* aContextConfig ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::GetDefaultContextParams." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETDEFAULTCONTEXTPARAMS_1, "TSY: CMmPacketServiceTsy::GetDefaultContextParams." ); TInt ret = iMmPacketServiceGsmWcdmaExt->GetDefaultContextParams( aContextConfig ); @@ -3794,7 +3799,7 @@ if ( RCall::EStatusUnknown != status && RCall::EStatusIdle != status ) { - TFLOGSTRING("TSY: CMmPacketServiceTsy::IsActivationAllowed. CS call active, Context Activation not allowed" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ISACTIVATIONALLOWED_1, "TSY: CMmPacketServiceTsy::IsActivationAllowed. CS call active, Context Activation not allowed" ); isAllowed = EFalse; i = iMmPhone->CallList()->GetNumberOfObjects(); } @@ -3823,7 +3828,7 @@ void CMmPacketServiceTsy::CompleteNotifyEGprsInfoChange( CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyEGprsInfoChange." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYEGPRSINFOCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyEGprsInfoChange." ); //Unpack data TBool lastEdgeGprsSupport; @@ -3887,7 +3892,7 @@ //Unpack data aDataPackage->UnPackData( ntwkMode ); -TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNetworkModeChange. ntwkMode: %d", ntwkMode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENETWORKMODECHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNetworkModeChange. ntwkMode: %d", ntwkMode ); iCurrentMode = ntwkMode; } @@ -3916,7 +3921,7 @@ // RHandleBase* CMmPacketServiceTsy::GlobalKernelObjectHandle() { -TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_1, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle" ); if ( KNullHandle == iMutex.Handle() ) { @@ -3924,16 +3929,16 @@ if ( KErrNone == ret ) { -TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex created" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_2, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex created" ); } else { -TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation failed" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_3, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation failed" ); } } else { -TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation skipped" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_4, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation skipped" ); } return &iMutex; @@ -3948,8 +3953,8 @@ TTsyReqHandle aTsyReqHandle, RMmCustomAPI::TSetAlwaysOnMode aMode ) { -TFLOGSTRING2("TSY: CMmPacketServiceTsy::SetAlwaysOn Mode = %d", aMode ); -TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn ReqHandle %d", aTsyReqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETALWAYSONL_1, "TSY: CMmPacketServiceTsy::SetAlwaysOn Mode = %d", aMode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETALWAYSONL_2, "TSY: CMmPacketServiceTsy::SetAlwaysOn ReqHandle %d", aTsyReqHandle ); TInt ret( KErrServerBusy ); //Check if request is allready pending @@ -3984,12 +3989,12 @@ void CMmPacketServiceTsy::CompleteSetAlwaysOn( TInt aError ) { -TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn Error %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETALWAYSON_1, "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn Error %d", aError ); const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePacketSetAlwaysOn ) ); -TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn ReqHandle %d", reqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETALWAYSON_2, "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn ReqHandle %d", reqHandle ); if ( EMultimodePacketServiceReqHandleUnknown != reqHandle ) { @@ -4015,7 +4020,7 @@ void CMmPacketServiceTsy::CancelSetAlwaysOn( TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CancelSetAlwaysOn ReqHandle %d", aTsyReqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_CANCELSETALWAYSON_1, "TSY: CMmPacketServiceTsy::CancelSetAlwaysOn ReqHandle %d", aTsyReqHandle ); if ( aTsyReqHandle != EMultimodePacketServiceReqHandleUnknown ) { @@ -4034,12 +4039,12 @@ // TInt CMmPacketServiceTsy::EnumerateMbmsActiveServiceList( TInt &aCount, TInt &aMaxAllowed ) { -TFLOGSTRING2( "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveServiceList. max: %d", aMaxAllowed ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_1, "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveServiceList. max: %d", aMaxAllowed ); aCount = EnumerateMbmsActiveServices(); aMaxAllowed = iMaxActiveServices; -TFLOGSTRING3( "TSY: CMmPacketServiceTsy::EnumerateActiveServiceList Count: %d, Max allowed %d", aCount, aMaxAllowed ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_2, "TSY: CMmPacketServiceTsy::EnumerateActiveServiceList Count: %d, Max allowed %d", aCount, aMaxAllowed ); // Complete the request with KErrNone CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone ); return KErrNone; @@ -4052,7 +4057,7 @@ // TInt CMmPacketServiceTsy::EnumerateMbmsActiveServices() { -TFLOGSTRING2( "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveService. max: %d", iMaxActiveServices ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICES_1, "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveService. max: %d", iMaxActiveServices ); TInt ret( 0 ); for( TInt i = 0; i< iMBMSContextList->NumberOfContexts(); i++ ) @@ -4089,7 +4094,7 @@ CMmDataPackage* aDataPackage, const TInt aResult) { -TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteEnumerateMbmsActiveServiceList. Error: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEENUMERATEMBMSACTIVESERVICELIST_1, "TSY: CMmPacketServiceTsy::CompleteEnumerateMbmsActiveServiceList. Error: %d", aResult ); if( KErrNone == aResult && NULL != aDataPackage ) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontextlist.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontextlist.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontextlist.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmmbmscontextlistTraces.h" +#endif + #include "cmmmbmscontextlist.h" // ============================ MEMBER FUNCTIONS =============================== @@ -32,7 +38,7 @@ CMmMBMSContextList* CMmMBMSContextList::NewL() { -TFLOGSTRING("TSY: CMmMBMSContextList* CMmMBMSContextList::NewL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_NEWL_1, "TSY: CMmMBMSContextList* CMmMBMSContextList::NewL." ); CMmMBMSContextList* const contextList = new ( ELeave ) CMmMBMSContextList(); @@ -69,7 +75,7 @@ // TInt CMmMBMSContextList::AddContext( CMmMBMSContextTsy* aContext ) { -TFLOGSTRING("TSY: CMmMBMSContextList::AddContext."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_ADDCONTEXT_1, "TSY: CMmMBMSContextList::AddContext."); TInt ret( KErrArgument ); @@ -88,7 +94,7 @@ TInt CMmMBMSContextList::RemoveContext( CMmMBMSContextTsy* aContext ) { -TFLOGSTRING("TSY: CMmMBMSContextList::RemoveContext." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_REMOVECONTEXT_1, "TSY: CMmMBMSContextList::RemoveContext." ); TInt ret = RemoveObject(aContext); @@ -104,7 +110,7 @@ // CMmMBMSContextTsy* CMmMBMSContextList::ContextByIndex( TInt aIndex ) const { -TFLOGSTRING2("TSY: CMmMBMSContextList::ContextByIndex. aIndex: %d", aIndex ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_CONTEXTBYINDEX_1, "TSY: CMmMBMSContextList::ContextByIndex. aIndex: %d", aIndex ); return (CMmMBMSContextTsy*)GetObjectByIndex(aIndex); } @@ -117,7 +123,7 @@ CMmMBMSContextTsy* CMmMBMSContextList::ContextByName( const TInfoName& aName ) //name of the context { -TFLOGSTRING2("TSY: CMmMBMSContextList::ContextByName. Context Name: %S ", &aName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_CONTEXTBYNAME_1, "TSY: CMmMBMSContextList::ContextByName. Context Name: %S ", aName ); // Find name from context info list TInt size = NumberOfContexts(); for ( TInt i = 0; i < size; i++ ) @@ -158,7 +164,7 @@ TUint8& aProxyId, //proxy id of the context TInt aMaxContexts ) { -TFLOGSTRING("TSY: CMmMBMSContextList::GenerateNewContextName." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_GENERATENEWCONTEXTNAME_1, "TSY: CMmMBMSContextList::GenerateNewContextName." ); if(aMaxContexts <= NumberOfContexts() ) { @@ -189,7 +195,7 @@ // TBool CMmMBMSContextList::IsMbmsContextReceiving() { -TFLOGSTRING("TSY: CMmMBMSContextList::IsMbmsContextReceiving." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTLIST_ISMBMSCONTEXTRECEIVING_1, "TSY: CMmMBMSContextList::IsMbmsContextReceiving." ); TInt size = NumberOfContexts(); for( TInt i = 0; i < size; i++ ) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,10 +16,15 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmmbmscontexttsyTraces.h" +#endif + #include "cmmmbmscontexttsy.h" #include "cmmmbmscontextlist.h" #include "CMmPacketTsy.h" -#include #include "mbmstypes.h" #include "MmTsy_timeoutdefs.h" #include "MmTsy_numberOfSlots.h" @@ -35,7 +40,7 @@ const TDes& aName, const TUint8 aProxyId ) { -TFLOGSTRING( "TSY: CMmMBMSContextTsy::NewL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_NEWL_1, "TSY: CMmMBMSContextTsy::NewL" ); CMmMBMSContextTsy* packetContext = new ( ELeave ) CMmMBMSContextTsy(); CleanupClosePushL( *packetContext ); @@ -74,7 +79,7 @@ CMmMBMSContextTsy::~CMmMBMSContextTsy() { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::~CMmMBMSContextTsy Context name: %S", &iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DTOR_1, "TSY: CMmMBMSContextTsy::~CMmMBMSContextTsy Context name: %S", iContextName ); if( iMmPacketService ) { @@ -115,7 +120,7 @@ TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3( "TSY: CMmMBMSContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, &iContextName ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_EXTFUNC_1, "TSY: CMmMBMSContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, iContextName ); TInt ret( KErrNone ); TInt trapError( KErrNone ); @@ -161,8 +166,7 @@ TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3( "TSY: CMmMBMSContextTsy::DoExtFuncL. IPC: %d Handle:%d", - aIpc, aTsyReqHandle ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DOEXTFUNCL_1, "TSY: CMmMBMSContextTsy::DoExtFuncL. IPC: %d Handle:%d",aIpc, aTsyReqHandle ); TInt ret( KErrNotSupported ); @@ -255,7 +259,7 @@ CTelObject::TReqMode CMmMBMSContextTsy::ReqModeL( TInt aIpc ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::ReqModeL. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_REQMODEL_1, "TSY: CMmMBMSContextTsy::ReqModeL. IPC: %d", aIpc ); CTelObject::TReqMode reqMode( 0 ); TBool doLeave( EFalse ); @@ -367,7 +371,7 @@ break; } -TFLOGSTRING3( "TSY: CMmMBMSContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d", aIpc, numberOfSlots ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_NUMBEROFSLOTSL_1, "TSY: CMmMBMSContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d", aIpc, numberOfSlots ); return numberOfSlots; @@ -389,7 +393,7 @@ TInt aIpc, TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3( "TSY: CMmMBMSContextTsy::CancelService. IPC: %d Handle:%d", aIpc, aTsyReqHandle ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_CANCELSERVICE_1, "TSY: CMmMBMSContextTsy::CancelService. IPC: %d Handle:%d", aIpc, aTsyReqHandle ); TInt ret( KErrNone ); //TTsyReqHandle reqHandle( NULL ); @@ -462,7 +466,7 @@ TInt CMmMBMSContextTsy::RegisterNotification( TInt aIpc ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::RegisterNotification. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_REGISTERNOTIFICATION_1, "TSY: CMmMBMSContextTsy::RegisterNotification. IPC: %d", aIpc ); TInt ret( KErrNone ); @@ -495,7 +499,7 @@ TInt CMmMBMSContextTsy::DeregisterNotification( TInt aIpc ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::DeregisterNotification. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DEREGISTERNOTIFICATION_1, "TSY: CMmMBMSContextTsy::DeregisterNotification. IPC: %d", aIpc ); TInt ret( KErrNone ); @@ -522,7 +526,7 @@ // TInt CMmMBMSContextTsy::InitialiseContextL( RPacketContext::TDataChannelV2* aDataChannel ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::InitialiseContextL. %S", &iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_INITIALISECONTEXTL_1, "TSY: CMmMBMSContextTsy::InitialiseContextL. %S", iContextName ); TInt ret( KErrArgument ); @@ -561,7 +565,7 @@ void CMmMBMSContextTsy::CompleteInitialiseContext(TInt aResult, RPacketContext::TDataChannelV2* aDataChannel ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteInitialiseContext. Error: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEINITIALISECONTEXT_1, "TSY: CMmMBMSContextTsy::CompleteInitialiseContext. Error: %d", aResult ); iIsActivateAllowed = ETrue; if (KErrNone == aResult ) @@ -601,7 +605,7 @@ // TInt CMmMBMSContextTsy::ActivateL() { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::ActivateL. Context name:%S", &iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_ACTIVATEL_1, "TSY: CMmMBMSContextTsy::ActivateL. Context name:%S", iContextName ); TInt ret( KErrNotReady ); @@ -647,7 +651,7 @@ // void CMmMBMSContextTsy::CompleteActivate(TInt aResult) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteActivate. Error: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEACTIVATE_1, "TSY: CMmMBMSContextTsy::CompleteActivate. Error: %d", aResult ); // Reset the req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -663,8 +667,7 @@ } else { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteActivate. ErrorCause: %d", - aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEACTIVATE_2, "TSY: CMmMBMSContextTsy::CompleteActivate. ErrorCause: %d",aResult ); // Re-activation is allowed because activation has not succeeded iIsActivateAllowed = ETrue; } @@ -687,7 +690,7 @@ // TInt CMmMBMSContextTsy::DeactivateL() { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::DeactivateL. Context name:%S", &iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DEACTIVATEL_1, "TSY: CMmMBMSContextTsy::DeactivateL. Context name:%S", iContextName ); TInt ret( KErrArgument ); @@ -720,7 +723,7 @@ CMmDataPackage* aDataPackage, TInt aResult ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteDeactivate. Error: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEDEACTIVATE_1, "TSY: CMmMBMSContextTsy::CompleteDeactivate. Error: %d", aResult ); // Reset the req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeMbmsContextDeactivate ); @@ -782,7 +785,7 @@ // TInt CMmMBMSContextTsy::DeleteL() { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::DeleteL. Context name:%S", &iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_DELETEL_1, "TSY: CMmMBMSContextTsy::DeleteL. Context name:%S", iContextName ); TInt ret( KErrNotReady ); if( RPacketContext::EStatusUnknown != ContextStatus() ) @@ -814,7 +817,7 @@ void CMmMBMSContextTsy::CompleteDelete( TInt aResult ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteDelete. Error: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEDELETE_1, "TSY: CMmMBMSContextTsy::CompleteDelete. Error: %d", aResult ); if( KErrNone == aResult ) { @@ -848,7 +851,7 @@ TTsyReqHandle aTsyReqHandle, TPacketDataConfigBase* aConfig ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::GetConfig. Context name:%S", &iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETCONFIG_1, "TSY: CMmMBMSContextTsy::GetConfig. Context name:%S", iContextName ); TInt ret( KErrNone ); // Check that the mode given in aConfig is KConfigMBMS @@ -880,7 +883,7 @@ TTsyReqHandle aTsyReqHandle, TInt* aError ) { -TFLOGSTRING3( "TSY: CMmMBMSContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d", &iContextName, iLastErrorCause ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETLASTERRORCAUSE_1, "TSY: CMmMBMSContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d", iContextName, iLastErrorCause ); *aError = iLastErrorCause; CMmMBMSContextTsy::ReqCompleted( aTsyReqHandle, KErrNone ); @@ -900,8 +903,7 @@ iLastErrorCause = aErrorCause; -TFLOGSTRING3( "TSY: CMmMBMSContextTsy::SetLastErrorCause. aErrorCause: %d iLastErrorCause:%d", - aErrorCause, iLastErrorCause ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_SETLASTERRORCAUSE_1, "TSY: CMmMBMSContextTsy::SetLastErrorCause. aErrorCause: %d iLastErrorCause:%d", aErrorCause, iLastErrorCause ); } @@ -915,7 +917,7 @@ TTsyReqHandle aTsyReqHandle, RPacketContext::TContextStatus* aContextStatus ) { -TFLOGSTRING3( "TSY: CMmMBMSContextTsy::GetStatus. Context name: %S Context Status:%d", &iContextName, iContextStatus ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETSTATUS_1, "TSY: CMmMBMSContextTsy::GetStatus. Context name: %S Context Status:%d", iContextName, iContextStatus ); *aContextStatus = iContextStatus; CMmMBMSContextTsy::ReqCompleted( aTsyReqHandle, KErrNone ); @@ -931,7 +933,7 @@ TInt CMmMBMSContextTsy::NotifyConfigChanged( TPacketDataConfigBase* aConfig ) { -TFLOGSTRING( "TSY: CMmMBMSContextTsy::NotifyConfigChanged." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_NOTIFYCONFIGCHANGED_1, "TSY: CMmMBMSContextTsy::NotifyConfigChanged." ); // Check that used mode is MBMS if ( TPacketDataConfigBase::KConfigMBMS != aConfig->ExtensionId() ) @@ -956,8 +958,7 @@ void CMmMBMSContextTsy::CompleteNotifyConfigChanged(const CMmDataPackage* aDataPackage, TInt aResult) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteNotifyConfigChanged. Context name:%S", - &iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETENOTIFYCONFIGCHANGED_1, "TSY: CMmMBMSContextTsy::CompleteNotifyConfigChanged. Context name:%S",iContextName ); if(aDataPackage != NULL) { if ( KErrNone == aResult ) @@ -1015,7 +1016,7 @@ TInt CMmMBMSContextTsy::NotifyStatusChange( RPacketContext::TContextStatus* aContextStatus ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::NotifyStatusChange. Context name:%S", &iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_NOTIFYSTATUSCHANGE_1, "TSY: CMmMBMSContextTsy::NotifyStatusChange. Context name:%S", iContextName ); iRetNotifyStatus = aContextStatus; iReqHandleType = EMultimodeMbmsContextNotifyStatusChange; @@ -1034,8 +1035,7 @@ if ( aContextStatus != iContextStatus ) { iContextStatus = aContextStatus; -TFLOGSTRING3( "TSY: CMmMBMSContextTsy::CompleteNotifyStatusChange. Context name: %S Context status:%d", - &iContextName, iContextStatus ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmMBMSContextTsy::CompleteNotifyStatusChange. Context name: %S Context status:%d",iContextName, iContextStatus ); if ( RPacketContext::EStatusActive == iContextStatus || RPacketContext::EStatusInactive == iContextStatus || @@ -1114,7 +1114,7 @@ TInt CMmMBMSContextTsy::SetConfigL( TPacketDataConfigBase* aConfig ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::SetConfigL. Context name:%S", &iContextName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_SETCONFIGL_1, "TSY: CMmMBMSContextTsy::SetConfigL. Context name:%S", iContextName ); TInt ret( KErrArgument ); @@ -1139,7 +1139,7 @@ CMmDataPackage data; data.PackData( &( *aConfig ), &iContextName ); -TFLOGSTRING2("TSY: CMmMBMSContextTsy::SetConfigL. Context: %S", &iContextName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_SETCONFIGL_2, "TSY: CMmMBMSContextTsy::SetConfigL. Context: %S", iContextName); ret = iMmPacketService->MessageManager()->HandleRequestL( EPacketContextSetConfig, &data ); @@ -1175,7 +1175,7 @@ void CMmMBMSContextTsy::CompleteSetConfig( TInt aError ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::CompleteSetConfig. Error: %d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETESETCONFIG_1, "TSY: CMmMBMSContextTsy::CompleteSetConfig. Error: %d", aError ); if( (KErrNone == aError) && (iConfig) && (iTempConfig) ) { @@ -1220,7 +1220,7 @@ TTsyReqHandle aTsyReqHandle, TInt aError ) { -TFLOGSTRING3( "TSY: CMmMBMSContextTsy::ReqCompleted. Handle:%d Error:%d", aTsyReqHandle, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_REQCOMPLETED_1, "TSY: CMmMBMSContextTsy::ReqCompleted. Handle:%d Error:%d", aTsyReqHandle, aError ); // Set last error cause if ( KErrNone != aError ) @@ -1300,7 +1300,7 @@ const TInt aReqHandleType, const TInt aError ) { -TFLOGSTRING2( "TSY: CMmMBMSContextTsy::Complete. Req type %d", aReqHandleType ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETE_1, "TSY: CMmMBMSContextTsy::Complete. Req type %d", aReqHandleType ); // All possible TSY req handle types are listed in the @@ -1384,7 +1384,7 @@ TMbmsAction* aAction, TMbmsSessionId* aSession ) { -TFLOGSTRING3("TSY: CMmMBMSContextTsy::UpdateMbmsSessionList. Context: %S, action: %d", &iContextName, aAction); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_UPDATEMBMSSESSIONLIST_1, "TSY: CMmMBMSContextTsy::UpdateMbmsSessionList. Context: %S, action: %d", iContextName, *aAction); TInt ret( KErrNone ); if( iConfig->iMbmsSessionFlag ) @@ -1432,7 +1432,7 @@ void CMmMBMSContextTsy::CompleteUpdateMbmsSessionList( const TInt aResult ) { -TFLOGSTRING3("TSY: CMmMBMSContextTsy::CompleteUpdateMbmsSessionList. Context: %S, result: %d", &iContextName, aResult); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_COMPLETEUPDATEMBMSSESSIONLIST_1, "TSY: CMmMBMSContextTsy::CompleteUpdateMbmsSessionList. Context: %S, result: %d", iContextName, aResult); TInt ret( aResult ); @@ -1526,7 +1526,7 @@ TInt* aBufSize ) { TInt ret( KErrNone ); -TFLOGSTRING("TSY: CMmMBMSContextTsy::GetMbmsActiveServicesPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETMBMSACTIVESERVICESPHASE1L_1, "TSY: CMmMBMSContextTsy::GetMbmsActiveServicesPhase1L"); if (iServicesArray->iSessionIdList.Count() > 0) { @@ -1560,7 +1560,7 @@ RMobilePhone::TClientId* aClient, TDes8* aBuffer ) { -TFLOGSTRING("TSY: CMmMBMSContextTsy::GetMbmsActiveServicesPhase2L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMBMSCONTEXTTSY_GETMBMSACTIVESERVICESPHASE2L_1, "TSY: CMmMBMSContextTsy::GetMbmsActiveServicesPhase2L"); TInt error = KErrNone; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmsmonitoredlist.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmsmonitoredlist.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmsmonitoredlist.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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,7 +20,6 @@ #include #include "mbmstypes.h" #include "cmmmbmsmonitoredlist.h" -#include // ============================ MEMBER FUNCTIONS =============================== diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmpacketcontextgsmwcdmaextTraces.h" +#endif + #include #include "cmmpacketcontextgsmwcdmaext.h" #include "Cmmpacketcontexttsy.h" @@ -32,7 +38,7 @@ CMmPacketContextTsy* const aMmPacketContextTsy, CMmPacketServiceTsy* const aMmPacketServiceTsy ) { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::NewL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_NEWL_1, "TSY: CMmPacketContextGsmWcdmaExt::NewL." ); CMmPacketContextGsmWcdmaExt* packetContextGsmWcdmaExt = new ( ELeave ) CMmPacketContextGsmWcdmaExt(); @@ -59,7 +65,7 @@ CMmPacketContextGsmWcdmaExt::~CMmPacketContextGsmWcdmaExt() { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::~CMmPacketContextGsmWcdmaExt." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_DTOR_1, "TSY: CMmPacketContextGsmWcdmaExt::~CMmPacketContextGsmWcdmaExt." ); TInfoName contextName; if( iMmPacketContextTsy ) @@ -157,7 +163,7 @@ // TInt CMmPacketContextGsmWcdmaExt::InitialiseContextL(RPacketContext::TDataChannelV2* aDataChannel) { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_INITIALISECONTEXTL_1, "TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextL." ); TInt ret( KErrArgument ); @@ -191,7 +197,7 @@ // void CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext(const TInt aResult) // Result { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT_1, "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext." ); if ( KErrNone == aResult ) { @@ -226,7 +232,7 @@ // TInt CMmPacketContextGsmWcdmaExt::ActivateL() { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::ActivateL " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_ACTIVATEL_1, "TSY: CMmPacketContextGsmWcdmaExt::ActivateL " ); TInt ret( KErrArgument ); @@ -285,8 +291,7 @@ CMmDataPackage* aDataPackage, TInt aResult ) { -TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. Status: %d", - aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_1, "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. Status: %d",aResult ); if ( KErrNone == aResult ) { @@ -332,8 +337,7 @@ } else { -TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. ErrorCause: %d", - aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_2, "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivate. ErrorCause: %d",aResult ); // Re-activation is allowed because activation has not succeeded iIsActivateAllowed = ETrue; } @@ -357,7 +361,7 @@ void CMmPacketContextGsmWcdmaExt::CompleteActivatePhase2( CMmDataPackage* aDataPackage, const TInt aResult ) { -TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivatePhase2. Status: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATEPHASE2_1, "TSY: CMmPacketContextGsmWcdmaExt::CompleteActivatePhase2. Status: %d", aResult ); if ( KErrNone == aResult ) { @@ -429,7 +433,7 @@ // TInt CMmPacketContextGsmWcdmaExt::DeactivateL() { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::DeactivateL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_DEACTIVATEL_1, "TSY: CMmPacketContextGsmWcdmaExt::DeactivateL." ); TInt ret( KErrArgument ); //zero length @@ -459,7 +463,7 @@ void CMmPacketContextGsmWcdmaExt::CompleteDeactivate( const TInt aResult ) { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteDeactivate." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDEACTIVATE_1, "TSY: CMmPacketContextGsmWcdmaExt::CompleteDeactivate." ); if ( KErrNone == aResult ) { @@ -487,7 +491,7 @@ // TInt CMmPacketContextGsmWcdmaExt::DeleteL() { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::DeleteL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_DELETEL_1, "TSY: CMmPacketContextGsmWcdmaExt::DeleteL." ); TInt ret( KErrNotReady ); @@ -516,7 +520,7 @@ void CMmPacketContextGsmWcdmaExt::CompleteDelete( TInt const aResult ) { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteDelete." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDELETE_1, "TSY: CMmPacketContextGsmWcdmaExt::CompleteDelete." ); if( KErrNone == aResult ) { @@ -548,7 +552,7 @@ TInt CMmPacketContextGsmWcdmaExt::GetConfig( TPacketDataConfigBase* const aConfig ) { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetConfig." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIG_1, "TSY: CMmPacketContextGsmWcdmaExt::GetConfig." ); TInt ret( KErrNone ); @@ -602,7 +606,7 @@ // TInt CMmPacketContextGsmWcdmaExt::GetDataVolumeTransferredL() { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetDataVolumeTransferredL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETDATAVOLUMETRANSFERREDL_1, "TSY: CMmPacketContextGsmWcdmaExt::GetDataVolumeTransferredL." ); TInt ret( KErrNone ); TInfoName contextName = iMmPacketContextTsy->ContextName(); @@ -645,8 +649,7 @@ { errorValue = KErrGeneral; } -TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteGetDataVolumeTransferred. Error Value:%d", - errorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEGETDATAVOLUMETRANSFERRED_1, "TSY: CMmPacketContextGsmWcdmaExt::CompleteGetDataVolumeTransferred. Error Value:%d",errorValue ); iMmPacketContextTsy->CompleteGetDataVolumeTransferred( errorValue ); @@ -662,7 +665,7 @@ TInt CMmPacketContextGsmWcdmaExt::NotifyConfigChanged( TPacketDataConfigBase& aConfig ) { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::NotifyConfigChanged." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_NOTIFYCONFIGCHANGED_1, "TSY: CMmPacketContextGsmWcdmaExt::NotifyConfigChanged." ); TInt ret( KErrNone ); @@ -684,7 +687,7 @@ // void CMmPacketContextGsmWcdmaExt::CompleteNotifyConfigChanged() { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::CompleteNotifyConfigChanged." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETENOTIFYCONFIGCHANGED_1, "TSY: CMmPacketContextGsmWcdmaExt::CompleteNotifyConfigChanged." ); if ( NULL != iConfig ) { @@ -717,7 +720,7 @@ TInt CMmPacketContextGsmWcdmaExt::SetConfigL( TPacketDataConfigBase* const aConfig ) { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_1, "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL." ); TInt ret( KErrNotSupported ); @@ -744,7 +747,7 @@ // Temporary store the configGPRS *iTempConfig = configGPRS; -TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL. NWIContext: %d", configGPRS.iNWIContext ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_2, "TSY: CMmPacketContextGsmWcdmaExt::SetConfigL. NWIContext: %d", configGPRS.iNWIContext ); TInfoName contextName = iMmPacketContextTsy->ContextName(); CMmDataPackage data; @@ -827,8 +830,7 @@ void CMmPacketContextGsmWcdmaExt::CompleteSetConfig( const TInt aResult ) { -TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::CompleteSetConfig. aStatus:%d", - aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETESETCONFIG_1, "TSY: CMmPacketContextGsmWcdmaExt::CompleteSetConfig. aStatus:%d",aResult ); if ( NULL != iTempConfig ) @@ -885,7 +887,7 @@ TBool& aContextType, TInfoName& aPrimaryContextName ) { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetConfigurationData." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIGURATIONDATA_1, "TSY: CMmPacketContextGsmWcdmaExt::GetConfigurationData." ); TInt ret( KErrNotReady ); @@ -920,7 +922,7 @@ RPacketContext::TPacketFilterV2& contextFilter = ( *contextFilterPckg )(); -TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::AddPacketFilterL contextFilterId: %d", contextFilter.iId ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_ADDPACKETFILTERL_1, "TSY: CMmPacketContextGsmWcdmaExt::AddPacketFilterL contextFilterId: %d", contextFilter.iId ); // Check out Tft operation iFilterStatus = EAddPacketFilterStatusAdd; @@ -1142,7 +1144,7 @@ TInt CMmPacketContextGsmWcdmaExt::RemovePacketFilter( const TInt aID ) { -TFLOGSTRING2( "TSY: CMmPacketContextGsmWcdmaExt::RemovePacketFilter. FilterId:%d", aID ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_REMOVEPACKETFILTER_1, "TSY: CMmPacketContextGsmWcdmaExt::RemovePacketFilter. FilterId:%d", aID ); TInt ret( KErrArgument ); @@ -1217,7 +1219,7 @@ // TInt CMmPacketContextGsmWcdmaExt::ModifyActiveContextL() { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::ModifyActiveContextL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_MODIFYACTIVECONTEXTL_1, "TSY: CMmPacketContextGsmWcdmaExt::ModifyActiveContextL." ); TInt ret( KErrArgument ); @@ -1610,7 +1612,7 @@ TInt CMmPacketContextGsmWcdmaExt::GetDnsInfoEtel( TDes8* const aDnsInfo ) { -TFLOGSTRING( "TSY: CMmPacketContextGsmWcdmaExt::GetDnsInfoEtel." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_GETDNSINFOETEL_1, "TSY: CMmPacketContextGsmWcdmaExt::GetDnsInfoEtel." ); // Unpack the aDnsInfo RPacketContext::TTDnsInfoV2Pckg* dnsInfoPckg = diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaextwithdispatcher.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaextwithdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaextwithdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -22,6 +22,11 @@ // INCLUDE FILES +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmpacketcontextgsmwcdmaextwithdispatcherTraces.h" +#endif + #include "cmmpacketservicegsmwcdmaext.h" // --------------------------------------------------------------------------- @@ -34,8 +39,7 @@ void CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext(const TDesC& aChannelId, const TInt aResult ) // Result { -TFLOGSTRING3( "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext. Status: aChannelId=%S, aResult=%d", - &aChannelId, aResult); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT1_1, "TSY: CMmPacketContextGsmWcdmaExt::CompleteInitialiseContext. Status: aChannelId=%S, aResult=%d",aChannelId, aResult); if ( KErrNone == aResult ) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontexttsywithdispatcher.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontexttsywithdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontexttsywithdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -22,6 +22,11 @@ // INCLUDE FILES +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CmmpacketcontexttsywithdispatcherTraces.h" +#endif + #include "cmmpacketservicegsmwcdmaext.h" // ============================ MEMBER FUNCTIONS =============================== @@ -35,7 +40,7 @@ TInt CMmPacketContextTsy::RemovePacketFilter( TInt *aID ) { -TFLOGSTRING2( "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REMOVEPACKETFILTER1_1, "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID ); // id must be value from 1 to 8 if ( 0 < *aID && 8 >= *aID ) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketqosgsmwcdmaext.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketqosgsmwcdmaext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketqosgsmwcdmaext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmpacketqosgsmwcdmaextTraces.h" +#endif + #include "Cmmpacketservicetsy.h" #include "Cmmpacketcontexttsy.h" #include "cmmpacketqosgsmwcdmaext.h" @@ -43,7 +49,7 @@ packetQoSGsmWcdmaExt->ConstructL(); CleanupStack::Pop( packetQoSGsmWcdmaExt ); -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::NewL. "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_NEWL_1, "TSY: CMmPacketQoSGsmWcdmaExt::NewL. "); return packetQoSGsmWcdmaExt; } @@ -55,7 +61,7 @@ CMmPacketQoSGsmWcdmaExt::~CMmPacketQoSGsmWcdmaExt() { -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::~CMmPacketQoSGsmWcdmaExt." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_DTOR_1, "TSY: CMmPacketQoSGsmWcdmaExt::~CMmPacketQoSGsmWcdmaExt." ); } @@ -68,7 +74,7 @@ TInt CMmPacketQoSGsmWcdmaExt::GetProfileCapabilities( TDes8* aProfileCaps ) { -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::GetProfileCapabilities." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_GETPROFILECAPABILITIES_1, "TSY: CMmPacketQoSGsmWcdmaExt::GetProfileCapabilities." ); // Unpack the packet TPckg* profileCapsPckg = @@ -129,7 +135,7 @@ TPckg* profilePckg = ( TPckg* ) aProfile; TPacketDataConfigBase& profile = ( *profilePckg )(); -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::GetProfileParameters."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_GETPROFILEPARAMETERS_1, "TSY: CMmPacketQoSGsmWcdmaExt::GetProfileParameters."); // If extension is KConfigGPRS if ( TPacketDataConfigBase::KConfigGPRS == profile.ExtensionId() ) @@ -169,7 +175,7 @@ else if ( TPacketDataConfigBase::KConfigRel5 == profile.ExtensionId() ) { -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::GetProfileParameters. Rel 5"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_GETPROFILEPARAMETERS_2, "TSY: CMmPacketQoSGsmWcdmaExt::GetProfileParameters. Rel 5"); TPckg* gprsProfilePckg = ( TPckg* ) aProfile; RPacketQoS::TQoSR5Negotiated& gprsProfile = ( *gprsProfilePckg )(); @@ -233,7 +239,7 @@ void CMmPacketQoSGsmWcdmaExt::NotifyProfileChangedCancel() { -TFLOGSTRING( "TSY: CMmPacketQoSGsmWcdmaExt::NotifyProfileChangedCancel." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_NOTIFYPROFILECHANGEDCANCEL_1, "TSY: CMmPacketQoSGsmWcdmaExt::NotifyProfileChangedCancel." ); iQoSGPRSNotifyPckg = NULL; @@ -247,7 +253,7 @@ TInt CMmPacketQoSGsmWcdmaExt::SetProfileParametersL( TDes8* aProfile ) { -TFLOGSTRING2("TSY: CMmPacketQoSGsmWcdmaExt::SetProfileParametersL. \t aProfile:%d", aProfile ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_SETPROFILEPARAMETERSL_1, "TSY: CMmPacketQoSGsmWcdmaExt::SetProfileParametersL. \t aProfile:%d", aProfile ); //Datapackage CMmDataPackage data; @@ -303,7 +309,7 @@ } else if ( TPacketDataConfigBase::KConfigRel5 == profile.ExtensionId() ) { -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::SetProfileParameters. Rel 5"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_SETPROFILEPARAMETERSL_2, "TSY: CMmPacketQoSGsmWcdmaExt::SetProfileParameters. Rel 5"); TPckg* gprsProfilePckg = ( TPckg* ) aProfile; RPacketQoS::TQoSR5Requested& gprsProfile = ( *gprsProfilePckg )(); @@ -349,7 +355,7 @@ void CMmPacketQoSGsmWcdmaExt::CompleteSetProfileParameters( const TInt aErrorValue ) { -TFLOGSTRING2("TSY: CMmPacketQoSGsmWcdmaExt::CompleteSetProfileParameters. \t aErrorValue:%d", aErrorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETESETPROFILEPARAMETERS_1, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteSetProfileParameters. \t aErrorValue:%d", aErrorValue ); // Call CompleteSetProfileParameters from QoS Tsy iMmPacketQoSTsy->CompleteSetProfileParameters( aErrorValue ); @@ -379,7 +385,7 @@ -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R99/R4 default values"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_1, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R99/R4 default values"); //Copy negotiated values to minimun values iRequested99.iMinTrafficClass = iQoSR99_R4Negotiated.iTrafficClass; iRequested99.iMinDeliveryOrderReqd = @@ -430,7 +436,7 @@ iRequested99.iReqGuaranteedRate = iQoSR99_R4Negotiated.iGuaranteedRate; -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R97 default values"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_2, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R97 default values"); iRequested.iReqPrecedence = iQoSGPRSNegotiated.iPrecedence; iRequested.iMinPrecedence = iQoSGPRSNegotiated.iPrecedence; @@ -448,7 +454,7 @@ -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R5 default values"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_3, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged . COPY new R5 default values"); //Copy negotiated values to minimun values iRequestedR5.iMinTrafficClass = iQoSR5Negotiated.iTrafficClass; @@ -512,7 +518,7 @@ // Update the client side data through pointers gprsProfile = iQoSGPRSNegotiated; -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged. R97/98 QoS Parameters in use"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_4, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged. R97/98 QoS Parameters in use"); } // if client uses R99 QoS parameters and aQoS99Negotiated @@ -529,7 +535,7 @@ // Update the client side data through pointers gprsProfile = iQoSR99_R4Negotiated; -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged. R99/R4 QoS Parameters in use"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_5, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged. R99/R4 QoS Parameters in use"); } @@ -545,7 +551,7 @@ // Update the client side data through pointers gprsProfile = iQoSR5Negotiated; -TFLOGSTRING("TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged. R5 QoS Parameters in use"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_6, "TSY: CMmPacketQoSGsmWcdmaExt::CompleteNotifyProfileChanged. R5 QoS Parameters in use"); } if ( completeToClient ) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketservicegsmwcdmaext.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketservicegsmwcdmaext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketservicegsmwcdmaext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmpacketservicegsmwcdmaextTraces.h" +#endif + #include "cmmpacketservicegsmwcdmaext.h" #include "Cmmpacketcontexttsy.h" #include "Cmmpacketcontextlist.h" @@ -46,7 +52,7 @@ packetServiceGsmWcdmaExt->ConstructL( aFactory ); CleanupStack::Pop(); -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::NewL.\n" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_NEWL_1, "TSY: CMmPacketServiceGsmWcdmaExt::NewL.\n" ); return packetServiceGsmWcdmaExt; } @@ -77,7 +83,7 @@ CMmPacketServiceGsmWcdmaExt::~CMmPacketServiceGsmWcdmaExt() { -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::~CMmPacketServiceGsmWcdmaExt.\n" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_DTOR_1, "TSY: CMmPacketServiceGsmWcdmaExt::~CMmPacketServiceGsmWcdmaExt.\n" ); } //---------------------------------------------------------------------------- @@ -129,7 +135,7 @@ // TInt CMmPacketServiceGsmWcdmaExt::AttachL() { -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::AttachL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_ATTACHL_1, "TSY: CMmPacketServiceGsmWcdmaExt::AttachL." ); // Call and return return iMmPacketServiceTsy->MessageManager()->HandleRequestL( @@ -145,7 +151,7 @@ void CMmPacketServiceGsmWcdmaExt::CompleteAttach( TInt aErrorValue ) const { -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteAttach.\n \t ErrorValue:%d\n", aErrorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEATTACH_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteAttach.\n \t ErrorValue:%d\n", aErrorValue ); if ( KErrNone == aErrorValue ) { @@ -174,7 +180,7 @@ // TInt CMmPacketServiceGsmWcdmaExt::DetachL() { -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::DetachL.\n "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_DETACHL_1, "TSY: CMmPacketServiceGsmWcdmaExt::DetachL.\n "); return iMmPacketServiceTsy->MessageManager()-> HandleRequestL( EPacketDetach ); @@ -190,7 +196,7 @@ void CMmPacketServiceGsmWcdmaExt::CompleteDetachL( TInt aErrorValue ) const { -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteDetachL\n \t ErrorValue:%d\n", aErrorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEDETACHL_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteDetachL\n \t ErrorValue:%d\n", aErrorValue ); if ( KErrNone == aErrorValue ) { @@ -217,7 +223,7 @@ // TInt CMmPacketServiceGsmWcdmaExt::GetNtwkRegStatusL() { -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::GetNtwkRegStatusL.\n" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_GETNTWKREGSTATUSL_1, "TSY: CMmPacketServiceGsmWcdmaExt::GetNtwkRegStatusL.\n" ); return iMmPacketServiceTsy->MessageManager()->HandleRequestL( EPacketGetNtwkRegStatus ); @@ -238,7 +244,7 @@ //Unpack data aDataPackage->UnPackData( regStatusClient ); -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetNtwkRegStatus.\n \t", regStatusClient); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETNTWKREGSTATUS_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetNtwkRegStatus.\n RegStatusClient = %d \t", regStatusClient); // Call CompleteGetNtwkRegStatus() from service tsy iMmPacketServiceTsy->CompleteGetNtwkRegStatus( regStatusClient, @@ -254,7 +260,7 @@ TInt CMmPacketServiceGsmWcdmaExt::SetAttachModeL( RPacketService::TAttachMode aMode ) { -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::SetAttachModeL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_SETATTACHMODEL_1, "TSY: CMmPacketServiceGsmWcdmaExt::SetAttachModeL." ); TInt ret( KErrNone ); CMmDataPackage data; @@ -276,7 +282,7 @@ const TInt aErrorValue ) const { -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteSetAttachMode.\n \t Error Value:%d\n", aErrorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETESETATTACHMODE_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteSetAttachMode.\n \t Error Value:%d\n", aErrorValue ); iMmPacketServiceTsy->CompleteSetAttachMode( aErrorValue ); @@ -289,7 +295,7 @@ // TInt CMmPacketServiceGsmWcdmaExt::GetAttachModeL() { -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::GetAttachModeL.\n\t " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_GETATTACHMODEL_1, "TSY: CMmPacketServiceGsmWcdmaExt::GetAttachModeL.\n\t " ); TBool calledOnInitPhase = EFalse; CMmDataPackage data; @@ -313,7 +319,7 @@ aDataPackage->UnPackData( attachMode ); - TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetAttachMode.\n \t Status:%d\n\t ", attachMode ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETATTACHMODE_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetAttachMode.\n \t Status:%d\n\t ", attachMode ); iMmPacketServiceTsy->CompleteGetAttachMode( attachMode, aResult); @@ -330,7 +336,7 @@ TInt ret( KErrNone ); TDataPackage package = aPackage; -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::SetPreferredBearerL."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_SETPREFERREDBEARERL_1, "TSY: CMmPacketServiceGsmWcdmaExt::SetPreferredBearerL."); ret = iMmPacketServiceTsy->MessageManager()->HandleRequestL( EPacketSetPrefBearer, &package ); @@ -347,7 +353,7 @@ TInt aErrorValue ) const { -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteSetPreferredBearer.\n\t Error Value:%d\n", aErrorValue ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETESETPREFERREDBEARER_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteSetPreferredBearer.\n\t Error Value:%d\n", aErrorValue ); iMmPacketServiceTsy->CompleteSetPreferredBearer( aErrorValue ); @@ -366,7 +372,7 @@ // Set caps *aCaps = iDynamicCaps; -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::GetDynamicCaps.\n\t Dynamic Caps:%b\n", *aCaps ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_GETDYNAMICCAPS_1, "TSY: CMmPacketServiceGsmWcdmaExt::GetDynamicCaps.\n\t Dynamic Caps:0x%08x\n", (TUint)*aCaps ); } @@ -449,7 +455,7 @@ // Call complete notify dynamic caps change from service tsy iMmPacketServiceTsy->CompleteNotifyDynamicCapsChange( iDynamicCaps ); -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::SetDynamicCapsFlag.\n\t Dynamic Caps:%b\n", iDynamicCaps ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_SETDYNAMICCAPSFLAG_1, "TSY: CMmPacketServiceGsmWcdmaExt::SetDynamicCapsFlag.\n\t Dynamic Caps:%u\n", (TUint)iDynamicCaps ); } } @@ -543,7 +549,7 @@ // Call complete notify dynamic caps change from service tsy iMmPacketServiceTsy->CompleteNotifyDynamicCapsChange( iDynamicCaps ); -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteDynamicCapsChange.\n\t Dynamic Caps:%b\n", iDynamicCaps ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEDYNAMICCAPSCHANGE_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteDynamicCapsChange.\n\t Dynamic Caps:%x\n", (TUint)iDynamicCaps ); } } @@ -555,7 +561,7 @@ void CMmPacketServiceGsmWcdmaExt::GetStaticCaps( TUint* const aCaps )const { -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::GetStaticCaps.\n\t Static Caps:%b\n", iStaticCaps ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_GETSTATICCAPS_1, "TSY: CMmPacketServiceGsmWcdmaExt::GetStaticCaps.\n\t Static Caps:%u\n", iStaticCaps ); *aCaps = iStaticCaps; @@ -700,7 +706,7 @@ // TBool CMmPacketServiceGsmWcdmaExt::EGprsSupportInCell() { -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::EGprsSupportInCell.\n\t Last Edge Support:%b\n", iLastEdgeGprsSupport ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_EGPRSSUPPORTINCELL_1, "TSY: CMmPacketServiceGsmWcdmaExt::EGprsSupportInCell.\n\t Last Edge Support:%u\n", (TUint)iLastEdgeGprsSupport ); return iLastEdgeGprsSupport; } @@ -715,7 +721,7 @@ { iLastEdgeGprsSupport = aLastEdgeGprsSupport; -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::SetEdgeGprsSupport.\n\t Last Edge Support:%b\n", iLastEdgeGprsSupport ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_SETEDGEGPRSSUPPORT_1, "TSY: CMmPacketServiceGsmWcdmaExt::SetEdgeGprsSupport.\n\t Last Edge Support:%u\n", (TUint)iLastEdgeGprsSupport ); } //---------------------------------------------------------------------------- @@ -727,7 +733,7 @@ void CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange( CMmDataPackage* aPackage ) { -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETETRANSFERCAPSCHANGE_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange" ); // create temporary variable to hold the tranfer capabilities TDynamicTransferCapsFlags transferCaps; @@ -735,7 +741,7 @@ // unpack the data form the adaptation layer, contains the transfer caps aPackage->UnPackData( transferCaps ); -TFLOGSTRING2("TSY: CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange.\n\t Dynamic Caps:%b\n", transferCaps ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETETRANSFERCAPSCHANGE_2, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteTransferCapsChange.\n\t Dynamic Caps:%u\n", (TUint)transferCaps ); // create temporary dynamic capability variable from the member variable RPacketService::TDynamicCapsFlags dynamicCaps( iDynamicCaps ); @@ -772,7 +778,7 @@ // void CMmPacketServiceGsmWcdmaExt::CompleteGetStaticCaps( CMmDataPackage* aDataPackage, TInt aError ) { -TFLOGSTRING("TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetStaticCaps."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETSTATICCAPS_1, "TSY: CMmPacketServiceGsmWcdmaExt::CompleteGetStaticCaps."); //Unpack necessary data from datapackage if (KErrNone == aError) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmbroadcasttsyTraces.h" +#endif + #include #include #include "cmmbroadcasttsy.h" @@ -25,7 +31,6 @@ #include "MmTsy_numberOfSlots.h" #include "cmmtsyreqhandlestore.h" #include -#include #include "cmmnettsy.h" // ======== MEMBER FUNCTIONS ======== @@ -46,7 +51,7 @@ void CMmBroadcastTsy::ConstructL() { -TFLOGSTRING("TSY: CMmBroadcastTsy::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_CONSTRUCTL_1, "TSY: CMmBroadcastTsy::ConstructL"); #ifdef REQHANDLE_TIMER // create req handle store iTsyReqHandleStore = CMmTsyReqHandleStore::NewL( this, iMmPhone, @@ -82,7 +87,7 @@ CMmBroadcastTsy::~CMmBroadcastTsy() { -TFLOGSTRING("TSY: CMmBroadcastTsy::~CMmBroadcastTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_DTOR_1, "TSY: CMmBroadcastTsy::~CMmBroadcastTsy"); if ( iMmPhone ) { // deregister tsy object from message manager @@ -469,7 +474,7 @@ // TSY supports only "accept all" and "reject all" filtering. cbsCaps.iFilterCaps = RMobileBroadcastMessaging::KCapsSimpleFilter; - TFLOGSTRING3("TSY:CMmBroadcastTsy::GetCaps:Mode caps=0x%x, Filter caps=0x%x",cbsCaps.iModeCaps,cbsCaps.iFilterCaps); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_GETCAPS_1, "TSY:CMmBroadcastTsy::GetCaps:Mode caps=0x%08x, Filter caps=0x%08x",cbsCaps.iModeCaps,cbsCaps.iFilterCaps); ret = KErrNone; ReqCompleted( aTsyReqHandle, ret ); @@ -528,7 +533,7 @@ else if ( !iCbRoutingActivated ) { // DOS's CB routing is not activated - TFLOGSTRING("TSY:CMmBroadcastTsy::ReceiveMessageL:DOS's CB routing is not activated, sending activation request."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_RECEIVEMESSAGEL_1, "TSY:CMmBroadcastTsy::ReceiveMessageL:DOS's CB routing is not activated, sending activation request."); //Create package CMmDataPackage package; @@ -557,7 +562,7 @@ } else { - TFLOGSTRING("TSY:CMmBroadcastTsy::ReceiveMessageL:DOS's CB routing is activated, waiting for messages."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_RECEIVEMESSAGEL_2, "TSY:CMmBroadcastTsy::ReceiveMessageL:DOS's CB routing is activated, waiting for messages."); // routing is active, wait for messages from DOS iReqHandleType = EMultimodeBroadcastReceiveMessage; @@ -580,7 +585,7 @@ void CMmBroadcastTsy::InternalCompleteCbRoutingRequest( TInt aError ) { -TFLOGSTRING2("TSY:CMmBroadcastTsy::InternalCompleteCbRoutingRequest:error=%d.", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_INTERNALCOMPLETECBROUTINGREQUEST_1, "TSY:CMmBroadcastTsy::InternalCompleteCbRoutingRequest:error=%d.", aError); if ( KErrNone == aError ) { iCbRoutingActivated = ETrue; @@ -617,7 +622,7 @@ // void CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft() { -TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft:Delivering page %d to client.", iWcdmaCbsMsgPageIndex); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_1, "TSY:CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft:Delivering page %d to client.", iWcdmaCbsMsgPageIndex); RMobileBroadcastMessaging::TMobileBroadcastAttributesV2Pckg* attrPckg = reinterpret_cast < RMobileBroadcastMessaging::TMobileBroadcastAttributesV2Pckg* > @@ -638,7 +643,7 @@ cbAttrib.iNumberOfPages = ( *iCbsMsg )[iWcdmaCbsMsgPageIndex] ->iNumberOfPages; - TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: cbAttrib.iNumberOfPages %x .", cbAttrib.iNumberOfPages); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_2, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: cbAttrib.iNumberOfPages %d .", cbAttrib.iNumberOfPages); // Message Type cbAttrib.iMessageType = ( *iCbsMsg )[iWcdmaCbsMsgPageIndex] @@ -656,7 +661,7 @@ iReceiveCbMessagePtr->Copy( ( *iCbsMsg )[iWcdmaCbsMsgPageIndex]->iWcdmaCbsData.Ptr(), ( *iCbsMsg )[iWcdmaCbsMsgPageIndex]->iInfoLength ); - TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft: AppendFormat in use iWcdmaCurrentPage: %d.", iWcdmaCurrentPage ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_3, "TSY:CMmBroadcastTsy::CompleteReceivedWcdmaCbsMessagePageLeft: AppendFormat in use iWcdmaCurrentPage: %d.", iWcdmaCurrentPage ); _LIT8(KFormat, "%c"); // Append pagenumber to end of CBS message @@ -690,7 +695,7 @@ TInt aError, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageGsmCbs:error=%d.",aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEGSMCBS_1, "TSY:CMmBroadcastTsy::CompleteReceiveMessageGsmCbs:error=%d.",aError); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeBroadcastReceiveMessage ); @@ -735,7 +740,7 @@ TInt aError, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs:error=%d.", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_1, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs:error=%d.", aError); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeBroadcastReceiveMessage ); @@ -766,7 +771,7 @@ if ( KErrNone == trapError ) { - TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: %d pages received.",iWcdmaPageNumber); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_2, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: %d pages received.",iWcdmaPageNumber); // first page. index is 0 iWcdmaCbsMsgPageIndex = 0; @@ -794,7 +799,7 @@ cbAttrib.iNumberOfPages = ( *iCbsMsg )[iWcdmaCbsMsgPageIndex] ->iNumberOfPages; - TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: cbAttrib.iNumberOfPages %x .", cbAttrib.iNumberOfPages); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_3, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: cbAttrib.iNumberOfPages %d.", cbAttrib.iNumberOfPages); // Message Type cbAttrib.iMessageType = ( *iCbsMsg ) @@ -817,7 +822,7 @@ _LIT8(KFormat, "%c"); - TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: 1st Page - AppendFormat in use iWcdmaCurrentPage: %d.", iWcdmaCurrentPage ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_4, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs: 1st Page - AppendFormat in use iWcdmaCurrentPage: %d.", iWcdmaCurrentPage ); // insert current pagenumber end of CBS message iReceiveCbMessagePtr->AppendFormat(KFormat, iWcdmaCurrentPage); @@ -852,7 +857,7 @@ aError = KErrCorrupt; } } -TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs:Completing with error=%d.", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_5, "TSY:CMmBroadcastTsy::CompleteReceiveMessageWcdmaCbs:Completing with error=%d.", aError); ReqCompleted( reqHandle, aError ); } @@ -875,7 +880,7 @@ if ( iCbRoutingActivated ) { -TFLOGSTRING("TSY:CMmBroadcastTsy::ReceiveMessageCancelL:Routing was active, sending de-activation request."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_RECEIVEMESSAGECANCELL_1, "TSY:CMmBroadcastTsy::ReceiveMessageCancelL:Routing was active, sending de-activation request."); // Create package CMmDataPackage package; @@ -916,7 +921,7 @@ } else { -TFLOGSTRING("TSY:CMmBroadcastTsy::ReceiveMessageCancelL:Routing was not active."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_RECEIVEMESSAGECANCELL_2, "TSY:CMmBroadcastTsy::ReceiveMessageCancelL:Routing was not active."); ReqCompleted( aTsyReqHandle, KErrCancel ); } @@ -932,7 +937,7 @@ void CMmBroadcastTsy::CompleteReceiveMessageCancel( TInt aError ) { -TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteReceiveMessageCancel:error=%d.",aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETERECEIVEMESSAGECANCEL_1, "TSY:CMmBroadcastTsy::CompleteReceiveMessageCancel:error=%d.",aError); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeBroadcastReceiveMessageCancel ); @@ -965,7 +970,7 @@ RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter* aSetting ) { *aSetting = iCbFilterSetting; -TFLOGSTRING2("TSY:CMmBroadcastTsy::GetFilterSetting:Filter setting=0x%x.",iCbFilterSetting); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_GETFILTERSETTING_1, "TSY:CMmBroadcastTsy::GetFilterSetting:Filter setting=0x%08x.",iCbFilterSetting); ReqCompleted( aTsyReqHandle, KErrNone ); @@ -983,7 +988,7 @@ const TTsyReqHandle aTsyReqHandle, RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter const* aSetting ) { -TFLOGSTRING3("TSY:CMmBroadcastTsy::SetFilterSettingL:Old filter setting=0x%x, setting to 0x%x.",iCbFilterSetting,*aSetting); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_SETFILTERSETTINGL_1, "TSY:CMmBroadcastTsy::SetFilterSettingL:Old filter setting=0x%08x, setting to 0x%08x.",iCbFilterSetting,(TUint)*aSetting); if ( ( RMobileBroadcastMessaging::EBroadcastAcceptAll == *aSetting ) || ( RMobileBroadcastMessaging::EBroadcastAcceptNone == *aSetting ) ) { @@ -1051,7 +1056,7 @@ void CMmBroadcastTsy::CompleteSetFilterSetting( TInt aError ) { -TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteSetFilterSetting:error=%d.",aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETESETFILTERSETTING_1, "TSY:CMmBroadcastTsy::CompleteSetFilterSetting:error=%d.",aError); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeBroadcastSetFilterSetting ); @@ -1094,7 +1099,7 @@ TInt CMmBroadcastTsy::NotifyFilterSettingChange( RMobileBroadcastMessaging::TMobilePhoneBroadcastFilter* aSetting ) { -TFLOGSTRING("TSY:CMmBroadcastTsy::NotifyFilterSettingChange."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_NOTIFYFILTERSETTINGCHANGE_1, "TSY:CMmBroadcastTsy::NotifyFilterSettingChange."); iReqHandleType = EMultimodeBroadcastNotifyFilterSetting; iNotifyFilterSettingChangePtr = aSetting; @@ -1111,7 +1116,7 @@ TInt CMmBroadcastTsy::NotifyFilterSettingChangeCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY:CMmBroadcastTsy::NotifyFilterSettingChangeCancel."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_NOTIFYFILTERSETTINGCHANGECANCEL_1, "TSY:CMmBroadcastTsy::NotifyFilterSettingChangeCancel."); iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeBroadcastNotifyFilterSetting ); ReqCompleted( aTsyReqHandle, KErrCancel ); @@ -1128,7 +1133,7 @@ // void CMmBroadcastTsy::CompleteNotifyFilterSettingChange() { -TFLOGSTRING("TSY:CMmBroadcastTsy::CompleteNotifyFilterSettingChange."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETENOTIFYFILTERSETTINGCHANGE_1, "TSY:CMmBroadcastTsy::CompleteNotifyFilterSettingChange."); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeBroadcastNotifyFilterSetting ); @@ -1137,7 +1142,7 @@ if ( iNotifyFilterSettingChangePtr ) { *iNotifyFilterSettingChangePtr = iCbFilterSetting; -TFLOGSTRING2("TSY:CMmBroadcastTsy::CompleteNotifyFilterSettingChange.New filter setting is 0x%x.",iCbFilterSetting); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_COMPLETENOTIFYFILTERSETTINGCHANGE_2, "TSY:CMmBroadcastTsy::CompleteNotifyFilterSettingChange.New filter setting is 0x%08x.",iCbFilterSetting); } ReqCompleted( reqHandle, KErrNone ); @@ -1157,7 +1162,7 @@ TInt* ) { // not supported. -TFLOGSTRING("TSY: CMmBroadcastTsy::GetBroadcastIdListPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_GETBROADCASTIDLISTPHASE1L_1, "TSY: CMmBroadcastTsy::GetBroadcastIdListPhase1L"); return KErrNotSupported; } @@ -1174,7 +1179,7 @@ RMobilePhone::TClientId const* , TDes8* ) { - TFLOGSTRING("TSY:CMmBroadcastTsy::GetBroadcastIdListPhase2.List returned to client."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_GETBROADCASTIDLISTPHASE2_1, "TSY:CMmBroadcastTsy::GetBroadcastIdListPhase2.List returned to client."); return KErrNotSupported; } @@ -1189,7 +1194,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8 const* /*aBuffer*/ ) { -TFLOGSTRING("TSY:CMmBroadcastTsy::StoreBroadcastIdListL."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMBROADCASTTSY_STOREBROADCASTIDLISTL_1, "TSY:CMmBroadcastTsy::StoreBroadcastIdListL."); ReqCompleted( aTsyReqHandle, KErrNotSupported ); return KErrNone; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsgsmext.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsgsmext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsgsmext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,10 +16,15 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmsmsgsmextTraces.h" +#endif + #include // error values #include #include "cmmsmsgsmext.h" -#include #include #include "cmmphonetsy.h" #include @@ -77,7 +82,7 @@ if ( KSimSmsNotPresent == aSmsMsg->iMessageStatus ) { -TFLOGSTRING("TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 0, 1 or 3 message"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_1, "TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 0, 1 or 3 message"); // SMS message that is routed directly to the TSY. This message is not // acknowledge to the network. @@ -89,7 +94,7 @@ } else if ( aSmsMsg->iSmsClass2 && ( 0 != aSmsMsg->iLocation ) ) { -TFLOGSTRING("TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 2 message stored in SIM"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_2, "TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 2 message stored in SIM"); // Class 2 SMS message that is stored in SIM. This message is // acknowledged to the network by SMS server. msgAttributes.iStatus = RMobileSmsMessaging::EMtMessageUnknownStatus; @@ -100,7 +105,7 @@ } else { -TFLOGSTRING("TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 2 message not stored in SIM"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_3, "TSY: CMmSmsGsmExt::CompleteReceiveMessage. Class 2 message not stored in SIM"); // Class 2 SMS message that is not stored in SIM. This message is // acknowledged to the network by SMS server. msgAttributes.iStatus = @@ -180,7 +185,7 @@ CArrayPtrFlat* aSmsReadAllArray, TInt* aReadAllBufSizePtr ) { -TFLOGSTRING("TSY: CMmSmsGsmExt::CompleteReadAllSmsPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSGSMEXT_COMPLETEREADALLSMSPHASE1L_1, "TSY: CMmSmsGsmExt::CompleteReadAllSmsPhase1L"); // read the list, store its content and then return size of this // buffer to client CMobilePhoneGsmSmsList* list = CMobilePhoneGsmSmsList::NewL(); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmssendrequest.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmssendrequest.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmssendrequest.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -17,7 +17,6 @@ // INCLUDE FILES #include "cmmsmssendrequest.h" -#include // ======== MEMBER FUNCTIONS ======== diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmsmsstoragetsyTraces.h" +#endif + #include #include "cmmsmsstoragetsy.h" #include "cmmphonetsy.h" @@ -23,7 +29,6 @@ #include "cmmsmsextinterface.h" #include "MmTsy_numberOfSlots.h" #include -#include // ======== MEMBER FUNCTIONS ======== @@ -34,7 +39,7 @@ void CMmSmsStorageTsy::ConstructL() { -TFLOGSTRING("TSY: CMmSmsStorageTsy::ConstructL\n"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_CONSTRUCTL_1, "TSY: CMmSmsStorageTsy::ConstructL\n"); ResetVariables(); iSmsListArray = new ( ELeave ) CArrayPtrFlat( 1 ); @@ -65,7 +70,7 @@ CMmSmsStorageTsy::~CMmSmsStorageTsy() { -TFLOGSTRING("TSY: CMmSmsStorageTsy::~CMmSmsStorageTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_DTOR_1, "TSY: CMmSmsStorageTsy::~CMmSmsStorageTsy"); if ( iMmPhone ) { // deregister tsy object from message manager @@ -110,7 +115,7 @@ // void CMmSmsStorageTsy::Init() { -TFLOGSTRING("TSY: CMmSmsStorageTsy::Init."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_INIT_1, "TSY: CMmSmsStorageTsy::Init."); // Send request to the Domestic OS layer. TRAP_IGNORE( iMmPhone->MessageManager()->HandleRequestL( EMobilePhoneStoreGetInfo ); ); @@ -644,7 +649,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteReadSms. Error: %d",aResult); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEREADSMS_1, "TSY: CMmSmsStorageTsy::CompleteReadSms. Error: %d",aResult); TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( CMmSmsTsy::EMultimodeSimStSmsReadSms ); @@ -676,7 +681,7 @@ if ( sizeof( RMobilePhoneStore::TMobilePhoneStoreEntryV1 ) > aSmsPckg->Length() ) { - TFLOGSTRING ("TSY: CMmSmsStorageTsy::WriteSms bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_WRITESMSL_1, "TSY: CMmSmsStorageTsy::WriteSms bad size argument"); // Complete the request with appropiate error return KErrArgument; } @@ -731,7 +736,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteWriteSms. Error: %d",aResult); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEWRITESMS_1, "TSY: CMmSmsStorageTsy::CompleteWriteSms. Error: %d",aResult); TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( CMmSmsTsy::EMultimodeSimStSmsWriteSms ); @@ -827,7 +832,7 @@ void CMmSmsStorageTsy::CompleteDeleteSms( TInt aResult ) { -TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteDeleteSms. Error: %d", aResult); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEDELETESMS_1, "TSY: CMmSmsStorageTsy::CompleteDeleteSms. Error: %d", aResult); TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( CMmSmsTsy::EMultimodeSimStSmsEraseSms ); @@ -894,7 +899,7 @@ void CMmSmsStorageTsy::CompleteDeleteAllSms( TInt aResult ) { -TFLOGSTRING2( "TSY: CMmSmsStorageTsy::CompleteDeleteAllSms. Error: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEDELETEALLSMS_1, "TSY: CMmSmsStorageTsy::CompleteDeleteAllSms. Error: %d", aResult ); TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( CMmSmsTsy::EMultimodeSimStSmsEraseAllSms ); @@ -960,12 +965,12 @@ { // if store has space, get "StoreAdded" notifications iUsedEntries++; -TFLOGSTRING("TSY: CMmSmsStorageTsy::StoreEntryAdded notifications"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_1, "TSY: CMmSmsStorageTsy::StoreEntryAdded notifications"); if ( iUsedEntries == iTotalEntries ) { // if store gets full after class2 message, get "StoreAdded and // StoreFull" notifications -TFLOGSTRING("TSY: CMmSmsStorageTsy::StoreEntryAdded and StoreFull notifications"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_2, "TSY: CMmSmsStorageTsy::StoreEntryAdded and StoreFull notifications"); aEvent = ( RMobilePhoneStore::KStoreFull | RMobilePhoneStore::KStoreEntryAdded ); } @@ -977,12 +982,12 @@ // if entry has been deleted from store, get "EntryDeleted" // notification iUsedEntries--; -TFLOGSTRING("TSY: CMmSmsStorageTsy::StoreEntryDeleted notifications"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_3, "TSY: CMmSmsStorageTsy::StoreEntryDeleted notifications"); if ( (iUsedEntries+1) == iTotalEntries ) { // if store has been full, after deleting get notifications // "EntryDeleted" and "StoreHasSpace" -TFLOGSTRING("TSY: CMmSmsStorageTsy::StoreEntryDeleted and StoreHasSpace notifications"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_4, "TSY: CMmSmsStorageTsy::StoreEntryDeleted and StoreHasSpace notifications"); aEvent = ( RMobilePhoneStore::KStoreHasSpace | RMobilePhoneStore::KStoreEntryDeleted ); } @@ -1004,7 +1009,7 @@ *smsStoreEvent = aEvent; *iNotifySmsStoreEventIndexPtr = aLocation; -TFLOGSTRING3("TSY: CMmSmsStorageTsy::CompleteNotifyStoreEvent:notified client about event=0x%x, location=%d", aEvent, aLocation ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_5, "TSY: CMmSmsStorageTsy::CompleteNotifyStoreEvent:notified client about event=0x%08x, location=%d", (TUint)aEvent, aLocation ); ReqCompleted( reqHandle, KErrNone ); } } @@ -1023,7 +1028,7 @@ CRetrieveMobilePhoneSmsList::TBatchRequestData const* aRequest, TInt* aBufSize ) { -TFLOGSTRING("TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE1L_1, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L"); TInt ret( KErrNone ); TTsyReqHandle readAllSmsHandle = iMmTsyReqHandleStore->GetTsyReqHandle( @@ -1045,7 +1050,7 @@ } else { -TFLOGSTRING("TSY: CMmSmsStorageTsy::ReadAllSmsPhase1. SMS reading starts."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE1L_2, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase1. SMS reading starts."); // Client is asking for all SMS store entries iReadAllBufSizePtr = aBufSize; iReadAllId = aRequest->iClient; @@ -1072,7 +1077,7 @@ if ( KErrNone != ret ) { -TFLOGSTRING2("TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L - and the returned value for EMobilePhoneStoreReadAllPhase1:%d", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE1L_3, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L - and the returned value for EMobilePhoneStoreReadAllPhase1:%d", ret); (void)iMmTsyReqHandleStore->ResetTsyReqHandle( CMmSmsTsy::EMultimodeSimStSmsReadAllSms ); // the returned value from ResetTsyReqHandle is not needed. } @@ -1086,7 +1091,7 @@ // DOS layer returned with error if ( ret != KErrNone ) { -TFLOGSTRING3("TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L aTsyReqHandle: %d and ret:%d", aTsyReqHandle, ret); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE1L_4, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase1L aTsyReqHandle: %u and ret:%d", (TUint)aTsyReqHandle, ret); ReqCompleted( aTsyReqHandle, ret ); } @@ -1106,7 +1111,7 @@ RMobilePhone::TClientId const* aId, TDes8* aBuffer ) { -TFLOGSTRING("TSY: CMmSmsStorageTsy::ReadAllSmsPhase2"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSPHASE2_1, "TSY: CMmSmsStorageTsy::ReadAllSmsPhase2"); CListReadAllAttempt* read = NULL; // Find the read attempt from this client @@ -1143,7 +1148,7 @@ TInt CMmSmsStorageTsy::ReadAllSmsCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSmsStorageTsy::ReadAllSmsCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_READALLSMSCANCEL_1, "TSY: CMmSmsStorageTsy::ReadAllSmsCancel"); iMmTsyReqHandleStore->ResetTsyReqHandle( CMmSmsTsy::EMultimodeSimStSmsReadAllSms ); @@ -1165,7 +1170,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmSmsStorageTsy::RetrieveSmsListReadSmsL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_RETRIEVESMSLISTREADSMSL_1, "TSY: CMmSmsStorageTsy::RetrieveSmsListReadSmsL"); TTsyReqHandle reqHandle = iMmTsyReqHandleStore->GetTsyReqHandle( CMmSmsTsy::EMultimodeSimStSmsReadAllSms ); @@ -1226,7 +1231,7 @@ TInt aResult, TBool aReceivedClass2ToBeReSent ) { -TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteReadAllSmsPhase1. Complete read first phase error: %d", aResult); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEREADALLSMSPHASE1_1, "TSY: CMmSmsStorageTsy::CompleteReadAllSmsPhase1. Complete read first phase error: %d", aResult); TTsyReqHandle reqHandle = iMmTsyReqHandleStore->ResetTsyReqHandle( CMmSmsTsy::EMultimodeSimStSmsReadAllSms ); if ( reqHandle ) @@ -1235,7 +1240,7 @@ ReqCompleted( reqHandle, aResult ); iSmsListArray->Reset(); -TFLOGSTRING2("TSY: CMmSmsStorageTsy::CompleteReadAllSmsPhase1 aReceivedClass2ToBeReSent: %d",aReceivedClass2ToBeReSent); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSSTORAGETSY_COMPLETEREADALLSMSPHASE1_2, "TSY: CMmSmsStorageTsy::CompleteReadAllSmsPhase1 aReceivedClass2ToBeReSent: %d",aReceivedClass2ToBeReSent); if ( aReceivedClass2ToBeReSent ) { // silently IGNORE if call to DOS fails diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmsmstsyTraces.h" +#endif + #include "cmmsmstsy.h" #include "cmmphonetsy.h" #include "cmmsmsstoragetsy.h" @@ -37,12 +43,12 @@ CMmSmsTsy::CMmSmsTsy(): iReqHandleType(EMultimodeSmsReqHandleUnknown) { -TFLOGSTRING("TSY: CMmSmsTsy::CMmSmsTsy: constructor"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_CTOR_1, "TSY: CMmSmsTsy::CMmSmsTsy: constructor"); } void CMmSmsTsy::ConstructL() { -TFLOGSTRING("TSY: CMmSmsTsy::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_CONSTRUCTL_1, "TSY: CMmSmsTsy::ConstructL"); #ifdef REQHANDLE_TIMER //create req handle store iTsyReqHandleStore = CMmTsyReqHandleStore::NewL( this, iMmPhone, @@ -82,7 +88,7 @@ { iIsOffline = EFalse; } -TFLOGSTRING2("TSY: CMmSmsTsy::ConstructL: iIsOffline has been initialised to %d", iIsOffline); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_CONSTRUCTL_2, "TSY: CMmSmsTsy::ConstructL: iIsOffline has been initialised to %d", iIsOffline); // there's no pending ResumeSmsReception request at startup iResumeSmsReceptionPending = EFalse; @@ -108,7 +114,7 @@ CMmSmsTsy::~CMmSmsTsy() { -TFLOGSTRING("TSY: CMmSmsTsy::~CMmSmsTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_DTOR_1, "TSY: CMmSmsTsy::~CMmSmsTsy"); if ( iMmPhone ) { // deregister tsy object from message manager @@ -249,7 +255,7 @@ if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() && !IsRequestPossibleInOffline( aIpc ) ) { -TFLOGSTRING2 ("TSY: Offline mode ON, request is not allowed: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_EXTFUNC_1, "TSY: Offline mode ON, request is not allowed: %d", aIpc ); TInt error = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); @@ -300,7 +306,7 @@ if ( KErrNone != leaveCode ) { -TFLOGSTRING3("CMmSmsTsy: Leave trapped!, IPC=%d, error value:%d", aIpc, leaveCode ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_EXTFUNC_2, "CMmSmsTsy: Leave trapped!, IPC=%d, error value:%d", aIpc, leaveCode ); ReqCompleted( aTsyReqHandle, leaveCode ); } @@ -768,7 +774,7 @@ TDes8* aMsgData, TDes8* aMsgAttributes ) { -TFLOGSTRING("TSY: CMmSmsTsy::ReceiveMessageL\n"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_RECEIVEMESSAGEL_1, "TSY: CMmSmsTsy::ReceiveMessageL\n"); if(sizeof(RMobileSmsMessaging::TMobileSmsReceiveAttributesV1) > aMsgAttributes->Size()) { @@ -853,18 +859,18 @@ if ( ( KErrNone == aError ) && ( KSmsRoutingActivated == aSmsRoutingStatus ) ) { -TFLOGSTRING("TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing activated"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEACTIVATESMSROUTING_1, "TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing activated"); iServerRoutingActivity = ERoutingActivated; } else if ( ( KErrNone == aError ) && ( KSmsRoutingDeactivated == aSmsRoutingStatus ) ) { -TFLOGSTRING("TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing not activated"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEACTIVATESMSROUTING_2, "TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing not activated"); iServerRoutingActivity = ERoutingNotActivated; } else { -TFLOGSTRING("TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing activation failed"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEACTIVATESMSROUTING_3, "TSY: CMmSmsTsy::CompleteActivateSmsRouting SMS routing activation failed"); iServerRoutingActivity = ERoutingNotActivated; TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -894,7 +900,7 @@ TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsReceiveMessage ); -TFLOGSTRING2("TSY: CMmSmsTsy::CompleteReceiveMessage. iClientStorageFull: %d", iClientStorageFull ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_1, "TSY: CMmSmsTsy::CompleteReceiveMessage. iClientStorageFull: %d", iClientStorageFull ); // SMS successfully received if ( KErrNone == aError ) @@ -909,7 +915,7 @@ // notification if ( smsClass2 && ( 0 != smsMsg->iLocation ) && iMmSmsStorageTsy ) { -TFLOGSTRING("TSY: CMmSmsTsy::CompleteReceiveMessage. CompleteNotifyStoreEvent happens"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_2, "TSY: CMmSmsTsy::CompleteReceiveMessage. CompleteNotifyStoreEvent happens"); iMmSmsStorageTsy->CMmSmsStorageTsy::CompleteNotifyStoreEvent( smsMsg->iLocation, RMobilePhoneStore::KStoreEntryAdded ); } @@ -986,7 +992,7 @@ iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeSmsReceiveMessage ); -TFLOGSTRING("TSY: CMmSmsTsy::CompleteReceiveMessage. Deliver SMS to the SMS stack"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_3, "TSY: CMmSmsTsy::CompleteReceiveMessage. Deliver SMS to the SMS stack"); ReqCompleted( reqHandle, ret ); // increase the count of expected acknowledgements @@ -1055,7 +1061,7 @@ { ret = trapError; } -TFLOGSTRING("TSY: CMmSmsTsy::CompleteReceiveMessage.KErrGsmSMSUnspecifiedProtocolError "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_4, "TSY: CMmSmsTsy::CompleteReceiveMessage.KErrGsmSMSUnspecifiedProtocolError "); } else // SMS Memory is full { @@ -1091,7 +1097,7 @@ { ret = trapError; } -TFLOGSTRING("TSY: CMmSmsTsy::CompleteReceiveMessage.KErrGsmSMSMemoryCapacityExceeded "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETERECEIVEMESSAGE_5, "TSY: CMmSmsTsy::CompleteReceiveMessage.KErrGsmSMSMemoryCapacityExceeded "); } else if ( !reqHandle ) { @@ -1198,7 +1204,7 @@ { if ( EFalse == iSmsMsgArray->At( i )->iDeleteAfterClientAck ) { -TFLOGSTRING2("TSY: CMmSmsTsy::DeliverClass2ToSmsStack. Deliver SMS to the SMS stack. Array count: %d", iSmsMsgArray->Count()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_DELIVERCLASS2TOSMSSTACK_1, "TSY: CMmSmsTsy::DeliverClass2ToSmsStack. Deliver SMS to the SMS stack. Array count: %d", iSmsMsgArray->Count()); // TSY can now delete the message if SMS stack ack message // successfully iSmsMsgArray->At( i )->iDeleteAfterClientAck = ETrue; @@ -1235,7 +1241,7 @@ const TDesC8* aMsgData, TBool const * aMemoryFull ) { -TFLOGSTRING2("TSY: CMmSmsTsy::AckSmsStored. aMemoryFull: %d",*aMemoryFull); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_ACKSMSSTOREDL_1, "TSY: CMmSmsTsy::AckSmsStored. aMemoryFull: %d",*aMemoryFull); TTsyReqHandle getAckStoredMessageHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsAckStored ); @@ -1247,7 +1253,7 @@ else if ( iExpectAckOrNack <= 0 ) { -TFLOGSTRING("TSY: CMmSmsTsy::AckSmsStoredL. -> ReceiveMessage not requested - error returned "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_ACKSMSSTOREDL_2, "TSY: CMmSmsTsy::AckSmsStoredL. -> ReceiveMessage not requested - error returned "); ReqCompleted( aTsyReqHandle, KErrNotReady ); return KErrNone; } @@ -1265,7 +1271,7 @@ KErrNone == aMsgData->CompareF( iSmsMsgArray->At( i )->iSmsMsg ) ) { -TFLOGSTRING3("TSY: CMmSmsTsy::AckSmsStored. Delete SMS: %d, Array count: %d",i,iSmsMsgArray->Count()); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_ACKSMSSTOREDL_3, "TSY: CMmSmsTsy::AckSmsStored. Delete SMS: %d, Array count: %d",i,iSmsMsgArray->Count()); delete iSmsMsgArray->At( i ); // Delete object from memory iSmsMsgArray->Delete( i ); // Delete pointer from array iSmsMsgArray->Compress(); @@ -1360,7 +1366,7 @@ const TDesC8* aMsgData, TInt* aRpCause ) { -TFLOGSTRING2("TSY: CMmSmsTsy::NackSmsStored. aRpCause: %d",*aRpCause); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_NACKSMSSTOREDL_1, "TSY: CMmSmsTsy::NackSmsStored. aRpCause: %d",*aRpCause); TTsyReqHandle nackHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsNackStored ); @@ -1374,7 +1380,7 @@ else if ( iExpectAckOrNack <= 0 ) { -TFLOGSTRING("TSY: CMmSmsTsy::AckSmsStoredL. -> ReceiveMessage not requested - error returned "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_NACKSMSSTOREDL_2, "TSY: CMmSmsTsy::AckSmsStoredL. -> ReceiveMessage not requested - error returned "); ReqCompleted( aTsyReqHandle, KErrNotReady ); return KErrNone; } @@ -1505,7 +1511,7 @@ TInt CMmSmsTsy::ResumeSmsReceptionL( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSmsTsy::ResumeSmsReceptionL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_RESUMESMSRECEPTIONL_1, "TSY: CMmSmsTsy::ResumeSmsReceptionL"); TTsyReqHandle resumeHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsResumeReception ); @@ -1581,7 +1587,7 @@ void CMmSmsTsy::SetOffline( TBool aIsOffline ) { -TFLOGSTRING2("TSY: CMmSmsTsy::SetOffline has been called with %d", aIsOffline); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_SETOFFLINE_1, "TSY: CMmSmsTsy::SetOffline has been called with %d", aIsOffline); if ( !aIsOffline && iIsOffline ) { @@ -1626,7 +1632,7 @@ const TTsyReqHandle aTsyReqHandle, RMobileSmsMessaging::TMobileSmsBearer* aBearer ) { -TFLOGSTRING("TSY: CMmSmsTsy::SetMoSmsBearer called"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_SETMOSMSBEARER_1, "TSY: CMmSmsTsy::SetMoSmsBearer called"); TTsyReqHandle setMoSmsBearerHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsSetMoSmsBearer ); @@ -1816,7 +1822,7 @@ // save send request iSmsSendReq = smsSendReq; -TFLOGSTRING("TSY: CMmSmsTsy::SendMessageL: Send request saved"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_SENDMESSAGEL_1, "TSY: CMmSmsTsy::SendMessageL: Send request saved"); // send request to DOS // packed parameter: TSendSmsDataAndAttributes @@ -1868,7 +1874,7 @@ // --------------------------------------------------------------------------- TBool CMmSmsTsy::IsRPError(TInt aError) { - TFLOGSTRING2("CMmSmsTsy::IsRPError(): %d", aError); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_ISRPERROR_1, "CMmSmsTsy::IsRPError(): %d", aError); TBool isRPError = EFalse; switch (aError) @@ -1953,7 +1959,7 @@ // DOS returned error to send request. Message might be tried to be // resent (see method ResendSms). // Timeout mechanism cannot access this part of code, ever. -TFLOGSTRING2("TSY: CMmSmsTsy::CompleteSendMessage. Resend counter: %d", iSmsSendReq->GetSendCounter()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETESENDMESSAGE_1, "TSY: CMmSmsTsy::CompleteSendMessage. Resend counter: %d", iSmsSendReq->GetSendCounter()); } else { @@ -2090,7 +2096,7 @@ void CMmSmsTsy::CompleteSendSatMessage( TInt aError ) { -TFLOGSTRING2("TSY: CMmSmsTsy::CompleteSendSatMessage. Complete SAT SMS send Error: %d", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETESENDSATMESSAGE_1, "TSY: CMmSmsTsy::CompleteSendSatMessage. Complete SAT SMS send Error: %d", aError); iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeSmsSendSatMessage ); if ( iTsySatMessaging ) @@ -2244,7 +2250,7 @@ RMobilePhone::TClientId const* aId, TInt* aBufSize ) { -TFLOGSTRING("TSY: CMmSmsTsy::ReadSmspListPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_READSMSPLISTPHASE1L_1, "TSY: CMmSmsTsy::ReadSmspListPhase1L"); TTsyReqHandle readSmspHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeSmsReadSmspListPhase1 ); @@ -2459,7 +2465,7 @@ TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeSmsReadSmspListPhase1 ); -TFLOGSTRING2("TSY: CMmSmsTsy::CompleteReadAllSmspPhase1 Complete read first phase error: %d",aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_1, "TSY: CMmSmsTsy::CompleteReadAllSmspPhase1 Complete read first phase error: %d",aError); if ( KErrNone == aError ) { aDataPackage->UnPackData( &smsParams ); @@ -2479,13 +2485,13 @@ if ( KErrNone == trapError ) { *iRetSMSPSize = iSMSPList->Size(); -TFLOGSTRING("TSY: CMmSmsTsy::CompleteReadAllSmspPhase1: Phase 1 OK."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_2, "TSY: CMmSmsTsy::CompleteReadAllSmspPhase1: Phase 1 OK."); // Complete first phase of read all SMSP sets ReqCompleted( reqHandle, KErrNone ); } else { -TFLOGSTRING2("TSY: CMmSmsTsy::CompleteReadAllSmspPhase1: Could not create SMSP list, trapError=%d",trapError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_3, "TSY: CMmSmsTsy::CompleteReadAllSmspPhase1: Could not create SMSP list, trapError=%d",trapError); // Complete with error ReqCompleted( reqHandle, trapError ); } @@ -3084,7 +3090,7 @@ sendData.iIpc ) { iSmsNoFdnCheckFlag = ESmsNoFdnCheckUsed; -TFLOGSTRING2("TSY: CMmSmsTsy::ResendSms. EMobileSmsMessagingSendMessageNoFdnCheck: %d", sendData.iIpc); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_RESENDSMS_1, "TSY: CMmSmsTsy::ResendSms. EMobileSmsMessagingSendMessageNoFdnCheck: %d", sendData.iIpc); CompleteSendMessageNoFdnCheck( KErrGeneral, NULL ); } } @@ -3141,7 +3147,7 @@ TInt CMmSmsTsy::SendMessageNoFdnCheckCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSmsTsy::SendMessageNoFdnCheckCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_SENDMESSAGENOFDNCHECKCANCEL_1, "TSY: CMmSmsTsy::SendMessageNoFdnCheckCancel" ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeSmsSendMessageNoFdnCheck ); @@ -3182,7 +3188,7 @@ // DOS returned error to send request. Message might be tried to be // resent (see method ResendSms). // Timeout mechanism cannot access this part of code, ever. -TFLOGSTRING2("TSY: CMmSmsTsy::CompleteSendMessageNoFdnCheck. Resend counter: %d", iSmsSendReq->GetSendCounter()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSMSTSY_COMPLETESENDMESSAGENOFDNCHECK_1, "TSY: CMmSmsTsy::CompleteSendMessageNoFdnCheck. Resend counter: %d", iSmsSendReq->GetSendCounter()); } else { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmussdtsyTraces.h" +#endif + #include #include #include "cmmussdtsy.h" @@ -37,7 +43,7 @@ void CMmUssdTsy::ConstructL( CMmPhoneTsy* aMmPhoneTsy ) { -TFLOGSTRING("TSY: CMmUssdTsy::ConstructL\n" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_CONSTRUCTL_1, "TSY: CMmUssdTsy::ConstructL\n" ); iMmPhone = aMmPhoneTsy; // register . @@ -76,7 +82,7 @@ CMmUssdTsy::~CMmUssdTsy() { -TFLOGSTRING("TSY: CMmUssdTsy::~CMmUssdTsy" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_DTOR_1, "TSY: CMmUssdTsy::~CMmUssdTsy" ); // unregister. if ( iMmPhone ) { @@ -126,7 +132,7 @@ if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() && ( !IsRequestPossibleInOffline( aIpc ) ) ) { -TFLOGSTRING2 ("TSY: Offline mode ON, request is not allowed: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_EXTFUNC_1, "TSY: Offline mode ON, request is not allowed: %d", aIpc ); ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); @@ -345,7 +351,7 @@ TInt CMmUssdTsy::RegisterNotification( const TInt aIpc ) // Notification IPC number { - TFLOGSTRING2( "TSY: CMmUssdTsy::RegisterNotification. IPC: %d", aIpc ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_REGISTERNOTIFICATION_1, "TSY: CMmUssdTsy::RegisterNotification. IPC: %d", aIpc ); TInt ret( KErrNone ); @@ -376,7 +382,7 @@ TInt CMmUssdTsy::DeregisterNotification( const TInt aIpc ) // Notification IPC number { - TFLOGSTRING2( "TSY: CMmUssdTsy::DeregisterNotification. IPC: %d", aIpc ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_DEREGISTERNOTIFICATION_1, "TSY: CMmUssdTsy::DeregisterNotification. IPC: %d", aIpc ); TInt ret( KErrNone ); @@ -516,7 +522,7 @@ TInt aError, CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmUssdTsy::CompleteReceiveMessage.\n" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETERECEIVEMESSAGE_1, "TSY: CMmUssdTsy::CompleteReceiveMessage.\n" ); TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeUssdReceiveMessage ); @@ -557,8 +563,8 @@ TDes8* aData, TDes8* aAttributes ) { -TFLOGSTRING2("TSY: CMmUssdTsy::SendMessage - Data length: %d", aData->Length() ); -TFLOGSTRING2("TSY: CMmUssdTsy::SendMessageL: iUssdNoFdnCheckFlag: %d", iUssdNoFdnCheckFlag); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDMESSAGEL_1, "TSY: CMmUssdTsy::SendMessage - Data length: %d", aData->Length() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDMESSAGEL_2, "TSY: CMmUssdTsy::SendMessageL: iUssdNoFdnCheckFlag: %d", iUssdNoFdnCheckFlag); TInt ret = KErrNone; if ( iSsTransactionOngoing ) @@ -663,7 +669,7 @@ void CMmUssdTsy::CompleteSendMessage( TInt aError ) { -TFLOGSTRING("TSY: CMmUssdTsy::CompleteSendMessage.\n" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETESENDMESSAGE_1, "TSY: CMmUssdTsy::CompleteSendMessage.\n" ); TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeUssdSendMessage ); @@ -697,12 +703,12 @@ // The request is already in processing because of previous request // Complete request with status value informing the client about // the situation. -TFLOGSTRING("LTSY: CMmUssdTsy::SendRelease - KErrServerBusy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDRELEASEL_1, "LTSY: CMmUssdTsy::SendRelease - KErrServerBusy"); ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else { -TFLOGSTRING("TSY: CMmUssdTsy::SendRelease called"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDRELEASEL_2, "TSY: CMmUssdTsy::SendRelease called"); TInt ret = KErrGeneral; @@ -758,7 +764,7 @@ TInt aErrorCode, CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmUssdTsy::CompleteSendRelease" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETESENDRELEASE_1, "TSY: CMmUssdTsy::CompleteSendRelease" ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeUssdSendRelease ); @@ -805,18 +811,18 @@ TDes8* aMsgData, TDes8* aMsgAttributes) // aMsgAttributes may be NULL { -TFLOGSTRING("TSY: CMmUssdTsy::NotifyNetworkRelease" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_NOTIFYNETWORKRELEASE_1, "TSY: CMmUssdTsy::NotifyNetworkRelease" ); if (aMsgData->MaxLength() < sizeof(RMobilePhone::TMobilePhoneSendSSRequestV3Pckg)) { - TFLOGSTRING ("TSY: CMmNetTsy::NotifyNetworkRelease Bad size argument (arg1)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_NOTIFYNETWORKRELEASE_2, "TSY: CMmNetTsy::NotifyNetworkRelease Bad size argument (arg1)"); // Complete the request with appropiate error return KErrArgument; } if (aMsgAttributes && aMsgAttributes->MaxLength() < sizeof(RMobileUssdMessaging::TMobileUssdAttributesV1Pckg)) { - TFLOGSTRING ("TSY: CMmNetTsy::NotifyNetworkRelease Bad size argument (arg2)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_NOTIFYNETWORKRELEASE_3, "TSY: CMmNetTsy::NotifyNetworkRelease Bad size argument (arg2)"); // Complete the request with appropiate error return KErrArgument; } @@ -866,7 +872,7 @@ CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmUssdTsy::CompleteNotifyNetworkRelease. Error: %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETENOTIFYNETWORKRELEASE_1, "TSY: CMmUssdTsy::CompleteNotifyNetworkRelease. Error: %d", aErrorCode ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeUssdNotifyNetworkRelease ); @@ -1060,7 +1066,7 @@ const TTsyReqHandle aTsyReqHandle, const TInt aError ) { -TFLOGSTRING3("TSY: CMmUssdTsy::ReqCompleted. Handle: %d Error: %d", aTsyReqHandle, aError); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_REQCOMPLETED_1, "TSY: CMmUssdTsy::ReqCompleted. Handle: %d Error: %d", aTsyReqHandle, aError); CTelObject::ReqCompleted( aTsyReqHandle, aError ); } #endif // TF_LOGGING_ENABLED @@ -1111,7 +1117,7 @@ TInt CMmUssdTsy::SendMessageNoFdnCheckCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmUssdTsy::SendMessageNoFdnCheckCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_SENDMESSAGENOFDNCHECKCANCEL_1, "TSY: CMmUssdTsy::SendMessageNoFdnCheckCancel" ); // reset the req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -1137,7 +1143,7 @@ void CMmUssdTsy::CompleteSendMessageNoFdnCheck( TInt aError ) { -TFLOGSTRING("TSY: CMmUssdTsy::CompleteSendMessageNoFdnCheck.\n" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMUSSDTSY_COMPLETESENDMESSAGENOFDNCHECK_1, "TSY: CMmUssdTsy::CompleteSendMessageNoFdnCheck.\n" ); // get reg handle TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeUssdSendMessageNoFdnCheck ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmenstoretsyTraces.h" +#endif + #include "cmmenstoretsy.h" #include "cmmtsyreqhandlestore.h" #include "CMmPrivateUtility.h" @@ -83,7 +89,7 @@ CMmENStoreTsy::~CMmENStoreTsy() { -TFLOGSTRING("TSY: CMmENStoreTsy::~CMmENStoreTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMENSTORETSY_DTOR_1, "TSY: CMmENStoreTsy::~CMmENStoreTsy"); if (iMmPhone ) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmonstoretsyTraces.h" +#endif + #include "cmmonstoretsy.h" #include "cmmtsyreqhandlestore.h" #include "CMmPrivateUtility.h" @@ -35,7 +41,7 @@ void CMmONStoreTsy::ConstructL() { -TFLOGSTRING("TSY: CMmONStoreTsy::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_CONSTRUCTL_1, "TSY: CMmONStoreTsy::ConstructL"); #ifdef REQHANDLE_TIMER // Create req handle store @@ -98,7 +104,7 @@ CMmONStoreTsy::~CMmONStoreTsy() { -TFLOGSTRING("TSY: CMmONStoreTsy::~CMmONStoreTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DTOR_1, "TSY: CMmONStoreTsy::~CMmONStoreTsy"); if (iMmPhone ) { @@ -178,7 +184,7 @@ CTelObject::TReqMode CMmONStoreTsy::ReqModeL( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmONStoreTsy::ReqModeL IPC %d", aIpc); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_REQMODEL_1, "TSY: CMmONStoreTsy::ReqModeL IPC %d", aIpc); CTelObject::TReqMode ret=0; switch ( aIpc ) { @@ -290,7 +296,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmONStoreTsy::ExtFunc - IPC:%d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_EXTFUNC_1, "TSY: CMmONStoreTsy::ExtFunc - IPC:%d Handle:%d", aIpc, aTsyReqHandle); TInt ret = KErrNone; TInt trapError = KErrNone; @@ -333,7 +339,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmONStoreTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DOEXTFUNCL_1, "TSY: CMmONStoreTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle); TAny* dataPtr=aPackage.Ptr1(); TAny* dataPtr2=aPackage.Ptr2(); @@ -458,7 +464,7 @@ // TInt CMmONStoreTsy::ReadL( TDes8* aEntry ) { -TFLOGSTRING("TSY: CMmONStoreTsy::ReadL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READL_1, "TSY: CMmONStoreTsy::ReadL"); // Initialize ret value TInt ret( KErrArgument ); @@ -501,7 +507,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteRead"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREAD_1, "TSY: CMmONStoreTsy::CompleteRead"); // Response information TONStoreMsg* ONStoreResp = NULL; // unpack data if exists @@ -512,7 +518,7 @@ } else if ( KErrNone == aResult ) { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteRead result is KErrNone and aDataPackage is NULL!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREAD_2, "TSY: CMmONStoreTsy::CompleteRead result is KErrNone and aDataPackage is NULL!"); aResult = KErrArgument; } @@ -578,7 +584,7 @@ TInt CMmONStoreTsy::ReadCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmONStoreTsy::ReadCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READCANCEL_1, "TSY: CMmONStoreTsy::ReadCancel"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreRead ); @@ -603,7 +609,7 @@ const TTsyReqHandle aTsyReqHandle, TDesC8* aEntry ) { -TFLOGSTRING("TSY: CMmONStoreTsy::WriteL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_WRITEL_1, "TSY: CMmONStoreTsy::WriteL"); // Unpack entry param to get the location RMobileONStore::TMobileONEntryV1Pckg* entryPckg = @@ -661,7 +667,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteWrite"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEWRITE_1, "TSY: CMmONStoreTsy::CompleteWrite"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreWrite ); @@ -713,7 +719,7 @@ TInt CMmONStoreTsy::WriteCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmONStoreTsy::WriteCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_WRITECANCEL_1, "TSY: CMmONStoreTsy::WriteCancel"); // Check if cancelling is possible. If not, return KErrNone if ( iIsWriteCancellingPossible ) { @@ -742,7 +748,7 @@ const TTsyReqHandle aTsyReqHandle, TInt* aIndex ) { -TFLOGSTRING("TSY: CMmONStoreTsy::DeleteL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEL_1, "TSY: CMmONStoreTsy::DeleteL"); // Initialize ret value TInt ret( KErrGeneral ); @@ -781,7 +787,7 @@ void CMmONStoreTsy::CompleteDelete( TInt aResult ) { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDelete"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETE_1, "TSY: CMmONStoreTsy::CompleteDelete"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreDelete ); @@ -811,7 +817,7 @@ TInt CMmONStoreTsy::DeleteAllL ( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmONStoreTsy::DeleteAllL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEALLL_1, "TSY: CMmONStoreTsy::DeleteAllL"); // Init variable for DeleteAllPhase1 iDeleteAllContinue = ETrue; @@ -843,7 +849,7 @@ void CMmONStoreTsy::CompleteDeleteAllPhase1L( TInt aResult ) { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAllPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALLPHASE1L_1, "TSY: CMmONStoreTsy::CompleteDeleteAllPhase1L"); // Check that DeleteAll was called if ( iDeleteAllContinue ) { @@ -889,7 +895,7 @@ // Check that deleted request handle was valid if ( EMultimodeONStoreReqHandleUnknown != reqHandle ) { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAll"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALL_1, "TSY: CMmONStoreTsy::CompleteDeleteAll"); // Complete with error ReqCompleted( reqHandle, aResult ); @@ -907,7 +913,7 @@ else if(EMultimodeONStoreReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(EMultimodeONStoreStoreAll )) { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAll requested by StoreAllL."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALL_2, "TSY: CMmONStoreTsy::CompleteDeleteAll requested by StoreAllL."); TInt ret (aResult); if(KErrNone == ret) @@ -928,7 +934,7 @@ } else { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteDeleteAll - the request has been cancelled or bad req handle"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEDELETEALL_3, "TSY: CMmONStoreTsy::CompleteDeleteAll - the request has been cancelled or bad req handle"); } } @@ -941,7 +947,7 @@ TInt CMmONStoreTsy::DeleteAllCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmONStoreTsy::DeleteAllCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEALLCANCEL_1, "TSY: CMmONStoreTsy::DeleteAllCancel"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreDeleteAll ); @@ -967,7 +973,7 @@ const TTsyReqHandle aTsyReqHandle, RMobileONStore::TMobileONStoreInfoV1* aInfo ) { -TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_1, "TSY: CMmONStoreTsy::GetInfoL"); TInt ret( KErrNone ); @@ -988,12 +994,12 @@ // Don't send request if pb init is still ongoing // instead create an ADN book store and wait for it to initilize -TFLOGSTRING2( "TSY: CMmONStoreTsy::GetInfoL iPBList->GetNumberOfObjects() = %d", iMmPhone->PBList()->GetNumberOfObjects()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_2, "TSY: CMmONStoreTsy::GetInfoL iPBList->GetNumberOfObjects() = %d", iMmPhone->PBList()->GetNumberOfObjects()); CMmPhoneBookStoreTsy* pbStore = NULL; for( TInt i = 0; (i < iMmPhone->PBList()->GetNumberOfObjects()) && (NULL == pbStore) ; i++ ) { pbStore = iMmPhone->PBList()->GetMmPBByIndex( i ); -TFLOGSTRING2( "TSY: CMmONStoreTsy::GetInfoL index = %d", i); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_3, "TSY: CMmONStoreTsy::GetInfoL index = %d", i); if( (pbStore->GetPhonebookType() != KADNPhoneBook) && (pbStore->GetPhonebookType() != KFDNPhoneBook ) ) { pbStore = NULL; @@ -1001,12 +1007,12 @@ else { -TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - found ADN or FDN store"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_4, "TSY: CMmONStoreTsy::GetInfoL - found ADN or FDN store"); } } if(NULL == pbStore) { -TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - no ADN nor FDN store- creating ADN"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_5, "TSY: CMmONStoreTsy::GetInfoL - no ADN nor FDN store- creating ADN"); pbStore = CMmPhoneBookStoreTsy::NewL( iMmPhone, KETelIccAdnPhoneBook ); TInt addPBSucceeded = iMmPhone->PBList()->AddObject( pbStore ); if(addPBSucceeded != KErrNone) @@ -1022,13 +1028,13 @@ if ( !pbStore->IsPBInitDone()) { -TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - waiting for phone book to be initilized"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_6, "TSY: CMmONStoreTsy::GetInfoL - waiting for phone book to be initilized"); // Save tsy req handle type iReqHandleType = EMultimodeONStoreGetInfo; return KErrNone; } -TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoL - PBInit done, complete"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOL_7, "TSY: CMmONStoreTsy::GetInfoL - PBInit done, complete"); // Request to GSM extension, get used entries, // -1 as a index param-> specified location param not needed @@ -1057,7 +1063,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmONStoreTsy::CompleteGetInfo - Result: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_1, "TSY: CMmONStoreTsy::CompleteGetInfo - Result: %d", aResult ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -1082,9 +1088,9 @@ *iONStoreInfoChanged = iONStoreInfo; -TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Name: %S, Type: %d", &iONStoreInfoChanged->iName, iONStoreInfoChanged->iType ); -TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Total entries: %d, Used entries: %d", iONStoreInfoChanged->iTotalEntries, iONStoreInfoChanged->iUsedEntries ); -TFLOGSTRING3("TSY: CMmONStoreTsy::CompleteGetInfo - Max Number length: %d, Max Name length: %d", iONStoreInfoChanged->iNumberLen, iONStoreInfoChanged->iTextLen ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_2, "TSY: CMmONStoreTsy::CompleteGetInfo - Name: %S, Type: %d", iONStoreInfoChanged->iName, iONStoreInfoChanged->iType ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_3, "TSY: CMmONStoreTsy::CompleteGetInfo - Total entries: %d, Used entries: %d", iONStoreInfoChanged->iTotalEntries, iONStoreInfoChanged->iUsedEntries ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEGETINFO_4, "TSY: CMmONStoreTsy::CompleteGetInfo - Max Number length: %d, Max Name length: %d", iONStoreInfoChanged->iNumberLen, iONStoreInfoChanged->iTextLen ); } // NULL the pointer to info supplied to TSY from the client @@ -1103,7 +1109,7 @@ // void CMmONStoreTsy::SetInfo() { -TFLOGSTRING("TSY: CMmONStoreTsy::SetInfo"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_SETINFO_1, "TSY: CMmONStoreTsy::SetInfo"); // The name of the store iONStoreInfo.iName = KETelOwnNumberStore; @@ -1135,7 +1141,7 @@ TInt CMmONStoreTsy::GetInfoCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmONStoreTsy::GetInfoCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_GETINFOCANCEL_1, "TSY: CMmONStoreTsy::GetInfoCancel"); iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreGetInfo ); @@ -1155,7 +1161,7 @@ RMobilePhoneStore::TMobileStoreEvent* aEvent, TInt* aIndex ) { -TFLOGSTRING("TSY: CMmONStoreTsy::NotifyStoreEvent"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_NOTIFYSTOREEVENT_1, "TSY: CMmONStoreTsy::NotifyStoreEvent"); TTsyReqHandle requestHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeONStoreNotifyStoreEvent ); @@ -1182,7 +1188,7 @@ void CMmONStoreTsy::CompleteNotifyStoreEvent( TInt aLocation ) { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteNotifyStoreEvent"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETENOTIFYSTOREEVENT_1, "TSY: CMmONStoreTsy::CompleteNotifyStoreEvent"); // Reset request handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreNotifyStoreEvent ); @@ -1211,7 +1217,7 @@ TInt CMmONStoreTsy::NotifyStoreEventCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmONStoreTsy::NotifyStoreEventCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_NOTIFYSTOREEVENTCANCEL_1, "TSY: CMmONStoreTsy::NotifyStoreEventCancel"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreNotifyStoreEvent ); @@ -1238,7 +1244,7 @@ const RMobilePhone::TClientId* aId, TInt* aBufSize ) { -TFLOGSTRING("TSY: CMmONStoreTsy::ReadAllPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READALLPHASE1L_1, "TSY: CMmONStoreTsy::ReadAllPhase1L"); // Init return value TInt ret( KErrNone ); @@ -1281,12 +1287,12 @@ TInt aError, CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_1, "TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL"); if ( KErrNone == aError ) { TInt size; aDataPackage->UnPackData( size ); -TFLOGSTRING2("TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size=%d",size); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_2, "TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size=%d",size); if( 0 < size ) { *iReadAllBufSizePtr = size; @@ -1295,7 +1301,7 @@ } else { -TFLOGSTRING2("TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size is %d", size); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_3, "TSY: CMmONStoreTsy::InternalRetrieveONListReadSizeL size is %d", size); CompleteReadAllPhase1Req( KErrNotFound ); } } @@ -1315,7 +1321,7 @@ // void CMmONStoreTsy::MakeInternalRetrieveONListReadReqL() { -TFLOGSTRING("TSY: CMmONStoreTsy::MakeInternalRetrieveONListReadReqL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_MAKEINTERNALRETRIEVEONLISTREADREQL_1, "TSY: CMmONStoreTsy::MakeInternalRetrieveONListReadReqL"); // Read one entry from the PhoneBook. TInt ret = iMmONStoreExtInterface-> ReadL( EMmTsyONStoreReadEntryIPC,iReadAllONStoreIndex ); @@ -1342,7 +1348,7 @@ TInt aError, CMmDataPackage* aDataPackage) { -TFLOGSTRING("TSY: CMmONStoreTsy::InternalRetrieveONListReadEntryL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALRETRIEVEONLISTREADENTRYL_1, "TSY: CMmONStoreTsy::InternalRetrieveONListReadEntryL"); if ( KErrNone == aError ) { // Check if there is data to save @@ -1388,7 +1394,7 @@ // TInt CMmONStoreTsy::CompleteReadAllPhase1L() { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteReadAllPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREADALLPHASE1L_1, "TSY: CMmONStoreTsy::CompleteReadAllPhase1L"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeONStoreReadAll ); @@ -1467,7 +1473,7 @@ void CMmONStoreTsy::CompleteReadAllPhase1Req( TInt aResult ) { -TFLOGSTRING("TSY: CMmONStoreTsy::CompleteReadAllPhase1Req"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETEREADALLPHASE1REQ_1, "TSY: CMmONStoreTsy::CompleteReadAllPhase1Req"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreReadAll ); @@ -1496,7 +1502,7 @@ // void CMmONStoreTsy::DeleteONStoreListArrayElements() { -TFLOGSTRING("TSY: CMmONStoreTsy::DeleteONStoreListArrayElements"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_DELETEONSTORELISTARRAYELEMENTS_1, "TSY: CMmONStoreTsy::DeleteONStoreListArrayElements"); while( 0 == !iONStoreListArray->Count() ) { // Delete list member @@ -1519,7 +1525,7 @@ const RMobilePhone::TClientId* aId, TDes8* aBuffer ) { -TFLOGSTRING("TSY: CMmONStoreTsy::ReadAllPhase2"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READALLPHASE2_1, "TSY: CMmONStoreTsy::ReadAllPhase2"); // Initialize ret value TInt ret( KErrCorrupt ); @@ -1576,7 +1582,7 @@ TInt CMmONStoreTsy::ReadAllCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmONStoreTsy::ReadAllCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_READALLCANCEL_1, "TSY: CMmONStoreTsy::ReadAllCancel"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreReadAll ); @@ -1604,7 +1610,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aBuffer ) { -TFLOGSTRING("TSY: CMmONStoreTsy::StoreAllL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_STOREALLL_1, "TSY: CMmONStoreTsy::StoreAllL"); // Init return value TInt ret( KErrNone ); @@ -1624,7 +1630,7 @@ // StoreAll overwrites ON phone store. So, first delete all store. ret = iMmONStoreExtInterface->DeleteAllL( EMmTsyONStoreDeleteAllIPC ); -TFLOGSTRING2("CMmONStoreTsy::StoreAllL - DeleteAllL() ret: %d", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_STOREALLL_2, "CMmONStoreTsy::StoreAllL - DeleteAllL() ret: %d", ret); // Message construction failed or phonet sender returned error if ( KErrNone != ret ) @@ -1653,13 +1659,13 @@ TInt aError, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("CMmONStoreTsy::InternalStoreAllGetSizeL %d",aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_1, "CMmONStoreTsy::InternalStoreAllGetSizeL %d",aError); if ( KErrNone == aError ) { TInt size; aDataPackage->UnPackData( size ); -TFLOGSTRING2("CMmONStoreTsy::InternalStoreAllGetSizeL size %d", size); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_2, "CMmONStoreTsy::InternalStoreAllGetSizeL size %d", size); // Check the size of ONStore and the ONList size from Client // Client's ONList size should not be greater than ONStore size if ( size > 0 && size >= iStoreAllONListSize ) @@ -1701,7 +1707,7 @@ // void CMmONStoreTsy::MakeInternalStoreAllWriteReqL() { -TFLOGSTRING("CMmONStoreTsy::MakeInternalStoreAllWriteReqL "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_MAKEINTERNALSTOREALLWRITEREQL_1, "CMmONStoreTsy::MakeInternalStoreAllWriteReqL "); // Create ONList and push it to cleanup stack CMobilePhoneONList* aONList=CMobilePhoneONList::NewL(); CleanupStack::PushL(aONList); @@ -1777,7 +1783,7 @@ void CMmONStoreTsy::InternalStoreAllWriteEntryL( TInt aResult ) { -TFLOGSTRING2("CMmONStoreTsy::InternalStoreAllWriteEntryL %d",aResult); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_1, "CMmONStoreTsy::InternalStoreAllWriteEntryL %d",aResult); TTsyReqHandle storeAllRequestHandle = iTsyReqHandleStore->GetTsyReqHandle( @@ -1786,7 +1792,7 @@ if ( EMultimodeONStoreReqHandleUnknown == storeAllRequestHandle ) { // The request has been cancelled or bad req handle -TFLOGSTRING("The ON store request has been cancelled or bad req handle"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_2, "The ON store request has been cancelled or bad req handle"); return; } @@ -1810,7 +1816,7 @@ void CMmONStoreTsy::CompleteStoreAll( TInt aResult ) { -TFLOGSTRING2("CMmONStoreTsy::CompleteStoreAll %d",aResult); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETESTOREALL_1, "CMmONStoreTsy::CompleteStoreAll %d",aResult); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreStoreAll ); @@ -1848,7 +1854,7 @@ TInt CMmONStoreTsy::StoreAllCancel( TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("CMmONStoreTsy::StoreAllCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_STOREALLCANCEL_1, "CMmONStoreTsy::StoreAllCancel"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreStoreAll ); @@ -1905,7 +1911,7 @@ const TTsyReqHandle aTsyReqHandle, const TInt aError ) { -TFLOGSTRING3("TSY: CMmONStoreTsy::ReqCompleted Completed - Handle:%d Error:%d", aTsyReqHandle, aError); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_REQCOMPLETED_1, "TSY: CMmONStoreTsy::ReqCompleted Completed - Handle:%d Error:%d", aTsyReqHandle, aError); CTelObject::ReqCompleted( aTsyReqHandle, aError ); } @@ -1992,7 +1998,7 @@ TInt aReqHandleType, TInt aError ) { -TFLOGSTRING3( "TSY: CMmONStoreTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_COMPLETE_1, "TSY: CMmONStoreTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError ); //All possible TSY req handle types are listed in the //switch case below. switch( aReqHandleType ) @@ -2039,7 +2045,7 @@ // void CMmONStoreTsy::PhoneBookStoreInitCompleteL(TInt aError) { - TFLOGSTRING("TSY: CMmONStoreTsy::PhoneBookStoreInitCompleteL "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMONSTORETSY_PHONEBOOKSTOREINITCOMPLETEL_1, "TSY: CMmONStoreTsy::PhoneBookStoreInitCompleteL "); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeONStoreGetInfo ); if( EMultimodeONStoreReqHandleUnknown != reqHandle ) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,11 +16,16 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmphonebookstoretsyTraces.h" +#endif + #include "cmmphonebookstoretsy.h" #include "cmmpblist.h" #include "cmmphonebookstoregsmext.h" #include "CMmCustomTsy.h" -#include #include #include "cmmmessagemanagerbase.h" #include "cmmtsyreqhandlestore.h" @@ -39,7 +44,7 @@ void CMmPhoneBookStoreTsy::ConstructL( const TDesC& aName ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ConstructL - entered"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_1, "TSY: CMmPhoneBookStoreTsy::ConstructL - entered"); #ifdef REQHANDLE_TIMER // Create req handle store iTsyReqHandleStore = CMmTsyReqHandleStore::NewL( this, @@ -74,7 +79,7 @@ // Set phonebookrelated name and number max values SetMaxNameAndNumLenght(); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ConstructL - PB %S", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_2, "TSY: CMmPhoneBookStoreTsy::ConstructL - PB %S", iPhoneBookName); // Used entries is zero in the start iUsedEntries = 0; @@ -90,9 +95,9 @@ iRequestedOnPBRead = EFalse; iIsPBInitCompleted = EFalse; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ConstructL - iIsPhonebookInitialized: %i", iStoreInfoData->iIsPhonebookInitialized); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ConstructL - iSIMReady: %i", bootState->iSIMReady); -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ConstructL - before initialization"); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_3, "TSY: CMmPhoneBookStoreTsy::ConstructL - iIsPhonebookInitialized: %u", (TUint)iStoreInfoData->iIsPhonebookInitialized); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_4, "TSY: CMmPhoneBookStoreTsy::ConstructL - iSIMReady: %u", (TUint)bootState->iSIMReady); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_5, "TSY: CMmPhoneBookStoreTsy::ConstructL - before initialization"); if(bootState->iSIMReady) { SimIsReady(); @@ -107,7 +112,7 @@ CMmPhoneTsy* aMmPhone, const TDesC& aName ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::NewL - entered"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_NEWL_1, "TSY: CMmPhoneBookStoreTsy::NewL - entered"); CMmPhoneBookStoreTsy* mmPhoneBookStoreTsy = new ( ELeave ) CMmPhoneBookStoreTsy(); @@ -126,7 +131,7 @@ CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy() { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - PB %S", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_1, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - PB %S", iPhoneBookName); if ( iMmPhoneTsy ) { @@ -136,11 +141,11 @@ { RMmCustomAPI::TPndCacheStatus fdnCacheStatus = iMmPhoneTsy->GetCustomTsy()->GetPhonebookCacheStatus( KFDNPhoneBook ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - FDN cachestatus %d", fdnCacheStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_2, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - FDN cachestatus %d", fdnCacheStatus); RMmCustomAPI::TPndCacheStatus adnCacheStatus = iMmPhoneTsy->GetCustomTsy()->GetPhonebookCacheStatus( KADNPhoneBook ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - ADN cachestatus %d", adnCacheStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_3, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - ADN cachestatus %d", adnCacheStatus); // Check if the caching is active if ( bootState->iCachingActive ) @@ -161,8 +166,8 @@ package.SetPhoneBookName( iPhoneBookName ); TRAP_IGNORE( iMmPhoneTsy->MessageManager()->HandleRequestL( EMmTsyPhoneBookStoreCacheCancelIPC, &package ); ); - TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CacheCancel for %d", iPhoneBookType); - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = EFalse"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_4, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CacheCancel for %d", iPhoneBookType); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_5, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = EFalse"); bootState->iCachingActive = EFalse; } @@ -174,7 +179,7 @@ || RMmCustomAPI::ECacheFailed == adnCacheStatus )) && (KFDNPhoneBook == iPhoneBookType) ) { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = ETrue"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_6, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = ETrue"); // Set the caching back to active bootState->iCachingActive = ETrue; } @@ -299,7 +304,7 @@ CTelObject::TReqMode CMmPhoneBookStoreTsy::ReqModeL( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReqModeL IPC:%d", aIpc); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_REQMODEL_1, "TSY: CMmPhoneBookStoreTsy::ReqModeL IPC:%d", aIpc); CTelObject::TReqMode ret = 0; switch ( aIpc ) @@ -438,7 +443,7 @@ const TInt aIpc, const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::CancelService IPC:%d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CANCELSERVICE_1, "TSY: CMmPhoneBookStoreTsy::CancelService IPC:%d Handle:%d", aIpc, aTsyReqHandle); TInt ret( KErrNone ); @@ -464,7 +469,7 @@ default: break; } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CancelService return: %d", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CANCELSERVICE_2, "TSY: CMmPhoneBookStoreTsy::CancelService return: %d", ret); return ret; } @@ -483,7 +488,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::ExtFunc IPC:%d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_EXTFUNC_1, "TSY: CMmPhoneBookStoreTsy::ExtFunc IPC:%d Handle:%d", aIpc, aTsyReqHandle); TInt ret = KErrNone; TInt trapError = KErrNone; @@ -537,7 +542,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DOEXTFUNCL_1, "TSY: CMmPhoneBookStoreTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, aTsyReqHandle); TAny* dataPtr=aPackage.Ptr1(); TAny* dataPtr2=aPackage.Ptr2(); @@ -630,7 +635,7 @@ { iPhoneBookType = KMBDNPhoneBook; //MBDN } -TFLOGSTRING2( "TSY: CMmPhoneBookStoreTsy::SetPhoneBookType - Type: %d", iPhoneBookType); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETPHONEBOOKTYPE_1, "TSY: CMmPhoneBookStoreTsy::SetPhoneBookType - Type: %d", iPhoneBookType); } // --------------------------------------------------------------------------- @@ -643,8 +648,8 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - Result: %i",aResult ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - PhoneBookType: %u",iPhoneBookType ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_1, "TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - Result: %d",aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_2, "TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - PhoneBookType: %u",iPhoneBookType ); // If initialization made successfully // fill phonebook related static data @@ -671,7 +676,7 @@ //Initialisation has failed { CMmCustomTsy* mmCustom = iMmPhoneTsy->GetCustomTsy(); -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL has failed" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_3, "TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL has failed" ); if ( NULL != mmCustom ) { @@ -732,7 +737,7 @@ // void CMmPhoneBookStoreTsy::SetMaxNameAndNumLenght() { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SetMaxNameAndNumLenght"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETMAXNAMEANDNUMLENGHT_1, "TSY: CMmPhoneBookStoreTsy::SetMaxNameAndNumLenght"); switch ( iPhoneBookType ) { case KADNPhoneBook: @@ -781,7 +786,7 @@ RMobilePhoneBookStore::TPBIndexAndNumEntries* aIndexAndEntries, TDes8* aPBData, TBool aContinuedRead ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_1, "TSY: CMmPhoneBookStoreTsy::ReadL"); // Initialise ret to KErrServerBusy TInt ret = KErrServerBusy; @@ -799,7 +804,7 @@ if ( !aContinuedRead && EMultimodePhoneBookStoreReqHandleUnknown != phoneBookStoreReadHandle ) { // If request handle already exists return KErrServerBusy - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Handle already exists"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_2, "TSY: CMmPhoneBookStoreTsy::ReadL - Handle already exists"); ReqCompleted( aTsyReqHandle, ret ); } // check the buffer size @@ -812,7 +817,7 @@ !( iReadReqStore->iCaching ) && (KADNPhoneBook == iPhoneBookType || KFDNPhoneBook == iPhoneBookType)) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - SIM refresh registration failed Cache info can be corrupted - "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_3, "TSY: CMmPhoneBookStoreTsy::ReadL - SIM refresh registration failed Cache info can be corrupted - "); //Store Read req params for new request iReadReqStore->iReqHandle = aTsyReqHandle; @@ -834,7 +839,7 @@ KFDNPhoneBook == iPhoneBookType ) && ( !iStoreInfoData->iIsPhonebookInitialized || !iCacheReady ) ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Initiliszation ongoing -> Read not possible"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_4, "TSY: CMmPhoneBookStoreTsy::ReadL - Initiliszation ongoing -> Read not possible"); // If phonebook initialisation is not ready for AND and FDN phonebooks, // complete with KErrInUse. This is done becauce TSY can not handle // multible simultaneously request to certain phonebook. @@ -857,8 +862,8 @@ // number of records. if ( ( 1 > iIndexToRead ) || ( 1 > aIndexAndEntries->iNumSlots ) ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Index is less than 1 or aIndexAndEntries->iNumSlots is less then 1" ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - Index %i ", iIndexToRead); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_5, "TSY: CMmPhoneBookStoreTsy::ReadL - Index is less than 1 or aIndexAndEntries->iNumSlots is less then 1" ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_6, "TSY: CMmPhoneBookStoreTsy::ReadL - Index %d ", iIndexToRead); iIndexAndEntries = NULL; iIndexToRead = 0; ReqCompleted( aTsyReqHandle, KErrArgument ); @@ -866,8 +871,8 @@ else if ( KBDNPhoneBook != iPhoneBookType && aIndexAndEntries->iNumSlots > iMultipleReadPosTo ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - iPhoneBookType %i: ", iPhoneBookType); -TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots: %i > iMultipleReadPosTo: %i", aIndexAndEntries->iNumSlots, iMultipleReadPosTo ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_7, "TSY: CMmPhoneBookStoreTsy::ReadL - iPhoneBookType %u: ", iPhoneBookType); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_8, "TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots: %d > iMultipleReadPosTo: %d", aIndexAndEntries->iNumSlots, iMultipleReadPosTo ); iIndexAndEntries = NULL; iIndexToRead = 0; ReqCompleted( aTsyReqHandle, KErrNotFound ); @@ -896,7 +901,7 @@ // If cache request, but cache is not yet ready else if ( ( NULL == iPBStoreCache ) || !iCacheReady ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Cache is not yet ready" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_9, "TSY: CMmPhoneBookStoreTsy::ReadL - Cache is not yet ready" ); ret = KErrNotReady; } // Set cache request for completion handling @@ -907,7 +912,7 @@ if ( ( iNumEntriesToRead ) > iMultipleReadPosTo ) { ret = KErrArgument; -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - KErrArgument" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_10, "TSY: CMmPhoneBookStoreTsy::ReadL - KErrArgument" ); } } @@ -932,20 +937,20 @@ // Handle cached request else { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - iIndexToRead %i ", iIndexToRead); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots %i ", iNumEntriesToRead); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_11, "TSY: CMmPhoneBookStoreTsy::ReadL - iIndexToRead %d ", iIndexToRead); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_12, "TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots %d ", iNumEntriesToRead); ReadEntriesFromArrayL( EPBStoreCacheArray ); aIndexAndEntries->iNumSlots = iNumEntriesFilled; //This condition will arise when client has sent a buffer insufficient to //hold even one entry. KErrArgument has to be returned in this case. if ( ( iRetFillBufferedDes == KErrOverflow ) && ( iNumEntriesFilled == 0 ) ) { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Insufficient buffer to hold even 1 entry." ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_13, "TSY: CMmPhoneBookStoreTsy::ReadL - Insufficient buffer to hold even 1 entry." ); ret = KErrArgument; } else if ( 0 == iNumEntriesFilled ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - iNumEntriesFilled is 0 " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_14, "TSY: CMmPhoneBookStoreTsy::ReadL - iNumEntriesFilled is 0 " ); ret = KErrNotFound; } ReqCompleted( aTsyReqHandle, ret ); @@ -979,7 +984,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteReadL - aResult: %i",aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEREADL_1, "TSY: CMmPhoneBookStoreTsy::CompleteReadL - aResult: %d",aResult ); TInt errCode = aResult; // Reset req handle. Returns the deleted req handle @@ -997,7 +1002,7 @@ //hold even one entry. KErrArgument has to be returned in this case. if ( ( iRetFillBufferedDes == KErrOverflow ) && ( iNumEntriesFilled == 0 ) ) { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteReadL - Insufficient buffer to hold even 1 entry." ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEREADL_2, "TSY: CMmPhoneBookStoreTsy::CompleteReadL - Insufficient buffer to hold even 1 entry." ); errCode = KErrArgument; } } @@ -1027,7 +1032,7 @@ // TInt CMmPhoneBookStoreTsy::CountEntriesL() { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CountEntriesL called"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COUNTENTRIESL_1, "TSY: CMmPhoneBookStoreTsy::CountEntriesL called"); // before phonebook requests, phonebook must be initialized TInt returnValue( KErrNone ); @@ -1049,7 +1054,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCountEntries - Result: %i", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECOUNTENTRIES_1, "TSY: CMmPhoneBookStoreTsy::CompleteCountEntries - Result: %d", aResult ); TInt numOfEntries( 0 ); //reset request handle. Returns the deleted req handle. @@ -1086,7 +1091,7 @@ void CMmPhoneBookStoreTsy::CacheEntriesL() { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_1, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered"); // Get Phonebook related DLL -static data // Check if phonebook has been initialized successfully. Caching of ADN @@ -1095,7 +1100,7 @@ ( EFalse == iStoreInfoData->iIsPhonebookInitializeFailed || KADNPhoneBook != iPhoneBookType ) ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_2, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", iPhoneBookName); TInt ret = KErrNone; CMmPhoneTsy::TNosBootState* bootState = iMmPhoneTsy->NosBootState(); @@ -1113,7 +1118,7 @@ iPBStoreCache->ResetAndDestroy(); delete iPBStoreCache; iPBStoreCache = NULL; -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_3, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted"); } //Inform phonebook that the cache is not ready for refresh @@ -1125,11 +1130,11 @@ } else if ( iCacheReady ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_4, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", iPhoneBookName); } if ( KErrNone != ret) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_5, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", iPhoneBookName); } } // Phonebook not initialized -> let's do it before caching @@ -1137,7 +1142,7 @@ || iStoreInfoData->iIsPhonebookInitializeFailed ) && !iMmPhoneTsy->IsPBInitActive() ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_6, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", iPhoneBookName); // before phonebook requests, phonebook must be initialized iMmPhoneBookStoreExtInterface->InitPhonebook( EMmTsyPhoneBookStoreInitIPC, iPhoneBookName ); @@ -1159,8 +1164,8 @@ void CMmPhoneBookStoreTsy::CompleteCachingL( TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - PB %S Caching completed", &iPhoneBookName); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Result: %i",aResult ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_1, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - PB %S Caching completed", iPhoneBookName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_2, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Result: %d",aResult ); #ifdef USING_CTSY_DISPATCHER aDataPackage->UnPackData(iPBStoreCache); @@ -1176,7 +1181,7 @@ // the number of used entries if ( KErrNone == aResult ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iPBStoreCache->Count: %i",iPBStoreCache->Count() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_3, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iPBStoreCache->Count: %d",iPBStoreCache->Count() ); iUsedEntries = iPBStoreCache->Count(); //Set the caching ready only if request is successfull. //when FDN is on, the ADN caching is not successful. Meanwhile the FDN @@ -1187,7 +1192,7 @@ iCacheReady = ETrue; } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iUsedEntries: %i",iUsedEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_4, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iUsedEntries: %d",iUsedEntries ); bootState->iCachingActive = EFalse; @@ -1196,7 +1201,7 @@ // Check if client has requested caching before completing if ( NULL != mmCustom && !iMmPhoneTsy->IsRefreshOngoing() ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Client refresh req complete" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_5, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Client refresh req complete" ); if ( KErrNone == aResult ) { mmCustom->UpdateCacheStatus( RMmCustomAPI::ECacheReady, @@ -1224,7 +1229,7 @@ // through refresh else { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - SIM refresh req complete" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_6, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - SIM refresh req complete" ); // Check for which phonebook the caching must be completed if ( !iPhoneBookName.CompareF( KETelIccAdnPhoneBook ) ) @@ -1238,7 +1243,7 @@ //NOTIFY THE PHONEBOOK that the cache is ready if ( NULL != mmCustom ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteCachingL, mmCustom->UpdateCacheStatus" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_7, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL, mmCustom->UpdateCacheStatus" ); if ( KErrNone == aResult ) { mmCustom->UpdateCacheStatus( @@ -1260,8 +1265,8 @@ mmCustom->GetPhonebookCacheStatus( KFDNPhoneBook ); RMmCustomAPI::TPndCacheStatus adnCacheStatus = mmCustom->GetPhonebookCacheStatus( KADNPhoneBook ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - FDN cachestatus %d", fdnCacheStatus); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - ADN cachestatus %d", adnCacheStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_8, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - FDN cachestatus %d", fdnCacheStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_9, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - ADN cachestatus %d", adnCacheStatus); // Set caching back to active if either FDN or ADN is caching if ( RMmCustomAPI::ECacheNotReady == fdnCacheStatus @@ -1285,17 +1290,17 @@ if ( EPBStoreCacheArray == aArrayType ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadEntriesFromCache %S, iPBStoreCache", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_1, "TSY: CMmPhoneBookStoreTsy::ReadEntriesFromCache %S, iPBStoreCache", iPhoneBookName); ptrToArray = iPBStoreCache; } else if ( EPBStoreReadEntriesArray == aArrayType ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray %S, iPBStoreReadEntries", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_2, "TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray %S, iPBStoreReadEntries", iPhoneBookName); ptrToArray = iPBStoreReadEntries; } else { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray invalid aArrayType"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_3, "TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray invalid aArrayType"); User::Leave(KErrNotSupported); } @@ -1332,7 +1337,7 @@ // void CMmPhoneBookStoreTsy::ReadToCacheL() { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadToCacheL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READTOCACHEL_1, "TSY: CMmPhoneBookStoreTsy::ReadToCacheL"); // Call ReadL from GSM extension iMmPhoneBookStoreExtInterface->ReadToCacheL( @@ -1351,8 +1356,8 @@ CPhoneBookStoreEntry* aEntry, TBool aDeleteEntry ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL"); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->Count(): %i ", iPBStoreCache->Count() ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_1, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL"); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_2, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->Count(): %d ", iPBStoreCache->Count() ); if(aEntry == NULL) { @@ -1365,7 +1370,7 @@ User::Leave(KErrArgument); } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry->Location(): %i ", aEntry->iLocation ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_3, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry->Location(): %u ", aEntry->iLocation ); TInt result( KErrNotFound ); TInt updateIndex( 0 ); @@ -1375,7 +1380,7 @@ { if ( ( iPBStoreCache->At( index ) )->iLocation == aEntry->iLocation ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->iLocation: %i ", aEntry->iLocation); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_4, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->iLocation: %u ", aEntry->iLocation); updateIndex = index; result = KErrNone; } @@ -1402,7 +1407,7 @@ } else { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL, Deleted entry is not in cache! "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_5, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL, Deleted entry is not in cache! "); } } // Entry found @@ -1414,7 +1419,7 @@ ( aEntry->iEmail && aEntry->iEmail->MdcaCount() > 0 ) || ( aEntry->iSne && aEntry->iSne->MdcaCount() > 0 ) ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Change existing entry"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_6, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Change existing entry"); // Every update/deletion of an existing phonebook entry or the // addition of a new phone book entry, incremements the // iChangeCounter. @@ -1426,13 +1431,13 @@ iPBStoreCache->At( updateIndex ); if ( entryToDelete == iDeleteEntry ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_7, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry"); // reset iDeleteEntry member iDeleteEntry = NULL; } if ( entryToDelete == iWriteEntry ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iWriteEntry"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_8, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iWriteEntry"); // reset iWriteEntry member iWriteEntry = NULL; } @@ -1440,10 +1445,10 @@ entryToDelete = NULL; iPBStoreCache->Delete( updateIndex ); iPBStoreCache->InsertL( updateIndex, aEntry ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - updateIndex: %i", updateIndex); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_9, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - updateIndex: %d", updateIndex); if ( aEntry == iWriteEntry ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry == iWriteEntry"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_10, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry == iWriteEntry"); // reset iWriteEntry member iWriteEntry = NULL; } @@ -1456,7 +1461,7 @@ // Case: else { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Delete entry"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_11, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Delete entry"); // decrease iUsedEntries iUsedEntries--; @@ -1468,13 +1473,13 @@ iPBStoreCache->At( updateIndex ); if ( entryToDelete == iDeleteEntry ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_12, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry"); // reset iDeleteEntry member iDeleteEntry = NULL; } else { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iWriteEntry = NULL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_13, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iWriteEntry = NULL"); // reset iWriteEntry member iWriteEntry = NULL; } @@ -1531,7 +1536,7 @@ if ( 0 == marked ) { ret = pbBuffer->AddNewEntryTag(); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 0, ret: %i ", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_1, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 0, ret: %d ", ret); } // Append Index else if ( 1 == marked ) @@ -1539,7 +1544,7 @@ ret = pbBuffer->PutTagAndValue( RMobilePhoneBookStore::ETagPBAdnIndex, (TUint16)( aPhoneBookStoreResp->iLocation ) ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 1, ret: %i ", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_2, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 1, ret: %d ", ret); } // Append Name else if ( 2 == marked ) @@ -1551,7 +1556,7 @@ RMobilePhoneBookStore::ETagPBText, aPhoneBookStoreResp->iText->Des() ); } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 2, ret: %i ", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_3, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 2, ret: %d ", ret); } // Append Number else if ( 3 == marked ) @@ -1563,7 +1568,7 @@ RMobilePhoneBookStore::ETagPBNumber, aPhoneBookStoreResp->iNumber->Des() ); } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 3, ret: %i ", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_4, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 3, ret: %d ", ret); } // Append Email else if ( 4 == marked ) @@ -1576,7 +1581,7 @@ RMobilePhoneBookStore::ETagPBEmailAddress, aPhoneBookStoreResp->iEmail->MdcaPoint( numEmails ) ); } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 4, ret: %i ", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_5, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 4, ret: %d ", ret); } // Append Sne else if ( 5 == marked ) @@ -1589,7 +1594,7 @@ RMobilePhoneBookStore::ETagPBSecondName, aPhoneBookStoreResp->iSne->MdcaPoint( numSnes ) ); } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 5, ret: %i ", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_6, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 5, ret: %d ", ret); } // Append Anr else if ( 6 == marked ) @@ -1603,7 +1608,7 @@ RMobilePhoneBookStore::ETagPBNumber, aPhoneBookStoreResp->iAnr->MdcaPoint( numAnrs ) ); } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 6, ret: %i ", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_7, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 6, ret: %d ", ret); } marked++; @@ -1627,12 +1632,12 @@ CleanupStack::PopAndDestroy(pbBuffer); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - returnvalue: %i ", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_8, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - returnvalue: %d ", ret); //If simrefresh registration is failed prevent new cache if( KErrOverflow == ret && !( iMmPhoneTsy->GetSimRefreshRegister() ) ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Prevent new cache" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_9, "TSY: CMmPhoneBookStoreTsy::ReadL - Prevent new cache" ); iReadReqStore->iCaching = ETrue; } @@ -1651,7 +1656,7 @@ TInt CMmPhoneBookStoreTsy::ReadCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadCancel - Handle:%d", aTsyReqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READCANCEL_1, "TSY: CMmPhoneBookStoreTsy::ReadCancel - Handle:%d", aTsyReqHandle ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -1687,12 +1692,12 @@ TDesC8* aPBData, TInt* aIndex ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::WriteL - EtelIndex: %i",*aIndex ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_WRITEL_1, "TSY: CMmPhoneBookStoreTsy::WriteL - EtelIndex: %d",*aIndex ); //SDN phonebook can't be updated by user. if (iPhoneBookType == KSDNPhoneBook) { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::WriteL - SDN phonebook entry can't be updated"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_WRITEL_2, "TSY: CMmPhoneBookStoreTsy::WriteL - SDN phonebook entry can't be updated"); ReqCompleted( aTsyReqHandle, KErrAccessDenied ); } else @@ -1729,7 +1734,7 @@ // Straight write-forwarding to SIM server, TInt index = *aIndex; - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::WriteL - Straight write-forwarding to SIM"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_WRITEL_3, "TSY: CMmPhoneBookStoreTsy::WriteL - Straight write-forwarding to SIM"); ret = WriteByIndexL( index ); } @@ -1813,7 +1818,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL - Result: %i",aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_1, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL - Result: %d",aResult ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneBookStoreWrite ); @@ -1862,14 +1867,14 @@ //Update Adn Max Num Length iStoreInfoData->iADNNumberLengthMax = pbEntryInfo.iMaxNumLength; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_2, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } else if ( KFDNPhoneBook == iPhoneBookType ) { //Update Fdn Max Num Length iStoreInfoData->iFDNNumberLengthMax = pbEntryInfo.iMaxNumLength; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_3, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } else if ( KVMBXPhoneBook == iPhoneBookType ) { @@ -1879,7 +1884,7 @@ iStoreInfoData->iVMBXNumberLengthMax = pbEntryInfo.iMaxNumLength; } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_4, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } else if ( KMBDNPhoneBook == iPhoneBookType ) { @@ -1889,7 +1894,7 @@ iStoreInfoData->iMBDNNumberLengthMax = pbEntryInfo.iMaxNumLength; } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL:MBDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_5, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL:MBDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } CompleteNotifyStoreEvent( pbEntryInfo.iLocation ); } @@ -1978,7 +1983,7 @@ ret = pbBuffer->GetValue( textPtr ); if ( iMaxTextLen < textPtr.Length() ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Text length is more than KPBStoreTextSize " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_1, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Text length is more than KPBStoreTextSize " ); ret = CMmCommonStaticUtility::EpocErrorCode( KErrTooBig, KErrGsm0707TextStringTooLong ); } @@ -2054,13 +2059,13 @@ } break; case RMobilePhoneBookStore::ETagPBText: -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBText" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_2, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBText" ); break; case RMobilePhoneBookStore::ETagPBTonNpi: -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBTonNpi" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_3, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBTonNpi" ); break; default: -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart KErrArgument" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_4, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart KErrArgument" ); ret = KErrArgument; break; } @@ -2068,7 +2073,7 @@ break; // Unknown Tag, complete with KErrArgument default: -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Unknown Tag " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_5, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Unknown Tag " ); ret = KErrArgument; break; } @@ -2077,7 +2082,7 @@ if ( KErrNone == ret ) { ret = pbBuffer->GetTagAndType( tagValue, tagType ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::GetNewField tagValue: %d ", tagValue); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_6, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::GetNewField tagValue: %d ", tagValue); } } if ( KErrNotFound != ret ) @@ -2088,7 +2093,7 @@ // Bad descriptor, no new entry found else { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Bad descriptor " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_7, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Bad descriptor " ); returnValue = KErrArgument; } @@ -2108,12 +2113,12 @@ const TTsyReqHandle aTsyReqHandle, TInt* aIndex ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::DeleteL - aIndex: %i",*aIndex ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEL_1, "TSY: CMmPhoneBookStoreTsy::DeleteL - aIndex: %d",*aIndex ); //SDN phonebook can't be updated by user. if (iPhoneBookType == KSDNPhoneBook) { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::DeleteL - SDN phonebook entry can't be updated"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEL_2, "TSY: CMmPhoneBookStoreTsy::DeleteL - SDN phonebook entry can't be updated"); ReqCompleted( aTsyReqHandle, KErrAccessDenied ); } else @@ -2177,7 +2182,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL - Result: %i",aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_1, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL - Result: %d",aResult ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneStoreDelete ); @@ -2220,14 +2225,14 @@ //Update Adn Max Num Length iStoreInfoData->iADNNumberLengthMax = pbEntryInfo.iMaxNumLength; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_2, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } else if ( KFDNPhoneBook == iPhoneBookType ) { //Update Fdn Max Num Length iStoreInfoData->iFDNNumberLengthMax = pbEntryInfo.iMaxNumLength; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_3, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } else if ( KVMBXPhoneBook == iPhoneBookType ) { @@ -2237,7 +2242,7 @@ iStoreInfoData->iVMBXNumberLengthMax = pbEntryInfo.iMaxNumLength; } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_4, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } } @@ -2285,12 +2290,12 @@ TInt CMmPhoneBookStoreTsy::DeleteAllL( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::DeleteAllL - Handle:%d", aTsyReqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEALLL_1, "TSY: CMmPhoneBookStoreTsy::DeleteAllL - Handle:%d", aTsyReqHandle ); //SDN phonebook can't be updated by user. if (iPhoneBookType == KSDNPhoneBook) { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::DeleteAllL - SDN phonebook entry can't be updated"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEALLL_2, "TSY: CMmPhoneBookStoreTsy::DeleteAllL - SDN phonebook entry can't be updated"); ReqCompleted( aTsyReqHandle, KErrAccessDenied ); } else @@ -2326,7 +2331,7 @@ TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll - Result: %i",aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_1, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll - Result: %d",aResult ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneStoreDeleteAll ); @@ -2358,14 +2363,14 @@ //Update Adn Max Num Length iStoreInfoData->iADNNumberLengthMax = pbEntryInfo.iMaxNumLength; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_2, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } else if ( KFDNPhoneBook == iPhoneBookType ) { //Update Fdn Max Num Length iStoreInfoData->iFDNNumberLengthMax = pbEntryInfo.iMaxNumLength; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_3, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } else if ( KVMBXPhoneBook == iPhoneBookType ) { @@ -2375,7 +2380,7 @@ iStoreInfoData->iVMBXNumberLengthMax = pbEntryInfo.iMaxNumLength; } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_4, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength); } // Complete notify store event @@ -2402,7 +2407,7 @@ TDes8* aInfo ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL Handle:%d", aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_1, "TSY: CMmPhoneBookStoreTsy::GetInfoL Handle:%d", aTsyReqHandle); TInt ret( KErrNone ); TTsyReqHandle getInfoHandle = @@ -2453,12 +2458,12 @@ // will be delivered to the client. if ( KBDNPhoneBook == iPhoneBookType ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - BDN" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_2, "TSY: CMmPhoneBookStoreTsy::GetInfoL - BDN" ); } // If PB type is ADN, total entries and used entries already read else if ( KADNPhoneBook == iPhoneBookType ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - ADN" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_3, "TSY: CMmPhoneBookStoreTsy::GetInfoL - ADN" ); ret = KErrNotReady; //if cache is ready, set information and get name length @@ -2477,7 +2482,7 @@ // The total number of entries iPhoneBookInfoChanged->iTotalEntries = iStoreInfoData->iADNNumOfEntries; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iADNNumOfEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_4, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iADNNumOfEntries ); // Check if Email, SNE & ANR Caps are supported + GRP @@ -2486,28 +2491,28 @@ iPhoneBookInfoChanged->iCaps = iPhoneBookInfoChanged->iCaps | RMobilePhoneBookStore::KCapsEmailAddressUsed; -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> Email supported" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_5, "TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> Email supported" ); } if ( iStoreInfoData->iSNENumOfEntriesPerEntry > 0 ) { iPhoneBookInfoChanged->iCaps = iPhoneBookInfoChanged->iCaps | RMobilePhoneBookStore::KCapsSecondNameUsed; -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> SNE supported" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_6, "TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> SNE supported" ); } if ( iStoreInfoData->iANRNumOfEntriesPerEntry > 0 ) { iPhoneBookInfoChanged->iCaps = iPhoneBookInfoChanged->iCaps | RMobilePhoneBookStore::KCapsAdditionalNumUsed; -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> ANR supported" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_7, "TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> ANR supported" ); } } } // If PB type is FDN, total entries and used entries already read else if ( KFDNPhoneBook == iPhoneBookType ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - FDN" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_8, "TSY: CMmPhoneBookStoreTsy::GetInfoL - FDN" ); ret = KErrNotReady; //if cache is ready, set information and get name length @@ -2526,19 +2531,19 @@ // The total number of entries iPhoneBookInfoChanged->iTotalEntries = iStoreInfoData->iFDNNumOfEntries; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iFDNNumOfEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_9, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iFDNNumOfEntries ); // Set caps by phonebook name iPhoneBookInfoChanged->iCaps = KPBTypeFDNCaps; } -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %i",iPhoneBookInfoChanged->iMaxNumLength ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %i",iPhoneBookInfoChanged->iMaxTextLength ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iTotalEntries: %i",iPhoneBookInfoChanged->iTotalEntries ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iUsedEntries: %i",iPhoneBookInfoChanged->iUsedEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_10, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %d",iPhoneBookInfoChanged->iMaxNumLength ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_11, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %d",iPhoneBookInfoChanged->iMaxTextLength ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_12, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iTotalEntries: %d",iPhoneBookInfoChanged->iTotalEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_13, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iUsedEntries: %d",iPhoneBookInfoChanged->iUsedEntries ); } else if ( KSDNPhoneBook == iPhoneBookType ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - SDN" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_14, "TSY: CMmPhoneBookStoreTsy::GetInfoL - SDN" ); ret = KErrNone; // The maximum length for the number in a phonebook entry @@ -2552,7 +2557,7 @@ // The total number of entries iPhoneBookInfoChanged->iTotalEntries = iStoreInfoData->iSDNNumOfEntries; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iSDNNumOfEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_15, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iSDNNumOfEntries ); if ( !iIsUsedEntriesCounted ) { @@ -2569,7 +2574,7 @@ else { iPhoneBookInfoChanged = NULL; -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_16, "TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()"); ret = KErrNotReady; } } @@ -2577,7 +2582,7 @@ //VMBX need to read total and used entries else if ( KVMBXPhoneBook == iPhoneBookType ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - VMBX" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_17, "TSY: CMmPhoneBookStoreTsy::GetInfoL - VMBX" ); ret = KErrNone; // The maximum length for the number in a phonebook entry @@ -2591,7 +2596,7 @@ // The total number of entries iPhoneBookInfoChanged->iTotalEntries = iStoreInfoData->iVMBXNumOfEntries; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iVMBXNumOfEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_18, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iVMBXNumOfEntries ); // Set caps by the store info data //iPhoneBookInfoChanged->iCaps = iStoreInfoData->iVMBXCaps; @@ -2611,7 +2616,7 @@ else { iPhoneBookInfoChanged = NULL; -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_19, "TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()"); ret = KErrNotReady; } } @@ -2619,7 +2624,7 @@ //MBDN else if ( KMBDNPhoneBook == iPhoneBookType ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - MBDN" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_20, "TSY: CMmPhoneBookStoreTsy::GetInfoL - MBDN" ); ret = KErrNone; // The maximum length for the number in a phonebook entry @@ -2633,9 +2638,9 @@ // The total number of entries iPhoneBookInfoChanged->iTotalEntries = iStoreInfoData->iMBDNNumOfEntries; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iPhoneBookInfoChanged->iTotalEntries ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %i",iPhoneBookInfoChanged->iMaxNumLength ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %i",iPhoneBookInfoChanged->iMaxTextLength ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_21, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iPhoneBookInfoChanged->iTotalEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_22, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %d",iPhoneBookInfoChanged->iMaxNumLength ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_23, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %d",iPhoneBookInfoChanged->iMaxTextLength ); // Set caps by the store info data iPhoneBookInfoChanged->iCaps = KPBTypeMBDNCaps; @@ -2670,7 +2675,7 @@ void CMmPhoneBookStoreTsy::CompleteGetInfo( TInt aError ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteGetInfo - Result: %i", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEGETINFO_1, "TSY: CMmPhoneBookStoreTsy::CompleteGetInfo - Result: %d", aError ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneStoreGetInfo ); @@ -2751,7 +2756,7 @@ // Indicates the current number of entries that may be held in this store iPhoneBookInfoChanged->iUsedEntries = iUsedEntries; -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::SetInfo - used entries: %i",iUsedEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETINFO_1, "TSY: CMmPhoneBookStoreTsy::SetInfo - used entries: %d",iUsedEntries ); // Indicates the total number of entries iPhoneBookInfoChanged->iTotalEntries = KNoInfoAvail; @@ -2767,7 +2772,7 @@ TInt CMmPhoneBookStoreTsy::GetInfoCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoCancel - Handle:%d", aTsyReqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOCANCEL_1, "TSY: CMmPhoneBookStoreTsy::GetInfoCancel - Handle:%d", aTsyReqHandle ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -2800,7 +2805,7 @@ RMobilePhoneStore::TMobileStoreEvent *aEvent, TInt* aIndex ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::NotifyStoreEvent - called" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENT_1, "TSY: CMmPhoneBookStoreTsy::NotifyStoreEvent - called" ); TTsyReqHandle requestHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodePhoneStoreNotifyStoreEvent ); @@ -2828,7 +2833,7 @@ TInt CMmPhoneBookStoreTsy::NotifyStoreEventCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::NotifyStoreEventCancel - called" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENTCANCEL_1, "TSY: CMmPhoneBookStoreTsy::NotifyStoreEventCancel - called" ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -2854,7 +2859,7 @@ void CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent( TInt aLocation ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - Called" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_1, "TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - Called" ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -2866,8 +2871,8 @@ REINTERPRET_CAST( RMobilePhoneStore::TMobileStoreEvent*, iNotifyPhoneBookStoreEventPtr ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - StoreEvent %i ", iMobilePhoneBookStoreEvent ); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - location %i ", aLocation ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_2, "TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - StoreEvent %8X ", (TUint)iMobilePhoneBookStoreEvent ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_3, "TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - location %d ", aLocation ); // Fill notify information *phoneBookStoreEvent = iMobilePhoneBookStoreEvent; *iNotifyPhoneBookStoreEventIndexPtr = aLocation; @@ -2915,7 +2920,7 @@ // void CMmPhoneBookStoreTsy::ResetVariables() { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetVariables" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETVARIABLES_1, "TSY: CMmPhoneBookStoreTsy::ResetVariables" ); // Reset phonebooktype iPhoneBookType = 0; @@ -2960,7 +2965,7 @@ // void CMmPhoneBookStoreTsy::ResetCache() { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetCache" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETCACHE_1, "TSY: CMmPhoneBookStoreTsy::ResetCache" ); // SDN and VMBX do not have cache. Skip reset if the cache pointer is null. if ( NULL != iPBStoreCache ) @@ -2980,7 +2985,7 @@ // void CMmPhoneBookStoreTsy::ResetCacheReady() { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetCacheReady" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETCACHEREADY_1, "TSY: CMmPhoneBookStoreTsy::ResetCacheReady" ); iCacheReady = EFalse; CMmCustomTsy* mmCustom = NULL; @@ -2991,7 +2996,7 @@ if ( NULL != mmCustom ) { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetCacheReady, mmCustom->UpdateCacheStatus - not ready" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETCACHEREADY_2, "TSY: CMmPhoneBookStoreTsy::ResetCacheReady, mmCustom->UpdateCacheStatus - not ready" ); mmCustom->UpdateCacheStatus( RMmCustomAPI::ECacheNotReady, iPhoneBookName ); } @@ -3023,7 +3028,7 @@ const TTsyReqHandle aTsyReqHandle, const TInt aError ) { -TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::ReqCompleted - Handle:%d Error:%d", aTsyReqHandle, aError); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_REQCOMPLETED_1, "TSY: CMmPhoneBookStoreTsy::ReqCompleted - Handle:%d Error:%d", aTsyReqHandle, aError); CTelObject::ReqCompleted( aTsyReqHandle, aError ); } @@ -3044,7 +3049,7 @@ const TInt aReqHandleType, const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::SetTypeOfResponse - Handle:%d Type:%d", aTsyReqHandle, aReqHandleType ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETTYPEOFRESPONSE_1, "TSY: CMmPhoneBookStoreTsy::SetTypeOfResponse - Handle:%d Type:%d", aTsyReqHandle, aReqHandleType ); TInt timeOut( 0 ); @@ -3143,7 +3148,7 @@ // void CMmPhoneBookStoreTsy::ContinueReadL() { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ContinueReadL "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONTINUEREADL_1, "TSY: CMmPhoneBookStoreTsy::ContinueReadL "); iRequestedOnPBRead = EFalse; //Reguest Read with stored parameters @@ -3162,8 +3167,8 @@ // TBool CMmPhoneBookStoreTsy::IsPBInitDone() { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB %S", &iPhoneBookName); -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB iIsPBInitCompleted = %d ", iIsPBInitCompleted ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_ISPBINITDONE_1, "TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB %S", iPhoneBookName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_ISPBINITDONE_2, "TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB iIsPBInitCompleted = %d ", iIsPBInitCompleted ); return iIsPBInitCompleted; } @@ -3176,7 +3181,7 @@ // TUint8 CMmPhoneBookStoreTsy::GetPhonebookType() { -TFLOGSTRING2( "TSY: CMmPhoneBookStoreTsy::GetPhonebookType - iPhoneBookType: %d", iPhoneBookType); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETPHONEBOOKTYPE_1, "TSY: CMmPhoneBookStoreTsy::GetPhonebookType - iPhoneBookType: %d", iPhoneBookType); return iPhoneBookType; } @@ -3268,14 +3273,14 @@ void CMmPhoneBookStoreTsy::SimIsReady() { - TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::SimIsReady - iIsPhonebookInitialized: %i", iStoreInfoData->iIsPhonebookInitialized); - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - before initialization"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_1, "TSY: CMmPhoneBookStoreTsy::SimIsReady - iIsPhonebookInitialized: %u", (TUint)iStoreInfoData->iIsPhonebookInitialized); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_2, "TSY: CMmPhoneBookStoreTsy::SimIsReady - before initialization"); // Check if phonebook has been initialized if ( !iMmPhoneTsy->IsPBInitActive() && ( !iStoreInfoData->iIsPhonebookInitialized ) ) { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - starting initialization"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_3, "TSY: CMmPhoneBookStoreTsy::SimIsReady - starting initialization"); // before phonebook requests, phonebook must be initialized iMmPhoneBookStoreExtInterface->InitPhonebook( @@ -3285,12 +3290,12 @@ } else if (iMmPhoneTsy->IsPBInitActive()) { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - initialization active via other store, waiting for completion"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_4, "TSY: CMmPhoneBookStoreTsy::SimIsReady - initialization active via other store, waiting for completion"); iIsPBInitCompleted = EFalse; } else { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - Initialization was done via other store"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_5, "TSY: CMmPhoneBookStoreTsy::SimIsReady - Initialization was done via other store"); // Set initialization flag iIsPBInitCompleted = ETrue; } @@ -3299,7 +3304,7 @@ && ( iPhoneBookType == KADNPhoneBook || iPhoneBookType == KFDNPhoneBook ) ) { - TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - starting caching"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_6, "TSY: CMmPhoneBookStoreTsy::SimIsReady - starting caching"); // Call CacheEntries method to read entries from SIM. CacheEntriesL(); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsywithdispatcher.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsywithdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsywithdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -22,6 +22,11 @@ // INCLUDE FILES +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmphonebookstoretsywithdispatcherTraces.h" +#endif + #include "cmmphonebookstoretsy.h" #include "cmmphonebookstoreextinterface.h" #include @@ -40,7 +45,7 @@ void CMmPhoneBookStoreTsy::CacheEntriesL() { -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_1, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered"); // Get Phonebook related DLL -static data // Check if phonebook has been initialized successfully. Caching of ADN @@ -49,7 +54,7 @@ ( EFalse == iStoreInfoData->iIsPhonebookInitializeFailed || KADNPhoneBook != iPhoneBookType ) ) { - TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", &iPhoneBookName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_2, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", iPhoneBookName); TInt ret = KErrNone; CMmPhoneTsy::TNosBootState* bootState = iMmPhoneTsy->NosBootState(); @@ -66,7 +71,7 @@ iPBStoreCache->ResetAndDestroy(); delete iPBStoreCache; iPBStoreCache = NULL; -TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_3, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted"); } //Inform phonebook that the cache is not ready for refresh @@ -78,11 +83,11 @@ } else if ( iCacheReady ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_4, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", iPhoneBookName); } if ( KErrNone != ret) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_5, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", iPhoneBookName); } } // Phonebook not initialized -> let's do it before caching @@ -90,7 +95,7 @@ || iStoreInfoData->iIsPhonebookInitializeFailed ) && !iMmPhoneTsy->IsPBInitActive() ) { -TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", &iPhoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_6, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", iPhoneBookName); // before phonebook requests, phonebook must be initialized iMmPhoneBookStoreExtInterface->InitPhonebook( EMmTsyPhoneBookStoreInitIPC, iPhoneBookName ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CMmMessageRouterProxyTraces.h" +#endif + #include "cmmmessagerouterproxy.h" #include "cmmvoicecalltsy.h" #include "cmmdatacalltsy.h" @@ -63,7 +69,7 @@ CMmMessageRouterProxy* CMmMessageRouterProxy::NewL( CTsyDelegates& aTsyDelegates ) { -TFLOGSTRING("TSY: CMmMessageRouterProxy::NewL." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_CTOR_1, "TSY: CMmMessageRouterProxy::NewL." ); CMmMessageRouterProxy* const routerproxy = new ( ELeave ) CMmMessageRouterProxy(); CleanupStack::PushL( routerproxy ); @@ -92,7 +98,7 @@ CMmDataPackage* aData, TInt aResult ) { -TFLOGSTRING3("TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_COMPLETE_1, "TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult); RouteCompletion( aIpc, aData, aResult ); } @@ -256,7 +262,7 @@ TName phoneBookName; phonebookData->GetPhoneBookName( phoneBookName ); -TFLOGSTRING2("TSY: CMmMessageRouterProxy::RouteCompletion: PB Name: %S", &phoneBookName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_1, "TSY: CMmMessageRouterProxy::RouteCompletion: PB Name: %S", phoneBookName); for( TInt i = 0; i < iMmPhone->PBList()->GetNumberOfObjects(); i++ ) { @@ -270,7 +276,7 @@ } if ( NULL == mmObject ) { -TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: PB object not found!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_2, "TSY: CMmMessageRouterProxy::RouteCompletion: PB object not found!"); iMmPhone->SetPBInitActiveStatus( EFalse ); } } @@ -782,14 +788,14 @@ // phonebook stores are initialised won't introduce side effects. (One future improvement) for( TInt i = 0; i < iMmPhone->PBList()->GetNumberOfObjects(); i++ ) { -TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion:EMmTsyPhoneBookStoreInitIPC for loop, check init statuses "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_3, "TSY: CMmMessageRouterProxy::RouteCompletion:EMmTsyPhoneBookStoreInitIPC for loop, check init statuses "); CMmPhoneBookStoreTsy* pbStore = iMmPhone->PBList()-> GetMmPBByIndex( i ); done = pbStore->IsPBInitDone(); -TFLOGSTRING3("TSY: CMmMessageRouterProxy::RouteCompletion: active: %i, done: %i",iMmPhone->IsPBInitActive(), done); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_4, "TSY: CMmMessageRouterProxy::RouteCompletion: active: %u, done: %u",(TUint)iMmPhone->IsPBInitActive(), (TUint)done); if ( iMmPhone->IsPBInitActive() && !done ) { -TFLOGSTRING2("TSY: CMmMessageRouterProxy::RouteCompletion: complete also to: %S",pbStore->PhoneBookName()); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_5, "TSY: CMmMessageRouterProxy::RouteCompletion: complete also to: %S",*(pbStore->PhoneBookName())); mmObject = static_cast( pbStore ); static_cast( mmObject )-> CompletePBStoreInitializationL( @@ -2606,7 +2612,7 @@ aDataPackage, aResult ); break; case EMmTsyPhoneBookStoreFdnInfoIPC: -TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: route to phonetsy EMmTsyPhoneBookStoreFdnInfoIPC"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_6, "TSY: CMmMessageRouterProxy::RouteCompletion: route to phonetsy EMmTsyPhoneBookStoreFdnInfoIPC"); static_cast( mmObject )-> SaveFdnInfoDetails( aResult, aDataPackage ); break; @@ -2649,7 +2655,7 @@ if ( NULL == mmObject ) { -TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: Call object not found for mobile Call Info!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_7, "TSY: CMmMessageRouterProxy::RouteCompletion: Call object not found for mobile Call Info!"); } else { @@ -2688,7 +2694,7 @@ if ( NULL == mmCall ) { -TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: Call object not found for Dial!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_8, "TSY: CMmMessageRouterProxy::RouteCompletion: Call object not found for Dial!"); } else { @@ -2717,7 +2723,7 @@ CMmCallTsy::EMultimodeCallDialISV ) && mmCall->CallMode() == callMode ) ) { -TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: Special case before CompleteDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_9, "TSY: CMmMessageRouterProxy::RouteCompletion: Special case before CompleteDial"); mmCall->CompleteDial( aResult ); break; } @@ -2726,7 +2732,7 @@ CMmCallTsy::EMultimodeCallDialNoFdnCheck ) && mmCall->CallMode() == callMode ) { -TFLOGSTRING("TSY: CMmMessageRouterProxy::RouteCompletion: Special case before CompleteDialNoFdn"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_10, "TSY: CMmMessageRouterProxy::RouteCompletion: Special case before CompleteDialNoFdn"); mmCall->CompleteDialNoFdn( aResult ); break; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,9 +16,14 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CTsyDelegatesTraces.h" +#endif + #include "ctsydelegates.h" #include "cmmmessagemanagerbase.h" -#include // ======== MEMBER FUNCTIONS ======== @@ -44,7 +49,7 @@ CBase* CTsyDelegates::GetTsyObject( CMmMessageManagerBase::TTsyObjects aObject ) { -TFLOGSTRING2("TSY: CTsyDelegates::GetTsyObject object=%d", aObject ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_GETTSYOBJECT_1, "TSY: CTsyDelegates::GetTsyObject object=%d", aObject ); CBase* object = NULL; object = iTsyObjectArray.At( aObject ); @@ -61,7 +66,7 @@ CMmMessageManagerBase::TTsyObjects aTsyObjectType, CBase* aTsyObject ) { -TFLOGSTRING3("TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%x", TInt( aTsyObjectType ), aTsyObject ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_REGISTERTSYOBJECT_1, "TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%08x", TInt( aTsyObjectType ), (TUint)aTsyObject ); iTsyObjectArray[ aTsyObjectType ] = aTsyObject; } @@ -74,7 +79,7 @@ // void CTsyDelegates::DeregisterTsyObject( CBase* aTsyObject ) { -TFLOGSTRING2("TSY: CTsyDelegates::DeregisterTsyObject address=0x%x", aTsyObject ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_DEREGISTERTSYOBJECT_1, "TSY: CTsyDelegates::DeregisterTsyObject address=0x%08x", (TUint)aTsyObject ); for( TInt i = 0; i < TInt( CMmMessageManagerBase::EMaxNumOfTsyObjects ); i++ ) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/ChargingStatusObserver.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/ChargingStatusObserver.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/ChargingStatusObserver.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007-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" @@ -18,8 +18,13 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ChargingStatusObserverTraces.h" +#endif + #include "ChargingStatusObserver.h" -#include // ======== MEMBER FUNCTIONS ======== @@ -81,7 +86,7 @@ if ( KErrNone != errorStatus ) { -TFLOGSTRING2("TSY: CChargingStatusObserver::RunL - iStatus: %d", errorStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHARGINGSTATUSOBSERVER_RUNL_1, "TSY: CChargingStatusObserver::RunL - iStatus: %d", errorStatus ); iChargingStatusNotifier.NotifyChargingStatus( errorStatus, batteryInfo ); return; @@ -90,7 +95,7 @@ // property updated, get new value TInt level( 0 ); TInt error = iChargingStatus.Get( level ); -TFLOGSTRING2("TSY: CChargingStatusObserver::RunL error: %d", error); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHARGINGSTATUSOBSERVER_RUNL_2, "TSY: CChargingStatusObserver::RunL error: %d", error); if ( KErrNone == error ) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmcalltsyTraces.h" +#endif + #include "cmmcalltsy.h" #include #include @@ -69,7 +75,7 @@ CMmCallTsy::~CMmCallTsy() { -TFLOGSTRING3("TSY: CMmCallTsy::~CMmCallTsy. Call deleted iCallId:%d iCallName:%S",iCallId, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DTOR_1, "TSY: CMmCallTsy::~CMmCallTsy. Call deleted iCallId:%d iCallName:%S",iCallId, iCallName); TInt trapError( KErrNone ); @@ -122,7 +128,7 @@ { iTelephonyAudioControl->TeardownTelephonyAudio( iCallName, KErrNone ); -TFLOGSTRING2("TSY: CMmCallTsy::~CMmCallTsy Call routing tear down: Call name:%S", &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DTOR_2, "TSY: CMmCallTsy::~CMmCallTsy Call routing tear down: Call name:%S", iCallName ); } } @@ -323,7 +329,7 @@ if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo () && !IsRequestPossibleInOffline( aIpc ) ) { -TFLOGSTRING2("TSY: Offline mode ON, request is not allowed: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_EXTFUNC_1, "TSY: Offline mode ON, request is not allowed: %d", aIpc ); ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); @@ -687,7 +693,7 @@ TInt CMmCallTsy::DialCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmCallTsy::DialCancel. Req handle: %d, Call name: %S", aTsyReqHandle, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DIALCANCEL_1, "TSY: CMmCallTsy::DialCancel. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName); TInt ret( KErrGeneral ); @@ -705,12 +711,12 @@ { if ( RMobileCall::EStatusDisconnecting != iMobileCallStatus ) { -TFLOGSTRING("TSY: CMmCallTsy::DialCancel Hangup called"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DIALCANCEL_2, "TSY: CMmCallTsy::DialCancel Hangup called"); HangUp( aTsyReqHandle ); } else { -TFLOGSTRING("TSY: CMmCallTsy::DialCancel skipped Hangup call"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_DIALCANCEL_3, "TSY: CMmCallTsy::DialCancel skipped Hangup call"); } } } @@ -726,8 +732,8 @@ void CMmCallTsy::CompleteDial( TInt aResult ) { -TFLOGSTRING2("TSY: CMmCallTsy::CompleteDial. Result:%d", aResult ); -TFLOGSTRING3("TSY: CMmCallTsy::CompleteDial. Call Id:%d Call name:%S", iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIAL_1, "TSY: CMmCallTsy::CompleteDial. Result:%d", aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIAL_2, "TSY: CMmCallTsy::CompleteDial. Call Id:%d Call name:%S", iCallId, iCallName); //Set dial flag to false SetDialFlag( EFalse ); @@ -738,7 +744,7 @@ { //3rd Party Client //reset req handle. Returns the deleted req handle -TFLOGSTRING("TSY: CMmCallTsy::CompleteDial. EMultimodeCallDialISV"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIAL_3, "TSY: CMmCallTsy::CompleteDial. EMultimodeCallDialISV"); reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallDialISV ); @@ -746,7 +752,7 @@ else { //reset req handle. Returns the deleted req handle -TFLOGSTRING("TSY: CMmCallTsy::CompleteDial. EMultimodeCallDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIAL_4, "TSY: CMmCallTsy::CompleteDial. EMultimodeCallDial"); reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallDial ); } @@ -784,7 +790,7 @@ TInt CMmCallTsy::AnswerIncomingCallCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmCallTsy::AnswerIncomingCallCancel. Req handle: %d, Call name: %S", aTsyReqHandle, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_ANSWERINCOMINGCALLCANCEL_1, "TSY: CMmCallTsy::AnswerIncomingCallCancel. Req handle: %d, Call name: %S", aTsyReqHandle, iCallName); TInt ret( KErrNone ); @@ -814,12 +820,12 @@ void CMmCallTsy::CompleteAnswerIncomingCall( TInt aResult ) { -TFLOGSTRING2("TSY: CMmCallTsy::CompleteAnswerIncomingCall. Result:%d", aResult ); -TFLOGSTRING3("TSY: CMmCallTsy::CompleteAnswerIncomingCall. Call Id:%d Call name:%S", iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_1, "TSY: CMmCallTsy::CompleteAnswerIncomingCall. Result:%d", aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_2, "TSY: CMmCallTsy::CompleteAnswerIncomingCall. Call Id:%d Call name:%S", iCallId, iCallName); TTsyReqHandle reqHandle ( EMultimodeCallReqHandleUnknown ); -TFLOGSTRING2("TSY: CMmCallTsy::CompleteAnswerIncomingCall. iExtensionId:%d", iExtensionId ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_3, "TSY: CMmCallTsy::CompleteAnswerIncomingCall. iExtensionId:%d", iExtensionId ); if ( KETelExt3rdPartyV1 == iExtensionId ) { @@ -894,8 +900,8 @@ void CMmCallTsy::CompleteHangUp( TInt aResult ) { -TFLOGSTRING2("TSY: CMmCallTsy::CompleteHangUp.\n \t\t\t Result:%d", aResult ); -TFLOGSTRING3("TSY: CMmCallTsy::CompleteHangUp. Call Id:%d Call name:%S", iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEHANGUP_1, "TSY: CMmCallTsy::CompleteHangUp.\n \t\t\t Result:%d", aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEHANGUP_2, "TSY: CMmCallTsy::CompleteHangUp. Call Id:%d Call name:%S", iCallId, iCallName); TInt ret( KErrNone ); @@ -1125,7 +1131,7 @@ if(sizeof(RMobileCall::TMobileCallParamsV1) > aParams->MaxLength()) { - TFLOGSTRING ("TSY: CMmCallTsy::GetCallParams bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_GETCALLPARAMS_1, "TSY: CMmCallTsy::GetCallParams bad size argument"); // Complete the request with appropiate error return KErrArgument; } @@ -1604,7 +1610,7 @@ { if( IsPartOfConference() && RMobileCall::ERemoteTerminated == aEvent ) { -TFLOGSTRING("TSY: iIsRemoteReleasedCall = ETrue"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETENOTIFYCALLEVENT_1, "TSY: iIsRemoteReleasedCall = ETrue"); iIsRemoteReleasedCall = ETrue; } *iRetCallEvent = aEvent; @@ -1682,7 +1688,7 @@ TInt CMmCallTsy::FillMobileCallInfo( TDes8* aInfo ) { -TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_1, "TSY: CMmCallTsy::FillMobileCallInfo"); TInt ret = KErrArgument; TInt extensionId = 0; @@ -1696,7 +1702,7 @@ // get extensionid from the recieved data extensionId = callInfo.ExtensionId(); -TFLOGSTRING2("TSY: CMmCallTsy::FillMobileCallInfo - extensionid=%d",callInfo.ExtensionId()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_2, "TSY: CMmCallTsy::FillMobileCallInfo - extensionid=%d",callInfo.ExtensionId()); } //TMobileCallInfoV1 @@ -1705,7 +1711,7 @@ KEtelExtMultimodeV7 == extensionId || KEtelExtMultimodeV8 == extensionId ) { -TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo - V1"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_3, "TSY: CMmCallTsy::FillMobileCallInfo - V1"); // Set ret to KErrNone. We can fill this parameter class. ret = KErrNone; @@ -1726,7 +1732,7 @@ KEtelExtMultimodeV7 == extensionId || KEtelExtMultimodeV8 == extensionId ) { -TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo - V3"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_4, "TSY: CMmCallTsy::FillMobileCallInfo - V3"); RMobileCall::TMobileCallInfoV3Pckg* paramsPckgV3 = reinterpret_cast( aInfo ); @@ -1740,7 +1746,7 @@ if ( KEtelExtMultimodeV7 == extensionId || KEtelExtMultimodeV8 == extensionId ) { -TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo - V7"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_5, "TSY: CMmCallTsy::FillMobileCallInfo - V7"); RMobileCall::TMobileCallInfoV7Pckg* paramsPckgV7 = reinterpret_cast( aInfo ); @@ -1753,7 +1759,7 @@ // TMobileCallInfoV8 if ( KEtelExtMultimodeV8 == extensionId ) { -TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfo - V8"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_6, "TSY: CMmCallTsy::FillMobileCallInfo - V8"); RMobileCall::TMobileCallInfoV8Pckg* paramsPckgV8 = reinterpret_cast( aInfo ); @@ -1763,7 +1769,7 @@ iMmCallExtInterface->FillMobileCallInfoV8( &info ); } -TFLOGSTRING2("TSY: CMmCallTsy::FillMobileCallInfo end. ret=%d",ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFO_7, "TSY: CMmCallTsy::FillMobileCallInfo end. ret=%d",ret); return ret; } @@ -1782,7 +1788,7 @@ if( sizeof( RMobileCall::TMobileCallRemotePartyInfoV1 ) > aRemotePartyInfo->MaxLength() ) { -TFLOGSTRING ("TSY: CMmCallTsy::NotifyRemotePartyInfoChange Bad size argument"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_NOTIFYREMOTEPARTYINFOCHANGE_1, "TSY: CMmCallTsy::NotifyRemotePartyInfoChange Bad size argument"); // Complete the request with appropiate error ret = KErrArgument; @@ -2231,7 +2237,7 @@ //Overloads CTelObject::ReqCompleted for logging purposes. It //prints the aTsyReqHandle and aError variable in the log file and then //calls CTelObject::ReqCompleted. -TFLOGSTRING3("TSY: CMmCallTsy::Request Completed. Handle:%d Error:%d", aTsyReqHandle, aError); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_REQCOMPLETED_1, "TSY: CMmCallTsy::Request Completed. Handle:%d Error:%d", aTsyReqHandle, aError); CTelObject::ReqCompleted(aTsyReqHandle,aError); } @@ -2259,11 +2265,11 @@ #ifdef TF_LOGGING_METHOD if ( iIsPartOfConference ) { -TFLOGSTRING2( "TSY: CMmCallTsy::SetPartOfConference: Call %d has joined the conference", iCallId ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETPARTOFCONFERENCE_1, "TSY: CMmCallTsy::SetPartOfConference: Call %d has joined the conference", iCallId ); } else { -TFLOGSTRING( "TSY: CMmCallTsy::SetPartOfConference: Call has left the conference" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETPARTOFCONFERENCE_2, "TSY: CMmCallTsy::SetPartOfConference: Call has left the conference" ); } #endif // TF_LOGGING_METHOD @@ -2362,7 +2368,7 @@ TInt aExtensionId ) { iExtensionId = aExtensionId; -TFLOGSTRING2("TSY: CMmCallTsy::SetExtensionId.iExtensionId:%d",iExtensionId ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETEXTENSIONID_1, "TSY: CMmCallTsy::SetExtensionId.iExtensionId:%d",iExtensionId ); } // --------------------------------------------------------------------------- @@ -2386,7 +2392,7 @@ TBool aDialFlag ) { iDialFlag= aDialFlag; -TFLOGSTRING2("TSY: CMmCallTsy::SetDialFlag. iDialFlag:%d",iDialFlag ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETDIALFLAG_1, "TSY: CMmCallTsy::SetDialFlag. iDialFlag:%d",iDialFlag ); } // --------------------------------------------------------------------------- @@ -2398,7 +2404,7 @@ TBool CMmCallTsy::GetDialFlag() { -TFLOGSTRING2("TSY: CMmCallTsy::GetDialFlag. iDialFlag:%d",iDialFlag ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_GETDIALFLAG_1, "TSY: CMmCallTsy::GetDialFlag. iDialFlag:%d",iDialFlag ); return iDialFlag; } @@ -2410,7 +2416,7 @@ // TBool CMmCallTsy::IsRemoteReleasedCall() const { -TFLOGSTRING("TSY: CMmCallTsy::IsRemoteReleasedCall()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_ISREMOTERELEASEDCALL_1, "TSY: CMmCallTsy::IsRemoteReleasedCall()"); return iIsRemoteReleasedCall; } @@ -2433,7 +2439,7 @@ // Unpack UUS parameters RMobileCall::TMobileCallUUSRequestV1 requestUUS = ( *aUUSRequest )(); -TFLOGSTRING3("TSY: CMmCallTsy::ActivateUUS() -ServiceReq:%u -UUI:%S", requestUUS.iServiceReq, &requestUUS.iUUI ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_ACTIVATEUUS_1, "TSY: CMmCallTsy::ActivateUUS() -ServiceReq:%u -UUI:%S", requestUUS.iServiceReq, requestUUS.iUUI ); // handle implicit UUS1 request only if ( requestUUS.iServiceReq & RMobileCall::KUUS1Implicit ) { @@ -2461,12 +2467,12 @@ TInt CMmCallTsy::ReceiveUUI( const TTsyReqHandle aTsyReqHandle, RMobileCall::TMobileCallUUI* aUUI ) { -TFLOGSTRING("TSY: CMmCallTsy::ReceiveUUI()" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_RECEIVEUUI_1, "TSY: CMmCallTsy::ReceiveUUI()" ); // check are there any UUI information already in the buffer (UUS1) if ( 0 < iReceivedUUI.Length() ) { -TFLOGSTRING2("TSY: CMmCallTsy::ReceiveUUI() - information in BUFFER:%S", &iReceivedUUI ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_RECEIVEUUI_2, "TSY: CMmCallTsy::ReceiveUUI() - information in BUFFER:%S", iReceivedUUI ); // copy and empty the buffered information *aUUI = iReceivedUUI; iReceivedUUI.Zero(); @@ -2476,7 +2482,7 @@ } else { -TFLOGSTRING("TSY: CMmCallTsy::ReceiveUUI() - wait for next incoming UUI message" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_RECEIVEUUI_3, "TSY: CMmCallTsy::ReceiveUUI() - wait for next incoming UUI message" ); // Save request handle and pointer of the UUI message. iRetUUI = aUUI; iTsyReqHandleStore->SetTsyReqHandle( @@ -2495,7 +2501,7 @@ // TInt CMmCallTsy::ReceiveUUICancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmCallTsy::ReceiveUUICancel()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_RECEIVEUUICANCEL_1, "TSY: CMmCallTsy::ReceiveUUICancel()"); // reset the client side pointer, empty buffer and cancel the handle iRetUUI = NULL; @@ -2514,12 +2520,12 @@ void CMmCallTsy::CompleteReceiveUUI( CMmDataPackage* aDataPackage, TInt aResult ) { -TFLOGSTRING("TSY: CMmCallTsy::CompleteReceiveUUI()" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETERECEIVEUUI_1, "TSY: CMmCallTsy::CompleteReceiveUUI()" ); RMobileCall::TMobileCallUUI* receiveUUI = NULL; aDataPackage->UnPackData( &receiveUUI ); -TFLOGSTRING2("TSY: CMmCallTsy::CompleteReceiveUUI() - receiveUUI:%S", &receiveUUI ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETERECEIVEUUI_2, "TSY: CMmCallTsy::CompleteReceiveUUI() - receiveUUI:%S", *receiveUUI ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = @@ -2527,7 +2533,7 @@ if ( EMultimodeCallReqHandleUnknown != reqHandle ) { -TFLOGSTRING("TSY: CMmCallTsy::CompleteReceiveUUI() - Handle found, complete" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETERECEIVEUUI_3, "TSY: CMmCallTsy::CompleteReceiveUUI() - Handle found, complete" ); // Update the client side data through pointer *iRetUUI = *receiveUUI; // Null client side pointer, data copied @@ -2537,7 +2543,7 @@ } else if ( KErrNone == aResult ) { -TFLOGSTRING("TSY: CMmCallTsy::CompleteReceiveUUI() - Handle NOT found, buffer" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETERECEIVEUUI_4, "TSY: CMmCallTsy::CompleteReceiveUUI() - Handle NOT found, buffer" ); // set initial information to the buffer iReceivedUUI = *receiveUUI; } @@ -2553,7 +2559,7 @@ TUint8 aDialType ) { iDialTypeId = aDialType; -TFLOGSTRING2("TSY: CMmCallTsy::SetDialTypeId.iDialType:%d",aDialType ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_SETDIALTYPEID_1, "TSY: CMmCallTsy::SetDialTypeId.iDialType:%d",aDialType ); } // --------------------------------------------------------------------------- @@ -2565,7 +2571,7 @@ TUint8 CMmCallTsy::GetDialTypeId() { -TFLOGSTRING2("TSY: CMmCallTsy::GetDialType. iDialType:%d",iDialTypeId ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_GETDIALTYPEID_1, "TSY: CMmCallTsy::GetDialType. iDialType:%d",iDialTypeId ); return iDialTypeId; } @@ -2578,8 +2584,8 @@ void CMmCallTsy::CompleteDialNoFdn( TInt aResult ) { -TFLOGSTRING2("TSY: CMmCallTsy::CompleteDialNoFdn. Result:%d", aResult ); -TFLOGSTRING3("TSY: CMmCallTsy::CompleteDialNoFdn. Call Id:%d Call name:%S", iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIALNOFDN_1, "TSY: CMmCallTsy::CompleteDialNoFdn. Result:%d", aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_COMPLETEDIALNOFDN_2, "TSY: CMmCallTsy::CompleteDialNoFdn. Call Id:%d Call name:%S", iCallId, iCallName); //Set dial flag to false SetDialFlag( EFalse ); @@ -2629,8 +2635,7 @@ duration = tis.Int(); duration = duration % iMmPhone->KLifeTimeUpdateInterval; - TFLOGSTRING2("TSY: CMmCallTsy::UpdateLifeTimer - \ - duration: %d", duration); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_UPDATELIFETIMER_1, "TSY: CMmCallTsy::UpdateLifeTimer - \duration: %d", duration); //errors: trap and ignore CMmDataPackage dataPackage; @@ -2657,7 +2662,7 @@ TInt CMmCallTsy::FillMobileCallInfoDefaults( RMobileCall::TMobileCallInfoV1* aInfo ) { -TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfoDefaults"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFODEFAULTS_1, "TSY: CMmCallTsy::FillMobileCallInfoDefaults"); //set validity fields to 0 in the beginning. aInfo->iValid = 0; @@ -2692,7 +2697,7 @@ //ETrue if the call is an emergency call or EFalse if it is not. aInfo->iEmergency = iEmergencyCall; aInfo->iValid |= RMobileCall::KCallEmergency; -TFLOGSTRING("TSY: CMmCallTsy::FillMobileCallInfoDefaults end"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLTSY_FILLMOBILECALLINFODEFAULTS_2, "TSY: CMmCallTsy::FillMobileCallInfoDefaults end"); return KErrNone; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ //INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmconferencecalltsyTraces.h" +#endif + #include "cmmconferencecalltsy.h" #include "cmmphonetsy.h" #include "cmmtsyreqhandlestore.h" @@ -89,7 +95,7 @@ CMmConferenceCallTsy::~CMmConferenceCallTsy() { - TFLOGSTRING("TSY: CMmConferenceCallTsy::~CMmConferenceCallTsy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_DTOR_1, "TSY: CMmConferenceCallTsy::~CMmConferenceCallTsy"); if ( iMmPhone ) { @@ -230,8 +236,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { - TFLOGSTRING3("TSY: CMmConferenceCallTsy::DoExtFuncL.\n \t\t\t IPC:%d\n \t\t\t Handle:%d", - aIpc, aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_DOEXTFUNCL_1, "TSY: CMmConferenceCallTsy::DoExtFuncL.\n \t\t\t IPC:%d\n \t\t\t Handle:%d",aIpc, aTsyReqHandle); TInt ret( KErrNotSupported ); @@ -687,7 +692,7 @@ TInt CMmConferenceCallTsy::CreateConferenceL( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmConferenceCallTsy::CreateConferenceL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_CREATECONFERENCEL_1, "TSY: CMmConferenceCallTsy::CreateConferenceL"); //Store call object with status connected iConnectedCall = iMmPhone->CallList()->GetMmCallByStatus( RMobileCall::EStatusConnected ); @@ -723,7 +728,7 @@ void CMmConferenceCallTsy::CompleteCreateConference( TInt aResult ) { -TFLOGSTRING("TSY: CMmConferenceCallTsy::CompleteCreateConference"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETECREATECONFERENCE_1, "TSY: CMmConferenceCallTsy::CompleteCreateConference"); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeConferenceCallCreateConference ); @@ -780,7 +785,7 @@ const TTsyReqHandle aTsyReqHandle, const TName* aCallName ) { -TFLOGSTRING("TSY: CMmConferenceCallTsy::AddCallL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_ADDCALLL_1, "TSY: CMmConferenceCallTsy::AddCallL"); //set return value to KErrNotFound TInt ret( KErrNotFound ); @@ -816,7 +821,7 @@ void CMmConferenceCallTsy::CompleteAddCall( TInt aResult ) { -TFLOGSTRING2("TSY: CMmConferenceCallTsy::CompleteAddCall, Result: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_1, "TSY: CMmConferenceCallTsy::CompleteAddCall, Result: %d", aResult ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -827,7 +832,7 @@ { if ( (KErrNone == aResult) && (iAddCallName.Length() > 0) ) { -TFLOGSTRING("TSY: AddCall succeeded. AddCall request completed"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_2, "TSY: AddCall succeeded. AddCall request completed"); //notify call added using the call name received with AddCall //request CompleteNotifyConferenceEvent( iAddCallName, @@ -842,11 +847,11 @@ { //something special is needed here to handle a case where //CompleteAddCall fails - TFLOGSTRING("TSY: AddCall failed"); - TFLOGSTRING2("TSY: # of CC participants: %d", iNumOfCallsInConferenceCall ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_3, "TSY: AddCall failed"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_4, "TSY: # of CC participants: %d", iNumOfCallsInConferenceCall ); if ( 2 == iNumOfCallsInConferenceCall ) { - TFLOGSTRING("TSY: FIX FOR A ADDCALL & MT RELEASE CASE"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_5, "TSY: FIX FOR A ADDCALL & MT RELEASE CASE"); CMmCallTsy* mmCall = NULL; CMmCallList* callList = iMmPhone->CallList(); CMmCallGsmWcdmaExt* mmCallGsmWcdmaExt = NULL; @@ -858,12 +863,12 @@ mmCall = callList->GetMmCallByIndex(i); status = mmCall->MobileCallStatus(); - TFLOGSTRING2("TSY: Handling call, Call ID: %d", mmCall->CallId() ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_6, "TSY: Handling call, Call ID: %d", mmCall->CallId() ); if ( status == RMobileCall::EStatusHold || status == RMobileCall::EStatusConnected ) { - TFLOGSTRING("TSY: Status was Held or Connected, reconstructing capabilities"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_7, "TSY: Status was Held or Connected, reconstructing capabilities"); // Fetch the active call extension mmCallGsmWcdmaExt = static_cast( @@ -887,7 +892,7 @@ } else { - TFLOGSTRING("TSY: normal AddCall failure"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETEADDCALL_8, "TSY: normal AddCall failure"); } } ReqCompleted( reqHandle, aResult ); @@ -905,7 +910,7 @@ void CMmConferenceCallTsy::RemoveNonParticipatingCall() { - TFLOGSTRING("TSY: CMmConferenceCallTsy::RemoveNonParticipatingCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_1, "TSY: CMmConferenceCallTsy::RemoveNonParticipatingCall"); RMobileCall::TMobileCallStatus statusOfCallsInConference( RMobileCall::EStatusConnected); @@ -915,7 +920,7 @@ TInt numberOfCallInConference(0); TBool callReleased = EFalse; - TFLOGSTRING2("TSY: Conference status: %d", iStatus); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_2, "TSY: Conference status: %d", iStatus); if ( iStatus == RMobileConferenceCall::EConferenceHold ) { @@ -935,7 +940,7 @@ CompleteNotifyConferenceEvent( mmCall->CallName(), RMobileConferenceCall::EConferenceCallRemoved ); -TFLOGSTRING("TSY: Call removed from conference." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_3, "TSY: Call removed from conference." ); } else if ( status == statusOfCallsInConference ) { @@ -944,7 +949,7 @@ } if ( mmCall->IsRemoteReleasedCall() ) { -TFLOGSTRING("TSY: One call is remote released"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_4, "TSY: One call is remote released"); callReleased = ETrue; } } @@ -952,7 +957,7 @@ iNumOfCallsInConferenceCall == 3 && callReleased ) { iNumOfCallsInConferenceCall--; - TFLOGSTRING("TSY: number of calls in conference decremented"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_5, "TSY: number of calls in conference decremented"); } } @@ -968,7 +973,7 @@ TInt CMmConferenceCallTsy::SwapL( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmConferenceCallTsy::SwapL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_SWAPL_1, "TSY: CMmConferenceCallTsy::SwapL"); //direct request to extension TInt ret = iMmConferenceCallExtInterface->SwapL( iStatus, iMmPhone->CallList() ); @@ -997,7 +1002,7 @@ void CMmConferenceCallTsy::CompleteSwap( TInt aResult ) { -TFLOGSTRING("TSY: CMmConferenceCallTsy::CompleteSwap"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETESWAP_1, "TSY: CMmConferenceCallTsy::CompleteSwap"); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeConferenceCallSwap ); @@ -1151,7 +1156,7 @@ const TTsyReqHandle aTsyReqHandle, RMobileConferenceCall::TMobileConferenceStatus* aStatus ) { -TFLOGSTRING2("TSY: CMmConferenceCallTsy::GetConferenceStatus. iStatus:%d", iStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_GETCONFERENCESTATUS_1, "TSY: CMmConferenceCallTsy::GetConferenceStatus. iStatus:%d", iStatus ); *aStatus = iStatus; ReqCompleted( aTsyReqHandle, KErrNone ); @@ -1223,7 +1228,7 @@ TBool conferenceStatusChanged( EFalse ); RMobileConferenceCall::TMobileConferenceStatus oldStatus = iStatus; -TFLOGSTRING2("TSY: CMmConferenceCallTsy::CompleteNotifyConferenceStatusChange. oldStatus:%d", oldStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCESTATUSCHANGE_1, "TSY: CMmConferenceCallTsy::CompleteNotifyConferenceStatusChange. oldStatus:%d", oldStatus ); iMmConferenceCallExtInterface->GetNewStatus( &iStatus ); switch( iStatus ) @@ -1294,7 +1299,7 @@ if ( ( EMultimodeConferenceCallReqHandleUnknown != reqHandle ) && conferenceStatusChanged ) { -TFLOGSTRING2("TSY: CMmConferenceCallTsy::CompleteNotifyConferenceStatusChange. Cur. iStatus:%d", iStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCESTATUSCHANGE_2, "TSY: CMmConferenceCallTsy::CompleteNotifyConferenceStatusChange. Cur. iStatus:%d", iStatus ); //reset req handle. iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeConferenceCallStatusChangeNotification ); @@ -1377,7 +1382,7 @@ const TName& aName, RMobileConferenceCall::TMobileConferenceEvent aEvent ) { -TFLOGSTRING2("TSY: CMmConferenceCallTsy::CompleteNotifyConferenceEvent.aEvent:%d", aEvent ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCEEVENT_1, "TSY: CMmConferenceCallTsy::CompleteNotifyConferenceEvent.aEvent:%d", aEvent ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeConferenceCallConferenceEventNotification ); @@ -1598,7 +1603,7 @@ // void CMmConferenceCallTsy::ResetAttributes() { -TFLOGSTRING("TSY: CMmConferenceCallTsy::ResetAttributes." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_RESETATTRIBUTES_1, "TSY: CMmConferenceCallTsy::ResetAttributes." ); //Name of the call to be added to Conference call iAddCallName.Zero(); //Conference call capabilities @@ -1756,8 +1761,7 @@ const TTsyReqHandle aTsyReqHandle, const TInt aError ) { - TFLOGSTRING3("TSY: CMmConferenceCallTsy::Request Completed. \n\t\t\tHandle:%d\n\t\t\t Error:%d", - aTsyReqHandle, aError); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCONFERENCECALLTSY_REQCOMPLETED_1, "TSY: CMmConferenceCallTsy::Request Completed. \n\t\t\tHandle:%d\n\t\t\t Error:%d",aTsyReqHandle, aError); //call original ReqCompleted from CTelObject CTelObject::ReqCompleted( aTsyReqHandle, aError ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmdatacalltsyTraces.h" +#endif + #include "cmmdatacalltsy.h" #include "cmmdatalinetsy.h" #include "cmmphonetsy.h" @@ -43,7 +49,7 @@ TDes& aName, CMmMessageManagerBase* aMessageManager ) { -TFLOGSTRING2("TSY: CMmDataCallTsy::NewL. Call name: %S", &aName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_NEWL_1, "TSY: CMmDataCallTsy::NewL. Call name: %S", aName); CMmDataCallTsy* mmCall = NULL; @@ -67,8 +73,7 @@ CMmDataCallTsy::~CMmDataCallTsy() { -TFLOGSTRING3("TSY: CMmDataCallTsy::~CMmDataCallTsy - Call deleted iCallId: %d iCallName: %S", - iCallId, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DTOR_1, "TSY: CMmDataCallTsy::~CMmDataCallTsy - 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, @@ -145,8 +150,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmDataCallTsy::DoExtFuncL - IPC: %d Handle: %d", - aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DOEXTFUNCL_1, "TSY: CMmDataCallTsy::DoExtFuncL - IPC: %d Handle: %d",aIpc, aTsyReqHandle); TInt ret( KErrNone ); @@ -285,7 +289,7 @@ CTelObject::TReqMode CMmDataCallTsy::ReqModeL( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmDataCallTsy::ReqModeL - IPC: %d", aIpc); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_REQMODEL_1, "TSY: CMmDataCallTsy::ReqModeL - IPC: %d", aIpc); CTelObject::TReqMode ret( 0 ); // default return value @@ -531,8 +535,7 @@ const TInt aIpc, const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING3("TSY: CMmDataCallTsy::CancelService - IPC: %d, Req handle: %d", - aIpc, aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CANCELSERVICE_1, "TSY: CMmDataCallTsy::CancelService - IPC: %d, Req handle: %d",aIpc, aTsyReqHandle); TInt ret( KErrNone ); @@ -637,10 +640,8 @@ callDataPackage->UnPackData( callStatus ); - TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteNotifyStatusChange - \ - aResult: %d", aResult ); - TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteNotifyStatusChange - \ - Call status: %d, Call name: %S", callStatus, &iCallName); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange - \aResult: %d", aResult ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_2, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange - \Call status: %d, Call name: %S", callStatus, iCallName); switch( callStatus ) { @@ -760,12 +761,12 @@ if ( 0 < dialCancelHandle ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_3, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDial"); HangUp( dialCancelHandle ); } else if ( 0 < dialCancelHandleNoFdn ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialNoFdnCheck"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_4, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialNoFdnCheck"); HangUp( dialCancelHandleNoFdn ); } else @@ -802,7 +803,7 @@ // Check if the call is for Call Back functionality. // E.g. client has dialled server, which calls back to // save user the data call charging. - TFLOGSTRING("TSY: CMmDataCallTsy::Check for waiting call"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_5, "TSY: CMmDataCallTsy::Check for waiting call"); if ( this == iMmPhone->WaitingCallForData() ) { // Client has already tried to answer the incoming @@ -837,7 +838,7 @@ // it with CALL_CAUSE_NOT_ALLOWED if( RCall::EStatusAnswering == call->Status() ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteNotifyStatusChange Answering not allowed!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_6, "TSY: CMmDataCallTsy::CompleteNotifyStatusChange Answering not allowed!"); TInt errorValue = CMmCommonStaticUtility::EpocErrorCode( KErrAccessDenied, KErrMMEtelCallForbidden ); @@ -1043,14 +1044,13 @@ const TDesC8* aCallParams, TDesC* aTelNumber ) { -TFLOGSTRING3("TSY: CMmDataCallTsy::Dial - Req handle: %d, Call name: %S", - aTsyReqHandle, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_1, "TSY: CMmDataCallTsy::Dial - Req handle: %u, Call name: %S",aTsyReqHandle, iCallName); if( aCallParams->Length()!= 0) { if(sizeof(RCall::TCallParams) > aCallParams->Length()) { - TFLOGSTRING ("TSY: CMmDataCallTsy::Dial bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_2, "TSY: CMmDataCallTsy::Dial bad size argument"); // Complete the request with appropiate error return KErrArgument; } @@ -1070,7 +1070,7 @@ if(!dialFlag ) { -TFLOGSTRING("TSY: CMmDataCallTsy::Dial ONGOING" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_3, "TSY: CMmDataCallTsy::Dial ONGOING" ); SetDialFlag( ETrue ); TTsyReqHandle dialHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeCallDial ); @@ -1083,7 +1083,7 @@ if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() ) { - TFLOGSTRING("TSY: Offline mode ON, Dial request is not allowed" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_4, "TSY: Offline mode ON, Dial request is not allowed" ); TInt ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); @@ -1098,7 +1098,7 @@ // is still in use. // Complete request with status value informing the client // about the situation. - TFLOGSTRING("TSY: CMmDataCallTsy::Dial - KErrNotReady"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_5, "TSY: CMmDataCallTsy::Dial - KErrNotReady"); ReqCompleted( aTsyReqHandle, KErrNotReady ); } else if ( 0 < dialHandle ) @@ -1106,7 +1106,7 @@ // The request is already in processing because of previous request // Complete request with status value informing the client about // the situation. - TFLOGSTRING("TSY: CMmDataCallTsy::Dial - KErrServerBusy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_6, "TSY: CMmDataCallTsy::Dial - KErrServerBusy"); ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -1170,7 +1170,7 @@ if ( KErrNone == ret ) { - TFLOGSTRING("TSY: CMmDataCallTsy::Dial - DialDataCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIAL_7, "TSY: CMmDataCallTsy::Dial - DialDataCall"); TRAP( trapError, ret = iMmCallExtInterface->DialDataCallL( iCallMode, aCallParams, aTelNumber ); @@ -1231,9 +1231,8 @@ void CMmDataCallTsy::CompleteDial( TInt aResult ) { -TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteDial - Result: %d", aResult ); -TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteDial - Call Id: %d, Call name: %S", - iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIAL_1, "TSY: CMmDataCallTsy::CompleteDial - Result: %d", aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIAL_2, "TSY: CMmDataCallTsy::CompleteDial - Call Id: %d, Call name: %S",iCallId, iCallName); // Set dial flag to false SetDialFlag( EFalse ); @@ -1286,8 +1285,7 @@ const TTsyReqHandle aTsyReqHandle, const TDesC8* ) { -TFLOGSTRING2("TSY: CMmDataCallTsy::AnswerIncomingCall. \n\t\t\t Handle: %d", - aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_ANSWERINCOMINGCALL_1, "TSY: CMmDataCallTsy::AnswerIncomingCall. \n\t\t\t Handle: %d",aTsyReqHandle); TTsyReqHandle answerCallHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeCallAnswer ); @@ -1400,8 +1398,7 @@ TInt CMmDataCallTsy::AnswerIncomingCallCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmDataCallTsy::AnswerIncomingCallCancel. Req handle: %d, Call name: %S", - aTsyReqHandle, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_ANSWERINCOMINGCALLCANCEL_1, "TSY: CMmDataCallTsy::AnswerIncomingCallCancel. Req handle: %u, Call name: %S",aTsyReqHandle, iCallName); TInt ret( KErrNone ); @@ -1419,8 +1416,7 @@ } else { -TFLOGSTRING2("TSY: CMmDataCallTsy::AnswerIncomingCallCancel -- iCallStatus = %d", - iCallStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_ANSWERINCOMINGCALLCANCEL_2, "TSY: CMmDataCallTsy::AnswerIncomingCallCancel -- iCallStatus = %d", iCallStatus); if ( RCall::EStatusUnknown == iCallStatus ) { // Cancel automatic answering @@ -1464,10 +1460,8 @@ void CMmDataCallTsy::CompleteAnswerIncomingCall( TInt aResult ) { -TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteAnswerIncomingCall - Result: %d", - aResult ); -TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteAnswerIncomingCall - Call Id: %d, Call name: %S", - iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEANSWERINCOMINGCALL_1, "TSY: CMmDataCallTsy::CompleteAnswerIncomingCall - Result: %d",aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEANSWERINCOMINGCALL_2, "TSY: CMmDataCallTsy::CompleteAnswerIncomingCall - Call Id: %d, Call name: %S",iCallId, iCallName); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = @@ -1529,8 +1523,7 @@ TInt CMmDataCallTsy::HangUp( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmDataCallTsy::HangUp - Req. handle: %d, Call name: %S", - aTsyReqHandle, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_HANGUP_1, "TSY: CMmDataCallTsy::HangUp - Req. handle: %u, Call name: %S",aTsyReqHandle, iCallName); TInt hangUpCause( KErrNone ); TInt ret( KErrNone ); @@ -1547,7 +1540,7 @@ //The request is already in processing because of previous request //Complete request with status value informing the client about //the situation. -TFLOGSTRING("TSY: CMmDataCallTsy::HangUp - KErrServerBusy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_HANGUP_2, "TSY: CMmDataCallTsy::HangUp - KErrServerBusy"); ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else if ( RCall::EStatusIdle == iCallStatus && @@ -1555,7 +1548,7 @@ { //Call object is already in idle state. Complete HangUp request with //error. -TFLOGSTRING("TSY: CMmDataCallTsy::HangUp - KErrNotReady"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_HANGUP_3, "TSY: CMmDataCallTsy::HangUp - KErrNotReady"); ReqCompleted( aTsyReqHandle, KErrNotReady ); } else @@ -1591,7 +1584,7 @@ //ownership. if ( RCall::EStatusRinging == iCallStatus ) { - TFLOGSTRING("TSY: CMmDataCallTsy::HangUp - Reject incoming call"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_HANGUP_4, "TSY: CMmDataCallTsy::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 @@ -1668,10 +1661,8 @@ void CMmDataCallTsy::CompleteHangUp( TInt aResult ) { -TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteHangUp.\n \t\t\t Result: %d", - aResult ); -TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteHangUp - Call Id: %d, Call name: %S", - iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_1, "TSY: CMmDataCallTsy::CompleteHangUp.\n \t\t\t Result: %d",aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_2, "TSY: CMmDataCallTsy::CompleteHangUp - Call Id: %d, Call name: %S", iCallId, iCallName); TInt ret( KErrNone ); @@ -1738,21 +1729,21 @@ // Complete for DialCancel or AnswerIncomingCallCancel, success else if ( KErrNone == aResult ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_3, "TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallDial"); // Find out if this is cancelling of Dial TTsyReqHandle cancelHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallDial ); if ( NULL == cancelHandle ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallDialNoFdnCheck"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_4, "TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallDialNoFdnCheck"); // Find out if this is cancelling of DialNoFdnCheck cancelHandle = iTsyReqHandleStore-> ResetTsyReqHandle( EMultimodeCallDialNoFdnCheck ); if ( NULL == cancelHandle ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallAnswer"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_5, "TSY: CMmDataCallTsy::CompleteHangUp - EMultimodeCallAnswer"); // Find out if this is cancelling of AnswerIncomingCall cancelHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallAnswer ); @@ -1761,7 +1752,7 @@ if ( 0 < cancelHandle ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp with KErrCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_6, "TSY: CMmDataCallTsy::CompleteHangUp with KErrCancel"); // Complete with error value KErrCancel ReqCompleted( cancelHandle, KErrCancel ); @@ -1794,7 +1785,7 @@ if ( NULL == cancelHandle ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - cancelling of EMultimodeCallDialNoFdnCheck"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_7, "TSY: CMmDataCallTsy::CompleteHangUp - cancelling of EMultimodeCallDialNoFdnCheck"); // Find out if this is cancelling of DialNoFdnCheck TTsyReqHandle cancelHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -1802,7 +1793,7 @@ if ( NULL == cancelHandle ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - cancelling of AnswerIncomingCall"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_8, "TSY: CMmDataCallTsy::CompleteHangUp - cancelling of AnswerIncomingCall"); // Find out if this is cancelling of AnswerIncomingCall cancelHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallAnswer ); @@ -1813,7 +1804,7 @@ // Cancel to Dial or AnswerIncomingCall if ( 0 < cancelHandle ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteHangUp - with KErrNone"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEHANGUP_9, "TSY: CMmDataCallTsy::CompleteHangUp - with KErrNone"); // Complete with success (KErrNone) ReqCompleted( cancelHandle, KErrNone ); @@ -2244,11 +2235,11 @@ { //Incoming call detected, which is directed to this call object //which should be waiting for incoming call - TFLOGSTRING("TSY: CMmDataCallTsy::CallComingForWaitingCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CALLCOMINGFORWAITINGCALL_1, "TSY: CMmDataCallTsy::CallComingForWaitingCall"); TInt ret( KErrNone ); - TFLOGSTRING("TSY: CMmDataCallTsy::AnswerIncomingCall - Data call"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CALLCOMINGFORWAITINGCALL_2, "TSY: CMmDataCallTsy::AnswerIncomingCall - Data call"); //Answer incoming call TRAPD( trapError, ret = iMmCallExtInterface->AnswerIncomingDataCallL( iCallId ); @@ -2294,8 +2285,7 @@ const TTsyReqHandle aTsyReqHandle, RCall::TCommPort* aCommPort ) { -TFLOGSTRING2("TSY: CMmDataCallTsy::LoanDataPort - Client taking control: %S", - &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_LOANDATAPORT_1, "TSY: CMmDataCallTsy::LoanDataPort - Client taking control: %S",iCallName ); TInt ret( KErrNone ); @@ -2405,8 +2395,7 @@ TInt CMmDataCallTsy::RecoverDataPort( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmDataCallTsy::RecoverDataPort - Client returning control: %S", - &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_RECOVERDATAPORT_1, "TSY: CMmDataCallTsy::RecoverDataPort - Client returning control: %S",iCallName ); TInt ret( KErrNone ); @@ -2465,8 +2454,7 @@ // TInt CMmDataCallTsy::RecoverDataPortAndRelinquishOwnership() { -TFLOGSTRING2("TSY: CMmDataCallTsy::RecoverDataPortAndRelinquishOwnership - \ - Client returning control: %S", &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_RECOVERDATAPORTANDRELINQUISHOWNERSHIP_1, "TSY: CMmDataCallTsy::RecoverDataPortAndRelinquishOwnership - \Client returning control: %S", iCallName ); TInt ret( KErrNone ); @@ -2543,7 +2531,7 @@ const TTsyReqHandle aTsyReqHandle, const TDesC8* aCallParams ) { -TFLOGSTRING("TSY: CMmDataCallTsy::Connect"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CONNECT_1, "TSY: CMmDataCallTsy::Connect"); if ( CheckOwnership( aTsyReqHandle ) == CCallBase::EOwnedUnowned ) { SetOwnership( aTsyReqHandle ); @@ -2577,7 +2565,7 @@ } if(sizeof(RMobileCall::TMobileCallParamsV1) > aCallParams->Length()) { - TFLOGSTRING ("TSY: CMmDataCallTsy::Connect bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_CONNECT_2, "TSY: CMmDataCallTsy::Connect bad size argument"); // Complete the request with appropiate error return KErrArgument; } @@ -2802,8 +2790,7 @@ TInt ret( KErrNone ); // HSCSD parameters can be set only if this call has been opened // from the phone's data line. -TFLOGSTRING3("TSY: CMmDataCallTsy::SetDynamicHscsdParams.\n \t\t\t Air Intrf: %d\n \t\t\t RX slots: %d", - *aAiur, *aRxTimeslots); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_SETDYNAMICHSCSDPARAMS_1, "TSY: CMmDataCallTsy::SetDynamicHscsdParams.\n \t\t\t Air Intrf: %d\n \t\t\t RX slots: %d", *aAiur, *aRxTimeslots); iReqHandleType = EMultimodeCallSetDynamicHscsdParams; @@ -2843,7 +2830,7 @@ void CMmDataCallTsy::CompleteSetDynamicHscsdParams( TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteSetDynamicHscsdParams"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETESETDYNAMICHSCSDPARAMS_1, "TSY: CMmDataCallTsy::CompleteSetDynamicHscsdParams"); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallSetDynamicHscsdParams ); @@ -2864,7 +2851,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aHSCSDInfo ) { -TFLOGSTRING("TSY: CMmDataCallTsy::GetCurrentHscsdInfo"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_GETCURRENTHSCSDINFO_1, "TSY: CMmDataCallTsy::GetCurrentHscsdInfo"); TInt ret( KErrNone ); // HSCSD info can be read only if this call has been opened from the // phone's data line and call is connected. @@ -2950,7 +2937,7 @@ // void CMmDataCallTsy::CompleteNotifyHscsdInfoChange() { -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteNotifyHscsdInfoChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETENOTIFYHSCSDINFOCHANGE_1, "TSY: CMmDataCallTsy::CompleteNotifyHscsdInfoChange"); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeCallNotifyHscsdInfoChange ); @@ -2990,8 +2977,7 @@ const TDesC8* aCallParams, TDesC* aTelNumber ) { -TFLOGSTRING3("TSY: CMmDataCallTsy::DialNoFdnCheck - Req handle: %d, Call name: %S", - aTsyReqHandle, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_1, "TSY: CMmDataCallTsy::DialNoFdnCheck - Req handle: %u, Call name: %S",aTsyReqHandle, iCallName); CMmCallList* callList = iMmPhone->CallList(); TBool dialFlag( EFalse ); @@ -3008,7 +2994,7 @@ if( !dialFlag ) { -TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck ONGOING" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_2, "TSY: CMmDataCallTsy::DialNoFdnCheck ONGOING" ); SetDialFlag( ETrue ); @@ -3023,11 +3009,11 @@ if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() ) { -TFLOGSTRING("TSY: CMmDataCallTsy - DialNoFdnCheck - Offline mode ON, Dial request is not allowed" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_3, "TSY: CMmDataCallTsy - DialNoFdnCheck - Offline mode ON, Dial request is not allowed" ); TInt ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); SetDialFlag( EFalse ); -TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck - RF inactive -> dial-flag false" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_4, "TSY: CMmDataCallTsy::DialNoFdnCheck - RF inactive -> dial-flag false" ); // Complete the request with appropiate error ReqCompleted ( aTsyReqHandle, ret ); } @@ -3039,7 +3025,7 @@ // is still in use. // Complete request with status value informing the client // about the situation. -TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck - KErrNotReady"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_5, "TSY: CMmDataCallTsy::DialNoFdnCheck - KErrNotReady"); ReqCompleted( aTsyReqHandle, KErrNotReady ); } else if ( 0 < dialHandle ) @@ -3047,7 +3033,7 @@ // Request is already in processing because of previous request // Complete request with status value informing the client about // the situation. -TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck - KErrServerBusy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_6, "TSY: CMmDataCallTsy::DialNoFdnCheck - KErrServerBusy"); ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -3103,7 +3089,7 @@ { SetDialTypeId( KMultimodeCallTypeIDNoFdnCheck ); -TFLOGSTRING("TSY: CMmDataCallTsy::DialNoFdnCheck - DialDataCall"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_DIALNOFDNCHECK_7, "TSY: CMmDataCallTsy::DialNoFdnCheck - DialDataCall"); TRAP( trapError, ret = iMmCallExtInterface->DialDataCallL( iCallMode, aCallParams, aTelNumber ); @@ -3167,9 +3153,8 @@ void CMmDataCallTsy::CompleteDialNoFdn( TInt aResult ) { -TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteDialNoFdn - Result: %d", aResult ); -TFLOGSTRING3("TSY: CMmDataCallTsy::CompleteDialNoFdn - Call Id: %d, Call name: %S", - iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIALNOFDN_1, "TSY: CMmDataCallTsy::CompleteDialNoFdn - Result: %d", aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIALNOFDN_2, "TSY: CMmDataCallTsy::CompleteDialNoFdn - Call Id: %d, Call name: %S",iCallId, iCallName); // Set dial flag to false SetDialFlag( EFalse ); @@ -3193,10 +3178,10 @@ //complete caps change notification CompleteNotifyCapsChange(); } -TFLOGSTRING2("TSY: CMmDataCallTsy::CompleteDialNoFdn before ReqComplete %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIALNOFDN_3, "TSY: CMmDataCallTsy::CompleteDialNoFdn before ReqComplete %d", aResult ); ReqCompleted( reqHandle, aResult ); -TFLOGSTRING("TSY: CMmDataCallTsy::CompleteDialNoFdn - set dialtype to none "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_COMPLETEDIALNOFDN_4, "TSY: CMmDataCallTsy::CompleteDialNoFdn - set dialtype to none "); //Set dial type to none SetDialTypeId( KMultimodeCallTypeDialNone ); } @@ -3231,7 +3216,7 @@ //Overloads CTelObject::ReqCompleted for logging purposes. It //prints the aTsyReqHandle and aError variable in the log file and then //calls CTelObject::ReqCompleted. -TFLOGSTRING3("TSY: CMmDataCallTsy::Request Completed. Handle:%d Error:%d", aTsyReqHandle, aError); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATACALLTSY_REQCOMPLETED_1, "TSY: CMmDataCallTsy::Request Completed. Handle:%d Error:%d", aTsyReqHandle, aError); CTelObject::ReqCompleted(aTsyReqHandle,aError); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatalinetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatalinetsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatalinetsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ //INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmdatalinetsyTraces.h" +#endif + #include "cmmdatalinetsy.h" #include "cmmphonetsy.h" #include "cmmdatacalltsy.h" @@ -37,7 +43,7 @@ void CMmDataLineTsy::ConstructL() { -TFLOGSTRING("TSY: CMmDataLineTsy::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_CONSTRUCTL_1, "TSY: CMmDataLineTsy::ConstructL"); CMmLineTsy::ConstructL(); } @@ -48,7 +54,7 @@ const TDesC& aName, CMmMessageManagerBase* aMessageManager ) { -TFLOGSTRING2("TSY: CMmDataLineTsy::NewL - Data line %S created", &aName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_NEWL_1, "TSY: CMmDataLineTsy::NewL - Data line %S created", aName); CMmDataLineTsy* mmLineTsy = NULL; if ( NULL != aMmPhone && RMobilePhone::ECircuitDataService == aMode ) @@ -69,8 +75,7 @@ CMmDataLineTsy::~CMmDataLineTsy() { -TFLOGSTRING2("TSY: CMmDataLineTsy::~CMmDataLineTsy - Line name: %S", - &iLineName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_DTOR_1, "TSY: CMmDataLineTsy::~CMmDataLineTsy - Line name: %S",iLineName); } @@ -252,8 +257,7 @@ reinterpret_cast(aDataPackage); callDataPackage->GetCallIdAndMode( callId, callMode ); -TFLOGSTRING3("TSY: CMmDataLineTsy::CompleteNotifyIncomingCall - \ - Line name: %S, Call id: %d", &iLineName, callId ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYINCOMINGCALL_1, "TSY: CMmDataLineTsy::CompleteNotifyIncomingCall - \Line name: %S, Call id: %d", iLineName, callId ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -419,7 +423,7 @@ void CMmDataLineTsy::CompleteNotifyDiallingStatus( CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_1, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus"); TInt callId( -1 ); TBool ghostCall( EFalse ); @@ -436,8 +440,7 @@ if ( NULL == mmCall ) { - TFLOGSTRING("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - \ - GhostCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_2, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - \GhostCall"); ghostCall = ETrue; } else @@ -453,8 +456,8 @@ resultNoFdnCheck = mmCall->IsServiceLocallyRequested( CMmCallTsy::EMultimodeCallDialNoFdnCheck ); -TFLOGSTRING2("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - IsDial: %d", result ); -TFLOGSTRING2("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - IsDialNoFdnCheck: %d", resultNoFdnCheck ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_3, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - IsDial: %d", result ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_4, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - IsDialNoFdnCheck: %d", resultNoFdnCheck ); if ( result || resultNoFdnCheck ) { @@ -470,7 +473,7 @@ CMmCallTsy::EMultimodeCallDialNoFdnCheck ) ) ) { mmCall->SetCallId( callId ); -TFLOGSTRING2("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_5, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId); mmCall->CompleteNotifyMobileCallInfoChange( aDataPackage ); break; @@ -479,14 +482,14 @@ } else { -TFLOGSTRING("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - Dial not found"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_6, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus - Dial not found"); ghostCall = ETrue; } } //Ghost call handling starts here if ( ghostCall ) { -TFLOGSTRING("TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus -> CompleteNotifyAddBypassingCall"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_7, "TSY: CMmDataLineTsy::CompleteNotifyDiallingStatus -> CompleteNotifyAddBypassingCall"); //complete call added notification directly from here CompleteNotifyAddBypassingCall( aDataPackage ); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,9 +16,14 @@ //INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmdtmftsyTraces.h" +#endif + #include "cmmdtmftsy.h" #include -#include // include internal Tsy classes #include "cmmphonetsy.h" @@ -59,7 +64,7 @@ CMmDtmfTsy::~CMmDtmfTsy() { - TFLOGSTRING("TSY: CMmDtmfTsy::~CMmDtmfTsy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_DTOR_1, "TSY: CMmDtmfTsy::~CMmDtmfTsy"); if (iMmPhone ) { // deregister tsy object from message manager @@ -145,7 +150,7 @@ // --------------------------------------------------------------------------- TInt CMmDtmfTsy::NotifyDTMFEvent( TInt* aInfo ) { -TFLOGSTRING("TSY: CMmDtmfTsy::NotifyDTMFEvent"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_NOTIFYDTMFEVENT_1, "TSY: CMmDtmfTsy::NotifyDTMFEvent"); iDtmfInfo = aInfo; // save pointer to client data @@ -162,7 +167,7 @@ // void CMmDtmfTsy::CompleteNotifyDTMFEvent( TInt aInfo ) { -TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyDtmfEvent"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETENOTIFYDTMFEVENT_1, "TSY: CMmCustomTsy::CompleteNotifyDtmfEvent"); // reset request handle. Returns the deleted req handle. TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( @@ -183,7 +188,7 @@ // --------------------------------------------------------------------------- TInt CMmDtmfTsy::NotifyDTMFEventCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmDtmfTsy::NotifyDtmfEventCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_NOTIFYDTMFEVENTCANCEL_1, "TSY: CMmDtmfTsy::NotifyDtmfEventCancel"); iDtmfInfo = NULL; TTsyReqHandle reqHandle = @@ -452,7 +457,7 @@ // TInt CMmDtmfTsy::SendDTMFTonesCancelL() { -TFLOGSTRING("TSY: CMmDtmfTsy::SendDTMFTonesCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_SENDDTMFTONESCANCELL_1, "TSY: CMmDtmfTsy::SendDTMFTonesCancel"); TTsyReqHandle sendDTMFTonesHandle = iMmPhone->iTsyReqHandleStore->GetTsyReqHandle( @@ -486,7 +491,7 @@ void CMmDtmfTsy::CompleteSendDTMFTonesCancel( TInt aResult ) { -TFLOGSTRING("TSY: CMmDtmfTsy::CompleteSendDTMFTonesCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETESENDDTMFTONESCANCEL_1, "TSY: CMmDtmfTsy::CompleteSendDTMFTonesCancel"); // Get req handle. TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->GetTsyReqHandle( @@ -608,7 +613,7 @@ // TInt CMmDtmfTsy::NotifyStopInDTMFString() { -TFLOGSTRING("TSY: CMmDtmfTsy::NotifyStopInDTMFString"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_NOTIFYSTOPINDTMFSTRING_1, "TSY: CMmDtmfTsy::NotifyStopInDTMFString"); //Set TSY request handle type iMmPhone->iReqHandleType = CMmPhoneTsy::EMultimodePhoneNotifyStopInDTMFString; @@ -643,7 +648,7 @@ void CMmDtmfTsy::CompleteNotifyStopInDTMFString( CMmDataPackage* aDataPackage ) { -TFLOGSTRING("TSY: CMmDtmfTsy::CompleteNotifyStopInDTMFString"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETENOTIFYSTOPINDTMFSTRING_1, "TSY: CMmDtmfTsy::CompleteNotifyStopInDTMFString"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneNotifyStopInDTMFString ); @@ -670,7 +675,7 @@ TBool aContinue ) { -TFLOGSTRING2("TSY: CMmDtmfTsy::ContinueDTMFStringSendingL aContinue:%d",aContinue); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_CONTINUEDTMFSTRINGSENDINGL_1, "TSY: CMmDtmfTsy::ContinueDTMFStringSendingL aContinue:%d",aContinue); TInt ret( KErrNone ); TTsyReqHandle sendDTMFTonesHandle = @@ -764,7 +769,8 @@ { // get call status RCall::TStatus callStatus = mmCall->Status(); - if ( RCall::EStatusConnected == callStatus) + // Check if the call state is one that suggests that someone will listen to a DTMF. + if (( RCall::EStatusConnected == callStatus ) || ( RCall::EStatusDialling == callStatus )|| ( RCall::EStatusConnecting == callStatus )) { // get service type of call RMobileCall::TMobileCallInfoV1 info; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsywithdispatcher.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsywithdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsywithdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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,12 +20,17 @@ * in CTSY for use when the CTSY is used with the CTSY Dispatcher. */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmdtmftsywithdispatcherTraces.h" +#endif + #include "cmmdtmftsy.h" #include "cmmphonetsy.h" #include "cmmtsyreqhandlestore.h" #include "cmmcalllist.h" #include "cmmcalltsy.h" -#include /** * Starts sending a single DTMF digit. @@ -40,7 +45,7 @@ */ TInt CMmDtmfTsy::StartDTMFToneL(const TTsyReqHandle aTsyReqHandle, TChar* aTone) { - TFLOGSTRING("TSY: CMmDtmfTsy::StartDTMFToneL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_STARTDTMFTONEL_1, "TSY: CMmDtmfTsy::StartDTMFToneL"); TInt ret = KErrServerBusy; @@ -101,7 +106,7 @@ */ TInt CMmDtmfTsy::StopDTMFToneL(const TTsyReqHandle aTsyReqHandle) { - TFLOGSTRING("TSY: CMmDtmfTsy::StopDTMFToneL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_STOPDTMFTONEL_1, "TSY: CMmDtmfTsy::StopDTMFToneL"); TInt ret = KErrServerBusy; @@ -156,7 +161,7 @@ */ void CMmDtmfTsy::CompleteStartDTMFTone(TInt aResult) { - TFLOGSTRING2("TSY: CMmDtmfTsy::CompleteStartDTMFTone aResult=%d", aResult); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETESTARTDTMFTONE_1, "TSY: CMmDtmfTsy::CompleteStartDTMFTone aResult=%d", aResult); TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( @@ -176,7 +181,7 @@ */ void CMmDtmfTsy::CompleteStopDTMFTone(TInt aResult) { - TFLOGSTRING2("TSY: CMmDtmfTsy::CompleteStopDTMFTone aResult=%d", aResult); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_COMPLETESTOPDTMFTONE_1, "TSY: CMmDtmfTsy::CompleteStopDTMFTone aResult=%d", aResult); TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( @@ -197,7 +202,7 @@ */ TInt CMmDtmfTsy::SendDTMFTonesL(const TTsyReqHandle aTsyReqHandle, const TDesC* aTones) { - TFLOGSTRING("TSY: CMmDtmfTsy::SendDTMFTonesL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_SENDDTMFTONESL_1, "TSY: CMmDtmfTsy::SendDTMFTonesL"); TTsyReqHandle sendDTMFTonesHandle = iMmPhone->iTsyReqHandleStore ->GetTsyReqHandle(CMmPhoneTsy::EMultimodePhoneSendDTMFTones); @@ -295,7 +300,7 @@ // TInt CMmDtmfTsy::SendDTMFTonesCancelL() { -TFLOGSTRING("TSY: CMmDtmfTsy::SendDTMFTonesCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMDTMFTSY_SENDDTMFTONESCANCELL1_1, "TSY: CMmDtmfTsy::SendDTMFTonesCancel"); TTsyReqHandle sendDTMFTonesHandle = iMmPhone->iTsyReqHandleStore->GetTsyReqHandle( diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ //INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmfaxcalltsyTraces.h" +#endif + #include "cmmfaxcalltsy.h" #include "cmmfaxlinetsy.h" #include "cmmphonetsy.h" @@ -42,7 +48,7 @@ TDes& aName, CMmMessageManagerBase* aMessageManager ) { - TFLOGSTRING2("TSY: CMmFaxCallTsy::NewL. Call name: %S", &aName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_NEWL_1, "TSY: CMmFaxCallTsy::NewL. Call name: %S", aName); CMmFaxCallTsy* mmCall = NULL; @@ -66,8 +72,7 @@ CMmFaxCallTsy::~CMmFaxCallTsy() { - TFLOGSTRING3("TSY: CMmFaxCallTsy::~CMmFaxCallTsy. Call deleted \ - iCallId:%d iCallName:%S", iCallId, &iCallName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DTOR_1, "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, @@ -201,8 +206,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { - TFLOGSTRING3("TSY: CMmFaxCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc, - aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DOEXTFUNCL_1, "TSY: CMmFaxCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc, aTsyReqHandle); TInt ret( KErrNone ); @@ -306,7 +310,7 @@ CTelObject::TReqMode CMmFaxCallTsy::ReqModeL( const TInt aIpc ) { - TFLOGSTRING2("TSY: CMmFaxCallTsy::ReqModeL. IPC:%d",aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_REQMODEL_1, "TSY: CMmFaxCallTsy::ReqModeL. IPC:%d",aIpc); CTelObject::TReqMode ret( 0 ); // default return value @@ -549,8 +553,7 @@ const TInt aIpc, const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING3("TSY: CMmFaxCallTsy::CancelService. IPC: %d, Req handle: %d", - aIpc, aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_CANCELSERVICE_1, "TSY: CMmFaxCallTsy::CancelService. IPC: %d, Req handle: %d",aIpc, aTsyReqHandle); TInt ret( KErrNone ); @@ -654,10 +657,8 @@ callDataPackage->UnPackData( callStatus ); - TFLOGSTRING2("TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. aResult:%d", - aResult ); - TFLOGSTRING3("TSY: CMmFaxCallTsy::CompleteNotifyStatusChange. \ - Call status:%d Call name:%S", callStatus, &iCallName); + 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); switch( callStatus ) { @@ -973,8 +974,7 @@ const TDesC8* aCallParams, TDesC* aTelNumber ) { - TFLOGSTRING3("TSY: CMmFaxCallTsy::Dial. Req handle: %d, Call name: %S", - aTsyReqHandle, &iCallName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_1, "TSY: CMmFaxCallTsy::Dial. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName); CMmCallList* callList = iMmPhone->CallList(); TBool dialFlag( EFalse ); @@ -1003,7 +1003,7 @@ if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() ) { - TFLOGSTRING("TSY: Offline mode ON, Dial request is not allowed" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_2, "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. - TFLOGSTRING("TSY: CMmFaxCallTsy::Dial - KErrNotReady"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_3, "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. - TFLOGSTRING("TSY: CMmFaxCallTsy::Dial - KErrServerBusy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIAL_4, "TSY: CMmFaxCallTsy::Dial - KErrServerBusy"); ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -1117,8 +1117,7 @@ TInt CMmFaxCallTsy::DialCancel( const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING3("TSY: CMmFaxCallTsy::DialCancel. Req handle: %d, Call name: %S", - aTsyReqHandle, &iCallName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_DIALCANCEL_1, "TSY: CMmFaxCallTsy::DialCancel. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName); TInt ret( KErrGeneral ); @@ -1144,8 +1143,7 @@ const TTsyReqHandle aTsyReqHandle, const TDesC8* /*aCallParams*/ ) { - TFLOGSTRING2("TSY: CMmFaxCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d", - aTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_ANSWERINCOMINGCALL_1, "TSY: CMmFaxCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d",aTsyReqHandle); TTsyReqHandle iAnswerCallHandle = iTsyReqHandleStore-> GetTsyReqHandle( EMultimodeCallAnswer ); @@ -1227,8 +1225,7 @@ TInt CMmFaxCallTsy::HangUp( const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING3("TSY: CMmFaxCallTsy::HangUp. Req handle: %d, Call name: %S", - aTsyReqHandle, &iCallName); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_HANGUP_1, "TSY: CMmFaxCallTsy::HangUp. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName); TInt hangUpCause( KErrNone ); TInt ret( KErrNone ); @@ -1284,7 +1281,7 @@ //ownership. if ( RCall::EStatusRinging == iCallStatus ) { - TFLOGSTRING("TSY: CMmFaxCallTsy::HangUp - Reject incoming call"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_HANGUP_2, "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 @@ -1731,8 +1728,7 @@ const TTsyReqHandle aTsyReqHandle, RCall::TCommPort* aCommPort ) { -TFLOGSTRING2("TSY: CMmFaxCallTsy::LoanDataPort - Client taking control: %S", - &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_LOANDATAPORT_1, "TSY: CMmFaxCallTsy::LoanDataPort - Client taking control: %S",iCallName ); TInt ret( KErrNone ); @@ -1838,8 +1834,7 @@ TInt CMmFaxCallTsy::RecoverDataPort( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmFaxCallTsy::RecoverDataPort - Client returning control: %S", - &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_RECOVERDATAPORT_1, "TSY: CMmFaxCallTsy::RecoverDataPort - Client returning control: %S",iCallName ); TInt ret( KErrNone ); @@ -1894,8 +1889,7 @@ // TInt CMmFaxCallTsy::RecoverDataPortAndRelinquishOwnership() { -TFLOGSTRING2("TSY: CMmFaxCallTsy::RecoverDataPortAndRelinquishOwnership - \ - Client returning control: %S", &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXCALLTSY_RECOVERDATAPORTANDRELINQUISHOWNERSHIP_1, "TSY: CMmFaxCallTsy::RecoverDataPortAndRelinquishOwnership - \Client returning control: %S", iCallName ); TInt ret( KErrNone ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxlinetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxlinetsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxlinetsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmfaxlinetsyTraces.h" +#endif + #include "cmmfaxlinetsy.h" #include "cmmphonetsy.h" #include "cmmfaxcalltsy.h" @@ -24,7 +30,6 @@ #include "cmmcalllist.h" #include "cmmtsyreqhandlestore.h" #include "cmmmessagemanagerbase.h" -#include #include // ======== MEMBER FUNCTIONS ======== @@ -60,8 +65,7 @@ CMmFaxLineTsy::~CMmFaxLineTsy() { - TFLOGSTRING2("TSY: CMmFaxLineTsy::~CMmFaxLineTsy. Line name: %S", - &iLineName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_DTOR_1, "TSY: CMmFaxLineTsy::~CMmFaxLineTsy. Line name: %S",iLineName); iLastIncomingFaxCall = NULL; } @@ -258,8 +262,7 @@ callDataPackage->GetCallIdAndMode( callId, callMode ); - TFLOGSTRING3("TSY: CMmFaxLineTsy::CompleteNotifyIncomingCall - \ - Line name: %S, Call id: %d", &iLineName, callId ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_COMPLETENOTIFYINCOMINGCALL_1, "TSY: CMmFaxLineTsy::CompleteNotifyIncomingCall - \Line name: %S, Call id: %d", iLineName, callId ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -348,7 +351,7 @@ void CMmFaxLineTsy::CompleteNotifyDiallingStatus( CMmDataPackage* aDataPackage ) { - TFLOGSTRING("TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_1, "TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus"); TInt callId( -1 ); TBool ghostCall( EFalse ); RMobilePhone::TMobileService callMode( RMobilePhone::EFaxService ); @@ -363,8 +366,7 @@ if ( NULL == mmCall ) { - TFLOGSTRING("TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus - \ - GhostCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_2, "TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus - \GhostCall"); ghostCall = ETrue; } else @@ -394,8 +396,7 @@ } else { - TFLOGSTRING("TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus - \ - Dial not found"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_3, "TSY: CMmFaxLineTsy::CompleteNotifyDiallingStatus - \Dial not found"); ghostCall = ETrue; } } @@ -414,7 +415,7 @@ // void CMmFaxLineTsy::ResetLastIncomingCall() { - TFLOGSTRING("TSY: CMmFaxLineTsy::ResetLastIncomingCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMFAXLINETSY_RESETLASTINCOMINGCALL_1, "TSY: CMmFaxLineTsy::ResetLastIncomingCall"); iLastIncomingFaxCall = NULL; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinelist.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinelist.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinelist.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ //INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmlinelistTraces.h" +#endif + #include "cmmlinelist.h" #include "cmmphonetsy.h" #include "cmmlinetsy.h" @@ -81,7 +87,7 @@ iIsLineInUse[ i ] = EFalse; } -TFLOGSTRING2("TSY: CMmLineList::ConstructL:iObjectContainer->Count()=%d", iObjectContainer->Count()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_CONSTRUCTL_1, "TSY: CMmLineList::ConstructL:iObjectContainer->Count()=%d", iObjectContainer->Count()); } @@ -103,10 +109,10 @@ { CMmLineTsy* mmLine = NULL; -TFLOGSTRING("TSY: CMmLineList::GetMmLineByMode"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYMODE_1, "TSY: CMmLineList::GetMmLineByMode"); if ( iObjectContainer && iInitialised) { -TFLOGSTRING2("TSY: CMmLineList::GetMmLineByMode::iObjectContainer->Count()=%d", iObjectContainer->Count()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYMODE_2, "TSY: CMmLineList::GetMmLineByMode::iObjectContainer->Count()=%d", iObjectContainer->Count()); for ( TInt i = 0; i < iObjectContainer->Count(); i++ ) { @@ -137,14 +143,14 @@ TInt aIndex ) { CMmLineTsy* mmLine = NULL; -TFLOGSTRING("TSY: CMmLineList::GetMmLineByIndex"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYINDEX_1, "TSY: CMmLineList::GetMmLineByIndex"); //This is for checking that return objects is right CTelObject* tempObject = reinterpret_cast< CTelObject* >( this ); if ( iObjectContainer && iInitialised ) { -TFLOGSTRING2("TSY: CMmLineList::GetMmLineByIndex:iObjectContainer->Count()=%d", iObjectContainer->Count()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETMMLINEBYINDEX_2, "TSY: CMmLineList::GetMmLineByIndex:iObjectContainer->Count()=%d", iObjectContainer->Count()); if ( aIndex >= 0 && aIndex < iObjectContainer->Count() ) { @@ -174,10 +180,10 @@ { TInt ret ( KErrGeneral ); -TFLOGSTRING("TSY: CMmLineList::AddLineObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_ADDLINEOBJECT_1, "TSY: CMmLineList::AddLineObject"); if ( iObjectContainer ) { -TFLOGSTRING2("TSY: CMmLineList::AddLineObject:iObjectContainer->Count()=%d", iObjectContainer->Count()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_ADDLINEOBJECT_2, "TSY: CMmLineList::AddLineObject:iObjectContainer->Count()=%d", iObjectContainer->Count()); TInt trapError( KErrNone ); @@ -295,10 +301,10 @@ { CBase* mmObject = NULL; -TFLOGSTRING2("TSY: CMmLineList::GetObjectByIndex. aIndex=%d", aIndex ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETOBJECTBYINDEX_1, "TSY: CMmLineList::GetObjectByIndex. aIndex=%d", aIndex ); if ( iObjectContainer ) { -TFLOGSTRING2("TSY: CMmLineList::GetObjectByIndex. iObjectContainer->Count()=%d", iObjectContainer->Count()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINELIST_GETOBJECTBYINDEX_2, "TSY: CMmLineList::GetObjectByIndex. iObjectContainer->Count()=%d", iObjectContainer->Count()); if ( iIsLineInUse[ aIndex ] ) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmlinetsyTraces.h" +#endif + #include "cmmlinetsy.h" #include "cmmphonetsy.h" #include "cmmcalltsy.h" @@ -23,7 +29,6 @@ #include "cmmcalllist.h" #include "cmmtsyreqhandlestore.h" #include "MmTsy_numberOfSlots.h" -#include #include #include @@ -36,7 +41,7 @@ void CMmLineTsy::ConstructL() { - TFLOGSTRING("TSY: CMmLineTsy::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_CONSTRUCTL_1, "TSY: CMmLineTsy::ConstructL"); //Initialise miscellaneous internal attributes InitInternalAttributesL(); @@ -56,7 +61,7 @@ CMmLineTsy::~CMmLineTsy() { - TFLOGSTRING2("TSY: CMmLineTsy::~CMmLineTsy. Line name: %S", &iLineName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_DTOR_1, "TSY: CMmLineTsy::~CMmLineTsy. Line name: %S", iLineName); //delete req handle store delete iTsyReqHandleStore; @@ -96,7 +101,7 @@ CTelObject* CMmLineTsy::OpenNewObjectByNameL( const TDesC& aName ) { - TFLOGSTRING2("TSY: CMmLineTsy::OpenNewObjectByNameL %S", &aName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmLineTsy::OpenNewObjectByNameL %S", aName); TName mmCallName( aName ); CMmCallTsy* mmCall = iMmPhone->CallList()->GetMmCallByName( &mmCallName ); @@ -165,7 +170,7 @@ CTelObject::TReqMode CMmLineTsy::ReqModeL( const TInt aIpc ) { - TFLOGSTRING2("TSY: CMmLineTsy::ReqModeL IPC:%d",aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_REQMODEL_1, "TSY: CMmLineTsy::ReqModeL IPC:%d",aIpc); CTelObject::TReqMode ret( 0 ); // default return value @@ -311,8 +316,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { - TFLOGSTRING3("TSY: CMmLineTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, \ - aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_DOEXTFUNCL_1, "TSY: CMmLineTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, aTsyReqHandle); TInt ret ( KErrNone ); @@ -776,8 +780,7 @@ const TTsyReqHandle aTsyReqHandle, TName* aName ) { - TFLOGSTRING2("TSY: CMmLineTsy::NotifyCallAdded requested by client, \ - lineMode:%d", iLineMode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_NOTIFYCALLADDED_1, "TSY: CMmLineTsy::NotifyCallAdded requested by client, \lineMode:%d", iLineMode); // On return, contains the name of the new call. iRetCallAdded = aName; iTsyReqHandleStore->SetTsyReqHandle( EMultimodeLineNotifyCallAdded, @@ -796,7 +799,7 @@ TInt CMmLineTsy::NotifyCallAddedCancel( const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("TSY: CMmLineTsy::NotifyCallAddedCancel requested by client"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_NOTIFYCALLADDEDCANCEL_1, "TSY: CMmLineTsy::NotifyCallAddedCancel requested by client"); iRetCallAdded = NULL; iTsyReqHandleStore->ResetTsyReqHandle( EMultimodeLineNotifyCallAdded ); ReqCompleted( aTsyReqHandle, KErrCancel ); @@ -813,8 +816,7 @@ // void CMmLineTsy::CompleteNotifyCallAdded(const TDesC& aName ) { - TFLOGSTRING3("TSY: CMmLineTsy::CompleteNotifyCallAdded entered, \ - CALL ADDED, Call name: %S, Call mode: %d", &aName, iLineMode ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_COMPLETENOTIFYCALLADDED_1, "TSY: CMmLineTsy::CompleteNotifyCallAdded entered, \CALL ADDED, Call name: %S, Call mode: %d", aName, iLineMode ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -824,7 +826,7 @@ if ( EMultimodeLineReqHandleUnknown != reqHandle ) { - TFLOGSTRING("TSY: CMmLineTsy::CompleteNotifyCallAdded, Completed!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_COMPLETENOTIFYCALLADDED_2, "TSY: CMmLineTsy::CompleteNotifyCallAdded, Completed!"); *iRetCallAdded = aName; ReqCompleted( reqHandle, KErrNone ); } @@ -899,8 +901,7 @@ const TTsyReqHandle aTsyReqHandle, TCallInfoIndex* aCallInfoIndex ) { - TFLOGSTRING3("TSY: CMmLineTsy::GetCallInfo - Line name: %S, Index: %d", - &iLineName, aCallInfoIndex->iIndex ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_GETCALLINFO_1, "TSY: CMmLineTsy::GetCallInfo - Line name: %S, Index: %d",iLineName, aCallInfoIndex->iIndex ); TInt ret( KErrNotFound ); @@ -916,8 +917,7 @@ aCallInfoIndex->iInfo.iStatus = mmCall->Status(); aCallInfoIndex->iInfo.iCallCapsFlags = mmCall->CallCaps(); - TFLOGSTRING3("TSY: CMmLineTsy::GetCallInfo - Call name: %S, Status: %d", - &aCallInfoIndex->iInfo.iCallName, aCallInfoIndex->iInfo.iStatus ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_GETCALLINFO_2, "TSY: CMmLineTsy::GetCallInfo - Call name: %S, Status: %d",aCallInfoIndex->iInfo.iCallName, aCallInfoIndex->iInfo.iStatus ); ret = KErrNone; } @@ -1201,9 +1201,7 @@ mobileCallInfo->iStatus == RMobileCall::EStatusConnecting || mobileCallInfo->iStatus == RMobileCall::EStatusConnected ) { - TFLOGSTRING2("TSY: CMmLineTsy::CompleteNotifyAddBypassingCall, \ - CALL INITIATED - NOT REQUESTED BY ETEL's CLIENT, Call ID: %d", - callId ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_COMPLETENOTIFYADDBYPASSINGCALL_1, "TSY: CMmLineTsy::CompleteNotifyAddBypassingCall, \CALL INITIATED - NOT REQUESTED BY ETEL's CLIENT, Call ID: %d",callId ); //create new call object CMmCallTsy* mmGhostCall = CreateGhostCallObject( @@ -1231,9 +1229,7 @@ } else { - TFLOGSTRING3("TSY: CMmLineTsy::CompleteNotifyAddBypassingCall, \ - CALL NOT INITIATED - Call ID:%d, Call status:%d", - callId, mobileCallInfo->iStatus); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_COMPLETENOTIFYADDBYPASSINGCALL_2, "TSY: CMmLineTsy::CompleteNotifyAddBypassingCall, \CALL NOT INITIATED - Call ID:%d, Call status:%d", callId, mobileCallInfo->iStatus); } } @@ -1250,8 +1246,7 @@ const TTsyReqHandle aTsyReqHandle, const TInt aError ) { - TFLOGSTRING3("TSY: CMmLineTsy::ReqCompleted Handle:%d Error:%d", - aTsyReqHandle, aError); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMLINETSY_REQCOMPLETED_1, "TSY: CMmLineTsy::ReqCompleted Handle:%d Error:%d", aTsyReqHandle, aError); CTelObject::ReqCompleted(aTsyReqHandle,aError); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,8 +16,13 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmmessagemanagerbaseTraces.h" +#endif + #include "cmmmessagemanagerbase.h" -#include #include "ctsydelegates.h" // ======== MEMBER FUNCTIONS ======== @@ -66,7 +71,7 @@ // --------------------------------------------------------------------------- EXPORT_C void CMmMessageManagerBase::SetPhoneTsy( CMmPhoneTsy* aMmPhone ) { -TFLOGSTRING2("TSY: CMmMessageManagerBase::SetPhoneTsy : Phone=0x%x", aMmPhone ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CMMMESSAGEMANAGERBASE_SETPHONETSY_1, "TSY: CMmMessageManagerBase::SetPhoneTsy : Phone=0x%x", aMmPhone ); iMmPhone = aMmPhone; if( iMessageRouterProxy ) @@ -83,7 +88,7 @@ TInt CMmMessageManagerBase::HandleRequestL( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); return HandleRequestL( aIpc, REINTERPRET_CAST( const CMmDataPackage*, NULL ) ); } @@ -98,7 +103,7 @@ const TInt aIpc, const CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL1_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); return iMessageRouter->ExtFuncL( aIpc, aDataPackage ); } @@ -113,7 +118,7 @@ const TInt aIpc, const TDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL2_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); // map the TDataPackage into a CMmDataPackage // Non-core Methods from the SOS layer using the DOS layer will perforn @@ -176,7 +181,7 @@ EXPORT_C void CMmMessageManagerBase::SetMessageRouter( MMessageRouter* aMessageRouter ) { -TFLOGSTRING2("TSY: CMmMessageManagerBase::SetMessageRouter : MessageRouter=0x%x", aMessageRouter ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CMMMESSAGEMANAGERBASE_SETMESSAGEROUTER_1, "TSY: CMmMessageManagerBase::SetMessageRouter : MessageRouter=0x%08x", aMessageRouter ); iMessageRouter = aMessageRouter; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ //INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmnettsyTraces.h" +#endif + #include "cmmnettsy.h" #include "cmmphonetsy.h" #include "cmmtsyreqhandlestore.h" @@ -46,7 +52,7 @@ void CMmNetTsy::ConstructL() { -TFLOGSTRING("TSY: CMmNetTsy::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_CONSTRUCTL_1, "TSY: CMmNetTsy::ConstructL"); //set current NW mode iMode = RMobilePhone::ENetworkModeUnknown; @@ -82,7 +88,7 @@ CMmNetTsy::~CMmNetTsy() { -TFLOGSTRING("TSY: CMmNetTsy::~CMmNetTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DTOR_1, "TSY: CMmNetTsy::~CMmNetTsy"); // Delete get detected networks list if ( iGetDetectedNetworks ) @@ -120,8 +126,7 @@ const TInt aIpc, // IPC number of request const TDataPackage& aPackage ) // Contains parameters for request { -TFLOGSTRING3("TSY: CMmPhoneTsy::DoExtFuncL.\n \t\t\t IPC:%d\n \t\t\t Handle:%d", - aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DOEXTFUNCL_1, "TSY: CMmPhoneTsy::DoExtFuncL.\n \t\t\t IPC:%d\n \t\t\t Handle:%d", aIpc, aTsyReqHandle); TInt ret ( KErrNone ); @@ -166,7 +171,7 @@ dataPtr2 ) ); break; case EMobilePhoneGetNetworkName: -TFLOGSTRING("TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneGetNetworkName"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DOEXTFUNCL_2, "TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneGetNetworkName"); ret = GetNetworkName( aTsyReqHandle, aPackage.Des1n(), aPackage.Des2n() ); break; @@ -177,12 +182,12 @@ break; // Get Cell information case EMobilePhoneGetCellInfo: - TFLOGSTRING("TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneGetCellInfo"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DOEXTFUNCL_3, "TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneGetCellInfo"); ret = GetCellInfoL(aTsyReqHandle, aPackage.Des1n()); break; // Notify cell information change case EMobilePhoneNotifyCellInfoChange: - TFLOGSTRING("TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneNotifyCellInfoChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_DOEXTFUNCL_4, "TSY: CMmNetTsy::DoExtFuncL - EMobilePhoneNotifyCellInfoChange"); ret = NotifyCellInfoChangeL(aTsyReqHandle, aPackage.Des1n()); break; // Notify Current Network Change, no location @@ -303,7 +308,7 @@ const TInt aIpc, // IPC number of request. const TTsyReqHandle aTsyReqHandle ) // Request handle of given request. { - TFLOGSTRING3("TSY: CMmNetTsy::CancelService IPC: %d ret: %d", aIpc, aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_CANCELSERVICE_1, "TSY: CMmNetTsy::CancelService IPC: %d ret: %d", aIpc, aTsyReqHandle); TInt ret ( KErrNotSupported ); //When the clients close their sub-sessions (eg. by calling RLine::Close), @@ -1095,7 +1100,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aNetworkInfoPckg ) const { -TFLOGSTRING("TSY: CMmNetTsy::GetHomeNetwork" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETHOMENETWORK_1, "TSY: CMmNetTsy::GetHomeNetwork" ); TInt ret ( KErrNotSupported ); @@ -1170,12 +1175,12 @@ TDes8* aNetworkInfoPckg, RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) const { -TFLOGSTRING("TSY: CMmNetTsy::GetCurrentNetwork"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTNETWORK_1, "TSY: CMmNetTsy::GetCurrentNetwork"); TInt ret( KErrArgument ); if ( ERfsStateInfoInactive == iMmPhoneTsy->GetRfStateInfo() ) { -TFLOGSTRING ("TSY: CMmNetTsy::GetCurrentNetwork Offline mode ON, request is not allowed! "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTNETWORK_2, "TSY: CMmNetTsy::GetCurrentNetwork Offline mode ON, request is not allowed! "); ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); @@ -1258,10 +1263,10 @@ // TInt CMmNetTsy::GetCellInfoL(const TTsyReqHandle aTsyReqHandle, TDes8* aCellInfoPckg) { - TFLOGSTRING2("TSY: CMmNetTsy::GetCellInfoL; Handle : %d", aTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOL_1, "TSY: CMmNetTsy::GetCellInfoL; Handle : %d", aTsyReqHandle); if(sizeof(RMobilePhone::TMobilePhoneCellInfoV9) > aCellInfoPckg->MaxLength()) { - TFLOGSTRING ("TSY: CMmNetTsy::GetCellInfo Bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOL_2, "TSY: CMmNetTsy::GetCellInfo Bad size argument"); // Complete the request with appropiate error return KErrArgument; } @@ -1270,14 +1275,14 @@ RMobilePhone::TMultimodeType& cellInfoTemp = ( *cellInfoTempPckg )(); if(cellInfoTemp.ExtensionId()!=KEtelExtMultimodeV9) { - TFLOGSTRING ("TSY: CMmNetTsy::GetCellInfo Bad version argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOL_3, "TSY: CMmNetTsy::GetCellInfo Bad version argument"); // Complete the request with appropiate error return KErrArgument; } TInt ret( KErrNotSupported ); if ( ERfsStateInfoInactive == iMmPhoneTsy->GetRfStateInfo() ) { - TFLOGSTRING ("TSY: CMmNetTsy::GetCellInfo Offline mode ON, request is not allowed! "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOL_4, "TSY: CMmNetTsy::GetCellInfo Offline mode ON, request is not allowed! "); ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); // Complete the request with appropiate error @@ -1471,7 +1476,7 @@ } //Complete the client request - TFLOGSTRING3("TSY: CMmNetTsy::CompleteCellInfoReq client: %d; Handle: %d", i, req.iReqHandle ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_HANDLECELLINFOUPDATE_1, "TSY: CMmNetTsy::CompleteCellInfoReq client: %d; Handle: %d", i, req.iReqHandle ); iMmPhoneTsy->ReqCompleted( req.iReqHandle, aError ); } // Destroy array @@ -1500,13 +1505,13 @@ TDes8* aNetworkNamePckg, TDes8* aPlmnPckg ) const { -TFLOGSTRING("TSY: CMmNetTsy::GetNetworkName"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKNAME_1, "TSY: CMmNetTsy::GetNetworkName"); TInt ret ( KErrGeneral ); if( sizeof(RMobilePhone::TMobilePhoneNetworkNameV3) > aNetworkNamePckg->MaxLength() || sizeof(RMobilePhone::TMobilePhoneOPlmnV3) > aPlmnPckg->MaxLength() ) { - TFLOGSTRING ("TSY: CMmNetTsy::GetNetworkName bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKNAME_2, "TSY: CMmNetTsy::GetNetworkName bad size argument"); // Complete the request with appropiate error ret = KErrArgument; } @@ -1531,11 +1536,11 @@ networkName.iShortName.Copy( networkInfo.iShortName ); plmn.iCountryCode.Copy( networkInfo.iCountryCode ); plmn.iNetworkId.Copy( networkInfo.iNetworkId ); -TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkName, iLongName: %S", &networkName.iLongName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKNAME_3, "TSY: CMmNetTsy::GetNetworkName, iLongName: %S", networkName.iLongName); if( KErrNone == ret ) { -TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkName - completing, ret: %d", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKNAME_4, "TSY: CMmNetTsy::GetNetworkName - completing, ret: %d", ret); iMmPhoneTsy->ReqCompleted( aTsyReqHandle, ret ); } } @@ -1554,7 +1559,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aNetworkInfoPckg ) const { -TFLOGSTRING("TSY: CMmNetTsy::GetCurrentNetworkNoLocation"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTNETWORKNOLOCATION_1, "TSY: CMmNetTsy::GetCurrentNetworkNoLocation"); TInt ret( KErrNotSupported ); @@ -1622,7 +1627,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aNetworkInfoPckg ) { -TFLOGSTRING("TSY: CMmNetTsy::NotifyCurrentNetworkNoLocationChangeL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCURRENTNETWORKNOLOCATIONCHANGEL_1, "TSY: CMmNetTsy::NotifyCurrentNetworkNoLocationChangeL"); // save the handle and the request type iMmPhoneTsy->iReqHandleType = @@ -1647,7 +1652,7 @@ TInt CMmNetTsy::NotifyCurrentNetworkNoLocationChangeCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmNetTsy::NotifyCurrentNetworkNoLocationChangeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCURRENTNETWORKNOLOCATIONCHANGECANCEL_1, "TSY: CMmNetTsy::NotifyCurrentNetworkNoLocationChangeCancel"); // find the correct ReqHandle... for ( TInt i = 0; i < iNotifyCurrentNwNoLocationRequests.Count(); i++ ) @@ -1683,7 +1688,7 @@ TDes8* aNetworkInfoPckg, RMobilePhone::TMobilePhoneLocationAreaV1* aArea ) { -TFLOGSTRING("TSY: CMmNetTsy::NotifyCurrentNetworkChangeL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCURRENTNETWORKCHANGEL_1, "TSY: CMmNetTsy::NotifyCurrentNetworkChangeL"); TInt ret = KErrArgument; TInt length = aNetworkInfoPckg->MaxLength(); @@ -1721,7 +1726,7 @@ TInt CMmNetTsy::NotifyCurrentNetworkChangeCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmNetTsy::NotifyCurrentNetworkChangeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCURRENTNETWORKCHANGECANCEL_1, "TSY: CMmNetTsy::NotifyCurrentNetworkChangeCancel"); // find the correct ReqHandle... for ( TInt i = 0; i < iNotifyCurrentNwRequests.Count(); i++ ) @@ -1756,14 +1761,14 @@ CMmDataPackage* aDataPackage, TInt aResult ) { -TFLOGSTRING("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_1, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange"); // create a copy of the NW info sended by the LTSY RMobilePhone::TMobilePhoneNetworkInfoV8 networkInfo; RMobilePhone::TMobilePhoneLocationAreaV1 locationArea; aDataPackage->UnPackData ( networkInfo, locationArea ); -TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, new extension ID: %d", networkInfo.ExtensionId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_2, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, new extension ID: %d", networkInfo.ExtensionId() ); // empty additional extension information... if ( KETelExtMultimodeV1 == networkInfo.ExtensionId() ) @@ -1805,17 +1810,17 @@ TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneNotifyCurrentNetworkChange ); -TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, req handler =%u", reqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_3, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, req handler =%u", reqHandle ); if ( CMmPhoneTsy::EMultimodePhoneReqHandleUnknown != reqHandle ) { TInt requestCount = iNotifyCurrentNwRequests.Count(); -TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, requestCount: %d ", requestCount ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_4, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, requestCount: %d ", requestCount ); // Complete all notification requests... for ( TInt i = 0; i < requestCount; i++ ) { -TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, Loc; array: %d ", i ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_5, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, Loc; array: %d ", i ); // copy the infromation to client, 0 = first index switch ( ( *( iNotifyCurrentNwRequests[ 0 ]. @@ -1904,17 +1909,17 @@ TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneNotifyCurrentNetworkNoLocationChange ); -TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, req handler NoLoc =%u", reqHandle ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_6, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, req handler NoLoc =%u", reqHandle ); if ( CMmPhoneTsy::EMultimodePhoneReqHandleUnknown != reqHandle ) { TInt requestCount = iNotifyCurrentNwNoLocationRequests.Count(); -TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, requestCount NoLoc: %d ", requestCount ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_7, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, requestCount NoLoc: %d ", requestCount ); // Complete all requests... for ( TInt indx = 0; indx < requestCount; indx++ ) { -TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, NoLoc; array: %d ", indx ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_8, "TSY: CMmNetTsy::CompleteNotifyCurrentNetworkChange, NoLoc; array: %d ", indx ); // copy the infromation to client, 0 = first index switch ( ( *( iNotifyCurrentNwNoLocationRequests[ 0 ]. @@ -2002,10 +2007,10 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aCellInfoPckg) { - TFLOGSTRING2("TSY: CMmNetTsy::NotifyCellInfoChangeL; Handel: %d", aTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCELLINFOCHANGEL_1, "TSY: CMmNetTsy::NotifyCellInfoChangeL; Handel: %d", aTsyReqHandle); if(sizeof(RMobilePhone::TMobilePhoneCellInfoV9) > aCellInfoPckg->MaxLength()) { - TFLOGSTRING ("TSY: CMmNetTsy::NotifyCellInfoChangeL Bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCELLINFOCHANGEL_2, "TSY: CMmNetTsy::NotifyCellInfoChangeL Bad size argument"); // Complete the request with appropiate error return KErrArgument; } @@ -2014,7 +2019,7 @@ RMobilePhone::TMultimodeType& cellInfoTemp = ( *cellInfoTempPckg )(); if(cellInfoTemp.ExtensionId()!=KEtelExtMultimodeV9) { - TFLOGSTRING ("TSY: CMmNetTsy::GetCellInfo Bad version argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCELLINFOCHANGEL_3, "TSY: CMmNetTsy::GetCellInfo Bad version argument"); // Complete the request with appropiate error return KErrArgument; } @@ -2047,7 +2052,7 @@ TInt CMmNetTsy::GetCellInfoCancel( const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING2("TSY: CMmNetTsy::GetCellInfoCancel; Handle: %d", aTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCELLINFOCANCEL_1, "TSY: CMmNetTsy::GetCellInfoCancel; Handle: %d", aTsyReqHandle); // find the correct ReqHandle... const TInt KReqCount = iCellInfoRequests.Count(); for ( TInt i = 0; i < KReqCount; i++ ) @@ -2080,7 +2085,7 @@ TInt CMmNetTsy::NotifyCellInfoChangeCancel( const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING2("TSY: CMmNetTsy::NotifyCellInfoChangeCancel; Handle: %d", aTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYCELLINFOCHANGECANCEL_1, "TSY: CMmNetTsy::NotifyCellInfoChangeCancel; Handle: %d", aTsyReqHandle); // find the correct ReqHandle... const TInt KReqCount = iNotifyCellInfoRequests.Count(); @@ -2115,7 +2120,7 @@ const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneRegistrationStatus* aStatus ) { -TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusL Handle: %d", aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_1, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL Handle: %d", aTsyReqHandle); // If the modem is not ready (Common TSY has not received EMmTsyBootNotifyModemStatusReadyIPC // from LTSY), we don't need to ask. Update registration status and complete client immediately. @@ -2146,15 +2151,17 @@ //get mode specific information TInt ret ( iMmPhoneTsy->iMmPhoneExtInterface-> GetNetworkRegistrationStatusL() ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_2, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Sending request to LTSY" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_3, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Modem not ready" ); if ( KErrNone != ret ) { - TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Complete with error %d", ret ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_4, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Complete with error %d", ret ); iMmPhoneTsy->ReqCompleted( aTsyReqHandle, ret ); } else { -TFLOGSTRING("TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Client to buffer" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_5, "TSY: CMmNetTsy::GetNetworkRegistrationStatusL - Client to buffer" ); // save request handle in queue TGetNetworkRegisterationRequest* req = new (ELeave) TGetNetworkRegisterationRequest(); @@ -2187,13 +2194,13 @@ TInt CMmNetTsy::GetNetworkRegistrationStatusCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatusCancel Handle: %d", aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSCANCEL_1, "TSY: CMmNetTsy::GetNetworkRegistrationStatusCancel Handle: %d", aTsyReqHandle); TInt requestCount = iRegisterationStatusRequests.Count(); if( 1 == requestCount ) { -TFLOGSTRING("TSY: CMmNetTsy::GetNetworkRegistrationStatusCancel 1 == requestCount "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKREGISTRATIONSTATUSCANCEL_2, "TSY: CMmNetTsy::GetNetworkRegistrationStatusCancel 1 == requestCount "); //reset the req handle TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetNetworkRegistrationStatus ); @@ -2225,7 +2232,7 @@ void CMmNetTsy::CompleteGetNetworkRegistrationStatus( TInt aErrorValue ) { -TFLOGSTRING("TSY: CMmNetTsy::CompleteGetNetworkRegistrationStatus"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETEGETNETWORKREGISTRATIONSTATUS_1, "TSY: CMmNetTsy::CompleteGetNetworkRegistrationStatus"); // Reset the req handle TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( @@ -2243,7 +2250,7 @@ //set value in client side *(req->iRetGetNWRegistrationStatus) = iNWRegistrationStatus; -TFLOGSTRING2("TSY: CMmNetTsy::CompleteGetNetworkRegistrationStatus client: %d", i ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETEGETNETWORKREGISTRATIONSTATUS_2, "TSY: CMmNetTsy::CompleteGetNetworkRegistrationStatus client: %d", i ); //Complete the client request iMmPhoneTsy->ReqCompleted( req->iReqHandle, aErrorValue ); @@ -2299,7 +2306,7 @@ CMmDataPackage* aDataPackage, //Contains information for client side TInt aResult ) // result code { -TFLOGSTRING( "TSY: CMmNetTsy::CompleteNotifyNetworkRegistrationStatusChange" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_1, "TSY: CMmNetTsy::CompleteNotifyNetworkRegistrationStatusChange" ); RMobilePhone::TMobilePhoneRegistrationStatus* regStatus = NULL; RMobilePhone::TMobilePhoneNetworkStatus* nwStatus = NULL; @@ -2314,7 +2321,7 @@ // Store NEW registration status iNWRegistrationStatus = *regStatus; -TFLOGSTRING2("TSY: CMmNetTsy::CompleteNotifyNetworkRegistrationStatusChange, status: %d", iNWRegistrationStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_2, "TSY: CMmNetTsy::CompleteNotifyNetworkRegistrationStatusChange, status: %d", iNWRegistrationStatus ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> @@ -2557,7 +2564,7 @@ RMobilePhone::TMobilePhoneRegistrationStatus CMmNetTsy::GetNetworkRegistrationStatus() const { -TFLOGSTRING2("TSY: CMmNetTsy::GetNetworkRegistrationStatus: %d", iNWRegistrationStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKMODE_1, "TSY: CMmNetTsy::GetNetworkRegistrationStatus: %d", iNWRegistrationStatus ); return iNWRegistrationStatus; } @@ -2573,7 +2580,7 @@ aNetworkSecurityLevel ) const //Network security level { - TFLOGSTRING("TSY: CMmNetTsy::GetNetworkSecurityLevel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETNETWORKSECURITYLEVEL_1, "TSY: CMmNetTsy::GetNetworkSecurityLevel"); iMmPhoneTsy->PhoneExtInterface()->GetNetworkSecurityLevel ( *aNetworkSecurityLevel ); @@ -2591,7 +2598,7 @@ RMobilePhone::TMobilePhoneNetworkSecurity* aNetworkSecurityLevel ) { - TFLOGSTRING("TSY: CMmNetTsy::NotifyNetworkSecurityLevelChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYNETWORKSECURITYLEVELCHANGE_1, "TSY: CMmNetTsy::NotifyNetworkSecurityLevelChange"); iMmPhoneTsy->iReqHandleType = CMmPhoneTsy::EMultimodePhoneNotifyNetworkSecurityLevelChange; iRetNetworkSecurityLevel = aNetworkSecurityLevel; @@ -2604,7 +2611,7 @@ // TInt CMmNetTsy::NotifyNetworkSecurityLevelChangeCancel() { - TFLOGSTRING("TSY: CMmNetTsy::NotifyNetworkSecurityLevelChangeCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_NOTIFYNETWORKSECURITYLEVELCHANGECANCEL_1, "TSY: CMmNetTsy::NotifyNetworkSecurityLevelChangeCancel"); iRetNetworkSecurityLevel = NULL; TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( @@ -2788,7 +2795,7 @@ const RMobilePhone::TMobilePhoneNetworkInfoV8& previousNetInfo, const RMobilePhone::TMobilePhoneNetworkInfoV8& newNetInfo ) { -TFLOGSTRING("TSY: CMmNetTsy::IsNetworkInfoChanged" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_ISNETWORKINFOCHANGED_1, "TSY: CMmNetTsy::IsNetworkInfoChanged" ); TBool ret ( ETrue ); @@ -2877,11 +2884,11 @@ } //close the file file.Close(); -TFLOGSTRING("TSY:CMmNetTsy::ReadVariantOptions:File successfully read."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_READVARIANTOPTIONS_1, "TSY:CMmNetTsy::ReadVariantOptions:File successfully read."); } else { -TFLOGSTRING2("TSY:CMmNetTsy::ReadVariantOptions:Could not open file Z:\\private\\101f7989\\operatorVariants.ini, error=%d",err); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_READVARIANTOPTIONS_2, "TSY:CMmNetTsy::ReadVariantOptions:Could not open file Z:\\private\\101f7989\\operatorVariants.ini, error=%d",err); } // close connection to file server @@ -2889,9 +2896,9 @@ } else { -TFLOGSTRING("TSY:CMmNetTsy::ReadVariantOptions:Could not connect to file server."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_READVARIANTOPTIONS_3, "TSY:CMmNetTsy::ReadVariantOptions:Could not connect to file server."); } -TFLOGSTRING2("TSY:CMmNetTsy::ReadVariantOptions:iCipheringIndicatorForcedOff=%d",iCipheringIndicatorForcedOff); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_READVARIANTOPTIONS_4, "TSY:CMmNetTsy::ReadVariantOptions:iCipheringIndicatorForcedOff=%d",iCipheringIndicatorForcedOff); } // --------------------------------------------------------------------------- @@ -2902,7 +2909,7 @@ // TBool CMmNetTsy::CipheringIndicatorForcedOff() { - TFLOGSTRING2("TSY:CMmNetTsy::CipheringIndicatorForcedOff:iCipheringIndicatorForcedOff=%d",iCipheringIndicatorForcedOff); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_CIPHERINGINDICATORFORCEDOFF_1, "TSY:CMmNetTsy::CipheringIndicatorForcedOff:iCipheringIndicatorForcedOff=%d",iCipheringIndicatorForcedOff); return iCipheringIndicatorForcedOff; } @@ -2917,7 +2924,7 @@ RMobilePhone::TClientId* aClient, TInt* aBufSize ) { -TFLOGSTRING("TSY: CMmNetTsy::AuthorizationInfoPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETAUTHORIZATIONINFOPHASE1L_1, "TSY: CMmNetTsy::AuthorizationInfoPhase1L"); TTsyReqHandle getAuthorizationInfoPhase1Handle = iMmPhoneTsy->iTsyReqHandleStore->GetTsyReqHandle( @@ -2967,7 +2974,7 @@ CMmDataPackage* aDataPackage, TInt aError ) { -TFLOGSTRING("TSY: CMmNetTsy::ProcessGetAuthorizationInfoPhase1L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_PROCESSGETAUTHORIZATIONINFOPHASE1L_1, "TSY: CMmNetTsy::ProcessGetAuthorizationInfoPhase1L"); // Fetch the request handle TTsyReqHandle reqHandle = @@ -3010,7 +3017,7 @@ RMobilePhone::TClientId* aClient, TDes8* aBuffer ) { -TFLOGSTRING("TSY: CMmNetTsy::GetAuthorizationInfoPhase2L"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETAUTHORIZATIONINFOPHASE2L_1, "TSY: CMmNetTsy::GetAuthorizationInfoPhase2L"); TInt error = KErrNone; @@ -3091,7 +3098,7 @@ const TTsyReqHandle aTsyReqHandle, RMobilePhone::TAID* aAID ) { -TFLOGSTRING("TSY:CMmNetTsy::GetCurrentActiveUSimApplicationL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTACTIVEUSIMAPPLICATIONL_1, "TSY:CMmNetTsy::GetCurrentActiveUSimApplicationL"); TTsyReqHandle getCurrentActiveUSimApplicationHandle = iMmPhoneTsy->iTsyReqHandleStore->GetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetCurrentActiveUSimApplication ); @@ -3134,7 +3141,7 @@ // TInt CMmNetTsy::GetCurrentActiveUSimApplicationCancel() { -TFLOGSTRING("TSY: CMmNetTsy::GetCurrentActiveUSimApplicationCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_GETCURRENTACTIVEUSIMAPPLICATIONCANCEL_1, "TSY: CMmNetTsy::GetCurrentActiveUSimApplicationCancel"); //reset the req handle TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( @@ -3159,7 +3166,7 @@ CMmDataPackage* aDataPackage, TInt aErrorValue ) { - TFLOGSTRING("TSY: CMmNetTsy::CompleteGetCurrentActiveUSimApplication"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMNETTSY_COMPLETEGETCURRENTACTIVEUSIMAPPLICATION_1, "TSY: CMmNetTsy::CompleteGetCurrentActiveUSimApplication"); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore->ResetTsyReqHandle( diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -14,6 +14,11 @@ // +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmphonetsyTraces.h" +#endif + //INCLUDES #include @@ -90,7 +95,7 @@ CMmPhoneFactoryTsy* aMmPhoneFactoryTsy, MLtsyFactoryBase* aFactory ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::NewL - Phone model Id: %S", &KPhoneModelId); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CMMPHONETSY_NEWL_1, "TSY: CMmPhoneTsy::NewL - Phone model Id: %S", KPhoneModelId); CleanupStack::PushL( aMessageManager ); CMmPhoneTsy* mmPhoneTsy = new (ELeave) CMmPhoneTsy(); @@ -130,9 +135,9 @@ void CMmPhoneTsy::ConstructL() { -TFLOGSTRING("TSY: CMmPhoneTsy::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CONSTRUCTL_1, "TSY: CMmPhoneTsy::ConstructL"); iCentRep = CRepository::NewL( KCRUidCtsyMEAlsLine ); -TFLOGSTRING("TSY: CMmPhoneTsy::ConstructL Central Repository opened successfully"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CONSTRUCTL_2, "TSY: CMmPhoneTsy::ConstructL Central Repository opened successfully"); //iPublic Central Repositories iMWISCentRep = CRepository::NewL( KCRUidCtsyMessageWaitingIndicator ); @@ -182,7 +187,7 @@ // initialize HWRM & its observers if(IsHWRMSupported()) { - TFLOGSTRING("TSY: HWRM Battery API is in use."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CONSTRUCTL_3, "TSY: HWRM Battery API is in use."); iPowerManager = CHWRMPower::NewL(); iBattery = CBatteryInfoObserver::NewL( *iPowerManager, *this ); iChargingStatus = CChargingStatusObserver::NewL( *this ); @@ -349,7 +354,7 @@ CMmPhoneTsy::~CMmPhoneTsy() { -TFLOGSTRING("TSY: CMmPhoneTsy::~CMmPhoneTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DTOR_1, "TSY: CMmPhoneTsy::~CMmPhoneTsy"); if(IsHWRMSupported()) { @@ -559,7 +564,7 @@ delete iSystemStatePluginHandler; } iSystemStatePluginHandler = NULL; -TFLOGSTRING("TSY: CMmPhoneTsy::~CMmPhoneTsy DONE"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DTOR_2, "TSY: CMmPhoneTsy::~CMmPhoneTsy DONE"); } // --------------------------------------------------------------------------- @@ -583,7 +588,7 @@ // void CMmPhoneTsy::CompleteNotifyModemStatusReady() { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyModemStatusReady"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYMODEMSTATUSREADY_1, "TSY: CMmPhoneTsy::CompleteNotifyModemStatusReady"); TRAP_IGNORE( //update the network registration status @@ -612,7 +617,7 @@ { if ( !iBootState.iSIMReady ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - SIM is ready, start initialisations"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_1, "TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - SIM is ready, start initialisations"); iBootState.iSIMReady = ETrue; iBootState.iADNReady = ETrue; @@ -657,14 +662,14 @@ // VIAG homezone parameters. if ( iMmCustomTsy ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CustomTSY ready"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_2, "TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CustomTSY ready"); // Get pointer to SIM Custom TSY CMmSIMTsy* simCustomTsy = ( ( CMmSIMTsy* ) iMmCustomTsy->GetSIMTsyPtr() ); if ( simCustomTsy ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CheckViagHomeZoneParamsL()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_3, "TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CheckViagHomeZoneParamsL()"); simCustomTsy->CheckViagHomezoneParamsL(); iViagHomeZoneParamsChecked = ETrue; } @@ -673,7 +678,7 @@ else { iViagHomeZoneParamsChecked = EFalse; -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CustomTSY NOT ready"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_4, "TSY: CMmPhoneTsy::CompleteNotifySimStatusReadyL - CustomTSY NOT ready"); } } } @@ -717,7 +722,7 @@ TInt CMmPhoneTsy::NotifyIndicatorChange( TUint32* aIndicatorState ) { -TFLOGSTRING("TSY: CMmPhoneTsy::NotifyIndicatorChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYINDICATORCHANGE_1, "TSY: CMmPhoneTsy::NotifyIndicatorChange"); // Update indicator state, we don't keep track of it // unless notify is on. So we need to update starting @@ -736,17 +741,17 @@ // void CMmPhoneTsy::CompleteNotifyIndicatorChange() { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange"); // first check if this notify is actually requested.. if (NULL != iRetIndicatorState) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange -- notify is on"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_2, "TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange -- notify is on"); TUint32 newIndicatorState = GetIndicatorState(); if (newIndicatorState != iIndicatorState) { iIndicatorState = newIndicatorState; -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange -- changed to 0x%x", iIndicatorState); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_3, "TSY: CMmPhoneTsy::CompleteNotifyIndicatorChange -- changed to 0x%08x", iIndicatorState); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -772,7 +777,7 @@ TInt CMmPhoneTsy::NotifyIndicatorChangeCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmPhoneTsy::NotifyIndicatorChangeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYINDICATORCHANGECANCEL_1, "TSY: CMmPhoneTsy::NotifyIndicatorChangeCancel"); iRetIndicatorState = NULL; iTsyReqHandleStore->ResetTsyReqHandle( @@ -1063,8 +1068,7 @@ if ( KErrNone != trapError || KErrNone != addLineSucceeded || KErrNone != addPBSucceeded ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::OpenNewObjectByNameL - Failed: %d", - trapError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmPhoneTsy::OpenNewObjectByNameL - Failed: %d",trapError); if ( mmLine ) { @@ -1121,7 +1125,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmPhoneTsy::ExtFunc, IPC:%d, Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_EXTFUNC_1, "TSY: CMmPhoneTsy::ExtFunc, IPC:%d, Handle:%d", aIpc, aTsyReqHandle); TInt ret = KErrNone; TInt trapError = KErrNone; @@ -1139,7 +1143,7 @@ if ( ERfsStateInfoInactive == iStateInfo && !IsRequestPossibleInOffline( aIpc ) ) { -TFLOGSTRING2 ("TSY: Offline mode ON, request is not allowed: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_EXTFUNC_2, "TSY: Offline mode ON, request is not allowed: %d", aIpc ); ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); @@ -1191,7 +1195,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmPhoneTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DOEXTFUNCL_1, "TSY: CMmPhoneTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle); TInt ret = KErrNone; @@ -1774,7 +1778,7 @@ break; } - TFLOGSTRING3("TSY: CMmPhoneTsy::ReqModeL - IPC:%d, Mode:%d", aIpc, ret); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_REQMODEL_1, "TSY: CMmPhoneTsy::ReqModeL - IPC:%d, Mode:%d", aIpc, ret); return ret; } @@ -1929,7 +1933,7 @@ const TInt aIpc, const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmPhoneTsy::CancelService - IPC:%d, Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CANCELSERVICE_1, "TSY: CMmPhoneTsy::CancelService - IPC:%d, Handle:%d", aIpc, aTsyReqHandle); TInt ret ( KErrNotSupported ); @@ -2441,7 +2445,7 @@ // TInt CMmPhoneTsy::TerminateAllCallsL(const TTsyReqHandle aTsyReqHandle) { -TFLOGSTRING("TSY: CMmPhoneTsy::TerminateAllCalls"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TERMINATEALLCALLSL_1, "TSY: CMmPhoneTsy::TerminateAllCalls"); // Check if some other client has already requested this TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(EMultimodePhoneTerminateAllCalls); @@ -2491,7 +2495,7 @@ } else { -TFLOGSTRING("TSY: CMmPhoneTsy::TerminateAllCalls - Already requested"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TERMINATEALLCALLSL_2, "TSY: CMmPhoneTsy::TerminateAllCalls - Already requested"); ReqCompleted( aTsyReqHandle, KErrServerBusy ); } return KErrNone; @@ -2517,7 +2521,7 @@ // TInt CMmPhoneTsy::TerminateActiveCallsL(const TTsyReqHandle aTsyReqHandle) { -TFLOGSTRING("TSY: CMmPhoneTsy::TerminateActiveCalls"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TERMINATEACTIVECALLSL_1, "TSY: CMmPhoneTsy::TerminateActiveCalls"); // Check if some other client has already requested this TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(EMultimodePhoneTerminateActiveCalls); @@ -2544,7 +2548,7 @@ } else { -TFLOGSTRING("TSY: CMmPhoneTsy::TerminatActiveCalls - Already requested"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TERMINATEACTIVECALLSL_2, "TSY: CMmPhoneTsy::TerminatActiveCalls - Already requested"); ReqCompleted( aTsyReqHandle, KErrServerBusy ); } return KErrNone; @@ -2778,7 +2782,7 @@ const RMobilePhone::TMobileName* aStoreName ) { TInt ret( KErrArgument ); -TFLOGSTRING("TSY: CMmPhoneTsy::GetPhoneStoreInfoL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETPHONESTOREINFOL_1, "TSY: CMmPhoneTsy::GetPhoneStoreInfoL" ); if(sizeof(RMobilePhoneStore::TMobilePhoneStoreInfoV1) <= aInfo->MaxLength()) { @@ -2791,7 +2795,7 @@ if ( KETelExtMultimodeV1 != storeInfo.ExtensionId() ) { - TFLOGSTRING("TSY: Phonebook not supported. Only KETelExtMultimodeV1 types supported for RMobilePhone::GetPhoneStoreInfo" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETPHONESTOREINFOL_2, "TSY: Phonebook not supported. Only KETelExtMultimodeV1 types supported for RMobilePhone::GetPhoneStoreInfo" ); ret = KErrNotSupported; } else @@ -2806,7 +2810,7 @@ 0x0 == aStoreName->Compare( KETelMeSmsStore ) ) { - TFLOGSTRING("TSY: Phonebook name is not supported. " ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETPHONESTOREINFOL_3, "TSY: Phonebook name is not supported. " ); ret = KErrNotSupported; } else @@ -2895,7 +2899,7 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aCspFile ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILEL_1, "TSY: CMmPhoneTsy::GetCustomerServiceProfileL" ); TInt ret = KErrArgument; @@ -2912,7 +2916,7 @@ if ( 0 < reqHandle ) { - TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileL one req already ongoing" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILEL_2, "TSY: CMmPhoneTsy::GetCustomerServiceProfileL one req already ongoing" ); ret = KErrNone; //The request is already in processing because of previous request //Complete request with status value informing the client about @@ -2958,7 +2962,7 @@ TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetCustomerServiceProfile" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETCUSTOMERSERVICEPROFILE_1, "TSY: CMmPhoneTsy::CompleteGetCustomerServiceProfile" ); // Check if the get was called internally during boot if( iCspFileQueryInBoot ) @@ -2991,7 +2995,7 @@ //set value in client side *(req->iRetCspFile) = aCspFile; //reset the return pointer -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetCustomerServiceProfile queue handling" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETCUSTOMERSERVICEPROFILE_2, "TSY: CMmPhoneTsy::CompleteGetCustomerServiceProfile queue handling" ); ReqCompleted( req->iReqHandle, aErrorCode ); } // Complete the client request @@ -3009,14 +3013,14 @@ // TInt CMmPhoneTsy::GetCustomerServiceProfileCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel aTsyReqHandle: %d", aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_1, "TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel aTsyReqHandle: %d", aTsyReqHandle); TInt customerServiceProfileRequestsCount = iCustomerServiceProfileRequests.Count(); //reset the req handle if only one req remains if( 1 == customerServiceProfileRequestsCount ) { - TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - one req"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_2, "TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - one req"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetCustomerServiceProfile ); } @@ -3024,7 +3028,7 @@ // go through array if one or more requests remain and find the correct request handle to cancel for ( TInt i=0; i < customerServiceProfileRequestsCount ; i++ ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - queued requests"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_3, "TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - queued requests"); TCustomerServiceProfileIdRequest* req = iCustomerServiceProfileRequests[ i ]; @@ -3071,7 +3075,7 @@ const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneBatteryInfoV1* aInfo ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetBatteryInfoL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETBATTERYINFOL_1, "TSY: CMmPhoneTsy::GetBatteryInfoL"); // Battery info is requested when phone is booted up and updated when // EM server sends indications. @@ -3091,7 +3095,7 @@ TInt CMmPhoneTsy::NotifyBatteryInfoChange( RMobilePhone::TMobilePhoneBatteryInfoV1* aInfo ) { -TFLOGSTRING("TSY: CMmPhoneTsy::NotifyBatteryInfoChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYBATTERYINFOCHANGE_1, "TSY: CMmPhoneTsy::NotifyBatteryInfoChange"); iRetBatteryInfo = aInfo; iReqHandleType = EMultimodePhoneNotifyBatteryInfoChange; @@ -3109,7 +3113,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyBatteryInfoChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYBATTERYINFOCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyBatteryInfoChange"); if ( KErrNone == aErrorCode ) { @@ -3119,7 +3123,7 @@ iBatteryInfo = *batteryInfo; } -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteNotifyBatteryInfoChange, battery status: %d", (TInt)iBatteryInfo.iStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYBATTERYINFOCHANGE_2, "TSY: CMmPhoneTsy::CompleteNotifyBatteryInfoChange, battery status: %d", (TInt)iBatteryInfo.iStatus); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -3146,7 +3150,7 @@ TInt CMmPhoneTsy::NotifyBatteryInfoChangeCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmPhoneTsy::NotifyBatteryInfoChangeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYBATTERYINFOCHANGECANCEL_1, "TSY: CMmPhoneTsy::NotifyBatteryInfoChangeCancel"); iRetBatteryInfo = NULL; iTsyReqHandleStore->ResetTsyReqHandle( @@ -3231,12 +3235,12 @@ if ( iBootState.iSIMReady ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameL -Sim ready"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMEL_1, "TSY: CMmPhoneTsy::GetServiceProviderNameL -Sim ready"); if ( sizeof( RMobilePhone::TMobilePhoneServiceProviderNameV2 ) > aName->MaxLength() ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameL -Invalid parameter!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMEL_2, "TSY: CMmPhoneTsy::GetServiceProviderNameL -Invalid parameter!"); ret = KErrArgument; } else @@ -3254,7 +3258,7 @@ if ( KErrNone == ret ) { // save reqhandle to queue -TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameL - Client to queue"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMEL_3, "TSY: CMmPhoneTsy::GetServiceProviderNameL - Client to queue"); RMobilePhone::TMobilePhoneServiceProviderNameV2Pckg* nameV2Pckg = REINTERPRET_CAST( RMobilePhone::TMobilePhoneServiceProviderNameV2Pckg*, @@ -3275,7 +3279,7 @@ } else { -TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameL - Sim not ready"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMEL_4, "TSY: CMmPhoneTsy::GetServiceProviderNameL - Sim not ready"); ret = KErrNotReady; } @@ -3293,7 +3297,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_1, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error %d", aErrorCode ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -3308,24 +3312,24 @@ { aDataPackage->UnPackData( &name ); -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName name: %S", &name->iSPName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_2, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName name: %S", name->iSPName ); for ( TInt i=0; i < requestCount ; i++ ) { TServiceProviderNameRequest* req = iServiceProviderNameRequests[ i ]; *(req->iServiceProviderName) = *name; -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName client %d", i ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_3, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName client %d", i ); ReqCompleted( req->iReqHandle, aErrorCode ); } } else { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_4, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error %d", aErrorCode ); for ( TInt i=0; i < requestCount ; i++ ) { TServiceProviderNameRequest* req = iServiceProviderNameRequests[ i ]; -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error queue: %d", i ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_5, "TSY: CMmPhoneTsy::CompleteGetServiceProviderName Error queue: %d", i ); ReqCompleted( req->iReqHandle, aErrorCode ); } } @@ -3344,14 +3348,14 @@ // TInt CMmPhoneTsy::GetServiceProviderNameCancel( const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING2("TSY: CMmPhoneTsy::GetServiceProviderNameCancel aTsyReqHandle: %d", aTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_1, "TSY: CMmPhoneTsy::GetServiceProviderNameCancel aTsyReqHandle: %d", aTsyReqHandle); TInt requestCount = iServiceProviderNameRequests.Count(); //reset the req handle if only one req remains if( 1 == requestCount ) { - TFLOGSTRING("TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - one req"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_2, "TSY: CMmPhoneTsy::GetCustomerServiceProfileCancel - one req"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetServiceProviderName ); } @@ -3359,7 +3363,7 @@ // qo throw array if several requests and find correct reqhandle to cancel for ( TInt i = 0; i < requestCount; i++ ) { - TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceProviderNameCancel - queued requests"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_3, "TSY: CMmPhoneTsy::GetServiceProviderNameCancel - queued requests"); TServiceProviderNameRequest* req = iServiceProviderNameRequests[i]; @@ -3508,10 +3512,8 @@ } else { - TFLOGSTRING3("TSY: CMmPhoneTsy::GetPhoneIdL - iManufacturer: %S, iModel: %S", &iPhoneIdentity.iManufacturer, - &iPhoneIdentity.iModel ); - TFLOGSTRING3("TSY: CMmPhoneTsy::GetPhoneIdL - iRevision: %S, iSerialNumber: %S", &iPhoneIdentity.iRevision, - &iPhoneIdentity.iSerialNumber); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DOGETPHONEIDL_1, "TSY: CMmPhoneTsy::GetPhoneIdL - iManufacturer: %S, iModel: %S", iPhoneIdentity.iManufacturer, iPhoneIdentity.iModel ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DOGETPHONEIDL_2, "TSY: CMmPhoneTsy::GetPhoneIdL - iRevision: %S, iSerialNumber: %S", iPhoneIdentity.iRevision, iPhoneIdentity.iSerialNumber); *aId = iPhoneIdentity; ReqCompleted( aTsyReqHandle, KErrNone ); @@ -3533,7 +3535,7 @@ // Copy serial number iPhoneIdentity.iSerialNumber.Copy(aSerialData.Left( aSerialData.Length() ) ); - TFLOGSTRING2("TSY: CMmPhoneTsy::CompletePhoneSerialNumber - iSerialNumber: %S", &iPhoneIdentity.iSerialNumber ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID_1, "TSY: CMmPhoneTsy::CompletePhoneSerialNumber - iSerialNumber: %S", iPhoneIdentity.iSerialNumber ); } //reset req handle. Returns the deleted req handle @@ -3559,7 +3561,7 @@ // TInt CMmPhoneTsy::MobilePhoneGetPhoneIdCancel(const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("TSY: CMmPhoneTsy::MobilePhoneGetPhoneIdCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MOBILEPHONEGETPHONEIDCANCEL_1, "TSY: CMmPhoneTsy::MobilePhoneGetPhoneIdCancel"); TInt reqCount = iGetPhoneIdRequests.Count(); @@ -3633,7 +3635,7 @@ } else { - TFLOGSTRING("TSY: CMmPhoneTsy::GetSubscriberIdL - queued requests add req to queue"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSUBSCRIBERIDL_1, "TSY: CMmPhoneTsy::GetSubscriberIdL - queued requests add req to queue"); TSubscriberIdRequest* req = new (ELeave) TSubscriberIdRequest(); req->iReqHandle = aTsyReqHandle; req->iRetSubscrId = aId; @@ -3663,7 +3665,7 @@ { TInt ret( KErrGeneral ); -TFLOGSTRING("TSY: CMmPhoneTsy::GetIndicatorCaps" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORCAPS_1, "TSY: CMmPhoneTsy::GetIndicatorCaps" ); if( NULL != aActCaps && NULL != aIndCaps ) { *aActCaps = RMobilePhone::KCapsGetIndicator | @@ -3689,7 +3691,7 @@ const TTsyReqHandle aTsyReqHandle, TUint32* aIndicators ) { -TFLOGSTRING( "TSY: CMmPhoneTsy::GetIndicators" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORS_1, "TSY: CMmPhoneTsy::GetIndicators" ); TInt ret( KErrGeneral ); if( aIndicators ) @@ -3714,7 +3716,7 @@ TUint32 indicators( 0 ); //Charger connected? -TFLOGSTRING2( "TSY: CMmPhoneTsy::GetIndicatorState charger: %d", (TInt)iBatteryInfo.iStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORSTATE_1, "TSY: CMmPhoneTsy::GetIndicatorState charger: %d", (TInt)iBatteryInfo.iStatus ); if( RMobilePhone::EBatteryConnectedButExternallyPowered == iBatteryInfo.iStatus ) { @@ -3731,7 +3733,7 @@ { indicators |= RMobilePhone::KIndNetworkAvailable; } -TFLOGSTRING2( "TSY: CMmPhoneTsy::GetIndicatorState network: %d", (TInt)networkRegStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORSTATE_2, "TSY: CMmPhoneTsy::GetIndicatorState network: %d", (TInt)networkRegStatus ); } //Call in progress? @@ -3743,12 +3745,12 @@ CMmCallTsy* mmCall = CallList()->GetMmCallByIndex( i ); if ( RMobileCall::EStatusConnected == mmCall->MobileCallStatus() ) { -TFLOGSTRING3( "TSY: CMmPhoneTsy::GetIndicatorState call id: %d, status: %d", mmCall->CallId(), (TInt)mmCall->MobileCallStatus() ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORSTATE_3, "TSY: CMmPhoneTsy::GetIndicatorState call id: %d, status: %d", mmCall->CallId(), (TInt)mmCall->MobileCallStatus() ); indicators |= RMobilePhone::KIndCallInProgress; break; } } -TFLOGSTRING2( "TSY: CMmPhoneTsy::GetIndicatorState - ok, Indicators: %d", indicators ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETINDICATORSTATE_4, "TSY: CMmPhoneTsy::GetIndicatorState - ok, Indicators: %d", indicators ); return indicators; } @@ -3763,7 +3765,7 @@ TBuf8 aImsiData, TInt aError ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL, aError=%d", aError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_1, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL, aError=%d", aError ); // Set the flag to EFalse iTSYSubscriberIdReq = EFalse; @@ -3773,19 +3775,19 @@ // Retrieve previous IMSI value from the Central Repository iCFISPrivateCentRep->Get( KCtsyIMSI, subscriberIdTmp ); -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Get old IMSI from CenRep: %S", &subscriberIdTmp ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_2, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Get old IMSI from CenRep: %S", subscriberIdTmp ); if ( ( KErrNone == aError ) && ( 0 < aImsiData.Length() ) ) { // Copy new IMSI value to the member variable iSubscriberId.Copy( aImsiData.Left( aImsiData.Length() ) ); -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Copy new IMSI: %S", &iSubscriberId ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_3, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Copy new IMSI: %S", iSubscriberId ); } // check the boot state security, is the security ready (PIN query) if ( iBootState.iSecReady ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Security ready"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_4, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Security ready"); // Check has the IMSI changed and is there previous info: or an error if ( KErrNotFound == subscriberIdTmp.Match( iSubscriberId ) && @@ -3802,7 +3804,7 @@ iCFISPrivateCentRep->Reset(); // Reset MWIS support iMmSupplServTsy->SetIccSupportForMWIS( ETrue ); -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Central Repositories have been reseted!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_5, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Central Repositories have been reseted!"); // intialize the previous SIM related data if ( iMmCustomTsy ) @@ -3814,7 +3816,7 @@ // get new infromation from lower levels, if sim is ready if ( iBootState.iSIMReady ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - SIM ready, retrive intial ICC SIM data."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_6, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - SIM ready, retrive intial ICC SIM data."); // update ALS line information iMessageManager->HandleRequestL( EMobilePhoneGetALSLine ); @@ -3837,7 +3839,7 @@ { // Write new IMSI value to the central repository iCFISPrivateCentRep->Set( KCtsyIMSI, iSubscriberId ); -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Write new IMSI to the CenRep: %S", &iSubscriberId ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_7, "TSY: CMmPhoneTsy::CompleteGetSubscriberIdL - Write new IMSI to the CenRep: %S", iSubscriberId ); } //reset req handle. Returns the deleted req handle @@ -3898,7 +3900,7 @@ const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneALSLine* aALSLine ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetALSLineL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETALSLINEL_1, "TSY: CMmPhoneTsy::GetALSLineL"); TInt ret ( KErrNone ); TBool alsSupportedBySim; @@ -4014,7 +4016,7 @@ RMobilePhone::TMobilePhoneALSLine aAlsStatus, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetAlsLine - ALS line" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETALSLINE_1, "TSY: CMmPhoneTsy::CompleteGetAlsLine - ALS line" ); //check if value has been updated if ( aAlsStatus != iAlsLine ) @@ -4054,7 +4056,7 @@ const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneALSLine* aALSLine ) { -TFLOGSTRING("TSY: CMmPhoneTsy::SetALSLineL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETALSLINEL_1, "TSY: CMmPhoneTsy::SetALSLineL"); TInt ret ( KErrNone ); TBool alsSupportedBySim ( EFalse ); @@ -4127,7 +4129,7 @@ void CMmPhoneTsy::CompleteSetAlsLine( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSetAlsLine - ALS line: %d", iTempAlsLine ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESETALSLINE_1, "TSY: CMmPhoneTsy::CompleteSetAlsLine - ALS line: %d", iTempAlsLine ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -4216,7 +4218,7 @@ const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneFdnStatus* aFdnStatus ) { -TFLOGSTRING( "TSY: CMmPhoneTsy::GetFdnStatusL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETFDNSTATUSL_1, "TSY: CMmPhoneTsy::GetFdnStatusL" ); TInt ret ( KErrServerBusy ); @@ -4260,7 +4262,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetFdnStatus - Error: %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETFDNSTATUS_1, "TSY: CMmPhoneTsy::CompleteGetFdnStatus - Error: %d", aErrorCode ); //reset req handle. Returns the deleted req handle @@ -4293,7 +4295,7 @@ TInt CMmPhoneTsy::GetFdnStatusCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING( "TSY: CMmPhoneTsy::GetFdnStatusCancel" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETFDNSTATUSCANCEL_1, "TSY: CMmPhoneTsy::GetFdnStatusCancel" ); iRetGetFdnStatus = NULL; iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetFdnStatus ); @@ -4343,8 +4345,7 @@ void CMmPhoneTsy::CompleteSetFdnSettingL( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSetFdnSettingL - Error: %d", - aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESETFDNSETTINGL_1, "TSY: CMmPhoneTsy::CompleteSetFdnSettingL - Error: %d",aErrorCode); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -4601,14 +4602,14 @@ if ( CMmPhoneGsmWcdmaExt::EICCTypeSim2GGsm == currentIccType) { *aCaps = RMobilePhone::KCapsSimAccessSupported; -TFLOGSTRING("TSY: CMmPhoneTsy::GetIccAccessCaps: aCaps = KCapsSimAccessSupported."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETICCACCESSCAPS_1, "TSY: CMmPhoneTsy::GetIccAccessCaps: aCaps = KCapsSimAccessSupported."); } // 3G USIM else if ( CMmPhoneGsmWcdmaExt::EICCTypeSim3G == currentIccType ) { *aCaps = RMobilePhone::KCapsUSimAccessSupported + RMobilePhone::KCapsSimAccessSupported; -TFLOGSTRING("TSY: CMmPhoneTsy::GetIccAccessCaps: aCaps = KCapsUSimAccessSupported + KCapsSimAccessSupported."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETICCACCESSCAPS_2, "TSY: CMmPhoneTsy::GetIccAccessCaps: aCaps = KCapsUSimAccessSupported + KCapsSimAccessSupported."); } ReqCompleted( aTsyReqHandle, ret ); @@ -4672,11 +4673,11 @@ { case CMmPhoneGsmWcdmaExt::EICCTypeSim2GGsm: // 2G SIM *iICCCaps = RMobilePhone::KCapsSimAccessSupported; -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyIccAccessCapsChange: KCapsSimAccessSupported."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYICCACCESSCAPSCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyIccAccessCapsChange: KCapsSimAccessSupported."); break; case CMmPhoneGsmWcdmaExt::EICCTypeSim3G: // 3G USIM *iICCCaps = RMobilePhone::KCapsUSimAccessSupported; -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyIccAccessCapsChange: KCapsUSimAccessSupported."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYICCACCESSCAPSCHANGE_2, "TSY: CMmPhoneTsy::CompleteNotifyIccAccessCapsChange: KCapsUSimAccessSupported."); break; default: @@ -4721,7 +4722,7 @@ ret = GetServiceTableL( aTsyReqHandle, aTable, serviceTableV1 ); } -TFLOGSTRING2("TSY: CMmPhoneTsy::GetServiceTableCheckParametersL - ret:%d",ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLECHECKPARAMETERSL_1, "TSY: CMmPhoneTsy::GetServiceTableCheckParametersL - ret:%d",ret); return ret; } @@ -4736,7 +4737,7 @@ RMobilePhone::TMobilePhoneServiceTable* aTable, RMobilePhone::TMobilePhoneServiceTableV1* aTableData ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::GetServiceTableL - Handle:%d", aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_1, "TSY: CMmPhoneTsy::GetServiceTableL - Handle:%d", aTsyReqHandle); TInt ret( KErrServerBusy ); TTsyReqHandle serviceTableHandle = @@ -4791,7 +4792,7 @@ // if SIM is not ready, store request and complete it when SIM is ready if ( !iBootState.iSIMReady ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableL - request when SIM not ready - store req" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_2, "TSY: CMmPhoneTsy::GetServiceTableL - request when SIM not ready - store req" ); TServiceTableRequests* req = new (ELeave) TServiceTableRequests(); req->iReqHandle = aTsyReqHandle; req->iTable = aTable; @@ -4803,7 +4804,7 @@ if( RMobilePhone::ESIMServiceTable == *aTable && iServiceTableDataCache ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableL ESIMServiceTable returned from cache"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_3, "TSY: CMmPhoneTsy::GetServiceTableL ESIMServiceTable returned from cache"); *aTableData = *iServiceTableDataCache; ReqCompleted( aTsyReqHandle, ret ); return KErrNone; @@ -4811,7 +4812,7 @@ else if ( RMobilePhone::EUSIMServiceTable== *aTable && iServiceTableUSIMDataCache ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableL EUSIMServiceTable returned from cache"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_4, "TSY: CMmPhoneTsy::GetServiceTableL EUSIMServiceTable returned from cache"); *aTableData = *iServiceTableUSIMDataCache; ReqCompleted( aTsyReqHandle, ret ); return KErrNone; @@ -4820,7 +4821,7 @@ { if( !iSimRefreshRegisterOk && !( iServiceTableReq->iCaching ) ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableL sim refresh registration failed - possible old data - cache and complete "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLEL_5, "TSY: CMmPhoneTsy::GetServiceTableL sim refresh registration failed - possible old data - cache and complete "); //Store reguest parameters for completion iServiceTableReq->iReqHandle = aTsyReqHandle; iServiceTableReq->iTable = aTable; @@ -4895,7 +4896,7 @@ // void CMmPhoneTsy::CacheServiceTablesL() { -TFLOGSTRING("TSY: CMmPhoneTsy::CacheServiceTables."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHESERVICETABLESL_1, "TSY: CMmPhoneTsy::CacheServiceTables."); // Start caching if it is not already ongoing if ( (((iSimCacheQueue && ( KCacheServiceTable & iSimCacheQueue )) ) @@ -4924,11 +4925,11 @@ // void CMmPhoneTsy::CompleteCacheServiceTablesL( const TInt aError ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL Error = %d", aError); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_1, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL Error = %d", aError); if ( ( iSimCacheQueue && ( KCacheServiceTable & iSimCacheQueue ) ) && IsRefreshOngoing() ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_2, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL"); CompleteCacheSimL( KCacheServiceTable, aError ); } @@ -4936,42 +4937,42 @@ // check pending requests and proceed if any TInt serviceTableRequestsCount = iServiceTableRequests.Count(); -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - serviceTableRequestsCount: %d", serviceTableRequestsCount ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_3, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - serviceTableRequestsCount: %d", serviceTableRequestsCount ); if ( serviceTableRequestsCount ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Completing pending ServiceTableRequests"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_4, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Completing pending ServiceTableRequests"); // check request type for every pending request and complete for ( TInt i = 0; i < serviceTableRequestsCount; i++ ) { TServiceTableRequests* req = iServiceTableRequests[ i ]; if ( RMobilePhone::ESIMServiceTable == *req->iTable ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending ESIMServiceTableRequest"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_5, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending ESIMServiceTableRequest"); *(req->iTableData) = *iServiceTableDataCache; } else if ( RMobilePhone::EUSIMServiceTable == *req->iTable ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending ESIMServiceTableRequest"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_6, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending ESIMServiceTableRequest"); *(req->iTableData) = *iServiceTableUSIMDataCache; } else { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending BadRequest - KErrGeneral"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_7, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - pending BadRequest - KErrGeneral"); ret = KErrGeneral; } -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - ReqCompleted for pending req withHandle:%d", req->iReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_8, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - ReqCompleted for pending req withHandle:%d", req->iReqHandle); ReqCompleted(req->iReqHandle, ret); } // Reset req handle iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetServiceTable ); iServiceTableRequests.ResetAndDestroy(); -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Reset and ResetAndDestroy!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_9, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Reset and ResetAndDestroy!"); } if ( ENoRequest != iPendingServiceTableReq ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL completing client request"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_10, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL completing client request"); // Complete client request if pending // Reset req handle. Returns the deleted req handle @@ -5007,7 +5008,7 @@ if ( iCalledOnGet && ( iServiceTableReq->iCaching ) ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Called when reading service tables - "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_11, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Called when reading service tables - "); iCalledOnGet = EFalse; iSimCacheQueue = 0; iRefreshOngoing = EFalse; @@ -5026,7 +5027,7 @@ iPendingServiceTableReq = ENoRequest; // Complete request if error occured -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Completing req if error occurred"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESERVICETABLESL_12, "TSY: CMmPhoneTsy::CompleteCacheServiceTablesL - Completing req if error occurred"); ReqCompleted( reqHandle, ret ); } } @@ -5044,36 +5045,36 @@ RMobilePhone::TMobilePhoneServiceTableV1 aTableData, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceTableL Error = %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_1, "TSY: CMmPhoneTsy::CompleteGetServiceTableL Error = %d", aErrorCode); // Check if timeout has happend, complete to all pending ServiceTable // requests and clear queue -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_2, "TSY: CMmPhoneTsy::CompleteGetServiceTableL"); if ( KErrTimedOut == aErrorCode ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL - Timeout happened"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_3, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - Timeout happened"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetServiceTable ); if ( EMultimodePhoneReqHandleUnknown != reqHandle ) -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL - in EMultimodePhoneReqHandleUnknown != reqHandle" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_4, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - in EMultimodePhoneReqHandleUnknown != reqHandle" ); { // count pending requests and proceed if any TInt serviceTableRequestsCount = iServiceTableRequests.Count(); -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceTableL - serviceTableRequestsCount: %d", serviceTableRequestsCount ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_5, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - serviceTableRequestsCount: %d", serviceTableRequestsCount ); if ( serviceTableRequestsCount ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL - Completing pending ServiceTableRequests"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_6, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - Completing pending ServiceTableRequests"); // complete pending requests for ( TInt i = 0; i < serviceTableRequestsCount; i++ ) { TServiceTableRequests* req = iServiceTableRequests[ i ]; -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetServiceTableL - ReqCompleted for pending req withHandle:%d", req->iReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_7, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - ReqCompleted for pending req withHandle:%d", req->iReqHandle); ReqCompleted(req->iReqHandle, aErrorCode); } -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL - in iServiceTableRequests.ResetAndDestroy()" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_8, "TSY: CMmPhoneTsy::CompleteGetServiceTableL - in iServiceTableRequests.ResetAndDestroy()" ); iServiceTableRequests.ResetAndDestroy(); } } @@ -5081,7 +5082,7 @@ if ( ESIMRequest == iPendingServiceTableCacheReq ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL got Service Table"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_9, "TSY: CMmPhoneTsy::CompleteGetServiceTableL got Service Table"); delete iServiceTableDataCache; iServiceTableDataCache = NULL; @@ -5099,7 +5100,7 @@ iMmPhoneExtInterface->CurrentICCType() ) && ENoRequest != iPendingServiceTableCacheReq ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL requesting USIM Service Table"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_10, "TSY: CMmPhoneTsy::CompleteGetServiceTableL requesting USIM Service Table"); RMobilePhone::TMobilePhoneServiceTable serviceTable = RMobilePhone::EUSIMServiceTable; @@ -5124,7 +5125,7 @@ } else if ( EUSIMRequest == iPendingServiceTableCacheReq ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL got USIM Service Table"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_11, "TSY: CMmPhoneTsy::CompleteGetServiceTableL got USIM Service Table"); delete iServiceTableUSIMDataCache; iServiceTableUSIMDataCache = NULL; @@ -5148,7 +5149,7 @@ if ( ENoRequest != iPendingServiceTableReq && ENoRequest == iPendingServiceTableCacheReq ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL completing client request"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_12, "TSY: CMmPhoneTsy::CompleteGetServiceTableL completing client request"); // Complete client request if pending // Reset req handle. Returns the deleted req handle @@ -5164,7 +5165,7 @@ if( KErrNone == aErrorCode ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL copy SIM ST data to client"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_13, "TSY: CMmPhoneTsy::CompleteGetServiceTableL copy SIM ST data to client"); iServiceTableDataCache = new (ELeave) RMobilePhone::TMobilePhoneServiceTableV1(); *iServiceTableDataCache = aTableData; @@ -5178,7 +5179,7 @@ if( KErrNone == aErrorCode ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetServiceTableL copy USIM ST data to client"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETSERVICETABLEL_14, "TSY: CMmPhoneTsy::CompleteGetServiceTableL copy USIM ST data to client"); iServiceTableUSIMDataCache = new (ELeave) RMobilePhone::TMobilePhoneServiceTableV1(); *iServiceTableUSIMDataCache = aTableData; @@ -5203,7 +5204,7 @@ TInt CMmPhoneTsy::GetServiceTableCancel ( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetServiceTableCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSERVICETABLECANCEL_1, "TSY: CMmPhoneTsy::GetServiceTableCancel"); iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetServiceTable ); ReqCompleted( aTsyReqHandle, KErrCancel ); @@ -5219,7 +5220,7 @@ // TInt CMmPhoneTsy::SimRefreshRegisterL() { -TFLOGSTRING( "TSY: CMmPhoneTsy::SimRefreshRegisterL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SIMREFRESHREGISTERL_1, "TSY: CMmPhoneTsy::SimRefreshRegisterL" ); TInt ret( KErrNone ); @@ -5238,7 +5239,7 @@ if ( KErrNone != ret ) { // the sending has failed -TFLOGSTRING( "TSY: CMmPhoneTsy::SimRefreshRegisterL, Registration for Refresh failed" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SIMREFRESHREGISTERL_2, "TSY: CMmPhoneTsy::SimRefreshRegisterL, Registration for Refresh failed" ); } return ret; @@ -5253,7 +5254,7 @@ void CMmPhoneTsy::CompleteSimRefreshRegister( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSimRefreshRegisterL Error = %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESIMREFRESHREGISTER_1, "TSY: CMmPhoneTsy::CompleteSimRefreshRegisterL Error = %d", aErrorCode ); if( KErrNone == aErrorCode ) { @@ -5269,7 +5270,7 @@ // TBool CMmPhoneTsy::GetSimRefreshRegister() { -TFLOGSTRING2( "TSY: CMmPhoneTsy::GetSimRefreshRegister iSimRefreshRegisterOk = %d", iSimRefreshRegisterOk ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSIMREFRESHREGISTER_1, "TSY: CMmPhoneTsy::GetSimRefreshRegister iSimRefreshRegisterOk = %d", iSimRefreshRegisterOk ); return iSimRefreshRegisterOk; } @@ -5284,7 +5285,7 @@ { if( KErrNone != aErrorCode) { - TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteUpdateLifeTimer Error = %d", aErrorCode ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEUPDATELIFETIMER_1, "TSY: CMmPhoneTsy::CompleteUpdateLifeTimer Error = %d", aErrorCode ); } } @@ -5343,7 +5344,7 @@ void CMmPhoneTsy::CompleteSimRefreshNowL( TUint16 aFilesToRefresh ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSimRefreshNowL filemask: %d", aFilesToRefresh); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESIMREFRESHNOWL_1, "TSY: CMmPhoneTsy::CompleteSimRefreshNowL filemask: %d", aFilesToRefresh); // Set flag to indicate that refresh has started iRefreshOngoing = ETrue; @@ -5393,13 +5394,13 @@ //FDN requested? (FDN has the first priority) if( KCacheFdn & iSimCacheQueue ) { -TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - FDN" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_1, "TSY: CMmPhoneTsy::CacheNextL - FDN" ); pbRequested = KETelIccFdnPhoneBook; resetFlag = KCacheFdn; } else if( KCacheALSline & iSimCacheQueue ) { -TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - ALS" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_2, "TSY: CMmPhoneTsy::CacheNextL - ALS" ); ResetMEAlsInfo(); pbRequested = KNullDesC; cacheStarted = ETrue; @@ -5407,7 +5408,7 @@ //ADN requested? else if( KCacheAdn & iSimCacheQueue ) { -TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - ADN" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_3, "TSY: CMmPhoneTsy::CacheNextL - ADN" ); //NOTE: Here should be added the checking of FDN active state pbRequested = KETelIccAdnPhoneBook; resetFlag = KCacheAdn; @@ -5416,7 +5417,7 @@ //checked and the queue can be reset) else { -TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - Unknown" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_4, "TSY: CMmPhoneTsy::CacheNextL - Unknown" ); pbRequested = KNullDesC; resetFlag = iSimCacheQueue; } @@ -5425,7 +5426,7 @@ if( (pbRequested!=KNullDesC) && (iPBList) ) { TInt numberOfPBooks = iPBList->GetNumberOfObjects(); -TFLOGSTRING2( "TSY: CMmPhoneTsy::CacheNextL - Num Of PBs: %d", numberOfPBooks ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_5, "TSY: CMmPhoneTsy::CacheNextL - Num Of PBs: %d", numberOfPBooks ); //Browse through the phonebook names for the one required for( TInt i=0; i < numberOfPBooks; i++ ) @@ -5446,24 +5447,23 @@ TRAP_IGNORE( MessageManager()->HandleRequestL( EMmTsyPhoneBookStoreCacheCancelIPC, &package ); ); -#if ( TF_LOGGING_METHOD > 0 ) + if ( pbRequested == KETelIccFdnPhoneBook ) { -TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - CancelCache for : KETelIccFdnPhoneBook" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_6, "TSY: CMmPhoneTsy::CacheNextL - CancelCache for : KETelIccFdnPhoneBook" ); } else { -TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - CancelCache for : KETelIccAdnPhoneBook" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_7, "TSY: CMmPhoneTsy::CacheNextL - CancelCache for : KETelIccAdnPhoneBook" ); } -#endif // TF_LOGGING_METHOD } // perform the various stages of phonebook // cache re-initialisation -TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - Resetting cache."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_8, "TSY: CMmPhoneTsy::CacheNextL - Resetting cache."); pbStore->ResetCacheReady(); pbStore->ResetInitialisationStatus(); pbStore->ResetCache(); -TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL -> Cache entries" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_9, "TSY: CMmPhoneTsy::CacheNextL -> Cache entries" ); pbStore->CacheEntriesL(); cacheStarted = ETrue; @@ -5477,14 +5477,14 @@ //so the file is removed from the cache queue if( !cacheStarted ) { -TFLOGSTRING( "TSY: CMmPhoneTsy::CacheNextL - No PB Could be found, or Unknown request" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_10, "TSY: CMmPhoneTsy::CacheNextL - No PB Could be found, or Unknown request" ); CompleteCacheSimL( resetFlag, ETrue ); //complete with error } } //more files in the queue? result = ( iSimCacheQueue )? ETrue : EFalse; -TFLOGSTRING2( "TSY: CMmPhoneTsy::CacheNextL: (Success/Fail = 1/0) %d",(TInt)result ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_CACHENEXTL_11, "TSY: CMmPhoneTsy::CacheNextL: (Success/Fail = 1/0) %d",(TInt)result ); return result; } @@ -5500,7 +5500,7 @@ TUint8 aFileType, TBool aReadError) { -TFLOGSTRING2( "TSY: CMmPhoneTsy::CompleteCacheSimL, FileType: 0x%x", aFileType ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESIML_1, "TSY: CMmPhoneTsy::CompleteCacheSimL, FileType: 0x%x", aFileType ); TBool filesInCacheQueue(EFalse); //By default: "no more files in cache" @@ -5536,7 +5536,7 @@ } else { -TFLOGSTRING( "TSY: CMmPhoneTsy::CompleteCacheSimL, caching still in progress." ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETECACHESIML_2, "TSY: CMmPhoneTsy::CompleteCacheSimL, caching still in progress." ); } } @@ -5549,7 +5549,7 @@ void CMmPhoneTsy::NotifySimRefreshCompletionL( TBool aReadError ) { -TFLOGSTRING2( "TSY: CMmPhoneTsy::NotifySimRefreshCompletionL error = %d",aReadError ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYSIMREFRESHCOMPLETIONL_1, "TSY: CMmPhoneTsy::NotifySimRefreshCompletionL error = %d",aReadError ); // Refresh is finished, update flag iRefreshOngoing = EFalse; @@ -5575,7 +5575,7 @@ TInt CMmPhoneTsy::ImsAuthenticationL( TDes8* aAuthenticationData ) { -TFLOGSTRING("TSY: CMmPhoneTsy::ImsAuthenticationL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_IMSAUTHENTICATIONL_1, "TSY: CMmPhoneTsy::ImsAuthenticationL"); TInt ret = KErrServerBusy; @@ -5628,7 +5628,7 @@ CMmDataPackage* aDataPackage, TInt aResult ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteImsAuthentication"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEIMSAUTHENTICATION_1, "TSY: CMmPhoneTsy::CompleteImsAuthentication"); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -5695,7 +5695,7 @@ // TInt CMmPhoneTsy::ImsAuthenticationCancel() { -TFLOGSTRING("TSY: CMmPhoneTsy::ImsAuthenticationCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_IMSAUTHENTICATIONCANCEL_1, "TSY: CMmPhoneTsy::ImsAuthenticationCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneIMSAuthenticate ); @@ -5721,7 +5721,7 @@ TInt CMmPhoneTsy::GetMailboxNumbersL( TDes8* aMailBox ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetMailboxNumbersL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMAILBOXNUMBERSL_1, "TSY: CMmPhoneTsy::GetMailboxNumbersL"); TInt ret = KErrServerBusy; // Check if request handle already exists @@ -5758,7 +5758,7 @@ found = ETrue; if( !pbStore->IsPBInitDone() ) { - TFLOGSTRING("TSY: CMmPhoneTsy::GetMailboxNumbersL VoiceMailBox initilizing was not complete... Waiting for completion"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMAILBOXNUMBERSL_2, "TSY: CMmPhoneTsy::GetMailboxNumbersL VoiceMailBox initilizing was not complete... Waiting for completion"); iReqHandleType = EMultimodePhoneGetMailboxNumbers; return KErrNone; } @@ -5766,7 +5766,7 @@ } if(!found) { - TFLOGSTRING("TSY: CMmPhoneTsy::GetMailboxNumbersL VoiceMailBox should be created..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMAILBOXNUMBERSL_3, "TSY: CMmPhoneTsy::GetMailboxNumbersL VoiceMailBox should be created..."); iMmPhoneBookStoreTsy = CMmPhoneBookStoreTsy::NewL( this, KETelIccVoiceMailBox ); @@ -5806,7 +5806,7 @@ CMmDataPackage* aDataPackage, TInt aResult ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetMailboxNumbers"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETMAILBOXNUMBERS_1, "TSY: CMmPhoneTsy::CompleteGetMailboxNumbers"); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -5843,7 +5843,7 @@ // TInt CMmPhoneTsy::GetMailboxNumbersCancel() { -TFLOGSTRING("TSY: CMmPhoneTsy::GetMailboxNumbersCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMAILBOXNUMBERSCANCEL_1, "TSY: CMmPhoneTsy::GetMailboxNumbersCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetMailboxNumbers ); @@ -5978,7 +5978,7 @@ //Check if the object is the Phone object if( this == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - this == aObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_1, "TSY: CMmPhoneTsy::TimerExpired - this == aObject"); //call phone object to complete this request this->Complete( aReqHandleType, error ); } @@ -5989,14 +5989,14 @@ //Check if the object is a Call object for ( i = 0; i < iCallList->GetNumberOfObjects(); i++ ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iCallList->GetNumberOfObjects()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_2, "TSY: CMmPhoneTsy::TimerExpired - iCallList->GetNumberOfObjects()"); //Get call object CMmCallTsy* call = iCallList->GetMmCallByIndex( i ); //check if the current call is the object that we are //trying to find if( call == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - call == aObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_3, "TSY: CMmPhoneTsy::TimerExpired - call == aObject"); //call the complete method call->Complete( aReqHandleType, error ); //object found, break @@ -6007,7 +6007,7 @@ // Check if the object is a ConferenceCall object if ( iMmConferenceCall == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmConferenceCall"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_4, "TSY: CMmPhoneTsy::TimerExpired - iMmConferenceCall"); iMmConferenceCall->Complete( aReqHandleType, error ); } //OTHER MODULES @@ -6015,14 +6015,14 @@ //Check if the object is a PBStore object for ( i = 0; i < iPBList->GetNumberOfObjects(); i++ ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iPBList->GetNumberOfObjects()"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_5, "TSY: CMmPhoneTsy::TimerExpired - iPBList->GetNumberOfObjects()"); //Get PBStore object CMmPhoneBookStoreTsy* pbStore = iPBList->GetMmPBByIndex( i ); //check if the current PB is the object that we are //trying to find if ( pbStore == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - aPBStore == aObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_6, "TSY: CMmPhoneTsy::TimerExpired - aPBStore == aObject"); //call the complete method pbStore->Complete( aReqHandleType, error ); //object found, break @@ -6033,41 +6033,41 @@ // Check if the object is the SMS object if ( iMmSmsTsy == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmSmsTsy == aObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_7, "TSY: CMmPhoneTsy::TimerExpired - iMmSmsTsy == aObject"); //call the complete method iMmSmsTsy->Complete( aReqHandleType, error ); } // Check if the object is the Broadcast object else if ( iMmBroadcastTsy == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmBroadcastTsy == aObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_8, "TSY: CMmPhoneTsy::TimerExpired - iMmBroadcastTsy == aObject"); //call the complete method iMmBroadcastTsy->Complete( aReqHandleType, error ); } // Check if the object is the USSD object else if ( iMmUssdTsy == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmUssdTsy == aObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_9, "TSY: CMmPhoneTsy::TimerExpired - iMmUssdTsy == aObject"); //call the complete method iMmUssdTsy->Complete( aReqHandleType, error ); } // Check if the object is the ONstore object else if ( iMmONStoreTsy == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmONStoreTsy == aObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_10, "TSY: CMmPhoneTsy::TimerExpired - iMmONStoreTsy == aObject"); //call the complete method iMmONStoreTsy->Complete( aReqHandleType, error ); } // Check if the object is the ENstore object else if ( iMmENStoreTsy == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmENStoreTsy == aObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_11, "TSY: CMmPhoneTsy::TimerExpired - iMmENStoreTsy == aObject"); //call the complete method iMmENStoreTsy->Complete( aReqHandleType, error ); } else if ( iMmCustomTsy == aObject ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - iMmCustomTsy == aObject"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_12, "TSY: CMmPhoneTsy::TimerExpired - iMmCustomTsy == aObject"); iMmCustomTsy->Complete( aReqHandleType, error , aIPC ); } @@ -6079,13 +6079,13 @@ // Data session else if ( NULL != iMmPacketServiceTsy ) { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - NULL != iMmPacketServiceTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_13, "TSY: CMmPhoneTsy::TimerExpired - NULL != iMmPacketServiceTsy"); //call the complete method iMmPacketServiceTsy->Complete( aObject, aReqHandleType, error ); } else { -TFLOGSTRING("TSY: CMmPhoneTsy::TimerExpired - else"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_TIMEREXPIRED_14, "TSY: CMmPhoneTsy::TimerExpired - else"); } } @@ -6323,7 +6323,7 @@ RMobilePhone::TMobilePhoneServiceTableV1 emptyServiceTable; RMobilePhoneStore::TMobilePhoneStoreInfoV1 emptyPhoneStoreInfo; TInt trapError = KErrNone; -TFLOGSTRING2("TSY: CMmPhoneTsy::Complete - ReqHandleType: %d", aReqHandleType); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETE_1, "TSY: CMmPhoneTsy::Complete - ReqHandleType: %d", aReqHandleType); switch( aReqHandleType ) { case EMultimodePhoneTerminateAllCalls: @@ -6456,7 +6456,7 @@ CompleteGetFdnStatus( NULL, aError ); break; default: -TFLOGSTRING("TSY: CMmPhoneTsy::Complete default handle type" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETE_2, "TSY: CMmPhoneTsy::Complete default handle type" ); if ( iTsyReqHandleStore->GetTsyReqHandle( aReqHandleType )) { @@ -6541,7 +6541,7 @@ const TTsyReqHandle aTsyReqHandle, const TInt aError ) { -TFLOGSTRING3("TSY: CMmPhoneTsy::Request Completed - Handle:%d Error:%d", aTsyReqHandle, aError); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_REQCOMPLETED_1, "TSY: CMmPhoneTsy::Request Completed - Handle:%d Error:%d", aTsyReqHandle, aError); CTelObject::ReqCompleted( aTsyReqHandle, aError ); @@ -6886,7 +6886,7 @@ break; } -TFLOGSTRING3("TSY: CMmPhoneTsy::IsRequestPossibleInOffline - IPC:%d, ret:%d", aIpc, isRequestPossible); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ISREQUESTPOSSIBLEINOFFLINE_1, "TSY: CMmPhoneTsy::IsRequestPossibleInOffline - IPC:%d, ret:%d", aIpc, isRequestPossible); return isRequestPossible; } @@ -6903,7 +6903,7 @@ iCallForwardingNumber.Zero(); aDataPackage->UnPackData( iCallForwardingNumber ); -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetCallForwardingNumber number = %S ", &iCallForwardingNumber); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETCALLFORWARDINGNUMBER_1, "TSY: CMmPhoneTsy::CompleteGetCallForwardingNumber number = %S ", iCallForwardingNumber); } @@ -6917,7 +6917,7 @@ const TTsyReqHandle aTsyReqHandle, TUint32* aIndex ) { -TFLOGSTRING("TSY: CMmPhoneTsy::EnumerateAPNEntries"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ENUMERATEAPNENTRIESL_1, "TSY: CMmPhoneTsy::EnumerateAPNEntries"); // Check if request handle already exists TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( @@ -6969,7 +6969,7 @@ // TInt CMmPhoneTsy::EnumerateAPNEntriesCancel() { -TFLOGSTRING("CMmPhoneTsy::EnumerateAPNEntriesCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ENUMERATEAPNENTRIESCANCEL_1, "CMmPhoneTsy::EnumerateAPNEntriesCancel"); iRetAPNEntries = NULL; //reset the req handle @@ -6995,7 +6995,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteEnumerateAPNEntries Error: %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEENUMERATEAPNENTRIES_1, "TSY: CMmPhoneTsy::CompleteEnumerateAPNEntries Error: %d", aErrorCode); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -7031,7 +7031,7 @@ TUint32* aIndex, TDes8* aAPN ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetAPNnameL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETAPNNAMEL_1, "TSY: CMmPhoneTsy::GetAPNnameL"); TInt ret = KErrServerBusy; @@ -7085,7 +7085,7 @@ // TInt CMmPhoneTsy::GetAPNnameCancel() { -TFLOGSTRING("CMmPhoneTsy::GetAPNnameCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETAPNNAMECANCEL_1, "CMmPhoneTsy::GetAPNnameCancel"); iRetAPNname = NULL; //reset the req handle @@ -7111,7 +7111,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetAPNname Error: %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETAPNNAME_1, "TSY: CMmPhoneTsy::CompleteGetAPNname Error: %d", aErrorCode); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -7153,7 +7153,7 @@ void CMmPhoneTsy::SetAlsState( TBool aState ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::SetAlsState Error: %d", aState); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETALSSTATE_1, "TSY: CMmPhoneTsy::SetAlsState Error: %d", aState); // Check where set was called if( iCspFileAlsSet ) @@ -7190,7 +7190,7 @@ RMobilePhone::TMobilePhoneALSLine CMmPhoneTsy::MapMEALSLine( TInt aAlsLineInfo ) { -TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_1, "TSY: CMmPhoneTsy::MapMEALSLine"); RMobilePhone::TMobilePhoneALSLine lineInfo; @@ -7198,23 +7198,23 @@ { case 0://TInt from CentRep lineInfo = RMobilePhone::EAlternateLinePrimary; -TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSInfo Line line = EAlternateLinePrimary"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_2, "TSY: CMmPhoneTsy::MapMEALSInfo Line line = EAlternateLinePrimary"); break; case 1://TInt from CentRep lineInfo = RMobilePhone::EAlternateLineAuxiliary; -TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineAuxiliary"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_3, "TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineAuxiliary"); break; case 2://TInt from CentRep lineInfo = RMobilePhone::EAlternateLineUnknown; -TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineUnknown"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_4, "TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineUnknown"); break; case 3://TInt from CentRep lineInfo = RMobilePhone::EAlternateLineNotAvailable; -TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineNotAvailable"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_5, "TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineNotAvailable"); break; default: lineInfo = RMobilePhone::EAlternateLineUnknown; -TFLOGSTRING("TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineUnknown"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_MAPMEALSLINE_6, "TSY: CMmPhoneTsy::MapMEALSLine line = EAlternateLineUnknown"); break; } @@ -7230,13 +7230,13 @@ void CMmPhoneTsy::ResetMEAlsInfo() { -TFLOGSTRING("TSY: CMmPhoneTsy::ResetMEAlsInfo"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_RESETMEALSINFO_1, "TSY: CMmPhoneTsy::ResetMEAlsInfo"); iCentRep->Reset(); if( iSimCacheQueue && ( KCacheALSline & iSimCacheQueue ) ) { -TFLOGSTRING("TSY: CMmPhoneTsy::ResetMEAlsInfo -> CompleteCacheSimL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_RESETMEALSINFO_2, "TSY: CMmPhoneTsy::ResetMEAlsInfo -> CompleteCacheSimL"); // function can leave, so there for it must be trapped, the error // value is ingnored, because the functionality doesn't depend on it TRAP_IGNORE( CompleteCacheSimL( KCacheALSline, EFalse ) ); @@ -7252,7 +7252,7 @@ // CRepository* CMmPhoneTsy::GetCfisCenRep() { -TFLOGSTRING("TSY: CMmPhoneTsy::GetCfisCenRep"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCFISCENREP_1, "TSY: CMmPhoneTsy::GetCfisCenRep"); if( iCFISCentRep ) { @@ -7270,7 +7270,7 @@ // CRepository* CMmPhoneTsy::GetMwisCenRep() { -TFLOGSTRING("TSY: CMmPhoneTsy::GetMwisCenRep"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETMWISCENREP_1, "TSY: CMmPhoneTsy::GetMwisCenRep"); if( iMWISCentRep ) { @@ -7288,7 +7288,7 @@ // CRepository* CMmPhoneTsy::GetCfisPRCenRep() { -TFLOGSTRING("TSY: CMmPhoneTsy::GetCfisPRCenRep"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETCFISPRCENREP_1, "TSY: CMmPhoneTsy::GetCfisPRCenRep"); if( iCFISPrivateCentRep ) { @@ -7306,7 +7306,7 @@ // void CMmPhoneTsy::GetSubscriberIdForTSYL() { -TFLOGSTRING("TSY: CMmPhoneTsy::GetSubscriberIdForTSYL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSUBSCRIBERIDFORTSYL_1, "TSY: CMmPhoneTsy::GetSubscriberIdForTSYL"); // Check if some client has already requested this TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( @@ -7320,7 +7320,7 @@ } else { -TFLOGSTRING("TSY: CMmPhoneTsy::GetSubscriberIdForTSYL - Already requested"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETSUBSCRIBERIDFORTSYL_2, "TSY: CMmPhoneTsy::GetSubscriberIdForTSYL - Already requested"); } } @@ -7333,7 +7333,7 @@ TInt CMmPhoneTsy::AppendAPNNameL( RMobilePhone::TAPNEntryV3* aAPNEntry ) { -TFLOGSTRING("TSY: CMmPhoneTsy::AppendAPNNameL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_APPENDAPNNAMEL_1, "TSY: CMmPhoneTsy::AppendAPNNameL"); TInt ret ( KErrServerBusy ); @@ -7366,7 +7366,7 @@ // TInt CMmPhoneTsy::AppendAPNNameCancel() { -TFLOGSTRING("TSY: CMmPhoneTsy::AppendAPNNameCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_APPENDAPNNAMECANCEL_1, "TSY: CMmPhoneTsy::AppendAPNNameCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneAppendAPNName ); @@ -7389,7 +7389,7 @@ void CMmPhoneTsy::CompleteAppendAPNName( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteAppendAPNName. Error: %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEAPPENDAPNNAME_1, "TSY: CMmPhoneTsy::CompleteAppendAPNName. Error: %d", aErrorCode); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneAppendAPNName ); @@ -7410,7 +7410,7 @@ const TTsyReqHandle aTsyReqHandle, TUint32* aIndex ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::DeleteAPNNameL, index = %d", aIndex); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DELETEAPNNAMEL_1, "TSY: CMmPhoneTsy::DeleteAPNNameL, index = %d", aIndex); // get the handle TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( @@ -7450,7 +7450,7 @@ // TInt CMmPhoneTsy::DeleteAPNNameCancel() { -TFLOGSTRING("TSY: CMmPhoneTsy::DeleteAPNNameCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_DELETEAPNNAMECANCEL_1, "TSY: CMmPhoneTsy::DeleteAPNNameCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneDeleteAPNName ); @@ -7472,7 +7472,7 @@ void CMmPhoneTsy::CompleteDeleteAPNName( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteDeleteAPNName. Error: %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEDELETEAPNNAME_1, "TSY: CMmPhoneTsy::CompleteDeleteAPNName. Error: %d", aErrorCode); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneDeleteAPNName ); @@ -7492,7 +7492,7 @@ // TInt CMmPhoneTsy::NotifyAPNListChanged() { -TFLOGSTRING("TSY: CMmPhoneTsy::NotifyAPNListChanged"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYAPNLISTCHANGED_1, "TSY: CMmPhoneTsy::NotifyAPNListChanged"); iReqHandleType = EMultimodePhoneNotifyAPNListChange; @@ -7508,7 +7508,7 @@ // TInt CMmPhoneTsy::NotifyAPNListChangedCancel() { -TFLOGSTRING("TSY: CMmPhoneTsy::NotifyAPNListChangedCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYAPNLISTCHANGEDCANCEL_1, "TSY: CMmPhoneTsy::NotifyAPNListChangedCancel"); TTsyReqHandle reqHandle = iTsyReqHandleStore-> ResetTsyReqHandle( EMultimodePhoneNotifyAPNListChange ); @@ -7530,7 +7530,7 @@ void CMmPhoneTsy::CompleteNotifyAPNListChanged( TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyAPNListChanged"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYAPNLISTCHANGED_1, "TSY: CMmPhoneTsy::CompleteNotifyAPNListChanged"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneNotifyAPNListChange ); @@ -7552,7 +7552,7 @@ const TTsyReqHandle aTsyReqHandle, RMobilePhone::TAPNControlListServiceStatus* aAPNControlListServiceStatus ) { -TFLOGSTRING("TSY: CMmPhoneTsy::SetAPNControlListServiceStatusL."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETAPNCONTROLLISTSERVICESTATUSL_1, "TSY: CMmPhoneTsy::SetAPNControlListServiceStatusL."); iSetAclStatus = aAPNControlListServiceStatus; @@ -7594,7 +7594,7 @@ // TInt CMmPhoneTsy::SetAPNControlListServiceStatusCancel() { -TFLOGSTRING("TSY: CMmPhoneTsy::SetAPNControlListServiceStatusCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETAPNCONTROLLISTSERVICESTATUSCANCEL_1, "TSY: CMmPhoneTsy::SetAPNControlListServiceStatusCancel"); // erase pointer to client data iSetAclStatus = NULL; @@ -7620,7 +7620,7 @@ void CMmPhoneTsy::CompleteSetAPNControlListServiceStatus( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteSetAPNControlListServiceStatus. Error: %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETESETAPNCONTROLLISTSERVICESTATUS_1, "TSY: CMmPhoneTsy::CompleteSetAPNControlListServiceStatus. Error: %d", aErrorCode); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -7643,7 +7643,7 @@ const TTsyReqHandle aTsyReqHandle, RMobilePhone::TAPNControlListServiceStatus* aAPNControlListServiceStatus ) { -TFLOGSTRING("TSY: CMmPhoneTsy::GetAPNControlListServiceStatusL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETAPNCONTROLLISTSERVICESTATUSL_1, "TSY: CMmPhoneTsy::GetAPNControlListServiceStatusL"); TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodePhoneGetAPNControlListServiceStatus ); @@ -7684,7 +7684,7 @@ // TInt CMmPhoneTsy::GetAPNControlListServiceStatusCancel() { -TFLOGSTRING("TSY: CMmPhoneTsy::GetAPNControlListServiceStatusCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_GETAPNCONTROLLISTSERVICESTATUSCANCEL_1, "TSY: CMmPhoneTsy::GetAPNControlListServiceStatusCancel"); // reset the reqhandle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetAPNControlListServiceStatus ); @@ -7707,7 +7707,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteGetAPNControlListServiceStatus. Error %d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETAPNCONTROLLISTSERVICESTATUS_1, "TSY: CMmPhoneTsy::CompleteGetAPNControlListServiceStatus. Error %d", aErrorCode); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneGetAPNControlListServiceStatus ); @@ -7746,7 +7746,7 @@ TInt CMmPhoneTsy::NotifyAPNControlListServiceStatusChange( RMobilePhone::TAPNControlListServiceStatus* aAPNControlListServiceStatus ) { -TFLOGSTRING("TSY: CMmPhoneTsy::NotifyAPNControlListServiceStatusChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYAPNCONTROLLISTSERVICESTATUSCHANGE_1, "TSY: CMmPhoneTsy::NotifyAPNControlListServiceStatusChange"); iRetNotifyAclStatus = aAPNControlListServiceStatus; iReqHandleType = EMultimodePhoneNotifyAPNControlListServiceStatusChange; @@ -7763,7 +7763,7 @@ // TInt CMmPhoneTsy::NotifyAPNControlListServiceStatusChangeCancel() { -TFLOGSTRING("TSY: CMmPhoneTsy::NotifyAPNControlListServiceStatusChangeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYAPNCONTROLLISTSERVICESTATUSCHANGECANCEL_1, "TSY: CMmPhoneTsy::NotifyAPNControlListServiceStatusChangeCancel"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneNotifyAPNControlListServiceStatusChange ); @@ -7788,7 +7788,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteNotifyAPNControlListServiceStatusChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYAPNCONTROLLISTSERVICESTATUSCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyAPNControlListServiceStatusChange"); TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePhoneNotifyAPNControlListServiceStatusChange ); @@ -7874,8 +7874,7 @@ CMmDataPackage dataPackage; dataPackage.PackData( &duration ); - TFLOGSTRING2("TSY: CMmPhoneTsy::CompleteNotifyCallDurationChange - \ - duration: %d", duration); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETENOTIFYCALLDURATIONCHANGE_1, "TSY: CMmPhoneTsy::CompleteNotifyCallDurationChange - \duration: %d", duration); #ifdef USING_CTSY_DISPATCHER TRAP_IGNORE(iMessageManager->HandleRequestL( @@ -7893,16 +7892,16 @@ // Receives error notifications from Telephony audio control // --------------------------------------------------------------------------- // -#if TF_LOGGING_METHOD == 1 +#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) void CMmPhoneTsy::NotifyTelephonyAudioControlError( const TName& aCallName, const TInt& aError ) { - TFLOGSTRING3("TSY: CMmPhoneTsy::NotifyAudioControlError. Call name:%S, Error code %d", &aCallName, aError ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_NOTIFYTELEPHONYAUDIOCONTROLERROR_1, "TSY: CMmPhoneTsy::NotifyAudioControlError. Call name:%S, Error code %d", aCallName, aError ); #else void CMmPhoneTsy::NotifyTelephonyAudioControlError( const TName& /*aCallName*/, const TInt& /*aError*/ ) { -#endif // TF_LOGGING_METHOD +#endif // TInt callCount( iCallList->GetNumberOfObjects() ); // find all the audio calls and hang up them all @@ -7929,8 +7928,8 @@ // void CMmPhoneTsy::SetPBInitActiveStatus( TBool aIsInitializationActive ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::SetPBInitActiveStatus: - prev.status %i", iIsInitializationActive); -TFLOGSTRING2("TSY: CMmPhoneTsy::SetPBInitActiveStatus: %i", aIsInitializationActive); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETPBINITACTIVESTATUS_1, "TSY: CMmPhoneTsy::SetPBInitActiveStatus: - prev.status %u", (TUint)iIsInitializationActive); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SETPBINITACTIVESTATUS_2, "TSY: CMmPhoneTsy::SetPBInitActiveStatus: %u", (TUint)aIsInitializationActive); iIsInitializationActive = aIsInitializationActive; } @@ -7943,7 +7942,7 @@ // TBool CMmPhoneTsy::IsPBInitActive() { -TFLOGSTRING2("TSY: CMmPhoneTsy::IsPBInitActive: %i", iIsInitializationActive); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ISPBINITACTIVE_1, "TSY: CMmPhoneTsy::IsPBInitActive: %x", (TUint)iIsInitializationActive); return iIsInitializationActive; } @@ -7976,7 +7975,7 @@ // TBool CMmPhoneTsy::IsSIMReady() { - TFLOGSTRING2("TSY: CMmPhoneTsy::IsSIMReady: %i", iBootState.iSIMReady); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ISSIMREADY_1, "TSY: CMmPhoneTsy::IsSIMReady: %u", (TUint)iBootState.iSIMReady); return iBootState.iSIMReady; } @@ -7988,7 +7987,7 @@ // void CMmPhoneTsy::SaveFdnInfoDetails( TInt aResult, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmPhoneTsy::SaveFdnInfoDetails aResult: %d", aResult ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SAVEFDNINFODETAILS_1, "TSY: CMmPhoneTsy::SaveFdnInfoDetails aResult: %d", aResult ); // Store FDN info only in successfull case if ( KErrNone == aResult ) @@ -7999,9 +7998,9 @@ iPhoneBookState->iFDNNumberLengthMax = pbFdnInfo.iFDNNumberLengthMax; iPhoneBookState->iFDNTextLengthMax = pbFdnInfo.iFDNTextLengthMax; -TFLOGSTRING2("TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNNumOfEntries: %i",iPhoneBookState->iFDNNumOfEntries ); -TFLOGSTRING2("TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNNumberLengthMax: %i",iPhoneBookState->iFDNNumberLengthMax ); -TFLOGSTRING2("TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNTextLengthMax: %i",iPhoneBookState->iFDNTextLengthMax ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SAVEFDNINFODETAILS_2, "TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNNumOfEntries: %d",iPhoneBookState->iFDNNumOfEntries ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SAVEFDNINFODETAILS_3, "TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNNumberLengthMax: %d",iPhoneBookState->iFDNNumberLengthMax ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_SAVEFDNINFODETAILS_4, "TSY: CMmPhoneTsy::SaveFdnInfoDetails - iFDNTextLengthMax: %d",iPhoneBookState->iFDNTextLengthMax ); } } @@ -8013,7 +8012,7 @@ // TBool CMmPhoneTsy::IsModemStatusReady() const { -TFLOGSTRING2("TSY: CMmPhoneTsy::IsModemStatusReady: %i", iIsModemReady ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_ISMODEMSTATUSREADY_1, "TSY: CMmPhoneTsy::IsModemStatusReady: %u", (TUint)iIsModemReady ); return iIsModemReady; } @@ -8026,7 +8025,7 @@ // void CMmPhoneTsy::PhoneBookStoreInitCompleteL(TInt aError) { - TFLOGSTRING("TSY: CMmPhoneTsy::PhoneBookStoreInitCompleteL "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_PHONEBOOKSTOREINITCOMPLETEL_1, "TSY: CMmPhoneTsy::PhoneBookStoreInitCompleteL "); TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodePhoneGetMailboxNumbers ); if( EMultimodePhoneReqHandleUnknown != reqHandle ) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsywithdispatcher.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsywithdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsywithdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -15,6 +15,11 @@ #ifdef USING_CTSY_DISPATCHER +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmphonetsywithdispatcherTraces.h" +#endif + /** * This file contains additional function definitions for the CMmPhoneTsy class * in CTSY for use when the CTSY is used with the CTSY Dispatcher. @@ -52,11 +57,11 @@ iPhoneIdentity.iSerialNumber.Copy(aPhoneId.iSerialNumber); } -TFLOGSTRING("TSY: CMmPhoneTsy::CompleteGetPhoneId :"); -TFLOGSTRING2(" Manufacturer: %S,", &iPhoneIdentity.iManufacturer); -TFLOGSTRING2(" Model: %S,", &iPhoneIdentity.iModel); -TFLOGSTRING2(" Revision: %S,", &iPhoneIdentity.iRevision); -TFLOGSTRING2(" SerialNumber: %S", &iPhoneIdentity.iSerialNumber); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_1, "TSY: CMmPhoneTsy::CompleteGetPhoneId :"); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_2, "Manufacturer: %S,", iPhoneIdentity.iManufacturer); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_3, "Model: %S,", iPhoneIdentity.iModel); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_4, "Revision: %S,", iPhoneIdentity.iRevision); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONETSY_COMPLETEGETPHONEID1_5, "SerialNumber: %S", iPhoneIdentity.iSerialNumber); } //reset req handle. Returns the deleted req handle diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmsecuritytsyTraces.h" +#endif + #include "cmmsecuritytsy.h" #include "cmmphonetsy.h" #include "cmmtsyreqhandlestore.h" @@ -30,7 +36,7 @@ CMmSecurityTsy* CMmSecurityTsy::NewL( CMmPhoneTsy* aPhoneTsy ) // Ptr to PhoneTsy { -TFLOGSTRING("TSY: CMmSecurityTsy::NewL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NEWL_1, "TSY: CMmSecurityTsy::NewL"); CMmSecurityTsy* const mmSecurityTsy = new ( ELeave ) CMmSecurityTsy(); CleanupStack::PushL( mmSecurityTsy ); mmSecurityTsy->iMmPhoneTsy = aPhoneTsy; @@ -46,7 +52,7 @@ void CMmSecurityTsy::ConstructL() { -TFLOGSTRING("TSY: CMmSecurityTsy::ConstructL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_CONSTRUCTL_1, "TSY: CMmSecurityTsy::ConstructL"); // Is security codes (PIN and phone password) checked in boot iSecurityCheckedForBoot = EFalse; @@ -72,7 +78,7 @@ CMmSecurityTsy::~CMmSecurityTsy() { -TFLOGSTRING("TSY: CMmSecurityTsy::~CMmSecurityTsy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_DTOR_1, "TSY: CMmSecurityTsy::~CMmSecurityTsy"); } // --------------------------------------------------------------------------- @@ -86,7 +92,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmSecurityTsy::DoExtFuncL.\n \t\t\t IPC:%d\n \t\t\t Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_DOEXTFUNCL_1, "TSY: CMmSecurityTsy::DoExtFuncL.\n \t\t\t IPC:%d\n \t\t\t Handle:%d", aIpc, aTsyReqHandle); TInt ret ( KErrNone ); @@ -290,7 +296,7 @@ // TInt CMmSecurityTsy::GetLockInfoL( const TDataPackage& aPackage ) { -TFLOGSTRING("LTSY: CMmSecurityTsy::GetLockInfoL - Client call"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_GETLOCKINFOL_1, "LTSY: CMmSecurityTsy::GetLockInfoL - Client call"); TInt ret ( KErrArgument ); @@ -326,7 +332,7 @@ RMobilePhone::TMobilePhoneLock* aLock, TDes8* aLockInfo ) { -TFLOGSTRING2("LTSY: CMmSecurityTsy::NotifyLockInfoChange - Lock: %d", aLock); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYLOCKINFOCHANGE_1, "LTSY: CMmSecurityTsy::NotifyLockInfoChange - Lock: %d", aLock); TInt ret( KErrNone ); @@ -357,7 +363,7 @@ TInt CMmSecurityTsy::NotifyLockInfoChangeCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("LTSY: CMmSecurityTsy::NotifyLockInfoChangeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYLOCKINFOCHANGECANCEL_1, "LTSY: CMmSecurityTsy::NotifyLockInfoChangeCancel"); iRetNotifyLockInfoChange = NULL; iRetNotifyPhoneLockChange = NULL; @@ -424,7 +430,7 @@ const TTsyReqHandle aTsyReqHandle, const TDataPackage& aPackage ) { -TFLOGSTRING("LTSY: CMmSecurityTsy::SetLockSettingL - Client call" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_SETLOCKSETTINGL_1, "LTSY: CMmSecurityTsy::SetLockSettingL - Client call" ); TInt ret( KErrNone ); @@ -496,8 +502,7 @@ reinterpret_cast ( aPackage.Ptr2() ); -TFLOGSTRING3("LTSY: CMmSecurityTsy::LockSetting - Lock:%d, Setting:%d", - *lock, *setting ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_LOCKSETTINGL_1, "LTSY: CMmSecurityTsy::LockSetting - Lock:%d, Setting:%d",*lock, *setting ); // Some SIM cards might not support PIN1 disable. Thus // return error if client tries to disable it. @@ -542,7 +547,7 @@ event = RMobilePhone::EUniversalPinRequired; if ( RMobilePhone::ELockReplaced == *setting ) { -TFLOGSTRING("TSY: CMmSecurityTsy::LockSetting RMobilePhone::ELockReplaced"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_LOCKSETTINGL_2, "TSY: CMmSecurityTsy::LockSetting RMobilePhone::ELockReplaced"); iActiveCodeToUpinState = EActiveCodeToUpinAskUpin; } break; @@ -603,7 +608,7 @@ RMobilePhone::TMobilePhoneLockStatus, RMobilePhone::TMobilePhoneLockSetting ) { -TFLOGSTRING2("LTSY: CMmSecurityTsy::CompleteSetLockSetting - Error:%d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETESETLOCKSETTING_1, "LTSY: CMmSecurityTsy::CompleteSetLockSetting - Error:%d", aErrorCode); TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneSetLockSetting ); @@ -666,7 +671,7 @@ TInt CMmSecurityTsy::CompleteChangeSecurityCode( TInt aErrorCode ) // Error code { - TFLOGSTRING2("TSY: CMmSecurityTsy::CompleteChangeSecurityCode - Error:%d", aErrorCode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETECHANGESECURITYCODE_1, "TSY: CMmSecurityTsy::CompleteChangeSecurityCode - Error:%d", aErrorCode); TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> @@ -703,7 +708,7 @@ // Thus this is the only way to get the information in boot. if ( iSecurityCheckedForBoot == EFalse ) { -TFLOGSTRING( "TSY: CMmSecurityTsy::NotifySecurityEvent - Checking PIN state"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYSECURITYEVENTL_1, "TSY: CMmSecurityTsy::NotifySecurityEvent - Checking PIN state"); // We can't do anything if sending fails. If this happens, // then every send to IsaApi should fail. (void)iMmPhoneTsy->iMmPhoneExtInterface->GetICCTypeL(); @@ -714,7 +719,7 @@ if ( iIsSecurityCodeRequestCachedInBoot && !iMmPhoneTsy->iBootState.iSecReady ) { -TFLOGSTRING( "TSY: CMmSecurityTsy::NotifySecurityEventL - Completing security code event"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYSECURITYEVENTL_2, "TSY: CMmSecurityTsy::NotifySecurityEventL - Completing security code event"); CompleteNotifySecurityEventL( RMobilePhone::EPhonePasswordRequired, KErrNone ); @@ -757,14 +762,13 @@ RMobilePhone::TMobilePhoneSecurityEvent aEvent, TInt aErrorCode ) { -TFLOGSTRING3("TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - Event: %d, Error: %d", - aEvent, aErrorCode ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_1, "TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - Event: %d, Error: %d",aEvent, aErrorCode ); if ( iLastPinRequested != EPinUnknown && ( RMobilePhone::EPin1Verified == aEvent ) || ( RMobilePhone::EPin2Verified == aEvent ) ) { -TFLOGSTRING( "TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - iLastPinRequested != EPinUnknown"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_2, "TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - iLastPinRequested != EPinUnknown"); iLastPinRequested = EPinUnknown; } @@ -800,7 +804,7 @@ !iIsSecurityCodeRequestCachedInBoot ) { -TFLOGSTRING("TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - Caching event"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_3, "TSY: CMmSecurityTsy::CompleteNotifySecurityEvent - Caching event"); iIsSecurityCodeRequestCachedInBoot = ETrue; } @@ -957,12 +961,12 @@ if ( RMobilePhone::ESecurityCodePin1 == *type ) { -TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN VERIFY REQUESTED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL_1, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN VERIFY REQUESTED"); iLastPinRequested = EPin1Requested; } if ( RMobilePhone::ESecurityCodePin2 == *type ) { -TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN2 VERIFY REQUESTED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL_2, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN2 VERIFY REQUESTED"); iLastPinRequested = EPin2Requested; } //This is to prevent unnecessary PIN1 request after PUK code @@ -971,14 +975,14 @@ ( RMobilePhone::ESecurityCodePuk2 == *type ) ) && ( 0 < codes->iUnblockCode.Length() ) ) { -TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PUK VERIFY REQUESTED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL_3, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PUK VERIFY REQUESTED"); iPukCodeVerify = ETrue; } //This is to prevent unnecessary PIN1 request after phone password //request (PYRA-5UBCLC) if ( RMobilePhone::ESecurityCodePhonePassword == *type ) { -TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PHONE PASSWORD VERIFY REQUESTED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL_4, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PHONE PASSWORD VERIFY REQUESTED"); iPhonePasswordVerify = ETrue; } iMmPhoneTsy->iMmPhoneExtInterface->DeliverCode( *codes ); @@ -1071,7 +1075,7 @@ void CMmSecurityTsy::CompleteVerifySecurityCodeL( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmSecurityTsy::CompleteVerifySecurityCode - Error:%d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_1, "TSY: CMmSecurityTsy::CompleteVerifySecurityCode - Error:%d", aErrorCode); TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneVerifySecurityCode ); @@ -1108,7 +1112,7 @@ // IF PIN1 REQUESTED LAST if ( iLastPinRequested == EPin1Requested ) { -TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN VERIFICATION NEEDED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_2, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN VERIFICATION NEEDED"); CompleteNotifySecurityEventL( RMobilePhone::EPin1Required, KErrNone ); iLastPinRequested = EPinUnknown; @@ -1116,7 +1120,7 @@ // IF PIN2 REQUESTED LAST if (iLastPinRequested == EPin2Requested) { -TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN2"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_3, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN2"); iLastPinRequested = EPinUnknown; } } @@ -1124,7 +1128,7 @@ phoneSetLockSettingHandle && EActiveCodeToUpinAskUpin == iActiveCodeToUpinState ) { -TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - iActiveCodeToUpinState = EActiveCodeToUpinAskPin"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_4, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - iActiveCodeToUpinState = EActiveCodeToUpinAskPin"); if ( KErrNone == aErrorCode ) { iActiveCodeToUpinState = EActiveCodeToUpinAskPin; @@ -1257,7 +1261,7 @@ void CMmSecurityTsy::CompleteAbortSecurityCode( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmSecurityTsy::CompleteAbortSecurityCode - Error:%d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEABORTSECURITYCODE_1, "TSY: CMmSecurityTsy::CompleteAbortSecurityCode - Error:%d", aErrorCode); TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneAbortSecurityCode ); @@ -1290,7 +1294,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING2("LTSY: CMmSecurityTsy::CompleteGetLockInfo - Error:%d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEGETLOCKINFO_1, "LTSY: CMmSecurityTsy::CompleteGetLockInfo - Error:%d", aErrorCode); TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetLockInfo ); @@ -1356,7 +1360,7 @@ RMobilePhone::TMobilePhoneSecurityCode* aSecurityCode, TDes8* aSecurityCodeInfo ) { -TFLOGSTRING("TSY: CMmSecurityTsy::GetSecurityCodeInfoL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_GETSECURITYCODEINFOL_1, "TSY: CMmSecurityTsy::GetSecurityCodeInfoL"); TInt ret( KErrNone ); @@ -1473,7 +1477,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmSecurityTsy::CompleteGetSecurityCodeInfo"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEGETSECURITYCODEINFO_1, "TSY: CMmSecurityTsy::CompleteGetSecurityCodeInfo"); RMobilePhone::TMobilePhoneSecurityCode* securityCode; RMobilePhone::TMobilePhoneSecurityCodeInfoV5* securityCodeInfoV5; @@ -1519,7 +1523,7 @@ TInt CMmSecurityTsy::GetSecurityCodeInfoCancel( TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSecurityTsy::GetSecurityCodeInfoCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_GETSECURITYCODEINFOCANCEL_1, "TSY: CMmSecurityTsy::GetSecurityCodeInfoCancel"); RMobilePhone::TMobilePhoneSecurityCode secCode = RMobilePhone::ESecurityCodePin1; TBool reqHandleExist = EFalse; @@ -1644,7 +1648,7 @@ RMobilePhone::TMobilePhoneSecurityCode* aSecurityCode, TDes8* aSecurityCodeInfo ) { -TFLOGSTRING("TSY: CMmSecurityTsy::NotifySecurityCodeInfoChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYSECURITYCODEINFOCHANGE_1, "TSY: CMmSecurityTsy::NotifySecurityCodeInfoChange"); TInt ret( KErrNone ); @@ -1674,7 +1678,7 @@ CMmDataPackage* aDataPackage, TInt aErrorCode ) { -TFLOGSTRING("TSY: CMmSecurityTsy::CompleteNotifySecurityCodeInfoChange"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETENOTIFYSECURITYCODEINFOCHANGE_1, "TSY: CMmSecurityTsy::CompleteNotifySecurityCodeInfoChange"); TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> ResetTsyReqHandle( @@ -1718,7 +1722,7 @@ TInt CMmSecurityTsy::NotifySecurityCodeInfoChangeCancel( TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSecurityTsy::NotifySecurityCodeInfoChangeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_NOTIFYSECURITYCODEINFOCHANGECANCEL_1, "TSY: CMmSecurityTsy::NotifySecurityCodeInfoChangeCancel"); iRetNotifySecurityCodeInfo = NULL; iRetNotifySecurityCode = NULL; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsywithdispatcher.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsywithdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsywithdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -21,6 +21,12 @@ */ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmsecuritytsywithdispatcherTraces.h" +#endif + #include "cmmsecuritytsy.h" #include "cmmphonetsy.h" #include "cmmtsyreqhandlestore.h" @@ -69,12 +75,12 @@ { if ( RMobilePhone::ESecurityCodePin1 == *type ) { -TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN VERIFY REQUESTED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL1_1, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN VERIFY REQUESTED"); iLastPinRequested = EPin1Requested; } if ( RMobilePhone::ESecurityCodePin2 == *type ) { -TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN2 VERIFY REQUESTED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL1_2, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PIN2 VERIFY REQUESTED"); iLastPinRequested = EPin2Requested; } //This is to prevent unnecessary PIN1 request after PUK code @@ -83,14 +89,14 @@ ( RMobilePhone::ESecurityCodePuk2 == *type ) ) && ( 0 < codes->iUnblockCode.Length() ) ) { -TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PUK VERIFY REQUESTED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL1_3, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PUK VERIFY REQUESTED"); iPukCodeVerify = ETrue; } //This is to prevent unnecessary PIN1 request after phone password //request (PYRA-5UBCLC) if ( RMobilePhone::ESecurityCodePhonePassword == *type ) { -TFLOGSTRING("TSY: CMmSecurityTsy::VerifySecurityCodeL - PHONE PASSWORD VERIFY REQUESTED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_VERIFYSECURITYCODEL1_4, "TSY: CMmSecurityTsy::VerifySecurityCodeL - PHONE PASSWORD VERIFY REQUESTED"); iPhonePasswordVerify = ETrue; } iMmPhoneTsy->iMmPhoneExtInterface->DeliverCode( *codes ); @@ -159,7 +165,7 @@ void CMmSecurityTsy::CompleteVerifySecurityCodeL( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmSecurityTsy::CompleteVerifySecurityCode - Error:%d", aErrorCode); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_1, "TSY: CMmSecurityTsy::CompleteVerifySecurityCode - Error:%d", aErrorCode); TTsyReqHandle reqHandle = iMmPhoneTsy->iTsyReqHandleStore-> ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneVerifySecurityCode ); @@ -196,7 +202,7 @@ // IF PIN1 REQUESTED LAST if ( iLastPinRequested == EPin1Requested ) { -TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN VERIFICATION NEEDED"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_2, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN VERIFICATION NEEDED"); CompleteNotifySecurityEventL( RMobilePhone::EPin1Required, KErrNone ); iLastPinRequested = EPinUnknown; @@ -204,7 +210,7 @@ // IF PIN2 REQUESTED LAST if (iLastPinRequested == EPin2Requested) { -TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN2"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_3, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - PIN2"); iLastPinRequested = EPinUnknown; } } @@ -212,7 +218,7 @@ phoneSetLockSettingHandle && EActiveCodeToUpinAskUpin == iActiveCodeToUpinState ) { -TFLOGSTRING("TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - iActiveCodeToUpinState = EActiveCodeToUpinAskPin"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_4, "TSY: CMmSecurityTsy::CompleteVerifySecurityCodeL - iActiveCodeToUpinState = EActiveCodeToUpinAskPin"); if ( KErrNone == aErrorCode ) { iActiveCodeToUpinState = EActiveCodeToUpinAskPin; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsupplservtsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsupplservtsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsupplservtsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,8 +16,13 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmsupplservtsyTraces.h" +#endif + #include "cmmsupplservtsy.h" -#include // include internal Tsy classes #include "cmmphonetsy.h" @@ -707,7 +712,7 @@ } else { -TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetCallForwardingStatusPhase1L: No response received."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETCALLFORWARDINGSTATUSPHASE1L_1, "TSY: CMmSupplServTsy::CompleteGetCallForwardingStatusPhase1L: No response received."); aErrorCode = KErrNotFound; } } @@ -887,7 +892,7 @@ if ( !cancelSetCallForwardingStatus ) { // Cancellation called although request is not going on - TFLOGSTRING("TSY: CMmSupplServTsy::SetCallForwardingStatusCancel - KErrServerBusy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETCALLFORWARDINGSTATUSCANCEL_1, "TSY: CMmSupplServTsy::SetCallForwardingStatusCancel - KErrServerBusy"); iMmPhone->ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -1122,7 +1127,7 @@ } else { -TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetCallBarringStatusPhase1L: No response received."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETCALLBARRINGSTATUSPHASE1L_1, "TSY: CMmSupplServTsy::CompleteGetCallBarringStatusPhase1L: No response received."); aErrorCode = KErrNotFound; } } @@ -1242,7 +1247,7 @@ //The request is already in processing because of previous request //Complete request with status value informing the client about //the situation. - TFLOGSTRING("TSY: CMmPhoneTsy::SetCallBarringStatusCancel - KErrServerBusy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETCALLBARRINGSTATUSCANCEL_1, "TSY: CMmPhoneTsy::SetCallBarringStatusCancel - KErrServerBusy"); iMmPhone->ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -1343,14 +1348,11 @@ RMobilePhone::TMobilePhonePasswordChangeV2& ssPassword = ( *ssPasswordPckg )(); - TFLOGSTRING2("TSY: CMmSupplServTsy::SetSSPassword - SS service: %d", - *aSsService ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETSSPASSWORDL_1, "TSY: CMmSupplServTsy::SetSSPassword - SS service: %d", *aSsService ); - TFLOGSTRING2("TSY: CMmSupplServTsy::SetSSPassword - Old PW: %S", - &ssPassword.iOldPassword ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETSSPASSWORDL_2, "TSY: CMmSupplServTsy::SetSSPassword - Old PW: %S", ssPassword.iOldPassword ); - TFLOGSTRING3("TSY: CMmSupplServTsy::SetSSPassword - New PW: %S, Verify PW: %S", - &ssPassword.iNewPassword, &ssPassword.iVerifiedPassword ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETSSPASSWORDL_3, "TSY: CMmSupplServTsy::SetSSPassword - New PW: %S, Verify PW: %S", ssPassword.iNewPassword, ssPassword.iVerifiedPassword ); // Packed parameters: TMobilePhonePasswordChangeV2 and TUint16 TUint16 ssServiceUnsigned = static_cast( *aSsService ); @@ -1413,7 +1415,7 @@ //The request is already in processing because of previous request //Complete request with status value informing the client about //the situation. - TFLOGSTRING("TSY: CMmSupplServTsy::SetSSPasswordCancel - KErrServerBusy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETSSPASSWORDCANCEL_1, "TSY: CMmSupplServTsy::SetSSPasswordCancel - KErrServerBusy"); iMmPhone->ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -1575,7 +1577,7 @@ } else { -TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetCallWaitingStatusPhase1L: No response received."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETCALLWAITINGSTATUSPHASE1L_1, "TSY: CMmSupplServTsy::CompleteGetCallWaitingStatusPhase1L: No response received."); aErrorCode = KErrNotFound; } } @@ -1674,7 +1676,7 @@ //The request is already in processing because of previous request //Complete request with status value informing the client about //the situation. - TFLOGSTRING("TSY: CMmSupplServTsy::SetCallWaitingStatusCancel - KErrServerBusy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETCALLWAITINGSTATUSCANCEL_1, "TSY: CMmSupplServTsy::SetCallWaitingStatusCancel - KErrServerBusy"); iMmPhone->ReqCompleted( aTsyReqHandle, KErrServerBusy ); } else @@ -1871,7 +1873,7 @@ const TDesC* aServiceString ) { TInt ret = KErrNone; -TFLOGSTRING2("TSY: CMmSupplServTsy::SendNetworkServiceRequestL: iSsNoFdnCheckFlag: %d", iSsNoFdnCheckFlag); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SENDNETWORKSERVICEREQUESTL_1, "TSY: CMmSupplServTsy::SendNetworkServiceRequestL: iSsNoFdnCheckFlag: %d", iSsNoFdnCheckFlag); if ( iSsTransactionOngoing ) { ret = KErrServerBusy; @@ -1955,7 +1957,7 @@ const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneMessageWaitingV1* aMessageWaiting ) { -TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_1, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL"); // check if parameter is correct type of class if ( KETelExtMultimodeV1 != aMessageWaiting->ExtensionId() ) @@ -1976,7 +1978,7 @@ { TInt ret( KErrNone ); -TFLOGSTRING2("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL, MWIS supported:%d", iMessageWaitingSupportedByIcc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_2, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL, MWIS supported:%d", iMessageWaitingSupportedByIcc ); if (iMmPhone->IsSIMReady()) { @@ -2010,7 +2012,7 @@ ret = ReadIccMessageWaitingIndicatorsFromCentRep( iMessageWaiting ); - TFLOGSTRING2("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL, Error during the reading from CentRep:%d", ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_3, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL, Error during the reading from CentRep:%d", ret); if ( KErrNone == ret ) { @@ -2032,7 +2034,7 @@ } else { - TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL - save reqHandle to queue"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_4, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsL - save reqHandle to queue"); // Save reqHandle to queue for completion TMwisInfoRequest* req = new (ELeave) TMwisInfoRequest(); req->iReqHandle = aTsyReqHandle; @@ -2055,7 +2057,7 @@ RMobilePhone::TMobilePhoneMessageWaitingV1* aMessageWaiting, TInt aErrorCode ) { -TFLOGSTRING3("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, bootup=%d, Error: %d", iGetIccSupportAtBoot, aErrorCode ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_1, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, bootup=%d, Error: %d", iGetIccSupportAtBoot, aErrorCode ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( @@ -2083,7 +2085,7 @@ } else { -TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, NOT supported by SIM" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_2, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, NOT supported by SIM" ); SetIccSupportForMWIS( EFalse ); // read the data from the Central Repository @@ -2094,7 +2096,7 @@ // Go through the request queue and complete same information to all reguests for ( TInt i = 0; i < iMwisInfoRequests.Count(); i++ ) { - TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, Going throw request queue" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_3, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, Going throw request queue" ); TMwisInfoRequest* req = iMwisInfoRequests[ i ]; //set value in client side *(req->iMwisInfo) = iMessageWaiting; @@ -2124,7 +2126,7 @@ iMessageWaiting.iDisplayStatus = aMessageWaiting->iDisplayStatus; aErrorCode = iMwisCentRep->Set( KCtsyMessageWaitingDisplayStatus, aMessageWaiting->iDisplayStatus ); -TFLOGSTRING3("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, CPHS bootup, status=%d, error=%d ", aMessageWaiting->iDisplayStatus, aErrorCode ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_4, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, CPHS bootup, status=%d, error=%d ", aMessageWaiting->iDisplayStatus, aErrorCode ); } else { @@ -2143,12 +2145,12 @@ TInt CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_1, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel"); //reset the req handle if only one req remains if( 1 == iMwisInfoRequests.Count() ) { - TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel - one req"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_2, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel - one req"); TTsyReqHandle reqHandle = iMmPhone-> iTsyReqHandleStore->ResetTsyReqHandle( CMmPhoneTsy::EMultimodePhoneGetIccMessageWaitingIndicators); @@ -2156,7 +2158,7 @@ // qo through array if several requests and find correct reqhandle to cancel for ( TInt i = 0; i < iMwisInfoRequests.Count(); i++ ) { - TFLOGSTRING("TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel - queued requests"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_3, "TSY: CMmSupplServTsy::GetIccMessageWaitingIndicatorsCancel - queued requests"); TMwisInfoRequest* req = iMwisInfoRequests[ i ]; if( aTsyReqHandle == req->iReqHandle ) { @@ -2180,13 +2182,13 @@ const TTsyReqHandle aTsyReqHandle, TDes8* aParams ) { -TFLOGSTRING("TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_1, "TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL"); TInt ret( KErrNone ); if ( sizeof( RMobilePhone::TMobilePhoneMessageWaitingV1 ) > aParams->MaxLength() ) { - TFLOGSTRING ("TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_2, "TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL bad size argument"); // Complete the request with appropiate error ret = KErrArgument; } @@ -2200,7 +2202,7 @@ CMmPhoneTsy::EMultimodePhoneGetIccMessageWaitingIndicators ) ) ) { -TFLOGSTRING2("TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL, MWIS supported:%d",iMessageWaitingSupportedByIcc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_3, "TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsL, MWIS supported:%d",iMessageWaitingSupportedByIcc ); RMobilePhone::TMobilePhoneMessageWaitingV1Pckg* paramsPckgV1 = reinterpret_cast( aParams ); @@ -2258,7 +2260,7 @@ void CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators( TInt aErrorCode ) { -TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators, Error: %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_1, "TSY: CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators, Error: %d", aErrorCode ); // reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( @@ -2282,7 +2284,7 @@ } else { -TFLOGSTRING("TSY: CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators, not supported by SIM" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_2, "TSY: CMmSupplServTsy::CompleteSetIccMessageWaitingIndicators, not supported by SIM" ); SetIccSupportForMWIS( EFalse ); // reset error value, return possible cenrep error value @@ -2304,7 +2306,7 @@ // So go through the request queue and complete all the request. for ( TInt i = 0; i < iMwisInfoRequests.Count(); i++ ) { - TFLOGSTRING("TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, Going throw request queue" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_3, "TSY: CMmSupplServTsy::CompleteGetIccMessageWaitingIndicators, Going throw request queue" ); TMwisInfoRequest* req = iMwisInfoRequests[ i ]; //set value in client side *(req->iMwisInfo) = iMessageWaiting; @@ -2325,7 +2327,7 @@ TInt CMmSupplServTsy::SetIccMessageWaitingIndicatorsCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSCANCEL_1, "TSY: CMmSupplServTsy::SetIccMessageWaitingIndicatorsCancel"); // As cancel is called, the client memory address pointed to is no longer // valid -> NULL it @@ -2346,7 +2348,7 @@ TInt CMmSupplServTsy::NotifyIccMessageWaitingIndicatorsChange( RMobilePhone::TMobilePhoneMessageWaitingV1* aMessageWaiting ) { -TFLOGSTRING("TSY: CMmSupplServTsy::NotifyIccMessageWaitingIndicatorsChangeL"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYICCMESSAGEWAITINGINDICATORSCHANGE_1, "TSY: CMmSupplServTsy::NotifyIccMessageWaitingIndicatorsChangeL"); TInt ret( KErrNone ); @@ -2377,7 +2379,7 @@ RMobilePhone::TMobilePhoneMessageWaitingV1* aMessageWaiting, TInt& aErrorCode ) { -TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteNotifyIccMessageWaitingIndicatorChange, error:%d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETENOTIFYICCMESSAGEWAITINGINDICATORCHANGE_1, "TSY: CMmSupplServTsy::CompleteNotifyIccMessageWaitingIndicatorChange, error:%d", aErrorCode ); if ( IsMwisInfoChanged( *aMessageWaiting ) ) { @@ -2399,7 +2401,7 @@ if ( aMessageWaiting->iDisplayStatus != iMessageWaiting.iDisplayStatus ) { -TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteNotifyIccMessageWaitingIndicatorChange, CPHS information changed status=%d ", aMessageWaiting->iDisplayStatus); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETENOTIFYICCMESSAGEWAITINGINDICATORCHANGE_2, "TSY: CMmSupplServTsy::CompleteNotifyIccMessageWaitingIndicatorChange, CPHS information changed status=%d ", aMessageWaiting->iDisplayStatus); // update only CPHS supported information iMessageWaiting.iDisplayStatus = aMessageWaiting->iDisplayStatus; @@ -2438,7 +2440,7 @@ TInt CMmSupplServTsy::NotifyIccMessageWaitingIndicatorChangeCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSupplServTsy::NotifyIccMessageWaitingIndicatorChangeCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYICCMESSAGEWAITINGINDICATORCHANGECANCEL_1, "TSY: CMmSupplServTsy::NotifyIccMessageWaitingIndicatorChangeCancel"); // Null the pointer to client-side data iRetNotifyMessageWaiting = NULL; @@ -2457,7 +2459,7 @@ // void CMmSupplServTsy::SetIccSupportForMWIS( TBool aSupport ) { -TFLOGSTRING2("TSY: CMmSupplServTsy::SetIccSupportForMWIS, support%d ", aSupport ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCSUPPORTFORMWIS_1, "TSY: CMmSupplServTsy::SetIccSupportForMWIS, support%d ", aSupport ); iMessageWaitingSupportedByIcc = aSupport; } @@ -2471,7 +2473,7 @@ TInt CMmSupplServTsy::ReadIccMessageWaitingIndicatorsFromCentRep( RMobilePhone::TMobilePhoneMessageWaitingV1& aMessageWaiting ) { -TFLOGSTRING("TSY: CMmSupplServTsy::ReadIccMessageWaitingIndicatorsFromCentRep"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_READICCMESSAGEWAITINGINDICATORSFROMCENTREP_1, "TSY: CMmSupplServTsy::ReadIccMessageWaitingIndicatorsFromCentRep"); TInt retval( KErrNone ); TInt tempVal( 0 ); @@ -2526,32 +2528,32 @@ TInt CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep( const RMobilePhone::TMobilePhoneMessageWaitingV1& aMessageWaiting ) { -TFLOGSTRING("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_1, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep"); TInt retval( KErrNone ); // Write new values to the central repository retval = iMwisCentRep->Set( KCtsyMessageWaitingDisplayStatus, aMessageWaiting.iDisplayStatus ); -TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iDisplayStatus:%u", aMessageWaiting.iDisplayStatus ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_2, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iDisplayStatus:%u", aMessageWaiting.iDisplayStatus ); retval = iMwisCentRep->Set( KCtsyMessageWaitingVoiceMailCount, aMessageWaiting.iVoiceMsgs ); -TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iVoiceMsgs:%u", aMessageWaiting.iVoiceMsgs ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_3, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iVoiceMsgs:%u", aMessageWaiting.iVoiceMsgs ); retval = iMwisCentRep->Set( KCtsyMessageWaitingAuxLineCount, aMessageWaiting.iAuxVoiceMsgs ); -TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iAuxVoiceMsgs:%u", aMessageWaiting.iAuxVoiceMsgs ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_4, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iAuxVoiceMsgs:%u", aMessageWaiting.iAuxVoiceMsgs ); retval = iMwisCentRep->Set( KCtsyMessageWaitingDataCount, aMessageWaiting.iDataMsgs ); -TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iDataMsgs:%u", aMessageWaiting.iDataMsgs ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_5, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iDataMsgs:%u", aMessageWaiting.iDataMsgs ); retval = iMwisCentRep->Set( KCtsyMessageWaitingFaxCount, aMessageWaiting.iFaxMsgs ); -TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iFaxMsgs:%u", aMessageWaiting.iFaxMsgs ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_6, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iFaxMsgs:%u", aMessageWaiting.iFaxMsgs ); retval = iMwisCentRep->Set( KCtsyMessageWaitingEmailCount, aMessageWaiting.iEmailMsgs ); -TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iEmailMsgs:%u", aMessageWaiting.iEmailMsgs ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_7, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iEmailMsgs:%u", aMessageWaiting.iEmailMsgs ); retval = iMwisCentRep->Set( KCtsyMessageWaitingOtherMessageCount, aMessageWaiting.iOtherMsgs ); -TFLOGSTRING2("TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iOtherMsgs:%u", aMessageWaiting.iOtherMsgs ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_8, "TSY: CMmSupplServTsy::WriteIccMessageWaitingIndicatorsToCentRep : iOtherMsgs:%u", aMessageWaiting.iOtherMsgs ); return retval; } @@ -2565,7 +2567,7 @@ TBool CMmSupplServTsy::IsMwisInfoChanged( const RMobilePhone::TMobilePhoneMessageWaitingV1& aNewMessageWaiting ) { -TFLOGSTRING("TSY: CMmSupplServTsy::IsMwisInfoChanged"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_ISMWISINFOCHANGED_1, "TSY: CMmSupplServTsy::IsMwisInfoChanged"); TBool retval( ETrue ); @@ -2615,11 +2617,11 @@ const RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation, TDes8* aSendSSRequestPckg ) { -TFLOGSTRING("TSY: CMmSupplServTsy::NotifySendNetworkServiceRequest" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUEST_1, "TSY: CMmSupplServTsy::NotifySendNetworkServiceRequest" ); if(sizeof(RMobilePhone::TMobilePhoneSendSSRequestV3) > aSendSSRequestPckg->MaxLength()) { - TFLOGSTRING ("TSY: CMmNetTsy::NotifySendNetworkServiceRequest Bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUEST_2, "TSY: CMmNetTsy::NotifySendNetworkServiceRequest Bad size argument"); // Complete the request with appropiate error return KErrArgument; } @@ -2648,7 +2650,7 @@ void CMmSupplServTsy::CompleteSendNetworkServiceRequestInd( TInt aErrorCode, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteSendNetworkServiceRequestInd. Error: %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETESENDNETWORKSERVICEREQUESTIND_1, "TSY: CMmSupplServTsy::CompleteSendNetworkServiceRequestInd. Error: %d", aErrorCode ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( @@ -2695,7 +2697,7 @@ TInt CMmSupplServTsy::NotifySendNetworkServiceRequestCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSupplServTsy::NotifySendNetworkServiceRequestCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUESTCANCEL_1, "TSY: CMmSupplServTsy::NotifySendNetworkServiceRequestCancel"); // Clear data pointers iRetSSDataPtrIndRequest = NULL; @@ -2720,7 +2722,7 @@ RMobilePhone::TMobilePhoneNotifySendSSOperation* aOperation, TDes8* aRequestComplete ) { -TFLOGSTRING("TSY: CMmSupplServTsy::NotifyAllSendNetworkRequest" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYALLSENDNETWORKSERVICEREQUEST_1, "TSY: CMmSupplServTsy::NotifyAllSendNetworkRequest" ); TPckg* ssDataPckg = reinterpret_cast*> @@ -2753,7 +2755,7 @@ void CMmSupplServTsy::CompleteNotifyAllSendNetworkServiceRequest( TInt aErrorCode, CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmSupplServTsy::CompleteNotifyAllSendNetworkRequest. Error: %d", aErrorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_COMPLETENOTIFYALLSENDNETWORKSERVICEREQUEST_1, "TSY: CMmSupplServTsy::CompleteNotifyAllSendNetworkRequest. Error: %d", aErrorCode ); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iMmPhone->iTsyReqHandleStore->ResetTsyReqHandle( @@ -2787,7 +2789,7 @@ TInt CMmSupplServTsy::NotifyAllSendNetworkServiceRequestCancel( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING("TSY: CMmSupplServTsy::NotifyAllSendNetworkServiceRequestCancel"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_NOTIFYALLSENDNETWORKSERVICEREQUESTCANCEL_1, "TSY: CMmSupplServTsy::NotifyAllSendNetworkServiceRequestCancel"); // Clear data pointers iRetSSOperationPtr = NULL; @@ -2811,7 +2813,7 @@ // void CMmSupplServTsy::SetIccMwisBootUpFlag( TBool aBootUp ) { -TFLOGSTRING2("TSY: CMmSupplServTsy::SetIccMwisBootUpFlag, aBootUp=%d", aBootUp ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSUPPLSERVTSY_SETICCMWISBOOTUPFLAG_1, "TSY: CMmSupplServTsy::SetIccMwisBootUpFlag, aBootUp=%d", aBootUp ); iGetIccSupportAtBoot = aBootUp; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicecalltsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicecalltsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicecalltsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmvoicecalltsyTraces.h" +#endif + #include "cmmvoicecalltsy.h" #include @@ -51,7 +57,7 @@ CMmMessageManagerBase* aMessageManager, MTelephonyAudioControl* aTelephonyAudioControl ) { -TFLOGSTRING2("TSY: CMmVoiceCallTsy::NewL. Call name: %S", &aName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_NEWL_1, "TSY: CMmVoiceCallTsy::NewL. Call name: %S", aName); CMmVoiceCallTsy* mmCall = NULL; @@ -78,7 +84,7 @@ CMmVoiceCallTsy::~CMmVoiceCallTsy() { -TFLOGSTRING3("TSY: CMmVoiceCallTsy::~CMmVoiceCallTsy. Call deleted iCallId:%d iCallName:%S", iCallId, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DTOR_1, "TSY: CMmVoiceCallTsy::~CMmVoiceCallTsy. Call deleted iCallId:%d iCallName:%S", iCallId, iCallName); } @@ -118,7 +124,7 @@ const TInt aIpc, const TDataPackage& aPackage ) { -TFLOGSTRING3("TSY: CMmVoiceCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DOEXTFUNCL_1, "TSY: CMmVoiceCallTsy::DoExtFuncL. IPC:%d Handle:%d", aIpc, aTsyReqHandle); TInt ret( KErrNone ); @@ -266,7 +272,7 @@ CTelObject::TReqMode CMmVoiceCallTsy::ReqModeL( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmVoiceCallTsy::ReqModeL. IPC:%d",aIpc); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_REQMODEL_1, "TSY: CMmVoiceCallTsy::ReqModeL. IPC:%d",aIpc); CTelObject::TReqMode ret( 0 ); // default return value @@ -510,7 +516,7 @@ const TInt aIpc, const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmVoiceCallTsy::CancelService. IPC: %d, Req handle: %d", aIpc, aTsyReqHandle); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_CANCELSERVICE_1, "TSY: CMmVoiceCallTsy::CancelService. IPC: %d, Req handle: %d", aIpc, aTsyReqHandle); TInt ret( KErrNone ); @@ -631,8 +637,8 @@ callDataPackage->GetCallIdAndMode( callId, callMode ); callDataPackage->UnPackData( callStatus ); -TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. aResult:%d", aResult ); -TFLOGSTRING3("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call status:%d Call name:%S", callStatus, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. aResult:%d", aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_2, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call status:%d Call name:%S", callStatus, iCallName); TTsyReqHandle holdHandle = iTsyReqHandleStore->GetTsyReqHandle( EMultimodeMobileCallHold ); @@ -664,7 +670,7 @@ if( call->IsEmergencyCall() ) { numberOfEmergencyCalls++; -TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. numberOfEmergencyCalls:%d", numberOfEmergencyCalls ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_3, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. numberOfEmergencyCalls:%d", numberOfEmergencyCalls ); } } @@ -706,11 +712,11 @@ { iTelephonyAudioControl->CallStateChange( iCallName, RMobileCall::EStatusDisconnecting ); -TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call routing state changed to EStatusDisconnecting: Call name:%S", &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_4, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call routing state changed to EStatusDisconnecting: Call name:%S", iCallName ); } iTelephonyAudioControl->TeardownTelephonyAudio( iCallName, aResult ); -TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call routing teared down: Call name:%S", &iCallName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_5, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. Call routing teared down: Call name:%S", iCallName); iTelephonyAudioControlSetup = EFalse; } @@ -737,7 +743,7 @@ CompleteHangUp( aResult ); CompleteAnswerIncomingCall( aResult ); } -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - CompleteDial's called"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_6, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - CompleteDial's called"); CompleteDial( aResult ); CompleteDialNoFdn( aResult ); CompleteDialEmergencyCall( aResult ); @@ -747,7 +753,7 @@ // hanging. else { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - Try to complete Dial and HangUp"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_7, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - Try to complete Dial and HangUp"); iLastExitCode = KErrGeneral; TInt errorValue = CMmCommonStaticUtility::EpocErrorCode( KErrNotReady, KErrNotFound ); @@ -793,7 +799,7 @@ if ( KETelExt3rdPartyV1 != GetExtensionId() ) { //non 3rd party client -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - StopTimeOuts"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_8, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - StopTimeOuts"); iTsyReqHandleStore->StopTimeout( EMultimodeCallDial ); iTsyReqHandleStore->StopTimeout( EMultimodeMobileCallDialEmergencyCall ); @@ -803,7 +809,7 @@ else { //3rd party client -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - StopTimeOut EMultimodeCallDialISV"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_9, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - StopTimeOut EMultimodeCallDialISV"); iTsyReqHandleStore->StopTimeout( EMultimodeCallDialISV ); } #endif // REQHANDLE_TIMER @@ -834,28 +840,28 @@ if ( 0 < dialCancelHandle ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_10, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDial"); HangUp( dialCancelHandle ); } else if ( 0 < dialCancelHandleISV ) { //3rd party client -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialISV"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_11, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialISV"); HangUp( dialCancelHandleISV ); } else if ( 0 < dialEmergCancelHandle ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeMobileCallDialEmergencyCall"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_12, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeMobileCallDialEmergencyCall"); HangUp( dialEmergCancelHandle ); } else if ( 0 < dialCancelHandleNoFdn ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialNoFdn"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_13, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - HangUp - EMultimodeCallDialNoFdn"); HangUp( dialCancelHandleNoFdn ); } else { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - iDialCancelFlag = CMmCallTsy::EDialCancelNotCalled"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_14, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - iDialCancelFlag = CMmCallTsy::EDialCancelNotCalled"); iDialCancelFlag = CMmCallTsy::EDialCancelNotCalled; } } @@ -890,7 +896,7 @@ // it with CALL_CAUSE_NOT_ALLOWED if( RCall::EStatusAnswering == call->Status() ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange Answering not allowed!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_15, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange Answering not allowed!"); TInt errorValue = CMmCommonStaticUtility::EpocErrorCode( KErrAccessDenied, KErrMMEtelCallForbidden ); @@ -900,7 +906,7 @@ } //check previous status. If status is answering -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - EStatusConnected"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_16, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. - EStatusConnected"); if ( RCall::EStatusAnswering == iCallStatus ) { // don't start timers if error occurred @@ -938,13 +944,13 @@ || ( iTsyReqHandleStore->GetTsyReqHandle( EMultimodeCallDialISV ) ) ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange.EStatusConnected - Before CompleteDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_17, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange.EStatusConnected - Before CompleteDial"); CompleteDial( aResult ); } if( iTsyReqHandleStore->GetTsyReqHandle( EMultimodeCallDialNoFdnCheck ) ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange.EStatusConnected - Before CompleteDialNoFdn"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_18, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange.EStatusConnected - Before CompleteDialNoFdn"); CompleteDialNoFdn( aResult ); } @@ -1004,13 +1010,13 @@ { if( KMultimodeCallTypeIDNoFdnCheck == GetDialTypeId() ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnecting - Before CompleteDialNoFdn"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_19, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnecting - Before CompleteDialNoFdn"); //CompleteDialNoFdn in case remote user is busy CompleteDialNoFdn( aResult ); } else { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnecting - Before CompleteDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_20, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnecting - Before CompleteDial"); //CompleteDial in case remote user is busy CompleteDial( aResult ); } @@ -1044,13 +1050,13 @@ if( KMultimodeCallTypeIDNoFdnCheck == GetDialTypeId() ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnectingWithInband - Before CompleteDialNoFdn"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_21, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnectingWithInband - Before CompleteDialNoFdn"); //CompleteDialNoFdn in case remote user is busy CompleteDialNoFdn( aResult ); } else { -TFLOGSTRING("TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnectingWithInband - Before CompleteDial"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_22, "TSY: CMmVoiceCallTsy::CompleteNotifyStatusChange. RMobileCall::EStatusDisconnectingWithInband - Before CompleteDial"); //CompleteDial in case remote user is busy CompleteDial( aResult ); } @@ -1204,7 +1210,7 @@ const TDesC8* aCallParams, TDesC* aTelNumber ) { -TFLOGSTRING3("TSY: CMmVoiceCallTsy::Dial. Req handle: %d, Call name: %S", aTsyReqHandle, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_1, "TSY: CMmVoiceCallTsy::Dial. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName); TBool isDialISV = iIsDialISV; iIsDialISV = EFalse; @@ -1213,7 +1219,7 @@ { if ( sizeof( RMobileCall::TCallParams ) > aCallParams->Length() ) { - TFLOGSTRING ("TSY: CMmVoiceCallTsy::Dial bad size argument"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_2, "TSY: CMmVoiceCallTsy::Dial bad size argument"); // Complete the request with appropiate error return KErrArgument; } @@ -1291,7 +1297,7 @@ if ( KETelExt3rdPartyV1 == extensionId && !isDialISV ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - KErrArgument"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_3, "TSY: CMmVoiceCallTsy::Dial - KErrArgument"); //Complete the request with appropiate error ReqCompleted ( aTsyReqHandle, KErrArgument ); SetDialFlag( EFalse ); @@ -1299,7 +1305,7 @@ else if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() ) { -TFLOGSTRING("TSY: Offline mode ON, Dial request is not allowed" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_4, "TSY: Offline mode ON, Dial request is not allowed" ); ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); @@ -1315,7 +1321,7 @@ //is still in use. //Complete request with status value informing the client about //the situation. -TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - KErrNotReady"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_5, "TSY: CMmVoiceCallTsy::Dial - KErrNotReady"); ReqCompleted( aTsyReqHandle, KErrNotReady ); SetDialFlag( EFalse ); } @@ -1326,7 +1332,7 @@ //The request is already processing because of previous request //Complete request with status value informing the client about //the situation. -TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - KErrServerBusy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_6, "TSY: CMmVoiceCallTsy::Dial - KErrServerBusy"); ReqCompleted( aTsyReqHandle, KErrServerBusy ); SetDialFlag( EFalse ); } @@ -1335,7 +1341,7 @@ && ( KETelExt3rdPartyV1 != activeCall->GetExtensionId() ) ) { //a 3rd party client call cannot put on Hold a "normal" call -TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - KErrServerBusy"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_7, "TSY: CMmVoiceCallTsy::Dial - KErrServerBusy"); ReqCompleted( aTsyReqHandle, KErrServerBusy ); SetDialFlag( EFalse ); } @@ -1345,11 +1351,11 @@ else if ( extensionId == KETelExt3rdPartyV1 && !i3rdPartyEmergencyNumberCheckDone ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - For 3rd party client number check must be done every time "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_8, "TSY: CMmVoiceCallTsy::Dial - For 3rd party client number check must be done every time "); TInt ret( KErrGeneral ); -TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - 3rd party client number check iNumberCheckMode.iCheckMode = RMmCustomAPI::EEmerNumberCheckNormal "); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_9, "TSY: CMmVoiceCallTsy::Dial - 3rd party client number check iNumberCheckMode.iCheckMode = RMmCustomAPI::EEmerNumberCheckNormal "); iNumberCheckMode.iCheckMode = RMmCustomAPI::EEmerNumberCheckNormal; iNumberCheckMode.iNumber.Copy( *aTelNumber ); @@ -1363,7 +1369,7 @@ if ( NULL == mmCustom ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::Dial - CustomTSY is not yet created!"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_10, "TSY: CMmVoiceCallTsy::Dial - CustomTSY is not yet created!"); ReqCompleted( aTsyReqHandle, KErrNotReady ); SetDialFlag( EFalse ); } @@ -1402,7 +1408,7 @@ else { -TFLOGSTRING2("TSY: CMmVoiceCallTsy::Dial - UUS services: %u", iUUSRequest.iServiceReq ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_11, "TSY: CMmVoiceCallTsy::Dial - UUS services: %u", iUUSRequest.iServiceReq ); // UUS1 will be embedded within the call set-up message if ( iUUSRequest.iServiceReq & RMobileCall::KUUS1Implicit ) @@ -1428,7 +1434,7 @@ // complete the dial with error value if ( KErrNone != ret ) { -TFLOGSTRING2("TSY: CMmVoiceCallTsy::Dial - UUS ERROR:%d", ret ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIAL_12, "TSY: CMmVoiceCallTsy::Dial - UUS ERROR:%d", ret ); // Complete the request with appropiate error ReqCompleted ( aTsyReqHandle, KErrGsmCCResourceNotAvailable ); ClearCallStatus(); @@ -1509,7 +1515,7 @@ const TTsyReqHandle aTsyReqHandle, const TDesC8* aCallParams ) { -TFLOGSTRING2("TSY: CMmVoiceCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d", aTsyReqHandle); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_ANSWERINCOMINGCALL_1, "TSY: CMmVoiceCallTsy::AnswerIncomingCall. \n\t\t\t Handle:%d", aTsyReqHandle); TInt trapError( KErrNone ); @@ -1662,7 +1668,7 @@ TInt CMmVoiceCallTsy::HangUp( const TTsyReqHandle aTsyReqHandle ) { -TFLOGSTRING3("TSY: CMmVoiceCallTsy::HangUp. Req handle: %d, Call name: %S", aTsyReqHandle, &iCallName); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_HANGUP_1, "TSY: CMmVoiceCallTsy::HangUp. Req handle: %u, Call name: %S", aTsyReqHandle, iCallName); TInt ret( KErrNone ); TInt trapError( KErrNone ); @@ -1784,8 +1790,8 @@ void CMmVoiceCallTsy::CompleteHangUp( TInt aResult ) { -TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteHangUp.\n \t\t\t Result:%d", aResult ); -TFLOGSTRING3("TSY: CMmVoiceCallTsy::CompleteHangUp. Call Id:%d Call name:%S", iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETEHANGUP_1, "TSY: CMmVoiceCallTsy::CompleteHangUp.\n \t\t\t Result:%d", aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETEHANGUP_2, "TSY: CMmVoiceCallTsy::CompleteHangUp. Call Id:%d Call name:%S", iCallId, iCallName); TInt ret( KErrNone ); @@ -2149,7 +2155,7 @@ const TTsyReqHandle aTsyReqHandle, const TDataPackage& aNumber ) { - TFLOGSTRING2("TSY: CMmVoiceCallTsy::DialEmergencyCall number %S", aNumber.Des1u()); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALEMERGENCYCALL_1, "TSY: CMmVoiceCallTsy::DialEmergencyCall number %S", *(aNumber.Des1u())); if(aNumber.Des1u()->MaxLength() > RMobileENStore::KEmergencyNumberSize) { @@ -2205,8 +2211,8 @@ void CMmVoiceCallTsy::CompleteDialEmergencyCall( TInt aResult ) { -TFLOGSTRING2("TSY: CMmVoiceCallTsy::CompleteDialEmergencyCall. Result:%d", aResult ); -TFLOGSTRING3("TSY: CMmVoiceCallTsy::CompleteDialEmergencyCall. Call Id:%d Call name:%S", iCallId, &iCallName); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETEDIALEMERGENCYCALL_1, "TSY: CMmVoiceCallTsy::CompleteDialEmergencyCall. Result:%d", aResult ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETEDIALEMERGENCYCALL_2, "TSY: CMmVoiceCallTsy::CompleteDialEmergencyCall. Call Id:%d Call name:%S", iCallId, iCallName); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore-> @@ -2254,7 +2260,7 @@ TInt CMmVoiceCallTsy::FillMobileCallInfo( TDes8* aInfo ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_1, "TSY: CMmVoiceCallTsy::FillMobileCallInfo"); TInt ret = KErrArgument; TInt extensionId = 0; @@ -2268,7 +2274,7 @@ // get extensionid from the recieved data extensionId = callInfo.ExtensionId(); -TFLOGSTRING2("TSY: CMmVoiceCallTsy::FillMobileCallInfo - extensionid=%d",callInfo.ExtensionId()); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_2, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - extensionid=%d",callInfo.ExtensionId()); } //TMobileCallInfoV1 @@ -2277,7 +2283,7 @@ KEtelExtMultimodeV7 == extensionId || KEtelExtMultimodeV8 == extensionId ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo - V1"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_3, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - V1"); // Set ret to KErrNone. We can fill this parameter class. ret = KErrNone; @@ -2297,7 +2303,7 @@ KEtelExtMultimodeV7 == extensionId || KEtelExtMultimodeV8 == extensionId ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo - V3"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_4, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - V3"); RMobileCall::TMobileCallInfoV3Pckg* paramsPckgV3 = reinterpret_cast( aInfo ); @@ -2311,7 +2317,7 @@ if ( KEtelExtMultimodeV7 == extensionId || KEtelExtMultimodeV8 == extensionId ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo - V7"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_5, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - V7"); RMobileCall::TMobileCallInfoV7Pckg* paramsPckgV7 = reinterpret_cast( aInfo ); @@ -2324,7 +2330,7 @@ // TMobileCallInfoV8 if ( KEtelExtMultimodeV8 == extensionId ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::FillMobileCallInfo - V8"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_6, "TSY: CMmVoiceCallTsy::FillMobileCallInfo - V8"); RMobileCall::TMobileCallInfoV8Pckg* paramsPckgV8 = reinterpret_cast( aInfo ); @@ -2334,7 +2340,7 @@ iMmCallExtInterface->FillMobileCallInfoV8( &info ); } -TFLOGSTRING2("TSY: CMmVoiceCallTsy::FillMobileCallInfo end. ret=%d",ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_FILLMOBILECALLINFO_7, "TSY: CMmVoiceCallTsy::FillMobileCallInfo end. ret=%d",ret); return ret; } @@ -2452,7 +2458,7 @@ if ( EMultimodeCallReqHandleUnknown != reqHandle ) { -TFLOGSTRING2("TSY: Swap complete, Call ID: %d", iCallId ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETESWAP_1, "TSY: Swap complete, Call ID: %d", iCallId ); ReqCompleted( reqHandle, aResult ); } (reinterpret_cast( iMmLine ))-> @@ -2728,19 +2734,19 @@ // void CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck( TBool aIsEmergencyNbr ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_1, "TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck " ); if( i3rdPartyEmergencyNumberCheckDone ) { if( aIsEmergencyNbr ) { -TFLOGSTRING("TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck - Emergency number" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_2, "TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck - Emergency number" ); CompleteDial( KErrNotSupported ); i3rdPartyEmergencyNumberCheckDone = EFalse; } else { -TFLOGSTRING("TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck - NOT Emergency nbr - DIAL" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_3, "TSY: CMmVoiceCallTsy::Complete3rdPartyCallNbrCheck - NOT Emergency nbr - DIAL" ); i3rdPartyEmergencyNumberCheckDone = ETrue; iIsDialISV = ETrue; @@ -2777,7 +2783,7 @@ const TDesC8* aCallParams, TDesC* aTelNumber ) { -TFLOGSTRING3("TSY: CMmVoiceCallTsy::DialNoFdnCheck. Req handle: %d, Call name: %S", aTsyReqHandle, &iCallName ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_1, "TSY: CMmVoiceCallTsy::DialNoFdnCheck. Req handle: %u, Call name: %S", (TUint)aTsyReqHandle, iCallName ); TInt ret( KErrGeneral ); // Check that there is no dial on going for another call @@ -2832,7 +2838,7 @@ if ( ERfsStateInfoInactive == iMmPhone->GetRfStateInfo() ) { -TFLOGSTRING("TSY: Offline mode ON, DialNoFdnCheck request is not allowed" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_2, "TSY: Offline mode ON, DialNoFdnCheck request is not allowed" ); ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmOfflineOpNotAllowed ); @@ -2847,7 +2853,7 @@ //is still in use. //Complete request with status value informing the client about //the situation. -TFLOGSTRING("TSY: CMmVoiceCallTsy::DialNoFdnCheck - KErrNotReady"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_3, "TSY: CMmVoiceCallTsy::DialNoFdnCheck - KErrNotReady"); ReqCompleted( aTsyReqHandle, KErrNotReady ); SetDialFlag(EFalse); } @@ -2866,7 +2872,7 @@ iCallMode, paramsPckgV1, aTelNumber, KMultimodeCallTypeIDNoFdnCheck )); -TFLOGSTRING2("TSY: CMmVoiceCallTsy::DialNoFdnCheck ret = %d", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_4, "TSY: CMmVoiceCallTsy::DialNoFdnCheck ret = %d", ret); if(err != KErrNone) { ret = err; @@ -2894,7 +2900,7 @@ } else { -TFLOGSTRING2("TSY: CMmVoiceCallTsy::DialNoFdnCheck Before ReqCompleted ret = %d", ret); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_DIALNOFDNCHECK_5, "TSY: CMmVoiceCallTsy::DialNoFdnCheck Before ReqCompleted ret = %d", ret); ReqCompleted( aTsyReqHandle, ret ); ClearCallStatus(); SetDialFlag(EFalse); @@ -3004,7 +3010,7 @@ { iTelephonyAudioControl->CallStateChange( aCallName, aMobileCallStatus ); -TFLOGSTRING2("TSY: CMmVoiceCallTsy::UpdateCallRoutingControl. Call routing state changed to EStatusDialling: Call name:%S", &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_UPDATECALLROUTINGCONTROL_1, "TSY: CMmVoiceCallTsy::UpdateCallRoutingControl. Call routing state changed to EStatusDialling: Call name:%S", iCallName ); } else { @@ -3013,7 +3019,7 @@ MTelephonyAudioControl::ECallTypeVoice, iEmergencyCall, iCallDirection ); -TFLOGSTRING2("TSY: CMmVoiceCallTsy::CMmVoiceCallTsy::UpdateCallRoutingControl. Call routing setup: Call name:%S", &iCallName ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICECALLTSY_UPDATECALLROUTINGCONTROL_2, "TSY: CMmVoiceCallTsy::CMmVoiceCallTsy::UpdateCallRoutingControl. Call routing setup: Call name:%S", iCallName ); iTelephonyAudioControlSetup = ETrue; } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmvoicelinetsyTraces.h" +#endif + #include "cmmvoicelinetsy.h" #include "cmmphonetsy.h" #include "cmmvoicecalltsy.h" @@ -34,7 +40,7 @@ void CMmVoiceLineTsy::ConstructL() { - TFLOGSTRING("TSY: CMmVoiceLineTsy::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_CONSTRUCTL_1, "TSY: CMmVoiceLineTsy::ConstructL"); CMmLineTsy::ConstructL(); } @@ -45,7 +51,7 @@ CMmMessageManagerBase* aMessageManager, MTelephonyAudioControl* aTelephonyAudioControl ) { - TFLOGSTRING2("TSY: CMmVoiceLineTsy::NewL, Voice line %S created", &aName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_NEWL_1, "TSY: CMmVoiceLineTsy::NewL, Voice line %S created", aName); CMmVoiceLineTsy* mmLineTsy = NULL; if ( aMmPhone != NULL && ( aMode == RMobilePhone::EVoiceService @@ -66,8 +72,7 @@ CMmVoiceLineTsy::~CMmVoiceLineTsy() { - TFLOGSTRING2("TSY: CMmVoiceLineTsy::~CMmVoiceLineTsy. Line name: %S", \ - &iLineName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_DTOR_1, "TSY: CMmVoiceLineTsy::~CMmVoiceLineTsy. Line name: %S", iLineName); } // --------------------------------------------------------------------------- @@ -257,8 +262,7 @@ callDataPackage->GetCallIdAndMode( callId, callMode ); - TFLOGSTRING3("TSY: CMmVoiceLineTsy::CompleteNotifyIncomingCall - Line \ - name: %S, Call id: %d", &iLineName, callId ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYINCOMINGCALL_1, "TSY: CMmVoiceLineTsy::CompleteNotifyIncomingCall - Line \name: %S, Call id: %d", iLineName, callId ); //reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle( @@ -336,7 +340,7 @@ void CMmVoiceLineTsy::CompleteNotifyDiallingStatus( CMmDataPackage* aDataPackage ) { - TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_1, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus"); TInt callId( -1 ); TBool ghostCall( EFalse ); RMobilePhone::TMobileService callMode( RMobilePhone::EVoiceService ); @@ -351,8 +355,7 @@ if ( NULL == mmCall ) { - TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \ - GhostCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_2, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \GhostCall"); ghostCall = ETrue; } else @@ -380,7 +383,7 @@ if ( result || resultNoFdnCheck || resultISV ) { -TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - Not Emergency call"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_3, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - Not Emergency call"); for ( TInt i = 0; i < iMmPhone->CallList()->GetNumberOfObjects(); i++ ) { @@ -397,7 +400,7 @@ CMmCallTsy::EMultimodeCallDialNoFdnCheck ) ) ) ) { mmCall->SetCallId( callId ); -TFLOGSTRING2("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_4, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId); mmCall->CompleteNotifyMobileCallInfoChange( aDataPackage ); break; @@ -406,8 +409,7 @@ } else { - TFLOGSTRING("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \ - Dial not found"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_5, "TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - \Dial not found"); ghostCall = ETrue; } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,13 +16,18 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CMmCommonStaticUtilityTraces.h" +#endif + #include #include #include #include #include "CMmCommonStaticUtility.h" -#include #include // ======== MEMBER FUNCTIONS ======== @@ -39,14 +44,12 @@ TInt aCoreErrorCode, // core error TInt aExtendedErrorCode ) // extended error { -TFLOGSTRING3("TSY: CMmStaticUtility::EpocErrorCode, Error mapping done, \ -Core error: %d, Extended error: %d", aCoreErrorCode, aExtendedErrorCode ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCOMMONSTATICUTILITY_EPOCERRORCODE_1, "TSY: CMmStaticUtility::EpocErrorCode, Error mapping done, \Core error: %d, Extended error: %d", aCoreErrorCode, aExtendedErrorCode ); TInt errorCode = ( aCoreErrorCode & 0x0000FFFF ) | ( aExtendedErrorCode << 16 ); -TFLOGSTRING2("TSY: CMmStaticUtility::EpocErrorCode. It was mapped \ -to the following Symbian OS error: %d", errorCode ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCOMMONSTATICUTILITY_EPOCERRORCODE_2, "TSY: CMmStaticUtility::EpocErrorCode. It was mapped \to the following Symbian OS error: %d", errorCode ); return errorCode; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimer.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimer.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimer.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,11 +16,16 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CResponseTimerTraces.h" +#endif + #include "CResponseTimer.h" #include "cmmphonetsy.h" #include "CResponseTimerStore.h" #include "MmTsy_timeoutdefs.h" -#include #ifdef REQHANDLE_TIMER @@ -116,7 +121,7 @@ //if the entry is expired, complete and delete it if ( aEntry->GetTimeStamp() <= iBeatCounter ) { -TFLOGSTRING2("TSY: Request completed due timer expiration, IPC: %d", aEntry->GetIPC() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRESPONSETIMER_BEAT_1, "TSY: Request completed due timer expiration, IPC: %d", aEntry->GetIPC() ); //call completion of the request due expired timer iPhone->TimerExpired( aEntry->GetUserObject(), diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimerStore.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimerStore.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimerStore.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,11 +16,16 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CResponseTimerStoreTraces.h" +#endif + #include "CResponseTimerStore.h" #include "cmmphonetsy.h" #include "CResponseTimer.h" #include "MmTsy_timeoutdefs.h" -#include #ifdef REQHANDLE_TIMER @@ -216,7 +221,7 @@ if ( KErrNone != ret ) { //log problem -TFLOGSTRING("Error inserting entry in the Timer table."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRESPONSETIMERSTORE_ADDTIMEENTRY_1, "Error inserting entry in the Timer table."); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp --- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,6 +16,12 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmtsyreqhandlestoreTraces.h" +#endif + #include #include "cmmtsyreqhandlestore.h" #include "cmmphonetsy.h" @@ -41,7 +47,7 @@ TInt aNumberOfRequests, //number of requests TTsyReqHandle* aFirstElement ) //pointer to the first element { - TFLOGSTRING3("TSY:CMmTsyReqHandleStore::NewL aNumberOfRequests=%d aFirstElement=%x",aNumberOfRequests,aFirstElement); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_NEWL_1, "TSY:CMmTsyReqHandleStore::NewL aNumberOfRequests=%d aFirstElement=0x%08x",aNumberOfRequests, (TUint)aFirstElement); CMmTsyReqHandleStore* tsyReqHandleStore = new ( ELeave ) CMmTsyReqHandleStore(); @@ -56,7 +62,7 @@ *( tsyReqHandleStore->iReqHandles + i ) = 0; CleanupStack::Pop(); - TFLOGSTRING2("TSY:CMmTsyReqHandleStore::NewL returns tsyReqHandleStore=%x",tsyReqHandleStore); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_NEWL_2, "TSY:CMmTsyReqHandleStore::NewL returns tsyReqHandleStore=0x%08x", (TUint)tsyReqHandleStore); return tsyReqHandleStore; } @@ -68,8 +74,8 @@ TInt aNumberOfRequests, TTsyReqHandle* aFirstElement ) { - TFLOGSTRING3("TSY:CMmTsyReqHandleStore::NewL aCTelObject=%x aPhone=%x",aCTelObject,aPhone); - TFLOGSTRING3("TSY:CMmTsyReqHandleStore::NewL aNumberOfRequests=%d aFirstElement=%x",aNumberOfRequests,aFirstElement); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_NEWL1_1, "TSY:CMmTsyReqHandleStore::NewL aCTelObject=0x%08x aPhone=0x%08x",(TUint)aCTelObject, (TUint)aPhone); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_NEWL1_2, "TSY:CMmTsyReqHandleStore::NewL aNumberOfRequests=%d aFirstElement=0x%08x",aNumberOfRequests,(TUint)aFirstElement); CMmTsyReqHandleStore* tsyReqHandleStore = new ( ELeave ) CMmTsyReqHandleStore(); @@ -99,7 +105,7 @@ TTsyReqHandle CMmTsyReqHandleStore::GetTsyReqHandle( const TInt aIndex ) { - TFLOGSTRING2("TSY:CMmTsyReqHandleStore::GetTsyReqHandle aIndex=%d", aIndex); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_GETTSYREQHANDLE_1, "TSY:CMmTsyReqHandleStore::GetTsyReqHandle aIndex=%d", aIndex); TTsyReqHandle ret( NULL ); //check the bounds @@ -121,7 +127,7 @@ const TInt aIndex, const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING3("TSY:CMmTsyReqHandleStore::SetTsyReqHandle aIndex=%d aTsyReqHandle=%d ", aIndex, aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_SETTSYREQHANDLE_1, "TSY:CMmTsyReqHandleStore::SetTsyReqHandle aIndex=%d aTsyReqHandle=0x%08x", aIndex, (TUint)aTsyReqHandle); if ( aIndex >= 0 && aIndex < iNumOfRequests ) { *( iReqHandles + aIndex ) = aTsyReqHandle; @@ -144,8 +150,8 @@ TInt aTimeout, TInt aIPC ) { - TFLOGSTRING3("TSY:CMmTsyReqHandleStore::SetTsyReqHandle aIndex=%d, aTsyReqHandle=%d",aIndex,aTsyReqHandle); - TFLOGSTRING3("TSY:CMmTsyReqHandleStore::SetTsyReqHandle aTimeout=%d IPC=%d", aTimeout, aIPC); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_SETTSYREQHANDLE1_1, "TSY:CMmTsyReqHandleStore::SetTsyReqHandle aIndex=%d, aTsyReqHandle=0x%08x",aIndex,(TUint)aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_SETTSYREQHANDLE1_2, "TSY:CMmTsyReqHandleStore::SetTsyReqHandle aTimeout=%d IPC=%d", aTimeout, aIPC); if ( aIndex >= 0 && aIndex < iNumOfRequests ) { @@ -161,6 +167,7 @@ iCTelObject, aTimeout, aIPC ); + } } @@ -177,7 +184,7 @@ TTsyReqHandle CMmTsyReqHandleStore::ResetTsyReqHandle( const TInt aIndex ) { -TFLOGSTRING2("TSY:CMmTsyReqHandleStore::ResetTsyReqHandle aIndex=%d", aIndex); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_RESETTSYREQHANDLE_1, "TSY:CMmTsyReqHandleStore::ResetTsyReqHandle aIndex=%d", aIndex); //req handle was not used. TInt ret = 0; @@ -209,7 +216,7 @@ } } -TFLOGSTRING3("TSY:CMmTsyReqHandleStore::ResetTsyReqHandle aIndex=%d, ret=%d", aIndex, ret); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_RESETTSYREQHANDLE_2, "TSY:CMmTsyReqHandleStore::ResetTsyReqHandle aIndex=%d, ret=%d", aIndex, ret); return ret; } @@ -225,7 +232,7 @@ const TInt aHandle, const TInt aTimeout ) { - TFLOGSTRING3("TSY:CMmTsyReqHandleStore::PostponeTimeout aHandle=%d, aTimeout=%d",aHandle,aTimeout); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_POSTPONETIMEOUT_1, "TSY:CMmTsyReqHandleStore::PostponeTimeout aHandle=%d, aTimeout=%d",aHandle,aTimeout); // call ResetEntryTimeout iPhone->GetTimeStampStore()->ResetEntryTimeout( aHandle, this, @@ -243,7 +250,7 @@ void CMmTsyReqHandleStore::StopTimeout( const TInt aHandle ) { - TFLOGSTRING2("TSY:CMmTsyReqHandleStore::StopTimeout aHandle=%d",aHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMTSYREQHANDLESTORE_STOPTIMEOUT_1, "TSY:CMmTsyReqHandleStore::StopTimeout aHandle=%d",aHandle); iPhone->GetTimeStampStore()->DeleteEntryByHandle( aHandle, this ); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/commontsy/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/commontsy/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/commontsy/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,1684 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_BORDER=0x84 +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_BORDER[0x84]_CMMMESSAGEMANAGERBASE_SETMESSAGEROUTER_1=0x2 +[TRACE]TRACE_BORDER[0x84]_CMMMESSAGEMANAGERBASE_SETPHONETSY_1=0x1 +[TRACE]TRACE_BORDER[0x84]_CMMPHONETSY_NEWL_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CCHARGINGSTATUSOBSERVER_RUNL_1=0x3e9 +[TRACE]TRACE_INTERNALS[0x88]_CCHARGINGSTATUSOBSERVER_RUNL_2=0x3ea +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETENOTIFYFILTERSETTINGCHANGE_1=0x2a7 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETENOTIFYFILTERSETTINGCHANGE_2=0x2a8 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_1=0x296 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_2=0x297 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEDWCDMACBSMESSAGEPAGELEFT_3=0x298 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGECANCEL_1=0x2a1 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEGSMCBS_1=0x299 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_1=0x29a +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_2=0x29b +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_3=0x29c +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_4=0x29d +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETERECEIVEMESSAGEWCDMACBS_5=0x29e +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_COMPLETESETFILTERSETTING_1=0x2a4 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_CONSTRUCTL_1=0x290 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_DTOR_1=0x291 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_GETBROADCASTIDLISTPHASE1L_1=0x2a9 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_GETBROADCASTIDLISTPHASE2_1=0x2aa +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_GETCAPS_1=0x292 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_GETFILTERSETTING_1=0x2a2 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_INTERNALCOMPLETECBROUTINGREQUEST_1=0x295 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_NOTIFYFILTERSETTINGCHANGECANCEL_1=0x2a6 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_NOTIFYFILTERSETTINGCHANGE_1=0x2a5 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_RECEIVEMESSAGECANCELL_1=0x29f +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_RECEIVEMESSAGECANCELL_2=0x2a0 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_RECEIVEMESSAGEL_1=0x293 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_RECEIVEMESSAGEL_2=0x294 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_SETFILTERSETTINGL_1=0x2a3 +[TRACE]TRACE_INTERNALS[0x88]_CMMBROADCASTTSY_STOREBROADCASTIDLISTL_1=0x2ab +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALDATACALLL_1=0x12e +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALDATACALLL_2=0x12f +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALDATACALLL_3=0x130 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALDATACALLL_4=0x131 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_1=0x117 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_2=0x118 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_3=0x119 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_4=0x11a +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_5=0x11b +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_6=0x11c +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_7=0x11d +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_8=0x11e +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_DIALL_9=0x11f +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV3_1=0x123 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV7_1=0x124 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV8_1=0x125 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCALLPARAMS_1=0x120 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCALLPARAMS_2=0x121 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_1=0x12b +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_2=0x12c +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_3=0x12d +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_1=0x128 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_2=0x129 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_3=0x12a +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETRFSTATE_1=0x126 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SETRFSTATE_2=0x127 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_SSMPLUGINCALLBACK_1=0x132 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_TRANSFERL1_1=0x133 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLGSMWCDMAEXT_TRANSFERL_1=0x122 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_ACTIVATEUUS_1=0x40c +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_ANSWERINCOMINGCALLCANCEL_1=0x3f5 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_1=0x3f6 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_2=0x3f7 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEANSWERINCOMINGCALL_3=0x3f8 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIALNOFDN_1=0x417 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIALNOFDN_2=0x418 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIAL_1=0x3f1 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIAL_2=0x3f2 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIAL_3=0x3f3 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEDIAL_4=0x3f4 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEHANGUP_1=0x3f9 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETEHANGUP_2=0x3fa +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETENOTIFYCALLEVENT_1=0x3fc +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETERECEIVEUUI_1=0x411 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETERECEIVEUUI_2=0x412 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETERECEIVEUUI_3=0x413 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_COMPLETERECEIVEUUI_4=0x414 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DIALCANCEL_1=0x3ee +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DIALCANCEL_2=0x3ef +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DIALCANCEL_3=0x3f0 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DTOR_1=0x3eb +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_DTOR_2=0x3ec +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_EXTFUNC_1=0x3ed +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFODEFAULTS_1=0x41a +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFODEFAULTS_2=0x41b +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_1=0x3fd +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_2=0x3fe +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_3=0x3ff +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_4=0x400 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_5=0x401 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_6=0x402 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_FILLMOBILECALLINFO_7=0x403 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_GETCALLPARAMS_1=0x3fb +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_GETDIALFLAG_1=0x40a +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_GETDIALTYPEID_1=0x416 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_ISREMOTERELEASEDCALL_1=0x40b +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_NOTIFYREMOTEPARTYINFOCHANGE_1=0x404 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_RECEIVEUUICANCEL_1=0x410 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_RECEIVEUUI_1=0x40d +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_RECEIVEUUI_2=0x40e +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_RECEIVEUUI_3=0x40f +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_REQCOMPLETED_1=0x405 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETDIALFLAG_1=0x409 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETDIALTYPEID_1=0x415 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETEXTENSIONID_1=0x408 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETPARTOFCONFERENCE_1=0x406 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_SETPARTOFCONFERENCE_2=0x407 +[TRACE]TRACE_INTERNALS[0x88]_CMMCALLTSY_UPDATELIFETIMER_1=0x419 +[TRACE]TRACE_INTERNALS[0x88]_CMMCOMMONSTATICUTILITY_EPOCERRORCODE_1=0x67f +[TRACE]TRACE_INTERNALS[0x88]_CMMCOMMONSTATICUTILITY_EPOCERRORCODE_2=0x680 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_1=0x136 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_2=0x137 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_3=0x138 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_4=0x139 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CALLSTATUSCHANGED_5=0x13a +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_CHECKCONFERENCECAPABILITY_1=0x13b +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_1=0x147 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_2=0x148 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_3=0x149 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_4=0x14a +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_5=0x14b +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_6=0x14c +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_COMPLETENOTIFYCONFERENCEEVENT_7=0x14d +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_GETNEWSTATUS_1=0x145 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_1=0x13d +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_2=0x13e +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLEADDCALL_3=0x13f +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_1=0x140 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_2=0x141 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_3=0x142 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_4=0x143 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLECALLRELEASE_5=0x144 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_HANDLESWAP_1=0x13c +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_RESETATTRIBUTES_1=0x146 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_1=0x134 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLGSMWCDMAEXT_SWAPL_2=0x135 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_ADDCALLL_1=0x420 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_1=0x421 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_2=0x422 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_3=0x423 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_4=0x424 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_5=0x425 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_6=0x426 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_7=0x427 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETEADDCALL_8=0x428 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETECREATECONFERENCE_1=0x41f +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCEEVENT_1=0x433 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCESTATUSCHANGE_1=0x431 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETENOTIFYCONFERENCESTATUSCHANGE_2=0x432 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_COMPLETESWAP_1=0x42f +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_CREATECONFERENCEL_1=0x41e +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_DOEXTFUNCL_1=0x41d +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_DTOR_1=0x41c +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_GETCONFERENCESTATUS_1=0x430 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_1=0x429 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_2=0x42a +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_3=0x42b +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_4=0x42c +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REMOVENONPARTICIPATINGCALL_5=0x42d +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_REQCOMPLETED_1=0x435 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_RESETATTRIBUTES_1=0x434 +[TRACE]TRACE_INTERNALS[0x88]_CMMCONFERENCECALLTSY_SWAPL_1=0x42e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_CHECKSECURITYCODEL_1=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODECANCEL_1=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_COMPLETECHECKSECURITYCODE_1=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_COMPLETEDISABLEPHONELOCK_1=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_COMPLETE_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_CONSTRUCTL_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_DELIVERCODEL_1=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_ISBLOCKED_1=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSECURITYTSY_NEWL_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_1=0x66 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_2=0x67 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_3=0x68 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKRANDVALIDITYL_1=0x44 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CHECKTWODIGITDIALSUPPORTL_1=0x74 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_1=0x69 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_2=0x6a +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_3=0x6b +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSBLOCKED_1=0x55 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_1=0x5e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_2=0x5f +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_3=0x60 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_4=0x61 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETCELLINFO_1=0xa5 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_1=0x99 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_2=0x9a +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_3=0x9b +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_4=0x9c +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_5=0x9d +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_6=0x9e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_1=0x7f +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_2=0x80 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETSYSTEMNETWORKBAND_1=0xac +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEGETUSIMSERVICESUPPORT_1=0xb2 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYALSBLOCKEDCHANGED_1=0x58 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYCELLINFOCHANGE_1=0xa7 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_1=0x62 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_2=0x63 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_3=0x64 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYDTMFEVENT_1=0x4e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_1=0x94 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_2=0x95 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_3=0x96 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_1=0xa0 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_2=0xa1 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_3=0xa2 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYNETWORKCONNECTIONFAILURE_1=0x78 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYRAUEVENT_1=0x8b +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETENOTIFYREMOTEALERTINGTONESTATUSCHANGE_1=0xb5 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_1=0x8d +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_2=0x8e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETERESETNETSERVER_1=0x76 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETERESETNETSERVER_2=0x77 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESETALSBLOCKED_1=0x57 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESETDRIVEMODE_1=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESETSYSTEMNETWORKBAND_1=0xaf +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_1=0x37 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_10=0x40 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_11=0x41 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_12=0x42 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_13=0x43 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_2=0x38 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_3=0x39 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_4=0x3a +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_5=0x3b +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_6=0x3c +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_7=0x3d +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_8=0x3e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_9=0x3f +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETESSADDITIONALINFONOTIFICATION_1=0x73 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETETERMINATECALL_1=0x4c +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETEWRITEHSXPASTATUS_1=0x91 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_COMPLETE_1=0x65 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_1=0xa +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_2=0xb +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_3=0xc +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_4=0xd +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_5=0xe +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CONSTRUCTL_6=0xf +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CREATERANDDB_1=0x45 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CREATERANDDB_2=0x46 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CREATERANDDB_3=0x47 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_CREATERANDDB_4=0x48 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_DOEXTFUNCL_1=0x13 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_DTOR_1=0x11 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_EXTFUNC_1=0x12 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSBLOCKEDL_1=0x54 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_1=0x5c +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_2=0x5d +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTL_1=0x59 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTL_2=0x5a +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETALSPPSUPPORTL_3=0x5b +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETCELLINFOCANCEL_1=0xa4 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETCELLINFOL_1=0xa3 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODECANCEL_1=0x7a +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODEL_1=0x79 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETDIAGNOSTICINFO_1=0x4f +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETDIAGNOSTICINFO_2=0x50 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETDIAGNOSTICINFO_3=0x51 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETDIAGNOSTICINFO_4=0x52 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSCANCEL_1=0x9f +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSL_1=0x98 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_1=0x81 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_2=0x82 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_3=0x83 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_4=0x84 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_5=0x85 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETLIFETIMEL_6=0x86 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPHONEBOOKCACHESTATUS_1=0xa9 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPNDCACHESTATUS_1=0x6c +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPNDCACHESTATUS_2=0x6d +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPNDCACHESTATUS_3=0x6e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETPNDCACHESTATUS_4=0x6f +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREMOTEALERTINGTONESTATUS_1=0x53 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_1=0x14 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_10=0x1d +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_11=0x1e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_12=0x1f +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_13=0x20 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_14=0x21 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_15=0x22 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_16=0x23 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_17=0x24 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_18=0x25 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_19=0x26 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_2=0x15 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_20=0x27 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_21=0x28 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_3=0x16 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_4=0x17 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_5=0x18 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_6=0x19 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_7=0x1a +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_8=0x1b +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_9=0x1c +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSIMFILEINFOCANCEL_1=0x7e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSIMFILEINFOL_1=0x7b +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSIMFILEINFOL_2=0x7c +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSIMFILEINFOL_3=0x7d +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSYSTEMNETWORKBANDCANCEL_1=0xad +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETSYSTEMNETWORKBANDL_1=0xab +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETUSIMSERVICESUPPORTCANCEL_1=0xb3 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_GETUSIMSERVICESUPPORTL_1=0xb1 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_INSERTBLOBSTORANDDB_1=0x49 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_INSERTBLOBSTORANDDB_2=0x4a +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NEWL_1=0x10 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYCELLINFOCHANGECANCEL_1=0xa8 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYCELLINFOCHANGE_1=0xa6 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYDTMFEVENT_1=0x4d +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYHSXPASTATUSCANCEL_1=0x97 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYHSXPASTATUS_1=0x93 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYRAUEVENT_1=0x8a +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_NOTIFYREMOTEALERTINGTONESTATUSCHANGE_1=0xb4 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_READHSXPASTATUSCANCEL_1=0x8f +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_READHSXPASTATUSL_1=0x8c +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_REQCOMPLETED_1=0xaa +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_RESETNETSERVERL_1=0x75 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETALSBLOCKEDL_1=0x56 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETDRIVEMODEL_1=0x87 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETICCCFBOOTUPFLAG_1=0xb0 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETOBJECTFORISVDIALNUMBERCHECK_1=0x89 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SETSYSTEMNETWORKBANDL_1=0xae +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_1=0x29 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_10=0x32 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_11=0x33 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_12=0x34 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_13=0x35 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_14=0x36 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_2=0x2a +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_3=0x2b +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_4=0x2c +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_5=0x2d +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_6=0x2e +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_7=0x2f +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_8=0x30 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SIMAUTHENTICATIONL_9=0x31 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATIONCANCEL_1=0x72 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATION_1=0x71 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_UPDATEBITCOUNTER_1=0x4b +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_UPDATECACHESTATUS_1=0x70 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_WRITEHSXPASTATUSCANCEL_1=0x92 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMTSY_WRITEHSXPASTATUSL_1=0x90 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_ANSWERINCOMINGCALLCANCEL_1=0x44b +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_ANSWERINCOMINGCALLCANCEL_2=0x44c +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_ANSWERINCOMINGCALL_1=0x44a +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CALLCOMINGFORWAITINGCALL_1=0x45c +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CALLCOMINGFORWAITINGCALL_2=0x45d +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CANCELSERVICE_1=0x43a +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEANSWERINCOMINGCALL_1=0x44d +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEANSWERINCOMINGCALL_2=0x44e +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIALNOFDN_1=0x46e +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIALNOFDN_2=0x46f +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIALNOFDN_3=0x470 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIALNOFDN_4=0x471 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIAL_1=0x448 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEDIAL_2=0x449 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_1=0x453 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_2=0x454 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_3=0x455 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_4=0x456 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_5=0x457 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_6=0x458 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_7=0x459 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_8=0x45a +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETEHANGUP_9=0x45b +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYHSCSDINFOCHANGE_1=0x466 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x43b +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_2=0x43c +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_3=0x43d +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_4=0x43e +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_5=0x43f +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETENOTIFYSTATUSCHANGE_6=0x440 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_COMPLETESETDYNAMICHSCSDPARAMS_1=0x464 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CONNECT_1=0x461 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_CONNECT_2=0x462 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_1=0x467 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_2=0x468 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_3=0x469 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_4=0x46a +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_5=0x46b +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_6=0x46c +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIALNOFDNCHECK_7=0x46d +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_1=0x441 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_2=0x442 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_3=0x443 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_4=0x444 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_5=0x445 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_6=0x446 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DIAL_7=0x447 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DOEXTFUNCL_1=0x438 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_DTOR_1=0x437 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_GETCURRENTHSCSDINFO_1=0x465 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_HANGUP_1=0x44f +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_HANGUP_2=0x450 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_HANGUP_3=0x451 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_HANGUP_4=0x452 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_LOANDATAPORT_1=0x45e +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_NEWL_1=0x436 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_RECOVERDATAPORTANDRELINQUISHOWNERSHIP_1=0x460 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_RECOVERDATAPORT_1=0x45f +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_REQCOMPLETED_1=0x472 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_REQMODEL_1=0x439 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATACALLTSY_SETDYNAMICHSCSDPARAMS_1=0x463 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_1=0x477 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_2=0x478 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_3=0x479 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_4=0x47a +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_5=0x47b +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_6=0x47c +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYDIALLINGSTATUS_7=0x47d +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_COMPLETENOTIFYINCOMINGCALL_1=0x476 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_CONSTRUCTL_1=0x473 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_DTOR_1=0x475 +[TRACE]TRACE_INTERNALS[0x88]_CMMDATALINETSY_NEWL_1=0x474 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETENOTIFYDTMFEVENT_1=0x480 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETENOTIFYSTOPINDTMFSTRING_1=0x485 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETESENDDTMFTONESCANCEL_1=0x483 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETESTARTDTMFTONE_1=0x489 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_COMPLETESTOPDTMFTONE_1=0x48a +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_CONTINUEDTMFSTRINGSENDINGL_1=0x486 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_DTOR_1=0x47e +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_NOTIFYDTMFEVENTCANCEL_1=0x481 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_NOTIFYDTMFEVENT_1=0x47f +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_NOTIFYSTOPINDTMFSTRING_1=0x484 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_SENDDTMFTONESCANCELL1_1=0x48c +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_SENDDTMFTONESCANCELL_1=0x482 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_SENDDTMFTONESL_1=0x48b +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_STARTDTMFTONEL_1=0x487 +[TRACE]TRACE_INTERNALS[0x88]_CMMDTMFTSY_STOPDTMFTONEL_1=0x488 +[TRACE]TRACE_INTERNALS[0x88]_CMMENSTORETSY_DTOR_1=0x2fc +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_ANSWERINCOMINGCALL_1=0x499 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_CANCELSERVICE_1=0x491 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x492 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_COMPLETENOTIFYSTATUSCHANGE_2=0x493 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIALCANCEL_1=0x498 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIAL_1=0x494 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIAL_2=0x495 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIAL_3=0x496 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DIAL_4=0x497 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DOEXTFUNCL_1=0x48f +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_DTOR_1=0x48e +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_HANGUP_1=0x49a +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_HANGUP_2=0x49b +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_LOANDATAPORT_1=0x49c +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_NEWL_1=0x48d +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_RECOVERDATAPORTANDRELINQUISHOWNERSHIP_1=0x49e +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_RECOVERDATAPORT_1=0x49d +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXCALLTSY_REQMODEL_1=0x490 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_1=0x4a1 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_2=0x4a2 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_COMPLETENOTIFYDIALLINGSTATUS_3=0x4a3 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_COMPLETENOTIFYINCOMINGCALL_1=0x4a0 +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_DTOR_1=0x49f +[TRACE]TRACE_INTERNALS[0x88]_CMMFAXLINETSY_RESETLASTINCOMINGCALL_1=0x4a4 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_ADDLINEOBJECT_1=0x4aa +[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_ADDLINEOBJECT_2=0x4ab +[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_CONSTRUCTL_1=0x4a5 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETMMLINEBYINDEX_1=0x4a8 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETMMLINEBYINDEX_2=0x4a9 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETMMLINEBYMODE_1=0x4a6 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETMMLINEBYMODE_2=0x4a7 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETOBJECTBYINDEX_1=0x4ac +[TRACE]TRACE_INTERNALS[0x88]_CMMLINELIST_GETOBJECTBYINDEX_2=0x4ad +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_COMPLETENOTIFYADDBYPASSINGCALL_1=0x4b9 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_COMPLETENOTIFYADDBYPASSINGCALL_2=0x4ba +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_COMPLETENOTIFYCALLADDED_1=0x4b5 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_COMPLETENOTIFYCALLADDED_2=0x4b6 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_CONSTRUCTL_1=0x4ae +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_DOEXTFUNCL_1=0x4b2 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_DTOR_1=0x4af +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_GETCALLINFO_1=0x4b7 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_GETCALLINFO_2=0x4b8 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_NOTIFYCALLADDEDCANCEL_1=0x4b4 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_NOTIFYCALLADDED_1=0x4b3 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_OPENNEWOBJECTBYNAMEL_1=0x4b0 +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_REQCOMPLETED_1=0x4bb +[TRACE]TRACE_INTERNALS[0x88]_CMMLINETSY_REQMODEL_1=0x4b1 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_ADDCONTEXT_1=0x226 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_CONTEXTBYINDEX_1=0x228 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_CONTEXTBYNAME_1=0x229 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_GENERATENEWCONTEXTNAME_1=0x22a +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_ISMBMSCONTEXTRECEIVING_1=0x22b +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_NEWL_1=0x225 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTLIST_REMOVECONTEXT_1=0x227 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_ACTIVATEL_1=0x237 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_CANCELSERVICE_1=0x232 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEACTIVATE_1=0x238 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEACTIVATE_2=0x239 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEDEACTIVATE_1=0x23b +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEDELETE_1=0x23d +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEINITIALISECONTEXT_1=0x236 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETENOTIFYCONFIGCHANGED_1=0x243 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x245 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETESETCONFIG_1=0x248 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETEUPDATEMBMSSESSIONLIST_1=0x24c +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_COMPLETE_1=0x24a +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DEACTIVATEL_1=0x23a +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DELETEL_1=0x23c +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DEREGISTERNOTIFICATION_1=0x234 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DOEXTFUNCL_1=0x22f +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_DTOR_1=0x22d +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_EXTFUNC_1=0x22e +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETCONFIG_1=0x23e +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETLASTERRORCAUSE_1=0x23f +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETMBMSACTIVESERVICESPHASE1L_1=0x24d +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETMBMSACTIVESERVICESPHASE2L_1=0x24e +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_GETSTATUS_1=0x241 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_INITIALISECONTEXTL_1=0x235 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_NEWL_1=0x22c +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_NOTIFYCONFIGCHANGED_1=0x242 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_NOTIFYSTATUSCHANGE_1=0x244 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_NUMBEROFSLOTSL_1=0x231 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_REGISTERNOTIFICATION_1=0x233 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_REQCOMPLETED_1=0x249 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_REQMODEL_1=0x230 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_SETCONFIGL_1=0x246 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_SETCONFIGL_2=0x247 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_SETLASTERRORCAUSE_1=0x240 +[TRACE]TRACE_INTERNALS[0x88]_CMMMBMSCONTEXTTSY_UPDATEMBMSSESSIONLIST_1=0x24b +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL1_1=0x4bd +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL2_1=0x4be +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL_1=0x4bc +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_COMPLETE_1=0x3db +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_CTOR_1=0x3da +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_1=0x3dc +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_10=0x3e5 +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_2=0x3dd +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_3=0x3de +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_4=0x3df +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_5=0x3e0 +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_6=0x3e1 +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_7=0x3e2 +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_8=0x3e3 +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEROUTERPROXY_ROUTECOMPLETIONL_9=0x3e4 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_CANCELSERVICE_1=0x4c5 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_CIPHERINGINDICATORFORCEDOFF_1=0x4f8 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETEGETCURRENTACTIVEUSIMAPPLICATION_1=0x4fe +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETEGETNETWORKREGISTRATIONSTATUS_1=0x4eb +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETEGETNETWORKREGISTRATIONSTATUS_2=0x4ec +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_1=0x4d7 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_2=0x4d8 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_3=0x4d9 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_4=0x4da +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_5=0x4db +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_6=0x4dc +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_7=0x4dd +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYCURRENTNETWORKCHANGE_8=0x4de +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_1=0x4ed +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_2=0x4ee +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_CONSTRUCTL_1=0x4bf +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DOEXTFUNCL_1=0x4c1 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DOEXTFUNCL_2=0x4c2 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DOEXTFUNCL_3=0x4c3 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DOEXTFUNCL_4=0x4c4 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_DTOR_1=0x4c0 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETAUTHORIZATIONINFOPHASE1L_1=0x4f9 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETAUTHORIZATIONINFOPHASE2L_1=0x4fb +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOCANCEL_1=0x4e2 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOL_1=0x4c9 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOL_2=0x4ca +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOL_3=0x4cb +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCELLINFOL_4=0x4cc +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTACTIVEUSIMAPPLICATIONCANCEL_1=0x4fd +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTACTIVEUSIMAPPLICATIONL_1=0x4fc +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTNETWORKNOLOCATION_1=0x4d2 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTNETWORK_1=0x4c7 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETCURRENTNETWORK_2=0x4c8 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETHOMENETWORK_1=0x4c6 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKMODE_1=0x4ef +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKNAME_1=0x4ce +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKNAME_2=0x4cf +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKNAME_3=0x4d0 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKNAME_4=0x4d1 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSCANCEL_1=0x4e9 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSCANCEL_2=0x4ea +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_1=0x4e4 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_2=0x4e5 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_3=0x4e6 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_4=0x4e7 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKREGISTRATIONSTATUSL_5=0x4e8 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_GETNETWORKSECURITYLEVEL_1=0x4f0 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_HANDLECELLINFOUPDATE_1=0x4cd +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_ISNETWORKINFOCHANGED_1=0x4f3 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCELLINFOCHANGECANCEL_1=0x4e3 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCELLINFOCHANGEL_1=0x4df +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCELLINFOCHANGEL_2=0x4e0 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCELLINFOCHANGEL_3=0x4e1 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCURRENTNETWORKCHANGECANCEL_1=0x4d6 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCURRENTNETWORKCHANGEL_1=0x4d5 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCURRENTNETWORKNOLOCATIONCHANGECANCEL_1=0x4d4 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYCURRENTNETWORKNOLOCATIONCHANGEL_1=0x4d3 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYNETWORKSECURITYLEVELCHANGECANCEL_1=0x4f2 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_NOTIFYNETWORKSECURITYLEVELCHANGE_1=0x4f1 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_PROCESSGETAUTHORIZATIONINFOPHASE1L_1=0x4fa +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_READVARIANTOPTIONS_1=0x4f4 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_READVARIANTOPTIONS_2=0x4f5 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_READVARIANTOPTIONS_3=0x4f6 +[TRACE]TRACE_INTERNALS[0x88]_CMMNETTSY_READVARIANTOPTIONS_4=0x4f7 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETEALLPHASE1L_1=0x30c +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETEALL_1=0x30d +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETEALL_2=0x30e +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETEALL_3=0x30f +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEDELETE_1=0x30a +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEGETINFO_1=0x318 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEGETINFO_2=0x319 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEGETINFO_3=0x31a +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEGETINFO_4=0x31b +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETENOTIFYSTOREEVENT_1=0x31f +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEREADALLPHASE1L_1=0x327 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEREADALLPHASE1REQ_1=0x328 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEREAD_1=0x303 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEREAD_2=0x304 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETESTOREALL_1=0x333 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETEWRITE_1=0x307 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_COMPLETE_1=0x336 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_CONSTRUCTL_1=0x2fd +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DELETEALLCANCEL_1=0x310 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DELETEALLL_1=0x30b +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DELETEL_1=0x309 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DELETEONSTORELISTARRAYELEMENTS_1=0x329 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DOEXTFUNCL_1=0x301 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_DTOR_1=0x2fe +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_EXTFUNC_1=0x300 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOCANCEL_1=0x31d +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_1=0x311 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_2=0x312 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_3=0x313 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_4=0x314 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_5=0x315 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_6=0x316 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_GETINFOL_7=0x317 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALRETRIEVEONLISTREADENTRYL_1=0x326 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_1=0x322 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_2=0x323 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALRETRIEVEONLISTREADSIZEL_3=0x324 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_1=0x32e +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALSTOREALLGETSIZEL_2=0x32f +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_1=0x331 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_INTERNALSTOREALLWRITEENTRYL_2=0x332 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_MAKEINTERNALRETRIEVEONLISTREADREQL_1=0x325 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_MAKEINTERNALSTOREALLWRITEREQL_1=0x330 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_NOTIFYSTOREEVENTCANCEL_1=0x320 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_NOTIFYSTOREEVENT_1=0x31e +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_PHONEBOOKSTOREINITCOMPLETEL_1=0x337 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READALLCANCEL_1=0x32b +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READALLPHASE1L_1=0x321 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READALLPHASE2_1=0x32a +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READCANCEL_1=0x305 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_READL_1=0x302 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_REQCOMPLETED_1=0x335 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_REQMODEL_1=0x2ff +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_SETINFO_1=0x31c +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_STOREALLCANCEL_1=0x334 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_STOREALLL_1=0x32c +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_STOREALLL_2=0x32d +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_WRITECANCEL_1=0x308 +[TRACE]TRACE_INTERNALS[0x88]_CMMONSTORETSY_WRITEL_1=0x306 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_ACTIVATEL_1=0x253 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_ADDPACKETFILTERL_1=0x264 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATEPHASE2_1=0x256 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_1=0x254 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEACTIVATE_2=0x255 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDEACTIVATE_1=0x258 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEDELETE_1=0x25a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEGETDATAVOLUMETRANSFERRED_1=0x25d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT1_1=0x268 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETEINITIALISECONTEXT_1=0x252 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETENOTIFYCONFIGCHANGED_1=0x25f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_COMPLETESETCONFIG_1=0x262 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_DEACTIVATEL_1=0x257 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_DELETEL_1=0x259 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_DTOR_1=0x250 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIGURATIONDATA_1=0x263 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_GETCONFIG_1=0x25b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_GETDATAVOLUMETRANSFERREDL_1=0x25c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_GETDNSINFOETEL_1=0x267 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_INITIALISECONTEXTL_1=0x251 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_MODIFYACTIVECONTEXTL_1=0x266 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_NEWL_1=0x24f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_NOTIFYCONFIGCHANGED_1=0x25e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_REMOVEPACKETFILTER_1=0x265 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_1=0x260 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTGSMWCDMAEXT_SETCONFIGL_2=0x261 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_ADDOBJECT_1=0x166 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_ENUMERATECONTEXTSINNIF_1=0x16b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_ENUMERATENIFS_1=0x169 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_GETCONTEXTNAMEINNIF_1=0x16c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_GETNIFINFO_1=0x16a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_NEWL_1=0x165 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_REMOVEOBJECT_1=0x167 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTLIST_REMOVEOBJECT_2=0x168 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_ACTIVATEL_1=0x17d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_ADDPACKETFILTERL_1=0x199 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_CANCELSERVICE_1=0x173 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEACTIVATE_1=0x17e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEDEACTIVATE_1=0x180 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEDELETE_1=0x182 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEGETDATAVOLUMETRANSFERRED_1=0x186 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEINITIALISECONTEXT_1=0x17c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETEMODIFYACTIVECONTEXT_1=0x19c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONFIGCHANGED_1=0x18b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONINFOCHANGE_1=0x19f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONSPEEDCHANGE_1=0x18d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x18f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_COMPLETESETCONFIG_1=0x191 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_CONTEXTRESUMED_1=0x195 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_CONTEXTSUSPENDED_1=0x194 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DEACTIVATEL_1=0x17f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DELETEL_1=0x181 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DEREGISTERNOTIFICATION_1=0x175 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DOEXTFUNCL_1=0x170 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_DTOR_1=0x16e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_EXTFUNC_1=0x16f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_FILLCONNECTIONINFO_1=0x1a0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETCONFIG_1=0x183 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETCONNECTIONINFO_1=0x19d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETCONNECTIONSPEED_1=0x184 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETDATAVOLUMETRANSFERREDL_1=0x185 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETLASTERRORCAUSE_1=0x187 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETPROFILENAME_1=0x188 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_GETSTATUS_1=0x189 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_INITIALISECONTEXTL_1=0x17b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_MODIFYACTIVECONTEXTL_1=0x19b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NEWL_1=0x16d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NOTIFYCONFIGCHANGED_1=0x18a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONINFOCHANGE_1=0x19e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONSPEEDCHANGE_1=0x18c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NOTIFYSTATUSCHANGE_1=0x18e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_NUMBEROFSLOTSL_1=0x172 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_1=0x179 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_2=0x17a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_1=0x176 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_2=0x177 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_3=0x178 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REGISTERNOTIFICATION_1=0x174 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REMOVEPACKETFILTER1_1=0x269 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REMOVEPACKETFILTER_1=0x19a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REMOVEQOS_1=0x196 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REQCOMPLETED_1=0x197 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_REQMODEL_1=0x171 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_RESETDIALUPCONTEXT_1=0x198 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_SETCONFIGL_1=0x190 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_SETDATAVOLUME_1=0x192 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETCONTEXTTSY_SETLASTERRORCAUSE_1=0x193 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_1=0x273 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_2=0x274 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_3=0x275 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_4=0x276 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_5=0x277 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETENOTIFYPROFILECHANGED_6=0x278 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_COMPLETESETPROFILEPARAMETERS_1=0x272 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_DTOR_1=0x26b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_GETPROFILECAPABILITIES_1=0x26c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_GETPROFILEPARAMETERS_1=0x26d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_GETPROFILEPARAMETERS_2=0x26e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_NEWL_1=0x26a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_NOTIFYPROFILECHANGEDCANCEL_1=0x26f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_SETPROFILEPARAMETERSL_1=0x270 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSGSMWCDMAEXT_SETPROFILEPARAMETERSL_2=0x271 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_CANCELSERVICE_1=0x1a7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_COMPLETENOTIFYPROFILECHANGED_1=0x1af +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_COMPLETESETPROFILEPARAMETERS_1=0x1b1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_DEREGISTERNOTIFICATION_1=0x1a9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_DOEXTFUNCL_1=0x1a4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_DTOR_1=0x1a2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_EXTFUNC_1=0x1a3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_GETPROFILECAPABILITIES_1=0x1ac +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_GETPROFILEPARAMETERS_1=0x1ad +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_NEWL_1=0x1a1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_NOTIFYPROFILECHANGED_1=0x1ae +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_NUMBEROFSLOTSL_1=0x1a6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_OPENNEWOBJECTBYNAMEL_1=0x1ab +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_OPENNEWOBJECTL_1=0x1aa +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_REGISTERNOTIFICATION_1=0x1a8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_REQCOMPLETED_1=0x1b2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_REQMODEL_1=0x1a5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETQOSTSY_SETPROFILEPARAMETERSL_1=0x1b0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_ATTACHL_1=0x27b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEATTACH_1=0x27c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEDETACHL_1=0x27e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEDYNAMICCAPSCHANGE_1=0x289 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETATTACHMODE_1=0x284 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETNTWKREGSTATUS_1=0x280 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETEGETSTATICCAPS_1=0x28f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETESETATTACHMODE_1=0x282 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETESETPREFERREDBEARER_1=0x286 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETETRANSFERCAPSCHANGE_1=0x28d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_COMPLETETRANSFERCAPSCHANGE_2=0x28e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_DETACHL_1=0x27d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_DTOR_1=0x27a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_EGPRSSUPPORTINCELL_1=0x28b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_GETATTACHMODEL_1=0x283 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_GETDYNAMICCAPS_1=0x287 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_GETNTWKREGSTATUSL_1=0x27f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_GETSTATICCAPS_1=0x28a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_NEWL_1=0x279 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_SETATTACHMODEL_1=0x281 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_SETDYNAMICCAPSFLAG_1=0x288 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_SETEDGEGPRSSUPPORT_1=0x28c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICEGSMWCDMAEXT_SETPREFERREDBEARERL_1=0x285 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ATTACHL_1=0x1c1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_CANCELSERVICE_1=0x1ef +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_CANCELSETALWAYSON_1=0x220 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEATTACH_1=0x1c2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEDETACHL_1=0x1c4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEENUMERATEMBMSACTIVESERVICELIST_1=0x224 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEGETATTACHMODE_1=0x1c7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEGETMBMSNETWORKSERVICESTATUS_1=0x1f3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEGETNTWKREGSTATUS_1=0x1cc +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENETWORKMODECHANGE_1=0x217 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS1_1=0x1d2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS_1=0x1d1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTACTIVATIONREQUESTED_1=0x1d4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_1=0x1d6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_2=0x1d7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_3=0x1d8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_4=0x1d9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_5=0x1da +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_6=0x1db +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYDYNAMICCAPSCHANGE_1=0x1dd +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYEGPRSINFOCHANGE_1=0x216 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1=0x1f5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_1=0x1df +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_2=0x1e0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_1=0x1e2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_2=0x1e3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_1=0x1ba +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_2=0x1bb +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_3=0x1bc +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_4=0x1bd +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_5=0x1be +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEREJECTACTIVATIONREQUEST_1=0x1e5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETALWAYSON_1=0x21e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETALWAYSON_2=0x21f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETATTACHMODE_1=0x1e7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETDEFAULTCONTEXTPARAMS_1=0x213 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_1=0x1e9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_2=0x1ea +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETEUPDATEMBMSMONITORSERVICELIST_1=0x1f8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETE_1=0x20b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_COMPLETE_2=0x20c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_CONTEXTSTATUSCHANGED_1=0x1bf +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DEREGISTERNOTIFICATION_1=0x1f1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DETACHL_1=0x1c3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DOEXTFUNCL_1=0x1ec +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DTOR_1=0x1b5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DTOR_2=0x1b6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DTOR_3=0x1b7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_DTOR_4=0x1b8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATECONTEXTSINNIF_1=0x210 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATECONTEXTS_1=0x1c5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_1=0x221 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_2=0x222 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICES_1=0x223 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATEMONITORSERVICELIST_1=0x1f7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ENUMERATENIFS_1=0x20e +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_EXTFUNC_1=0x1eb +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETATTACHMODEL_1=0x1c6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETCONTEXTINFO_1=0x1c8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETCONTEXTNAMEINNIF_1=0x211 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETDEFAULTCONTEXTPARAMS_1=0x214 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETDYNAMICCAPS_1=0x1c9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESCANCEL_1=0x1fe +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE1L_1=0x1fa +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE2_1=0x1fd +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMBMSNETWORKSERVICESTATUS_1=0x1f2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETMSCLASS_1=0x1ca +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETNIFINFO_1=0x20f +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETNTWKREGSTATUSL_1=0x1cb +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETPREFERREDBEARER_1=0x1cd +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_1=0x1fb +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_2=0x1fc +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETSTATICCAPS_1=0x1ce +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GETSTATUS_1=0x1cf +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_1=0x218 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_2=0x219 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_3=0x21a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_4=0x21b +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_ISACTIVATIONALLOWED_1=0x215 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NEWL_1=0x1b3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NEWL_2=0x1b4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYCHANGEOFNTWKREGSTATUS_1=0x1d0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYCONTEXTACTIVATIONREQUESTED_1=0x1d3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYCONTEXTADDED_1=0x1d5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYDYNAMICCAPSCHANGE_1=0x1dc +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1=0x1f4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYMBMSSERVICEAVAILABILITYCHANGE_1=0x1f6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYMSCLASSCHANGE_1=0x1de +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NOTIFYSTATUSCHANGE_1=0x1e1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_NUMBEROFSLOTSL_1=0x1ee +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_1=0x206 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_2=0x207 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_3=0x208 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_4=0x209 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_5=0x20a +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_1=0x1ff +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_2=0x200 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_3=0x201 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_4=0x202 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_5=0x203 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_6=0x204 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_OPENNEWOBJECTL_7=0x205 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_PREFERREDBEARERCHANGED_1=0x1c0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_REGISTERNOTIFICATION_1=0x1f0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_REJECTACTIVATIONREQUESTL_1=0x1e4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_REQCOMPLETED_1=0x20d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_REQMODEL_1=0x1ed +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETALWAYSONL_1=0x21c +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETALWAYSONL_2=0x21d +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETATTACHMODEL_1=0x1e6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETDEFAULTCONTEXTPARAMSL_1=0x212 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_SETPREFERREDBEARERL_1=0x1e8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_UPDATEATTACHEDPACKETSTATUS_1=0x1b9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETSERVICETSY_UPDATEMBMSMONITORSERVICELISTCANCEL_1=0x1f9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_CANCELSERVICE_1=0xba +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_CANCELSETALWAYSON_1=0xc6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_1=0xc0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_2=0xc1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_COMPLETENOTIFYEGPRSINFOCHANGE_3=0xc2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_COMPLETESETALWAYSON_1=0xc5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_DOEXTFUNCL_1=0xb8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_DOEXTFUNCL_2=0xb9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_DTOR_1=0xb7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_GETEGPRSINFO_1=0xbd +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_GETEGPRSINFO_2=0xbe +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_GETEGPRSINFO_3=0xbf +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_NEWL_1=0xb6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_NOTIFYEGPRSINFOCHANGE_1=0xbc +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_REQCOMPLETED_1=0xbb +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_SETALWAYSONL_1=0xc3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPACKETTSY_SETALWAYSONL_2=0xc4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_1=0x3d4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_2=0x3d5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_3=0x3d6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_4=0x3d7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_5=0x3d8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL1_6=0x3d9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_1=0x360 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_2=0x361 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_3=0x362 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_4=0x363 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_5=0x364 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CACHEENTRIESL_6=0x365 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CANCELSERVICE_1=0x345 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CANCELSERVICE_2=0x346 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_1=0x366 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_2=0x367 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_3=0x368 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_4=0x369 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_5=0x36a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_6=0x36b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_7=0x36c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_8=0x36d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_9=0x36e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETECOUNTENTRIES_1=0x35f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_1=0x3a1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_2=0x3a2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_3=0x3a3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_4=0x3a4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_1=0x39b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_2=0x39c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_3=0x39d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_4=0x39e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEGETINFO_1=0x3bc +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_1=0x3c1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_2=0x3c2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_3=0x3c3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_1=0x34a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_2=0x34b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_3=0x34c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEREADL_1=0x35c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEREADL_2=0x35d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_1=0x38d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_2=0x38e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_3=0x38f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_4=0x390 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_5=0x391 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_1=0x338 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_2=0x339 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_3=0x33a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_4=0x33b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONSTRUCTL_5=0x33c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_CONTINUEREADL_1=0x3ca +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_COUNTENTRIESL_1=0x35e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DELETEALLL_1=0x39f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DELETEALLL_2=0x3a0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DELETEL_1=0x399 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DELETEL_2=0x39a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DOEXTFUNCL_1=0x348 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_1=0x33e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_2=0x33f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_3=0x340 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_4=0x341 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_5=0x342 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_DTOR_6=0x343 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_EXTFUNC_1=0x347 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_1=0x380 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_2=0x381 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_3=0x382 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_4=0x383 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_5=0x384 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_6=0x385 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_7=0x386 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_8=0x387 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_9=0x388 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOCANCEL_1=0x3be +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_1=0x3a5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_10=0x3ae +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_11=0x3af +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_12=0x3b0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_13=0x3b1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_14=0x3b2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_15=0x3b3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_16=0x3b4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_17=0x3b5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_18=0x3b6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_19=0x3b7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_2=0x3a6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_20=0x3b8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_21=0x3b9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_22=0x3ba +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_23=0x3bb +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_3=0x3a7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_4=0x3a8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_5=0x3a9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_6=0x3aa +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_7=0x3ab +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_8=0x3ac +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETINFOL_9=0x3ad +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_GETPHONEBOOKTYPE_1=0x3cd +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_ISPBINITDONE_1=0x3cb +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_ISPBINITDONE_2=0x3cc +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_NEWL_1=0x33d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENTCANCEL_1=0x3c0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENT_1=0x3bf +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READCANCEL_1=0x389 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_1=0x36f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_2=0x370 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_3=0x371 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_1=0x34e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_10=0x357 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_11=0x358 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_12=0x359 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_13=0x35a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_14=0x35b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_2=0x34f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_3=0x350 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_4=0x351 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_5=0x352 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_6=0x353 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_7=0x354 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_8=0x355 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READL_9=0x356 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_READTOCACHEL_1=0x372 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_REQCOMPLETED_1=0x3c8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_REQMODEL_1=0x344 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_RESETCACHEREADY_1=0x3c6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_RESETCACHEREADY_2=0x3c7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_RESETCACHE_1=0x3c5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_RESETVARIABLES_1=0x3c4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_1=0x392 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_2=0x393 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_3=0x394 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_4=0x395 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_5=0x396 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_6=0x397 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_7=0x398 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SETINFO_1=0x3bd +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SETMAXNAMEANDNUMLENGHT_1=0x34d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SETPHONEBOOKTYPE_1=0x349 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SETTYPEOFRESPONSE_1=0x3c9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_1=0x3ce +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_2=0x3cf +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_3=0x3d0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_4=0x3d1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_5=0x3d2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_SIMISREADY_6=0x3d3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_1=0x373 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_10=0x37c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_11=0x37d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_12=0x37e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_13=0x37f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_2=0x374 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_3=0x375 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_4=0x376 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_5=0x377 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_6=0x378 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_7=0x379 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_8=0x37a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_UPDATECACHEL_9=0x37b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_WRITEL_1=0x38a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_WRITEL_2=0x38b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEBOOKSTORETSY_WRITEL_3=0x38c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_COMPLETEGETHOMENETWORK_1=0x164 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_COMPLETENOTIFYNETWORKREGISTRATIONSTATUSCHANGE_1=0x15d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_DELIVERCODE_1=0x162 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCELLINFOL_1=0x15b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV1_1=0x154 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV2_1=0x155 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATIONV5_1=0x156 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKNOLOCATION_1=0x157 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV1_1=0x150 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV2_1=0x151 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORKV5_1=0x152 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETCURRENTNETWORK_1=0x153 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV1_1=0x15e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV2_1=0x15f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETHOMENETWORKV5_1=0x160 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETHOMENETWORK_1=0x161 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETNETWORKCAPS_1=0x14f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_GETNITZINFO_1=0x159 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_INITSIML_1=0x14e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_NOTIFYCELLINFOCHANGEL_1=0x15c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_RECEIVEDNITZINFO_1=0x15a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_SETCURRENTNETWORK_1=0x158 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEGSMWCDMAEXT_SETLOCKSETTINGL_1=0x163 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_APPENDAPNNAMECANCEL_1=0x5b7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_APPENDAPNNAMEL_1=0x5b6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_1=0x579 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_10=0x582 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_11=0x583 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_2=0x57a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_3=0x57b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_4=0x57c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_5=0x57d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_6=0x57e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_7=0x57f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_8=0x580 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHENEXTL_9=0x581 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CACHESERVICETABLESL_1=0x557 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CANCELSERVICE_1=0x513 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEAPPENDAPNNAME_1=0x5b8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_1=0x558 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_10=0x561 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_11=0x562 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_12=0x563 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_2=0x559 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_3=0x55a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_4=0x55b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_5=0x55c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_6=0x55d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_7=0x55e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_8=0x55f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESERVICETABLESL_9=0x560 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESIML_1=0x584 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETECACHESIML_2=0x585 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEDELETEAPNNAME_1=0x5bb +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEENUMERATEAPNENTRIES_1=0x5a4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETALSLINE_1=0x546 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETAPNCONTROLLISTSERVICESTATUS_1=0x5c4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETAPNNAME_1=0x5a7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETCALLFORWARDINGNUMBER_1=0x5a1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETCUSTOMERSERVICEPROFILE_1=0x51d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETCUSTOMERSERVICEPROFILE_2=0x51e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETFDNSTATUS_1=0x54a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETMAILBOXNUMBERS_1=0x58d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_1=0x5d4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_2=0x5d5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_3=0x5d6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_4=0x5d7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID1_5=0x5d8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETPHONEID_1=0x535 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_1=0x52b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_2=0x52c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_3=0x52d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_4=0x52e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICEPROVIDERNAME_5=0x52f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_1=0x564 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_10=0x56d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_11=0x56e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_12=0x56f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_13=0x570 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_14=0x571 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_2=0x565 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_3=0x566 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_4=0x567 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_5=0x568 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_6=0x569 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_7=0x56a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_8=0x56b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSERVICETABLEL_9=0x56c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_1=0x53e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_2=0x53f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_3=0x540 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_4=0x541 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_5=0x542 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_6=0x543 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEGETSUBSCRIBERIDL_7=0x544 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEIMSAUTHENTICATION_1=0x588 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYAPNCONTROLLISTSERVICESTATUSCHANGE_1=0x5c7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYAPNLISTCHANGED_1=0x5be +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYBATTERYINFOCHANGE_1=0x524 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYBATTERYINFOCHANGE_2=0x525 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYCALLDURATIONCHANGE_1=0x5c8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYICCACCESSCAPSCHANGE_1=0x54f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYICCACCESSCAPSCHANGE_2=0x550 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_1=0x50a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_2=0x50b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYINDICATORCHANGE_3=0x50c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYMODEMSTATUSREADY_1=0x504 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_1=0x505 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_2=0x506 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_3=0x507 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETENOTIFYSIMSTATUSREADYL_4=0x508 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESETALSLINE_1=0x548 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESETAPNCONTROLLISTSERVICESTATUS_1=0x5c1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESETFDNSETTINGL_1=0x54c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESIMREFRESHNOWL_1=0x578 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETESIMREFRESHREGISTER_1=0x575 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETEUPDATELIFETIMER_1=0x577 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETE_1=0x59d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_COMPLETE_2=0x59e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CONSTRUCTL_1=0x4ff +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CONSTRUCTL_2=0x500 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_CONSTRUCTL_3=0x501 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DELETEAPNNAMECANCEL_1=0x5ba +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DELETEAPNNAMEL_1=0x5b9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DOEXTFUNCL_1=0x511 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DOGETPHONEIDL_1=0x533 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DOGETPHONEIDL_2=0x534 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DTOR_1=0x502 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_DTOR_2=0x503 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ENUMERATEAPNENTRIESCANCEL_1=0x5a3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ENUMERATEAPNENTRIESL_1=0x5a2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_EXTFUNC_1=0x50f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_EXTFUNC_2=0x510 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETALSLINEL_1=0x545 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETAPNCONTROLLISTSERVICESTATUSCANCEL_1=0x5c3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETAPNCONTROLLISTSERVICESTATUSL_1=0x5c2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETAPNNAMECANCEL_1=0x5a6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETAPNNAMEL_1=0x5a5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETBATTERYINFOL_1=0x522 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCFISCENREP_1=0x5b1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCFISPRCENREP_1=0x5b3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_1=0x51f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_2=0x520 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILECANCEL_3=0x521 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILEL_1=0x51b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETCUSTOMERSERVICEPROFILEL_2=0x51c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETFDNSTATUSCANCEL_1=0x54b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETFDNSTATUSL_1=0x549 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETICCACCESSCAPS_1=0x54d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETICCACCESSCAPS_2=0x54e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORCAPS_1=0x538 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORSTATE_1=0x53a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORSTATE_2=0x53b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORSTATE_3=0x53c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORSTATE_4=0x53d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETINDICATORS_1=0x539 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMAILBOXNUMBERSCANCEL_1=0x58e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMAILBOXNUMBERSL_1=0x58a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMAILBOXNUMBERSL_2=0x58b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMAILBOXNUMBERSL_3=0x58c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETMWISCENREP_1=0x5b2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETPHONESTOREINFOL_1=0x518 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETPHONESTOREINFOL_2=0x519 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETPHONESTOREINFOL_3=0x51a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_1=0x530 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_2=0x531 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMECANCEL_3=0x532 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMEL_1=0x527 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMEL_2=0x528 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMEL_3=0x529 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICEPROVIDERNAMEL_4=0x52a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLECANCEL_1=0x572 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLECHECKPARAMETERSL_1=0x551 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_1=0x552 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_2=0x553 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_3=0x554 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_4=0x555 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSERVICETABLEL_5=0x556 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSIMREFRESHREGISTER_1=0x576 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSUBSCRIBERIDFORTSYL_1=0x5b4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSUBSCRIBERIDFORTSYL_2=0x5b5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_GETSUBSCRIBERIDL_1=0x537 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_IMSAUTHENTICATIONCANCEL_1=0x589 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_IMSAUTHENTICATIONL_1=0x587 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ISMODEMSTATUSREADY_1=0x5d2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ISPBINITACTIVE_1=0x5cc +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ISREQUESTPOSSIBLEINOFFLINE_1=0x5a0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_ISSIMREADY_1=0x5cd +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_1=0x5a9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_2=0x5aa +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_3=0x5ab +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_4=0x5ac +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_5=0x5ad +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MAPMEALSLINE_6=0x5ae +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_MOBILEPHONEGETPHONEIDCANCEL_1=0x536 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYAPNCONTROLLISTSERVICESTATUSCHANGECANCEL_1=0x5c6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYAPNCONTROLLISTSERVICESTATUSCHANGE_1=0x5c5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYAPNLISTCHANGEDCANCEL_1=0x5bd +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYAPNLISTCHANGED_1=0x5bc +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYBATTERYINFOCHANGECANCEL_1=0x526 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYBATTERYINFOCHANGE_1=0x523 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYINDICATORCHANGECANCEL_1=0x50d +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYINDICATORCHANGE_1=0x509 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYSIMREFRESHCOMPLETIONL_1=0x586 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_NOTIFYTELEPHONYAUDIOCONTROLERROR_1=0x5c9 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_OPENNEWOBJECTBYNAMEL_1=0x50e +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_PHONEBOOKSTOREINITCOMPLETEL_1=0x5d3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_REQCOMPLETED_1=0x59f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_REQMODEL_1=0x512 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_RESETMEALSINFO_1=0x5af +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_RESETMEALSINFO_2=0x5b0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SAVEFDNINFODETAILS_1=0x5ce +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SAVEFDNINFODETAILS_2=0x5cf +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SAVEFDNINFODETAILS_3=0x5d0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SAVEFDNINFODETAILS_4=0x5d1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETALSLINEL_1=0x547 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETALSSTATE_1=0x5a8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETAPNCONTROLLISTSERVICESTATUSCANCEL_1=0x5c0 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETAPNCONTROLLISTSERVICESTATUSL_1=0x5bf +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETPBINITACTIVESTATUS_1=0x5ca +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SETPBINITACTIVESTATUS_2=0x5cb +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SIMREFRESHREGISTERL_1=0x573 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_SIMREFRESHREGISTERL_2=0x574 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TERMINATEACTIVECALLSL_1=0x516 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TERMINATEACTIVECALLSL_2=0x517 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TERMINATEALLCALLSL_1=0x514 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TERMINATEALLCALLSL_2=0x515 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_1=0x58f +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_10=0x598 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_11=0x599 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_12=0x59a +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_13=0x59b +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_14=0x59c +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_2=0x590 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_3=0x591 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_4=0x592 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_5=0x593 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_6=0x594 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_7=0x595 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_8=0x596 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONETSY_TIMEREXPIRED_9=0x597 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEABORTSECURITYCODE_1=0x5f2 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETECHANGESECURITYCODE_1=0x5e4 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEGETLOCKINFO_1=0x5f3 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEGETSECURITYCODEINFO_1=0x5f5 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETENOTIFYSECURITYCODEINFOCHANGE_1=0x5f8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_1=0x5e7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_2=0x5e8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETENOTIFYSECURITYEVENTL_3=0x5e9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETESETLOCKSETTING_1=0x5e3 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_1=0x5fe +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_2=0x5ff +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_3=0x600 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL1_4=0x601 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_1=0x5ee +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_2=0x5ef +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_3=0x5f0 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_COMPLETEVERIFYSECURITYCODEL_4=0x5f1 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_CONSTRUCTL_1=0x5da +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_DOEXTFUNCL_1=0x5dc +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_DTOR_1=0x5db +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_GETLOCKINFOL_1=0x5dd +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_GETSECURITYCODEINFOCANCEL_1=0x5f6 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_GETSECURITYCODEINFOL_1=0x5f4 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_LOCKSETTINGL_1=0x5e1 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_LOCKSETTINGL_2=0x5e2 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NEWL_1=0x5d9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYLOCKINFOCHANGECANCEL_1=0x5df +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYLOCKINFOCHANGE_1=0x5de +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYSECURITYCODEINFOCHANGECANCEL_1=0x5f9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYSECURITYCODEINFOCHANGE_1=0x5f7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYSECURITYEVENTL_1=0x5e5 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_NOTIFYSECURITYEVENTL_2=0x5e6 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_SETLOCKSETTINGL_1=0x5e0 +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL1_1=0x5fa +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL1_2=0x5fb +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL1_3=0x5fc +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL1_4=0x5fd +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL_1=0x5ea +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL_2=0x5eb +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL_3=0x5ec +[TRACE]TRACE_INTERNALS[0x88]_CMMSECURITYTSY_VERIFYSECURITYCODEL_4=0x5ed +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMLOCKTSY_COMPLETE_1=0xfa +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_1=0xce +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_2=0xcf +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_3=0xd0 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEDELETESIMCBTOPIC_1=0xf8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_1=0xdc +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_2=0xdd +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_3=0xde +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_4=0xdf +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_5=0xe0 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_6=0xe1 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_7=0xe2 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_1=0xd1 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_2=0xd2 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_3=0xd3 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_4=0xd4 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_5=0xd5 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_6=0xd6 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_7=0xd7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_8=0xd8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_9=0xd9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETESTARTSIMCBTOPICBROWSING_1=0xf5 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONECACHERESP_1=0xec +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONEUHZIUESETTINGSRESP_1=0xed +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_COMPLETE_1=0xf9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CONSTRUCTL_1=0xc7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CONSTRUCTL_2=0xc8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_CONSTRUCTL_3=0xc9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_DELETESIMCBTOPICL_1=0xf7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_DOEXTFUNCL_1=0xcc +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_DTOR_1=0xcb +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_GETNEXTSIMCBTOPIC_1=0xf6 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_NEWL_1=0xca +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_1=0xe7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_2=0xe8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_3=0xe9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_4=0xea +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_1=0xe3 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_2=0xe4 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_3=0xe5 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_4=0xe6 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONECACHEL_1=0xdb +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONEPARAMSCANCEL_1=0xda +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_READVIAGHOMEZONEPARAMSL_1=0xcd +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTDYNAMICCACHINGL_1=0xee +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTDYNAMICCACHINGL_2=0xef +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTDYNAMICCACHINGL_3=0xf0 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTDYNAMICCACHINGL_4=0xf1 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_STARTSIMCBTOPICBROWSINGL_1=0xf4 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_WRITEVIAGHOMEZONECACHEL_1=0xeb +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSCANCEL_1=0xf3 +[TRACE]TRACE_INTERNALS[0x88]_CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSL_1=0xf2 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSGSMEXT_COMPLETEREADALLSMSPHASE1L_1=0x2af +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_1=0x2ac +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_2=0x2ad +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSGSMEXT_COMPLETERECEIVEMESSAGE_3=0x2ae +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEDELETEALLSMS_1=0x2b7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEDELETESMS_1=0x2b6 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_1=0x2b8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_2=0x2b9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_3=0x2ba +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_4=0x2bb +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETENOTIFYSTOREEVENT_5=0x2bc +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEREADALLSMSPHASE1_1=0x2c4 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEREADALLSMSPHASE1_2=0x2c5 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEREADSMS_1=0x2b3 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_COMPLETEWRITESMS_1=0x2b5 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_CONSTRUCTL_1=0x2b0 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_DTOR_1=0x2b1 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_INIT_1=0x2b2 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSCANCEL_1=0x2c2 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE1L_1=0x2bd +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE1L_2=0x2be +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE1L_3=0x2bf +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE1L_4=0x2c0 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_READALLSMSPHASE2_1=0x2c1 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_RETRIEVESMSLISTREADSMSL_1=0x2c3 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSSTORAGETSY_WRITESMSL_1=0x2b4 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_ACKSMSSTOREDL_1=0x2d6 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_ACKSMSSTOREDL_2=0x2d7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_ACKSMSSTOREDL_3=0x2d8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEACTIVATESMSROUTING_1=0x2cd +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEACTIVATESMSROUTING_2=0x2ce +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEACTIVATESMSROUTING_3=0x2cf +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_1=0x2e3 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_2=0x2e4 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETEREADALLSMSPPHASE1_3=0x2e5 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_1=0x2d0 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_2=0x2d1 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_3=0x2d2 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_4=0x2d3 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETERECEIVEMESSAGE_5=0x2d4 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETESENDMESSAGENOFDNCHECK_1=0x2e8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETESENDMESSAGE_1=0x2e0 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_COMPLETESENDSATMESSAGE_1=0x2e1 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_CONSTRUCTL_1=0x2c7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_CONSTRUCTL_2=0x2c8 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_CTOR_1=0x2c6 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_DELIVERCLASS2TOSMSSTACK_1=0x2d5 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_DTOR_1=0x2c9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_EXTFUNC_1=0x2ca +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_EXTFUNC_2=0x2cb +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_ISRPERROR_1=0x2df +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_NACKSMSSTOREDL_1=0x2d9 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_NACKSMSSTOREDL_2=0x2da +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_READSMSPLISTPHASE1L_1=0x2e2 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_RECEIVEMESSAGEL_1=0x2cc +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_RESENDSMS_1=0x2e6 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_RESUMESMSRECEPTIONL_1=0x2db +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_SENDMESSAGEL_1=0x2de +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_SENDMESSAGENOFDNCHECKCANCEL_1=0x2e7 +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_SETMOSMSBEARER_1=0x2dd +[TRACE]TRACE_INTERNALS[0x88]_CMMSMSTSY_SETOFFLINE_1=0x2dc +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETCALLBARRINGSTATUSPHASE1L_1=0x604 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETCALLFORWARDINGSTATUSPHASE1L_1=0x602 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETCALLWAITINGSTATUSPHASE1L_1=0x60a +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_1=0x611 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_2=0x612 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_3=0x613 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETEGETICCMESSAGEWAITINGINDICATORS_4=0x614 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETENOTIFYALLSENDNETWORKSERVICEREQUEST_1=0x633 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETENOTIFYICCMESSAGEWAITINGINDICATORCHANGE_1=0x620 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETENOTIFYICCMESSAGEWAITINGINDICATORCHANGE_2=0x621 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETESENDNETWORKSERVICEREQUESTIND_1=0x630 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_1=0x61b +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_2=0x61c +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_COMPLETESETICCMESSAGEWAITINGINDICATORS_3=0x61d +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_1=0x615 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_2=0x616 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSCANCEL_3=0x617 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_1=0x60d +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_2=0x60e +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_3=0x60f +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_GETICCMESSAGEWAITINGINDICATORSL_4=0x610 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_ISMWISINFOCHANGED_1=0x62d +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYALLSENDNETWORKSERVICEREQUESTCANCEL_1=0x634 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYALLSENDNETWORKSERVICEREQUEST_1=0x632 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYICCMESSAGEWAITINGINDICATORCHANGECANCEL_1=0x622 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYICCMESSAGEWAITINGINDICATORSCHANGE_1=0x61f +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUESTCANCEL_1=0x631 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUEST_1=0x62e +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_NOTIFYSENDNETWORKSERVICEREQUEST_2=0x62f +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_READICCMESSAGEWAITINGINDICATORSFROMCENTREP_1=0x624 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SENDNETWORKSERVICEREQUESTL_1=0x60c +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETCALLBARRINGSTATUSCANCEL_1=0x605 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETCALLFORWARDINGSTATUSCANCEL_1=0x603 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETCALLWAITINGSTATUSCANCEL_1=0x60b +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSCANCEL_1=0x61e +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_1=0x618 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_2=0x619 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMESSAGEWAITINGINDICATORSL_3=0x61a +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCMWISBOOTUPFLAG_1=0x635 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETICCSUPPORTFORMWIS_1=0x623 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETSSPASSWORDCANCEL_1=0x609 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETSSPASSWORDL_1=0x606 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETSSPASSWORDL_2=0x607 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_SETSSPASSWORDL_3=0x608 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_1=0x625 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_2=0x626 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_3=0x627 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_4=0x628 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_5=0x629 +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_6=0x62a +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_7=0x62b +[TRACE]TRACE_INTERNALS[0x88]_CMMSUPPLSERVTSY_WRITEICCMESSAGEWAITINGINDICATORSTOCENTREP_8=0x62c +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_GETTSYREQHANDLE_1=0x687 +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_NEWL1_1=0x685 +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_NEWL1_2=0x686 +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_NEWL_1=0x683 +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_NEWL_2=0x684 +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_POSTPONETIMEOUT_1=0x68d +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_RESETTSYREQHANDLE_1=0x68b +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_RESETTSYREQHANDLE_2=0x68c +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_SETTSYREQHANDLE1_1=0x689 +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_SETTSYREQHANDLE1_2=0x68a +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_SETTSYREQHANDLE_1=0x688 +[TRACE]TRACE_INTERNALS[0x88]_CMMTSYREQHANDLESTORE_STOPTIMEOUT_1=0x68e +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETENOTIFYNETWORKRELEASE_1=0x2f8 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETERECEIVEMESSAGE_1=0x2ee +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETESENDMESSAGENOFDNCHECK_1=0x2fb +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETESENDMESSAGE_1=0x2f1 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_COMPLETESENDRELEASE_1=0x2f4 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_CONSTRUCTL_1=0x2e9 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_DEREGISTERNOTIFICATION_1=0x2ed +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_DTOR_1=0x2ea +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_EXTFUNC_1=0x2eb +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_NOTIFYNETWORKRELEASE_1=0x2f5 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_NOTIFYNETWORKRELEASE_2=0x2f6 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_NOTIFYNETWORKRELEASE_3=0x2f7 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_REGISTERNOTIFICATION_1=0x2ec +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_REQCOMPLETED_1=0x2f9 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDMESSAGEL_1=0x2ef +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDMESSAGEL_2=0x2f0 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDMESSAGENOFDNCHECKCANCEL_1=0x2fa +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDRELEASEL_1=0x2f2 +[TRACE]TRACE_INTERNALS[0x88]_CMMUSSDTSY_SENDRELEASEL_2=0x2f3 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_ANSWERINCOMINGCALL_1=0x65d +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_CANCELSERVICE_1=0x63a +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_1=0x66c +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_2=0x66d +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETE3RDPARTYCALLNBRCHECK_3=0x66e +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETEDIALEMERGENCYCALL_1=0x662 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETEDIALEMERGENCYCALL_2=0x663 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETEHANGUP_1=0x65f +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETEHANGUP_2=0x660 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_1=0x63b +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_10=0x644 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_11=0x645 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_12=0x646 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_13=0x647 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_14=0x648 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_15=0x649 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_16=0x64a +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_17=0x64b +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_18=0x64c +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_19=0x64d +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_2=0x63c +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_20=0x64e +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_21=0x64f +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_22=0x650 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_3=0x63d +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_4=0x63e +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_5=0x63f +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_6=0x640 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_7=0x641 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_8=0x642 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETENOTIFYSTATUSCHANGE_9=0x643 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_COMPLETESWAP_1=0x66b +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALEMERGENCYCALL_1=0x661 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_1=0x66f +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_2=0x670 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_3=0x671 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_4=0x672 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIALNOFDNCHECK_5=0x673 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_1=0x651 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_10=0x65a +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_11=0x65b +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_12=0x65c +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_2=0x652 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_3=0x653 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_4=0x654 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_5=0x655 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_6=0x656 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_7=0x657 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_8=0x658 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DIAL_9=0x659 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DOEXTFUNCL_1=0x638 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_DTOR_1=0x637 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_1=0x664 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_2=0x665 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_3=0x666 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_4=0x667 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_5=0x668 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_6=0x669 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_FILLMOBILECALLINFO_7=0x66a +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_HANGUP_1=0x65e +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_NEWL_1=0x636 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_REQMODEL_1=0x639 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_UPDATECALLROUTINGCONTROL_1=0x674 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICECALLTSY_UPDATECALLROUTINGCONTROL_2=0x675 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_1=0x67a +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_2=0x67b +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_3=0x67c +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_4=0x67d +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYDIALLINGSTATUS_5=0x67e +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_COMPLETENOTIFYINCOMINGCALL_1=0x679 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_CONSTRUCTL_1=0x676 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_DTOR_1=0x678 +[TRACE]TRACE_INTERNALS[0x88]_CMMVOICELINETSY_NEWL_1=0x677 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETEGETATR_1=0xfe +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETEGETSIMCARDREADERSTATUS_1=0x106 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETENOTIFYSIMCARDSTATUS_1=0x109 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETEPOWERSIMOFF_1=0x115 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETEPOWERSIMON_1=0x111 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETESENDAPDUREQV2_1=0x10d +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETESIMWARMRESET_1=0x102 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_COMPLETE_1=0xfb +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETATRCANCEL_1=0xff +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETATRL_1=0xfc +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETATRL_2=0xfd +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETSIMCARDREADERSTATUSCANCEL_1=0x107 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETSIMCARDREADERSTATUSL_1=0x104 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_GETSIMCARDREADERSTATUSL_2=0x105 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_NOTIFYSIMCARDSTATUSCANCEL_1=0x10a +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_NOTIFYSIMCARDSTATUS_1=0x108 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMOFFCANCEL_1=0x116 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMOFFL_1=0x113 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMOFFL_2=0x114 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMONCANCEL_1=0x112 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMONL_1=0x10f +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_POWERSIMONL_2=0x110 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SENDAPDUREQV2CANCEL_1=0x10e +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SENDAPDUREQV2L_1=0x10b +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SENDAPDUREQV2L_2=0x10c +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SIMWARMRESETCANCEL_1=0x103 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SIMWARMRESETL_1=0x100 +[TRACE]TRACE_INTERNALS[0x88]_CMMWIMTSY_SIMWARMRESETL_2=0x101 +[TRACE]TRACE_INTERNALS[0x88]_CRESPONSETIMERSTORE_ADDTIMEENTRY_1=0x682 +[TRACE]TRACE_INTERNALS[0x88]_CRESPONSETIMER_BEAT_1=0x681 +[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_DEREGISTERTSYOBJECT_1=0x3e8 +[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_GETTSYOBJECT_1=0x3e6 +[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_REGISTERTSYOBJECT_1=0x3e7 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/group/bld.inf --- a/telephonyserverplugins/common_tsy/group/bld.inf Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -95,9 +95,10 @@ #endif // variant information. c32.exe SID is 101F7989 -../commontsy/inc/operatorVariants.ini /epoc32/data/z/private/101f7989/operatorvariants.ini -../commontsy/inc/operatorVariants.ini /epoc32/release/winscw/udeb/z/private/101f7989/operatorvariants.ini -../commontsy/inc/operatorVariants.ini /epoc32/release/winscw/urel/z/private/101f7989/operatorvariants.ini +../commontsy/inc/operatorVariants.ini z:/private/101f7989/operatorvariants.ini + +// by default load the non-dispatcher LTSY +../phonetsy/data/ltsydata.ini z:/private/101f7989/ltsydata.ini // ROM diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/group/ctsy.iby --- a/telephonyserverplugins/common_tsy/group/ctsy.iby Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/group/ctsy.iby Tue Jun 22 11:02:32 2010 +0100 @@ -36,6 +36,7 @@ // c32.exe SID is 101F7989 data=ZPRIVATE\101f7989\operatorVariants.ini private\101f7989\operatorVariants.ini +data=ZPRIVATE\101f7989\ltsydata.ini private\101f7989\ltsydata.ini //*** customapi *** file=ABI_DIR\DEBUG_DIR\CUSTOMAPI.DLL Sys\Bin\CUSTOMAPI.DLL diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp --- a/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_commontsy source \sf\os\cellularsrv\telephonyserverplugins\common_tsy\commontsy source \sf\os\cellularsrv\telephonyserverplugins\common_tsy\customapi diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/phonetsy/data/ltsydata.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/phonetsy/data/ltsydata.ini Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,3 @@ +[LicenseeTSY] +LicenseeTsyDllName = licenseetsy.dll +LicenseeTsyUid3 = 0x2000BEE4 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/phonetsy/group/phonetsy.mmh --- a/telephonyserverplugins/common_tsy/phonetsy/group/phonetsy.mmh Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/phonetsy/group/phonetsy.mmh Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -38,6 +38,8 @@ USERINCLUDE ../../commontsy/inc/mmgsmwcdma USERINCLUDE ../../licenseetsy_lib/inc +USERINCLUDE ../traces + // Default system include paths for OS extension layer modules. OS_LAYER_SYSTEMINCLUDE_SYMBIAN #ifdef CTSY_DISPATCHER @@ -54,11 +56,9 @@ #else LIBRARY commontsyfordispatcher.lib // Common TSY for Dispatcher #endif //CTSY_DISPATCHER -LIBRARY flogger.lib // Logging LIBRARY licenseetsy.lib // LTSY LIBRARY featmgr.lib // for featuremanager - -#include +LIBRARY efsrv.lib // config file reading // End of file diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp --- a/telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,26 +16,33 @@ +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmphonefactorytsyTraces.h" +#endif #include #include -#include "cmmphonefactorytsy.h" -#include "cmmphonetsy.h" #include -#include "MmTsy_conf.h" -#include "cmmmessagemanagerbase.h" #include +#include "cmmmessagemanagerbase.h" +#include "cmmphonefactorytsy.h" +#include "cmmphonetsy.h" +#include "MmTsy_conf.h" + +_LIT(KLtsyIniFile, "ltsydata.ini"); + #ifdef USING_CTSY_DISPATCHER -_LIT(KLicenseeTsyDllName, "licenseetsy.dll"); -_LIT(KCtsyDispatcherDllName, "ctsydispatcher.dll"); - -const TInt KLicenseeTsyUID3 = 0x2000BEE4; -const TInt KCtsyDispatcherUID3 = 0x10285C38; +_LIT(KDefaultLicenseeTsyDllName, "ctsydispatcher.dll"); +const TInt KDefaultLicenseeTsyUID3 = 0x10285C38; +#else +_LIT(KDefaultLicenseeTsyDllName, "licenseetsy.dll"); +const TInt KDefaultLicenseeTsyUID3 = 0x2000BEE4; +#endif //USING_CTSY_DISPATCHER typedef MLtsyFactoryBase*(*TFactoryBaseNewL)(); -#endif //USING_CTSY_DISPATCHER // ======== MEMBER FUNCTIONS ======== CMmPhoneFactoryTsy::CMmPhoneFactoryTsy() @@ -62,10 +69,8 @@ CMmPhoneFactoryTsy::~CMmPhoneFactoryTsy() { -#ifdef USING_CTSY_DISPATCHER iLoadedLib.Close(); -#endif //USING_CTSY_DISPATCHER - } + } // --------------------------------------------------------------------------- // CMmPhoneFactoryTsy::NewPhoneL @@ -75,91 +80,38 @@ // CPhoneBase* CMmPhoneFactoryTsy::NewPhoneL( const TDesC& aName ) { -TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - NEW LOG"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_1, "TSY: CMmPhoneFactoryTsy::NewL - NEW LOG"); iPhoneTsy = NULL; // In case of debug build, print flag info. #ifdef TF_LOGGING_ENABLED - RFeatureControl featureControl; - TInt err = featureControl.Open(); - if (err != KErrNone) - { -TFLOGSTRING("CMmPhoneFactoryTsy::NewPhoneL - failed to connect to FeatMgr"); - } - else if (featureControl.FeatureSupported(NFeature::KCsVideoTelephony) == KFeatureSupported) + RFeatureControl featureControl; + TInt err = featureControl.Open(); + if (err != KErrNone) { -TFLOGSTRING("TSY: __CS_VIDEO_TELEPHONY -flag is on"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_2, "CMmPhoneFactoryTsy::NewPhoneL - failed to connect to FeatMgr"); } - else if (featureControl.FeatureSupported(NFeature::KEmergencyCallsEnabledInOfflineMode) == KFeatureSupported) + else if (featureControl.FeatureSupported(NFeature::KCsVideoTelephony) == KFeatureSupported) { -TFLOGSTRING("TSY: __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE -flag is on"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_3, "TSY: __CS_VIDEO_TELEPHONY -flag is on"); + } + else if (featureControl.FeatureSupported(NFeature::KEmergencyCallsEnabledInOfflineMode) == KFeatureSupported) + { +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_4, "TSY: __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE -flag is on"); } - featureControl.Close(); + featureControl.Close(); #endif - + // Check if the Phone Name is OK if ( KErrNone == aName.CompareF( KMmTsyPhoneName ) ) { iMessageRouter = NULL; - - // Create Message Manager (the 'core' of the LTSY Plug-in API) - CMmMessageManagerBase* messageManager = CMmMessageManagerBase::NewL(); - if ( messageManager ) - { - CleanupStack::PushL( messageManager ); - - // LTSY Plug-in API successfully created -TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - Starting to open LicenceeTSY"); - - // get TSY message manager callback object - MmMessageManagerCallback* callBack = - messageManager->GetMessageManagerCallback(); - -#ifdef USING_CTSY_DISPATCHER - iLtsyFactory = LoadLibraryL(); -#else - // library entry for LTSY, get base factory object - iLtsyFactory = LTsyFactoryL(); - -#endif //USING_CTSY_DISPATCHER - - if( iLtsyFactory ) - { - // Get message router from LTSY. All current interface versions - // have the same GetMessageRouter defined in version 1. - MLtsyFactoryV1* ptr_v1 = - static_cast( iLtsyFactory ); - - iMessageRouter = ptr_v1->GetMessageRouter( *callBack ); - User::LeaveIfNull( iMessageRouter ); - - // Licencee Tsy successfully created -TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - LicenceeTSY successfully opened"); - - // set the pointer to the message router object - messageManager->SetMessageRouter( iMessageRouter ); - - // Ownership of messageManager passed to iPhoneTsy. - CleanupStack::Pop( messageManager ); - // Create Phone Tsy (which creates the whole Common TSY) -TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - Starting to open CommonTSY"); - iPhoneTsy = CMmPhoneTsy::NewL( - messageManager, this, iLtsyFactory ); - - if ( iPhoneTsy ) - { -TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - CommonTSY successfully opened"); - messageManager->SetPhoneTsy( iPhoneTsy ); - } - } - else - { - CleanupStack::PopAndDestroy( messageManager ); - } - } + + // Dynamic loading of LTSY + iLtsyFactory = LoadLibraryL(); } return iPhoneTsy; @@ -287,21 +239,24 @@ if ( KErrNone == aName.CompareF( KSatToolkit ) ) { -TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewSimAtk - Starting to open SimAtkTSY"); - - if( iLtsyFactory ) +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWSIMATK_1, "TSY: CMmPhoneFactoryTsy::NewSimAtk - Starting to open SimAtkTSY"); + + if (iLtsyFactory == NULL) + { + TRAP_IGNORE(iLtsyFactory = LoadLibraryL()); + } + + if (iLtsyFactory != NULL) { // Get SIM ATK TSY messaging service from LicenseeTsy - MLtsyFactoryV1* ptr_v1 = - static_cast( iLtsyFactory ); + MLtsyFactoryV1* ptr_v1 = static_cast( iLtsyFactory ); -#ifdef USING_CTSY_DISPATCHER - satMessaging = ptr_v1->GetSatMessagingService( - iPhoneTsy->SmsService() ); +#ifdef USING_CTSY_DISPATCHER + satMessaging = ptr_v1->GetSatMessagingService(iPhoneTsy->SmsService()); #else - satMessaging = ptr_v1->GetSatMessagingService( ); + satMessaging = ptr_v1->GetSatMessagingService( ); #endif - } + } } return satMessaging; @@ -329,7 +284,7 @@ // EXPORT_C CPhoneFactoryBase* LibEntry() { -TFLOGSTRING("TSY: CPhoneFactoryBase::LibEntry()..."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LIBENTRY_1, "TSY: CPhoneFactoryBase::LibEntry()..."); // return NULL if instantiation fails CMmPhoneFactoryTsy* factory(NULL); TRAP_IGNORE(factory = CMmPhoneFactoryTsy::NewL()); @@ -338,48 +293,209 @@ #ifdef USING_CTSY_DISPATCHER TBool CMmPhoneFactoryTsy::UsingCtsyDispatcher() - { - //function to determine whether the setup is using the CTSY Dispatcher layer. -#ifdef USING_CTSY_DISPATCHER - return ETrue; -#else - return EFalse; -#endif - } - -MLtsyFactoryBase* CMmPhoneFactoryTsy::LoadLibraryL() - { - //load library. This can either be LicenseeTsy or CtsyDispatcher dlls - TPtrC dllname; - TInt uid3_int; - if(UsingCtsyDispatcher()) - { - dllname.Set(KCtsyDispatcherDllName); - uid3_int = KCtsyDispatcherUID3; - } - else - { - dllname.Set(KLicenseeTsyDllName); - uid3_int = KLicenseeTsyUID3; - } - - TFLOGSTRING3("TSY: CMmPhoneFactoryTsy::LoadLibraryL - Loading Dll=%S, UID3=0x%x", &dllname, uid3_int); - - TUidType uid(KNullUid, KNullUid, TUid::Uid(uid3_int)); - - User::LeaveIfError(iLoadedLib.Load(dllname)); - - // Check the Uid3 is as expected - if(iLoadedLib.Type()[2]!=TUid::Uid(uid3_int)) - User::Leave(KErrBadLibraryEntryPoint); - - TFactoryBaseNewL libEntry=(TFactoryBaseNewL)iLoadedLib.Lookup(1); - MLtsyFactoryBase* factory=(*libEntry)(); // libEntry may leave. - - return factory; - } +/** + * Function to determine whether the setup is using the CTSY Dispatcher layer. + */ + { + return ETrue; + } #endif //USING_CTSY_DISPATCHER -// End of File +// --------------------------------------------------------------------------- +// CMmPhoneFactoryTsy::LoadLibraryL +// Dynamically loads a LTSY. +// --------------------------------------------------------------------------- +// +MLtsyFactoryBase* CMmPhoneFactoryTsy::LoadLibraryL() + { + TPtrC ltsyDllName(0, NULL); + TUint ltsyDllUid = 0; + +#ifdef USING_CTSY_DISPATCHER + ltsyDllName.Set(KDefaultLicenseeTsyDllName); + ltsyDllUid = KDefaultLicenseeTsyUID3; +#else + RBuf configData; + CleanupClosePushL(configData); + + TRAPD(ret, + { + ReadConfigFileL(&configData); + ltsyDllName.Set(ReadDllNameFromConfigL(configData)); + ltsyDllUid = ReadDllUidFromConfigL(configData); + }); + + if (ret != KErrNone) + { + ltsyDllName.Set(KDefaultLicenseeTsyDllName); + ltsyDllUid = KDefaultLicenseeTsyUID3; +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_ERROR, CMMPHONEFACTORYTSY_LOADLIBRARYL_1A, "TSY: Failed to load LTSY dll details from ini (error: %d), using defaults", ret); + } +#endif + +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_LOADLIBRARYL_1, "TSY: CMmPhoneFactoryTsy::LoadLibraryL - Loading Dll=%S, UID3=0x%8X", ltsyDllName, ltsyDllUid); + User::LeaveIfError(iLoadedLib.Load(ltsyDllName)); + +#ifndef USING_CTSY_DISPATCHER + CleanupStack::PopAndDestroy(); // configData +#endif + + // Check the Uid3 is as expected + if (iLoadedLib.Type()[2] != TUid::Uid(ltsyDllUid)) + { + User::Leave(KErrBadLibraryEntryPoint); + } + + TFactoryBaseNewL libEntry = reinterpret_cast(iLoadedLib.Lookup(1)); + MLtsyFactoryBase* factory = (*libEntry)(); // libEntry may leave. + User::LeaveIfNull(factory); + + InitCtsyL(factory); + +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_LOADLIBRARYL_2, "TSY: Loaded LTSY"); + return factory; + } + +void CMmPhoneFactoryTsy::InitCtsyL(MLtsyFactoryBase* aLtsyFactory) +/** + * Initialises iPhoneTsy + */ + { + if (iPhoneTsy != NULL) + { + return; + } + + // Create Message Manager (the 'core' of the LTSY Plug-in API) + CMmMessageManagerBase* messageManager = CMmMessageManagerBase::NewL(); + User::LeaveIfNull(messageManager); + CleanupStack::PushL( messageManager ); + + // get TSY message manager callback object + MmMessageManagerCallback* callBack = + messageManager->GetMessageManagerCallback(); + + // Get message router from LTSY. All current interface versions + // have the same GetMessageRouter defined in version 1. + MLtsyFactoryV1* ptr_v1 = + static_cast( aLtsyFactory ); + + iMessageRouter = ptr_v1->GetMessageRouter( *callBack ); + User::LeaveIfNull( iMessageRouter ); + + // set the pointer to the message router object + messageManager->SetMessageRouter( iMessageRouter ); + + // Ownership of messageManager to be passed to iPhoneTsy. + CleanupStack::Pop( messageManager ); + + // LTSY Plug-in API successfully created +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_INITLTSYL_1, "TSY: CMmPhoneFactoryTsy::NewL - Starting to open CommonTSY"); + // Create Phone Tsy (which creates the whole Common TSY) + iPhoneTsy = CMmPhoneTsy::NewL(messageManager, this, aLtsyFactory); + if (iPhoneTsy != NULL) + { + // Licencee Tsy successfully created +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_NORMAL, CMMPHONEFACTORYTSY_INITLTSYL_2, "TSY: CMmPhoneFactoryTsy::NewL - CommonTSY successfully opened"); + messageManager->SetPhoneTsy( iPhoneTsy ); + } + else + { +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_WARNING, CMMPHONEFACTORYTSY_INITLTSYL_3, "TSY: CMmPhoneFactoryTsy::NewL - CommonTSY not opened"); + } + } +TPtrC CMmPhoneFactoryTsy::ReadDllNameFromConfigL(const TDesC& aConfigData) + { + _LIT(KLicenseeTsyDllKeyName, "LicenseeTsyDllName"); + TPtrC dllName = GetValueForKeyL(aConfigData, KLicenseeTsyDllKeyName); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READDLLNAMEFROMCONFIGL_1, "TSY: Config file: LTSY DLL name = %S", dllName); + return dllName; + } + +TUint CMmPhoneFactoryTsy::ReadDllUidFromConfigL(const TDesC& aConfigData) + { + _LIT(KLicenseeTsyUid3, "LicenseeTsyUid3"); + + const TDesC& rawUid = GetValueForKeyL(aConfigData, KLicenseeTsyUid3); + // only take the right 8 characters (ie discard the "0x") + ASSERT(rawUid.Length() >= 8); + TLex lex(rawUid.Right(8)); + TUint uid; + User::LeaveIfError(lex.Val(uid, EHex)); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READUIDFROMCONFIGL_1, "TSY: Config file: LTSY UID3 = 0x%x", uid); + return uid; + } + +/*static*/ +void CMmPhoneFactoryTsy::ReadConfigFileL(RBuf* aConfigData) +/** + * Reads config file from system drive or, if not present, from ROM + * + * @param aConfigData This buffer gets created and has the ini file contents loaded into it + */ + { + RFs fs; + User::LeaveIfError(fs.Connect()); + CleanupClosePushL(fs); + +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READCONFIGFILE_1, "TSY: Trying to load from %d (C) drive", fs.GetSystemDrive()); + fs.SetSessionToPrivate(fs.GetSystemDrive()); + + RFile configFile; + TInt ret = configFile.Open(fs, KLtsyIniFile, EFileShareExclusive); + if (ret == KErrNotFound) + { +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READCONFIGFILE_2, "TSY: Trying to load ini from %d (Z) drive, as read for system drive returned error %d", EDriveZ, ret); + User::LeaveIfError(fs.SetSessionToPrivate(EDriveZ)); + User::LeaveIfError(configFile.Open(fs, KLtsyIniFile, EFileShareExclusive)); + } + +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_READCONFIGFILE_3, "TSY: Reading ini file %S", KLtsyIniFile); + + CleanupClosePushL(configFile); + + TInt configFileSize; + User::LeaveIfError(configFile.Size(configFileSize)); + + RBuf8 fileBuf; + fileBuf.Create(configFileSize); + CleanupClosePushL(fileBuf); + User::LeaveIfError(configFile.Read(fileBuf)); + + aConfigData->CreateL(configFileSize); + aConfigData->Copy(fileBuf); + + CleanupStack::PopAndDestroy(3, &fs); // fs, configFile, fileBuf + } + +/*static*/ +TPtrC CMmPhoneFactoryTsy::GetValueForKeyL(const TDesC& aKeysValues, const TDesC& aKey) +/** + * Gets the value for a specified key. The expected format is + * 
+ * key1 value1
+ * key2 value2
+ *
+ * + * However the parsing is flexible enough to allow "key1 =value1" as it allows an equals separator and extra whitespace + * The value cannot include whitespace, even if quoted. + */ + { + // this matches the bracket expression in this regexp: \w+\s*=?\s*(\w+)[\s$] + TInt startOfKey = aKeysValues.Find(aKey); + TLex valueExtractor(aKeysValues); + valueExtractor.Inc(startOfKey + aKey.Length()); + valueExtractor.SkipSpaceAndMark(); + // allow equals separating key and value + if (valueExtractor.Peek() == '=') + { + valueExtractor.Inc(); + valueExtractor.SkipSpaceAndMark(); + } + + TPtrC value = valueExtractor.NextToken(); + __ASSERT_ALWAYS(value.Length() > 0, User::Leave(KErrCorrupt)); + return value; + } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/phonetsy/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/phonetsy/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/phonetsy/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/phonetsy/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,13 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_LOADLIBRARYL_1=0xb +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_2=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_3=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_4=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_5=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_6=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_7=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWPHONEL_8=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CMMPHONEFACTORYTSY_NEWSIMATK_1=0x9 +[TRACE]TRACE_INTERNALS[0x88]_LIBENTRY_1=0xc diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/systemstateplugin/group/ctsysystemstateplugin.mmp --- a/telephonyserverplugins/common_tsy/systemstateplugin/group/ctsysystemstateplugin.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/systemstateplugin/group/ctsysystemstateplugin.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -29,6 +29,8 @@ USERINCLUDE ../../commontsy/inc/mmutility USERINCLUDE ../../commontsy/inc +USERINCLUDE ../traces + OS_LAYER_SYSTEMINCLUDE_SYMBIAN @@ -45,6 +47,4 @@ LIBRARY ssmadaptationcli.lib -#include - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/systemstateplugin/src/ctsysystemstateplugin.cpp --- a/telephonyserverplugins/common_tsy/systemstateplugin/src/ctsysystemstateplugin.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/systemstateplugin/src/ctsysystemstateplugin.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -13,8 +13,13 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ctsysystemstatepluginTraces.h" +#endif + #include "ctsysystemstateplugin.h" -#include CCtsySystemStatePlugin* CCtsySystemStatePlugin::NewL() { @@ -52,7 +57,7 @@ // --------------------------------------------------------------------------- TInt CCtsySystemStatePlugin::Connect() { - TFLOGSTRING("CCtsySystemStatePlugin::Connect()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_CONNECT_1, "CCtsySystemStatePlugin::Connect()"); TInt error (KErrNone); if (!iConnected) @@ -66,7 +71,7 @@ error = iSsmEmergencyCallRf.SetAsPriorityClient(); if (KErrNone != error) { - TFLOGSTRING2("CCtsySystemStatePlugin::Connect() - SetAsPriorityClient returned %d", error); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_CONNECT_2, "CCtsySystemStatePlugin::Connect() - SetAsPriorityClient returned %d", error); error = KErrNone; } } @@ -82,7 +87,7 @@ void CCtsySystemStatePlugin::ActivateRfForEmergencyCall(MCtsySsmPluginCallback* aSsmPluginCallback, TCtsySsmCallbackData& aCallbackData) { - TFLOGSTRING("CCtsySystemStatePlugin::ActivateRfForEmergencyCall()" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_ACTIVATERFFOREMERGENCYCALL_1, "CCtsySystemStatePlugin::ActivateRfForEmergencyCall()" ); iAoChangeRfForEmergencyCall->ActivateRfForEmergencyCall(aSsmPluginCallback, aCallbackData); } @@ -95,12 +100,12 @@ // --------------------------------------------------------------------------- void CCtsySystemStatePlugin::DeactivateRfAfterEmergencyCall() { - TFLOGSTRING("CCtsySystemStatePlugin::DeactivateRfForEmergencyCall()" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_1, "CCtsySystemStatePlugin::DeactivateRfForEmergencyCall()" ); //try to connect TInt err = Connect(); if (err) { - TFLOGSTRING2("CCtsySystemStatePlugin::DeactivateRfAfterEmergencyCall() failed to connect %d", err); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_2, "CCtsySystemStatePlugin::DeactivateRfAfterEmergencyCall() failed to connect %d", err); //do nothing return; } @@ -114,7 +119,7 @@ // --------------------------------------------------------------------------- void CCtsySystemStatePlugin::Close() { - TFLOGSTRING("CCtsySystemStatePlugin::Close()" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYSYSTEMSTATEPLUGIN_CLOSE_1, "CCtsySystemStatePlugin::Close()" ); if (iConnected) { // if there is some request... @@ -159,7 +164,7 @@ void CChangeRfForEmergencyCall::ActivateRfForEmergencyCall(MCtsySsmPluginCallback* aSsmPluginCallback, TCtsySsmCallbackData& aCallbackData) { - TFLOGSTRING("CChangeRfForEmergencyCall::ActivateRfForEmergencyCall()" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHANGERFFOREMERGENCYCALL_ACTIVATERFFOREMERGENCYCALL_1, "CChangeRfForEmergencyCall::ActivateRfForEmergencyCall()" ); if (EDeactivateBusy == iBusy) { @@ -196,7 +201,7 @@ // --------------------------------------------------------------------------- void CChangeRfForEmergencyCall::DeactivateRfAfterEmergencyCall() { - TFLOGSTRING("CChangeRfForEmergencyCall::DeactivateRfAfterEmergencyCall()" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCHANGERFFOREMERGENCYCALL_DEACTIVATERFAFTEREMERGENCYCALL_1, "CChangeRfForEmergencyCall::DeactivateRfAfterEmergencyCall()" ); // if we've already sent request if (EActivateBusy == iBusy) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/systemstateplugin/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/systemstateplugin/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/systemstateplugin/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/systemstateplugin/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,10 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CCHANGERFFOREMERGENCYCALL_ACTIVATERFFOREMERGENCYCALL_1=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CCHANGERFFOREMERGENCYCALL_DEACTIVATERFAFTEREMERGENCYCALL_1=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_ACTIVATERFFOREMERGENCYCALL_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_CLOSE_1=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_CONNECT_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_CONNECT_2=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_1=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CCTSYSYSTEMSTATEPLUGIN_DEACTIVATERFAFTEREMERGENCYCALL_2=0x5 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/RPS/group/Bld.inf --- a/telephonyserverplugins/common_tsy/test/RPS/group/Bld.inf Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ - -// 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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Remote Party Simulator -// -// - -/** - @file -*/ - - - -PRJ_TESTMMPFILES -RpsCommon.mmp -RPSMaster.mmp -RPSSlave.mmp - -PRJ_TESTEXPORTS - -./RPSSlave.oby /epoc32/rom/include/rpsslave.oby -./RPSSlave.iby /epoc32/rom/include/rpsslave.iby - -./RPSSlaveAutoexec.bat /epoc32/data/z/rpsslaveautoexec.bat - -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../RPSCommon/Inc/RpsCommon.h /epoc32/include/rpscommon.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../RPSCommon/Inc/RPSLoggerMacros.h /epoc32/include/rpsloggermacros.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../RPSMaster/Inc/RPSMaster.h /epoc32/include/rpsmaster.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../RPSCommon/Inc/RPSOwnNumbers.h /epoc32/include/rpsownnumbers.h -#endif -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../RPSMaster/Inc/RPSAsciiRqstDefs.h /epoc32/include/rpsasciirqstdefs.h -#endif - - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/RPS/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/RPS/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,53 @@ + +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Remote Party Simulator +// +// + +/** + @file +*/ + + + +PRJ_TESTMMPFILES +RpsCommon.mmp +RPSMaster.mmp +RPSSlave.mmp + +PRJ_TESTEXPORTS + +./RPSSlave.oby /epoc32/rom/include/rpsslave.oby +./RPSSlave.iby /epoc32/rom/include/rpsslave.iby + +./RPSSlaveAutoexec.bat /epoc32/data/z/rpsslaveautoexec.bat + +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +../RPSCommon/Inc/RpsCommon.h /epoc32/include/rpscommon.h +#endif +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +../RPSCommon/Inc/RPSLoggerMacros.h /epoc32/include/rpsloggermacros.h +#endif +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +../RPSMaster/Inc/RPSMaster.h /epoc32/include/rpsmaster.h +#endif +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +../RPSCommon/Inc/RPSOwnNumbers.h /epoc32/include/rpsownnumbers.h +#endif +#ifdef SYMBIAN_OLD_EXPORT_LOCATION +../RPSMaster/Inc/RPSAsciiRqstDefs.h /epoc32/include/rpsasciirqstdefs.h +#endif + + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/group/bld.inf --- a/telephonyserverplugins/common_tsy/test/component/group/bld.inf Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,5 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// +// Copyright (c) 2008-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" @@ -12,6 +13,7 @@ // // Description: // +// PRJ_MMPFILES @@ -54,6 +56,10 @@ ../scripts/te_ctsycomponent_timeout_all.script z:/testdata/scripts/te_ctsycomponent_timeout_all.script ../scripts/te_ctsycomponent_fullrun.script z:/testdata/scripts/te_ctsycomponent_fullrun.script +// Scripts which can be used to copy/remove MockLtsy ini file to/from C: drive +../scripts/mockltsy_copy_ini_file.script z:/testdata/scripts/mockltsy_copy_ini_file.script +../scripts/mockltsy_remove_ini_file.script z:/testdata/scripts/mockltsy_remove_ini_file.script + ../scripts/te_ctsycomponent_lbs_individual.script z:/testdata/scripts/te_ctsycomponent_lbs_individual.script ../scripts/te_ctsycomponent_smsstore_individual.script z:/testdata/scripts/te_ctsycomponent_smsstore_individual.script ../scripts/te_ctsycomponent_datacallcontrol_individual.script z:/testdata/scripts/te_ctsycomponent_datacallcontrol_individual.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/group/component_test.pkg --- a/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -; -; Copyright (c) 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" -; which accompanies this distribution, and is available -; at the URL "http://www.eclipse.org/legal/epl-v10.html". -; -; Initial Contributors: -; Nokia Corporation - initial contribution. -; -; Contributors: -; -; Description: -; - "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_onstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_onstore_individual.script" "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_packetservice_individual.script"-"c:\testdata\scripts\te_ctsycomponent_packetservice_individual.script" "\sf\os\cellularsrv\telephonyserverplugins\common_tsy\test\component\scripts\te_ctsycomponent_phonebookstore_individual.script"-"c:\testdata\scripts\te_ctsycomponent_phonebookstore_individual.script" diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component.iby --- a/telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component.iby Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/group/te_ctsy_component.iby Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,5 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// +// Copyright (c) 2008-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" @@ -12,6 +13,7 @@ // // Description: // +// #ifndef __TE_CTSY_COMPONENT_IBY__ #define __TE_CTSY_COMPONENT_IBY__ @@ -33,7 +35,7 @@ file=ABI_DIR\DEBUG_DIR\te_ctsy_component.exe SYSTEM_BINDIR\te_ctsy_component.exe // executables needed by te_ctsy_component.exe -file=ABI_DIR\DEBUG_DIR\licenseetsy.dll SYSTEM_BINDIR\licenseetsy.dll +file=ABI_DIR\DEBUG_DIR\mocklicenseetsy.dll SYSTEM_BINDIR\mocklicenseetsy.dll file=ABI_DIR\DEBUG_DIR\mockltsydll.dll SYSTEM_BINDIR\mockltsydll.dll // MockHWRM @@ -53,6 +55,12 @@ data=ZPRIVATE/10202be9/10205043.txt private\10202be9\10205043.txt #endif //HWRM_IS_SUPPORTED +// MockLTSY +data=EPOCROOT##epoc32\data\z\testdata\configs\ltsydata_mock.ini testdata\configs\ltsydata_mock.ini +// MockLTSY scripts that allow dynamic loading of mocklicenseetsy.dll +data=EPOCROOT##epoc32\data\z\testdata\scripts\mockltsy_copy_ini_file.script testdata\scripts\mockltsy_copy_ini_file.script +data=EPOCROOT##epoc32\data\z\testdata\scripts\mockltsy_remove_ini_file.script testdata\scripts\mockltsy_remove_ini_file.script + // Runnable Scripts data=EPOCROOT##epoc32\data\z\testdata\scripts\te_ctsycomponent.script testdata\scripts\te_ctsycomponent.script data=EPOCROOT##epoc32\data\z\testdata\scripts\te_ctsycomponent_timeout_all.script testdata\scripts\te_ctsycomponent_timeout_all.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/inc/cctsypacketservicefu.h --- a/telephonyserverplugins/common_tsy/test/component/inc/cctsypacketservicefu.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/inc/cctsypacketservicefu.h Tue Jun 22 11:02:32 2010 +0100 @@ -50,7 +50,8 @@ void TestNotifyContextAdded0004L(); void TestNotifyStatusChange0001L(); void TestNotifyStatusChange0002L(); - void TestNotifyStatusChange0004L(); + void TestNotifyStatusChange0004L(); + void TestNotifyStatusChange0004aL(); void TestNotifyStatusChange0001aL(); void TestSetPreferredBearer0001L(); void TestSetPreferredBearer0004L(); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/bwins/licenseetsyu.def --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/bwins/licenseetsyu.def Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -EXPORTS - ?LTsyFactoryL@@YAPAVMLtsyFactoryBase@@XZ @ 1 NONAME ; class MLtsyFactoryBase * LTsyFactoryL(void) - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/bwins/mocklicenseetsyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/bwins/mocklicenseetsyu.def Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,3 @@ +EXPORTS + ?LTsyFactoryL@@YAPAVMLtsyFactoryBase@@XZ @ 1 NONAME ; class MLtsyFactoryBase * LTsyFactoryL(void) + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/data/ltsydata_mock.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/data/ltsydata_mock.ini Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,3 @@ +[LicenseeTSY] +LicenseeTsyDllName = mocklicenseetsy.dll +LicenseeTsyUid3 = 0x2002EA67 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/licenseetsyu.def --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/licenseetsyu.def Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,943 +0,0 @@ -EXPORTS - _Z12LTsyFactoryLv @ 1 NONAME - _ZTI14TMockLtsyData1I10TGsmCbsMsgE @ 2 NONAME - _ZTI14TMockLtsyData1I11TONStoreMsgE @ 3 NONAME - _ZTI14TMockLtsyData1I12TRfStateInfoE @ 4 NONAME - _ZTI14TMockLtsyData1I12TServiceTypeE @ 5 NONAME - _ZTI14TMockLtsyData1I14TContextParamsE @ 6 NONAME - _ZTI14TMockLtsyData1I16TENStoreResponseE @ 7 NONAME - _ZTI14TMockLtsyData1I20TLockSettingPasswordE @ 8 NONAME - _ZTI14TMockLtsyData1I21TContextConfigurationE @ 9 NONAME - _ZTI14TMockLtsyData1I24TCbsCbmiAndLangAndFilterE @ 10 NONAME - _ZTI14TMockLtsyData1I25TMbmsNetworkServiceStatusE @ 11 NONAME - _ZTI14TMockLtsyData1I25TSendSmsDataAndAttributesE @ 12 NONAME - _ZTI14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 13 NONAME - _ZTI14TMockLtsyData1I4TBufILi10EEE @ 14 NONAME - _ZTI14TMockLtsyData1I4TBufILi128EEE @ 15 NONAME - _ZTI14TMockLtsyData1I4TBufILi15EEE @ 16 NONAME - _ZTI14TMockLtsyData1I4TBufILi16EEE @ 17 NONAME - _ZTI14TMockLtsyData1I4TBufILi32EEE @ 18 NONAME - _ZTI14TMockLtsyData1I4TBufILi6EEE @ 19 NONAME - _ZTI14TMockLtsyData1I5TBuf8ILi128EEE @ 20 NONAME - _ZTI14TMockLtsyData1I5TBuf8ILi15EEE @ 21 NONAME - _ZTI14TMockLtsyData1I5TBuf8ILi16EEE @ 22 NONAME - _ZTI14TMockLtsyData1I5TCharE @ 23 NONAME - _ZTI14TMockLtsyData1I5TTimeE @ 24 NONAME - _ZTI14TMockLtsyData1I7TSmsMsgE @ 25 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI11TAlsSupportEE @ 26 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI11TOperatorIdEE @ 27 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI11TViagParamsEE @ 28 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI12THSxPAStatusEE @ 29 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI12TSetAlsBlockEE @ 30 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI12TSimFileInfoEE @ 31 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI13TSetDriveModeEE @ 32 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI14TBandSelectionEE @ 33 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI16TNetworkModeCapsEE @ 34 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI16TSetAlwaysOnModeEE @ 35 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI18TGetAlsBlockStatusEE @ 36 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI18TViagCacheRecordIdEE @ 37 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI19TViagUHZIUESettingsEE @ 38 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI20TEmerNumberCheckModeEE @ 39 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI5TApduEE @ 40 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI9TDtmfInfoEE @ 41 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone11TAPNEntryV3EE @ 42 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone14TMobileServiceEE @ 43 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone16TMobilePhoneLockEE @ 44 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone16TMobilePhoneNITZEE @ 45 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone19TMobilePhoneALSLineEE @ 46 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneFdnStatusEE @ 47 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneIdServiceEE @ 48 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone22TImsAuthenticateDataV5EE @ 49 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 50 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 51 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockStatusEE @ 52 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCBConditionEE @ 53 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCFConditionEE @ 54 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneNetworkModeEE @ 55 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 56 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone24TMobilePhoneServiceTableEE @ 57 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 58 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 59 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 60 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 61 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 62 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 63 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneSecurityEventEE @ 64 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 65 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 66 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 67 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 68 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone28TAPNControlListServiceStatusEE @ 69 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 70 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 71 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 72 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 73 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 74 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 75 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 76 NONAME - _ZTI14TMockLtsyData1IN14RMobileONStore16TMobileONEntryV1EE @ 77 NONAME - _ZTI14TMockLtsyData1IN14RPacketContext17TContextConfig_R5EE @ 78 NONAME - _ZTI14TMockLtsyData1IN14RPacketContext18TContextConfigCDMAEE @ 79 NONAME - _ZTI14TMockLtsyData1IN14RPacketContext18TContextConfigGPRSEE @ 80 NONAME - _ZTI14TMockLtsyData1IN14RPacketContext20TContextConfigR99_R4EE @ 81 NONAME - _ZTI14TMockLtsyData1IN14RPacketService11TAttachModeEE @ 82 NONAME - _ZTI14TMockLtsyData1IN14RPacketService16TPreferredBearerEE @ 83 NONAME - _ZTI14TMockLtsyData1IN14RPacketService19TRegistrationStatusEE @ 84 NONAME - _ZTI14TMockLtsyData1IN14RPacketService7TStatusEE @ 85 NONAME - _ZTI14TMockLtsyData1IN14RPacketService8TMSClassEE @ 86 NONAME - _ZTI14TMockLtsyData1IN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 87 NONAME - _ZTI14TMockLtsyData1IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 88 NONAME - _ZTI14TMockLtsyData1IN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 89 NONAME - _ZTI14TMockLtsyData1IN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 90 NONAME - _ZTI14TMockLtsyData1IN19RMobileSmsMessaging16TMobileSmsBearerEE @ 91 NONAME - _ZTI14TMockLtsyData1IN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 92 NONAME - _ZTI14TMockLtsyData1IN6RPhone7TStatusEE @ 93 NONAME - _ZTI14TMockLtsyData1IP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 94 NONAME - _ZTI14TMockLtsyData1IP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 95 NONAME - _ZTI14TMockLtsyData1IP13CArrayPtrFlatI14TSmsParametersEE @ 96 NONAME - _ZTI14TMockLtsyData1IP13CArrayPtrFlatI16TENStoreResponseEE @ 97 NONAME - _ZTI14TMockLtsyData1IP13CArrayPtrFlatI7TSmsMsgEE @ 98 NONAME - _ZTI14TMockLtsyData1IP18CMobilePhoneCFListE @ 99 NONAME - _ZTI14TMockLtsyData1IP18CMobilePhoneCWListE @ 100 NONAME - _ZTI14TMockLtsyData1IP25CMobilePhoneNetworkListV2E @ 101 NONAME - _ZTI14TMockLtsyData1IP27CMobilePhoneBroadcastIdListE @ 102 NONAME - _ZTI14TMockLtsyData1IP29CPcktMbmsMonitoredServiceListE @ 103 NONAME - _ZTI14TMockLtsyData1IP4TBufILi100EEE @ 104 NONAME - _ZTI14TMockLtsyData1IP6TDesC8E @ 105 NONAME - _ZTI14TMockLtsyData1IPN12RMmCustomAPI20TSimCardReaderStatusEE @ 106 NONAME - _ZTI14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 107 NONAME - _ZTI14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 108 NONAME - _ZTI14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 109 NONAME - _ZTI14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 110 NONAME - _ZTI14TMockLtsyData1IPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 111 NONAME - _ZTI14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 112 NONAME - _ZTI14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 113 NONAME - _ZTI14TMockLtsyData1IPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 114 NONAME - _ZTI14TMockLtsyData1IhE @ 115 NONAME - _ZTI14TMockLtsyData1IiE @ 116 NONAME - _ZTI14TMockLtsyData1IjE @ 117 NONAME - _ZTI14TMockLtsyData1IlE @ 118 NONAME - _ZTI14TMockLtsyData1ImE @ 119 NONAME - _ZTI14TMockLtsyData1IsE @ 120 NONAME - _ZTI14TMockLtsyData1ItE @ 121 NONAME - _ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 122 NONAME - _ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 123 NONAME - _ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 124 NONAME - _ZTI14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 125 NONAME - _ZTI14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 126 NONAME - _ZTI14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 127 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 128 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 129 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 130 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 131 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 132 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 133 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 134 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 135 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 136 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EES1_E @ 137 NONAME - _ZTI14TMockLtsyData2I4TBufILi16EEiE @ 138 NONAME - _ZTI14TMockLtsyData2I5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 139 NONAME - _ZTI14TMockLtsyData2I5TTimeiE @ 140 NONAME - _ZTI14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 141 NONAME - _ZTI14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 142 NONAME - _ZTI14TMockLtsyData2IN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 143 NONAME - _ZTI14TMockLtsyData2IN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 144 NONAME - _ZTI14TMockLtsyData2IN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 145 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 146 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 147 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 148 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 149 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 150 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 151 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 152 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 153 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 154 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 155 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 156 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 157 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 158 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 159 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 160 NONAME - _ZTI14TMockLtsyData2IN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 161 NONAME - _ZTI14TMockLtsyData2IN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 162 NONAME - _ZTI14TMockLtsyData2IN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 163 NONAME - _ZTI14TMockLtsyData2IN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 164 NONAME - _ZTI14TMockLtsyData2IN14RPacketService7TStatusEiE @ 165 NONAME - _ZTI14TMockLtsyData2IN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 166 NONAME - _ZTI14TMockLtsyData2IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 167 NONAME - _ZTI14TMockLtsyData2IN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 168 NONAME - _ZTI14TMockLtsyData2IP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 169 NONAME - _ZTI14TMockLtsyData2IP13CArrayPtrFlatI7TSmsMsgEiE @ 170 NONAME - _ZTI14TMockLtsyData2IP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 171 NONAME - _ZTI14TMockLtsyData2IP6TDesC8S1_E @ 172 NONAME - _ZTI14TMockLtsyData2IP6TDesC8iE @ 173 NONAME - _ZTI14TMockLtsyData2Ih4TBufILi10EEE @ 174 NONAME - _ZTI14TMockLtsyData2IhiE @ 175 NONAME - _ZTI14TMockLtsyData2IiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 176 NONAME - _ZTI14TMockLtsyData2IiP7TSmsMsgE @ 177 NONAME - _ZTI14TMockLtsyData2IiiE @ 178 NONAME - _ZTI14TMockLtsyData2IjiE @ 179 NONAME - _ZTI14TMockLtsyData2IlaE @ 180 NONAME - _ZTI14TMockLtsyData2Is5TBuf8ILi165EEE @ 181 NONAME - _ZTI15CMockLtsyEngine @ 182 NONAME - _ZTI16CMmCustomStubExt @ 183 NONAME - _ZTI16CMmMessageRouter @ 184 NONAME - _ZTI17TMockLtsyData1BufI10TGsmCbsMsgE @ 185 NONAME - _ZTI17TMockLtsyData1BufI11TONStoreMsgE @ 186 NONAME - _ZTI17TMockLtsyData1BufI12TRfStateInfoE @ 187 NONAME - _ZTI17TMockLtsyData1BufI12TServiceTypeE @ 188 NONAME - _ZTI17TMockLtsyData1BufI14TContextParamsE @ 189 NONAME - _ZTI17TMockLtsyData1BufI16TENStoreResponseE @ 190 NONAME - _ZTI17TMockLtsyData1BufI20TLockSettingPasswordE @ 191 NONAME - _ZTI17TMockLtsyData1BufI21TContextConfigurationE @ 192 NONAME - _ZTI17TMockLtsyData1BufI24TCbsCbmiAndLangAndFilterE @ 193 NONAME - _ZTI17TMockLtsyData1BufI25TMbmsNetworkServiceStatusE @ 194 NONAME - _ZTI17TMockLtsyData1BufI25TSendSmsDataAndAttributesE @ 195 NONAME - _ZTI17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 196 NONAME - _ZTI17TMockLtsyData1BufI4TBufILi10EEE @ 197 NONAME - _ZTI17TMockLtsyData1BufI4TBufILi128EEE @ 198 NONAME - _ZTI17TMockLtsyData1BufI4TBufILi15EEE @ 199 NONAME - _ZTI17TMockLtsyData1BufI4TBufILi16EEE @ 200 NONAME - _ZTI17TMockLtsyData1BufI4TBufILi32EEE @ 201 NONAME - _ZTI17TMockLtsyData1BufI4TBufILi6EEE @ 202 NONAME - _ZTI17TMockLtsyData1BufI5TBuf8ILi128EEE @ 203 NONAME - _ZTI17TMockLtsyData1BufI5TBuf8ILi15EEE @ 204 NONAME - _ZTI17TMockLtsyData1BufI5TBuf8ILi16EEE @ 205 NONAME - _ZTI17TMockLtsyData1BufI5TCharE @ 206 NONAME - _ZTI17TMockLtsyData1BufI5TTimeE @ 207 NONAME - _ZTI17TMockLtsyData1BufI7TSmsMsgE @ 208 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TAlsSupportEE @ 209 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TOperatorIdEE @ 210 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TViagParamsEE @ 211 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI12THSxPAStatusEE @ 212 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI12TSetAlsBlockEE @ 213 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI12TSimFileInfoEE @ 214 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI13TSetDriveModeEE @ 215 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI14TBandSelectionEE @ 216 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI16TNetworkModeCapsEE @ 217 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI16TSetAlwaysOnModeEE @ 218 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI18TGetAlsBlockStatusEE @ 219 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI18TViagCacheRecordIdEE @ 220 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI19TViagUHZIUESettingsEE @ 221 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI20TEmerNumberCheckModeEE @ 222 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI5TApduEE @ 223 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI9TDtmfInfoEE @ 224 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone11TAPNEntryV3EE @ 225 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone14TMobileServiceEE @ 226 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneLockEE @ 227 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneNITZEE @ 228 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone19TMobilePhoneALSLineEE @ 229 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneFdnStatusEE @ 230 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneIdServiceEE @ 231 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone22TImsAuthenticateDataV5EE @ 232 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 233 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 234 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockStatusEE @ 235 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCBConditionEE @ 236 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCFConditionEE @ 237 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneNetworkModeEE @ 238 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 239 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneServiceTableEE @ 240 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 241 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 242 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 243 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 244 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 245 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 246 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneSecurityEventEE @ 247 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 248 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 249 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 250 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 251 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone28TAPNControlListServiceStatusEE @ 252 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 253 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 254 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 255 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 256 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 257 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 258 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 259 NONAME - _ZTI17TMockLtsyData1BufIN14RMobileONStore16TMobileONEntryV1EE @ 260 NONAME - _ZTI17TMockLtsyData1BufIN14RPacketContext17TContextConfig_R5EE @ 261 NONAME - _ZTI17TMockLtsyData1BufIN14RPacketContext18TContextConfigCDMAEE @ 262 NONAME - _ZTI17TMockLtsyData1BufIN14RPacketContext18TContextConfigGPRSEE @ 263 NONAME - _ZTI17TMockLtsyData1BufIN14RPacketContext20TContextConfigR99_R4EE @ 264 NONAME - _ZTI17TMockLtsyData1BufIN14RPacketService11TAttachModeEE @ 265 NONAME - _ZTI17TMockLtsyData1BufIN14RPacketService16TPreferredBearerEE @ 266 NONAME - _ZTI17TMockLtsyData1BufIN14RPacketService19TRegistrationStatusEE @ 267 NONAME - _ZTI17TMockLtsyData1BufIN14RPacketService7TStatusEE @ 268 NONAME - _ZTI17TMockLtsyData1BufIN14RPacketService8TMSClassEE @ 269 NONAME - _ZTI17TMockLtsyData1BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 270 NONAME - _ZTI17TMockLtsyData1BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 271 NONAME - _ZTI17TMockLtsyData1BufIN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 272 NONAME - _ZTI17TMockLtsyData1BufIN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 273 NONAME - _ZTI17TMockLtsyData1BufIN19RMobileSmsMessaging16TMobileSmsBearerEE @ 274 NONAME - _ZTI17TMockLtsyData1BufIN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 275 NONAME - _ZTI17TMockLtsyData1BufIN6RPhone7TStatusEE @ 276 NONAME - _ZTI17TMockLtsyData1BufIP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 277 NONAME - _ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 278 NONAME - _ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI14TSmsParametersEE @ 279 NONAME - _ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI16TENStoreResponseEE @ 280 NONAME - _ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI7TSmsMsgEE @ 281 NONAME - _ZTI17TMockLtsyData1BufIP18CMobilePhoneCFListE @ 282 NONAME - _ZTI17TMockLtsyData1BufIP18CMobilePhoneCWListE @ 283 NONAME - _ZTI17TMockLtsyData1BufIP25CMobilePhoneNetworkListV2E @ 284 NONAME - _ZTI17TMockLtsyData1BufIP27CMobilePhoneBroadcastIdListE @ 285 NONAME - _ZTI17TMockLtsyData1BufIP29CPcktMbmsMonitoredServiceListE @ 286 NONAME - _ZTI17TMockLtsyData1BufIP4TBufILi100EEE @ 287 NONAME - _ZTI17TMockLtsyData1BufIP6TDesC8E @ 288 NONAME - _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI20TSimCardReaderStatusEE @ 289 NONAME - _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 290 NONAME - _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 291 NONAME - _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 292 NONAME - _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 293 NONAME - _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 294 NONAME - _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 295 NONAME - _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 296 NONAME - _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 297 NONAME - _ZTI17TMockLtsyData1BufIhE @ 298 NONAME - _ZTI17TMockLtsyData1BufIiE @ 299 NONAME - _ZTI17TMockLtsyData1BufIjE @ 300 NONAME - _ZTI17TMockLtsyData1BufIlE @ 301 NONAME - _ZTI17TMockLtsyData1BufImE @ 302 NONAME - _ZTI17TMockLtsyData1BufIsE @ 303 NONAME - _ZTI17TMockLtsyData1BufItE @ 304 NONAME - _ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 305 NONAME - _ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 306 NONAME - _ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 307 NONAME - _ZTI17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 308 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 309 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 310 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 311 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 312 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 313 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 314 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 315 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 316 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 317 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 318 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 319 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EES1_E @ 320 NONAME - _ZTI17TMockLtsyData2BufI4TBufILi16EEiE @ 321 NONAME - _ZTI17TMockLtsyData2BufI5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 322 NONAME - _ZTI17TMockLtsyData2BufI5TTimeiE @ 323 NONAME - _ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 324 NONAME - _ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 325 NONAME - _ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 326 NONAME - _ZTI17TMockLtsyData2BufIN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 327 NONAME - _ZTI17TMockLtsyData2BufIN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 328 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 329 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 330 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 331 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 332 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 333 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 334 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 335 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 336 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 337 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 338 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 339 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 340 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 341 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 342 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 343 NONAME - _ZTI17TMockLtsyData2BufIN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 344 NONAME - _ZTI17TMockLtsyData2BufIN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 345 NONAME - _ZTI17TMockLtsyData2BufIN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 346 NONAME - _ZTI17TMockLtsyData2BufIN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 347 NONAME - _ZTI17TMockLtsyData2BufIN14RPacketService7TStatusEiE @ 348 NONAME - _ZTI17TMockLtsyData2BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 349 NONAME - _ZTI17TMockLtsyData2BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 350 NONAME - _ZTI17TMockLtsyData2BufIN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 351 NONAME - _ZTI17TMockLtsyData2BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 352 NONAME - _ZTI17TMockLtsyData2BufIP13CArrayPtrFlatI7TSmsMsgEiE @ 353 NONAME - _ZTI17TMockLtsyData2BufIP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 354 NONAME - _ZTI17TMockLtsyData2BufIP6TDesC8S1_E @ 355 NONAME - _ZTI17TMockLtsyData2BufIP6TDesC8iE @ 356 NONAME - _ZTI17TMockLtsyData2BufIh4TBufILi10EEE @ 357 NONAME - _ZTI17TMockLtsyData2BufIhiE @ 358 NONAME - _ZTI17TMockLtsyData2BufIiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 359 NONAME - _ZTI17TMockLtsyData2BufIiP7TSmsMsgE @ 360 NONAME - _ZTI17TMockLtsyData2BufIiiE @ 361 NONAME - _ZTI17TMockLtsyData2BufIjiE @ 362 NONAME - _ZTI17TMockLtsyData2BufIlaE @ 363 NONAME - _ZTI17TMockLtsyData2BufIs5TBuf8ILi165EEE @ 364 NONAME - _ZTI18CMockLtsyFactoryV1 @ 365 NONAME - _ZTI18CMockLtsyFactoryV2 @ 366 NONAME - _ZTI18CMockLtsyFactoryV3 @ 367 NONAME - _ZTI18TMockLtsyCallData1I4TBufILi129EEE @ 368 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall16TMobileCallEventEE @ 369 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall17TMobileCallInfoV1EE @ 370 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall17TMobileCallStatusEE @ 371 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV1EE @ 372 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV2EE @ 373 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV7EE @ 374 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall21TMobileCallDataCapsV1EE @ 375 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall22TMobileCallHscsdInfoV8EE @ 376 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV1EE @ 377 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV2EE @ 378 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV8EE @ 379 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV1EE @ 380 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV2EE @ 381 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV7EE @ 382 NONAME - _ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV8EE @ 383 NONAME - _ZTI18TMockLtsyCallData1IN12RMobilePhone19TMobilePhonePrivacyEE @ 384 NONAME - _ZTI18TMockLtsyCallData1IN5RCall14TBearerServiceEE @ 385 NONAME - _ZTI18TMockLtsyCallData1IN5RCall7TStatusEE @ 386 NONAME - _ZTI18TMockLtsyCallData1IN5RCall9TCommPortEE @ 387 NONAME - _ZTI18TMockLtsyCallData1IiE @ 388 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 389 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 390 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 391 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 392 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 393 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 394 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 395 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 396 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 397 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 398 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 399 NONAME - _ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 400 NONAME - _ZTI18TMockLtsyCallData2IiiE @ 401 NONAME - _ZTI19CMockSmsMessHandler @ 402 NONAME - _ZTI20CMockCallMessHandler @ 403 NONAME - _ZTI21CMockPhoneMessHandler @ 404 NONAME - _ZTI21TMockLtsyCallData1BufI4TBufILi129EEE @ 405 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall16TMobileCallEventEE @ 406 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallInfoV1EE @ 407 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallStatusEE @ 408 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV1EE @ 409 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV2EE @ 410 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV7EE @ 411 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall21TMobileCallDataCapsV1EE @ 412 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall22TMobileCallHscsdInfoV8EE @ 413 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV1EE @ 414 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV2EE @ 415 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV8EE @ 416 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV1EE @ 417 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV2EE @ 418 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV7EE @ 419 NONAME - _ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV8EE @ 420 NONAME - _ZTI21TMockLtsyCallData1BufIN12RMobilePhone19TMobilePhonePrivacyEE @ 421 NONAME - _ZTI21TMockLtsyCallData1BufIN5RCall14TBearerServiceEE @ 422 NONAME - _ZTI21TMockLtsyCallData1BufIN5RCall7TStatusEE @ 423 NONAME - _ZTI21TMockLtsyCallData1BufIN5RCall9TCommPortEE @ 424 NONAME - _ZTI21TMockLtsyCallData1BufIiE @ 425 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 426 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 427 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 428 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 429 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 430 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 431 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 432 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 433 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 434 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 435 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 436 NONAME - _ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 437 NONAME - _ZTI21TMockLtsyCallData2BufIiiE @ 438 NONAME - _ZTI21TMockLtsyContextData1I4TBufILi16EEE @ 439 NONAME - _ZTI21TMockLtsyContextData2I4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 440 NONAME - _ZTI21TMockLtsyContextData2I4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 441 NONAME - _ZTI23CMockPcktQoSMessHandler @ 442 NONAME - _ZTI23TMockLtsyPacketQoSData1I4TBufILi16EEE @ 443 NONAME - _ZTI23TMockLtsyPhoneBookData1I10TPBFdnInfoE @ 444 NONAME - _ZTI23TMockLtsyPhoneBookData1I12TPBEntryInfoE @ 445 NONAME - _ZTI23TMockLtsyPhoneBookData1I16CStorageInfoDataE @ 446 NONAME - _ZTI23TMockLtsyPhoneBookData1IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 447 NONAME - _ZTI23TMockLtsyPhoneBookData1IP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 448 NONAME - _ZTI23TMockLtsyPhoneBookData1IiE @ 449 NONAME - _ZTI23TMockLtsyPhoneBookData2IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 450 NONAME ABSENT - _ZTI23TMockLtsyPhoneBookData2IiP20CPhoneBookStoreEntryE @ 451 NONAME - _ZTI24TMockLtsyContextData1BufI4TBufILi16EEE @ 452 NONAME - _ZTI24TMockLtsyContextData2BufI4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 453 NONAME - _ZTI24TMockLtsyContextData2BufI4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 454 NONAME - _ZTI26CMmCustomMessHandlerGsmExt @ 455 NONAME - _ZTI26CMockTelephonyAudioControl @ 456 NONAME - _ZTI26TMockLtsyPhoneBookData1BufI10TPBFdnInfoE @ 457 NONAME - _ZTI26TMockLtsyPhoneBookData1BufI12TPBEntryInfoE @ 458 NONAME - _ZTI26TMockLtsyPhoneBookData1BufI16CStorageInfoDataE @ 459 NONAME - _ZTI26TMockLtsyPhoneBookData1BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 460 NONAME - _ZTI26TMockLtsyPhoneBookData1BufIP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 461 NONAME - _ZTI26TMockLtsyPhoneBookData1BufIiE @ 462 NONAME - _ZTI26TMockLtsyPhoneBookData2BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 463 NONAME ABSENT - _ZTI26TMockLtsyPhoneBookData2BufIiP20CPhoneBookStoreEntryE @ 464 NONAME - _ZTI27CMockPcktContextMessHandler @ 465 NONAME - _ZTI27CMockPcktServiceMessHandler @ 466 NONAME - _ZTI30CMockPhoneBookStoreMessHandler @ 467 NONAME - _ZTV14TMockLtsyData1I10TGsmCbsMsgE @ 468 NONAME - _ZTV14TMockLtsyData1I11TONStoreMsgE @ 469 NONAME - _ZTV14TMockLtsyData1I12TRfStateInfoE @ 470 NONAME - _ZTV14TMockLtsyData1I12TServiceTypeE @ 471 NONAME - _ZTV14TMockLtsyData1I14TContextParamsE @ 472 NONAME - _ZTV14TMockLtsyData1I16TENStoreResponseE @ 473 NONAME - _ZTV14TMockLtsyData1I20TLockSettingPasswordE @ 474 NONAME - _ZTV14TMockLtsyData1I21TContextConfigurationE @ 475 NONAME - _ZTV14TMockLtsyData1I24TCbsCbmiAndLangAndFilterE @ 476 NONAME - _ZTV14TMockLtsyData1I25TMbmsNetworkServiceStatusE @ 477 NONAME - _ZTV14TMockLtsyData1I25TSendSmsDataAndAttributesE @ 478 NONAME - _ZTV14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 479 NONAME - _ZTV14TMockLtsyData1I4TBufILi10EEE @ 480 NONAME - _ZTV14TMockLtsyData1I4TBufILi128EEE @ 481 NONAME - _ZTV14TMockLtsyData1I4TBufILi15EEE @ 482 NONAME - _ZTV14TMockLtsyData1I4TBufILi16EEE @ 483 NONAME - _ZTV14TMockLtsyData1I4TBufILi32EEE @ 484 NONAME - _ZTV14TMockLtsyData1I4TBufILi6EEE @ 485 NONAME - _ZTV14TMockLtsyData1I5TBuf8ILi128EEE @ 486 NONAME - _ZTV14TMockLtsyData1I5TBuf8ILi15EEE @ 487 NONAME - _ZTV14TMockLtsyData1I5TBuf8ILi16EEE @ 488 NONAME - _ZTV14TMockLtsyData1I5TCharE @ 489 NONAME - _ZTV14TMockLtsyData1I5TTimeE @ 490 NONAME - _ZTV14TMockLtsyData1I7TSmsMsgE @ 491 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI11TAlsSupportEE @ 492 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI11TOperatorIdEE @ 493 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI11TViagParamsEE @ 494 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI12THSxPAStatusEE @ 495 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI12TSetAlsBlockEE @ 496 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI12TSimFileInfoEE @ 497 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI13TSetDriveModeEE @ 498 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI14TBandSelectionEE @ 499 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI16TNetworkModeCapsEE @ 500 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI16TSetAlwaysOnModeEE @ 501 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI18TGetAlsBlockStatusEE @ 502 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI18TViagCacheRecordIdEE @ 503 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI19TViagUHZIUESettingsEE @ 504 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI20TEmerNumberCheckModeEE @ 505 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI5TApduEE @ 506 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI9TDtmfInfoEE @ 507 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone11TAPNEntryV3EE @ 508 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone14TMobileServiceEE @ 509 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone16TMobilePhoneLockEE @ 510 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone16TMobilePhoneNITZEE @ 511 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone19TMobilePhoneALSLineEE @ 512 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneFdnStatusEE @ 513 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneIdServiceEE @ 514 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone22TImsAuthenticateDataV5EE @ 515 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 516 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 517 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockStatusEE @ 518 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCBConditionEE @ 519 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCFConditionEE @ 520 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneNetworkModeEE @ 521 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 522 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone24TMobilePhoneServiceTableEE @ 523 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 524 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 525 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 526 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 527 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 528 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 529 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneSecurityEventEE @ 530 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 531 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 532 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 533 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 534 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone28TAPNControlListServiceStatusEE @ 535 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 536 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 537 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 538 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 539 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 540 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 541 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 542 NONAME - _ZTV14TMockLtsyData1IN14RMobileONStore16TMobileONEntryV1EE @ 543 NONAME - _ZTV14TMockLtsyData1IN14RPacketContext17TContextConfig_R5EE @ 544 NONAME - _ZTV14TMockLtsyData1IN14RPacketContext18TContextConfigCDMAEE @ 545 NONAME - _ZTV14TMockLtsyData1IN14RPacketContext18TContextConfigGPRSEE @ 546 NONAME - _ZTV14TMockLtsyData1IN14RPacketContext20TContextConfigR99_R4EE @ 547 NONAME - _ZTV14TMockLtsyData1IN14RPacketService11TAttachModeEE @ 548 NONAME - _ZTV14TMockLtsyData1IN14RPacketService16TPreferredBearerEE @ 549 NONAME - _ZTV14TMockLtsyData1IN14RPacketService19TRegistrationStatusEE @ 550 NONAME - _ZTV14TMockLtsyData1IN14RPacketService7TStatusEE @ 551 NONAME - _ZTV14TMockLtsyData1IN14RPacketService8TMSClassEE @ 552 NONAME - _ZTV14TMockLtsyData1IN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 553 NONAME - _ZTV14TMockLtsyData1IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 554 NONAME - _ZTV14TMockLtsyData1IN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 555 NONAME - _ZTV14TMockLtsyData1IN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 556 NONAME - _ZTV14TMockLtsyData1IN19RMobileSmsMessaging16TMobileSmsBearerEE @ 557 NONAME - _ZTV14TMockLtsyData1IN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 558 NONAME - _ZTV14TMockLtsyData1IN6RPhone7TStatusEE @ 559 NONAME - _ZTV14TMockLtsyData1IP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 560 NONAME - _ZTV14TMockLtsyData1IP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 561 NONAME - _ZTV14TMockLtsyData1IP13CArrayPtrFlatI14TSmsParametersEE @ 562 NONAME - _ZTV14TMockLtsyData1IP13CArrayPtrFlatI16TENStoreResponseEE @ 563 NONAME - _ZTV14TMockLtsyData1IP13CArrayPtrFlatI7TSmsMsgEE @ 564 NONAME - _ZTV14TMockLtsyData1IP18CMobilePhoneCFListE @ 565 NONAME - _ZTV14TMockLtsyData1IP18CMobilePhoneCWListE @ 566 NONAME - _ZTV14TMockLtsyData1IP25CMobilePhoneNetworkListV2E @ 567 NONAME - _ZTV14TMockLtsyData1IP27CMobilePhoneBroadcastIdListE @ 568 NONAME - _ZTV14TMockLtsyData1IP29CPcktMbmsMonitoredServiceListE @ 569 NONAME - _ZTV14TMockLtsyData1IP4TBufILi100EEE @ 570 NONAME - _ZTV14TMockLtsyData1IP6TDesC8E @ 571 NONAME - _ZTV14TMockLtsyData1IPN12RMmCustomAPI20TSimCardReaderStatusEE @ 572 NONAME - _ZTV14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 573 NONAME - _ZTV14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 574 NONAME - _ZTV14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 575 NONAME - _ZTV14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 576 NONAME - _ZTV14TMockLtsyData1IPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 577 NONAME - _ZTV14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 578 NONAME - _ZTV14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 579 NONAME - _ZTV14TMockLtsyData1IPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 580 NONAME - _ZTV14TMockLtsyData1IhE @ 581 NONAME - _ZTV14TMockLtsyData1IiE @ 582 NONAME - _ZTV14TMockLtsyData1IjE @ 583 NONAME - _ZTV14TMockLtsyData1IlE @ 584 NONAME - _ZTV14TMockLtsyData1ImE @ 585 NONAME - _ZTV14TMockLtsyData1IsE @ 586 NONAME - _ZTV14TMockLtsyData1ItE @ 587 NONAME - _ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 588 NONAME - _ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 589 NONAME - _ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 590 NONAME - _ZTV14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 591 NONAME - _ZTV14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 592 NONAME - _ZTV14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 593 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 594 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 595 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 596 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 597 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 598 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 599 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 600 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 601 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 602 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EES1_E @ 603 NONAME - _ZTV14TMockLtsyData2I4TBufILi16EEiE @ 604 NONAME - _ZTV14TMockLtsyData2I5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 605 NONAME - _ZTV14TMockLtsyData2I5TTimeiE @ 606 NONAME - _ZTV14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 607 NONAME - _ZTV14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 608 NONAME - _ZTV14TMockLtsyData2IN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 609 NONAME - _ZTV14TMockLtsyData2IN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 610 NONAME - _ZTV14TMockLtsyData2IN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 611 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 612 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 613 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 614 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 615 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 616 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 617 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 618 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 619 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 620 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 621 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 622 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 623 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 624 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 625 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 626 NONAME - _ZTV14TMockLtsyData2IN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 627 NONAME - _ZTV14TMockLtsyData2IN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 628 NONAME - _ZTV14TMockLtsyData2IN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 629 NONAME - _ZTV14TMockLtsyData2IN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 630 NONAME - _ZTV14TMockLtsyData2IN14RPacketService7TStatusEiE @ 631 NONAME - _ZTV14TMockLtsyData2IN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 632 NONAME - _ZTV14TMockLtsyData2IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 633 NONAME - _ZTV14TMockLtsyData2IN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 634 NONAME - _ZTV14TMockLtsyData2IP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 635 NONAME - _ZTV14TMockLtsyData2IP13CArrayPtrFlatI7TSmsMsgEiE @ 636 NONAME - _ZTV14TMockLtsyData2IP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 637 NONAME - _ZTV14TMockLtsyData2IP6TDesC8S1_E @ 638 NONAME - _ZTV14TMockLtsyData2IP6TDesC8iE @ 639 NONAME - _ZTV14TMockLtsyData2Ih4TBufILi10EEE @ 640 NONAME - _ZTV14TMockLtsyData2IhiE @ 641 NONAME - _ZTV14TMockLtsyData2IiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 642 NONAME - _ZTV14TMockLtsyData2IiP7TSmsMsgE @ 643 NONAME - _ZTV14TMockLtsyData2IiiE @ 644 NONAME - _ZTV14TMockLtsyData2IjiE @ 645 NONAME - _ZTV14TMockLtsyData2IlaE @ 646 NONAME - _ZTV14TMockLtsyData2Is5TBuf8ILi165EEE @ 647 NONAME - _ZTV15CMockLtsyEngine @ 648 NONAME - _ZTV16CMmCustomStubExt @ 649 NONAME - _ZTV16CMmMessageRouter @ 650 NONAME - _ZTV17TMockLtsyData1BufI10TGsmCbsMsgE @ 651 NONAME - _ZTV17TMockLtsyData1BufI11TONStoreMsgE @ 652 NONAME - _ZTV17TMockLtsyData1BufI12TRfStateInfoE @ 653 NONAME - _ZTV17TMockLtsyData1BufI12TServiceTypeE @ 654 NONAME - _ZTV17TMockLtsyData1BufI14TContextParamsE @ 655 NONAME - _ZTV17TMockLtsyData1BufI16TENStoreResponseE @ 656 NONAME - _ZTV17TMockLtsyData1BufI20TLockSettingPasswordE @ 657 NONAME - _ZTV17TMockLtsyData1BufI21TContextConfigurationE @ 658 NONAME - _ZTV17TMockLtsyData1BufI24TCbsCbmiAndLangAndFilterE @ 659 NONAME - _ZTV17TMockLtsyData1BufI25TMbmsNetworkServiceStatusE @ 660 NONAME - _ZTV17TMockLtsyData1BufI25TSendSmsDataAndAttributesE @ 661 NONAME - _ZTV17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 662 NONAME - _ZTV17TMockLtsyData1BufI4TBufILi10EEE @ 663 NONAME - _ZTV17TMockLtsyData1BufI4TBufILi128EEE @ 664 NONAME - _ZTV17TMockLtsyData1BufI4TBufILi15EEE @ 665 NONAME - _ZTV17TMockLtsyData1BufI4TBufILi16EEE @ 666 NONAME - _ZTV17TMockLtsyData1BufI4TBufILi32EEE @ 667 NONAME - _ZTV17TMockLtsyData1BufI4TBufILi6EEE @ 668 NONAME - _ZTV17TMockLtsyData1BufI5TBuf8ILi128EEE @ 669 NONAME - _ZTV17TMockLtsyData1BufI5TBuf8ILi15EEE @ 670 NONAME - _ZTV17TMockLtsyData1BufI5TBuf8ILi16EEE @ 671 NONAME - _ZTV17TMockLtsyData1BufI5TCharE @ 672 NONAME - _ZTV17TMockLtsyData1BufI5TTimeE @ 673 NONAME - _ZTV17TMockLtsyData1BufI7TSmsMsgE @ 674 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TAlsSupportEE @ 675 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TOperatorIdEE @ 676 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TViagParamsEE @ 677 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI12THSxPAStatusEE @ 678 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI12TSetAlsBlockEE @ 679 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI12TSimFileInfoEE @ 680 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI13TSetDriveModeEE @ 681 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI14TBandSelectionEE @ 682 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI16TNetworkModeCapsEE @ 683 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI16TSetAlwaysOnModeEE @ 684 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI18TGetAlsBlockStatusEE @ 685 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI18TViagCacheRecordIdEE @ 686 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI19TViagUHZIUESettingsEE @ 687 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI20TEmerNumberCheckModeEE @ 688 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI5TApduEE @ 689 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI9TDtmfInfoEE @ 690 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone11TAPNEntryV3EE @ 691 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone14TMobileServiceEE @ 692 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneLockEE @ 693 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneNITZEE @ 694 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone19TMobilePhoneALSLineEE @ 695 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneFdnStatusEE @ 696 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneIdServiceEE @ 697 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone22TImsAuthenticateDataV5EE @ 698 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 699 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 700 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockStatusEE @ 701 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCBConditionEE @ 702 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCFConditionEE @ 703 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneNetworkModeEE @ 704 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 705 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneServiceTableEE @ 706 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 707 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 708 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 709 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 710 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 711 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 712 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneSecurityEventEE @ 713 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 714 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 715 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 716 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 717 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone28TAPNControlListServiceStatusEE @ 718 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 719 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 720 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 721 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 722 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 723 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 724 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 725 NONAME - _ZTV17TMockLtsyData1BufIN14RMobileONStore16TMobileONEntryV1EE @ 726 NONAME - _ZTV17TMockLtsyData1BufIN14RPacketContext17TContextConfig_R5EE @ 727 NONAME - _ZTV17TMockLtsyData1BufIN14RPacketContext18TContextConfigCDMAEE @ 728 NONAME - _ZTV17TMockLtsyData1BufIN14RPacketContext18TContextConfigGPRSEE @ 729 NONAME - _ZTV17TMockLtsyData1BufIN14RPacketContext20TContextConfigR99_R4EE @ 730 NONAME - _ZTV17TMockLtsyData1BufIN14RPacketService11TAttachModeEE @ 731 NONAME - _ZTV17TMockLtsyData1BufIN14RPacketService16TPreferredBearerEE @ 732 NONAME - _ZTV17TMockLtsyData1BufIN14RPacketService19TRegistrationStatusEE @ 733 NONAME - _ZTV17TMockLtsyData1BufIN14RPacketService7TStatusEE @ 734 NONAME - _ZTV17TMockLtsyData1BufIN14RPacketService8TMSClassEE @ 735 NONAME - _ZTV17TMockLtsyData1BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 736 NONAME - _ZTV17TMockLtsyData1BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 737 NONAME - _ZTV17TMockLtsyData1BufIN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 738 NONAME - _ZTV17TMockLtsyData1BufIN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 739 NONAME - _ZTV17TMockLtsyData1BufIN19RMobileSmsMessaging16TMobileSmsBearerEE @ 740 NONAME - _ZTV17TMockLtsyData1BufIN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 741 NONAME - _ZTV17TMockLtsyData1BufIN6RPhone7TStatusEE @ 742 NONAME - _ZTV17TMockLtsyData1BufIP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 743 NONAME - _ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 744 NONAME - _ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI14TSmsParametersEE @ 745 NONAME - _ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI16TENStoreResponseEE @ 746 NONAME - _ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI7TSmsMsgEE @ 747 NONAME - _ZTV17TMockLtsyData1BufIP18CMobilePhoneCFListE @ 748 NONAME - _ZTV17TMockLtsyData1BufIP18CMobilePhoneCWListE @ 749 NONAME - _ZTV17TMockLtsyData1BufIP25CMobilePhoneNetworkListV2E @ 750 NONAME - _ZTV17TMockLtsyData1BufIP27CMobilePhoneBroadcastIdListE @ 751 NONAME - _ZTV17TMockLtsyData1BufIP29CPcktMbmsMonitoredServiceListE @ 752 NONAME - _ZTV17TMockLtsyData1BufIP4TBufILi100EEE @ 753 NONAME - _ZTV17TMockLtsyData1BufIP6TDesC8E @ 754 NONAME - _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI20TSimCardReaderStatusEE @ 755 NONAME - _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 756 NONAME - _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 757 NONAME - _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 758 NONAME - _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 759 NONAME - _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 760 NONAME - _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 761 NONAME - _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 762 NONAME - _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 763 NONAME - _ZTV17TMockLtsyData1BufIhE @ 764 NONAME - _ZTV17TMockLtsyData1BufIiE @ 765 NONAME - _ZTV17TMockLtsyData1BufIjE @ 766 NONAME - _ZTV17TMockLtsyData1BufIlE @ 767 NONAME - _ZTV17TMockLtsyData1BufImE @ 768 NONAME - _ZTV17TMockLtsyData1BufIsE @ 769 NONAME - _ZTV17TMockLtsyData1BufItE @ 770 NONAME - _ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 771 NONAME - _ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 772 NONAME - _ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 773 NONAME - _ZTV17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 774 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 775 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 776 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 777 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 778 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 779 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 780 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 781 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 782 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 783 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 784 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 785 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EES1_E @ 786 NONAME - _ZTV17TMockLtsyData2BufI4TBufILi16EEiE @ 787 NONAME - _ZTV17TMockLtsyData2BufI5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 788 NONAME - _ZTV17TMockLtsyData2BufI5TTimeiE @ 789 NONAME - _ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 790 NONAME - _ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 791 NONAME - _ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 792 NONAME - _ZTV17TMockLtsyData2BufIN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 793 NONAME - _ZTV17TMockLtsyData2BufIN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 794 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 795 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 796 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 797 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 798 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 799 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 800 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 801 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 802 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 803 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 804 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 805 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 806 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 807 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 808 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 809 NONAME - _ZTV17TMockLtsyData2BufIN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 810 NONAME - _ZTV17TMockLtsyData2BufIN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 811 NONAME - _ZTV17TMockLtsyData2BufIN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 812 NONAME - _ZTV17TMockLtsyData2BufIN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 813 NONAME - _ZTV17TMockLtsyData2BufIN14RPacketService7TStatusEiE @ 814 NONAME - _ZTV17TMockLtsyData2BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 815 NONAME - _ZTV17TMockLtsyData2BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 816 NONAME - _ZTV17TMockLtsyData2BufIN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 817 NONAME - _ZTV17TMockLtsyData2BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 818 NONAME - _ZTV17TMockLtsyData2BufIP13CArrayPtrFlatI7TSmsMsgEiE @ 819 NONAME - _ZTV17TMockLtsyData2BufIP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 820 NONAME - _ZTV17TMockLtsyData2BufIP6TDesC8S1_E @ 821 NONAME - _ZTV17TMockLtsyData2BufIP6TDesC8iE @ 822 NONAME - _ZTV17TMockLtsyData2BufIh4TBufILi10EEE @ 823 NONAME - _ZTV17TMockLtsyData2BufIhiE @ 824 NONAME - _ZTV17TMockLtsyData2BufIiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 825 NONAME - _ZTV17TMockLtsyData2BufIiP7TSmsMsgE @ 826 NONAME - _ZTV17TMockLtsyData2BufIiiE @ 827 NONAME - _ZTV17TMockLtsyData2BufIjiE @ 828 NONAME - _ZTV17TMockLtsyData2BufIlaE @ 829 NONAME - _ZTV17TMockLtsyData2BufIs5TBuf8ILi165EEE @ 830 NONAME - _ZTV18CMockLtsyFactoryV1 @ 831 NONAME - _ZTV18CMockLtsyFactoryV2 @ 832 NONAME - _ZTV18CMockLtsyFactoryV3 @ 833 NONAME - _ZTV18TMockLtsyCallData1I4TBufILi129EEE @ 834 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall16TMobileCallEventEE @ 835 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall17TMobileCallInfoV1EE @ 836 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall17TMobileCallStatusEE @ 837 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV1EE @ 838 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV2EE @ 839 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV7EE @ 840 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall21TMobileCallDataCapsV1EE @ 841 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall22TMobileCallHscsdInfoV8EE @ 842 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV1EE @ 843 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV2EE @ 844 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV8EE @ 845 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV1EE @ 846 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV2EE @ 847 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV7EE @ 848 NONAME - _ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV8EE @ 849 NONAME - _ZTV18TMockLtsyCallData1IN12RMobilePhone19TMobilePhonePrivacyEE @ 850 NONAME - _ZTV18TMockLtsyCallData1IN5RCall14TBearerServiceEE @ 851 NONAME - _ZTV18TMockLtsyCallData1IN5RCall7TStatusEE @ 852 NONAME - _ZTV18TMockLtsyCallData1IN5RCall9TCommPortEE @ 853 NONAME - _ZTV18TMockLtsyCallData1IiE @ 854 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 855 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 856 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 857 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 858 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 859 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 860 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 861 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 862 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 863 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 864 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 865 NONAME - _ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 866 NONAME - _ZTV18TMockLtsyCallData2IiiE @ 867 NONAME - _ZTV19CMockSmsMessHandler @ 868 NONAME - _ZTV20CMockCallMessHandler @ 869 NONAME - _ZTV21CMockPhoneMessHandler @ 870 NONAME - _ZTV21TMockLtsyCallData1BufI4TBufILi129EEE @ 871 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall16TMobileCallEventEE @ 872 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallInfoV1EE @ 873 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallStatusEE @ 874 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV1EE @ 875 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV2EE @ 876 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV7EE @ 877 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall21TMobileCallDataCapsV1EE @ 878 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall22TMobileCallHscsdInfoV8EE @ 879 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV1EE @ 880 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV2EE @ 881 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV8EE @ 882 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV1EE @ 883 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV2EE @ 884 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV7EE @ 885 NONAME - _ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV8EE @ 886 NONAME - _ZTV21TMockLtsyCallData1BufIN12RMobilePhone19TMobilePhonePrivacyEE @ 887 NONAME - _ZTV21TMockLtsyCallData1BufIN5RCall14TBearerServiceEE @ 888 NONAME - _ZTV21TMockLtsyCallData1BufIN5RCall7TStatusEE @ 889 NONAME - _ZTV21TMockLtsyCallData1BufIN5RCall9TCommPortEE @ 890 NONAME - _ZTV21TMockLtsyCallData1BufIiE @ 891 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 892 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 893 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 894 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 895 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 896 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 897 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 898 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 899 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 900 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 901 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 902 NONAME - _ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 903 NONAME - _ZTV21TMockLtsyCallData2BufIiiE @ 904 NONAME - _ZTV21TMockLtsyContextData1I4TBufILi16EEE @ 905 NONAME - _ZTV21TMockLtsyContextData2I4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 906 NONAME - _ZTV21TMockLtsyContextData2I4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 907 NONAME - _ZTV23CMockPcktQoSMessHandler @ 908 NONAME - _ZTV23TMockLtsyPacketQoSData1I4TBufILi16EEE @ 909 NONAME - _ZTV23TMockLtsyPhoneBookData1I10TPBFdnInfoE @ 910 NONAME - _ZTV23TMockLtsyPhoneBookData1I12TPBEntryInfoE @ 911 NONAME - _ZTV23TMockLtsyPhoneBookData1I16CStorageInfoDataE @ 912 NONAME - _ZTV23TMockLtsyPhoneBookData1IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 913 NONAME - _ZTV23TMockLtsyPhoneBookData1IP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 914 NONAME - _ZTV23TMockLtsyPhoneBookData1IiE @ 915 NONAME - _ZTV23TMockLtsyPhoneBookData2IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 916 NONAME ABSENT - _ZTV23TMockLtsyPhoneBookData2IiP20CPhoneBookStoreEntryE @ 917 NONAME - _ZTV24TMockLtsyContextData1BufI4TBufILi16EEE @ 918 NONAME - _ZTV24TMockLtsyContextData2BufI4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 919 NONAME - _ZTV24TMockLtsyContextData2BufI4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 920 NONAME - _ZTV26CMmCustomMessHandlerGsmExt @ 921 NONAME - _ZTV26CMockTelephonyAudioControl @ 922 NONAME - _ZTV26TMockLtsyPhoneBookData1BufI10TPBFdnInfoE @ 923 NONAME - _ZTV26TMockLtsyPhoneBookData1BufI12TPBEntryInfoE @ 924 NONAME - _ZTV26TMockLtsyPhoneBookData1BufI16CStorageInfoDataE @ 925 NONAME - _ZTV26TMockLtsyPhoneBookData1BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 926 NONAME - _ZTV26TMockLtsyPhoneBookData1BufIP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 927 NONAME - _ZTV26TMockLtsyPhoneBookData1BufIiE @ 928 NONAME - _ZTV26TMockLtsyPhoneBookData2BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 929 NONAME ABSENT - _ZTV26TMockLtsyPhoneBookData2BufIiP20CPhoneBookStoreEntryE @ 930 NONAME - _ZTV27CMockPcktContextMessHandler @ 931 NONAME - _ZTV27CMockPcktServiceMessHandler @ 932 NONAME - _ZTV30CMockPhoneBookStoreMessHandler @ 933 NONAME - _ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneDTMFEventEE @ 934 NONAME - _ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneDTMFEventEE @ 935 NONAME - _ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneDTMFEventEE @ 936 NONAME - _ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneDTMFEventEE @ 937 NONAME - _ZTI14TMockLtsyData1IN12RMmCustomAPI15TApduParametersEE @ 938 NONAME - _ZTI17TMockLtsyData1BufIN12RMmCustomAPI15TApduParametersEE @ 939 NONAME - _ZTV14TMockLtsyData1IN12RMmCustomAPI15TApduParametersEE @ 940 NONAME - _ZTV17TMockLtsyData1BufIN12RMmCustomAPI15TApduParametersEE @ 941 NONAME - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/mocklicenseetsyu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/eabi/mocklicenseetsyu.def Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,943 @@ +EXPORTS + _Z12LTsyFactoryLv @ 1 NONAME + _ZTI14TMockLtsyData1I10TGsmCbsMsgE @ 2 NONAME + _ZTI14TMockLtsyData1I11TONStoreMsgE @ 3 NONAME + _ZTI14TMockLtsyData1I12TRfStateInfoE @ 4 NONAME + _ZTI14TMockLtsyData1I12TServiceTypeE @ 5 NONAME + _ZTI14TMockLtsyData1I14TContextParamsE @ 6 NONAME + _ZTI14TMockLtsyData1I16TENStoreResponseE @ 7 NONAME + _ZTI14TMockLtsyData1I20TLockSettingPasswordE @ 8 NONAME + _ZTI14TMockLtsyData1I21TContextConfigurationE @ 9 NONAME + _ZTI14TMockLtsyData1I24TCbsCbmiAndLangAndFilterE @ 10 NONAME + _ZTI14TMockLtsyData1I25TMbmsNetworkServiceStatusE @ 11 NONAME + _ZTI14TMockLtsyData1I25TSendSmsDataAndAttributesE @ 12 NONAME + _ZTI14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 13 NONAME + _ZTI14TMockLtsyData1I4TBufILi10EEE @ 14 NONAME + _ZTI14TMockLtsyData1I4TBufILi128EEE @ 15 NONAME + _ZTI14TMockLtsyData1I4TBufILi15EEE @ 16 NONAME + _ZTI14TMockLtsyData1I4TBufILi16EEE @ 17 NONAME + _ZTI14TMockLtsyData1I4TBufILi32EEE @ 18 NONAME + _ZTI14TMockLtsyData1I4TBufILi6EEE @ 19 NONAME + _ZTI14TMockLtsyData1I5TBuf8ILi128EEE @ 20 NONAME + _ZTI14TMockLtsyData1I5TBuf8ILi15EEE @ 21 NONAME + _ZTI14TMockLtsyData1I5TBuf8ILi16EEE @ 22 NONAME + _ZTI14TMockLtsyData1I5TCharE @ 23 NONAME + _ZTI14TMockLtsyData1I5TTimeE @ 24 NONAME + _ZTI14TMockLtsyData1I7TSmsMsgE @ 25 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI11TAlsSupportEE @ 26 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI11TOperatorIdEE @ 27 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI11TViagParamsEE @ 28 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI12THSxPAStatusEE @ 29 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI12TSetAlsBlockEE @ 30 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI12TSimFileInfoEE @ 31 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI13TSetDriveModeEE @ 32 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI14TBandSelectionEE @ 33 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI16TNetworkModeCapsEE @ 34 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI16TSetAlwaysOnModeEE @ 35 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI18TGetAlsBlockStatusEE @ 36 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI18TViagCacheRecordIdEE @ 37 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI19TViagUHZIUESettingsEE @ 38 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI20TEmerNumberCheckModeEE @ 39 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI5TApduEE @ 40 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI9TDtmfInfoEE @ 41 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone11TAPNEntryV3EE @ 42 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone14TMobileServiceEE @ 43 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone16TMobilePhoneLockEE @ 44 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone16TMobilePhoneNITZEE @ 45 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone19TMobilePhoneALSLineEE @ 46 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneFdnStatusEE @ 47 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneIdServiceEE @ 48 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone22TImsAuthenticateDataV5EE @ 49 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 50 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 51 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockStatusEE @ 52 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCBConditionEE @ 53 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCFConditionEE @ 54 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone23TMobilePhoneNetworkModeEE @ 55 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 56 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone24TMobilePhoneServiceTableEE @ 57 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 58 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 59 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 60 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 61 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 62 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 63 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone25TMobilePhoneSecurityEventEE @ 64 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 65 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 66 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 67 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 68 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone28TAPNControlListServiceStatusEE @ 69 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 70 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 71 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 72 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 73 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 74 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 75 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 76 NONAME + _ZTI14TMockLtsyData1IN14RMobileONStore16TMobileONEntryV1EE @ 77 NONAME + _ZTI14TMockLtsyData1IN14RPacketContext17TContextConfig_R5EE @ 78 NONAME + _ZTI14TMockLtsyData1IN14RPacketContext18TContextConfigCDMAEE @ 79 NONAME + _ZTI14TMockLtsyData1IN14RPacketContext18TContextConfigGPRSEE @ 80 NONAME + _ZTI14TMockLtsyData1IN14RPacketContext20TContextConfigR99_R4EE @ 81 NONAME + _ZTI14TMockLtsyData1IN14RPacketService11TAttachModeEE @ 82 NONAME + _ZTI14TMockLtsyData1IN14RPacketService16TPreferredBearerEE @ 83 NONAME + _ZTI14TMockLtsyData1IN14RPacketService19TRegistrationStatusEE @ 84 NONAME + _ZTI14TMockLtsyData1IN14RPacketService7TStatusEE @ 85 NONAME + _ZTI14TMockLtsyData1IN14RPacketService8TMSClassEE @ 86 NONAME + _ZTI14TMockLtsyData1IN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 87 NONAME + _ZTI14TMockLtsyData1IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 88 NONAME + _ZTI14TMockLtsyData1IN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 89 NONAME + _ZTI14TMockLtsyData1IN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 90 NONAME + _ZTI14TMockLtsyData1IN19RMobileSmsMessaging16TMobileSmsBearerEE @ 91 NONAME + _ZTI14TMockLtsyData1IN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 92 NONAME + _ZTI14TMockLtsyData1IN6RPhone7TStatusEE @ 93 NONAME + _ZTI14TMockLtsyData1IP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 94 NONAME + _ZTI14TMockLtsyData1IP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 95 NONAME + _ZTI14TMockLtsyData1IP13CArrayPtrFlatI14TSmsParametersEE @ 96 NONAME + _ZTI14TMockLtsyData1IP13CArrayPtrFlatI16TENStoreResponseEE @ 97 NONAME + _ZTI14TMockLtsyData1IP13CArrayPtrFlatI7TSmsMsgEE @ 98 NONAME + _ZTI14TMockLtsyData1IP18CMobilePhoneCFListE @ 99 NONAME + _ZTI14TMockLtsyData1IP18CMobilePhoneCWListE @ 100 NONAME + _ZTI14TMockLtsyData1IP25CMobilePhoneNetworkListV2E @ 101 NONAME + _ZTI14TMockLtsyData1IP27CMobilePhoneBroadcastIdListE @ 102 NONAME + _ZTI14TMockLtsyData1IP29CPcktMbmsMonitoredServiceListE @ 103 NONAME + _ZTI14TMockLtsyData1IP4TBufILi100EEE @ 104 NONAME + _ZTI14TMockLtsyData1IP6TDesC8E @ 105 NONAME + _ZTI14TMockLtsyData1IPN12RMmCustomAPI20TSimCardReaderStatusEE @ 106 NONAME + _ZTI14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 107 NONAME + _ZTI14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 108 NONAME + _ZTI14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 109 NONAME + _ZTI14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 110 NONAME + _ZTI14TMockLtsyData1IPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 111 NONAME + _ZTI14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 112 NONAME + _ZTI14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 113 NONAME + _ZTI14TMockLtsyData1IPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 114 NONAME + _ZTI14TMockLtsyData1IhE @ 115 NONAME + _ZTI14TMockLtsyData1IiE @ 116 NONAME + _ZTI14TMockLtsyData1IjE @ 117 NONAME + _ZTI14TMockLtsyData1IlE @ 118 NONAME + _ZTI14TMockLtsyData1ImE @ 119 NONAME + _ZTI14TMockLtsyData1IsE @ 120 NONAME + _ZTI14TMockLtsyData1ItE @ 121 NONAME + _ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 122 NONAME + _ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 123 NONAME + _ZTI14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 124 NONAME + _ZTI14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 125 NONAME + _ZTI14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 126 NONAME + _ZTI14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 127 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 128 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 129 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 130 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 131 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 132 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 133 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 134 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 135 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 136 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EES1_E @ 137 NONAME + _ZTI14TMockLtsyData2I4TBufILi16EEiE @ 138 NONAME + _ZTI14TMockLtsyData2I5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 139 NONAME + _ZTI14TMockLtsyData2I5TTimeiE @ 140 NONAME + _ZTI14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 141 NONAME + _ZTI14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 142 NONAME + _ZTI14TMockLtsyData2IN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 143 NONAME + _ZTI14TMockLtsyData2IN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 144 NONAME + _ZTI14TMockLtsyData2IN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 145 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 146 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 147 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 148 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 149 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 150 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 151 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 152 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 153 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 154 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 155 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 156 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 157 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 158 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 159 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 160 NONAME + _ZTI14TMockLtsyData2IN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 161 NONAME + _ZTI14TMockLtsyData2IN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 162 NONAME + _ZTI14TMockLtsyData2IN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 163 NONAME + _ZTI14TMockLtsyData2IN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 164 NONAME + _ZTI14TMockLtsyData2IN14RPacketService7TStatusEiE @ 165 NONAME + _ZTI14TMockLtsyData2IN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 166 NONAME + _ZTI14TMockLtsyData2IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 167 NONAME + _ZTI14TMockLtsyData2IN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 168 NONAME + _ZTI14TMockLtsyData2IP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 169 NONAME + _ZTI14TMockLtsyData2IP13CArrayPtrFlatI7TSmsMsgEiE @ 170 NONAME + _ZTI14TMockLtsyData2IP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 171 NONAME + _ZTI14TMockLtsyData2IP6TDesC8S1_E @ 172 NONAME + _ZTI14TMockLtsyData2IP6TDesC8iE @ 173 NONAME + _ZTI14TMockLtsyData2Ih4TBufILi10EEE @ 174 NONAME + _ZTI14TMockLtsyData2IhiE @ 175 NONAME + _ZTI14TMockLtsyData2IiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 176 NONAME + _ZTI14TMockLtsyData2IiP7TSmsMsgE @ 177 NONAME + _ZTI14TMockLtsyData2IiiE @ 178 NONAME + _ZTI14TMockLtsyData2IjiE @ 179 NONAME + _ZTI14TMockLtsyData2IlaE @ 180 NONAME + _ZTI14TMockLtsyData2Is5TBuf8ILi165EEE @ 181 NONAME + _ZTI15CMockLtsyEngine @ 182 NONAME + _ZTI16CMmCustomStubExt @ 183 NONAME + _ZTI16CMmMessageRouter @ 184 NONAME + _ZTI17TMockLtsyData1BufI10TGsmCbsMsgE @ 185 NONAME + _ZTI17TMockLtsyData1BufI11TONStoreMsgE @ 186 NONAME + _ZTI17TMockLtsyData1BufI12TRfStateInfoE @ 187 NONAME + _ZTI17TMockLtsyData1BufI12TServiceTypeE @ 188 NONAME + _ZTI17TMockLtsyData1BufI14TContextParamsE @ 189 NONAME + _ZTI17TMockLtsyData1BufI16TENStoreResponseE @ 190 NONAME + _ZTI17TMockLtsyData1BufI20TLockSettingPasswordE @ 191 NONAME + _ZTI17TMockLtsyData1BufI21TContextConfigurationE @ 192 NONAME + _ZTI17TMockLtsyData1BufI24TCbsCbmiAndLangAndFilterE @ 193 NONAME + _ZTI17TMockLtsyData1BufI25TMbmsNetworkServiceStatusE @ 194 NONAME + _ZTI17TMockLtsyData1BufI25TSendSmsDataAndAttributesE @ 195 NONAME + _ZTI17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 196 NONAME + _ZTI17TMockLtsyData1BufI4TBufILi10EEE @ 197 NONAME + _ZTI17TMockLtsyData1BufI4TBufILi128EEE @ 198 NONAME + _ZTI17TMockLtsyData1BufI4TBufILi15EEE @ 199 NONAME + _ZTI17TMockLtsyData1BufI4TBufILi16EEE @ 200 NONAME + _ZTI17TMockLtsyData1BufI4TBufILi32EEE @ 201 NONAME + _ZTI17TMockLtsyData1BufI4TBufILi6EEE @ 202 NONAME + _ZTI17TMockLtsyData1BufI5TBuf8ILi128EEE @ 203 NONAME + _ZTI17TMockLtsyData1BufI5TBuf8ILi15EEE @ 204 NONAME + _ZTI17TMockLtsyData1BufI5TBuf8ILi16EEE @ 205 NONAME + _ZTI17TMockLtsyData1BufI5TCharE @ 206 NONAME + _ZTI17TMockLtsyData1BufI5TTimeE @ 207 NONAME + _ZTI17TMockLtsyData1BufI7TSmsMsgE @ 208 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TAlsSupportEE @ 209 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TOperatorIdEE @ 210 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI11TViagParamsEE @ 211 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI12THSxPAStatusEE @ 212 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI12TSetAlsBlockEE @ 213 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI12TSimFileInfoEE @ 214 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI13TSetDriveModeEE @ 215 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI14TBandSelectionEE @ 216 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI16TNetworkModeCapsEE @ 217 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI16TSetAlwaysOnModeEE @ 218 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI18TGetAlsBlockStatusEE @ 219 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI18TViagCacheRecordIdEE @ 220 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI19TViagUHZIUESettingsEE @ 221 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI20TEmerNumberCheckModeEE @ 222 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI5TApduEE @ 223 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI9TDtmfInfoEE @ 224 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone11TAPNEntryV3EE @ 225 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone14TMobileServiceEE @ 226 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneLockEE @ 227 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneNITZEE @ 228 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone19TMobilePhoneALSLineEE @ 229 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneFdnStatusEE @ 230 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneIdServiceEE @ 231 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone22TImsAuthenticateDataV5EE @ 232 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 233 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 234 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockStatusEE @ 235 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCBConditionEE @ 236 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCFConditionEE @ 237 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneNetworkModeEE @ 238 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 239 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneServiceTableEE @ 240 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 241 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 242 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 243 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 244 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 245 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 246 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneSecurityEventEE @ 247 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 248 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 249 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 250 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 251 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone28TAPNControlListServiceStatusEE @ 252 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 253 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 254 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 255 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 256 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 257 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 258 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 259 NONAME + _ZTI17TMockLtsyData1BufIN14RMobileONStore16TMobileONEntryV1EE @ 260 NONAME + _ZTI17TMockLtsyData1BufIN14RPacketContext17TContextConfig_R5EE @ 261 NONAME + _ZTI17TMockLtsyData1BufIN14RPacketContext18TContextConfigCDMAEE @ 262 NONAME + _ZTI17TMockLtsyData1BufIN14RPacketContext18TContextConfigGPRSEE @ 263 NONAME + _ZTI17TMockLtsyData1BufIN14RPacketContext20TContextConfigR99_R4EE @ 264 NONAME + _ZTI17TMockLtsyData1BufIN14RPacketService11TAttachModeEE @ 265 NONAME + _ZTI17TMockLtsyData1BufIN14RPacketService16TPreferredBearerEE @ 266 NONAME + _ZTI17TMockLtsyData1BufIN14RPacketService19TRegistrationStatusEE @ 267 NONAME + _ZTI17TMockLtsyData1BufIN14RPacketService7TStatusEE @ 268 NONAME + _ZTI17TMockLtsyData1BufIN14RPacketService8TMSClassEE @ 269 NONAME + _ZTI17TMockLtsyData1BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 270 NONAME + _ZTI17TMockLtsyData1BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 271 NONAME + _ZTI17TMockLtsyData1BufIN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 272 NONAME + _ZTI17TMockLtsyData1BufIN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 273 NONAME + _ZTI17TMockLtsyData1BufIN19RMobileSmsMessaging16TMobileSmsBearerEE @ 274 NONAME + _ZTI17TMockLtsyData1BufIN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 275 NONAME + _ZTI17TMockLtsyData1BufIN6RPhone7TStatusEE @ 276 NONAME + _ZTI17TMockLtsyData1BufIP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 277 NONAME + _ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 278 NONAME + _ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI14TSmsParametersEE @ 279 NONAME + _ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI16TENStoreResponseEE @ 280 NONAME + _ZTI17TMockLtsyData1BufIP13CArrayPtrFlatI7TSmsMsgEE @ 281 NONAME + _ZTI17TMockLtsyData1BufIP18CMobilePhoneCFListE @ 282 NONAME + _ZTI17TMockLtsyData1BufIP18CMobilePhoneCWListE @ 283 NONAME + _ZTI17TMockLtsyData1BufIP25CMobilePhoneNetworkListV2E @ 284 NONAME + _ZTI17TMockLtsyData1BufIP27CMobilePhoneBroadcastIdListE @ 285 NONAME + _ZTI17TMockLtsyData1BufIP29CPcktMbmsMonitoredServiceListE @ 286 NONAME + _ZTI17TMockLtsyData1BufIP4TBufILi100EEE @ 287 NONAME + _ZTI17TMockLtsyData1BufIP6TDesC8E @ 288 NONAME + _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI20TSimCardReaderStatusEE @ 289 NONAME + _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 290 NONAME + _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 291 NONAME + _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 292 NONAME + _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 293 NONAME + _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 294 NONAME + _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 295 NONAME + _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 296 NONAME + _ZTI17TMockLtsyData1BufIPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 297 NONAME + _ZTI17TMockLtsyData1BufIhE @ 298 NONAME + _ZTI17TMockLtsyData1BufIiE @ 299 NONAME + _ZTI17TMockLtsyData1BufIjE @ 300 NONAME + _ZTI17TMockLtsyData1BufIlE @ 301 NONAME + _ZTI17TMockLtsyData1BufImE @ 302 NONAME + _ZTI17TMockLtsyData1BufIsE @ 303 NONAME + _ZTI17TMockLtsyData1BufItE @ 304 NONAME + _ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 305 NONAME + _ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 306 NONAME + _ZTI17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 307 NONAME + _ZTI17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 308 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 309 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 310 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 311 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 312 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 313 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 314 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 315 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 316 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 317 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 318 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 319 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EES1_E @ 320 NONAME + _ZTI17TMockLtsyData2BufI4TBufILi16EEiE @ 321 NONAME + _ZTI17TMockLtsyData2BufI5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 322 NONAME + _ZTI17TMockLtsyData2BufI5TTimeiE @ 323 NONAME + _ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 324 NONAME + _ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 325 NONAME + _ZTI17TMockLtsyData2BufIN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 326 NONAME + _ZTI17TMockLtsyData2BufIN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 327 NONAME + _ZTI17TMockLtsyData2BufIN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 328 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 329 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 330 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 331 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 332 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 333 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 334 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 335 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 336 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 337 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 338 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 339 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 340 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 341 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 342 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 343 NONAME + _ZTI17TMockLtsyData2BufIN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 344 NONAME + _ZTI17TMockLtsyData2BufIN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 345 NONAME + _ZTI17TMockLtsyData2BufIN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 346 NONAME + _ZTI17TMockLtsyData2BufIN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 347 NONAME + _ZTI17TMockLtsyData2BufIN14RPacketService7TStatusEiE @ 348 NONAME + _ZTI17TMockLtsyData2BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 349 NONAME + _ZTI17TMockLtsyData2BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 350 NONAME + _ZTI17TMockLtsyData2BufIN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 351 NONAME + _ZTI17TMockLtsyData2BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 352 NONAME + _ZTI17TMockLtsyData2BufIP13CArrayPtrFlatI7TSmsMsgEiE @ 353 NONAME + _ZTI17TMockLtsyData2BufIP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 354 NONAME + _ZTI17TMockLtsyData2BufIP6TDesC8S1_E @ 355 NONAME + _ZTI17TMockLtsyData2BufIP6TDesC8iE @ 356 NONAME + _ZTI17TMockLtsyData2BufIh4TBufILi10EEE @ 357 NONAME + _ZTI17TMockLtsyData2BufIhiE @ 358 NONAME + _ZTI17TMockLtsyData2BufIiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 359 NONAME + _ZTI17TMockLtsyData2BufIiP7TSmsMsgE @ 360 NONAME + _ZTI17TMockLtsyData2BufIiiE @ 361 NONAME + _ZTI17TMockLtsyData2BufIjiE @ 362 NONAME + _ZTI17TMockLtsyData2BufIlaE @ 363 NONAME + _ZTI17TMockLtsyData2BufIs5TBuf8ILi165EEE @ 364 NONAME + _ZTI18CMockLtsyFactoryV1 @ 365 NONAME + _ZTI18CMockLtsyFactoryV2 @ 366 NONAME + _ZTI18CMockLtsyFactoryV3 @ 367 NONAME + _ZTI18TMockLtsyCallData1I4TBufILi129EEE @ 368 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall16TMobileCallEventEE @ 369 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall17TMobileCallInfoV1EE @ 370 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall17TMobileCallStatusEE @ 371 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV1EE @ 372 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV2EE @ 373 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV7EE @ 374 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall21TMobileCallDataCapsV1EE @ 375 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall22TMobileCallHscsdInfoV8EE @ 376 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV1EE @ 377 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV2EE @ 378 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV8EE @ 379 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV1EE @ 380 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV2EE @ 381 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV7EE @ 382 NONAME + _ZTI18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV8EE @ 383 NONAME + _ZTI18TMockLtsyCallData1IN12RMobilePhone19TMobilePhonePrivacyEE @ 384 NONAME + _ZTI18TMockLtsyCallData1IN5RCall14TBearerServiceEE @ 385 NONAME + _ZTI18TMockLtsyCallData1IN5RCall7TStatusEE @ 386 NONAME + _ZTI18TMockLtsyCallData1IN5RCall9TCommPortEE @ 387 NONAME + _ZTI18TMockLtsyCallData1IiE @ 388 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 389 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 390 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 391 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 392 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 393 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 394 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 395 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 396 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 397 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 398 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 399 NONAME + _ZTI18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 400 NONAME + _ZTI18TMockLtsyCallData2IiiE @ 401 NONAME + _ZTI19CMockSmsMessHandler @ 402 NONAME + _ZTI20CMockCallMessHandler @ 403 NONAME + _ZTI21CMockPhoneMessHandler @ 404 NONAME + _ZTI21TMockLtsyCallData1BufI4TBufILi129EEE @ 405 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall16TMobileCallEventEE @ 406 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallInfoV1EE @ 407 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallStatusEE @ 408 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV1EE @ 409 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV2EE @ 410 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV7EE @ 411 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall21TMobileCallDataCapsV1EE @ 412 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall22TMobileCallHscsdInfoV8EE @ 413 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV1EE @ 414 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV2EE @ 415 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV8EE @ 416 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV1EE @ 417 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV2EE @ 418 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV7EE @ 419 NONAME + _ZTI21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV8EE @ 420 NONAME + _ZTI21TMockLtsyCallData1BufIN12RMobilePhone19TMobilePhonePrivacyEE @ 421 NONAME + _ZTI21TMockLtsyCallData1BufIN5RCall14TBearerServiceEE @ 422 NONAME + _ZTI21TMockLtsyCallData1BufIN5RCall7TStatusEE @ 423 NONAME + _ZTI21TMockLtsyCallData1BufIN5RCall9TCommPortEE @ 424 NONAME + _ZTI21TMockLtsyCallData1BufIiE @ 425 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 426 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 427 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 428 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 429 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 430 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 431 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 432 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 433 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 434 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 435 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 436 NONAME + _ZTI21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 437 NONAME + _ZTI21TMockLtsyCallData2BufIiiE @ 438 NONAME + _ZTI21TMockLtsyContextData1I4TBufILi16EEE @ 439 NONAME + _ZTI21TMockLtsyContextData2I4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 440 NONAME + _ZTI21TMockLtsyContextData2I4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 441 NONAME + _ZTI23CMockPcktQoSMessHandler @ 442 NONAME + _ZTI23TMockLtsyPacketQoSData1I4TBufILi16EEE @ 443 NONAME + _ZTI23TMockLtsyPhoneBookData1I10TPBFdnInfoE @ 444 NONAME + _ZTI23TMockLtsyPhoneBookData1I12TPBEntryInfoE @ 445 NONAME + _ZTI23TMockLtsyPhoneBookData1I16CStorageInfoDataE @ 446 NONAME + _ZTI23TMockLtsyPhoneBookData1IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 447 NONAME + _ZTI23TMockLtsyPhoneBookData1IP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 448 NONAME + _ZTI23TMockLtsyPhoneBookData1IiE @ 449 NONAME + _ZTI23TMockLtsyPhoneBookData2IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 450 NONAME ABSENT + _ZTI23TMockLtsyPhoneBookData2IiP20CPhoneBookStoreEntryE @ 451 NONAME + _ZTI24TMockLtsyContextData1BufI4TBufILi16EEE @ 452 NONAME + _ZTI24TMockLtsyContextData2BufI4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 453 NONAME + _ZTI24TMockLtsyContextData2BufI4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 454 NONAME + _ZTI26CMmCustomMessHandlerGsmExt @ 455 NONAME + _ZTI26CMockTelephonyAudioControl @ 456 NONAME + _ZTI26TMockLtsyPhoneBookData1BufI10TPBFdnInfoE @ 457 NONAME + _ZTI26TMockLtsyPhoneBookData1BufI12TPBEntryInfoE @ 458 NONAME + _ZTI26TMockLtsyPhoneBookData1BufI16CStorageInfoDataE @ 459 NONAME + _ZTI26TMockLtsyPhoneBookData1BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 460 NONAME + _ZTI26TMockLtsyPhoneBookData1BufIP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 461 NONAME + _ZTI26TMockLtsyPhoneBookData1BufIiE @ 462 NONAME + _ZTI26TMockLtsyPhoneBookData2BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 463 NONAME ABSENT + _ZTI26TMockLtsyPhoneBookData2BufIiP20CPhoneBookStoreEntryE @ 464 NONAME + _ZTI27CMockPcktContextMessHandler @ 465 NONAME + _ZTI27CMockPcktServiceMessHandler @ 466 NONAME + _ZTI30CMockPhoneBookStoreMessHandler @ 467 NONAME + _ZTV14TMockLtsyData1I10TGsmCbsMsgE @ 468 NONAME + _ZTV14TMockLtsyData1I11TONStoreMsgE @ 469 NONAME + _ZTV14TMockLtsyData1I12TRfStateInfoE @ 470 NONAME + _ZTV14TMockLtsyData1I12TServiceTypeE @ 471 NONAME + _ZTV14TMockLtsyData1I14TContextParamsE @ 472 NONAME + _ZTV14TMockLtsyData1I16TENStoreResponseE @ 473 NONAME + _ZTV14TMockLtsyData1I20TLockSettingPasswordE @ 474 NONAME + _ZTV14TMockLtsyData1I21TContextConfigurationE @ 475 NONAME + _ZTV14TMockLtsyData1I24TCbsCbmiAndLangAndFilterE @ 476 NONAME + _ZTV14TMockLtsyData1I25TMbmsNetworkServiceStatusE @ 477 NONAME + _ZTV14TMockLtsyData1I25TSendSmsDataAndAttributesE @ 478 NONAME + _ZTV14TMockLtsyData1I31TMmMbmsMonitorServiceListParamsE @ 479 NONAME + _ZTV14TMockLtsyData1I4TBufILi10EEE @ 480 NONAME + _ZTV14TMockLtsyData1I4TBufILi128EEE @ 481 NONAME + _ZTV14TMockLtsyData1I4TBufILi15EEE @ 482 NONAME + _ZTV14TMockLtsyData1I4TBufILi16EEE @ 483 NONAME + _ZTV14TMockLtsyData1I4TBufILi32EEE @ 484 NONAME + _ZTV14TMockLtsyData1I4TBufILi6EEE @ 485 NONAME + _ZTV14TMockLtsyData1I5TBuf8ILi128EEE @ 486 NONAME + _ZTV14TMockLtsyData1I5TBuf8ILi15EEE @ 487 NONAME + _ZTV14TMockLtsyData1I5TBuf8ILi16EEE @ 488 NONAME + _ZTV14TMockLtsyData1I5TCharE @ 489 NONAME + _ZTV14TMockLtsyData1I5TTimeE @ 490 NONAME + _ZTV14TMockLtsyData1I7TSmsMsgE @ 491 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI11TAlsSupportEE @ 492 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI11TOperatorIdEE @ 493 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI11TViagParamsEE @ 494 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI12THSxPAStatusEE @ 495 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI12TSetAlsBlockEE @ 496 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI12TSimFileInfoEE @ 497 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI13TSetDriveModeEE @ 498 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI14TBandSelectionEE @ 499 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI16TNetworkModeCapsEE @ 500 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI16TSetAlwaysOnModeEE @ 501 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI18TGetAlsBlockStatusEE @ 502 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI18TViagCacheRecordIdEE @ 503 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI19TViagUHZIUESettingsEE @ 504 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI20TEmerNumberCheckModeEE @ 505 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI5TApduEE @ 506 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI9TDtmfInfoEE @ 507 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone11TAPNEntryV3EE @ 508 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone14TMobileServiceEE @ 509 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone16TMobilePhoneLockEE @ 510 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone16TMobilePhoneNITZEE @ 511 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone19TMobilePhoneALSLineEE @ 512 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneFdnStatusEE @ 513 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneIdServiceEE @ 514 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone22TImsAuthenticateDataV5EE @ 515 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 516 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 517 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone22TMobilePhoneLockStatusEE @ 518 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCBConditionEE @ 519 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneCFConditionEE @ 520 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone23TMobilePhoneNetworkModeEE @ 521 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 522 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone24TMobilePhoneServiceTableEE @ 523 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 524 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 525 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 526 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 527 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 528 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 529 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone25TMobilePhoneSecurityEventEE @ 530 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 531 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 532 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 533 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 534 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone28TAPNControlListServiceStatusEE @ 535 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 536 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 537 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 538 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 539 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 540 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 541 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 542 NONAME + _ZTV14TMockLtsyData1IN14RMobileONStore16TMobileONEntryV1EE @ 543 NONAME + _ZTV14TMockLtsyData1IN14RPacketContext17TContextConfig_R5EE @ 544 NONAME + _ZTV14TMockLtsyData1IN14RPacketContext18TContextConfigCDMAEE @ 545 NONAME + _ZTV14TMockLtsyData1IN14RPacketContext18TContextConfigGPRSEE @ 546 NONAME + _ZTV14TMockLtsyData1IN14RPacketContext20TContextConfigR99_R4EE @ 547 NONAME + _ZTV14TMockLtsyData1IN14RPacketService11TAttachModeEE @ 548 NONAME + _ZTV14TMockLtsyData1IN14RPacketService16TPreferredBearerEE @ 549 NONAME + _ZTV14TMockLtsyData1IN14RPacketService19TRegistrationStatusEE @ 550 NONAME + _ZTV14TMockLtsyData1IN14RPacketService7TStatusEE @ 551 NONAME + _ZTV14TMockLtsyData1IN14RPacketService8TMSClassEE @ 552 NONAME + _ZTV14TMockLtsyData1IN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 553 NONAME + _ZTV14TMockLtsyData1IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 554 NONAME + _ZTV14TMockLtsyData1IN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 555 NONAME + _ZTV14TMockLtsyData1IN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 556 NONAME + _ZTV14TMockLtsyData1IN19RMobileSmsMessaging16TMobileSmsBearerEE @ 557 NONAME + _ZTV14TMockLtsyData1IN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 558 NONAME + _ZTV14TMockLtsyData1IN6RPhone7TStatusEE @ 559 NONAME + _ZTV14TMockLtsyData1IP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 560 NONAME + _ZTV14TMockLtsyData1IP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 561 NONAME + _ZTV14TMockLtsyData1IP13CArrayPtrFlatI14TSmsParametersEE @ 562 NONAME + _ZTV14TMockLtsyData1IP13CArrayPtrFlatI16TENStoreResponseEE @ 563 NONAME + _ZTV14TMockLtsyData1IP13CArrayPtrFlatI7TSmsMsgEE @ 564 NONAME + _ZTV14TMockLtsyData1IP18CMobilePhoneCFListE @ 565 NONAME + _ZTV14TMockLtsyData1IP18CMobilePhoneCWListE @ 566 NONAME + _ZTV14TMockLtsyData1IP25CMobilePhoneNetworkListV2E @ 567 NONAME + _ZTV14TMockLtsyData1IP27CMobilePhoneBroadcastIdListE @ 568 NONAME + _ZTV14TMockLtsyData1IP29CPcktMbmsMonitoredServiceListE @ 569 NONAME + _ZTV14TMockLtsyData1IP4TBufILi100EEE @ 570 NONAME + _ZTV14TMockLtsyData1IP6TDesC8E @ 571 NONAME + _ZTV14TMockLtsyData1IPN12RMmCustomAPI20TSimCardReaderStatusEE @ 572 NONAME + _ZTV14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 573 NONAME + _ZTV14TMockLtsyData1IPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 574 NONAME + _ZTV14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 575 NONAME + _ZTV14TMockLtsyData1IPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 576 NONAME + _ZTV14TMockLtsyData1IPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 577 NONAME + _ZTV14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 578 NONAME + _ZTV14TMockLtsyData1IPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 579 NONAME + _ZTV14TMockLtsyData1IPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 580 NONAME + _ZTV14TMockLtsyData1IhE @ 581 NONAME + _ZTV14TMockLtsyData1IiE @ 582 NONAME + _ZTV14TMockLtsyData1IjE @ 583 NONAME + _ZTV14TMockLtsyData1IlE @ 584 NONAME + _ZTV14TMockLtsyData1ImE @ 585 NONAME + _ZTV14TMockLtsyData1IsE @ 586 NONAME + _ZTV14TMockLtsyData1ItE @ 587 NONAME + _ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 588 NONAME + _ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 589 NONAME + _ZTV14TMockLtsyData2I14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 590 NONAME + _ZTV14TMockLtsyData2I21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 591 NONAME + _ZTV14TMockLtsyData2I4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 592 NONAME + _ZTV14TMockLtsyData2I4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 593 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EE12TContextMiscE @ 594 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 595 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EE5TBuf8ILi1EEE @ 596 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 597 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 598 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 599 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 600 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 601 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 602 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EES1_E @ 603 NONAME + _ZTV14TMockLtsyData2I4TBufILi16EEiE @ 604 NONAME + _ZTV14TMockLtsyData2I5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 605 NONAME + _ZTV14TMockLtsyData2I5TTimeiE @ 606 NONAME + _ZTV14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 607 NONAME + _ZTV14TMockLtsyData2IN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 608 NONAME + _ZTV14TMockLtsyData2IN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 609 NONAME + _ZTV14TMockLtsyData2IN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 610 NONAME + _ZTV14TMockLtsyData2IN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 611 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 612 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 613 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 614 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 615 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 616 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 617 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 618 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 619 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 620 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 621 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 622 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 623 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 624 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 625 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 626 NONAME + _ZTV14TMockLtsyData2IN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 627 NONAME + _ZTV14TMockLtsyData2IN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 628 NONAME + _ZTV14TMockLtsyData2IN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 629 NONAME + _ZTV14TMockLtsyData2IN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 630 NONAME + _ZTV14TMockLtsyData2IN14RPacketService7TStatusEiE @ 631 NONAME + _ZTV14TMockLtsyData2IN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 632 NONAME + _ZTV14TMockLtsyData2IN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 633 NONAME + _ZTV14TMockLtsyData2IN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 634 NONAME + _ZTV14TMockLtsyData2IP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 635 NONAME + _ZTV14TMockLtsyData2IP13CArrayPtrFlatI7TSmsMsgEiE @ 636 NONAME + _ZTV14TMockLtsyData2IP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 637 NONAME + _ZTV14TMockLtsyData2IP6TDesC8S1_E @ 638 NONAME + _ZTV14TMockLtsyData2IP6TDesC8iE @ 639 NONAME + _ZTV14TMockLtsyData2Ih4TBufILi10EEE @ 640 NONAME + _ZTV14TMockLtsyData2IhiE @ 641 NONAME + _ZTV14TMockLtsyData2IiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 642 NONAME + _ZTV14TMockLtsyData2IiP7TSmsMsgE @ 643 NONAME + _ZTV14TMockLtsyData2IiiE @ 644 NONAME + _ZTV14TMockLtsyData2IjiE @ 645 NONAME + _ZTV14TMockLtsyData2IlaE @ 646 NONAME + _ZTV14TMockLtsyData2Is5TBuf8ILi165EEE @ 647 NONAME + _ZTV15CMockLtsyEngine @ 648 NONAME + _ZTV16CMmCustomStubExt @ 649 NONAME + _ZTV16CMmMessageRouter @ 650 NONAME + _ZTV17TMockLtsyData1BufI10TGsmCbsMsgE @ 651 NONAME + _ZTV17TMockLtsyData1BufI11TONStoreMsgE @ 652 NONAME + _ZTV17TMockLtsyData1BufI12TRfStateInfoE @ 653 NONAME + _ZTV17TMockLtsyData1BufI12TServiceTypeE @ 654 NONAME + _ZTV17TMockLtsyData1BufI14TContextParamsE @ 655 NONAME + _ZTV17TMockLtsyData1BufI16TENStoreResponseE @ 656 NONAME + _ZTV17TMockLtsyData1BufI20TLockSettingPasswordE @ 657 NONAME + _ZTV17TMockLtsyData1BufI21TContextConfigurationE @ 658 NONAME + _ZTV17TMockLtsyData1BufI24TCbsCbmiAndLangAndFilterE @ 659 NONAME + _ZTV17TMockLtsyData1BufI25TMbmsNetworkServiceStatusE @ 660 NONAME + _ZTV17TMockLtsyData1BufI25TSendSmsDataAndAttributesE @ 661 NONAME + _ZTV17TMockLtsyData1BufI31TMmMbmsMonitorServiceListParamsE @ 662 NONAME + _ZTV17TMockLtsyData1BufI4TBufILi10EEE @ 663 NONAME + _ZTV17TMockLtsyData1BufI4TBufILi128EEE @ 664 NONAME + _ZTV17TMockLtsyData1BufI4TBufILi15EEE @ 665 NONAME + _ZTV17TMockLtsyData1BufI4TBufILi16EEE @ 666 NONAME + _ZTV17TMockLtsyData1BufI4TBufILi32EEE @ 667 NONAME + _ZTV17TMockLtsyData1BufI4TBufILi6EEE @ 668 NONAME + _ZTV17TMockLtsyData1BufI5TBuf8ILi128EEE @ 669 NONAME + _ZTV17TMockLtsyData1BufI5TBuf8ILi15EEE @ 670 NONAME + _ZTV17TMockLtsyData1BufI5TBuf8ILi16EEE @ 671 NONAME + _ZTV17TMockLtsyData1BufI5TCharE @ 672 NONAME + _ZTV17TMockLtsyData1BufI5TTimeE @ 673 NONAME + _ZTV17TMockLtsyData1BufI7TSmsMsgE @ 674 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TAlsSupportEE @ 675 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TOperatorIdEE @ 676 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI11TViagParamsEE @ 677 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI12THSxPAStatusEE @ 678 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI12TSetAlsBlockEE @ 679 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI12TSimFileInfoEE @ 680 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI13TSetDriveModeEE @ 681 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI14TBandSelectionEE @ 682 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI16TNetworkModeCapsEE @ 683 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI16TSetAlwaysOnModeEE @ 684 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI18TGetAlsBlockStatusEE @ 685 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI18TViagCacheRecordIdEE @ 686 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI19TViagUHZIUESettingsEE @ 687 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI20TEmerNumberCheckModeEE @ 688 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI5TApduEE @ 689 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI9TDtmfInfoEE @ 690 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone11TAPNEntryV3EE @ 691 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone14TMobileServiceEE @ 692 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneLockEE @ 693 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone16TMobilePhoneNITZEE @ 694 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone19TMobilePhoneALSLineEE @ 695 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneFdnStatusEE @ 696 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneIdServiceEE @ 697 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone22TImsAuthenticateDataV5EE @ 698 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneCellInfoV9EE @ 699 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockInfoV1EE @ 700 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone22TMobilePhoneLockStatusEE @ 701 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCBConditionEE @ 702 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneCFConditionEE @ 703 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone23TMobilePhoneNetworkModeEE @ 704 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneSecurityCodeEE @ 705 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone24TMobilePhoneServiceTableEE @ 706 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneBatteryInfoV1EE @ 707 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneCWInfoEntryV1EE @ 708 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1EE @ 709 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2EE @ 710 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5EE @ 711 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8EE @ 712 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone25TMobilePhoneSecurityEventEE @ 713 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone26TMobilePhoneVoicemailIdsV3EE @ 714 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneIdServiceStatusEE @ 715 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneNetworkSecurityEE @ 716 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EE @ 717 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone28TAPNControlListServiceStatusEE @ 718 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone28TMobilePhoneMessageWaitingV1EE @ 719 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EE @ 720 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone29TMobileCallCipheringIndicatorEE @ 721 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneNetworkSelectionV1EE @ 722 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone30TMobilePhoneRegistrationStatusEE @ 723 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneNotifySendSSOperationEE @ 724 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone33TMobilePhoneServiceProviderNameV2EE @ 725 NONAME + _ZTV17TMockLtsyData1BufIN14RMobileONStore16TMobileONEntryV1EE @ 726 NONAME + _ZTV17TMockLtsyData1BufIN14RPacketContext17TContextConfig_R5EE @ 727 NONAME + _ZTV17TMockLtsyData1BufIN14RPacketContext18TContextConfigCDMAEE @ 728 NONAME + _ZTV17TMockLtsyData1BufIN14RPacketContext18TContextConfigGPRSEE @ 729 NONAME + _ZTV17TMockLtsyData1BufIN14RPacketContext20TContextConfigR99_R4EE @ 730 NONAME + _ZTV17TMockLtsyData1BufIN14RPacketService11TAttachModeEE @ 731 NONAME + _ZTV17TMockLtsyData1BufIN14RPacketService16TPreferredBearerEE @ 732 NONAME + _ZTV17TMockLtsyData1BufIN14RPacketService19TRegistrationStatusEE @ 733 NONAME + _ZTV17TMockLtsyData1BufIN14RPacketService7TStatusEE @ 734 NONAME + _ZTV17TMockLtsyData1BufIN14RPacketService8TMSClassEE @ 735 NONAME + _ZTV17TMockLtsyData1BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EE @ 736 NONAME + _ZTV17TMockLtsyData1BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EE @ 737 NONAME + _ZTV17TMockLtsyData1BufIN17RMobilePhoneStore23TMobilePhoneStoreInfoV1EE @ 738 NONAME + _ZTV17TMockLtsyData1BufIN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 739 NONAME + _ZTV17TMockLtsyData1BufIN19RMobileSmsMessaging16TMobileSmsBearerEE @ 740 NONAME + _ZTV17TMockLtsyData1BufIN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 741 NONAME + _ZTV17TMockLtsyData1BufIN6RPhone7TStatusEE @ 742 NONAME + _ZTV17TMockLtsyData1BufIP13CArrayFixFlatIN12RMmCustomAPI11TSimCbTopicEEE @ 743 NONAME + _ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEE @ 744 NONAME + _ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI14TSmsParametersEE @ 745 NONAME + _ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI16TENStoreResponseEE @ 746 NONAME + _ZTV17TMockLtsyData1BufIP13CArrayPtrFlatI7TSmsMsgEE @ 747 NONAME + _ZTV17TMockLtsyData1BufIP18CMobilePhoneCFListE @ 748 NONAME + _ZTV17TMockLtsyData1BufIP18CMobilePhoneCWListE @ 749 NONAME + _ZTV17TMockLtsyData1BufIP25CMobilePhoneNetworkListV2E @ 750 NONAME + _ZTV17TMockLtsyData1BufIP27CMobilePhoneBroadcastIdListE @ 751 NONAME + _ZTV17TMockLtsyData1BufIP29CPcktMbmsMonitoredServiceListE @ 752 NONAME + _ZTV17TMockLtsyData1BufIP4TBufILi100EEE @ 753 NONAME + _ZTV17TMockLtsyData1BufIP6TDesC8E @ 754 NONAME + _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI20TSimCardReaderStatusEE @ 755 NONAME + _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapAkaEE @ 756 NONAME + _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI24TSimAuthenticationEapSimEE @ 757 NONAME + _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationGbaBootstrapEE @ 758 NONAME + _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI30TSimAuthenticationMgvMskUpdateEE @ 759 NONAME + _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI32TSimAuthenticationMgvMskDeletionEE @ 760 NONAME + _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationGbaNafDerivationEE @ 761 NONAME + _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI34TSimAuthenticationMgvMtkGenerationEE @ 762 NONAME + _ZTV17TMockLtsyData1BufIPN12RMmCustomAPI36TSimAuthenticationGbaBootstrapUpdateEE @ 763 NONAME + _ZTV17TMockLtsyData1BufIhE @ 764 NONAME + _ZTV17TMockLtsyData1BufIiE @ 765 NONAME + _ZTV17TMockLtsyData1BufIjE @ 766 NONAME + _ZTV17TMockLtsyData1BufIlE @ 767 NONAME + _ZTV17TMockLtsyData1BufImE @ 768 NONAME + _ZTV17TMockLtsyData1BufIsE @ 769 NONAME + _ZTV17TMockLtsyData1BufItE @ 770 NONAME + _ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS15TQoSR5RequestedEE @ 771 NONAME + _ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS17TQoSGPRSRequestedEE @ 772 NONAME + _ZTV17TMockLtsyData2BufI14TContextParamsN10RPacketQoS19TQoSR99_R4RequestedEE @ 773 NONAME + _ZTV17TMockLtsyData2BufI21TContextConfigurationP13CArrayPtrFlatIN14RPacketContext24CTFTMediaAuthorizationV3EEE @ 774 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 775 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi15EEN12RMmCustomAPI11TLockNumberEE @ 776 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EE12TContextMiscE @ 777 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EE30TMmMbmsActiveServiceListParamsE @ 778 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EE5TBuf8ILi1EEE @ 779 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext11TDataVolumeEE @ 780 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext14TDataChannelV2EE @ 781 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext17TConnectionInfoV1EE @ 782 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EEN14RPacketContext18TContextConfigGPRSEE @ 783 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EEN18RPacketMbmsContext20TContextConfigMbmsV1EE @ 784 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EEPN18RPacketMbmsContext12CMbmsSessionEE @ 785 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EES1_E @ 786 NONAME + _ZTV17TMockLtsyData2BufI4TBufILi16EEiE @ 787 NONAME + _ZTV17TMockLtsyData2BufI5TBuf8ILi128EEN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 788 NONAME + _ZTV17TMockLtsyData2BufI5TTimeiE @ 789 NONAME + _ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_13TOperatorLogoEE @ 790 NONAME + _ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TOperatorIdENS0_7TSsInfoEE @ 791 NONAME + _ZTV17TMockLtsyData2BufIN12RMmCustomAPI11TViagParamsEP13CArrayFixFlatINS0_12TViagElementEEE @ 792 NONAME + _ZTV17TMockLtsyData2BufIN12RMmCustomAPI14TBandSelectionENS0_16TNetworkModeCapsEE @ 793 NONAME + _ZTV17TMockLtsyData2BufIN12RMmCustomAPI18TViagCacheRecordIdENS0_23TViagCacheRecordContentEE @ 794 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_20TMobilePhoneCFActiveEE @ 795 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone14TMobileServiceENS0_25TMobilePhoneServiceActionEE @ 796 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockInfoV1ENS0_16TMobilePhoneLockEE @ 797 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone22TMobilePhoneLockStatusENS0_23TMobilePhoneLockSettingEE @ 798 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCBConditionENS0_22TMobilePhoneCBChangeV1EE @ 799 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_14TMobileServiceEE @ 800 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone23TMobilePhoneCFConditionENS0_22TMobilePhoneCFChangeV1EE @ 801 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_19TCodeAndUnblockCodeEE @ 802 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone24TMobilePhoneSecurityCodeENS0_30TMobilePhoneSecurityCodeInfoV5EE @ 803 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV1ENS0_26TMobilePhoneLocationAreaV1EE @ 804 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV2ENS0_26TMobilePhoneLocationAreaV1EE @ 805 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV5ENS0_26TMobilePhoneLocationAreaV1EE @ 806 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone25TMobilePhoneNetworkInfoV8ENS0_26TMobilePhoneLocationAreaV1EE @ 807 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone27TMobilePhoneSendSSRequestV3EN20RMobileUssdMessaging23TMobileUssdAttributesV1EE @ 808 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone28TMobilePhonePasswordChangeV2EtE @ 809 NONAME + _ZTV17TMockLtsyData2BufIN12RMobilePhone30TMobilePhoneRegistrationStatusENS0_25TMobilePhoneNetworkStatusEE @ 810 NONAME + _ZTV17TMockLtsyData2BufIN14RPacketContext17TContextConfig_R5E4TBufILi16EEE @ 811 NONAME + _ZTV17TMockLtsyData2BufIN14RPacketContext18TContextConfigGPRSE4TBufILi16EEE @ 812 NONAME + _ZTV17TMockLtsyData2BufIN14RPacketContext20TContextConfigR99_R4E4TBufILi16EEE @ 813 NONAME + _ZTV17TMockLtsyData2BufIN14RPacketService7TStatusEiE @ 814 NONAME + _ZTV17TMockLtsyData2BufIN15RMobileSmsStore20TMobileGsmSmsEntryV1EiE @ 815 NONAME + _ZTV17TMockLtsyData2BufIN15RMobileSmsStore21TMobileCdmaSmsEntryV1EiE @ 816 NONAME + _ZTV17TMockLtsyData2BufIN18RPacketMbmsContext20TContextConfigMbmsV1E4TBufILi16EEE @ 817 NONAME + _ZTV17TMockLtsyData2BufIP13CArrayPtrFlatI12TWcdmaCbsMsgEhE @ 818 NONAME + _ZTV17TMockLtsyData2BufIP13CArrayPtrFlatI7TSmsMsgEiE @ 819 NONAME + _ZTV17TMockLtsyData2BufIP27CMobilePhoneBroadcastIdListN25RMobileBroadcastMessaging22TMobileBroadcastIdTypeEE @ 820 NONAME + _ZTV17TMockLtsyData2BufIP6TDesC8S1_E @ 821 NONAME + _ZTV17TMockLtsyData2BufIP6TDesC8iE @ 822 NONAME + _ZTV17TMockLtsyData2BufIh4TBufILi10EEE @ 823 NONAME + _ZTV17TMockLtsyData2BufIhiE @ 824 NONAME + _ZTV17TMockLtsyData2BufIiN12RMobilePhone34TMobilePhoneNetworkManualSelectionEE @ 825 NONAME + _ZTV17TMockLtsyData2BufIiP7TSmsMsgE @ 826 NONAME + _ZTV17TMockLtsyData2BufIiiE @ 827 NONAME + _ZTV17TMockLtsyData2BufIjiE @ 828 NONAME + _ZTV17TMockLtsyData2BufIlaE @ 829 NONAME + _ZTV17TMockLtsyData2BufIs5TBuf8ILi165EEE @ 830 NONAME + _ZTV18CMockLtsyFactoryV1 @ 831 NONAME + _ZTV18CMockLtsyFactoryV2 @ 832 NONAME + _ZTV18CMockLtsyFactoryV3 @ 833 NONAME + _ZTV18TMockLtsyCallData1I4TBufILi129EEE @ 834 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall16TMobileCallEventEE @ 835 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall17TMobileCallInfoV1EE @ 836 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall17TMobileCallStatusEE @ 837 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV1EE @ 838 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV2EE @ 839 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall19TMobileCallParamsV7EE @ 840 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall21TMobileCallDataCapsV1EE @ 841 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall22TMobileCallHscsdInfoV8EE @ 842 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV1EE @ 843 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV2EE @ 844 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall23TMobileDataCallParamsV8EE @ 845 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV1EE @ 846 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV2EE @ 847 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV7EE @ 848 NONAME + _ZTV18TMockLtsyCallData1IN11RMobileCall24TMobileHscsdCallParamsV8EE @ 849 NONAME + _ZTV18TMockLtsyCallData1IN12RMobilePhone19TMobilePhonePrivacyEE @ 850 NONAME + _ZTV18TMockLtsyCallData1IN5RCall14TBearerServiceEE @ 851 NONAME + _ZTV18TMockLtsyCallData1IN5RCall7TStatusEE @ 852 NONAME + _ZTV18TMockLtsyCallData1IN5RCall9TCommPortEE @ 853 NONAME + _ZTV18TMockLtsyCallData1IiE @ 854 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 855 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 856 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 857 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 858 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 859 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 860 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 861 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 862 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 863 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 864 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 865 NONAME + _ZTV18TMockLtsyCallData2IN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 866 NONAME + _ZTV18TMockLtsyCallData2IiiE @ 867 NONAME + _ZTV19CMockSmsMessHandler @ 868 NONAME + _ZTV20CMockCallMessHandler @ 869 NONAME + _ZTV21CMockPhoneMessHandler @ 870 NONAME + _ZTV21TMockLtsyCallData1BufI4TBufILi129EEE @ 871 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall16TMobileCallEventEE @ 872 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallInfoV1EE @ 873 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall17TMobileCallStatusEE @ 874 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV1EE @ 875 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV2EE @ 876 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall19TMobileCallParamsV7EE @ 877 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall21TMobileCallDataCapsV1EE @ 878 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall22TMobileCallHscsdInfoV8EE @ 879 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV1EE @ 880 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV2EE @ 881 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall23TMobileDataCallParamsV8EE @ 882 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV1EE @ 883 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV2EE @ 884 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV7EE @ 885 NONAME + _ZTV21TMockLtsyCallData1BufIN11RMobileCall24TMobileHscsdCallParamsV8EE @ 886 NONAME + _ZTV21TMockLtsyCallData1BufIN12RMobilePhone19TMobilePhonePrivacyEE @ 887 NONAME + _ZTV21TMockLtsyCallData1BufIN5RCall14TBearerServiceEE @ 888 NONAME + _ZTV21TMockLtsyCallData1BufIN5RCall7TStatusEE @ 889 NONAME + _ZTV21TMockLtsyCallData1BufIN5RCall9TCommPortEE @ 890 NONAME + _ZTV21TMockLtsyCallData1BufIiE @ 891 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV1EE @ 892 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV1ENS0_17TMobileCallInfoV8EE @ 893 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV2ENS0_17TMobileCallInfoV8EE @ 894 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall19TMobileCallParamsV7ENS0_17TMobileCallInfoV8EE @ 895 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall22TMobileCallHscsdInfoV8ENS0_21TMobileCallDataCapsV1EE @ 896 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV1ENS0_17TMobileCallInfoV8EE @ 897 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV2ENS0_17TMobileCallInfoV8EE @ 898 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall23TMobileDataCallParamsV8ENS0_17TMobileCallInfoV8EE @ 899 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV1ENS0_17TMobileCallInfoV8EE @ 900 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV2ENS0_17TMobileCallInfoV8EE @ 901 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV7ENS0_17TMobileCallInfoV8EE @ 902 NONAME + _ZTV21TMockLtsyCallData2BufIN11RMobileCall24TMobileHscsdCallParamsV8ENS0_17TMobileCallInfoV8EE @ 903 NONAME + _ZTV21TMockLtsyCallData2BufIiiE @ 904 NONAME + _ZTV21TMockLtsyContextData1I4TBufILi16EEE @ 905 NONAME + _ZTV21TMockLtsyContextData2I4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 906 NONAME + _ZTV21TMockLtsyContextData2I4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 907 NONAME + _ZTV23CMockPcktQoSMessHandler @ 908 NONAME + _ZTV23TMockLtsyPacketQoSData1I4TBufILi16EEE @ 909 NONAME + _ZTV23TMockLtsyPhoneBookData1I10TPBFdnInfoE @ 910 NONAME + _ZTV23TMockLtsyPhoneBookData1I12TPBEntryInfoE @ 911 NONAME + _ZTV23TMockLtsyPhoneBookData1I16CStorageInfoDataE @ 912 NONAME + _ZTV23TMockLtsyPhoneBookData1IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 913 NONAME + _ZTV23TMockLtsyPhoneBookData1IP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 914 NONAME + _ZTV23TMockLtsyPhoneBookData1IiE @ 915 NONAME + _ZTV23TMockLtsyPhoneBookData2IN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 916 NONAME ABSENT + _ZTV23TMockLtsyPhoneBookData2IiP20CPhoneBookStoreEntryE @ 917 NONAME + _ZTV24TMockLtsyContextData1BufI4TBufILi16EEE @ 918 NONAME + _ZTV24TMockLtsyContextData2BufI4TBufILi16EEP13CArrayFixFlatIN14RPacketContext15TPacketFilterV2EEE @ 919 NONAME + _ZTV24TMockLtsyContextData2BufI4TBufILi16EEPN14RPacketContext24CTFTMediaAuthorizationV3EE @ 920 NONAME + _ZTV26CMmCustomMessHandlerGsmExt @ 921 NONAME + _ZTV26CMockTelephonyAudioControl @ 922 NONAME + _ZTV26TMockLtsyPhoneBookData1BufI10TPBFdnInfoE @ 923 NONAME + _ZTV26TMockLtsyPhoneBookData1BufI12TPBEntryInfoE @ 924 NONAME + _ZTV26TMockLtsyPhoneBookData1BufI16CStorageInfoDataE @ 925 NONAME + _ZTV26TMockLtsyPhoneBookData1BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEE @ 926 NONAME + _ZTV26TMockLtsyPhoneBookData1BufIP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 927 NONAME + _ZTV26TMockLtsyPhoneBookData1BufIiE @ 928 NONAME + _ZTV26TMockLtsyPhoneBookData2BufIN21RMobilePhoneBookStore21TPBIndexAndNumEntriesEP12CArrayPtrSegI20CPhoneBookStoreEntryEE @ 929 NONAME ABSENT + _ZTV26TMockLtsyPhoneBookData2BufIiP20CPhoneBookStoreEntryE @ 930 NONAME + _ZTV27CMockPcktContextMessHandler @ 931 NONAME + _ZTV27CMockPcktServiceMessHandler @ 932 NONAME + _ZTV30CMockPhoneBookStoreMessHandler @ 933 NONAME + _ZTI14TMockLtsyData1IN12RMobilePhone21TMobilePhoneDTMFEventEE @ 934 NONAME + _ZTI17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneDTMFEventEE @ 935 NONAME + _ZTV14TMockLtsyData1IN12RMobilePhone21TMobilePhoneDTMFEventEE @ 936 NONAME + _ZTV17TMockLtsyData1BufIN12RMobilePhone21TMobilePhoneDTMFEventEE @ 937 NONAME + _ZTI14TMockLtsyData1IN12RMmCustomAPI15TApduParametersEE @ 938 NONAME + _ZTI17TMockLtsyData1BufIN12RMmCustomAPI15TApduParametersEE @ 939 NONAME + _ZTV14TMockLtsyData1IN12RMmCustomAPI15TApduParametersEE @ 940 NONAME + _ZTV17TMockLtsyData1BufIN12RMmCustomAPI15TApduParametersEE @ 941 NONAME + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/bld.inf --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/bld.inf Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -18,7 +18,8 @@ PRJ_PLATFORMS DEFAULT -PRJ_EXPORTS +PRJ_TESTEXPORTS +../data/ltsydata_mock.ini z:/testdata/configs/ltsydata_mock.ini PRJ_TESTMMPFILES mockltsy.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/mockltsy.mmp --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/mockltsy.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/mockltsy.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -14,10 +14,10 @@ * Description: * */ -TARGET licenseetsy.dll +TARGET mocklicenseetsy.dll TARGETTYPE DLL -UID 0x1000008D 0x2000BEE4 +UID 0x1000008D 0x2002EA67 CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData @@ -46,15 +46,14 @@ USERINCLUDE ../inc USERINCLUDE ../../mockltsydll/inc -USERINCLUDE ../../../../../commontsy/inc // tflogger.h USERINCLUDE ../../../../../commontsy/inc/mmutility // mmtsy_csd_defs.h USERINCLUDE ../../../../../commontsy/inc/mmgsmwcdma // mmgsmwcdmaprivateutils.h +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN OS_LAYER_ESTLIB_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY flogger.lib LIBRARY estlib.lib LIBRARY estor.lib LIBRARY etel.lib @@ -66,8 +65,6 @@ LIBRARY etelpckt.lib LIBRARY customapi.lib -#include - UNPAGED diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/Cmmcustommesshandlergsmext.cpp --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/Cmmcustommesshandlergsmext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/Cmmcustommesshandlergsmext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -14,8 +14,13 @@ // // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CmmcustommesshandlergsmextTraces.h" +#endif + #include "CMmCustomMessHandlerGsmExt.h" -#include #include #include #include @@ -35,7 +40,7 @@ CMmCustomMessHandlerGsmExt* CMmCustomMessHandlerGsmExt::NewL( CMmMessageRouter* aMessageRouter ) { -TFLOGSTRING("TSY: CMmCustomMessHandlerGsmExt::NewL.\n" ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMMESSHANDLERGSMEXT_NEWL_1, "TSY: CMmCustomMessHandlerGsmExt::NewL.\n" ); CMmCustomMessHandlerGsmExt* self = new( ELeave ) CMmCustomMessHandlerGsmExt(); @@ -50,7 +55,7 @@ CMmCustomMessHandlerGsmExt::~CMmCustomMessHandlerGsmExt() { -TFLOGSTRING("TSY: CMmCustomMessHandlerGsmExt::~CMmCustomMessHandlerGsmExt.\n"); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMMESSHANDLERGSMEXT_DTOR_1, "TSY: CMmCustomMessHandlerGsmExt::~CMmCustomMessHandlerGsmExt.\n"); } // --------------------------------------------------------------------------- diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmmcustomstubext.cpp --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmmcustomstubext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmmcustomstubext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -13,9 +13,14 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmcustomstubextTraces.h" +#endif + #include //#include "Telephony.h" -#include #include "cmmcustomstubext.h" #include #include "cmmmessagerouter.h" @@ -61,7 +66,7 @@ // void CMmCustomStubExt::InitializeL() { -TFLOGSTRING( "TSY: CMmCustomStubExt::InitializeL. " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_INITIALIZEL_1, "TSY: CMmCustomStubExt::InitializeL. " ); } // --------------------------------------------------------------------------- @@ -72,7 +77,7 @@ void CMmCustomStubExt::SetMessageRouter( CMmMessageRouter* aMessageRouter ) { -TFLOGSTRING( "TSY: CMmCustomStubExt::SetMessageRouter. " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_SETMESSAGEROUTER_1, "TSY: CMmCustomStubExt::SetMessageRouter. " ); iMessageRouter = aMessageRouter; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockcallmesshandler.cpp --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockcallmesshandler.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockcallmesshandler.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -14,7 +14,6 @@ // #include "cmockcallmesshandler.h" -#include #include "MmTsy_Csd_Defs.h" #include "cmmmessagerouter.h" #include diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktcontextmesshandler.cpp --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktcontextmesshandler.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktcontextmesshandler.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -15,7 +15,6 @@ #include #include "cmockpcktcontextmesshandler.h" -#include #include #include #include "cmockltsyengine.h" diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktqosmesshandler.cpp --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktqosmesshandler.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktqosmesshandler.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -13,8 +13,13 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmockpcktqosmesshandlerTraces.h" +#endif + #include "cmockpcktqosmesshandler.h" -#include #include #include #include "cmockltsyengine.h" @@ -64,7 +69,7 @@ { case EPacketQoSSetProfileParams: { -TFLOGSTRING3("Mock: CMockPcktQoSMessHandler. aIpc: %d aMmDataPackage: %d", aIpc, &aMmDataPackage ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMOCKPCKTQOSMESSHANDLER_EXTFUNCL_1, "Mock: CMockPcktQoSMessHandler. aIpc: %d aMmDataPackage: 0x%08x", aIpc, (TUint)aMmDataPackage ); TDes8* profile = NULL; TContextParams contextParams; @@ -73,7 +78,7 @@ TPckg* profilePckg = ( TPckg* ) profile; TPacketDataConfigBase& base = ( *profilePckg )(); -TFLOGSTRING2("Mock: CMockPcktQoSMessHandler. base.ExtensionId(): %d", base.ExtensionId() ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMOCKPCKTQOSMESSHANDLER_EXTFUNCL_2, "Mock: CMockPcktQoSMessHandler. base.ExtensionId(): %d", base.ExtensionId() ); switch(base.ExtensionId()) { @@ -148,7 +153,7 @@ break; case EPacketQoSSetProfileParams: { -TFLOGSTRING3("Mock: Complete. aIpc = %d, aData = %S", aIpc, &aData); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMOCKPCKTQOSMESSHANDLER_COMPLETEL_1, "Mock: Complete. aIpc = %d, aData = %s", aIpc, aData); TMockLtsyData1Buf< TInfoName > ret; ret.DeserialiseL(aData); dataPackage.PackData(ret.Data1Ptr()); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktservicemesshandler.cpp --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktservicemesshandler.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktservicemesshandler.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -18,7 +18,6 @@ #include "mmockmesshandlerbase.h" #include #include -#include #include #include "cmockltsyengine.h" #include "tmockltsydata.h" diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockphonebookstoremesshandler.cpp --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockphonebookstoremesshandler.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockphonebookstoremesshandler.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -18,7 +18,6 @@ #include #include #include -#include #include "cmmmessagerouter.h" #include "cmockltsyengine.h" #include "tmockltsydata.h" diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmocksmsmesshandler.cpp --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmocksmsmesshandler.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmocksmsmesshandler.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -16,8 +16,7 @@ #include #include "cmocksmsmesshandler.h" #include -#include "etelmm.h" -#include +#include "etelmm.h" #include "cmockltsyengine.h" #include "tmockltsydata.h" #include diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,9 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMMESSHANDLERGSMEXT_DTOR_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMMESSHANDLERGSMEXT_NEWL_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_INITIALIZEL_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_SETMESSAGEROUTER_1=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CMOCKPCKTQOSMESSHANDLER_COMPLETEL_1=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CMOCKPCKTQOSMESSHANDLER_EXTFUNCL_1=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CMOCKPCKTQOSMESSHANDLER_EXTFUNCL_2=0x6 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group/bld.inf --- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group/bld.inf Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsydll/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -14,8 +14,8 @@ // PRJ_TESTEXPORTS -../inc/rmockltsy.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(test/rmockltsy.h) -../inc/tmockltsydata.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(test/tmockltsydata.h) +../inc/rmockltsy.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(test/rmockltsy.h) +../inc/tmockltsydata.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(test/tmockltsydata.h) PRJ_TESTMMPFILES mockltsydll.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/mockltsy_copy_ini_file.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/mockltsy_copy_ini_file.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,28 @@ +// +// Copyright (c) 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Copies the file ltsydata_mock.ini from Z: (ROM or simulated ROM) to the C: drive +// Two reasons for doing this are: +// a) It loads the MockLtsy dll (mocklicenseetsy.dll) as the one to use as the LTsy component +// b) The file can be edited (or deleted) allowing fall-back to the "normal" licenseetsy.dll +// +// + + +// 101f7989 is SID of C32.exe so this should already exist +RUN_UTILS MkDir c:\private\101f7989 + +// Copy ltsydata_mock.ini from Z: to C: +RUN_UTILS CopyFile z:\testdata\configs\ltsydata_mock.ini c:\private\101f7989\ltsydata.ini +RUN_UTILS MakeReadWrite c:\private\101f7989\ltsydata.ini diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/mockltsy_remove_ini_file.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/mockltsy_remove_ini_file.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,19 @@ +// +// Copyright (c) 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Deletes the file ltsydata_mock.ini from the C: drive +// Use this in conjunction with mockltsy_copy_ini_file.script +// + +RUN_UTILS DeleteFile c:\private\101f7989\ltsydata.ini diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -14,6 +14,8 @@ // Description: // +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script + LOAD_SUITE te_ctsy_component RUN_SCRIPT z:\TestData\Scripts\te_ctsycomponent_packetservice_individual.script @@ -90,9 +92,6 @@ - +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script - - - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_airtimeduration_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_airtimeduration_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_airtimeduration_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -38,3 +41,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAirTimeDurationFU.TestNotifyAirTimeDurationChange0001L END_TESTCASE BA-CTSY-ATD-MNATDC-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatelineservice_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatelineservice_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatelineservice_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -82,3 +85,5 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAlternateLineServiceFU.TestNotifyALSLineChange0004L END_TESTCASE BA-CTSY-ALLS-MNALC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script + diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatingcall_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatingcall_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_alternatingcall_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -137,3 +140,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAlternatingCallFU.TestNotifyAlternatingCallModeChange0001L END_TESTCASE BA-CTSY-ALTC-MNACMC-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_apncontrollist_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_apncontrollist_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_apncontrollist_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -302,3 +305,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAPNControlListFU.TestNotifyAPNControlListServiceStatusChange0004L END_TESTCASE BA-CTSY-ACL-MNACLSSC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_authorisation_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_authorisation_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_authorisation_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -60,3 +63,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyAuthorisationAndAuthenticationFU.TestSmartCardAuthenticate0001L END_TESTCASE BA-CTSY-AAA-MSCA-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_broadcastmessaging_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_broadcastmessaging_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_broadcastmessaging_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -301,3 +304,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyBroadcastMessagingFU.TestGetCaps0003L END_TESTCASE BA-CTSY-BRMSG-BGC-0003 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callbarring_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callbarring_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callbarring_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -203,3 +206,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallBarringFU.TestNotifyCallBarringStatusChange0004L END_TESTCASE BA-CTSY-CBAR-MNCBSC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcompletion_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcompletion_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcompletion_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -158,3 +161,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallCompletionFU.TestNotifyCCBSStatusChange0001L END_TESTCASE BA-CTSY-CCOM-MNCCBSSC-0001 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcontrol_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcontrol_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcontrol_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -1064,3 +1067,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallControlFU.TestUpdateLifeTime0001L END_TESTCASE BA-CTSY-CCON-CNUA-0001 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcost_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcost_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callcost_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -93,3 +96,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallCostFU.TestSetPuct0001L END_TESTCASE BA-CTSY-CCOS-MSP-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callemergency_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callemergency_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callemergency_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -125,4 +128,6 @@ //!@SYMTestExpectedResults Pass //!@SYMTestType CT RUN_TEST_STEP 360 te_ctsy_component TEFUnit.CCTsyCallEmergencyFU.TestDialEmergencyCall0005L -END_TESTCASE BA-CTSY-CEMG-CDEC-0005 \ No newline at end of file +END_TESTCASE BA-CTSY-CEMG-CDEC-0005 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callforwarding_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callforwarding_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callforwarding_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -180,3 +183,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallForwardingFU.TestNotifyCallForwardingStatusChange0004L END_TESTCASE BA-CTSY-CFOR-MNCFSC-0004 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callinformation_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callinformation_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callinformation_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -1644,3 +1647,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallInformationFU.TestNotifyLineHookChange00011L END_TESTCASE BA-CTSY-CALLI-LNHCC-00011 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callownership_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callownership_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callownership_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -136,3 +139,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallOwnershipFU.TestTransferOwnership0006L END_TESTCASE BA-CTSY-COWN-CTO-0006 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callwaiting_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callwaiting_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_callwaiting_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -137,3 +140,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCallWaitingFU.TestNotifyCallWaitingStatusChange0004L END_TESTCASE BA-CTSY-CWAT-MCWSC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_conferencecallcontrol_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_conferencecallcontrol_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_conferencecallcontrol_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -477,3 +480,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyConferenceCallControlFU.TestGetMobileCallInfo0003L END_TESTCASE BA-CTSY-CONC-CGMCI-0003 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_customipc_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_customipc_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_customipc_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -2398,4 +2401,4 @@ END_TESTCASE BA-CTSY-CIPC-GUSS-0004 - +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_datacallcontrol_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_datacallcontrol_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_datacallcontrol_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -488,3 +491,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyDataCallControlFU.TestNotifyMobileDataCallCapsChange00011L END_TESTCASE BA-CTSY-DATC-CNMDCCC-00011 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_dtmf_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_dtmf_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_dtmf_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -216,3 +219,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyDTMFFU.TestContinueDTMFStringSending0001L END_TESTCASE BA-CTSY-DTMF-MCDSS-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_eapauthentication_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_eapauthentication_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_eapauthentication_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -26,3 +29,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyEAPAuthenticationFU.TestOpen0001L END_TESTCASE BA-CTSY-EAP-EO-0001 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_enstore_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_enstore_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_enstore_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -195,3 +198,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyENStoreFU.TestStart0004L END_TESTCASE BA-CTSY-PBEN-ESS-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fax_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fax_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fax_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -93,3 +96,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFaxFU.TestWrite0001L END_TESTCASE BA-CTSY-FAX-FW-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_featmgr_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_featmgr_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_featmgr_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -26,3 +29,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFeatMgr.TestFeatMgr0001L END_TESTCASE BA-CTSY-FEAT-FEATMGR-0001 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fixeddialling_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -178,4 +181,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyFixedDiallingFU.TestNotifyFdnStatusChange0004L END_TESTCASE BA-CTSY-FXD-MNFSC-0004 - +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fullrun.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fullrun.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_fullrun.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,10 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script + LOAD_SUITE te_ctsy_component @@ -87,4 +91,4 @@ // TimeOut RUN_SCRIPT z:\TestData\Scripts\te_ctsycomponent_timeout_all.script - +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ims_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ims_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ims_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -71,3 +74,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyIMSFU.TestNotifyImsAuthorizationInfoChange0001L END_TESTCASE BA-CTSY-IMS-MNIAIC-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_indicator_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_indicator_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_indicator_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -93,3 +96,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyIndicatorFU.TestNotifyIndicatorChange0004L END_TESTCASE BA-CTSY-IND-MNIC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_knownfailures_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_knownfailures_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_knownfailures_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -220,3 +223,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneBookStoreFU.TestWrite00021L END_TESTCASE BA-CTSY-PBSTR-PBSW-00021 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_lbs_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_lbs_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_lbs_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -115,3 +118,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyLBSFU.TestSendMolr0001L END_TESTCASE BA-CTSY-LBS-LSM-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_linecontrol_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_linecontrol_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_linecontrol_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -457,3 +460,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyLineControlFU.TestNotifyMobileLineStatusChange00014L END_TESTCASE BA-CTSY-LINC-LNMLSC-00014 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mailboxnumbers_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mailboxnumbers_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mailboxnumbers_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -104,3 +107,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMailboxNumbersFU.TestNotifyMailboxNumbersChange0001L END_TESTCASE BA-CTSY-MBXN-MNMNC-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mbmscontext_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mbmscontext_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mbmscontext_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,10 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script + LOAD_SUITE te_ctsy_component @@ -383,3 +387,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMbmsContextFU.TestNotifyStatusChange0003L END_TESTCASE BA-CTSY-MCF-PNSC-0003 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_messagewaiting_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_messagewaiting_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_messagewaiting_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,13 +13,13 @@ // // Description: // -//! @file te_ctsycomponent_messagewaiting_individual.script -//! @SYMScriptAuthor -//! @SYMTestSuiteName te_ctsy_component -//! @SYMScriptCreationDate +// PRINT Run Message Waiting test cases for suite te_ctsy_component +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script + + LOAD_SUITE te_ctsy_component START_TESTCASE BA-CTSY-MSGW-MCMW-0001 @@ -178,3 +178,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMessageWaitingFU.TestNotifyIccMessageWaitingIndicatorsChange0004L END_TESTCASE BA-CTSY-MSGW-MNIMWC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mms_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mms_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_mms_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -71,3 +74,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMMSFU.TestSetMmsUserPreferences0001L END_TESTCASE BA-CTSY-MMS-MSMUP-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multicallcallcontrol_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multicallcallcontrol_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multicallcallcontrol_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -60,3 +63,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMulticallCallControlFU.TestNotifyMulticallIndicatorChange0001L END_TESTCASE BA-CTSY-MCC-MNMIC-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multimediacallcontrol_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multimediacallcontrol_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_multimediacallcontrol_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -82,3 +85,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyMultimediaCallControlFU.TestSetMultimediaCallPreference0001L END_TESTCASE BA-CTSY-MMCC-MSMCP-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networkcontrol_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networkcontrol_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networkcontrol_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -942,3 +945,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkControlFU.TestNotifyCellInfoChange0004L END_TESTCASE BA-CTSY-NTWC-PNCIC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networksecurity_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networksecurity_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_networksecurity_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -117,3 +120,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyNetworkSecurityFU.TestNotifyNetworkSecurityLevelChange0004L END_TESTCASE BA-CTSY-NTWS-MNNSLC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_onstore_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_onstore_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_onstore_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,10 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script + LOAD_SUITE te_ctsy_component @@ -383,3 +387,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyONStoreFU.TestStart0004L END_TESTCASE BA-CTSY-PBON-OSS-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -738,5 +741,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketContextFU.TestNotifyConnectionInfoChange0004L END_TESTCASE BA-CTSY-PKTC-PCNCIC-0004 - - +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual_no_adaptive_tcp_receive_window.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual_no_adaptive_tcp_receive_window.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetcontext_individual_no_adaptive_tcp_receive_window.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -672,6 +675,5 @@ RUN_TEST_STEP !PanicCode=-28 100 te_ctsy_component TEFUnit.CCTsyPacketContextFU.TestOpenExistingContext0003L END_TESTCASE BA-CTSY-PKTC-PCONEC-0003 - +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetqos_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetqos_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetqos_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -411,3 +414,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketQoSFU.TestOpenExistingQoS0004L END_TESTCASE BA-CTSY-PKTQ-QOEQ-0004 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetservice_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetservice_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_packetservice_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -112,6 +115,18 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketServiceFU.TestNotifyStatusChange0004L END_TESTCASE BA-CTSY-PKTS-PSNSC-0004 +START_TESTCASE BA-CTSY-PKTS-PSNSC-0004a +//!@SYMTestCaseID BA-CTSY-PKTS-PSNSC-0004a +//!@SYMPREQ 1551 +//!@SYMComponent telephony_ctsy +//!@SYMTestCaseDesc Test support in CTSY for multiple client requests and cancel to RPacketService::NotifyStatusChange +//!@SYMTestPriority High +//!@SYMTestActions Invokes multiple client requests and cancel to RPacketService::NotifyStatusChange +//!@SYMTestExpectedResults Pass +//!@SYMTestType CT +RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketServiceFU.TestNotifyStatusChange0004aL +END_TESTCASE BA-CTSY-PKTS-PSNSC-0004a + START_TESTCASE BA-CTSY-PKTS-PSNSC-0001a //!@SYMTestCaseID BA-CTSY-PKTS-PSNSC-0001a //!@SYMPREQ 1551 @@ -1387,3 +1402,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPacketServiceFU.TestRetrievePcktMbmsSessionListStart0002L END_TESTCASE BA-CTSY-PKTS-PMSLS-0002 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_personalisation_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_personalisation_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_personalisation_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -49,3 +52,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPersonalisationFU.TestSetPersonalisationStatus0001L END_TESTCASE BA-CTSY-PERS-MSPS-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -1894,4 +1897,6 @@ //!@SYMTestExpectedResults Pass //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneBookStoreFU.TestOpen0001L -END_TESTCASE BA-CTSY-PBSTR-PBSO2-0001 \ No newline at end of file +END_TESTCASE BA-CTSY-PBSTR-PBSO2-0001 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual_fail.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual_fail.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonebookstore_individual_fail.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -1908,10 +1911,4 @@ END_TESTCASE BA-CTSY-PBSTR-PBSR3-0002 - - - - - - - +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecapability_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecapability_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecapability_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -92,3 +95,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneCapabilityFU.TestGetMultimodeCaps0001L END_TESTCASE BA-CTSY-PCAP-MGMC-0001 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecontrol_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecontrol_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonecontrol_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -103,3 +106,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneControlFU.TestGetStatus0001L END_TESTCASE BA-CTSY-PCON-PGS-0001 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phoneidentity_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phoneidentity_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phoneidentity_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -278,3 +281,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneIdentityFU.TestNotifyIdentitySuppressionRejected0001L END_TESTCASE BA-CTSY-PID-MNISR-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_hwrm_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_hwrm_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_hwrm_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -83,3 +86,4 @@ RUN_TEST_STEP 400 te_ctsy_component TEFUnit.CCTsyPhonePowerFU.TestHWRMNotifyBatteryInfoChange0004L END_TESTCASE BA-CTSY-PPHWRM-MNBIC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonepower_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -83,3 +86,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhonePowerFU.TestNotifyBatteryInfoChange0004L END_TESTCASE BA-CTSY-PP-MNBIC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonesecurity_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonesecurity_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonesecurity_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -490,3 +493,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneSecurityFU.TestNotifySecurityCapsChange0004L END_TESTCASE BA-CTSY-NTWS-MNSCC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonestore_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonestore_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_phonestore_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -60,3 +63,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPhoneStoreFU.TestGetPhoneStoreInfo0004L END_TESTCASE BA-CTSY-PSTR-MGPSI-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_privacy_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_privacy_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_privacy_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -170,3 +173,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyPrivacyFU.TestNotifyDefaultPrivacyChange0001L END_TESTCASE BA-CTSY-PRI-MNDPC-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_sessionmanagement_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_sessionmanagement_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_sessionmanagement_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -258,4 +261,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySessionManagementFU.TestInitialiseMM0001L END_TESTCASE BA-CTSY-SESMG-MIM-0001 - +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_signalstrength_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_signalstrength_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_signalstrength_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -82,3 +85,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySignalStrengthFU.TestNotifySignalStrengthChange0004L END_TESTCASE BA-CTSY-SIGS-MNSSC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smartcardapplication_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smartcardapplication_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smartcardapplication_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -93,3 +96,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySmartCardApplicationFU.TestNotifySmartCardAppInfoChange0001L END_TESTCASE BA-CTSY-SMCA-MNSCAIC-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsmessaging_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsmessaging_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsmessaging_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -560,3 +563,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySmsMessagingFU.TestGetCaps0003L END_TESTCASE BA-CTSY-SMSM-SGC-0003 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smspstore_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smspstore_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smspstore_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -49,3 +52,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySMSPStoreFU.TestStart0004L END_TESTCASE BA-CTSY-SMSP-CRMPSL-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsstore_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsstore_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_smsstore_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -302,3 +305,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySmsStoreFU.TestStartBatch0001L END_TESTCASE BA-CTSY-PBSMS-SMSSSB-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_subscriberinfo_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_subscriberinfo_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_subscriberinfo_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -236,3 +239,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySubscriberInfoFU.TestGetIccIdentity0001L END_TESTCASE BA-CTSY-SUBI-MGII-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_supplementaryservicecaps_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_supplementaryservicecaps_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_supplementaryservicecaps_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -60,3 +63,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySupplementaryServiceCapsFU.TestNotifyCallServiceCapsChange0004L END_TESTCASE BA-CTSY-SUSC-MCSCC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_systemstate_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_systemstate_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_systemstate_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -26,3 +29,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsySystemState.TestSystemState0001L END_TESTCASE BA-CTSY-SYSS-SYSSPLG-0001 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_telephonyaudiocontrol_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_telephonyaudiocontrol_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_telephonyaudiocontrol_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -125,3 +128,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyTelephonyAudioControlFU.TestNotifyTelephonyAudioControlError0001L END_TESTCASE BA-CTSY-CRC-CRCNTACE-0001 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_timeout_all.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_timeout_all.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_timeout_all.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -1985,3 +1988,5 @@ //!@SYMTestType CT RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyCustomIPCFU.TestGetUSIMServiceSupport0005L END_TESTCASE BA-CTSY-CIPC-GUSS-0005 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_trafficchannel_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_trafficchannel_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_trafficchannel_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -82,3 +85,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyTrafficChannelFU.TestNotifyTrafficChannelConfirmation00011L END_TESTCASE BA-CTSY-TRCH-CNTCC-00011 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usernetworkaccess_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usernetworkaccess_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usernetworkaccess_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -170,3 +173,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUserNetworkAccessFU.TestSendNetworkServiceRequestNoFdnCheck0004L END_TESTCASE BA-CTSY-USNA-MSNSRNFC-0004 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usertousersignalling_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usertousersignalling_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usertousersignalling_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -280,3 +283,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUserToUserSignallingFU.TestNotifyUUSSettingChange0001L END_TESTCASE BA-CTSY-UUS-MNUSC-0001 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usimapplication_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usimapplication_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_usimapplication_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -126,4 +129,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUSIMApplicationFU.TestGetCurrentActiveUSimApplication0004L END_TESTCASE BA-CTSY-SUBI-MGIK-0004 - +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ussdmessaging_individual.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ussdmessaging_individual.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsycomponent_ussdmessaging_individual.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -269,3 +272,4 @@ RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUssdMessagingFU.TestGetCaps0003L END_TESTCASE BA-CTSY-USSDM-UGC-0003 +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/scripts/te_ctsyintegration_mbms_auto.script --- a/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsyintegration_mbms_auto.script Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/scripts/te_ctsyintegration_mbms_auto.script Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ // -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-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" @@ -13,6 +13,9 @@ // // Description: // +// + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_copy_ini_file.script LOAD_SUITE te_ctsy_component @@ -566,3 +569,5 @@ //!@SYMTestCaseDependencies live/manual RUN_TEST_STEP 100 te_ctsy_component TEFUnit.CCTsyUCaseMbms027.CCtsyIntegrationTestMbms0002L END_TESTCASE BA-CTSY-INT-MB-0046 + +RUN_SCRIPT z:\TestData\Scripts\mockltsy_remove_ini_file.script diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/src/cctsypacketservicefu.cpp --- a/telephonyserverplugins/common_tsy/test/component/src/cctsypacketservicefu.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/src/cctsypacketservicefu.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -39,6 +39,8 @@ #define MBMS_MONITORSERVICECOUNTONE 1 #define MBMS_MONITORSERVICECOUNTMULTIPLE 3 +const TInt KOneSecond=1000000; // Used in a time out function, 1 second (in microSeconds) + CTestSuite* CCTsyPacketServiceFU::CreateSuiteL(const TDesC& aName) { SUB_SUITE; @@ -50,7 +52,8 @@ ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyContextAdded0004L); ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0001L); ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0002L); - ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0004L); + ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0004L); + ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0004aL); ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestNotifyStatusChange0001aL); ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestSetPreferredBearer0001L); ADD_TEST_STEP_ISO_CPP(CCTsyPacketServiceFU, TestSetPreferredBearer0004L); @@ -892,6 +895,97 @@ } /** +@SYMTestCaseID BA-CTSY-PKTS-PSNSC-0004a +@SYMPREQ 1551 +@SYMComponent telephony_ctsy +@SYMTestCaseDesc Test support in CTSY for multiple client requests to RPacketService::NotifyStatusChange +@SYMTestPriority High +@SYMTestActions Invokes multiple client requests to RPacketService::NotifyStatusChange +@SYMTestExpectedResults Pass +@SYMTestType CT +*/ +void CCTsyPacketServiceFU::TestNotifyStatusChange0004aL() + { + + OpenEtelServerL(EUseExtendedError); + CleanupStack::PushL(TCleanupItem(Cleanup,this)); + OpenPhoneL(); + + RBuf8 data; + CleanupClosePushL(data); + + // Open second client + RTelServer telServer2; + TInt ret = telServer2.Connect(); + ASSERT_EQUALS(KErrNone, ret); + CleanupClosePushL(telServer2); + + RMobilePhone phone2; + ret = phone2.Open(iTelServer,KMmTsyPhoneName); + ASSERT_EQUALS(KErrNone, ret); + CleanupClosePushL(phone2); + + RPacketService packetService; + OpenPacketServiceL(packetService); + CleanupClosePushL(packetService); + + RPacketService packetService2; + ret = packetService2.Open(phone2); + ASSERT_EQUALS(KErrNone, ret); + CleanupClosePushL(packetService2); + + //------------------------------------------------------------------------- + // Test A: Test multiple clients requesting RPacketService::NotifyStatusChange + //------------------------------------------------------------------------- + + // Data for CompleteL + RPacketService::TStatus sendStatus = RPacketService::EStatusAttached; + TBool isResumed = EFalse; + TMockLtsyData2 ltsyData(sendStatus, isResumed); + ltsyData.SerialiseL(data); + + TRequestStatus requestStatus; + RPacketService::TStatus contextStatus; + // sent first request + packetService.NotifyStatusChange(requestStatus, contextStatus); + + TRequestStatus requestStatus2; + RPacketService::TStatus contextStatus2; + // sent second request + packetService2.NotifyStatusChange(requestStatus2, contextStatus2); + + // Issue the Complete... + iMockLTSY.CompleteL(EPacketNotifyStatusChange, KErrNone, data); + + // wait for the first request + User::WaitForRequest(requestStatus); + ASSERT_EQUALS(KErrNone, requestStatus.Int()); + ASSERT_EQUALS(sendStatus, contextStatus); + // wait for the second request + User::WaitForRequest(requestStatus2); + ASSERT_EQUALS(KErrNone, requestStatus2.Int()); + ASSERT_EQUALS(sendStatus, contextStatus2); + + AssertMockLtsyStatusL(); + + // Activate both clients again + packetService.NotifyStatusChange(requestStatus, contextStatus); + User::After(KOneSecond); + packetService2.NotifyStatusChange(requestStatus2, contextStatus2); + User::After(KOneSecond); + + // Send cancel to the first client + packetService.CancelAsyncRequest(EPacketNotifyStatusChange); + User::WaitForRequest(requestStatus); + ASSERT_EQUALS(KErrCancel, requestStatus.Int()); + + AssertMockLtsyStatusL(); + + CleanupStack::PopAndDestroy(2); // packetService, packetService2 + CleanupStack::PopAndDestroy(4, this); // phone2, telServer2, data, this + } + +/** @SYMTestCaseID BA-CTSY-PKTS-PSNSC-0001a @SYMPREQ 1551 @SYMComponent telephony_ctsy diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/component/testdata/TestGetPhoneId0001f.ini --- a/telephonyserverplugins/common_tsy/test/component/testdata/TestGetPhoneId0001f.ini Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/component/testdata/TestGetPhoneId0001f.ini Tue Jun 22 11:02:32 2010 +0100 @@ -1,12 +1,12 @@ -[Device] -0x10286358 = InvalidManufacturer #ManufacturerName -0x10286359 = InvalidModelName #ModelName -0x1028635A = InvalidModelCode #ModelCode - -[UI] -0x1028635D = InvalidUIName #UIPlatformName -0x1028635E = 1 #UIPlatformVersionMajor -0x1028635F = 2 #UIPlatformVersionMinor - -[DeviceDefaults] -0x1028635C = Bob #DeviceName +[Device] +0x10286358 = InvalidManufacturer #ManufacturerName +0x10286359 = InvalidModelName #ModelName +0x1028635A = InvalidModelCode #ModelCode + +[UI] +0x1028635D = InvalidUIName #UIPlatformName +0x1028635E = 1 #UIPlatformVersionMajor +0x1028635F = 2 #UIPlatformVersionMinor + +[DeviceDefaults] +0x1028635C = Bob #DeviceName diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/group/bld.inf --- a/telephonyserverplugins/common_tsy/test/integration/group/bld.inf Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -13,6 +13,9 @@ // Description: // +//To resolve RPS dependency for integration tests +// RPS +#include "../../RPS/group/bld.inf" PRJ_EXPORTS @@ -120,8 +123,6 @@ PRJ_TESTMMPFILES -//To resolve RPS dependency for integration tests -// RPS -#include "../../RPS/group/bld.inf" + te_ctsyintegrationtestsuite.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestairtimeduration.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestairtimeduration.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestairtimeduration.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -103,12 +103,6 @@ // // TEST START // - - // Check RMobilePhone::GetAirTimeDuration returns duration == 0. - TTimeIntervalSeconds timeBeforeDial; - TTimeIntervalSeconds timeAfterDial; - ASSERT_EQUALS(customApi.GetAirTimeDuration(timeBeforeDial), KErrNone, _L("RMmCustomAPI::GetAirTimeDuration returned with an error")) - ASSERT_EQUALS(timeBeforeDial.Int(),0,_L("RMmCustomAPI::GetAirTimeDuration did not return zero time duration as expected")) // Dial a number that answers. TPtrC number; @@ -120,14 +114,19 @@ ASSERT_EQUALS(WaitForRequestWithTimeOut(dialStatus, ETimeMedium), KErrNone, _L("RCall::Dial timed-out")) ASSERT_EQUALS(dialStatus.Int(), KErrNone, _L("RCall::Dial returned with an error")) + // Note that the air time reported before dialing a call is the last call airtime + TTimeIntervalSeconds timeOne; + TTimeIntervalSeconds timeTwo; + ASSERT_EQUALS(customApi.GetAirTimeDuration(timeOne), KErrNone, _L("RMmCustomAPI::GetAirTimeDuration returned with an error")) + // Wait for two second and check RMobilePhone::GetAirTimeDuration returns duration > previous duration. Repeat for 20 seconds. TInt count=1; do { User::After(KOneSecond*2); - ASSERT_EQUALS(customApi.GetAirTimeDuration(timeAfterDial), KErrNone, _L("RMmCustomAPI::GetAirTimeDuration returned with an error")) - ASSERT_TRUE(timeAfterDial.Int()>timeBeforeDial.Int(),_L("RMmCustomAPI::GetAirTimeDuration did not return bigger time duration then the previous one")) - timeBeforeDial=timeAfterDial; + ASSERT_EQUALS(customApi.GetAirTimeDuration(timeTwo), KErrNone, _L("RMmCustomAPI::GetAirTimeDuration returned with an error")) + ASSERT_TRUE(timeTwo.Int()>timeOne.Int(),_L("RMmCustomAPI::GetAirTimeDuration did not return bigger time duration then the previous one")) + timeOne=timeTwo; count++; }while(count!=10); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallforwarding.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallforwarding.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallforwarding.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -210,7 +210,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingAllConditionalCases for EAllServices")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingAllConditionalCases, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingAllConditionalCases for EAllServices failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for EAllServices")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EAllServices failed")); @@ -398,7 +398,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ETelephony")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for ETelephony failed")); } - else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EVoiceService failed")); @@ -430,7 +430,7 @@ { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EFaxService failed")); } - else if(operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EFaxService failed")); } @@ -440,7 +440,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for EShortMessageService")); - if(operatorName==EOperatorTMobile || operatorName==EOperatorO2) + if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSIncompatibility), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EShortMessageService failed")); } @@ -561,7 +561,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices")); CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed")); } - else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EAllServices and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 newSetting.iAction=RMobilePhone::EServiceActionRegister; @@ -688,7 +688,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices")); CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed")); } - else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EAllServices and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 newSetting.iAction=RMobilePhone::EServiceActionRegister; @@ -731,7 +731,7 @@ { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EAuxVoiceService failed")); } - else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EAuxVoiceService failed")); } @@ -749,7 +749,7 @@ { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSIllegalOperation), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EPacketDataService failed")); } - else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EPacketDataService failed")); } @@ -762,7 +762,7 @@ { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EFaxService failed")); } - else if(operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EFaxService failed")); } @@ -779,7 +779,7 @@ { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EShortMessageService failed")); } - else if(operatorName==EOperatorO2) + else if(operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionErase ECallForwardingUnconditional for EShortMessageService failed")); } @@ -911,7 +911,7 @@ { CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed")); } - else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSErrorStatus), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingUnconditional for EAllServices failed")); } @@ -1081,7 +1081,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ETelephony")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ETelephony failed")); } - else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSErrorStatus), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EVoiceService failed")); @@ -1106,7 +1106,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EFaxService")); - if(operatorName==EOperatorOrange || operatorName==EOperatorO2) + if(operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned ), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EFaxService failed")); } @@ -1119,7 +1119,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EShortMessageService")); - if(operatorName==EOperatorTMobile || operatorName==EOperatorO2) + if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSIncompatibility), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EShortMessageService failed")); } @@ -1239,7 +1239,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices")); CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed")); } - else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionActivate and aInfo.iServiceGroup=RMobilePhone::EAllServices, aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 newSetting.iAction=RMobilePhone::EServiceActionRegister; @@ -1371,7 +1371,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EAllServices")); CHECK_TRUE_L(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EAllServices failed")); } - else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2) + else if(operatorName==EOperatorTMobile || operatorName==EOperatorOrange || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionActivate and aInfo.iServiceGroup=RMobilePhone::EAllServices, aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 newSetting.iAction=RMobilePhone::EServiceActionRegister; @@ -1440,7 +1440,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for ETelephony")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for ETelephony failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for EVoiceService failed")); @@ -1465,7 +1465,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for EFaxService")); - if(operatorName==EOperatorO2 || operatorName==EOperatorOrange) + if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSTeleserviceNotProvisioned), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for EFaxService failed")); } @@ -1478,7 +1478,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionDeactivate ECallForwardingUnconditional for EShortMessageService")); - if(operatorName==EOperatorO2 || operatorName==EOperatorTMobile) + if(operatorName==EOperatorO2 || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionDeactivate ECallForwardingUnconditional for EShortMessageService failed")); } @@ -1626,7 +1626,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ETelephony")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ETelephony failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // === Register call forwarding unconditional for all services === @@ -1901,7 +1901,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 newSetting.iAction=RMobilePhone::EServiceActionRegister; @@ -1997,7 +1997,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { newSetting.iAction=RMobilePhone::EServiceActionRegister; DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService")); @@ -2065,7 +2065,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNoReply for ECircuitDataService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNoReply), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNoReply for ECircuitDataService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { newSetting.iAction=RMobilePhone::EServiceActionRegister; DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingNoReply for ECircuitDataService")); @@ -2134,7 +2134,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNotReachable for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNotReachable), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNotReachable for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { newSetting.iAction=RMobilePhone::EServiceActionRegister; @@ -2315,7 +2315,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 newSetting.iAction=RMobilePhone::EServiceActionRegister; @@ -2551,7 +2551,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { newSetting.iAction=RMobilePhone::EServiceActionRegister; // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingBusy and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 @@ -2677,7 +2677,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNotReachable for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNotReachable), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNotReachable for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { newSetting.iAction=RMobilePhone::EServiceActionRegister; DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingNotReachable for EVoiceService")); @@ -2787,7 +2787,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingNoReply for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingNoReply), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingNoReply for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { newSetting.iAction=RMobilePhone::EServiceActionRegister; DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingNoReply for EVoiceService")); @@ -2995,7 +2995,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with ECallForwardingUnconditional for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 newSetting.iAction=RMobilePhone::EServiceActionRegister; @@ -3030,7 +3030,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with ECallForwardingUnconditional for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=different valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 newSetting.iAction=RMobilePhone::EServiceActionRegister; @@ -3159,13 +3159,13 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingNoReply and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=10 // Check RMobilePhone::NotifyCallForwardingStatusChange completes with aCondition=ECallForwardingBusy newSetting.iAction=RMobilePhone::EServiceActionRegister; DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingBusy for EVoiceService")); - if(operatorName==EOperatorTMobile || operatorName==EOperatorO2) + if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingBusy for EVoiceService failed")); } @@ -3194,13 +3194,13 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingBusy for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingBusy for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=RMobilePhone::ECallForwardingNoReply and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=different valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=20 // Check RMobilePhone::NotifyCallForwardingStatusChange completes with aCondition=ECallForwardingBusy newSetting.iAction=RMobilePhone::EServiceActionRegister; DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingBusy for EVoiceService")); - if(operatorName==EOperatorTMobile || operatorName==EOperatorO2) + if(operatorName==EOperatorTMobile || operatorName==EOperatorO2 || operatorName==EOperatorNTN) { ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingBusy, KErrGsmSSUnexpectedDataValue), _L("SetCallForwardingStatusUtil with EServiceActionRegister ECallForwardingBusy for EVoiceService failed")); } @@ -3334,7 +3334,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for EVoiceService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for EVoiceService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { newSetting.iAction=RMobilePhone::EServiceActionRegister; // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EVoiceService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 @@ -3373,7 +3373,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::ECircuitDataService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService")); @@ -3401,7 +3401,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::ECircuitDataService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService")); @@ -3429,7 +3429,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ECircuitDataService failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::EPacketDataService and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ECircuitDataService")); @@ -3458,7 +3458,7 @@ DEBUG_PRINTF1(_L("Setting call forward EServiceActionActivate ECallForwardingUnconditional for ETelephony")); ASSERT_TRUE(SetCallForwardingStatusUtilL(mobilePhone, newSetting, RMobilePhone::ECallForwardingUnconditional), _L("SetCallForwardingStatusUtil with EServiceActionActivate ECallForwardingUnconditional for ETelephony failed")); } - else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile) + else if(operatorName==EOperatorO2 || operatorName==EOperatorOrange || operatorName==EOperatorTMobile || operatorName==EOperatorNTN) { // Register call forwarding using RMobilePhone::SetCallForwardingStatus with aCondition=ECallForwardingUnconditional and aInfo.iAction=RMobilePhone::EServiceActionRegister and aInfo.iServiceGroup=RMobilePhone::ETelephony and aInfo.iNumber.iNumberPlan=EIsdnNumberPlan, aInfo.iNumber.iTelNumber=valid number, aInfo.iNumber.iTypeOfNumber=ENationalNumber, aInfo.iTimeout=-1 DEBUG_PRINTF1(_L("Setting call forward EServiceActionRegister ECallForwardingUnconditional for ETelephony")); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallwaiting.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallwaiting.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestcallwaiting.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -273,6 +273,7 @@ count = 1; //O2 supports only speech break; case EOperatorVodafone: + case EOperatorNTN: case EOperatorOrange: case EOperatorTMobile: count = 4; //vodafone, orange and tmobile support speech, voice and data @@ -814,6 +815,7 @@ count = 1; //O2 supports only speech break; case EOperatorVodafone: + case EOperatorNTN: case EOperatorOrange: case EOperatorTMobile: count = 3; //vodafone, orange and tmobile support speech, voice and data diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestmultibearerinteroperability.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestmultibearerinteroperability.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestmultibearerinteroperability.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -489,11 +489,11 @@ // Start downloading a file via HTTP. - TBuf<140> host(_L("developer.symbian.com")); - TBuf<140> page(_L("/main/downloads/papers/IMS_Introduction_Part_1.pdf")); + TBuf<140> host(_L("developer.symbian.org")); + TBuf<140> page(_L("/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf")); CHTTPDownload* download = new (ELeave) CHTTPDownload(this); CleanupStack::PushL(download); - ASSERT_TRUE(download->StartDownloadL(host,page), _L("Download Failed")); + ASSERT_TRUE(download->StartDownloadL(host,page), _L("Download Failed - perhaps page has moved!")); // Get context info TExtEtelRequestStatus getContextInfo(packetService, EPacketGetContextInfo); @@ -800,11 +800,11 @@ ASSERT_EQUALS(dialStatus.Int(), KErrNone, _L("RCall::Dial returned with an error")); // Start downloading a file e.g. via HTTP. - TBuf<140> host(_L("developer.symbian.com")); - TBuf<140> page(_L("/main/downloads/papers/IMS_Introduction_Part_1.pdf")); - CHTTPDownload *download = new (ELeave) CHTTPDownload(this); + TBuf<140> host(_L("developer.symbian.org")); + TBuf<140> page(_L("/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf")); + CHTTPDownload* download = new (ELeave) CHTTPDownload(this); CleanupStack::PushL(download); - ASSERT_TRUE(download->StartDownloadL(host,page),_L("CHTTPDownload::StartDownloadL failed")); + ASSERT_TRUE(download->StartDownloadL(host,page), _L("Download Failed - perhaps page has moved!")); // Verify file is downloading. ASSERT_TRUE(download->VerifyDownloading(), _L("CHTTPDownload::VerifyDownloading did not return ETrue as expected. File is not downloaded.")); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestpacketcontext.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestpacketcontext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestpacketcontext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -12426,11 +12426,11 @@ // === Send and receive some data and check data transferred advances === // Activate context with ESOCK server - TBuf<140> host(_L("developer.symbian.com")); - TBuf<140> page(_L("/main/downloads/papers/IMS_Introduction_Part_1.pdf")); + TBuf<140> host(_L("developer.symbian.org")); + TBuf<140> page(_L("/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf")); CHTTPDownload *download = new (ELeave) CHTTPDownload(this); CleanupStack::PushL(download); - ASSERT_TRUE(download->StartDownloadL(host,page),_L("Download Failed")); + ASSERT_TRUE(download->StartDownloadL(host,page),_L("Download Failed - perhaps page has moved!")); // Check RPacketService::GetNifInfo with aCount = 0 returns valid name in iContextName TInt nifInfoCount = 0; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestsmsmessaging.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestsmsmessaging.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/cctsyintegrationtestsmsmessaging.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -76,6 +76,9 @@ case EOperatorVodafone: network = &KNetworkVodafone; break; + case EOperatorNTN: + network = &KNetworkNTN; + break; case EOperatorOrange: network = &KNetworkOrange; break; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/chttpdownload.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/chttpdownload.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/chttpdownload.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -24,8 +24,8 @@ // Declare a static, counter fot active downloads, to know when to open and close the server socket session TInt CHTTPDownload::iActiveDownload = 0; -_LIT(KDefaultHost, "www.smartphoneshow.com"); -_LIT(KDefaultPage, "/newt/l/downloads/symbian/presentations/Day1Pres1_NigelClifford_Symbian_keynote.pdf"); +_LIT(KDefaultHost, "developer.symbian.org"); +_LIT(KDefaultPage, "/wiki/images/1/12/Common_Design_Patterns_for_Symbian_OS_Sample_Chapter.pdf"); const TInt KDefaultPort = 80; const TInt KBufferSize = 4096; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/comparisonfunctions.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/comparisonfunctions.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/comparisonfunctions.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -206,18 +206,28 @@ { if(aLogError == ELogError) { + TBuf<255> apn, username, password; + apn.Copy(iValue.iAccessPointName); + username.Copy(iValue.iProtocolConfigOption.iAuthInfo.iUsername); + password.Copy(iValue.iProtocolConfigOption.iAuthInfo.iPassword); _LIT(KAssertRPacketContextErrorEqualsTextA,"FAILURE"); _LIT(KAssertRPacketContextErrorEqualsTextB," Got apn=%S,username=%S,password=%S"); _LIT(KAssertRPacketContextErrorEqualsTextC," Expected apn=%S,username=%S,password=%S"); ERR_PRINTF1(KAssertRPacketContextErrorEqualsTextA); ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextB, - &iValue.iAccessPointName, - &iValue.iProtocolConfigOption.iAuthInfo.iUsername, - &iValue.iProtocolConfigOption.iAuthInfo.iPassword); + &apn, + &username, + &password); + apn.SetLength(0); + username.SetLength(0); + password.SetLength(0); + apn.Copy(iExpected.iAccessPointName); + username.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iUsername); + password.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iPassword); ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextC, - &iExpected.iAccessPointName, - &iExpected.iProtocolConfigOption.iAuthInfo.iUsername, - &iExpected.iProtocolConfigOption.iAuthInfo.iPassword); + &apn, + &username, + &password); } return EFalse; } @@ -246,18 +256,30 @@ { if(aLogError == ELogError) { + TBuf<255> apn, username, password; + apn.Copy(iValue.iAccessPointName); + username.Copy(iValue.iProtocolConfigOption.iAuthInfo.iUsername); + password.Copy(iValue.iProtocolConfigOption.iAuthInfo.iPassword); + _LIT(KAssertRPacketContextErrorEqualsTextA,"FAILURE"); _LIT(KAssertRPacketContextErrorEqualsTextB," Got apn=%S,username=%S,password=%S"); _LIT(KAssertRPacketContextErrorEqualsTextC," Expected apn=%S,username=%S,password=%S"); ERR_PRINTF1(KAssertRPacketContextErrorEqualsTextA); ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextB, - &iValue.iAccessPointName, - &iValue.iProtocolConfigOption.iAuthInfo.iUsername, - &iValue.iProtocolConfigOption.iAuthInfo.iPassword); + &apn, + &username, + &password); + apn.SetLength(0); + username.SetLength(0); + password.SetLength(0); + apn.Copy(iExpected.iAccessPointName); + username.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iUsername); + password.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iPassword); ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextC, - &iExpected.iAccessPointName, - &iExpected.iProtocolConfigOption.iAuthInfo.iUsername, - &iExpected.iProtocolConfigOption.iAuthInfo.iPassword); + &apn, + &username, + &password); + } return EFalse; } @@ -286,18 +308,28 @@ { if(aLogError == ELogError) { + TBuf<255> apn, username, password; + apn.Copy(iValue.iAccessPointName); + username.Copy(iValue.iProtocolConfigOption.iAuthInfo.iUsername); + password.Copy(iValue.iProtocolConfigOption.iAuthInfo.iPassword); _LIT(KAssertRPacketContextErrorEqualsTextA,"FAILURE"); _LIT(KAssertRPacketContextErrorEqualsTextB," Got apn=%S,username=%S,password=%S"); _LIT(KAssertRPacketContextErrorEqualsTextC," Expected apn=%S,username=%S,password=%S"); ERR_PRINTF1(KAssertRPacketContextErrorEqualsTextA); ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextB, - &iValue.iAccessPointName, - &iValue.iProtocolConfigOption.iAuthInfo.iUsername, - &iValue.iProtocolConfigOption.iAuthInfo.iPassword); + &apn, + &username, + &password); + apn.SetLength(0); + username.SetLength(0); + password.SetLength(0); + apn.Copy(iExpected.iAccessPointName); + username.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iUsername); + password.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iPassword); ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextC, - &iExpected.iAccessPointName, - &iExpected.iProtocolConfigOption.iAuthInfo.iUsername, - &iExpected.iProtocolConfigOption.iAuthInfo.iPassword); + &apn, + &username, + &password); } return EFalse; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/tnetworktsytesthelper.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/tnetworktsytesthelper.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/tnetworktsytesthelper.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -613,7 +613,8 @@ { aOperatorName = EOperatorAnite; } - else if ( ptrNetworkName.Find(_L("NTN")) >=0 ) + else if ( ptrNetworkName.Find(_L("NTN")) >=0 + || ptrNetworkName.Find(_L("NOKIA")) >=0) { aOperatorName = EOperatorNTN; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp --- a/telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/src/tpacketservicetsytesthelper.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -82,7 +82,19 @@ { // Request has completed with incorrect result. Consume any outstanding // Repost notification until timeout or we get the right result. - + DEBUG_PRINTF3(_L("State %d Expected %d waiting for correct state"), aContextStatus, aExpectedContextStatus); + + if (RPacketContext::EStatusActive == aContextStatus) + { + // === NTN Failure === + ERR_PRINTF1(_L("$NTNKnownFailure: Context Activation success (EStatusActive = 3)")); + // Nothing else to wait for now! + // Deactivate the context with RPacketContext::Deactivate + TExtEtelRequestStatus contextDeactivateStatus(aPacketContext, EPacketContextDeactivate); + aPacketContext.Deactivate(contextDeactivateStatus); + User::Leave(iTestStep.WaitForRequestWithTimeOut(contextDeactivateStatus, ETimeLong)); + } + aPacketContext.NotifyStatusChange(aRequestStatus, aContextStatus); err = iTestStep.WaitForRequestWithTimeOut(aRequestStatus, ETimeVeryLong); } @@ -777,8 +789,13 @@ } else if(ptrNetworkName.Find(_L("NTN")) != KErrNotFound) // NTN { - section.Copy(KIniSectionVodafoneGprs); - DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings")); + section.Copy(KIniSectionNTNGprs); + DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings")); + } + else if(ptrNetworkName.Find(_L("NOKIA")) != KErrNotFound) // NTN + { + section.Copy(KIniSectionNTNGprs); + DEBUG_PRINTF1(_L("Retrieving NTN GPRS settings")); } else if( (ptrNetworkName.Find(_L("01")) >=0) || (ptrNetworkName.Find(_L("ANITE")) >=0) ) // Anite diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/common_tsy/test/integration/testdata/ctsyintegration_ntn_data.ini --- a/telephonyserverplugins/common_tsy/test/integration/testdata/ctsyintegration_ntn_data.ini Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/common_tsy/test/integration/testdata/ctsyintegration_ntn_data.ini Tue Jun 22 11:02:32 2010 +0100 @@ -8,11 +8,11 @@ VoiceNumberInt1=99900 VoiceNumberIntExHC=99900 VoiceNumberDoesNotConnect=0 -SmsReceptor=01632960000 +SmsReceptor=+3584544109099 [DataNumbers] -DataNumber1=01632960000 +DataNumber1=+3584544109099 DataNumber2=0 [FaxNumbers] @@ -20,7 +20,7 @@ FaxNumber2=0 [OwnNumbers] -OwnVoiceNumber1= +OwnVoiceNumber1=+3584544268603 OwnVoiceNumber2= OwnDataNumber= OwnFaxNumber= @@ -136,7 +136,7 @@ Pin2= [NTNPasswords] -CallBarring1=0000 +CallBarring1=1234 Pin1=1234 Pin2=5678 Puk1=11111111 @@ -153,8 +153,8 @@ NTN= +358454400051 [BoardParams] -PhoneLock= +PhoneLock=12345 [SIMParams] -Puk1= -Puk2= +Puk1=11111111 +Puk2=22222222 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/exportinc/ltsylogger.h --- a/telephonyserverplugins/ctsydispatchlayer/exportinc/ltsylogger.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/exportinc/ltsylogger.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -27,18 +27,11 @@ #include -#ifdef _DEBUG +#ifdef OST_TRACE_COMPILER_IN_USE -#include _LIT8(KTsySubSystem, "tsy"); _LIT8(KTsyCompnt, "ctsydis"); - /** Regular logging macro */ - #define LOG(format, ARGS...) \ - { \ - RFileLogger::WriteFormat(KTsySubSystem, KTsyCompnt, format, ##ARGS); \ - } - /** Macros to log function entry and exit */ //#define TSYLOGENTRYEXIT(aFunc) TLogEntryExit __logger((aFunc), KTsyCompnt) @@ -84,7 +77,6 @@ #else // _DEBUG - #define LOG(format, ARGS...) #define TSYLOGENTRYEXIT #define TSYLOGENTRYEXITARGS(aFunc, aFmt, ARGS...) #define TSYLOGSETEXITERR(aErr) aErr // So that we don't lose the return code in UREL! diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/group/ctsydispatcher.mmp --- a/telephonyserverplugins/ctsydispatchlayer/group/ctsydispatcher.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/group/ctsydispatcher.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -22,8 +22,6 @@ CAPABILITY all -tcb VENDORID 0x70000001 -// For logging -#include MACRO USING_CTSY_DISPATCHER @@ -32,7 +30,7 @@ USERINCLUDE ../inc USERINCLUDE ../../common_tsy/commontsy/exportinc/serviceapi - +USERINCLUDE ../traces SOURCEPATH ../src @@ -76,6 +74,5 @@ LIBRARY bafl.lib //needed for CPhoneBookStoreEntry LIBRARY customapi.lib -//DEBUGLIBRARY ComsDbgUtil.lib diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp --- a/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_dispatcher source \sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer binary \sf\os\cellularsrv\telephonyserverplugins\ctsydispatchlayer\group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/ccallcontroldispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/ccallcontroldispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/ccallcontroldispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ccallcontroldispatcherTraces.h" +#endif + #include "ccallcontroldispatcher.h" #include @@ -2309,7 +2315,7 @@ CallbackQueryIsEmergencyNumber(&aIpcDataPackage); break; default: - LOG(_L8("WARNING: CCallControlDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCALLCONTROLDISPATCHER_CALLBACKSYNC_1, "WARNING: CCallControlDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/ccallcontrolmultipartydispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/ccallcontrolmultipartydispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/ccallcontrolmultipartydispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ccallcontrolmultipartydispatcherTraces.h" +#endif + #include "ccallcontrolmultipartydispatcher.h" #include @@ -415,7 +421,7 @@ { default: - LOG(_L8("WARNING: CCallControlMultipartyDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCALLCONTROLMULTIPARTYDISPATCHER_CALLBACKSYNC_1, "WARNING: CCallControlMultipartyDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/ccellbroadcastdispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/ccellbroadcastdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/ccellbroadcastdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ccellbroadcastdispatcherTraces.h" +#endif + #include "ccellbroadcastdispatcher.h" #include @@ -477,7 +483,7 @@ { default: - LOG(_L8("WARNING: CCellBroadcastDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCELLBROADCASTDISPATCHER_CALLBACKSYNC_1, "WARNING: CCellBroadcastDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/cctsydispatchercallback.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/cctsydispatchercallback.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/cctsydispatchercallback.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,11 @@ // Description: // +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cctsydispatchercallbackTraces.h" +#endif + #include #include #include "ccallcontroldispatcher.h" @@ -4178,7 +4183,8 @@ //initial invetigation shows a "ExitInfo 2,23,USER" TSYLOGENTRYEXIT; - LOG(_L8("aError=%d, aDcs=%d, aType=%d, aFormat=%d"),aError, aDcs, aType, aFormat) + + OstTraceDefExt5(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCTSYDISPATCHERCALLBACK_CALLBACKSUPPLEMENTARYSERVICESRECEIVEUSSDMESSAGEIND_1,"aError=%d, aDcs=%d, aType=%d, aFormat=%d aMessage=%s", aError, aDcs, aType, aFormat,aMessage); // Forward completion to correct dispatcher object to handle __ASSERT_DEBUG(iDispatcherHolder, CtsyDispatcherPanic(EInvalidNullPtr)); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/cmessagerouter.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/cmessagerouter.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/cmessagerouter.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmessagerouterTraces.h" +#endif + #include #include #include @@ -314,7 +320,7 @@ // Kick off boot sequence TInt ret = ExtFuncL(EMmTsyBootNotifyModemStatusReadyIPC, NULL); - LOG(_L8("ExtFuncL(EMmTsyBootNotifyModemStatusReadyIPC returned %d"), ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_STARTBOOTSEQUENCEL_1, "ExtFuncL(EMmTsyBootNotifyModemStatusReadyIPC returned %d", ret); User::LeaveIfError(ret); } // CMessageRouter::StartBootSequenceL @@ -1045,7 +1051,7 @@ ret = iCtsyDispatcherSatDispatcher->DispatchGetUssdControlSupportedL(); break; default: - LOG(_L8("WARNING: CMessageRouter::ExtFuncL unhandled IPC=%d"), aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_EXTFUNCL_1, "WARNING: CMessageRouter::ExtFuncL unhandled IPC=%d", aIpc); break; } // switch (aIpc) @@ -1080,31 +1086,31 @@ TUint32 indmask; iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchCallControlFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("CallControl indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_1, "CallControl indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPhoneFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("Security indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_2, "Security indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSecurityFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("CallControl indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_3, "CallControl indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPhonebookEnFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("Phonebook EN indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_4, "Phonebook EN indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchCellBroadcastFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("Cell Broadcast indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_5, "Cell Broadcast indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPhonebookOnFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("Phonebook ON indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_6, "Phonebook ON indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPhonebookFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("Phonebook indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_7, "Phonebook indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSimFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("SIM indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_8, "SIM indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSmsFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("Sms indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_9, "Sms indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchCallControlMultipartyFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("Call Control Multiparty indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_10, "Call Control Multiparty indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSupplementaryServicesFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("Supplementary Services indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_11, "Supplementary Services indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchPacketServicesFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("Packet Services indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_12, "Packet Services indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); iLtsyFactoryV1->IsCallbackIndicatorSupported(KDispatchSatFuncUnitId, EIndIdGroup1, indmask); - LOG(_L8("SAT indicator support. GroupID=%d, bitmask = 0x%x"), EIndIdGroup1, indmask); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_13, "SAT indicator support. GroupID=%d, bitmask = 0x%x", EIndIdGroup1, (TUint)indmask); } void CMessageRouter::RetrieveNetworkInfoL() diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/cpacketservicesdispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/cpacketservicesdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/cpacketservicesdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cpacketservicesdispatcherTraces.h" +#endif + #include "cpacketservicesdispatcher.h" #include @@ -2308,7 +2314,7 @@ { default: - LOG(_L8("WARNING: CPacketServicesDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPACKETSERVICESDISPATCHER_CALLBACKSYNC_1, "WARNING: CPacketServicesDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cphonebookdispatcherTraces.h" +#endif + #include "cphonebookdispatcher.h" #include @@ -1049,7 +1055,7 @@ * @param aPhonebook The phonebook to reset the cache for. */ { - TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d"), aError, aPhonebook); + TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d"), aError, aPhonebook); __ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter)); @@ -1071,8 +1077,8 @@ * @param aMaxNumberLength The maximum number length in the Fdn phonebook. */ { - TSYLOGENTRYEXITARGS(_L8("aError=%d,aTotalEntries=%d,aMaxTextLength=%d,aMaxNumberLength=%d"), - aError,aTotalEntries,aMaxTextLength,aMaxNumberLength); + TSYLOGENTRYEXITARGS(_L8("aError=%d, aTotalEntries=%d, aMaxTextLength=%d, aMaxNumberLength=%d"), + aError, aTotalEntries, aMaxTextLength, aMaxNumberLength); TName phoneBookName(KETelIccFdnPhoneBook); CPhoneBookDataPackage phoneBookDataPackage; @@ -1104,7 +1110,7 @@ * @see CPhoneBookEntry::ExternalizeToTlvEntry() */ { - TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d"), aError, aPhonebook); + TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d"), aError, aPhonebook); __ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter)); @@ -1115,11 +1121,11 @@ if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)) { - //fill the CTSY pointer - CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); - iPhonebookReadPtrs[aPhonebook] = readEntries; - - TRAP(aError,FillCtsyPhoneBookStoreL(aPhonebookEntries,*(iPhonebookReadPtrs[aPhonebook]))); + //fill the CTSY pointer + TRAP ( aError, + CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); + iPhonebookReadPtrs[aPhonebook] = readEntries; + FillCtsyPhoneBookStoreL(aPhonebookEntries,*(iPhonebookReadPtrs[aPhonebook]))); } CPhoneBookDataPackage phoneBookDataPackage; @@ -1174,7 +1180,7 @@ * @see CPhoneBookEntry::ExternalizeToTlvEntry() */ { - TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d"), aError, aPhonebook); + TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d"), aError, aPhonebook); __ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter)); @@ -1185,10 +1191,10 @@ if((aError == KErrNone) && (aPhonebook != DispatcherPhonebook::EUnknown)/* && (iPhonebookCachePtrs[aPhonebook])*/) { - CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); - iPhonebookCachePtrs[aPhonebook] = readEntries; - - TRAP(aError,FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook]))); + TRAP(aError, + CArrayPtrSeg* readEntries = new(ELeave) CArrayPtrSeg(1); + iPhonebookCachePtrs[aPhonebook] = readEntries; + FillCtsyPhoneBookStoreL(aPhonebookEntries, *(iPhonebookCachePtrs[aPhonebook]))); if(aError) { @@ -1337,7 +1343,7 @@ * @see RMobilePhoneBookStore::Write() */ { - TSYLOGENTRYEXITARGS(_L8("aError=%d,aPhonebook=%d,aIndex=%d,aMaxNumberLength=%d"), aError, aPhonebook, aIndex, aMaxNumberLength); + TSYLOGENTRYEXITARGS(_L8("aError=%d, aPhonebook=%d, aIndex=%d, aMaxNumberLength=%d"), aError, aPhonebook, aIndex, aMaxNumberLength); __ASSERT_DEBUG(aPhonebook != DispatcherPhonebook::EUnknown, CtsyDispatcherPanic(EInvalidParameter)); @@ -1509,7 +1515,7 @@ { default: - LOG(_L8("WARNING: CPhonebookDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBOOKDISPATCHER_CALLBACKSYNC_1, "WARNING: CPhonebookDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/cphonebookendispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookendispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookendispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cphonebookendispatcherTraces.h" +#endif + #include "cphonebookendispatcher.h" #include @@ -331,7 +337,7 @@ { default: - LOG(_L8("WARNING: CPhonebookEnDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBOOKENDISPATCHER_CALLBACKSYNC_1, "WARNING: CPhonebookEnDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/cphonebookondispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookondispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookondispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cphonebookondispatcherTraces.h" +#endif + #include "cphonebookondispatcher.h" #include @@ -623,7 +629,7 @@ { default: - LOG(_L8("WARNING: CPhonebookOnDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBOOKONDISPATCHER_CALLBACKSYNC_1, "WARNING: CPhonebookOnDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/cphonedispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/cphonedispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonedispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cphonedispatcherTraces.h" +#endif + #include "cphonedispatcher.h" #include @@ -2405,7 +2411,7 @@ { default: - LOG(_L8("WARNING: CPhoneDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEDISPATCHER_CALLBACKSYNC_1, "WARNING: CPhoneDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/csatdispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/csatdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/csatdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csatdispatcherTraces.h" +#endif + #include "csatdispatcher.h" #include @@ -2123,7 +2129,7 @@ { default: - LOG(_L8("WARNING: CSatDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDISPATCHER_CALLBACKSYNC_1, "WARNING: CSatDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/csecuritydispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/csecuritydispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/csecuritydispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csecuritydispatcherTraces.h" +#endif + #include #include "csecuritydispatcher.h" @@ -849,7 +855,7 @@ { default: - LOG(_L8("WARNING: CSecurityDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSECURITYDISPATCHER_CALLBACKSYNC_1, "WARNING: CSecurityDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/csimdispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/csimdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/csimdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csimdispatcherTraces.h" +#endif + #include "csimdispatcher.h" #include @@ -1739,7 +1745,7 @@ { default: - LOG(_L8("WARNING: CSimDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDISPATCHER_CALLBACKSYNC_1, "WARNING: CSimDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/csmsdispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/csmsdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/csmsdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csmsdispatcherTraces.h" +#endif + #include #include "csmsdispatcher.h" @@ -808,7 +814,7 @@ CallbackActivateSmsRouting(&aIpcDataPackage); break; default: - LOG(_L8("WARNING: CSmsDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDISPATCHER_CALLBACKSYNC_1, "WARNING: CSmsDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/csupplementaryservicesdispatcher.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/csupplementaryservicesdispatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/csupplementaryservicesdispatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,12 @@ // Description: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csupplementaryservicesdispatcherTraces.h" +#endif + #include "csupplementaryservicesdispatcher.h" #include @@ -1282,7 +1288,7 @@ { default: - LOG(_L8("WARNING: CSupplementaryServicesDispatcher::CallbackSync unhandled IPC=%d"), aIpcDataPackage.iIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSUPPLEMENTARYSERVICESDISPATCHER_CALLBACKSYNC_1, "WARNING: CSupplementaryServicesDispatcher::CallbackSync unhandled IPC=%d", aIpcDataPackage.iIpc); __ASSERT_DEBUG(NULL, CtsyDispatcherPanic(EUnhandledCtsyIpc)); break; } // switch (aIpcDataPackage.iIpc) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp --- a/telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -22,11 +22,15 @@ @internalComponent */ -#include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ltsyloggerTraces.h" +#endif -#ifdef _DEBUG -#include -#include +#include +//#include + +#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) const TInt KLineLength = 255; @@ -36,7 +40,7 @@ */ :iFnName(aFnName), iLayer(aLayer), iErr(KErrNone) { - RFileLogger::WriteFormat(KTsySubSystem, iLayer, _L8(">>%S"), &iFnName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT_1, "%s", iFnName); }; EXPORT_C TLogEntryExit::TLogEntryExit(const TDesC8& aFnName, const TDesC8& aLayer, TRefByValue aFmt, ...) @@ -52,7 +56,9 @@ line.Append(iFnName); line.Append(' '); line.Append(aFmt); - RFileLogger::WriteFormat(KTsySubSystem, iLayer, line, list); + TBuf8 evaluatedLine; + evaluatedLine.FormatList(line,list); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT1_1, "%s", evaluatedLine); }; EXPORT_C TLogEntryExit::TLogEntryExit(const TDesC8& aFnName, const TDesC8& aLayer, TRefByValue aFmt, ...) @@ -69,7 +75,9 @@ line.Insert(0,_L(">>")); line.Append(' '); line.Append(aFmt); - RFileLogger::WriteFormat(KTsySubSystem, iLayer, line, list); + TBuf evaluatedLine; + evaluatedLine.FormatList(line,list); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT2_1, "%S", evaluatedLine); }; EXPORT_C TLogEntryExit::~TLogEntryExit() @@ -79,11 +87,11 @@ { if (iErr == KErrNone) { - RFileLogger::WriteFormat(KTsySubSystem, iLayer, _L8("<<%S"), &iFnName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT_DTOR_1, "%s",iFnName); } else { - RFileLogger::WriteFormat(KTsySubSystem, iLayer, _L8("<<%S [err=%d]"), &iFnName, iErr); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TLOGENTRYEXIT_TLOGENTRYEXIT_DTOR_2, "%s [err=%d]",iFnName, iErr); } }; @@ -95,4 +103,4 @@ EXPORT_C TLogEntryExit::TLogEntryExit(const TDesC8& /*aFnName*/, const TDesC8& /*aLayer*/, TRefByValue /*aFmt*/, ...){}; EXPORT_C TLogEntryExit::~TLogEntryExit() {}; -#endif // #ifdef _DEBUG +#endif // #ifdef OST_TRACE_COMPILER_IN_USE diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/group/ltsyskeleton.mmh --- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/group/ltsyskeleton.mmh Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/group/ltsyskeleton.mmh Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -51,11 +51,9 @@ LIBRARY euser.lib LIBRARY ctsydispatcher.lib LIBRARY etelmm.lib -DEBUGLIBRARY ComsDbgUtil.lib // For logging -#include macro LTSY macro DEBUG_ALLOC // Define to add logging of object allocation diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/inc/ltsymacros.h --- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/inc/ltsymacros.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/inc/ltsymacros.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -38,8 +38,6 @@ #define MTEST_DECLARE_EVENT_COUNTER TInt iCounter; //all we are doing is is simulating "events from received from baseband occuring at interval of 5s. #define MTEST_WAIT_FOR_NEXT_EVENT User::After(500000);iCounter++; - - #define MTEST_LOG_RECEIVE_EVENT_NO LOG(_L8("LtsyReceiveThread simulated event = %d"), iCounter); #define MTEST_COUNTER_EXCEEDED_SHUTDOWN_RECEIVETHREAD if(iCounter>3) err = KShutdownLtsyReceiveThread; #else @@ -56,7 +54,6 @@ #define MTEST_QUERY_IND_SUPPORT_MOCKLTSYENGINE(A,B, C) #define MTEST_DECLARE_EVENT_COUNTER #define MTEST_WAIT_FOR_NEXT_EVENT - #define MTEST_LOG_RECEIVE_EVENT_NO #define MTEST_COUNTER_EXCEEDED_SHUTDOWN_RECEIVETHREAD #endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/cltsyreceivethreadeventstatehandler.cpp --- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/cltsyreceivethreadeventstatehandler.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/cltsyreceivethreadeventstatehandler.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -14,6 +14,11 @@ // Implements AO to retrieve lists // +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cltsyreceivethreadeventstatehandlerTraces.h" +#endif + #include "cltsyreceivethreadeventstatehandler.h" #include #include "ltsypaniccodes.h" @@ -78,7 +83,7 @@ //Add LTSY specific handling here. // Can be removed in real LTSY implementation - MTEST_LOG_RECEIVE_EVENT_NO + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CLTSYRECEIVETHREADEVENTSTATEHANDLER_HANDLERECEIVEEVENT_1,"LtsyReceiveThread simulated event = %d", iCounter); MTEST_COUNTER_EXCEEDED_SHUTDOWN_RECEIVETHREAD // diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/creceivethreadmanager.cpp --- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/creceivethreadmanager.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/creceivethreadmanager.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -13,6 +13,11 @@ // Description: // +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "creceivethreadmanagerTraces.h" +#endif + #include "creceivethreadmanager.h" #include @@ -71,7 +76,7 @@ TInt CReceiveThreadManager::StartReceiveThreadFn(TAny* aArg) { - LOG(_L8("StartReceiveThreadFn, thread id = %d"), RThread().Id().Id()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_1, "StartReceiveThreadFn, thread id = %d", RThread().Id().Id()); // Create a cleanup stack object CTrapCleanup* cleanup=CTrapCleanup::New(); @@ -83,7 +88,7 @@ TInt err = signaller->WaitLoop(); delete cleanup; - LOG(_L8("StartReceiveThreadFn, thread id = %d, Terminated with err = %d"), RThread().Id().Id(), err); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_2, "StartReceiveThreadFn, thread id = %d, Terminated with err = %d", RThread().Id().Id(), err); return err; } @@ -140,13 +145,13 @@ User::LeaveIfError(iThread.Open(aID)); iThread.Logon(iStatus); SetActive(); - LOG(_L8("CReceiveThreadLifeWatcher::LogonL. Watching thread id = %d"), iThread.Id().Id()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADLIFEWATCHER_LOGONL_1, "CReceiveThreadLifeWatcher::LogonL. Watching thread id = %d", iThread.Id().Id()); } void CReceiveThreadLifeWatcher::RunL() { TSYLOGENTRYEXIT; - LOG(_L8("CReceiveThreadLifeWatcher::RunL iThread = %d, iStatus=%d, exit reason = %d"), iThread.Id().Id(), iStatus.Int(), iThread.ExitReason() ); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADLIFEWATCHER_RUNL_1, "CReceiveThreadLifeWatcher::RunL iThread = %d, iStatus=%d, exit reason = %d", iThread.Id().Id(), iStatus.Int(), iThread.ExitReason() ); iReceiveThreadLifeObserver.HandleReceiveThreadLifeWatcherComplete(iStatus.Int()); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/group/mockltsy_under_ctsydispatch.mmp --- a/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/group/mockltsy_under_ctsydispatch.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/group/mockltsy_under_ctsydispatch.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -25,6 +25,7 @@ OS_LAYER_ESTLIB_SYSTEMINCLUDE USERINCLUDE ../inc +USERINCLUDE ../traces SOURCEPATH ../src diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,8 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_BORDER=0x84 +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_BORDER[0x84]_CLTSYRECEIVETHREADEVENTSTATEHANDLER_HANDLERECEIVEEVENT_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVETHREADLIFEWATCHER_LOGONL_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVETHREADLIFEWATCHER_RUNL_1=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_2=0x2 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/ctsydispatchlayer/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/ctsydispatchlayer/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/ctsydispatchlayer/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,37 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_BORDER=0x84 +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT1_1=0x2 +[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT2_1=0x3 +[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT_1=0x1 +[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT_DTOR_1=0x4 +[TRACE]TRACE_BORDER[0x84]_TLOGENTRYEXIT_TLOGENTRYEXIT_DTOR_2=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CCALLCONTROLDISPATCHER_CALLBACKSYNC_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CCALLCONTROLMULTIPARTYDISPATCHER_CALLBACKSYNC_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CCELLBROADCASTDISPATCHER_CALLBACKSYNC_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CCTSYDISPATCHERCALLBACK_CALLBACKSUPPLEMENTARYSERVICESRECEIVEUSSDMESSAGEIND_1=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_EXTFUNCL_1=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_1=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_10=0x10 +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_11=0x11 +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_12=0x12 +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_13=0x13 +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_2=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_3=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_4=0xa +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_5=0xb +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_6=0xc +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_7=0xd +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_8=0xe +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_QUERYSUPPORTERCALLBACKINDICATORS_9=0xf +[TRACE]TRACE_INTERNALS[0x88]_CMESSAGEROUTER_STARTBOOTSEQUENCEL_1=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CPACKETSERVICESDISPATCHER_CALLBACKSYNC_1=0x14 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEBOOKDISPATCHER_CALLBACKSYNC_1=0x15 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEBOOKENDISPATCHER_CALLBACKSYNC_1=0x16 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEBOOKONDISPATCHER_CALLBACKSYNC_1=0x17 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEDISPATCHER_CALLBACKSYNC_1=0x18 +[TRACE]TRACE_INTERNALS[0x88]_CSATDISPATCHER_CALLBACKSYNC_1=0x19 +[TRACE]TRACE_INTERNALS[0x88]_CSECURITYDISPATCHER_CALLBACKSYNC_1=0x1a +[TRACE]TRACE_INTERNALS[0x88]_CSIMDISPATCHER_CALLBACKSYNC_1=0x1b +[TRACE]TRACE_INTERNALS[0x88]_CSMSDISPATCHER_CALLBACKSYNC_1=0x1c +[TRACE]TRACE_INTERNALS[0x88]_CSUPPLEMENTARYSERVICESDISPATCHER_CALLBACKSYNC_1=0x1d diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp --- a/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component licenseetsystub source \sf\os\cellularsrv\telephonyserverplugins\licenseetsystub\ notes_source \component_defs\release.src diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp --- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -33,10 +33,10 @@ USERINCLUDE ../inc USERINCLUDE ../../simatk_tsy_stub/inc +USERINCLUDE ../traces LIBRARY euser.lib -LIBRARY flogger.lib // logging LIBRARY commontsy.lib // CommonTSY LIBRARY etelmm.lib // Etelmm LIBRARY simatktsy.lib // Sim Atk TSY diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/licenseetsystub/licensee_tsy_stub/inc/tflogger.h --- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/inc/tflogger.h Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,112 +0,0 @@ -// Copyright (c) 2002-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// - -#ifndef __TFLOGGER_H__ -#define __TFLOGGER_H__ - -// CONSTANTS -#ifndef _DEBUG - -// UREL BUILD: -#define TF_LOGGING_METHOD 0 // No logging in UREL builds - -#else - -// UDEB BUILD: -#define TF_LOGGING_METHOD 1 // 0 = No logging, - // 1 = Flogger, - // 2 = RDebug -#endif - - -#if TF_LOGGING_METHOD > 0 -#define TF_LOGGING_ENABLED // This is for backward compatibility -#endif - -// FUNCTION PROTOTYPES -#if TF_LOGGING_METHOD == 1 // Flogger - -#include -_LIT(KTfLogFolder,"TF"); -_LIT(KTfLogFile,"TFLOG.TXT"); - -#elif TF_LOGGING_METHOD == 2 // RDebug - -#include - -#endif - - -/* ------------------------------------------------------------------------------ - - LOGGING MACROs - - USE THESE MACROS IN YOUR CODE ! - ------------------------------------------------------------------------------ -*/ - -#if TF_LOGGING_METHOD == 1 // Flogger - -#define TFLOGTEXT(AAA) RFileLogger::Write(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend, AAA) -#define TFLOGSTRING(AAA) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::Write(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,tempLogDes()); } while (0) -#define TFLOGSTRING2(AAA,BBB) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,TRefByValue(tempLogDes()),BBB); } while (0) -#define TFLOGSTRING3(AAA,BBB,CCC) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,TRefByValue(tempLogDes()),BBB,CCC); } while (0) -#define TFLOGSTRING4(AAA,BBB,CCC,DDD) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,TRefByValue(tempLogDes()),BBB,CCC,DDD); } while (0) - - -#elif TF_LOGGING_METHOD == 2 // RDebug - -#define TFLOGTEXT(AAA) RDebug::Print(AAA) -#define TFLOGSTRING(AAA) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RDebug::Print(tempLogDes); } while (0) -#define TFLOGSTRING2(AAA,BBB) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RDebug::Print(tempLogDes, BBB); } while (0) -#define TFLOGSTRING3(AAA,BBB,CCC) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RDebug::Print(tempLogDes, BBB, CCC); } while (0) -#define TFLOGSTRING4(AAA,BBB,CCC,DDD) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RDebug::Print(tempLogDes, BBB, CCC, DDD); } while (0) - -#else // TF_LOGGING_METHOD == 0 or invalid - -#define TFLOGTEXT(AAA) // Example: TFLOGTEXT(own_desc); -#define TFLOGSTRING(AAA) // Example: TFLOGSTRING("Test"); -#define TFLOGSTRING2(AAA,BBB) // Example: TFLOGSTRING("Test %i", aValue); -#define TFLOGSTRING3(AAA,BBB,CCC) // Example: TFLOGSTRING("Test %i %i", aValue1, aValue2); -#define TFLOGSTRING4(AAA,BBB,CCC,DDD) // Example: TFLOGSTRING("Test %i %i %i", aValue1, aValue2, aValue3); - -#endif // TF_LOGGING_METHOD - -#if TF_LOGGING_METHOD == 1 || TF_LOGGING_METHOD == 2 - -// Note, #x and __FILE__ must be stored to char string first, making them 16bit -// strings with _LIT will not work in all compilers. - -#define TF_ASSERT(x) /*lint --e{717} */ do { if (!(x)) { const TUint8 tempX8[] = #x; \ - TBuf tempX; \ - tempX.Copy(TPtrC8(tempX8)); const TUint8 tempF8[] = __FILE__; TBuf tempF;\ - tempF.Copy(TPtrC8(tempF8)); \ - TFLOGSTRING4("TSY: ASSERT FAILED: %S, file %S, line %d", &tempX, &tempF, __LINE__ ); } } while(0) - -#define TF_ASSERT_NOT_REACHED() /*lint --e{717} */ do { const TUint8 tempF8[] = __FILE__;\ - TBuf tempF; tempF.Copy(TPtrC8(tempF8));\ - TFLOGSTRING3("TSY: ASSERT FAILED: unreachable code, file %S, line %d", &tempF, __LINE__ ); } while (0) - -#else // TF_LOGGING_METHOD == 0 or invalid - -#define TF_ASSERT(x) -#define TF_ASSERT_NOT_REACHED() - -#endif // TF_LOGGING_METHOD == 1 || TF_LOGGING_METHOD == 2 - - -#endif // __TFLOGGER_H__ - -// End of File diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmcustomstubext.cpp --- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmcustomstubext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmcustomstubext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -11,9 +11,14 @@ // Contributors: // + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmcustomstubextTraces.h" +#endif + #include "cmmmessagerouter.h" #include "cmmcustomstubext.h" -#include "tflogger.h" #include const TUint KPhoneInfoDescSize = 15; @@ -78,7 +83,7 @@ ret = KErrNone; } - TFLOGSTRING2( "TSY: CMmCustomStubExt::DoExtFuncL. ret: %d ", ret ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_DOEXTFUNCL_1, "TSY: CMmCustomStubExt::DoExtFuncL. ret: %d ", ret ); return ret; } @@ -103,7 +108,7 @@ void CMmCustomStubExt::InitializeL( MCustomVendorExtComplete& aMCustomVendorExtComplete ) { -TFLOGSTRING( "TSY: CMmCustomStubExt::InitializeL. " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_INITIALIZEL_1, "TSY: CMmCustomStubExt::InitializeL. " ); iVendorExtComplete = &aMCustomVendorExtComplete; } @@ -117,7 +122,7 @@ void CMmCustomStubExt::SetMessageRouter( CMmMessageRouter* aMessageRouter ) { -TFLOGSTRING( "TSY: CMmCustomStubExt::SetMessageRouter. " ); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMSTUBEXT_SETMESSAGEROUTER_1, "TSY: CMmCustomStubExt::SetMessageRouter. " ); iMessageRouter = aMessageRouter; iFirstTime = ETrue; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmmockmesshandler.cpp --- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmmockmesshandler.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmmockmesshandler.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -12,10 +12,15 @@ // // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmmockmesshandlerTraces.h" +#endif + #include "cmmmockmesshandler.h" #include "cmmmessagerouter.h" #include "cmmcustomstubext.h" -#include "tflogger.h" #include #include @@ -36,7 +41,7 @@ if ( !iTimer ) { iTimer = CPeriodic::NewL( CActive::EPriorityStandard ); - TFLOGSTRING("TSY: CMmMockMessHandler::ConstructL: timer created" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_CONSTRUCTL_1, "TSY: CMmMockMessHandler::ConstructL: timer created" ); } } @@ -66,7 +71,7 @@ TInt aIpc, const CMmDataPackage* /*aDataPackage*/) { -TFLOGSTRING2("TSY: CMmMockMessHandler::ExtFuncL. IPC: %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_EXTFUNCL_1, "TSY: CMmMockMessHandler::ExtFuncL. IPC: %d", aIpc ); // callback indicators TInt ret( KErrNotSupported ); @@ -322,7 +327,7 @@ // void CMmMockMessHandler::GetHomeNetwork() { -TFLOGSTRING("TSY: CMmMockMessHandler::GetHomeNetwork."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_GETHOMENETWORK_1, "TSY: CMmMockMessHandler::GetHomeNetwork."); iMyNetworkInfo.iMode = RMobilePhone::ENetworkModeGsm, iMyNetworkInfo.iStatus = RMobilePhone::ENetworkStatusCurrent, @@ -351,7 +356,7 @@ // void CMmMockMessHandler::GetHomeNetworkInfo() { -TFLOGSTRING("TSY: CMmMockMessHandler::GetHomeNetworkInfo."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_GETHOMENETWORKINFO_1, "TSY: CMmMockMessHandler::GetHomeNetworkInfo."); // call for completion TRAP_IGNORE( ExtFuncL( EMobilePhoneGetHomeNetwork, NULL ); ); } @@ -364,7 +369,7 @@ // TInt CMmMockMessHandler::TimerCallback( TAny* aThis ) { -TFLOGSTRING("TSY: CMmMockMessHandler::TimerCallback."); +OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_TIMERCALLBACK_1, "TSY: CMmMockMessHandler::TimerCallback."); // cancel the callback timer ( ( CMmMockMessHandler* )aThis )->iTimer->Cancel(); @@ -381,7 +386,7 @@ data.PackData( &tmp ); package = &data; -TFLOGSTRING2("TSY: CMmMockMessHandler::TimerCallback: IPC EMobilePhoneGetPhoneId Phone Id : %d", phoneid ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_TIMERCALLBACK_2, "TSY: CMmMockMessHandler::TimerCallback: IPC EMobilePhoneGetPhoneId Phone Id : %s", phoneid ); ( ( CMmMockMessHandler* ) aThis )->iMessageRouter->MessageManager()-> Complete( EMobilePhoneGetPhoneId, package, KErrNone ); @@ -392,7 +397,7 @@ data.PackData( &temp ); package = &data; -TFLOGSTRING2("TSY:CMmMockMessHandler::TimerCallback: IPC EMobilePhoneGetSubscriberId Dummy imsi : %d", imsi ); +OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMOCKMESSHANDLER_TIMERCALLBACK_3, "TSY:CMmMockMessHandler::TimerCallback: IPC EMobilePhoneGetSubscriberId Dummy imsi : %s", imsi ); ( ( CMmMockMessHandler* ) aThis )->iMessageRouter->MessageManager()-> Complete( EMobilePhoneGetSubscriberId, package, KErrNone ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/licenseetsystub/licensee_tsy_stub/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/licenseetsystub/licensee_tsy_stub/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,12 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_DOEXTFUNCL_1=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_INITIALIZEL_1=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CMMCUSTOMSTUBEXT_SETMESSAGEROUTER_1=0xa +[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_CONSTRUCTL_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_EXTFUNCL_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_GETHOMENETWORKINFO_1=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_GETHOMENETWORK_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_TIMERCALLBACK_1=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_TIMERCALLBACK_2=0xb +[TRACE]TRACE_INTERNALS[0x88]_CMMMOCKMESSHANDLER_TIMERCALLBACK_3=0xc diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/multimodetsy/group/BLD.INF --- a/telephonyserverplugins/multimodetsy/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -// Copyright (c) 1999-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Multimode 2 box GSM/GPRS TSY -// -// - -/** - @file -*/ - -PRJ_EXPORTS - -../group/mmtsy.iby /epoc32/rom/include/mmtsy.iby - -PRJ_TESTEXPORTS - -../group/Te_mmtsy.iby /epoc32/rom/include/te_mmtsy.iby - -../test/Te_LoopBack/Te_LoopBack.script z:/testdata/scripts/te_loopback.script -../test/Te_LoopBack/Te_LoopBack_setup.script z:/testdata/scripts/te_loopback_setup.script -../test/Te_LoopBack/Te_LoopBack_Commdb.cfg z:/testdata/configs/te_loopback_commdb.cfg - -../test/TE_Voice/TE_Voice.script z:/testdata/scripts/te_voice.script -../test/TE_Voice/TE_Voice_setup.script z:/testdata/scripts/te_voice_setup.script -../test/TE_Voice/TE_Voice_commdb.cfg z:/testdata/configs/te_voice_commdb.cfg - -../test/Te_Data/Te_Data.script z:/testdata/scripts/te_data.script -../test/Te_Data/Te_Data_setup.script z:/testdata/scripts/te_data_setup.script -../test/Te_Data/Te_Data.ini z:/testdata/configs/te_data.ini -../test/Te_Data/Te_data_comm1_9210.cfg z:/testdata/configs/te_data_comm1_9210.cfg -../test/Te_Data/Te_data_comm2_9210.cfg z:/testdata/configs/te_data_comm2_9210.cfg - -../test/Te_Echo/Te_Echo.script z:/testdata/scripts/te_echo.script -../test/Te_Echo/Te_Echo_comm1.cfg z:/testdata/configs/te_echo_comm1.cfg -../test/Te_Echo/Te_Echo_comm2.cfg z:/testdata/configs/te_echo_comm2.cfg -../test/Te_Echo/Te_Echo_comm3.cfg z:/testdata/configs/te_echo_comm3.cfg - -../test/Te_PhBk/Te_PhBk.script z:/testdata/scripts/te_phbk.script -../test/Te_PhBk/Te_phBk_setup.script z:/testdata/scripts/te_phbk_setup.script -../test/Te_PhBk/Te_phBk_commdb.cfg z:/testdata/configs/te_phbk_commdb.cfg - -../test/Te_Network/Te_Network.script z:/testdata/scripts/te_network.script -../test/Te_Network/Te_Network_Setup.script z:/testdata/scripts/te_network_setup.script -../test/Te_Network/Te_Network_commdb.cfg z:/testdata/configs/te_network_commdb.cfg - -../test/Te_Misc/Te_Misc.script z:/testdata/scripts/te_misc.script -../test/Te_Misc/Te_Misc_commdb.cfg z:/testdata/configs/te_misc_commdb.cfg -../test/Te_Misc/Te_Misc_setup.script z:/testdata/scripts/te_misc_setup.script - -../test/Te_Sms/Te_Sms.script z:/testdata/scripts/te_sms.script -../test/Te_Sms/Te_Sms_Setup.script z:/testdata/scripts/te_sms_setup.script -../test/Te_Sms/Te_Sms.ini z:/testdata/configs/te_sms.ini -../test/Te_Sms/Te_Sms_commdb.cfg z:/testdata/configs/te_sms_commdb.cfg - -../test/Te_Gprs/Te_Gprs_setup.script z:/testdata/scripts/te_gprs_setup.script -../test/Te_Gprs/Te_Gprs_Comm1_Orng.cfg z:/testdata/configs/te_gprs_comm1_orng.cfg -../test/Te_Gprs/Te_Gprs_Comm1_VodPhn.cfg z:/testdata/configs/te_gprs_comm1_vodphn.cfg -../test/Te_Gprs/Te_Gprs.script z:/testdata/scripts/te_gprs.script -../test/Te_Gprs/Te_Gprs_DialogPromptSet_setup.script z:/testdata/scripts/te_gprs_dialogpromptset_setup.script -../test/Te_Gprs/Te_Gprs_DialogPromptSet_CommDb.cfg z:/testdata/configs/te_gprs_dialogpromptset_commdb.cfg -../test/Te_Gprs/Te_Gprs_DialogPromptSet.script z:/testdata/scripts/te_gprs_dialogpromptset.script -../test/Te_Gprs/Te_Gprs.ini z:/testdata/configs/te_gprs.ini - -PRJ_MMPFILES - -../group/mmtsy.mmp - -PRJ_TESTMMPFILES - -// Most of these will be manual because they require both a phone and some -// operator intervention - -//TestExecute harness(es) for use in GT117 onwards -../test/Te_LoopBack/Te_Loopback.mmp -../test/TE_Voice/TE_Voice.mmp -../test/Te_Data/Te_Data.mmp -../test/Te_PhBk/Te_PhBk.mmp -../test/Te_Network/Te_Network.mmp -../test/Te_Misc/Te_Misc.mmp -../test/Te_Sms/Te_Sms.mmp -../test/Te_Gprs/Te_Gprs.mmp - -../test/Te_Echo/Te_Echo.mmp manual diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/multimodetsy/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/multimodetsy/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,94 @@ +// Copyright (c) 1999-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Multimode 2 box GSM/GPRS TSY +// +// + +/** + @file +*/ + +PRJ_EXPORTS + +../group/mmtsy.iby /epoc32/rom/include/mmtsy.iby + +PRJ_TESTEXPORTS + +../group/Te_mmtsy.iby /epoc32/rom/include/te_mmtsy.iby + +../test/Te_LoopBack/Te_LoopBack.script z:/testdata/scripts/te_loopback.script +../test/Te_LoopBack/Te_LoopBack_setup.script z:/testdata/scripts/te_loopback_setup.script +../test/Te_LoopBack/Te_LoopBack_Commdb.cfg z:/testdata/configs/te_loopback_commdb.cfg + +../test/TE_Voice/TE_Voice.script z:/testdata/scripts/te_voice.script +../test/TE_Voice/TE_Voice_setup.script z:/testdata/scripts/te_voice_setup.script +../test/TE_Voice/TE_Voice_commdb.cfg z:/testdata/configs/te_voice_commdb.cfg + +../test/Te_Data/Te_Data.script z:/testdata/scripts/te_data.script +../test/Te_Data/Te_Data_setup.script z:/testdata/scripts/te_data_setup.script +../test/Te_Data/Te_Data.ini z:/testdata/configs/te_data.ini +../test/Te_Data/Te_data_comm1_9210.cfg z:/testdata/configs/te_data_comm1_9210.cfg +../test/Te_Data/Te_data_comm2_9210.cfg z:/testdata/configs/te_data_comm2_9210.cfg + +../test/Te_Echo/Te_Echo.script z:/testdata/scripts/te_echo.script +../test/Te_Echo/Te_Echo_comm1.cfg z:/testdata/configs/te_echo_comm1.cfg +../test/Te_Echo/Te_Echo_comm2.cfg z:/testdata/configs/te_echo_comm2.cfg +../test/Te_Echo/Te_Echo_comm3.cfg z:/testdata/configs/te_echo_comm3.cfg + +../test/Te_PhBk/Te_PhBk.script z:/testdata/scripts/te_phbk.script +../test/Te_PhBk/Te_phBk_setup.script z:/testdata/scripts/te_phbk_setup.script +../test/Te_PhBk/Te_phBk_commdb.cfg z:/testdata/configs/te_phbk_commdb.cfg + +../test/Te_Network/Te_Network.script z:/testdata/scripts/te_network.script +../test/Te_Network/Te_Network_Setup.script z:/testdata/scripts/te_network_setup.script +../test/Te_Network/Te_Network_commdb.cfg z:/testdata/configs/te_network_commdb.cfg + +../test/Te_Misc/Te_Misc.script z:/testdata/scripts/te_misc.script +../test/Te_Misc/Te_Misc_commdb.cfg z:/testdata/configs/te_misc_commdb.cfg +../test/Te_Misc/Te_Misc_setup.script z:/testdata/scripts/te_misc_setup.script + +../test/Te_Sms/Te_Sms.script z:/testdata/scripts/te_sms.script +../test/Te_Sms/Te_Sms_Setup.script z:/testdata/scripts/te_sms_setup.script +../test/Te_Sms/Te_Sms.ini z:/testdata/configs/te_sms.ini +../test/Te_Sms/Te_Sms_commdb.cfg z:/testdata/configs/te_sms_commdb.cfg + +../test/Te_Gprs/Te_Gprs_setup.script z:/testdata/scripts/te_gprs_setup.script +../test/Te_Gprs/Te_Gprs_Comm1_Orng.cfg z:/testdata/configs/te_gprs_comm1_orng.cfg +../test/Te_Gprs/Te_Gprs_Comm1_VodPhn.cfg z:/testdata/configs/te_gprs_comm1_vodphn.cfg +../test/Te_Gprs/Te_Gprs.script z:/testdata/scripts/te_gprs.script +../test/Te_Gprs/Te_Gprs_DialogPromptSet_setup.script z:/testdata/scripts/te_gprs_dialogpromptset_setup.script +../test/Te_Gprs/Te_Gprs_DialogPromptSet_CommDb.cfg z:/testdata/configs/te_gprs_dialogpromptset_commdb.cfg +../test/Te_Gprs/Te_Gprs_DialogPromptSet.script z:/testdata/scripts/te_gprs_dialogpromptset.script +../test/Te_Gprs/Te_Gprs.ini z:/testdata/configs/te_gprs.ini + +PRJ_MMPFILES + +../group/mmtsy.mmp + +PRJ_TESTMMPFILES + +// Most of these will be manual because they require both a phone and some +// operator intervention + +//TestExecute harness(es) for use in GT117 onwards +../test/Te_LoopBack/Te_Loopback.mmp +../test/TE_Voice/TE_Voice.mmp +../test/Te_Data/Te_Data.mmp +../test/Te_PhBk/Te_PhBk.mmp +../test/Te_Network/Te_Network.mmp +../test/Te_Misc/Te_Misc.mmp +../test/Te_Sms/Te_Sms.mmp +../test/Te_Gprs/Te_Gprs.mmp + +../test/Te_Echo/Te_Echo.mmp manual diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp --- a/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_mmtsy source \sf\os\cellularsrv\telephonyserverplugins\multimodetsy binary \sf\os\cellularsrv\telephonyserverplugins\multimodetsy\group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/multimodetsy/test/gprs/mssccprj.scc --- a/telephonyserverplugins/multimodetsy/test/gprs/mssccprj.scc Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/multimodetsy/test/gprs/mssccprj.scc Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ -SCC = This is a Source Code Control file - -[T_GPRS.DSP] -SCC_Aux_Path = "\\mobileyes_pdc\data\Projects\Symbian_GSM_TSY\VSS" -SCC_Project_Name = "$/gsmtsy/TEST/GPRS", VHAAAAAA +SCC = This is a Source Code Control file + +[T_GPRS.DSP] +SCC_Aux_Path = "\\mobileyes_pdc\data\Projects\Symbian_GSM_TSY\VSS" +SCC_Project_Name = "$/gsmtsy/TEST/GPRS", VHAAAAAA diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/group/commonsimatktsy.mmp --- a/telephonyserverplugins/simatktsy/group/commonsimatktsy.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/group/commonsimatktsy.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -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" @@ -28,7 +28,6 @@ MACRO USING_CTSY_DISPATCHER #define USING_CTSY_DISPATCHER //#endif -MACRO TF_SAT_LOGGING SOURCEPATH ../src // SatTsy (the "main" module) @@ -98,12 +97,10 @@ USERINCLUDE ../inc USERINCLUDE ../exportinc/utility +USERINCLUDE ../traces #ifdef USING_CTSY_DISPATCHER USERINCLUDE ../exportinc - -//needed for tflogger.h (ideally change all "" to <> and remove) -USERINCLUDE ../../common_tsy/commontsy/inc #endif //USING_CTSY_DISPATCHER @@ -119,8 +116,6 @@ LIBRARY etelmm.lib // ETel Multimode API LIBRARY ETel.lib // Etel server and core API -#include - START WINS BASEADDRESS 0x65000000 END diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp --- a/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component CommonSimAtkTSY source /sf/os/cellularsrv/telephonyserverplugins/simatktsy binary /sf/os/cellularsrv/telephonyserverplugins/simatktsy/group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/group/cstktsyutility.mmp --- a/telephonyserverplugins/simatktsy/group/cstktsyutility.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/group/cstktsyutility.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -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" @@ -24,14 +24,9 @@ UID 0x1000008D 0x102078E0 #define USING_CTSY_DISPATCHER -MACRO TF_SAT_LOGGING USERINCLUDE ../inc USERINCLUDE ../exportinc/utility - -#ifdef USING_CTSY_DISPATCHER -//needed for tflogger.h (ideally change all "" to <> and remove -USERINCLUDE ../../common_tsy/commontsy/inc -#endif //USING_CTSY_DISPATCHER +USERINCLUDE ../traces SOURCEPATH ../utility/src @@ -51,8 +46,6 @@ // Symbian LIBRARY euser.lib // E32 user library -#include - UNPAGED SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyCallControlRequest.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyCallControlRequest.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyCallControlRequest.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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,13 +20,18 @@ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSatNotifyCallControlRequestTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyCallControlRequest.h" // Tsy class header #include "CSatNotificationsTsy.h" // Class header #include "CBerTlv.h" // Ber Tlv data handling #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. @@ -41,13 +46,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_NEWL_1, "CSAT: CSatNotifyCallControlRequest::NewL"); CSatNotifyCallControlRequest* const satNotifyCallControlRequest = new ( ELeave ) CSatNotifyCallControlRequest( aNotificationsTsy ); CleanupStack::PushL( satNotifyCallControlRequest ); satNotifyCallControlRequest->ConstructL(); CleanupStack::Pop( satNotifyCallControlRequest ); - TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_NEWL_2, "CSAT: CSatNotifyCallControlRequest::NewL, end of method"); return satNotifyCallControlRequest; } @@ -61,8 +66,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::\ - ~CSatNotifyCallControlRequest"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_DTOR_1, "CSAT: CSatNotifyCallControlRequest::~CSatNotifyCallControlRequest"); } // ----------------------------------------------------------------------------- @@ -88,7 +92,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_CONSTRUCTL_1, "CSAT: CSatNotifyCallControlRequest::ConstructL"); } // ----------------------------------------------------------------------------- @@ -103,7 +107,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_NOTIFY_1, "CSAT: CSatNotifyCallControlRequest::Notify"); // Save data pointer to client side for completion iCallControlV2Pckg = reinterpret_cast( @@ -126,7 +130,7 @@ const TTsyReqHandle aTsyReqHandle // Tsy request handle ) { - TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_CANCELNOTIFICATION_1, "CSAT: CSatNotifyCallControlRequest::CancelNotification"); // Reset the request handle iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifyCallControlRequestPCmdReqType ); @@ -147,7 +151,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFYL_1, "CSAT: CSatNotifyCallControlRequest::CompleteNotifyL"); RSat::TAlphaIdBuf alphaId; RSat::TControlResult result; // Unpack data @@ -169,7 +173,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyCallControlRequest::CompleteAlphaId"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_1, "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> @@ -192,15 +196,13 @@ callControlV2.SetCcGeneralResult( aResult ); callControlV2.SetAlphaId( validity, alphaIdTemp ); } - TFLOGSTRING( "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId\ - completing" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_2, "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId completing" ); // Complete notification iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, aErrorCode ); } else { - TFLOGSTRING( "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId\ - Request not ongoing" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_3, "CSAT: CSatNotifyCallControlRequest::CompleteAlphaId Request not ongoing" ); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyCloseChannelTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyCloseChannel.h" // 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: CSatNotifyCloseChannel::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_NEWL_1, "CSAT: CSatNotifyCloseChannel::NewL"); CSatNotifyCloseChannel* const satNotifyCloseChannel = new ( ELeave ) CSatNotifyCloseChannel( aNotificationsTsy ); CleanupStack::PushL( satNotifyCloseChannel ); satNotifyCloseChannel->ConstructL(); CleanupStack::Pop( satNotifyCloseChannel ); - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_NEWL_2, "CSAT: CSatNotifyCloseChannel::NewL, end of method"); return satNotifyCloseChannel; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_DTOR_1, "CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel"); } // ----------------------------------------------------------------------------- @@ -88,8 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel, \ - does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CONSTRUCTL_1, "CSAT: CSatNotifyCloseChannel::~CSatNotifyCloseChannel, does nothing"); } // ----------------------------------------------------------------------------- @@ -104,7 +108,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_NOTIFY_1, "CSAT: CSatNotifyCloseChannel::Notify"); // Save data pointer to client side for completion iCloseChannelRspV2Pckg = reinterpret_cast( @@ -129,7 +133,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CANCELNOTIFICATION_1, "CSAT: CSatNotifyCloseChannel::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifyCloseChannelPCmdReqType ); @@ -152,7 +156,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_1, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL"); TInt ret( KErrNone ); // Unpack parameters TPtrC8* data; @@ -202,8 +206,7 @@ closeChannelV2.iAlphaId.iStatus = RSat::EAlphaIdNotPresent; if ( KErrNotFound != returnValue ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL\ - Alpha ID present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_2, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL Alpha ID present"); TUint16 alphaIdLength = alphaIdentifier.GetLength(); if ( alphaIdLength ) { @@ -223,8 +226,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL\ - Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_3, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL Alpha ID is NULL"); closeChannelV2.iAlphaId.iStatus = RSat::EAlphaIdNull; } } @@ -236,8 +238,7 @@ else { // Required values missing - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL,\ - required values missing (Device Identities)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_4, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL, required values missing (Device Identities)"); ret = KErrCorrupt; CreateTerminalRespL( pCmdNumber, RSat::KErrorRequiredValuesMissing, KNullDesC16 ); } @@ -251,8 +252,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CompleteNotifyL\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_5, "CSAT: CSatNotifyCloseChannel::CompleteNotifyL Request not ongoing"); // Request not on, returning response immediately TBuf16<1> additionalInfo; additionalInfo.Append ( RSat::KNoSpecificMeProblem ); @@ -273,7 +273,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_1, "CSAT: CSatNotifyCloseChannel::TerminalResponseL"); TInt ret( KErrNone ); TBuf16<1> additionalInfo; @@ -298,8 +298,7 @@ && ( RSat::KBearerIndepProtocolError != rspV2.iGeneralResult ) && ( RSat::KFramesError != rspV2.iGeneralResult )) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_2, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -312,8 +311,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_3, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid Additional Info"); ret = KErrCorrupt; } } @@ -323,8 +321,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\ - Invalid Additional Info type"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_4, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid Additional Info type"); ret = KErrCorrupt; } @@ -350,7 +347,7 @@ const TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_1, "CSAT: CSatNotifyCloseChannel::CreateTerminalRespL"); TTlv tlvSpecificData; // Append general result tag tlvSpecificData.AddTag( KTlvResultTag ); @@ -367,8 +364,7 @@ // Unsuccessful result requires an additional info byte for ( TInt i = 0; i < aAdditionalInfo.Length(); i++ ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::CreateTerminalRespL,\ - Unsuccessful result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_2, "CSAT: CSatNotifyCloseChannel::CreateTerminalRespL, Unsuccessful result"); tlvSpecificData.AddByte( static_cast( aAdditionalInfo[i] ) ); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyDisplayText.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyDisplayText.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyDisplayText.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyDisplayTextTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyDisplayText.h" // 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. @@ -43,13 +48,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_NEWL_1, "CSAT: CSatNotifyDisplayText::NewL"); CSatNotifyDisplayText* const satNotifyDisplayText = new ( ELeave ) CSatNotifyDisplayText( aNotificationsTsy ); CleanupStack::PushL( satNotifyDisplayText ); satNotifyDisplayText->ConstructL(); CleanupStack::Pop( satNotifyDisplayText ); - TFLOGSTRING("CSAT: CSatNotifyDisplayText::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_NEWL_2, "CSAT: CSatNotifyDisplayText::NewL, end of method"); return satNotifyDisplayText; } @@ -60,7 +65,7 @@ // CSatNotifyDisplayText::~CSatNotifyDisplayText() { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::~CSatNotifyDisplayText"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_DTOR_1, "CSAT: CSatNotifyDisplayText::~CSatNotifyDisplayText"); } // ----------------------------------------------------------------------------- @@ -86,7 +91,7 @@ void ) { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_CONSTRUCTL_1, "CSAT: CSatNotifyDisplayText::ConstructL"); } // ----------------------------------------------------------------------------- @@ -101,7 +106,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_NOTIFY_1, "CSAT: CSatNotifyDisplayText::Notify"); // Save data pointer to client side for completion iDisplayTextV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -124,7 +129,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_CANCELNOTIFICATION_1, "CSAT: CSatNotifyDisplayText::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifyDisplayTextPCmdReqType ); @@ -147,14 +152,13 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_1, "CSAT: CSatNotifyDisplayText::CompleteNotifyL"); TInt ret( KErrNone ); // Unpack parameters TPtrC8* data; aDataPackage->UnPackData( &data ); - TFLOGSTRING2("CSAT: CSatNotifyDisplayText::CompleteNotifyL, dataLength: \ - %d", data->Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_2, "CSAT: CSatNotifyDisplayText::CompleteNotifyL, dataLength: %d", data->Length()); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( @@ -247,8 +251,7 @@ // Return terminal response immediately. else { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::CompleteNotifyL,\ - Text string empty"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_3, "CSAT: CSatNotifyDisplayText::CompleteNotifyL, Text string empty"); CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood, KNullDesC16 ); // Indicate Client that response was corrupted @@ -257,8 +260,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::CompleteNotifyL,\ - Test string missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_4, "CSAT: CSatNotifyDisplayText::CompleteNotifyL, Test string missing"); CreateTerminalRespL( pCmdNumber, RSat::KErrorRequiredValuesMissing, KNullDesC16 ); @@ -285,8 +287,7 @@ } // End of if ( CSatTsy::ESatReqHandleUnknown != reqHandle ) else { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_5, "CSAT: CSatNotifyDisplayText::CompleteNotifyL, Request not ongoing"); TBuf16<1> additionalInfo; // Request not on, returning response immediately additionalInfo.Append( RSat::KNoSpecificMeProblem ); @@ -306,7 +307,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_1, "CSAT: CSatNotifyDisplayText::TerminalResponseL"); TInt ret( KErrNone ); TBuf16<1> additionalInfo; @@ -328,8 +329,7 @@ && ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ) ) { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::TerminalResponseL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_2, "CSAT: CSatNotifyDisplayText::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -344,8 +344,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::TerminalResponseL,\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_3, "CSAT: CSatNotifyDisplayText::TerminalResponseL, Invalid Additional Info"); // Invalid additional info field ret = KErrCorrupt; } @@ -370,7 +369,7 @@ const TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifyDisplayText::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYDISPLAYTEXT_CREATETERMINALRESPL_1, "CSAT: CSatNotifyDisplayText::CreateTerminalRespL"); TTlv tlvSpecificData; // Create General Result TLV here tlvSpecificData.AddTag( KTlvResultTag ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyGetChannelStatus.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetChannelStatus.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetChannelStatus.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyGetChannelStatusTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyGetChannelStatus.h" // 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: CSatNotifyGetChannelStatus::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_NEWL_1, "CSAT: CSatNotifyGetChannelStatus::NewL"); CSatNotifyGetChannelStatus* const satNotifyGetChannelStatus = new ( ELeave ) CSatNotifyGetChannelStatus( aNotificationsTsy ); CleanupStack::PushL( satNotifyGetChannelStatus ); satNotifyGetChannelStatus->ConstructL(); CleanupStack::Pop( satNotifyGetChannelStatus ); - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_NEWL_2, "CSAT: CSatNotifyGetChannelStatus::NewL, end of method"); return satNotifyGetChannelStatus; } @@ -62,8 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::~CSatNotifyGetChannelStatus" - ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_DTOR_1, "CSAT: CSatNotifyGetChannelStatus::~CSatNotifyGetChannelStatus"); } // ----------------------------------------------------------------------------- @@ -89,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CONSTRUCTL_1, "CSAT: CSatNotifyGetChannelStatus::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -104,7 +108,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_NOTIFY_1, "CSAT: CSatNotifyGetChannelStatus::Notify"); // Save data pointers to client side for completion iGetChannelStatusRspV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -127,7 +131,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CANCELNOTIFICATION_1, "CSAT: CSatNotifyGetChannelStatus::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifyGetChannelStatusPCmdReqType ); @@ -150,7 +154,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_1, "CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL"); TInt ret( KErrNone ); // Unpack parameters @@ -177,8 +181,7 @@ // Complete right away if error has occured, otherwise continue.. if ( KErrNone == aErrorCode ) { - TFLOGSTRING2("CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL\ - aErrorCode: %d", aErrorCode ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_2, "CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL aErrorCode: %d", aErrorCode ); // Fill the Get Channel status structure RSat::TGetChannelStatusV2& channelStatusV2 = ( *iGetChannelStatusRspV2Pckg )(); @@ -194,8 +197,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_3, "CSAT: CSatNotifyGetChannelStatus::CompleteNotifyL Request not ongoing"); // Request not on, returning response immediately TBuf16<1> additionalInfo; additionalInfo.Append( RSat::KNoSpecificMeProblem ); @@ -217,7 +219,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_1, "CSAT: CSatNotifyGetChannelStatus::TerminalResponseL"); TInt ret( KErrNone ); TBuf16 additionalInfo; @@ -241,8 +243,7 @@ && ( RSat::KCmdNumberNotKnown != rspV2.iGeneralResult ) && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) ) { - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::TerminalResponseL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_2, "CSAT: CSatNotifyGetChannelStatus::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -252,8 +253,7 @@ { if ( !rspV2.iAdditionalInfo.Length() ) { - TFLOGSTRING("CSAT: CSatNotifyGetChannelStatus::TerminalResponseL,\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_3, "CSAT: CSatNotifyGetChannelStatus::TerminalResponseL, Invalid Additional Info"); ret = KErrCorrupt; } else @@ -287,7 +287,7 @@ const TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_1, "CSAT: CSatMessHandler::CreateTerminalRespL"); TTlv tlvSpecificData; // Append general result tag tlvSpecificData.AddTag( KTlvResultTag ); @@ -319,8 +319,7 @@ } else { - TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL - \ - mandatory channel status missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_2, "CSAT: CSatMessHandler::CreateTerminalRespL - mandatory channel status missing"); } // Prepare data diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyGetInkey.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetInkey.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetInkey.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyGetInkeyTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyGetInkey.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: CSatNotifyGetInkey::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_NEWL_1, "CSAT: CSatNotifyGetInkey::NewL"); CSatNotifyGetInkey* const satNotifyGetInkey = new ( ELeave ) CSatNotifyGetInkey( aNotificationsTsy ); CleanupStack::PushL( satNotifyGetInkey ); satNotifyGetInkey->ConstructL(); CleanupStack::Pop( satNotifyGetInkey ); - TFLOGSTRING("CSAT: CSatNotifyGetInkey::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_NEWL_2, "CSAT: CSatNotifyGetInkey::NewL, end of method"); return satNotifyGetInkey; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::~CSatNotifyGetInkey"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_DTOR_1, "CSAT: CSatNotifyGetInkey::~CSatNotifyGetInkey"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_CONSTRUCTL_1, "CSAT: CSatNotifyGetInkey::ConstructL"); } // ----------------------------------------------------------------------------- @@ -102,7 +107,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_NOTIFY_1, "CSAT: CSatNotifyGetInkey::Notify"); // Save data pointer to client side for completion iGetInkeyV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -127,7 +132,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_CANCELNOTIFICATION_1, "CSAT: CSatNotifyGetInkey::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifyGetInkeyPCmdReqType ); @@ -149,7 +154,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_COMPLETENOTIFYL_1, "CSAT: CSatNotifyGetInkey::CompleteNotifyL"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); @@ -230,8 +235,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::CompleteNotifyL,\ - No Help available"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_COMPLETENOTIFYL_2, "CSAT: CSatNotifyGetInkey::CompleteNotifyL, No Help available"); // No help getInkeyV2.iHelp = RSat::ENoHelpAvailable; } @@ -259,8 +263,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::CompleteNotifyL,\ - Required values missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_COMPLETENOTIFYL_3, "CSAT: CSatNotifyGetInkey::CompleteNotifyL, Required values missing"); additionalInfo.Zero(); additionalInfo.Append( KNoCause ); CreateTerminalRespL( pCmdNumber, @@ -283,8 +286,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_COMPLETENOTIFYL_4, "CSAT: CSatNotifyGetInkey::CompleteNotifyL, Request not ongoing"); additionalInfo.Zero(); additionalInfo.Append( KNoCause ); CreateTerminalRespL( pCmdNumber, RSat::KMeUnableToProcessCmd, @@ -304,7 +306,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_1, "CSAT: CSatNotifyGetInkey::TerminalResponseL"); TInt ret( KErrNone ); @@ -319,8 +321,7 @@ ( RSat::KTextString != rspV2.iInfoType ) && ( RSat::KNoAdditionalInfo != rspV2.iInfoType ) ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\ - Invalid Infotype"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_2, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid Infotype"); ret = KErrCorrupt; } @@ -330,8 +331,7 @@ ( RSat::ECharUcs2Alphabet != rspV2.iRspFormat ) && ( RSat::EYesNo != rspV2.iRspFormat ) ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\ - Invalid Response Format"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_3, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid Response Format"); ret = KErrCorrupt; } @@ -346,8 +346,7 @@ ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) && ( RSat::KSuccessRequestedIconNotDisplayed != rspV2.iGeneralResult )) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_4, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -356,8 +355,7 @@ if ( ( RSat::KMeProblem == rspV2.iInfoType ) && ( NULL == rspV2.iAdditionalInfo.Length() ) ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\ - Invalid Additional Info, ME Problem"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_5, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid Additional Info, ME Problem"); // Invalid additional info field ret = KErrCorrupt; } @@ -365,8 +363,7 @@ if ( ( RSat::KTextString == rspV2.iInfoType ) && ( NULL == rspV2.iAdditionalInfo.Length() ) ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::TerminalResponseL,\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_TERMINALRESPONSEL_6, "CSAT: CSatNotifyGetInkey::TerminalResponseL, Invalid Additional Info"); ret = KErrCorrupt; } @@ -395,7 +392,7 @@ TUint8 aDcs ) { - TFLOGSTRING("CSAT: CSatNotifyGetInkey::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_CREATETERMINALRESPL_1, "CSAT: CSatNotifyGetInkey::CreateTerminalRespL"); TTlv tlvSpecificData; tlvSpecificData.AddTag( KTlvResultTag ); @@ -436,8 +433,7 @@ { TSatUtility::Copy16to8LE( aAdditionalInfo, character); tlvSpecificData.AddData( character ); - TFLOGSTRING2("CSAT:CSatNotifyGetInkey::CreateTerminalRespL, %s \ - character", &character ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINKEY_CREATETERMINALRESPL_2, "CSAT:CSatNotifyGetInkey::CreateTerminalRespL, %s character", character ); } else { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyGetInput.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetInput.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetInput.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyGetInputTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyGetInput.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: CSatNotifyGetInput::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_NEWL_1, "CSAT: CSatNotifyGetInput::NewL"); CSatNotifyGetInput* const satNotifyGetInput = new ( ELeave ) CSatNotifyGetInput( aNotificationsTsy ); CleanupStack::PushL( satNotifyGetInput ); satNotifyGetInput->ConstructL(); CleanupStack::Pop( satNotifyGetInput ); - TFLOGSTRING("CSAT: CSatNotifyGetInput::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_NEWL_2, "CSAT: CSatNotifyGetInput::NewL, end of method"); return satNotifyGetInput; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyGetInput::~CSatNotifyGetInput"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_DTOR_1, "CSAT: CSatNotifyGetInput::~CSatNotifyGetInput"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyGetInput::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CONSTRUCTL_1, "CSAT: CSatNotifyGetInput::ConstructL"); } // ----------------------------------------------------------------------------- @@ -102,7 +107,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyGetInput::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_NOTIFY_1, "CSAT: CSatNotifyGetInput::Notify"); // Save data pointer to client side for completion iGetInputV1Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -125,7 +130,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CANCELNOTIFICATION_1, "CSAT: CSatNotifyGetInput::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( @@ -148,7 +153,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_1, "CSAT: CSatNotifyGetInput::CompleteNotifyL"); TInt returnValue( KErrNone ); TInt ret( KErrNone ); // Unpack parameters @@ -239,8 +244,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\ - No Help available"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_2, "CSAT: CSatNotifyGetInput::CompleteNotifyL, No Help available"); // No help getInputV1.iHelp = RSat::ENoHelpAvailable; } @@ -258,8 +262,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\ - Input text missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_3, "CSAT: CSatNotifyGetInput::CompleteNotifyL, Input text missing"); additionalInfo.Zero(); additionalInfo.Append( KNoCause ); CreateTerminalRespL( pCmdNumber, @@ -268,7 +271,7 @@ ret = KErrCorrupt; } - TFLOGSTRING2("CSAT: GetInput, text: %S", &getInputV1.iText ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_4, "CSAT: GetInput, text: %S", getInputV1.iText ); // Response length expected CTlv responseLength; @@ -284,8 +287,7 @@ if ( RSat::KGetInputTextMaxSize < getInputV1.iRspLength.iMinRspLength ) { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\ - Input text length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_5, "CSAT: CSatNotifyGetInput::CompleteNotifyL, Input text length exceeded"); additionalInfo.Zero(); additionalInfo.Append( KNoCause ); CreateTerminalRespL( pCmdNumber, @@ -300,8 +302,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\ - Response length TLV missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_6, "CSAT: CSatNotifyGetInput::CompleteNotifyL, Response length TLV missing"); // Mandatory reponse length tlv is missing additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -334,8 +335,7 @@ else { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_COMPLETENOTIFYL_7, "CSAT: CSatNotifyGetInput::CompleteNotifyL, Request not ongoing"); // Request not on, returning response immediately additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -358,7 +358,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyGetInput::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_1, "CSAT: CSatNotifyGetInput::TerminalResponseL"); TInt returnValue( KErrNone ); TBuf<1>additionalInfo; @@ -367,11 +367,8 @@ reinterpret_cast( aRsp ); RSat::TGetInputRspV1& rspV1 = ( *aRspPckg ) (); - TFLOGSTRING3("CSAT: CSatNotifyGetInput::TerminalResponseL, \ - iAdditionalInfo: %S, iInfoType: %d", - &rspV1.iAdditionalInfo, rspV1.iInfoType); - TFLOGSTRING2("CSAT:CSatNotifyGetInput::TerminalResponseL, \ - iGeneralResult: %d", rspV1.iGeneralResult); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_2, "CSAT: CSatNotifyGetInput::TerminalResponseL, iAdditionalInfo: %S, iInfoType: %u", rspV1.iAdditionalInfo, rspV1.iInfoType); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_3, "CSAT:CSatNotifyGetInput::TerminalResponseL, iGeneralResult: 0x%02x", (TUint)rspV1.iGeneralResult); // Get Proactive command number TUint8 pCmdNumber( rspV1.PCmdNumber() ); @@ -391,8 +388,7 @@ && ( RSat::KMeUnableToProcessCmd != rspV1.iGeneralResult ) && ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult )) { - TFLOGSTRING("CSAT: CSatNotifyGetInput::TerminalResponseL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_4, "CSAT: CSatNotifyGetInput::TerminalResponseL, Invalid General Result"); // Invalid general result returnValue = KErrCorrupt; } @@ -408,8 +404,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyGetInput::TerminalResponseL,\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_TERMINALRESPONSEL_5, "CSAT: CSatNotifyGetInput::TerminalResponseL, Invalid Additional Info"); // Invalid additional info field returnValue = KErrCorrupt; } @@ -437,7 +432,7 @@ TUint8 aDcs ) { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_1, "CSAT: CSatNotifyGetInput::CreateTerminalRespL"); TTlv tlvSpecificData; TBuf8 string; @@ -461,14 +456,12 @@ if ( aTextString.Length() ) { - TFLOGSTRING2("CSAT: CSatNotifyGetInput::CreateTerminalRespL \ - aTextString: %S", &aTextString); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_2, "CSAT: CSatNotifyGetInput::CreateTerminalRespL aTextString: %S", aTextString); switch ( aDcs ) { case RSat::EUcs2Alphabet: { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CreateTerminalRespL \ - EUcs2Alphabet"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_3, "CSAT: CSatNotifyGetInput::CreateTerminalRespL EUcs2Alphabet"); // Data coding scheme UCS2 (16-bit) tlvSpecificData.AddByte( KUCS2DCS ); @@ -483,8 +476,7 @@ case RSat::EDigitOnlyPacked: case RSat::ESmsDefaultAlphabetPacked: { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CreateTerminalRespL \ - EDigitOnlyPacked/ESmsDefaultAlphabetPacked"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_4, "CSAT: CSatNotifyGetInput::CreateTerminalRespL EDigitOnlyPacked/ESmsDefaultAlphabetPacked"); // Data coding scheme 7-bit default sms tlvSpecificData.AddByte( K7BitDefaultSmsDCS ); TSatUtility::UCSToPacked7( aTextString, string ); @@ -495,8 +487,7 @@ case RSat::EDigitOnlyUnpacked: case RSat::ESmsDefaultAlphabetUnpacked: { - TFLOGSTRING("CSAT: CSatNotifyGetInput::CreateTerminalRespL \ - EDigitOnlyUnpacked/ESmsDefaultAlphabetUnpacked"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_5, "CSAT: CSatNotifyGetInput::CreateTerminalRespL EDigitOnlyUnpacked/ESmsDefaultAlphabetUnpacked"); // Data coding scheme 8-bit tlvSpecificData.AddByte( K8BitDCS ); TSatUtility::ConvertUnicode16To7Bit( aTextString, string ); @@ -508,8 +499,7 @@ break; } - TFLOGSTRING2("CSAT: CSatNotifyGetInput::CreateTerminalRespL \ - string: %S", &string); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYGETINPUT_CREATETERMINALRESPL_6, "CSAT: CSatNotifyGetInput::CreateTerminalRespL string: %s", string); } } // Prepare data diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyLanguageNotification.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyLanguageNotification.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLanguageNotification.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyLanguageNotificationTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyLanguageNotification.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 @@ -43,13 +48,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_NEWL_1, "CSAT: CSatNotifyLanguageNotification::NewL"); CSatNotifyLanguageNotification* const satNotifyLanguageNotification = new ( ELeave ) CSatNotifyLanguageNotification( aNotificationsTsy ); CleanupStack::PushL( satNotifyLanguageNotification ); satNotifyLanguageNotification->ConstructL(); CleanupStack::Pop( satNotifyLanguageNotification ); - TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_NEWL_2, "CSAT: CSatNotifyLanguageNotification::NewL, end of method"); return satNotifyLanguageNotification; } @@ -63,8 +68,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::\ - ~CSatNotifyLanguageNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_DTOR_1, "CSAT: CSatNotifyLanguageNotification::~CSatNotifyLanguageNotification"); } // ----------------------------------------------------------------------------- @@ -90,7 +94,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_CONSTRUCTL_1, "CSAT: CSatNotifyLanguageNotification::ConstructL"); } // ----------------------------------------------------------------------------- @@ -104,7 +108,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_NOTIFY_1, "CSAT: CSatNotifyLanguageNotification::Notify"); // Save data pointer to client side for completion iLanguageNotificationV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -130,7 +134,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_CANCELNOTIFICATION_1, "CSAT: CSatNotifyLanguageNotification::CancelNotification"); // Reset the request handle iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( CSatTsy::ESatNotifyLanguageNotificationPCmdReqType ); @@ -154,7 +158,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_1, "CSAT: CSatNotifyLanguageNotification::CompleteNotifyL"); TInt returnValue( KErrNone ); TInt ret( KErrNone ); @@ -201,8 +205,7 @@ if ( !cmdQualifier ) { - TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::\ - CompleteNotifyL, No specific language used"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_2, "CSAT: CSatNotifyLanguageNotification::CompleteNotifyL, No specific language used"); // No specific language used languageNotificationV2.iNotificationType = RSat::ENonSpecificLangNotification; @@ -237,8 +240,7 @@ }// End of if( CSatTsy::ESatReqHandleUnknown != reqHandle ) else { - TFLOGSTRING("CSAT: CSatNotifyLanguageNotification::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_3, "CSAT: CSatNotifyLanguageNotification::CompleteNotifyL, Request not ongoing"); additionalInfo.Zero(); additionalInfo.Append( KNoCause ); CreateTerminalRespL( pCmdNumber, RSat::KMeUnableToProcessCmd, @@ -257,7 +259,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT:CSatNotifyLanguageNotification::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_TERMINALRESPONSEL_1, "CSAT:CSatNotifyLanguageNotification::TerminalResponseL"); TInt ret( KErrNone ); TBuf<1> additionalInfo; additionalInfo.FillZ(1); @@ -286,7 +288,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT:CSatNotifyLanguageNotification::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLANGUAGENOTIFICATION_CREATETERMINALRESPL_1, "CSAT:CSatNotifyLanguageNotification::CreateTerminalRespL"); TTlv tlvSpecificData; // Create General Result TLV here tlvSpecificData.AddTag( KTlvResultTag ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyLaunchBrowserTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyLaunchBrowser.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: CSatNotifyLaunchBrowser::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_NEWL_1, "CSAT: CSatNotifyLaunchBrowser::NewL"); CSatNotifyLaunchBrowser* const satNotifyLaunchBrowser = new ( ELeave ) CSatNotifyLaunchBrowser( aNotificationsTsy ); CleanupStack::PushL( satNotifyLaunchBrowser ); satNotifyLaunchBrowser->ConstructL(); CleanupStack::Pop( satNotifyLaunchBrowser ); - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_NEWL_2, "CSAT: CSatNotifyLaunchBrowser::NewL, end of method"); return satNotifyLaunchBrowser; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::~CSatNotifyLaunchBrowser"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_DTOR_1, "CSAT: CSatNotifyLaunchBrowser::~CSatNotifyLaunchBrowser"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_CONSTRUCTL_1, "CSAT: CSatNotifyLaunchBrowser::ConstructL"); iSsStatus = CSatNotificationsTsy::ENotBusy; } @@ -104,7 +109,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_NOTIFY_1, "CSAT: CSatNotifyLaunchBrowser::Notify"); // Save data pointer to client side for completion iLaunchBrowserV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -128,7 +133,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_CANCELNOTIFICATION_1, "CSAT: CSatNotifyLaunchBrowser::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> @@ -155,7 +160,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_1, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); // Unpack parameters @@ -183,8 +188,7 @@ // Check if busy if ( CSatNotificationsTsy::ENotBusy != iSsStatus ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, \ - iSsStatus is busy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_2, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, iSsStatus is busy"); if( CSatNotificationsTsy::EUssdBusy == iSsStatus) { @@ -201,8 +205,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL \ - No SS Transaction ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_3, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL No SS Transaction ongoing"); // Complete right away if error has occured, otherwise continue.. if ( KErrNone == aErrorCode ) { @@ -236,8 +239,7 @@ case KLaunchBrowserCmdQualifierNotUsed: case KLaunchBrowserCmdQualifierReserved: { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - CompleteNotifyL, Command Type not understood"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_4, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Command Type not understood"); CreateTerminalRespL( pCmdNumber, RSat::KCmdTypeNotUnderstood, KNoCause ); ret = KErrCorrupt; @@ -298,8 +300,7 @@ if ( KErrNotFound != returnValue ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - CompleteNotifyL, Alpha ID present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_5, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Alpha ID present"); TUint8 alphaIdLength( alphaIdentifier.GetLength() ); if ( alphaIdLength ) { @@ -318,8 +319,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - CompleteNotifyL, Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_6, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Alpha ID is NULL"); launchBrowserV2.iAlphaId.iStatus = RSat::EAlphaIdNull; } @@ -341,8 +341,7 @@ }// End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown ) else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, \ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_7, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Request not ongoing"); // Request not on, returning response immediately CreateTerminalRespL( pCmdNumber, RSat::KMeUnableToProcessCmd, KNoCause ); @@ -363,7 +362,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_1, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL"); TInt ret( KErrNone ); TUint8 additionalInfo( KNoCause ); RSat::TLaunchBrowserRspV2Pckg* aRspPckg = @@ -388,8 +387,7 @@ ( RSat::KNetworkUnableToProcessCmd != rspV2.iGeneralResult ) && ( RSat::KCmdNumberNotKnown != rspV2.iGeneralResult ) ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, \ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_2, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -402,8 +400,7 @@ ( RSat::KMeUnableToReadProvisioningData != rspV2.iInfoType ) && ( RSat::KNoSpecificBrowserError != rspV2.iInfoType ) ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, \ - Invalid Info Type"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_3, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, Invalid Info Type"); ret = KErrCorrupt; } @@ -417,8 +414,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, \ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_4, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, Invalid Additional Info"); // Invalid additional info field ret = KErrCorrupt; } @@ -442,8 +438,7 @@ { // Unpack parameters aDataPackage->UnPackData( iSsStatus ); - TFLOGSTRING2("CSAT: CSatNotifyLaunchBrowser::SetSatTsySsStatus, status: %d", - iSsStatus ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_SETSSSTATUS_1, "CSAT: CSatNotifyLaunchBrowser::SetSatTsySsStatus, status: %d", iSsStatus ); } // ----------------------------------------------------------------------------- @@ -458,7 +453,7 @@ RSat::TLaunchBrowserV2& aLaunchBrowserV2 ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBrowserId"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_1, "CSAT: CSatNotifyLaunchBrowser::ParseBrowserId"); TInt ret( KErrNone ); CTlv browserId; // optional TInt returnValue = aBerTlv.TlvByTagValue( &browserId, @@ -481,8 +476,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBrowserId, \ - Browser ID not set"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_2, "CSAT: CSatNotifyLaunchBrowser::ParseBrowserId, Browser ID not set"); aLaunchBrowserV2.iBrowserId = RSat::EBrowserIdNotSet; } return ret; @@ -500,7 +494,7 @@ RSat::TLaunchBrowserV2& aLaunchBrowserV2 ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseUrl"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEURLL_1, "CSAT: CSatNotifyLaunchBrowser::ParseUrl"); TInt ret( KErrNone ); CTlv url; // mandatory TInt returnValue = aBerTlv.TlvByTagValue( &url, KTlvUrlTag ); @@ -509,8 +503,7 @@ { if ( RSat::KUrlMaxSize < url.GetLength() ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseUrl, \ - False URL length"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEURLL_2, "CSAT: CSatNotifyLaunchBrowser::ParseUrl, False URL length"); CreateTerminalRespL( aPCmdNumber, RSat::KMeUnableToProcessCmd, KNoCause ); ret = KErrCorrupt; @@ -522,8 +515,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseUrl, \ - Required values missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEURLL_3, "CSAT: CSatNotifyLaunchBrowser::ParseUrl, Required values missing"); CreateTerminalRespL( aPCmdNumber, RSat::KErrorRequiredValuesMissing, KNoCause ); ret = KErrCorrupt; @@ -543,7 +535,7 @@ RSat::TLaunchBrowserV2& aLaunchBrowserV2 ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_1, "CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList"); TInt ret( KErrNone ); CTlv provisioningFileList; // optional @@ -599,8 +591,7 @@ if ( ( RSat::KFileRefMaxSize < stringLength ) || ( 4 > stringLength ) ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - ParseProvisioningFileList, False string length"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_2, "CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList, False string length"); CreateTerminalRespL( aPCmdNumber, RSat::KLaunchBrowserError, RSat::KMeUnableToReadProvisioningData ); ret = KErrCorrupt; @@ -618,8 +609,7 @@ // Adding the new fileref if ( KErrNoMemory == aLaunchBrowserV2.AddFileRef( newFileRef ) ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - ParseProvisioningFileList, Menu items corrupted"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_3, "CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList, Menu items corrupted"); // Too many or long menuitems CreateTerminalRespL( aPCmdNumber, RSat::KLaunchBrowserError, RSat::KMeUnableToReadProvisioningData ); @@ -645,7 +635,7 @@ RSat::TLaunchBrowserV2& aLaunchBrowserV2 ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBearerList"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_1, "CSAT: CSatNotifyLaunchBrowser::ParseBearerList"); TInt ret( KErrNone ); // Bearers (optional) CTlv bearerList; @@ -670,8 +660,7 @@ if ( 0x00 == aLaunchBrowserV2.iBearerList.Length() ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBearerList,\ - Bearer unvailable"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_2, "CSAT: CSatNotifyLaunchBrowser::ParseBearerList, Bearer unvailable"); CreateTerminalRespL( aPCmdNumber, RSat::KLaunchBrowserError, RSat::KBearerUnvailable ); ret = KErrCorrupt; @@ -679,8 +668,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBearerList,\ - Bearer List length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_3, "CSAT: CSatNotifyLaunchBrowser::ParseBearerList, Bearer List length exceeded"); CreateTerminalRespL( aPCmdNumber, RSat::KCmdDataNotUnderstood, RSat::KCmdDataNotUnderstood ); ret = KErrCorrupt; @@ -702,7 +690,7 @@ TUint8 aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_CREATETERMINALRESPL_1, "CSAT: CSatNotifyLaunchBrowser::CreateTerminalRespL"); TTlv tlvSpecificData; tlvSpecificData.AddTag( KTlvResultTag ); // Create General Result TLV here diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyLocalInfo.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyLocalInfo.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLocalInfo.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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,13 +20,18 @@ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSatNotifyLocalInfoTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyLocalInfo.h" // Class header #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: CSatNotifyLocalInfo::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_NEWL_1, "CSAT: CSatNotifyLocalInfo::NewL"); CSatNotifyLocalInfo* const satNotifyLocalInfo = new ( ELeave ) CSatNotifyLocalInfo( aNotificationsTsy ); CleanupStack::PushL( satNotifyLocalInfo ); satNotifyLocalInfo->ConstructL(); CleanupStack::Pop( satNotifyLocalInfo ); - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_NEWL_2, "CSAT: CSatNotifyLocalInfo::NewL, end of method"); return satNotifyLocalInfo; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::~CSatNotifyLocalInfo"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_DTOR_1, "CSAT: CSatNotifyLocalInfo::~CSatNotifyLocalInfo"); } // ----------------------------------------------------------------------------- @@ -93,7 +98,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CONSTRUCTL_1, "CSAT: CSatNotifyLocalInfo::ConstructL"); // IMEI of the ME iIMEI.Zero(); // Clear NMR (Network Measurement result) @@ -118,7 +123,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_NOTIFY_1, "CSAT: CSatNotifyLocalInfo::Notify"); // Save data pointer to client side for completion iLocalInfoV3Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -141,7 +146,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CANCELNOTIFICATION_1, "CSAT: CSatNotifyLocalInfo::CancelNotification"); // Reset the request handle iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( CSatTsy::ESatNotifyLocalInfoPCmdReqType ); @@ -163,7 +168,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_1, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL"); TInt ret( KErrNone ); TPtrC8* data; @@ -192,8 +197,7 @@ { case RSat::KProvideLocalInfo: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL\ - request: LOCAL INFO"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_2, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL request: LOCAL INFO"); iLocalInfoIsOngoing = ETrue; // Get Local Info dataPackage.PackData( &iLocalInfoIsOngoing ); @@ -203,8 +207,7 @@ } case RSat::KProvideLocalInfoImei: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo:: CompleteNotifyL, \ - request: IMEI"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_3, "CSAT: CSatNotifyLocalInfo:: CompleteNotifyL, request: IMEI"); // Check if IMEI is received if ( iIMEI.Length() ) { @@ -221,7 +224,7 @@ } case RSat::KProvideLocalInformationNmr: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo:: request: NMR"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_4, "CSAT: CSatNotifyLocalInfo:: request: NMR"); iLocalInfoIsOngoing = ETrue; // Request Network Measurement Results dataPackage.PackData( &iLocalInfoIsOngoing ); @@ -231,15 +234,13 @@ } case RSat::KProvideLocalInfoDateTimeTimeZone: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo:: request: \ - DATE/TIME/TIMEZONE"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_5, "CSAT: CSatNotifyLocalInfo:: request: DATE/TIME/TIMEZONE"); SetDateTimeTimeZone(); break; } case RSat::KProvideLocalInfoLanguage: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL request, \ - Language"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_6, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL request, Language"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( @@ -273,8 +274,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL\ - No reqHandle"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_7, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL No reqHandle"); iLocalInfoRspV3.iGeneralResult = RSat::KMeUnableToProcessCmd; iLocalInfoRspV3.iAdditionalInfo.Append( @@ -285,8 +285,7 @@ } case RSat::KProvideLocalInfoTimingAdv: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL\ - request: TimingAdvance"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_8, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL request: TimingAdvance"); iLocalInfoIsOngoing = ETrue; dataPackage.PackData( &iLocalInfoIsOngoing ); // Request service @@ -296,8 +295,7 @@ } case RSat::KProvideLocalInfoAccTech: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteNotifyL\ - request: Access Technology"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_9, "CSAT: CSatNotifyLocalInfo::CompleteNotifyL request: Access Technology"); iLocalInfoIsOngoing = ETrue; dataPackage.PackData( &iLocalInfoIsOngoing ); // Request Access technology @@ -345,7 +343,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_1, "CSAT: CSatNotifyLocalInfo::TerminalResponseL"); TInt ret( KErrNone ); TBuf additionalInfo; @@ -362,8 +360,7 @@ && ( RSat::KMeUnableToProcessCmd != rspV1.iGeneralResult ) && ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ) ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::TerminalResponseL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_2, "CSAT: CSatNotifyLocalInfo::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -377,8 +374,7 @@ if ( ( RSat::KMeProblem == rspV1.iInfoType ) && ( NULL == rspV1.iAdditionalInfo.Length() ) ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::TerminalResponseL,\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_3, "CSAT: CSatNotifyLocalInfo::TerminalResponseL, Invalid Additional Info"); // Invalid additional info field ret = KErrCorrupt; } @@ -415,7 +411,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_1, "CSAT: CSatNotifyLocalInfo::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; // Create General Result TLV @@ -506,8 +502,7 @@ } case RSat::KProvideLocalInfoTimingAdv: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::\ - CreateTerminalRespL, TimingAdvance"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_2, "CSAT: CSatNotifyLocalInfo::CreateTerminalRespL, TimingAdvance"); // Timing advance result tlvSpecificData.AddTag( KTlvTimingAdvanceTag ); tlvSpecificData.AddByte( iMEStatus ); @@ -516,8 +511,7 @@ } case RSat::KProvideLocalInfoLanguage: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::\ - CreateTerminalRespL, LocalInfoLanguage"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_3, "CSAT: CSatNotifyLocalInfo::CreateTerminalRespL, LocalInfoLanguage"); if ( aAdditionalInfo.Length() ) { @@ -535,8 +529,7 @@ } case RSat::KProvideLocalInfoAccTech: { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::\ - CreateTerminalRespL, Access Technology"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_4, "CSAT: CSatNotifyLocalInfo::CreateTerminalRespL, Access Technology"); // Access technology result tlvSpecificData.AddTag( KTlvAccessTechnologyTag ); tlvSpecificData.AddByte( iCurrentAccTech ); @@ -573,7 +566,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteTerminalRespDataL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETETERMINALRESPDATAL_1, "CSAT: CSatNotifyLocalInfo::CompleteTerminalRespDataL"); TInt ret( KErrNone ); // Unpack parameters CSatNotificationsTsy::TTerminalRespData* terminalRespData; @@ -595,7 +588,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateLocalInfo"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATELOCALINFO_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateLocalInfo"); aDataPackage->UnPackData( iLocalInformation ); } @@ -610,7 +603,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateNetInfo"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATENETINFO_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateNetInfo"); aDataPackage->UnPackData( iNMR, iBCCHChannelList ); } @@ -625,7 +618,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateTimingAdvAndMEStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATETIMINGADVANDMESTATUS_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateTimingAdvAndMEStatus"); aDataPackage->UnPackData( iTimingAdvance, iMEStatus ); } @@ -640,7 +633,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateAccTech"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATEACCTECH_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateAccTech"); aDataPackage->UnPackData( iCurrentAccTech ); } // ----------------------------------------------------------------------------- @@ -654,7 +647,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateIMEI"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATEIMEI_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateIMEI"); aDataPackage->UnPackData( iIMEI ); } @@ -669,7 +662,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::CompleteUpdateTimeZone"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_COMPLETEUPDATETIMEZONE_1, "CSAT: CSatNotifyLocalInfo::CompleteUpdateTimeZone"); aDataPackage->UnPackData( iTimeZone ); } @@ -684,7 +677,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::LocalInformation"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_TLOCALINFORMATION_1, "CSAT: CSatNotifyLocalInfo::LocalInformation"); return iLocalInformation; } @@ -698,7 +691,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::SetDateTimeTimeZone"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_SETDATETIMETIMEZONE_1, "CSAT: CSatNotifyLocalInfo::SetDateTimeTimeZone"); TTime time; TLocale locale; TDateTime dateTime; @@ -762,7 +755,7 @@ TTlv* aTlvSpecificData ) { - TFLOGSTRING("CSAT: CSatNotifyLocalInfo::SetInformationNmr"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLOCALINFO_SETINFORMATIONNMR_1, "CSAT: CSatNotifyLocalInfo::SetInformationNmr"); if ( iNMR.Length() ) { // Network measurement result diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyMoSmControlRequest.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyMoSmControlRequest.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyMoSmControlRequest.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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 "CSatNotifyMoSmControlRequestTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyMoSmControlRequest.h" // Class header @@ -28,7 +34,6 @@ #include "BerTlv_defs.h" // Ber Tlv specific definitions #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. @@ -44,13 +49,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_NEWL_1, "CSAT: CSatNotifyMoSmControlRequest::NewL"); CSatNotifyMoSmControlRequest* const satNotifyMoSmControlRequest = new ( ELeave ) CSatNotifyMoSmControlRequest( aNotificationsTsy ); CleanupStack::PushL( satNotifyMoSmControlRequest ); satNotifyMoSmControlRequest->ConstructL(); CleanupStack::Pop( satNotifyMoSmControlRequest ); - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_NEWL_2, "CSAT: CSatNotifyMoSmControlRequest::NewL, end of method"); return satNotifyMoSmControlRequest; } @@ -64,8 +69,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::\ - ~CSatNotifyMoSmControlRequest"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_DTOR_1, "CSAT: CSatNotifyMoSmControlRequest::~CSatNotifyMoSmControlRequest"); } // ----------------------------------------------------------------------------- @@ -91,14 +95,13 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CONSTRUCTL_1, "CSAT: CSatNotifyMoSmControlRequest::ConstructL"); // Checks if MO-SMS control should be activated iNotificationsTsy->iSatTsy->MessageManager()->HandleRequestL( ESatTsyMoSmsControlActivation ); // Initialize MO-SMS Control to deactivated iIsMoSmsCtrlActivated = EFalse; - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ConstructL, \ - end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CONSTRUCTL_2, "CSAT: CSatNotifyMoSmControlRequest::ConstructL, end of method"); } // ----------------------------------------------------------------------------- @@ -113,7 +116,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_NOTIFY_1, "CSAT: CSatNotifyMoSmControlRequest::Notify"); // Save data pointer to client side for completion iMoSmControlV1Pckg = reinterpret_cast( @@ -137,7 +140,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CANCELNOTIFICATION_1, "CSAT: CSatNotifyMoSmControlRequest::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> @@ -162,7 +165,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_1, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL" ); CSatNotificationsTsy::TMoSmCtrlData moSmCtrlData; @@ -186,13 +189,11 @@ TDesC8* atkData = NULL; aDataPackage->UnPackData( &atkData ); - TFLOGSTRING2("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL\ - Data length: %d", ( *atkData ).Length() ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_2, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL Data length: %d", ( *atkData ).Length() ); if ( KTlvMaxSize < ( *atkData ).Length() ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL, \ - Data length exceeded" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_3, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL, Data length exceeded" ); // Data not consistent, reject the call moSmCtrlData.iResult = KMoSmCtrlResultNotAllowed; isDataOk = EFalse; @@ -205,8 +206,7 @@ if ( KMoSmCtrlResultAllowedWithModifications == ( *atkData )[0] ) { - TFLOGSTRING3("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL\ - Addr1: %s, Addr2: %s", &addr1, &addr2 ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_4, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL Addr1: %s, Addr2: %s", addr1, addr2 ); simRespDataConsistent = VerifyNotificationData( addr1, addr2 ); } @@ -217,8 +217,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL, \ - NAA response data not consistent" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_5, "CSAT: CSatNotifyMoSmControlRequest::CompleteNotifyL, NAA response data not consistent" ); // Data not consistent, reject the sms moSmCtrlData.iResult = KMoSmCtrlResultNotAllowed; isDataOk = EFalse; @@ -300,15 +299,12 @@ } // If MO SM Ctrl Activated and data ok else { - TFLOGSTRING3("LSAT: CSatMoSmsCtrlMessHandler::CompleteNotifyL, \ - iIsMoSmsCtrlActivated: %d, isDataOk: %d ", - iIsMoSmsCtrlActivated, isDataOk); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_6, "LSAT: CSatMoSmsCtrlMessHandler::CompleteNotifyL, iIsMoSmsCtrlActivated: %d, isDataOk: %d ", iIsMoSmsCtrlActivated, isDataOk); } } // if KErrNone else { - TFLOGSTRING("LSAT: CSatMoSmsCtrlMessHandler::CompleteNotifyL, \ - Error in notification "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_7, "LSAT: CSatMoSmsCtrlMessHandler::CompleteNotifyL, Error in notification "); moSmCtrlData.iResult = KMoSmCtrlResultNotAllowed; // Pack data and send response right away to NAA CSatDataPackage dataPackage; @@ -332,13 +328,11 @@ TInt /*aResult*/ ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::\ - CreateMoSmsCtrlEnvelopeL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CREATEMOSMSCTRLENVELOPEL_1, "CSAT: CSatNotifyMoSmControlRequest::CreateMoSmsCtrlEnvelopeL"); // Check first if the MO-SMS is activated if ( iIsMoSmsCtrlActivated ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::\ - CreateMoSmsCtrlEnvelopeL, MO SM Ctrl Activated"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CREATEMOSMSCTRLENVELOPEL_2, "CSAT: CSatNotifyMoSmControlRequest::CreateMoSmsCtrlEnvelopeL, MO SM Ctrl Activated"); CSatNotificationsTsy::TAddressData* addressData; @@ -390,8 +384,7 @@ { // Unpack data aDataPackage->UnPackData( iIsMoSmsCtrlActivated ); - TFLOGSTRING2("CSAT: CSatNotifyMoSmControlRequest::SetActivationStatus, %d", - iIsMoSmsCtrlActivated ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_SETACTIVATIONSTATUS_1, "CSAT: CSatNotifyMoSmControlRequest::SetActivationStatus, %d",iIsMoSmsCtrlActivated ); } // ----------------------------------------------------------------------------- @@ -404,7 +397,7 @@ void ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ActivationStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_ACTIVATIONSTATUS_1, "CSAT: CSatNotifyMoSmControlRequest::ActivationStatus"); return iIsMoSmsCtrlActivated; } @@ -419,7 +412,7 @@ TDes8& aAddr ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::CleanAddressData"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_CLEANADDRESSDATA_1, "CSAT: CSatNotifyMoSmControlRequest::CleanAddressData"); // Starts from index 1, since index 0 is for TON/NPI for ( TInt i=1; i < aAddr.Length(); i++ ) { @@ -452,7 +445,7 @@ RSat::TAlphaId& aAlphaId ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ParseNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_1, "CSAT: CSatNotifyMoSmControlRequest::ParseNotification"); // Input data: // aAtkData[0] : result @@ -496,8 +489,7 @@ // Check which TLV is received if ( ( KTlvAddressTag == tag ) && ( !address1_got ) ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ParseNotification\ - Address 1"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_2, "CSAT: CSatNotifyMoSmControlRequest::ParseNotification Address 1"); // RP address first address1_got = ETrue; // Copy data to output variable @@ -510,8 +502,7 @@ } else if ( KTlvAddressTag == tag ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ParseNotification\ - Address 2"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_3, "CSAT: CSatNotifyMoSmControlRequest::ParseNotification Address 2"); // TP address. Copy data to output variable aAddr2.Copy( aAtkData.Mid( indexInBerTlv + nn + 2, lengthTlv ) ); if ( KReservedTonNpi1 != aAddr2[0] && @@ -522,8 +513,7 @@ } else if ( KTlvAlphaIdentifierTag == tag ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::ParseNotification\ - Alpha ID"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_4, "CSAT: CSatNotifyMoSmControlRequest::ParseNotification Alpha ID"); // Alpha id must be converted to TBuf16/unicode if ( lengthTlv ) { @@ -534,8 +524,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest:: \ - ParseNotification. Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_5, "CSAT: CSatNotifyMoSmControlRequest:: ParseNotification. Alpha ID is NULL"); aAlphaId.iStatus = RSat::EAlphaIdNull; } } @@ -559,7 +548,7 @@ TDes8& aTPAddr ) { - TFLOGSTRING("CSAT: CSatNotifyMoSmControlRequest::VerifyNotificationData"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMOSMCONTROLREQUEST_VERIFYNOTIFICATIONDATA_1, "CSAT: CSatNotifyMoSmControlRequest::VerifyNotificationData"); TBool ret( ETrue ); if ( ( 0 == aRPAddr.Length() && 0 == aTPAddr.Length() ) || ( KMoSmCtrlMaxLengthAddr1Addr2 <= ( diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyMoreTime.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyMoreTime.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyMoreTime.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyMoreTimeTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyMoreTime.h" // 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: CSatNotifyMoreTime::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_NEWL_1, "CSAT: CSatNotifyMoreTime::NewL"); CSatNotifyMoreTime* const satNotifyMoreTime = new ( ELeave ) CSatNotifyMoreTime( aNotificationsTsy ); CleanupStack::PushL( satNotifyMoreTime ); satNotifyMoreTime->ConstructL(); CleanupStack::Pop( satNotifyMoreTime ); - TFLOGSTRING("CSAT: CSatNotifyMoreTime::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_NEWL_2, "CSAT: CSatNotifyMoreTime::NewL, end of method"); return satNotifyMoreTime; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyMoreTime::~CSatNotifyMoreTime"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_DTOR_1, "CSAT: CSatNotifyMoreTime::~CSatNotifyMoreTime"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyMoreTime::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_CONSTRUCTL_1, "CSAT: CSatNotifyMoreTime::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -102,7 +107,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyMoreTime::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_COMPLETENOTIFYL_1, "CSAT: CSatNotifyMoreTime::CompleteNotifyL"); TInt ret( KErrNone ); // Unpack parameters TPtrC8* data; @@ -136,7 +141,7 @@ TUint8 aGeneralResult ) { - TFLOGSTRING("CSAT: CSatNotifyMoreTime::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYMORETIME_CREATETERMINALRESPL_1, "CSAT: CSatNotifyMoreTime::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; // General result diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyOpenChannel.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyOpenChannel.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyOpenChannel.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyOpenChannelTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyOpenChannel.h" // 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: CSatNotifyOpenChannel::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_NEWL_1, "CSAT: CSatNotifyOpenChannel::NewL"); CSatNotifyOpenChannel* const satNotifyOpenChannel = new ( ELeave ) CSatNotifyOpenChannel( aNotificationsTsy ); CleanupStack::PushL( satNotifyOpenChannel ); satNotifyOpenChannel->ConstructL(); CleanupStack::Pop( satNotifyOpenChannel ); - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_NEWL_2, "CSAT: CSatNotifyOpenChannel::NewL, end of method"); return satNotifyOpenChannel; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::~CSatNotifyOpenChannel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_DTOR_1, "CSAT: CSatNotifyOpenChannel::~CSatNotifyOpenChannel"); } // ----------------------------------------------------------------------------- @@ -89,7 +94,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CONSTRUCTL_1, "CSAT: CSatNotifyOpenChannel::ConstructL"); } // ----------------------------------------------------------------------------- @@ -104,7 +109,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_NOTIFY_1, "CSAT: CSatNotifyOpenChannel::Notify"); // Save data pointers to client side for completion iOpenBaseChannelV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -134,7 +139,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CANCELNOTIFICATION_1, "CSAT: CSatNotifyOpenChannel::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> @@ -161,7 +166,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_1, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL"); TInt ret( KErrNone ); // Unpack parameters @@ -204,9 +209,7 @@ { case KBipCsdBearer: { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\ - CompleteNotifyL, Command not supported: \ - Csd Bearer"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_2, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Command not supported: Csd Bearer"); // Buffer size iBufferSize = bufferSize.GetLongInfo( ETLV_BufferSize ); @@ -214,8 +217,7 @@ iBearerType = RSat::ECSDBearer; iBearer = bearerDescription.GetData( ETLV_BearerParameters ); - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\ - CompleteNotifyL, BipCsdBearer "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_3, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, BipCsdBearer "); CreateTerminalRespL( pCmdNumber, RSat::KCmdBeyondMeCapabilities, KNullDesC16 ); ret = KErrCorrupt; @@ -272,8 +274,7 @@ default: { // Bearer not supported (RFU) - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\ - CompleteNotifyL, Bearer not supported"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_4, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Bearer not supported"); // Required values missing iBearer.FillZ( 1 ); iBufferSize = 0; @@ -288,8 +289,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL,\ - required values missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_5, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, required values missing"); // Required values missing iBearer.FillZ( 1 ); iBufferSize = 0; @@ -358,16 +358,14 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\ - CompleteNotifyL, Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_6, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Alpha ID is NULL"); openChannelV2->iAlphaId.iStatus = RSat::EAlphaIdNull; } } // Alpha id not present else { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL,\ - Alpha ID not present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_7, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Alpha ID not present"); openChannelV2->iAlphaId.iStatus = RSat::EAlphaIdNotPresent; } @@ -411,8 +409,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL,\ - Protocol not present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_8, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Protocol not present"); openChannelV2->iSimMeInterface.iTransportProto = RSat::EProtocolNotPresent; } @@ -487,8 +484,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\ - CompleteNotifyL, Address not set"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_9, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not set"); openChannelV2->iDestinationAddress.iType = RSat::EAddressNotSet; break; @@ -542,9 +538,7 @@ } default: { - TFLOGSTRING("CSAT:\ - CSatNotifyOpenChannel::\ - CompleteNotifyL, Address not set"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_10, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not set"); openCsChannelV2.iLocalAddress.iType = RSat::EAddressNotSet; } @@ -558,8 +552,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\ - CompleteNotifyL, Address not present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_11, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not present"); openCsChannelV2.iLocalAddress.iType = RSat::EAddressNotPresent; } @@ -591,9 +584,7 @@ } default: { - TFLOGSTRING("CSAT: \ - CSatNotifyOpenChannel::\ - CompleteNotifyL, Address not set"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_12, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not set"); openGprsChannelV4.iLocalAddress.iType = RSat::EAddressNotSet; } @@ -608,8 +599,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\ - CompleteNotifyL, Address not present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_13, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Address not present"); openGprsChannelV4.iLocalAddress.iType = RSat::EAddressNotPresent; } @@ -618,8 +608,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::\ - CompleteNotifyL, Unknown Bearer type"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_14, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Unknown Bearer type"); break; } @@ -629,8 +618,7 @@ } // if ( KErrNone == ret ) else { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL,\ - Error when parsing Bearer data"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_15, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Error when parsing Bearer data"); } } // if ( KErrNone == aErrorCode ) else @@ -643,8 +631,7 @@ else { // Request not on, returning response immediately - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::CompleteNotifyL, \ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_16, "CSAT: CSatNotifyOpenChannel::CompleteNotifyL, Request not ongoing"); // additional info must be provided with KMeUnableToProcessCmd TBuf16<1> additionalInfo; additionalInfo.Append( RSat::KNoSpecificMeProblem ); @@ -667,7 +654,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_1, "CSAT: CSatNotifyOpenChannel::TerminalResponseL"); TInt ret( KErrNone ); @@ -679,8 +666,7 @@ TUint8 pCmdNumber( rspV2.PCmdNumber() ); - TFLOGSTRING2("CSAT: CSatNotifyOpenChannel::TerminalResponseL, \ - General result: %d", rspV2.iGeneralResult); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_2, "CSAT: CSatNotifyOpenChannel::TerminalResponseL, General result: %d", rspV2.iGeneralResult); // Check that general result value is valid if ( ( RSat::KSuccess != rspV2.iGeneralResult ) @@ -703,8 +689,7 @@ && ( RSat::KAccessTechUnableProcessCmd != rspV2.iGeneralResult ) && ( RSat::KFramesError != rspV2.iGeneralResult ) ) { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::TerminalResponseL, \ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_3, "CSAT: CSatNotifyOpenChannel::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -718,8 +703,7 @@ // Check the length of additional info if ( rspV2.iAdditionalInfo.Length() <= 0 ) { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::TerminalResponseL, \ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_4, "CSAT: CSatNotifyOpenChannel::TerminalResponseL, Invalid Additional Info"); // Invalid additional info field ret = KErrCorrupt; } @@ -742,8 +726,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyOpenChannel::TerminalResponseL, \ - Invalid Additional Info type"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_5, "CSAT: CSatNotifyOpenChannel::TerminalResponseL, Invalid Additional Info type"); ret = KErrCorrupt; } @@ -773,7 +756,7 @@ const TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_1, "CSAT: CSatMessHandler::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; // Create General Result TLV here @@ -800,8 +783,7 @@ // Successful result: could/must provide an additional info byte if ( aAdditionalInfo.Length() > 0 ) { - TFLOGSTRING2("CSAT: CSatMessHandler::CreateTerminalRespL,\ - Unsuccessful result: aAddtionalInfo: %d", aAdditionalInfo[0]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_2, "CSAT: CSatMessHandler::CreateTerminalRespL, Unsuccessful result: aAddtionalInfo: %d", aAdditionalInfo[0]); tlvSpecificData.AddByte( static_cast( aAdditionalInfo[0] ) ); } } @@ -815,8 +797,7 @@ } else { - TFLOGSTRING("CSAT: CSatMessHandler::CreateTerminalRespL: \ - No Bearer Description data available"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_3, "CSAT: CSatMessHandler::CreateTerminalRespL: No Bearer Description data available"); } // Append Buffer Size diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyPlayTone.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyPlayTone.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPlayTone.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyPlayToneTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyPlayTone.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: CSatNotifyPlayTone::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_NEWL_1, "CSAT: CSatNotifyPlayTone::NewL"); CSatNotifyPlayTone* const satNotifyPlayTone = new ( ELeave ) CSatNotifyPlayTone( aNotificationsTsy ); CleanupStack::PushL( satNotifyPlayTone ); satNotifyPlayTone->ConstructL(); CleanupStack::Pop( satNotifyPlayTone ); - TFLOGSTRING("CSAT: CSatNotifyPlayTone::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_NEWL_2, "CSAT: CSatNotifyPlayTone::NewL, end of method"); return satNotifyPlayTone; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyPlayTone::~CSatNotifyPlayTone"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_DTOR_1, "CSAT: CSatNotifyPlayTone::~CSatNotifyPlayTone"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyPlayTone::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_CONSTRUCTL_1, "CSAT: CSatNotifyPlayTone::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -102,7 +107,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyPlayTone::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_NOTIFY_1, "CSAT: CSatNotifyPlayTone::Notify"); // Save data pointer to client side for completion iPlayToneV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -127,7 +132,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyPlayTone::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_CANCELNOTIFICATION_1, "CSAT: CSatNotifyPlayTone::CancelNotification"); // Reset the request handle iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifyPlayTonePCmdReqType ); @@ -150,7 +155,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_1, "CSAT: CSatNotifyPlayTone::CompleteNotifyL"); TInt returnValue( KErrNone ); TInt ret( KErrNone ); @@ -191,8 +196,7 @@ if ( KErrNotFound != returnValue ) { - TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\ - Alpha ID present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_2, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Alpha ID present"); TUint16 alphaIdLength = alphaIdentifier.GetLength(); if ( alphaIdLength ) { @@ -212,8 +216,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\ - Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_3, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Alpha ID is NULL"); playToneV2.iAlphaId.iStatus = RSat::EAlphaIdNull; } } @@ -226,8 +229,7 @@ { playToneV2.iTone = ( RSat::TTone ) tone.GetShortInfo( ETLV_Tone ); - TFLOGSTRING2("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\ - Tone Selection: %d", playToneV2.iTone); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_4, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Tone Selection: %d", playToneV2.iTone); } // Duration of the tone (optional) @@ -248,8 +250,7 @@ }// End of if ( CSatTsy::ESatReqHandleUnknown != reqHandle ) else { - TFLOGSTRING("CSAT: CSatNotifyPlayTone::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_5, "CSAT: CSatNotifyPlayTone::CompleteNotifyL, Request not ongoing"); // Request not on, returning response immediately additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -272,7 +273,7 @@ TDes8* aRsp ) { - TFLOGSTRING( "CSAT: CSatNotifyPlayTone::TerminalResponseL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_1, "CSAT: CSatNotifyPlayTone::TerminalResponseL" ); TInt ret( KErrNone ); TBuf<1>additionalInfo; @@ -293,8 +294,7 @@ ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ) && ( RSat::KCmdDataNotUnderstood != rspV1.iGeneralResult ) ) { - TFLOGSTRING( "CSAT: CSatNotifyPlayTone::TerminalResponseL,\ - Invalid General Result" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_2, "CSAT: CSatNotifyPlayTone::TerminalResponseL, Invalid General Result" ); // Invalid general result ret = KErrCorrupt; } @@ -310,14 +310,12 @@ } else { - TFLOGSTRING( "CSAT: CSatNotifyPlayTone::TerminalResponseL,\ - Invalid Additional Info" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_3, "CSAT: CSatNotifyPlayTone::TerminalResponseL, Invalid Additional Info" ); // Invalid additional info field ret = KErrCorrupt; } } - TFLOGSTRING2( "CSAT: CSatNotifyPlayTone::TerminalResponseL: \ - AdditionalInfo: %s", &additionalInfo ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_4, "CSAT: CSatNotifyPlayTone::TerminalResponseL: AdditionalInfo: %S", additionalInfo ); CreateTerminalRespL( pCmdNumber, static_cast< TUint8 >( rspV1.iGeneralResult ), additionalInfo ); @@ -338,7 +336,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifyPlayTone::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPLAYTONE_CREATETERMINALRESPL_1, "CSAT: CSatNotifyPlayTone::CreateTerminalRespL"); TTlv tlvSpecificData; tlvSpecificData.AddTag( KTlvResultTag ); //General result diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyPollInterval.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyPollInterval.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPollInterval.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyPollIntervalTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyPollInterval.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. @@ -44,13 +49,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifyPollInterval::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_NEWL_1, "CSAT: CSatNotifyPollInterval::NewL"); CSatNotifyPollInterval* const satNotifyPollInterval = new ( ELeave ) CSatNotifyPollInterval( aNotificationsTsy ); CleanupStack::PushL( satNotifyPollInterval ); satNotifyPollInterval->ConstructL(); CleanupStack::Pop( satNotifyPollInterval ); - TFLOGSTRING("CSAT: CSatNotifyPollInterval::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_NEWL_2, "CSAT: CSatNotifyPollInterval::NewL, end of method"); return satNotifyPollInterval; } @@ -64,7 +69,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyPollInterval::~CSatNotifyPollInterval"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_DTOR_1, "CSAT: CSatNotifyPollInterval::~CSatNotifyPollInterval"); } // ----------------------------------------------------------------------------- @@ -90,7 +95,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyPollInterval::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_CONSTRUCTL_1, "CSAT: CSatNotifyPollInterval::ConstructL"); } // ----------------------------------------------------------------------------- @@ -105,7 +110,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyPollInterval::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_1, "CSAT: CSatNotifyPollInterval::CompleteNotifyL"); TInt returnValue( KErrNone ); TPtrC8* data; aDataPackage->UnPackData( &data ); @@ -167,8 +172,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotifyPollInterval::\ - CompleteNotifyL, Time unit unknown."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_2, "CSAT: CSatNotifyPollInterval::CompleteNotifyL, Time unit unknown."); returnValue = KErrNotFound; // Command data not understood CreateTerminalRespL( pCmdNumber, @@ -222,7 +226,7 @@ TUint8 aDcs ) { - TFLOGSTRING("CSAT: CSatNotifyPollInterval::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_1, "CSAT: CSatNotifyPollInterval::CreateTerminalRespL"); TTlv tlvSpecificData; tlvSpecificData.AddTag( KTlvResultTag ); tlvSpecificData.AddByte( aGeneralResult ); @@ -243,9 +247,7 @@ } default: { - TFLOGSTRING2("CSAT: CSatNotifyPollInterval::\ - CreateTerminalRespL, Additional Info: %d", - aAdditionalInfo); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_2, "CSAT: CSatNotifyPollInterval::CreateTerminalRespL, Additional Info: %d", aAdditionalInfo); tlvSpecificData.AddByte( aAdditionalInfo ); break; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyPollingOff.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyPollingOff.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPollingOff.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyPollingOffTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyPollingOff.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. @@ -43,13 +48,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifyPollingOff::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_NEWL_1, "CSAT: CSatNotifyPollingOff::NewL"); CSatNotifyPollingOff* const satNotifyPollingOff = new ( ELeave ) CSatNotifyPollingOff( aNotificationsTsy ); CleanupStack::PushL( satNotifyPollingOff ); satNotifyPollingOff->ConstructL(); CleanupStack::Pop( satNotifyPollingOff ); - TFLOGSTRING("CSAT: CSatNotifyPollingOff::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_NEWL_2, "CSAT: CSatNotifyPollingOff::NewL, end of method"); return satNotifyPollingOff; } @@ -63,7 +68,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyPollingOff::~CSatNotifyPollingOff"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_DTOR_1, "CSAT: CSatNotifyPollingOff::~CSatNotifyPollingOff"); } // ----------------------------------------------------------------------------- @@ -89,7 +94,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyPollingOff::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_CONSTRUCTL_1, "CSAT: CSatNotifyPollingOff::ConstructL"); } // ----------------------------------------------------------------------------- @@ -104,7 +109,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyPollingOff::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_COMPLETENOTIFYL_1, "CSAT: CSatNotifyPollingOff::CompleteNotifyL"); TPtrC8* data; TBuf<1> additionalInfo; aDataPackage->UnPackData( &data ); @@ -151,7 +156,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifyPollingOff::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_CREATETERMINALRESPL_1, "CSAT: CSatNotifyPollingOff::CreateTerminalRespL"); TTlv tlvSpecificData; tlvSpecificData.AddTag( KTlvResultTag ); @@ -173,9 +178,7 @@ } default: { - TFLOGSTRING2("CSAT: CSatNotifyPollingOff::\ - CreateTerminalRespL, Additional Info: %d", - aAdditionalInfo[0]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYPOLLINGOFF_CREATETERMINALRESPL_2, "CSAT: CSatNotifyPollingOff::CreateTerminalRespL, Additional Info: %d", aAdditionalInfo[0]); tlvSpecificData.AddByte( static_cast( aAdditionalInfo[0] ) ); break; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyReceiveData.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyReceiveData.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyReceiveData.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyReceiveDataTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyReceiveData.h" // 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: CSatNotifyMoreTime::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_NEWL_1, "CSAT: CSatNotifyMoreTime::NewL"); CSatNotifyReceiveData* const satNotifyReceiveData = new ( ELeave ) CSatNotifyReceiveData( aNotificationsTsy ); CleanupStack::PushL( satNotifyReceiveData ); satNotifyReceiveData->ConstructL(); CleanupStack::Pop( satNotifyReceiveData ); - TFLOGSTRING("CSAT: CSatNotifyMoreTime::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_NEWL_2, "CSAT: CSatNotifyMoreTime::NewL, end of method"); return satNotifyReceiveData; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyMoreTime::~CSatNotifyReceiveData"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_DTOR_1, "CSAT: CSatNotifyMoreTime::~CSatNotifyReceiveData"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyMoreTime::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_CONSTRUCTL_1, "CSAT: CSatNotifyMoreTime::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -103,7 +108,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_NOTIFY_1, "CSAT: CSatNotifyReceiveData::Notify"); // Save data pointer to client side for completion iReceiveDataRspV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -126,7 +131,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_CANCELNOTIFICATION_1, "CSAT: CSatNotifyReceiveData::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifyReceiveDataPCmdReqType ); @@ -149,7 +154,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_1, "CSAT: CSatNotifyReceiveData::CompleteNotifyL"); TInt ret( KErrNone ); TBuf<1> noAdditionalInfo( 0 ); // Unpack parameters @@ -224,8 +229,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::\ - CompleteNotifyL, Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_2, "CSAT: CSatNotifyReceiveData::CompleteNotifyL, Alpha ID is NULL"); receiveDataV2.iAlphaId.iStatus = RSat::EAlphaIdNull; } } @@ -237,8 +241,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::CompleteNotifyL, \ - Required values missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_3, "CSAT: CSatNotifyReceiveData::CompleteNotifyL, Required values missing"); // Required values missing TUint8 channelDataLength( 0 ); CreateTerminalRespL( @@ -257,8 +260,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::CompleteNotifyL, \ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_4, "CSAT: CSatNotifyReceiveData::CompleteNotifyL, Request not ongoing"); // Request not on, returning response immediately TUint8 channelDataLength( 0 ); TBuf16<1> additionalInfo; @@ -282,7 +284,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_1, "CSAT: CSatNotifyReceiveData::TerminalResponseL"); TInt ret( KErrNone ); @@ -309,8 +311,7 @@ && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) && ( RSat::KBearerIndepProtocolError != rspV2.iGeneralResult ) ) { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::TerminalResponseL, \ - Invalid general result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_2, "CSAT: CSatNotifyReceiveData::TerminalResponseL, Invalid general result"); ret = KErrCorrupt; } @@ -325,8 +326,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::TerminalResponseL, \ - Additional Info is Corrupted"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_3, "CSAT: CSatNotifyReceiveData::TerminalResponseL, Additional Info is Corrupted"); ret = KErrCorrupt; } } @@ -351,7 +351,7 @@ TUint8 aChannelDataLength ) { - TFLOGSTRING("CSAT: CSatNotifyReceiveData::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYRECEIVEDATA_CREATETERMINALRESPL_1, "CSAT: CSatNotifyReceiveData::CreateTerminalRespL"); TTlv tlvSpecificData; // Append general result tag tlvSpecificData.AddTag( KTlvResultTag ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyRefresh.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyRefresh.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyRefresh.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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 "CSatNotifyRefreshTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyRefresh.h" // 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. @@ -45,13 +50,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_NEWL_1, "CSAT: CSatNotifyRefresh::NewL"); CSatNotifyRefresh* const satNotifyRefresh = new ( ELeave ) CSatNotifyRefresh( aNotificationsTsy ); CleanupStack::PushL( satNotifyRefresh ); satNotifyRefresh->ConstructL(); CleanupStack::Pop( satNotifyRefresh ); - TFLOGSTRING("CSAT: CSatNotifyRefresh::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_NEWL_2, "CSAT: CSatNotifyRefresh::NewL, end of method"); return satNotifyRefresh; } @@ -65,7 +70,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::~CSatNotifyRefresh"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_DTOR_1, "CSAT: CSatNotifyRefresh::~CSatNotifyRefresh"); } // ----------------------------------------------------------------------------- @@ -91,7 +96,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_CONSTRUCTL_1, "CSAT: CSatNotifyRefresh::ConstructL"); } // ----------------------------------------------------------------------------- @@ -105,7 +110,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_NOTIFY_1, "CSAT: CSatNotifyRefresh::Notify"); // Save data pointer to client side for completion iRefreshV2Pckg = reinterpret_cast( @@ -136,7 +141,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::NotifyRefreshRequired"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_NOTIFYREFRESHREQUIRED_1, "CSAT: CSatNotifyRefresh::NotifyRefreshRequired"); // Save data pointer to client side for completion iRefreshRequiredV2Pckg = reinterpret_cast( @@ -166,7 +171,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING( "CSAT: CSatNotifyRefresh::CancelNotification" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_CANCELNOTIFICATION_1, "CSAT: CSatNotifyRefresh::CancelNotification" ); // Reset the request handle iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( @@ -191,7 +196,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING( "CSAT: CSatNotifyRefresh::CancelRefreshRequiredNotification" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_CANCELREFRESHREQUIREDNOTIFICATION_1, "CSAT: CSatNotifyRefresh::CancelRefreshRequiredNotification" ); // Reset the request handle iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( @@ -218,15 +223,14 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_1, "CSAT: CSatNotifyRefresh::CompleteNotifyL"); TInt ret( KErrNone ); TBuf<1> additionalInfo; // Unpack parameters TPtrC8* data; aDataPackage->UnPackData( &data ); - TFLOGSTRING2("CSAT: CSatNotifyRefresh::CompleteNotifyL, dataLength: %d", - data->Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_2, "CSAT: CSatNotifyRefresh::CompleteNotifyL, dataLength: %d", data->Length()); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> TsyReqHandle( CSatTsy::ESatNotifyRefreshPCmdReqType ); @@ -323,8 +327,7 @@ else if ( KFileChangeNotification == iNotificationsTsy-> iTerminalRespData.iCommandDetails[KCommandQualifier] ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL,\ - File list missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_3, "CSAT: CSatNotifyRefresh::CompleteNotifyL, File list missing"); // File list object is missing, return terminal resp immediately. ret = KErrCorrupt; additionalInfo.Zero(); @@ -340,9 +343,7 @@ { case KSimInitFullFileChangeNotification: { - TFLOGSTRING("CSAT: CSatNotifyRefresh::\ - CompleteNotifyL, Refresh mode: Sim init \ - and full file change notification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_4, "CSAT: CSatNotifyRefresh::CompleteNotifyL, Refresh mode: Sim init and full file change notification"); refreshV2.iType = RSat::ESimInitFullFileChangeNotification; iInternalCache = CSatNotificationsTsy::ECacheEFSST + @@ -351,11 +352,8 @@ } case KFileChangeNotification: { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\ - Refresh mode: File Change Notification"); - TFLOGSTRING2("CSAT: CSatNotifyRefresh::CompleteNotifyL\ - Number of files: %d", - refreshV2.iFileList.Length() ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_5, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: File Change Notification"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_6, "CSAT: CSatNotifyRefresh::CompleteNotifyL Number of files: %d", refreshV2.iFileList.Length() ); refreshV2.iType = RSat::EFileChangeNotification; if ( ( KErrNotFound != refreshV2.iFileList.Locate( @@ -378,19 +376,14 @@ } case KSimInitFileChangeNotification: { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL,\ - Refresh mode: Sim init and file \ - change notification"); - TFLOGSTRING2("CSAT: CSatNotifyRefresh::CompleteNotifyL\ - Number of files: %d", - refreshV2.iFileList.Length() ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_7, "CSAT: CSatNotifyRefresh::CompleteNotifyL, Refresh mode: Sim init and file change notification"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_8, "CSAT: CSatNotifyRefresh::CompleteNotifyL Number of files: %d", refreshV2.iFileList.Length() ); refreshV2.iType = RSat::ESimInitFileChangeNotification; break; } case KSimInit: { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\ - Refresh mode: Sim init "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_9, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: Sim init "); refreshV2.iType = RSat::ESimInit; iInternalCache = CSatNotificationsTsy::ECacheEFSST + CSatNotificationsTsy::ECacheEFCBMID; @@ -401,16 +394,14 @@ case KSimReset: { refreshV2.iType = RSat::ESimReset; - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\ - Refresh mode: Reset"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_10, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: Reset"); iInternalCache = CSatNotificationsTsy::ECacheEFSST + CSatNotificationsTsy::ECacheEFCBMID; break; } case KUSIMApplicationReset: { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\ - Refresh mode: USIM Application Reset"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_11, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: USIM Application Reset"); refreshV2.iType = RSat::EUsimApplicationReset; iInternalCache = CSatNotificationsTsy::ECacheEFSST + CSatNotificationsTsy::ECacheEFCBMID; @@ -418,15 +409,13 @@ } case K3GSessionReset: { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\ - Refresh mode: 3G Session Reset"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_12, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh mode: 3G Session Reset"); refreshV2.iType = RSat::E3GSessionReset; break; } default: { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL\ - Refresh type not set!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_13, "CSAT: CSatNotifyRefresh::CompleteNotifyL Refresh type not set!"); // This migth be an error case refreshV2.iType = RSat::ERefreshTypeNotSet; break; @@ -461,8 +450,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteNotifyL,\ - One or more of the requests not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETENOTIFYL_14, "CSAT: CSatNotifyRefresh::CompleteNotifyL, One or more of the requests not ongoing"); // Some of the request were not on, returning response immediately additionalInfo.Zero(); additionalInfo.Append( RSat::KNoSpecificMeProblem ); @@ -486,7 +474,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_TERMINALRESPONSEL_1, "CSAT: CSatNotifyRefresh::TerminalResponseL"); RSat::TRefreshRspV1Pckg* aRspPckg = reinterpret_cast( aRsp ); @@ -508,8 +496,7 @@ ( RSat::KSuccess != rspV1.iGeneralResult ) ) && ( EImsiNotEqual != iImsiState ) ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::TerminalResponseL, \ - S60 has done the Refresh" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_TERMINALRESPONSEL_2, "CSAT: CSatNotifyRefresh::TerminalResponseL, S60 has done the Refresh" ); // Send terminal response CreateTerminalRespL( pCmdNumber, (TUint8) rspV1.iGeneralResult, additionalInfo ); @@ -539,11 +526,10 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteImsiChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEIMSICHANGE_1, "CSAT: CSatNotifyRefresh::CompleteImsiChange"); if ( ERefreshSimInitReceived == iImsiState ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteImsiChange, \ - IMSI not equal"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEIMSICHANGE_2, "CSAT: CSatNotifyRefresh::CompleteImsiChange, IMSI not equal"); iImsiState = EImsiNotEqual; } } @@ -561,7 +547,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_CREATETERMINALRESPL_1, "CSAT: CSatNotifyRefresh::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; // append result tag @@ -601,7 +587,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::RefreshAllowed "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_REFRESHALLOWEDL_1, "CSAT: CSatNotifyRefresh::RefreshAllowed "); RSat::TRefreshRspV1Pckg* aRspPckg = reinterpret_cast( aPackage.Des1n() ); RSat::TRefreshRspV1& rspV1 = ( *aRspPckg ) (); @@ -625,8 +611,7 @@ else { // Refresh not allowed by the client - TFLOGSTRING("CSAT: CSatNotifyRefresh::RefreshAllowed, refresh was not \ - allowed by the client"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_REFRESHALLOWEDL_2, "CSAT: CSatNotifyRefresh::RefreshAllowed, refresh was not allowed by the client"); TBuf additionalInfo; additionalInfo.Append(RSat::KNoSpecificMeProblem); if ( RSat::KNoAdditionalInfo != rspV1.iInfoType ) @@ -654,7 +639,7 @@ TInt /*aErrorCode*/ ) { - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteTerminalRespDataL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETETERMINALRESPDATAL_1, "CSAT: CSatNotifyRefresh::CompleteTerminalRespDataL"); TInt ret( KErrNone ); CSatNotificationsTsy::TTerminalRespData* terminalRespData; // Send terminal response @@ -681,13 +666,11 @@ TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifyRefreshPCmdReqType ); - TFLOGSTRING3("CSAT: CSatNotifyRefresh::CompleteRequest.\ - \n\t\t\t Handle:%d\n\t\t\t Error:%d", reqHandle, aErrorCode); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEREQUEST_1, "CSAT: CSatNotifyRefresh::CompleteRequest.\n\t\t\t Handle:%d\n\t\t\t Error:%d", reqHandle, aErrorCode); iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, aErrorCode); - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteRequest. Request is \ - now completed"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEREQUEST_2, "CSAT: CSatNotifyRefresh::CompleteRequest. Request is now completed"); } #else //USING_CTSY_DISPATCHER void CSatNotifyRefresh::CompleteRequest @@ -702,15 +685,13 @@ TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifyRefreshPCmdReqType ); - TFLOGSTRING3("CSAT: CSatNotifyRefresh::CompleteRequest.\ - \n\t\t\t Handle:%d\n\t\t\t Error:%d", reqHandle, retValue); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEREQUEST1_1, "CSAT: CSatNotifyRefresh::CompleteRequest. \n\t\t\t Handle:%d\n\t\t\t Error:%d", reqHandle, retValue); if(CSatTsy::ESatReqHandleUnknown != reqHandle) { iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, retValue ); - TFLOGSTRING("CSAT: CSatNotifyRefresh::CompleteRequest. Request is \ - now completed"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYREFRESH_COMPLETEREQUEST1_2, "CSAT: CSatNotifyRefresh::CompleteRequest. Request is now completed"); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySelectItem.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySelectItem.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySelectItem.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 // 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( 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. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySendData.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySendData.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendData.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifySendDataTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifySendData.h" // 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: CSatNotifySendData::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_NEWL_1, "CSAT: CSatNotifySendData::NewL"); CSatNotifySendData* const satNotifySendData = new ( ELeave ) CSatNotifySendData( aNotificationsTsy ); CleanupStack::PushL( satNotifySendData ); satNotifySendData->ConstructL(); CleanupStack::Pop( satNotifySendData ); - TFLOGSTRING("CSAT: CSatNotifySendData::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_NEWL_2, "CSAT: CSatNotifySendData::NewL, end of method"); return satNotifySendData; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendData::~CSatNotifySendData"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_DTOR_1, "CSAT: CSatNotifySendData::~CSatNotifySendData"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendData::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_CONSTRUCTL_1, "CSAT: CSatNotifySendData::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -103,7 +108,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifySendData::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_NOTIFY_1, "CSAT: CSatNotifySendData::Notify"); // Save data pointer to client side for completion iSendDataRspV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -126,7 +131,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySendData::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendData::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifySendDataPCmdReqType ); @@ -149,7 +154,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendData::CompleteNotifyL"); TInt ret( KErrNone ); TBuf<1> noAdditionalInfo( 0 ); // Unpack parameters @@ -223,8 +228,7 @@ if ( KErrNotFound != returnValue ) { - TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL \ - Alpha ID found"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendData::CompleteNotifyL Alpha ID found"); TUint16 alphaIdLength = alphaIdentifier.GetLength(); if ( alphaIdLength ) { @@ -239,8 +243,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL\ - Alpha id is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendData::CompleteNotifyL Alpha id is NULL"); sendDataV2.iAlphaId.iStatus = RSat::EAlphaIdNull; } } @@ -252,8 +255,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL \ - Required values missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendData::CompleteNotifyL Required values missing"); // Required values missing TUint8 channelDataLength( 0 ); CreateTerminalRespL( @@ -272,8 +274,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendData::CompleteNotifyL \ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_COMPLETENOTIFYL_5, "CSAT: CSatNotifySendData::CompleteNotifyL Request not ongoing"); // Request not on, returning response immediately TUint8 channelDataLength( 0 ); TBuf16<1> additionalInfo; @@ -296,7 +297,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifySendData::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_TERMINALRESPONSEL_1, "CSAT: CSatNotifySendData::TerminalResponseL"); TInt ret( KErrNone ); TBuf16 additionalInfo; @@ -322,8 +323,7 @@ && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) && ( RSat::KBearerIndepProtocolError != rspV2.iGeneralResult ) ) { - TFLOGSTRING2("CSAT: CSatNotifySendData::TerminalResponseL, \ - Invalid general result: %d", rspV2.iGeneralResult); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_TERMINALRESPONSEL_2, "CSAT: CSatNotifySendData::TerminalResponseL, Invalid general result: %d", rspV2.iGeneralResult); // Invalid general result ret = KErrCorrupt; } @@ -336,8 +336,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendData::TerminalResponseL, \ - Additional Info corrupted "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_TERMINALRESPONSEL_3, "CSAT: CSatNotifySendData::TerminalResponseL, Additional Info corrupted "); ret = KErrCorrupt; } } @@ -362,7 +361,7 @@ TUint8 aChannelDataLength ) { - TFLOGSTRING("CSAT: CSatNotifySendData::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_CREATETERMINALRESPL_1, "CSAT: CSatNotifySendData::CreateTerminalRespL"); TTlv tlvSpecificData; // Append general result tag tlvSpecificData.AddTag( KTlvResultTag ); @@ -397,8 +396,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotifySendData::CreateTerminalRespL\ - Unknown General result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDATA_CREATETERMINALRESPL_2, "CSAT: CSatNotifySendData::CreateTerminalRespL Unknown General result"); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySendDtmf.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySendDtmf.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendDtmf.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifySendDtmfTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifySendDtmf.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: CSatNotifySendDtmf::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_NEWL_1, "CSAT: CSatNotifySendDtmf::NewL"); CSatNotifySendDtmf* const satNotifySendDtmf = new ( ELeave ) CSatNotifySendDtmf( aNotificationsTsy ); CleanupStack::PushL( satNotifySendDtmf ); satNotifySendDtmf->ConstructL(); CleanupStack::Pop( satNotifySendDtmf ); - TFLOGSTRING("CSAT: CSatNotifySendDtmf::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_NEWL_2, "CSAT: CSatNotifySendDtmf::NewL, end of method"); return satNotifySendDtmf; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::~CSatNotifySendDtmf"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_DTOR_1, "CSAT: CSatNotifySendDtmf::~CSatNotifySendDtmf"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_CONSTRUCTL_1, "CSAT: CSatNotifySendDtmf::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -102,7 +107,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_NOTIFY_1, "CSAT: CSatNotifySendDtmf::Notify"); // Save data pointer to client side for completion iSendDtmfV1Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -128,7 +133,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendDtmf::CancelNotification"); // Reset the request handle iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( CSatTsy::ESatNotifySendDtmfPCmdReqType ); @@ -152,7 +157,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendDtmf::CompleteNotifyL"); TInt returnValue( KErrNone ); TInt ret( KErrNone ); // Unpack parameters @@ -198,8 +203,7 @@ if ( RSat::KAlphaIdMaxSize < alphaIdLength ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\ - Alpha ID length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Alpha ID length exceeded"); // String too long additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -220,16 +224,14 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\ - Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Alpha ID is NULL"); sendDtmfV1.iAlphaId.iStatus = RSat::EAlphaIdNull; } } // Alpha id not present else { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\ - Alpha ID not present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Alpha ID not present"); sendDtmfV1.iAlphaId.iStatus = RSat::EAlphaIdNotPresent; } @@ -250,15 +252,13 @@ if ( ( dtmfStringLength && ( sendDtmf.Data()[2] == 0xFF ) ) || !dtmfStringLength ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\ - Data not understood"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_5, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Data not understood"); generalResult = RSat::KCmdDataNotUnderstood; ret = KErrCorrupt; } else if( RSat::KDtmfStringMaxSize < dtmfStringLength ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\ - Cmd beyond ME capabilities"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_6, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, Cmd beyond ME capabilities"); generalResult = RSat::KCmdBeyondMeCapabilities; ret = KErrCorrupt; } @@ -269,8 +269,7 @@ if( KErrCorrupt == ret ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::CompleteNotifyL,\ - DTMF length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_7, "CSAT: CSatNotifySendDtmf::CompleteNotifyL, DTMF length exceeded"); // String too long additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -319,7 +318,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT:CSatNotifySendDtmf::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_1, "CSAT:CSatNotifySendDtmf::TerminalResponseL"); TInt ret( KErrNone ); TBuf<1> additionalInfo; @@ -343,8 +342,7 @@ ( RSat::KPSessionTerminatedByUser != rspV1.iGeneralResult ) && ( RSat::KErrorRequiredValuesMissing != rspV1.iGeneralResult ) ) { - TFLOGSTRING("CSAT:CSatNotifySendDtmf::TerminalResponseL,\ - Invalid General result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_2, "CSAT:CSatNotifySendDtmf::TerminalResponseL, Invalid General result"); ret = KErrCorrupt; } @@ -357,8 +355,7 @@ } else { - TFLOGSTRING("CSAT:CSatNotifySendDtmf::TerminalResponseL,\ - Invalid Info Type"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_3, "CSAT:CSatNotifySendDtmf::TerminalResponseL, Invalid Info Type"); ret = KErrCorrupt; } } @@ -388,7 +385,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifySendDtmf::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDDTMF_CREATETERMINALRESPL_1, "CSAT: CSatNotifySendDtmf::CreateTerminalRespL"); TTlv tlvSpecificData; // Append general result tag diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySendSm.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySendSm.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendSm.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifySendSmTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifySendSm.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: CSatNotifySendSm::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_NEWL_1, "CSAT: CSatNotifySendSm::NewL"); CSatNotifySendSm* const satNotifySendSm = new ( ELeave ) CSatNotifySendSm( aNotificationsTsy ); CleanupStack::PushL( satNotifySendSm ); satNotifySendSm->ConstructL(); CleanupStack::Pop( satNotifySendSm ); - TFLOGSTRING("CSAT: CSatNotifySendSm::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_NEWL_2, "CSAT: CSatNotifySendSm::NewL, end of method"); return satNotifySendSm; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendSm::~CSatNotifySendSm"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_DTOR_1, "CSAT: CSatNotifySendSm::~CSatNotifySendSm"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendSm::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CONSTRUCTL_1, "CSAT: CSatNotifySendSm::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -102,7 +107,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifySendSm::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_NOTIFY_1, "CSAT: CSatNotifySendSm::Notify"); // Save data pointer to client side for completion iSendSmV1Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -124,7 +129,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySendSm::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendSm::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifySendSmPCmdReqType ); @@ -147,7 +152,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendSm::CompleteNotifyL"); TInt ret( KErrNone ); TBuf<1> additionalInfo; // Unpack parameters @@ -195,8 +200,7 @@ if ( KErrCorrupt == ret ) { - TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL,\ - Invalid data"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendSm::CompleteNotifyL, Invalid data"); additionalInfo.Zero(); additionalInfo.Append( KNoCause ); CreateTerminalRespL( pCmdNumber, @@ -221,8 +225,7 @@ ret = PackSms( smsTpdu, sendSmV1.iSmsTpdu ); if ( KErrNone != ret ) { - TFLOGSTRING("CSAT: CSatNotifySendSm::\ - CompleteNotifyL, Invalid TPDU"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendSm::CompleteNotifyL, Invalid TPDU"); // TPDU is invalid or packing cannot be requested // if tpdu is something else than SMS-SUBMIT additionalInfo.Zero(); @@ -238,8 +241,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL,\ - Packing not required"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendSm::CompleteNotifyL, Packing not required"); } } else @@ -249,8 +251,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL,\ - Missing TPDU"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_5, "CSAT: CSatNotifySendSm::CompleteNotifyL, Missing TPDU"); // TPdu is missing, returning response immediately additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -277,8 +278,7 @@ } // End of if ( CSatTsy::ESatReqHandleUnknown != reqHandle ) else { - TFLOGSTRING("CSAT: CSatNotifySendSm::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_COMPLETENOTIFYL_6, "CSAT: CSatNotifySendSm::CompleteNotifyL, Request not ongoing"); // Request not on, returning response immediately additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -298,7 +298,7 @@ TDes8* aRsp ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::TerminalResponseL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_TERMINALRESPONSEL_1, "CSAT::CSatNotifySendSm::TerminalResponseL" ); TInt ret( KErrNone ); TBuf<1> additionalInfo; @@ -307,8 +307,7 @@ RSat::TSendSmRspV1& rspV1 = ( *aRspPckg ) (); // Get Proactive command number TUint8 pCmdNumber( rspV1.PCmdNumber() ); - TFLOGSTRING2( "CSAT::CSatNotifySendSm::TerminalResponseL: GeneralResult: \ - %d", static_cast( rspV1.iGeneralResult ) ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_TERMINALRESPONSEL_2, "CSAT::CSatNotifySendSm::TerminalResponseL: GeneralResult: %d", static_cast( rspV1.iGeneralResult ) ); // Check that general result value is valid if ( ( RSat::KSuccess != rspV1.iGeneralResult ) && @@ -319,8 +318,7 @@ ( RSat::KModifiedByCallControl != rspV1.iGeneralResult ) && ( RSat::KSuccessRequestedIconNotDisplayed != rspV1.iGeneralResult ) ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::TerminalResponseL,\ - Invalid General result" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_TERMINALRESPONSEL_3, "CSAT::CSatNotifySendSm::TerminalResponseL, Invalid General result" ); // Invalid general result ret = KErrCorrupt; } @@ -334,8 +332,7 @@ // Check the length of additional info if ( 0 == rspV1.iAdditionalInfo.Length() ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::TerminalResponseL,\ - Invalid Additional Info" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_TERMINALRESPONSEL_4, "CSAT::CSatNotifySendSm::TerminalResponseL, Invalid Additional Info" ); // No info ret = KErrCorrupt; } @@ -371,7 +368,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::CreateTerminalRespL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CREATETERMINALRESPL_1, "CSAT::CSatNotifySendSm::CreateTerminalRespL" ); // Create and append response data TTlv tlvSpecificData; // Create General Result TLV here @@ -386,8 +383,7 @@ { if( aAdditionalInfo.Length() > 0 ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::CreateTerminalRespL,\ - Unsuccessful result" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CREATETERMINALRESPL_2, "CSAT::CSatNotifySendSm::CreateTerminalRespL, Unsuccessful result" ); // If there is ME, Network or SMS error, append additional info tlvSpecificData.AddByte( static_cast( aAdditionalInfo[0] ) ); } @@ -419,7 +415,7 @@ RSat::TSendSmV1& aSendSmV1 ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_1, "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData" ); TInt returnValue; TPtrC8 sourceString; // Used in unicode conversions // Alpha id string (optional) @@ -447,15 +443,13 @@ } else { - TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData,\ - Alpha ID is NULL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_2, "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData, Alpha ID is NULL" ); aSendSmV1.iAlphaId.iStatus = RSat::EAlphaIdNull; } } else { - TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData,\ - Alpha ID not present" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_3, "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData, Alpha ID not present" ); aSendSmV1.iAlphaId.iStatus = RSat::EAlphaIdNotPresent; } // The address data object holds the RP_Destination_Address of the Service @@ -491,13 +485,11 @@ // Converting back to ASCII format TSatUtility::BCDToAscii( sourceString, tempScaNumber ); aSendSmV1.iAddress.iTelNumber.Copy( tempScaNumber ); - TFLOGSTRING2("CSAT: SendSm, SCA number: %S", - &aSendSmV1.iAddress.iTelNumber ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_4, "CSAT: SendSm, SCA number: %S", aSendSmV1.iAddress.iTelNumber ); } else { - TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData\ - Address TLV found, TON/NPI present, but number epmpty" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_5, "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData Address TLV found, TON/NPI present, but number epmpty" ); // Address TLV found, TON/NPI present, but number epmpty. aSendSmV1.iAddress.iTypeOfNumber = RSat::EUnknownNumber; aSendSmV1.iAddress.iNumberPlan = RSat::EUnknownNumberingPlan; @@ -505,8 +497,7 @@ } else { - TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData\ - Address TLV found, but the Value part doesn't exist"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_6, "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData Address TLV found, but the Value part doesn't exist"); // Address TLV found, but the Value part doesn't exist aSendSmV1.iAddress.iTypeOfNumber = RSat::EUnknownNumber; aSendSmV1.iAddress.iNumberPlan = RSat::EUnknownNumberingPlan; @@ -514,8 +505,7 @@ } else { - TFLOGSTRING( "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData\ - Address TLV not found"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_7, "CSAT::CSatNotifySendSm::SetAlphaIdAndAddressData Address TLV not found"); // Address TLV not found aSendSmV1.iAddress.iTypeOfNumber = RSat::ETypeOfNumberNotSet; aSendSmV1.iAddress.iNumberPlan = RSat::ENumberingPlanNotSet; @@ -532,7 +522,7 @@ TPtrC8 aTpdu ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_1, "CSAT::CSatNotifySendSm::CheckTpdu"); TInt ret( KErrNone ); if ( KSATSmsMTISubmitOrSubmitReport == ( aTpdu[0] & KMask3 ) ) @@ -545,8 +535,7 @@ if ( !dcs && KSmsMaxSize < tpUdl ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu,\ - False DCS Length"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_2, "CSAT::CSatNotifySendSm::CheckTpdu, False DCS Length"); // DCS is 7-bit and message is over 160 bytes, set ret to corrupt ret = KErrCorrupt; } @@ -554,15 +543,13 @@ iTerminalRespData.iCommandDetails[KCommandQualifier] ) ) && ( KSmsMaxSizeWithoutPacking < tpUdl && dcs ) ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu,\ - TP-UD Too long without packing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_3, "CSAT::CSatNotifySendSm::CheckTpdu, TP-UD Too long without packing"); // TP-UD is too long without packing ret = KErrCorrupt; } else if ( ( KSmsMaxSize < tpUdl ) && dcs ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu,\ - TP-UD is too long even with packing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_4, "CSAT::CSatNotifySendSm::CheckTpdu, TP-UD is too long even with packing"); // TP-UD is too long even with packing ret = KErrCorrupt; } @@ -576,8 +563,7 @@ // SMS-COMMAND if ( KSMSCommandMaxSize < GetTpUdl( aTpdu ) ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::CheckTpdu,\ - False SMS Command length"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_CHECKTPDU_5, "CSAT::CSatNotifySendSm::CheckTpdu, False SMS Command length"); ret = KErrCorrupt; } else @@ -600,7 +586,7 @@ TPtrC8 aTpdu ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::GetTpUdl"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_GETTPUDL_1, "CSAT::CSatNotifySendSm::GetTpUdl"); TUint8 ret( 0 ); if ( KSATSmsMTISubmitOrSubmitReport == ( aTpdu[0] & KMask3 ) ) { @@ -675,7 +661,7 @@ TPtrC8 aTpdu ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::GetTpDcs"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_GETTPDCS_1, "CSAT::CSatNotifySendSm::GetTpDcs"); TUint8 retValue( NULL ); if ( KSATSmsMTISubmitOrSubmitReport == ( aTpdu[0] & KMask3 ) ) { @@ -711,7 +697,7 @@ TTpdu& aSendSm ) { - TFLOGSTRING( "CSAT::CSatNotifySendSm::PackSms"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_PACKSMS_1, "CSAT::CSatNotifySendSm::PackSms"); // See 3GPP TS 23.040 and TS 23.038: // Packing of Basic elements of the SMS SUBMIT type TInt ret( KErrNone ); @@ -797,7 +783,7 @@ } else { - TFLOGSTRING( "CSAT::CSatNotifySendSm::PackSms, No headers"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_PACKSMS_2, "CSAT::CSatNotifySendSm::PackSms, No headers"); // No headers, lets pack all the characters in SMS message TBool endOfTPDU( EFalse ); TUint8 move( 0 ); @@ -843,7 +829,7 @@ } else { - TFLOGSTRING( "CSAT::CSatNotifySendSm::PackSms, Corrupted"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_PACKSMS_3, "CSAT::CSatNotifySendSm::PackSms, Corrupted"); ret = KErrCorrupt; break; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySendSs.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySendSs.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendSs.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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 "CSatNotifySendSsTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatCCTsy.h" // Call Control Tsy class header @@ -28,7 +34,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. @@ -44,13 +49,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifySendSs::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_NEWL_1, "CSAT: CSatNotifySendSs::NewL"); CSatNotifySendSs* const satNotifySendSs = new ( ELeave ) CSatNotifySendSs( aNotificationsTsy ); CleanupStack::PushL( satNotifySendSs ); satNotifySendSs->ConstructL(); CleanupStack::Pop( satNotifySendSs ); - TFLOGSTRING("CSAT: CSatNotifySendSs::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_NEWL_2, "CSAT: CSatNotifySendSs::NewL, end of method"); return satNotifySendSs; } @@ -64,7 +69,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendSs::~CSatNotifySendSs"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_DTOR_1, "CSAT: CSatNotifySendSs::~CSatNotifySendSs"); } // ----------------------------------------------------------------------------- @@ -90,7 +95,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendSs::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CONSTRUCTL_1, "CSAT: CSatNotifySendSs::ConstructL"); } // ----------------------------------------------------------------------------- @@ -105,7 +110,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifySendSs::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_NOTIFY_1, "CSAT: CSatNotifySendSs::Notify"); // Save data pointer to client side for completion iSendSsV1Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -130,7 +135,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySendSs::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendSs::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> @@ -156,7 +161,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendSs::CompleteNotifyL"); TInt ret( KErrNone ); // Unpack parameters @@ -229,15 +234,13 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ - Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendSs::CompleteNotifyL, Alpha ID is NULL"); sendSsV1.iAlphaId.iStatus = RSat::EAlphaIdNull; } } else { - TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ - Alpha ID not present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendSs::CompleteNotifyL, Alpha ID not present"); sendSsV1.iAlphaId.iStatus = RSat::EAlphaIdNotPresent; } @@ -293,8 +296,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ - Data corrupted"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendSs::CompleteNotifyL, Data corrupted"); CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood, KNullDesC16 ); ret = KErrCorrupt; @@ -303,8 +305,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ - SS String length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_5, "CSAT: CSatNotifySendSs::CompleteNotifyL, SS String length exceeded"); // SS string is too long CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood, KNullDesC16 ); @@ -313,8 +314,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ - SS String missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_6, "CSAT: CSatNotifySendSs::CompleteNotifyL, SS String missing"); // Mandatory tlv is missing, returning response immediately CreateTerminalRespL( pCmdNumber, RSat::KErrorRequiredValuesMissing, @@ -337,8 +337,7 @@ } // End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown ) else { - TFLOGSTRING("CSAT: CSatNotifySendSs::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_COMPLETENOTIFYL_7, "CSAT: CSatNotifySendSs::CompleteNotifyL, Request not ongoing"); // Request not on, returning response immediately TBuf<1> additionalInfo; additionalInfo.Append( RSat::KNoSpecificMeProblem ); @@ -360,7 +359,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT:: CSatNotifySendSs::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_TERMINALRESPONSEL_1, "CSAT:: CSatNotifySendSs::TerminalResponseL"); TInt ret( KErrNone ); // Buffer for additional information TBuf additionalInfo; @@ -387,8 +386,7 @@ && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) && ( RSat::KInteractionWithCCPermanentError != rspV2.iGeneralResult ) ) { - TFLOGSTRING("CSAT:: CSatNotifySendSs::TerminalResponseL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_TERMINALRESPONSEL_2, "CSAT:: CSatNotifySendSs::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -447,8 +445,7 @@ if ( !isValidAddInfo ) { - TFLOGSTRING("CSAT: CSatNotifyCloseChannel::TerminalResponseL\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_TERMINALRESPONSEL_3, "CSAT: CSatNotifyCloseChannel::TerminalResponseL Invalid Additional Info"); ret = KErrCorrupt; } @@ -481,7 +478,7 @@ const TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT:: CSatNotifySendSs::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CREATETERMINALRESPL_1, "CSAT:: CSatNotifySendSs::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; tlvSpecificData.AddTag( KTlvResultTag ); @@ -517,7 +514,7 @@ RSat::TSsString& aSsString ) { - TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckCallForwarding"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKCALLFORWARDING_1, "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) @@ -539,8 +536,7 @@ } if ( KErrNotFound != pos ) { - TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckCallForwarding,\ - String is for call forwarding"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKCALLFORWARDING_2, "CSAT:: CSatNotifySendSs::CheckCallForwarding, String is for call forwarding"); aSsString.iSsString.Zero(); aSsString.iSsString.Append( aSource.Left( pos + 4 ) ); aSsString.iSsString.Append( KPlusMarkCharacterCode ); @@ -561,13 +557,12 @@ TPtrC8 aSsString ) { - TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckSsStringValidity"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_1, "CSAT:: CSatNotifySendSs::CheckSsStringValidity"); TInt ret( KErrNone ); if ( !aSsString.Length() ) { - TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckSsStringValidity,\ - String length is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_2, "CSAT:: CSatNotifySendSs::CheckSsStringValidity, String length is NULL"); // If length is zero ret = KErrCorrupt; } @@ -581,8 +576,7 @@ || ( KErrNotFound != aSsString.Find( KWild ) ) || ( KErrNotFound != aSsString.Find( KExpansionDigit ) ) ) { - TFLOGSTRING("CSAT:: CSatNotifySendSs::CheckSsStringValidity,\ - Incompatible character found"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_3, "CSAT:: CSatNotifySendSs::CheckSsStringValidity, Incompatible character found"); ret = KErrCorrupt; } return ret; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySendUssd.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySendUssd.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendUssd.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifySendUssdTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifySendUssd.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: CSatNotifySendUssd::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_NEWL_1, "CSAT: CSatNotifySendUssd::NewL"); CSatNotifySendUssd* const satNotifySendUssd = new ( ELeave ) CSatNotifySendUssd( aNotificationsTsy ); CleanupStack::PushL( satNotifySendUssd ); satNotifySendUssd->ConstructL(); CleanupStack::Pop( satNotifySendUssd ); - TFLOGSTRING("CSAT: CSatNotifySendUssd::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_NEWL_2, "CSAT: CSatNotifySendUssd::NewL, end of method"); return satNotifySendUssd; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendUssd::~CSatNotifySendUssd"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_DTOR_1, "CSAT: CSatNotifySendUssd::~CSatNotifySendUssd"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySendUssd::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_CONSTRUCTL_1, "CSAT: CSatNotifySendUssd::ConstructL"); } // ----------------------------------------------------------------------------- @@ -103,7 +108,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifySendUssd::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_NOTIFY_1, "CSAT: CSatNotifySendUssd::Notify"); // Save data pointer to client side for completion iSendUssdV1Pckg = reinterpret_cast( @@ -130,7 +135,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySendUssd::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_CANCELNOTIFICATION_1, "CSAT: CSatNotifySendUssd::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> @@ -154,7 +159,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_1, "CSAT: CSatNotifySendUssd::CompleteNotifyL"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); TBuf<1> additionalInfo; @@ -203,8 +208,7 @@ TUint16 alphaIdLength = alphaIdentifier.GetLength() ; if ( RSat::KAlphaIdMaxSize < alphaIdLength ) { - TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\ - Alpha ID length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_2, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Alpha ID length exceeded"); // String too long additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -230,15 +234,13 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\ - Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_3, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Alpha ID is NULL"); sendUssdV1.iAlphaId.iStatus = RSat::EAlphaIdNull; } } else { - TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\ - Alpha ID not present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_4, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Alpha ID not present"); sendUssdV1.iAlphaId.iStatus = RSat::EAlphaIdNotPresent; } @@ -273,8 +275,7 @@ && RSat::KStringMaxSize<8*ussdStringLengthInBytes/7)) { // The Ussd text string is too long. - TFLOGSTRING("CSAT:CSatNotifySendUssd::CompleteNotifyL, \ - USSD String too long"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_5, "CSAT:CSatNotifySendUssd::CompleteNotifyL, USSD String too long"); // Text string too long ret = KErrCorrupt; additionalInfo.Zero(); @@ -311,8 +312,7 @@ } default: { - TFLOGSTRING("CSAT:CSatNotifySendUssd::CompleteNotifyL, \ - USSD DCS has a reserved value"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_6, "CSAT:CSatNotifySendUssd::CompleteNotifyL, USSD DCS has a reserved value"); // The DCS has a reserved value ret = KErrCorrupt; additionalInfo.Zero(); @@ -352,8 +352,7 @@ } // End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown ) else { - TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_7, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Request not ongoing"); // Request not on, returning response immediately additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -376,7 +375,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifySendUssd::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_1, "CSAT: CSatNotifySendUssd::TerminalResponseL"); TInt ret( KErrNone ); TBuf additionalInfo; @@ -403,8 +402,7 @@ && ( RSat::KCmdBeyondMeCapabilities != rspV1.iGeneralResult ) && ( RSat::KUssdReturnError != rspV1.iGeneralResult ) ) { - TFLOGSTRING("CSAT: CSatNotifySendUssd::CompleteNotifyL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_2, "CSAT: CSatNotifySendUssd::CompleteNotifyL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -421,8 +419,7 @@ if ( 0 == rspV1.iAdditionalInfo.Length() ) { // No info - TFLOGSTRING("CSAT:CSatNotifySendUssd::TerminalResponseL, \ - AdditionalInfoType set, but no additional info available"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_3, "CSAT:CSatNotifySendUssd::TerminalResponseL, AdditionalInfoType set, but no additional info available"); ret = KErrCorrupt; } else if ( RSat::KTextString == rspV1.iInfoType ) @@ -433,8 +430,7 @@ // performed successfully, SAT Server uses the // rspV1.iUssdString.iUssdString to return the USSD string // sent by the network. - TFLOGSTRING("CSAT:CSatNotifySendUssd::TerminalResponseL, \ - AdditionalInfoType set to TextString."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_4, "CSAT:CSatNotifySendUssd::TerminalResponseL, AdditionalInfoType set to TextString."); } else { @@ -471,7 +467,7 @@ TUint8 aDcs ) { - TFLOGSTRING("CSAT: CSatNotifySendUssd::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_CREATETERMINALRESPL_1, "CSAT: CSatNotifySendUssd::CreateTerminalRespL"); TTlv tlvSpecificData; TBuf8 string; @@ -533,9 +529,7 @@ // Reserved // The general result should in fact prevent reaching this branch of // the switch. - TFLOGSTRING("TSY:CSatMessHandler::SendUssdTerminalRespL, \ - The DCS sent by the network has a reserved value. The general result \ - should have been set to UssdReturnError"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDUSSD_CREATETERMINALRESPL_2, "TSY:CSatMessHandler::SendUssdTerminalRespL, The DCS sent by the network has a reserved value. The general result should have been set to UssdReturnError"); break; } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySetUpCall.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpCall.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpCall.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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 "CSatNotifySetUpCallTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifySetUpCall.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: CSatNotifySetupCall::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_NEWL_1, "CSAT: CSatNotifySetupCall::NewL"); CSatNotifySetUpCall* const satNotifySetUpCall = new ( ELeave ) CSatNotifySetUpCall( aNotificationsTsy ); CleanupStack::PushL( satNotifySetUpCall ); satNotifySetUpCall->ConstructL(); CleanupStack::Pop( satNotifySetUpCall ); - TFLOGSTRING("CSAT: CSatNotifySetupCall::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_NEWL_2, "CSAT: CSatNotifySetupCall::NewL, end of method"); return satNotifySetUpCall; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySetupCall::~CSatNotifySetUpCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_DTOR_1, "CSAT: CSatNotifySetupCall::~CSatNotifySetUpCall"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySetupCall::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_CONSTRUCTL_1, "CSAT: CSatNotifySetupCall::ConstructL"); iCallConnectedEvent.Zero(); } @@ -103,15 +108,14 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifySetupCall::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_NOTIFY_1, "CSAT: CSatNotifySetupCall::Notify"); // Save data pointer to client side for completion iSetUpCallV1Pckg = reinterpret_cast( aPackage.Des1n() ); // Save the request handle iNotificationsTsy->iSatTsy->SaveReqHandle( aTsyReqHandle, CSatTsy::ESatNotifySetUpCallPCmdReqType ); - TFLOGSTRING2("CSAT: CSatNotifySetUpCall::Notify\t Handle:%d", - aTsyReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_NOTIFY_2, "CSAT: CSatNotifySetUpCall::Notify\t Handle:%d",aTsyReqHandle); // Check if requested notification is already pending iNotificationsTsy->NotifySatReadyForNotification( KSetUpCall ); @@ -131,7 +135,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySetUpCall::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_CANCELNOTIFICATION_1, "CSAT: CSatNotifySetUpCall::CancelNotification"); // Reset the request handle iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( CSatTsy::ESatNotifySetUpCallPCmdReqType ); @@ -155,7 +159,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_1, "CSAT: CSatNotifySetupCall::CompleteNotifyL"); TInt returnValue( KErrNone ); TInt ret( KErrNone ); iCCResult = 0; @@ -181,8 +185,7 @@ TUint8 pCmdNumber( commandDetails.GetShortInfo( ETLV_CommandNumber ) ); - TFLOGSTRING2("CSAT: CSatNotifySetUpCall::CompleteNotifyL\t Handle:%d", - reqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_2, "CSAT: CSatNotifySetUpCall::CompleteNotifyL\t Handle:%d",reqHandle); // In case the request was ongoing, continue.. if ( CSatTsy::ESatReqHandleUnknown != reqHandle ) { @@ -195,9 +198,7 @@ // Transaction ID setUpCallV1.SetPCmdNumber( pCmdNumber ); - TFLOGSTRING2("CSAT: CSatNotifySetupCall::CompleteNotifyL \ - CommandQualifier %d", iNotificationsTsy->iTerminalRespData. - iCommandDetails[ KCommandQualifier ]); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_3, "CSAT: CSatNotifySetupCall::CompleteNotifyL CommandQualifier %d", iNotificationsTsy->iTerminalRespData.iCommandDetails[ KCommandQualifier ]); switch ( iNotificationsTsy->iTerminalRespData. iCommandDetails[ KCommandQualifier ] ) @@ -241,8 +242,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\ - Call type not set"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_4, "CSAT: CSatNotifySetupCall::CompleteNotifyL,Call type not set"); // Call type not set setUpCallV1.iType = RSat::ESetUpCallTypeNotSet; break; @@ -275,9 +275,7 @@ // Get alpha id string sourceString.Set( alphaIdentifier.GetData( ETLV_AlphaIdentifier ) ); - TFLOGSTRING2("CSAT: CSatNotifySetupCall::CompleteNotifyL User \ - confirmation phase: sourceString %s", - &sourceString ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_5, "CSAT: CSatNotifySetupCall::CompleteNotifyL User confirmation phase: sourceString %s", sourceString ); // Convert and set the alpha id TSatUtility::SetAlphaId( sourceString , setUpCallV1.iAlphaIdConfirmationPhase.iAlphaId ); @@ -287,8 +285,7 @@ // is zero else { - TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL \ - User confirmation phase: Alpha Id missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_6, "CSAT: CSatNotifySetupCall::CompleteNotifyL User confirmation phase: Alpha Id missing"); setUpCallV1.iAlphaIdConfirmationPhase.iStatus = RSat::EAlphaIdNull; } @@ -296,8 +293,7 @@ // No alpha id for user confirmation phase else { - TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\ - User confirmation phase: Alpha ID not present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_7, "CSAT: CSatNotifySetupCall::CompleteNotifyL, User confirmation phase: Alpha ID not present"); setUpCallV1.iAlphaIdConfirmationPhase.iStatus = RSat::EAlphaIdNotPresent; } @@ -317,9 +313,7 @@ // Get alpha id string sourceString.Set( alphaIdentifier.GetData( ETLV_AlphaIdentifier ) ); - TFLOGSTRING2("CSAT: CSatNotifySetupCall::CompleteNotifyL \ - Call Set Up phase: sourceString %s", - &sourceString ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_8, "CSAT: CSatNotifySetupCall::CompleteNotifyL Call Set Up phase: sourceString %s",sourceString ); // Convert and set the alpha id TSatUtility::SetAlphaId( sourceString, setUpCallV1.iAlphaIdCallSetUpPhase.iAlphaId ); @@ -328,8 +322,7 @@ // Alpha id found for set up call phase, but length is zero else { - TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL \ - Call Set Up phase: Alpha Id is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_9, "CSAT: CSatNotifySetupCall::CompleteNotifyL Call Set Up phase: Alpha Id is NULL"); setUpCallV1.iAlphaIdCallSetUpPhase.iStatus = RSat::EAlphaIdNull; } @@ -338,8 +331,7 @@ // No alpha id set up call phase else { - TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\ - Alpha ID not present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_10, "CSAT: CSatNotifySetupCall::CompleteNotifyL, Alpha ID not present"); setUpCallV1.iAlphaIdCallSetUpPhase.iStatus = RSat::EAlphaIdNotPresent; } @@ -409,8 +401,7 @@ // Set actual number setUpCallV1.iAddress.iTelNumber.Copy( tempNumber ); - TFLOGSTRING2("CSAT: CSatNotifySetUpCall::CompleteNotifyL, \ - TelNumber: %S", &setUpCallV1.iAddress.iTelNumber ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_11, "CSAT: CSatNotifySetUpCall::CompleteNotifyL, TelNumber: %S", setUpCallV1.iAddress.iTelNumber ); iNotificationsTsy->iSatTsy->StoreProactiveAddress( &tempNumber ); @@ -418,8 +409,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_12, "CSAT: CSatNotifySetupCall::CompleteNotifyL, Request not ongoing"); additionalInfo.Zero(); additionalInfo.Append( KNoCause ); // Request not on, returning response immediately @@ -441,8 +431,7 @@ setUpCallV1.iCapabilityConfigParams.Append( capabilityConfig. GetData( ETLV_CapabilityConfigurationParameters ) ); - TFLOGSTRING2("CSAT: CSatNotifySetUpCall::CompleteNotifyL, \ - CapabilityParams: %s", &setUpCallV1.iCapabilityConfigParams ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_13, "CSAT: CSatNotifySetUpCall::CompleteNotifyL, CapabilityParams: %s", setUpCallV1.iCapabilityConfigParams ); } // Called Party SubAddress @@ -479,8 +468,7 @@ setUpCallV1.iSubAddress ); } - TFLOGSTRING2("CSAT: CSatNotifySetUpCall, SubAddress: %S", - &setUpCallV1.iSubAddress ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_14, "CSAT: CSatNotifySetUpCall, SubAddress: %S", setUpCallV1.iSubAddress ); } // Duration ( optional, maximum duration for the redial mechanism ) @@ -511,8 +499,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotifySetupCall::\ - CompleteNotifyL, time unit not set"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_15, "CSAT: CSatNotifySetupCall::CompleteNotifyL, time unit not set"); setUpCallV1.iDuration.iTimeUnit = RSat::ETimeUnitNotSet; break; @@ -523,8 +510,7 @@ setUpCallV1.iDuration.iNumOfUnits = callDuration.GetShortInfo( ETLV_TimeInterval ); - TFLOGSTRING("CSAT: CSatNotifySetUpCall::CompleteNotifyL Max \ - Duration for the Redial Mechanism" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_16, "CSAT: CSatNotifySetUpCall::CompleteNotifyL Max Duration for the Redial Mechanism" ); // Check that Time interval value is not invalid if ( NULL == setUpCallV1.iDuration.iNumOfUnits ) @@ -549,8 +535,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySetupCall::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_17, "CSAT: CSatNotifySetupCall::CompleteNotifyL, Request not ongoing"); additionalInfo.Zero(); additionalInfo.Append( KNoCause ); // Request not on, returning response immediately @@ -571,7 +556,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT:CSatNotifySetUpCall::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_1, "CSAT:CSatNotifySetUpCall::TerminalResponseL"); TInt ret( KErrNone ); TBuf<1> additionalInfo; @@ -597,8 +582,7 @@ && ( RSat::KErrorRequiredValuesMissing != rspV2.iGeneralResult ) && ( RSat::KInteractionWithCCPermanentError != rspV2.iGeneralResult) ) { - TFLOGSTRING("CSAT:CSatNotifySetUpCall::TerminalResponseL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_2, "CSAT:CSatNotifySetUpCall::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -617,8 +601,7 @@ } else { - TFLOGSTRING("CSAT:CSatNotifySetUpCall::TerminalResponseL,\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_3, "CSAT:CSatNotifySetUpCall::TerminalResponseL, Invalid Additional Info"); ret = KErrCorrupt; } } @@ -667,7 +650,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifySetUpCall::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_CREATETERMINALRESPL_1, "CSAT: CSatNotifySetUpCall::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; tlvSpecificData.AddTag( KTlvResultTag ); @@ -685,8 +668,7 @@ } else { - TFLOGSTRING( "CSAT: CSatNotifySetUpCall::CreateTerminalRespL \ - aAdditionalInfo.Length() == 0" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_CREATETERMINALRESPL_2, "CSAT: CSatNotifySetUpCall::CreateTerminalRespL aAdditionalInfo.Length() == 0" ); } } @@ -714,7 +696,7 @@ const TDesC8& aEnvelope ) { - TFLOGSTRING("CSAT: CSatNotifySetUpCall::StoreCallConnectedEvent"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPCALL_STORECALLCONNECTEDEVENT_1, "CSAT: CSatNotifySetUpCall::StoreCallConnectedEvent"); // Store it to the buffer iCallConnectedEvent = aEnvelope; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySetUpEventList.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpEventList.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpEventList.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifySetUpEventListTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifySetUpEventList.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: CSatNotifySetUpEventList::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_NEWL_1, "CSAT: CSatNotifySetUpEventList::NewL"); CSatNotifySetUpEventList* const satNotifySetUpEventList = new ( ELeave ) CSatNotifySetUpEventList( aNotificationsTsy ); CleanupStack::PushL( satNotifySetUpEventList ); satNotifySetUpEventList->ConstructL(); CleanupStack::Pop( satNotifySetUpEventList ); - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_NEWL_2, "CSAT: CSatNotifySetUpEventList::NewL, end of method"); return satNotifySetUpEventList; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::~CSatNotifySetUpEventList"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_DTOR_1, "CSAT: CSatNotifySetUpEventList::~CSatNotifySetUpEventList"); } // ----------------------------------------------------------------------------- // CSatNotifySetUpEventList::CSatNotifySetUpEventList @@ -87,7 +92,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_CONSTRUCTL_1, "CSAT: CSatNotifySetUpEventList::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -101,7 +106,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_NOTIFY_1, "CSAT: CSatNotifySetUpEventList::Notify"); // Save data pointer to client side for completion iSetUpEventListV1Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -129,7 +134,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_CANCELNOTIFICATION_1, "CSAT: CSatNotifySetUpEventList::CancelNotification"); // Reset the request handle iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( @@ -155,7 +160,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_1, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL"); TInt ret( KErrNone ); TUint8 generalResult( RSat::KSuccess ); @@ -204,8 +209,7 @@ TUint16 eventListLength = eventListTlv.GetLength(); if ( !eventListLength ) { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::\ - CompleteNotifyL, Event list empty"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_2, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL, Event list empty"); setUpEventListV1.iType = RSat::ERemoveExistingEventList; // Remove events from TSY:s list, No events = 0 iNotificationsTsy->iSatTsy->SetUpEventList( 0 ); @@ -329,16 +333,14 @@ }// if( KErrNone == ret ) else { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CompleteNotifyL,\ - Event list missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_3, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL, Event list missing"); // Event list is missing generalResult = RSat::KErrorRequiredValuesMissing; } }// if ( KErrNone == aErrorCode ) else { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CompleteNotifyL,\ - Error occurred in LSAT"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_4, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL, Error occurred in LSAT"); // Error code received from LicenceeSimAtkTsy return ret; } @@ -346,8 +348,7 @@ } // if ( CSatTsy::ESatReqHandleUnknown != reqHandle ) else { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_5, "CSAT: CSatNotifySetUpEventList::CompleteNotifyL, Request not ongoing"); generalResult = RSat::KMeUnableToProcessCmd; } @@ -379,7 +380,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT:CSatNotifySetUpEventList::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_1, "CSAT:CSatNotifySetUpEventList::TerminalResponseL"); TInt ret( KErrNone ); TBuf<1> additionalInfo; @@ -402,8 +403,7 @@ && ( RSat::KCmdNumberNotKnown != rspV1.iGeneralResult ) && ( RSat::KErrorRequiredValuesMissing != rspV1.iGeneralResult ) ) { - TFLOGSTRING("CSAT:CSatNotifySetUpEventList::TerminalResponseL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_2, "CSAT:CSatNotifySetUpEventList::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -411,8 +411,7 @@ if ((RSat::KMeUnableToProcessCmd == rspV1.iGeneralResult) && (RSat::KMeProblem != rspV1.iInfoType)) { // it's obligatory to provide additional info and KMeProblem flag for KMeUnableToProcessCmd error code - TFLOGSTRING("CSAT:CSatNotifySetUpEventList::TerminalResponseL,\ - KMeProblem flag is not specified"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_3, "CSAT:CSatNotifySetUpEventList::TerminalResponseL, KMeProblem flag is not specified"); ret = KErrCorrupt; } @@ -426,8 +425,7 @@ } else { - TFLOGSTRING("CSAT:CSatNotifySetUpEventList::TerminalResponseL,\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_4, "CSAT:CSatNotifySetUpEventList::TerminalResponseL, Invalid Additional Info"); // Invalid additional info field ret = KErrCorrupt; } @@ -462,7 +460,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifySetUpEventList::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPEVENTLIST_CREATETERMINALRESPL_1, "CSAT: CSatNotifySetUpEventList::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; // Create General Result TLV here diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySetUpIdleModeText.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpIdleModeText.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpIdleModeText.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifySetUpIdleModeTextTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifySetUpIdleModeText.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: CSatNotifySetUpIdleModeText::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_NEWL_1, "CSAT: CSatNotifySetUpIdleModeText::NewL"); CSatNotifySetUpIdleModeText* const satNotifySetUpIdleModeText = new ( ELeave ) CSatNotifySetUpIdleModeText( aNotificationsTsy ); CleanupStack::PushL( satNotifySetUpIdleModeText ); satNotifySetUpIdleModeText->ConstructL(); CleanupStack::Pop( satNotifySetUpIdleModeText ); - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_NEWL_2, "CSAT: CSatNotifySetUpIdleModeText::NewL, end of method"); return satNotifySetUpIdleModeText; } @@ -62,8 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::\ - ~CSatNotifySetUpIdleModeText"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_DTOR_1, "CSAT: CSatNotifySetUpIdleModeText::~CSatNotifySetUpIdleModeText"); } // ----------------------------------------------------------------------------- @@ -89,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_CONSTRUCTL_1, "CSAT: CSatNotifySetUpIdleModeText::ConstructL"); } // ----------------------------------------------------------------------------- @@ -104,7 +108,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_NOTIFY_1, "CSAT: CSatNotifySetUpIdleModeText::Notify"); // Save data pointer to client side for completion iSetUpIdleModeTextV1Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -129,7 +133,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_CANCELNOTIFICATION_1, "CSAT: CSatNotifySetUpIdleModeText::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> @@ -154,7 +158,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_1, "CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); TBuf<1> additionalInfo; @@ -224,8 +228,7 @@ ( ( RSat::ERemoveExistingIdleModeText == setUpIdleModeTextV1.iType) && ( RSat::ENotSelfExplanatory==setUpIdleModeTextV1.iIconId.iQualifier)) ) { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::\ - CompleteNotifyL, Invalid Data"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_2, "CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL, Invalid Data"); additionalInfo.Zero(); additionalInfo.Append( KNoCause ); CreateTerminalRespL( pCmdNumber, RSat::KCmdDataNotUnderstood, @@ -244,8 +247,7 @@ } // End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown ) else { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL,\ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_3, "CSAT: CSatNotifySetUpIdleModeText::CompleteNotifyL, Request not ongoing"); // Request not on, returning response immediately additionalInfo.Zero(); additionalInfo.Append( KNoCause ); @@ -268,7 +270,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_1, "CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL"); TInt ret( KErrNone ); TBuf<1> additionalInfo; @@ -289,8 +291,7 @@ ( RSat::KCmdDataNotUnderstood != rspV1.iGeneralResult ) && ( RSat::KSuccessRequestedIconNotDisplayed != rspV1.iGeneralResult ) ) { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL,\ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_2, "CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -305,8 +306,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL,\ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_3, "CSAT: CSatNotifySetUpIdleModeText::TerminalResponseL, Invalid Additional Info"); // Invalid additional info field ret = KErrCorrupt; } @@ -331,7 +331,7 @@ TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifySetUpIdleModeText::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPIDLEMODETEXT_CREATETERMINALRESPL_1, "CSAT: CSatNotifySetUpIdleModeText::CreateTerminalRespL"); TTlv tlvSpecificData; // Create General Result TLV here tlvSpecificData.AddTag( KTlvResultTag ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySetUpMenu.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpMenu.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpMenu.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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 "CSatNotifySetUpMenuTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifySetUpMenu.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: CSatNotifySetUpMenu::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_NEWL_1, "CSAT: CSatNotifySetUpMenu::NewL"); CSatNotifySetUpMenu* const satNotifySetUpMenu = new ( ELeave ) CSatNotifySetUpMenu( aNotificationsTsy ); CleanupStack::PushL( satNotifySetUpMenu ); satNotifySetUpMenu->ConstructL(); CleanupStack::Pop( satNotifySetUpMenu ); - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_NEWL_2, "CSAT: CSatNotifySetUpMenu::NewL"); return satNotifySetUpMenu; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::~CSatNotifySetUpMenu"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_DTOR_1, "CSAT: CSatNotifySetUpMenu::~CSatNotifySetUpMenu"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_CONSTRUCTL_1, "CSAT: CSatNotifySetUpMenu::ConstructL"); iItemsNextIndicatorRemoved = EFalse; } @@ -104,7 +109,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_NOTIFY_1, "CSAT: CSatNotifySetUpMenu::Notify"); // Save data pointer to client side for completion iSetUpMenuV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -128,7 +133,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_CANCELNOTIFICATION_1, "CSAT: CSatNotifySetUpMenu::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> ResetTsyReqHandle( CSatTsy::ESatNotifySetUpMenuPCmdReqType ); @@ -150,7 +155,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_1, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); // Unpack parameters @@ -162,8 +167,7 @@ iNotificationsTsy->iSatReqHandleStore->ResetTsyReqHandle( CSatTsy::ESatNotifySetUpMenuPCmdReqType ); - TFLOGSTRING2("CSAT: CSatNotifySetUpMenu::CompleteNotifyL reqHandle is :%d", - reqHandle ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_2, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL reqHandle is :%d", reqHandle ); // Get ber tlv CBerTlv berTlv; @@ -221,7 +225,7 @@ TUint16 alphaIdLength = alphaIdentifier.GetLength(); - TFLOGSTRING2("CSAT: Alpha ID length:%d", alphaIdLength ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_3, "CSAT: Alpha ID length:%d", alphaIdLength ); if ( RSat::KAlphaIdMaxSize < alphaIdLength ) { @@ -239,13 +243,11 @@ // Set SAT toolikit name, send SAT SMS logging purpose iToolKitName.Copy( menu.iAlphaId.iAlphaId ); - TFLOGSTRING2("CSAT: CSatNotifySetUpMenu::CompleteNotifyL, \ - iToolKitName:%S", &iToolKitName ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_4, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, iToolKitName:%S", iToolKitName ); } else { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL,\ - Wrong length of alpha id."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_5, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Wrong length of alpha id."); } // Alpha Id status @@ -255,8 +257,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL,\ - Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_6, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Alpha ID is NULL"); menu.iAlphaId.iStatus = RSat::EAlphaIdNull; } @@ -269,8 +270,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL,\ - No Help available"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_7, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, No Help available"); // No help menu.iHelp = RSat::ENoHelpAvailable; } @@ -307,14 +307,12 @@ } else if ( KErrNotFound == retValue ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL,\ - No Icon ID"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_8, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, No Icon ID"); menu.iIconListQualifier = RSat::ENoIconId; } else { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL, \ - Wrong return value of icon identifier list."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_9, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Wrong return value of icon identifier list."); } //Items Data @@ -376,8 +374,7 @@ // Suffle through all the menu items stringLength = 0; - TFLOGSTRING2("CSAT: CSatNotifySetUpMenu::CompleteNotifyL, \ - item number:%d", i ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_10, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, item number:%d", i ); // Fill the new item newItem.iItemId = itemsData.GetShortInfo( @@ -404,14 +401,12 @@ newItem.iItemString ); } - TFLOGSTRING2("CSAT: CSatNotifySetUpMenu::CompleteNotifyL \ - newItem.iItemString:%S", &newItem.iItemString ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_11, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL newItem.iItemString:%S", newItem.iItemString ); // Adding the new menuitem if( NULL != iconIdList.Size() && ( i < iconIdList.Length() ) ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL \ - Icons on the list" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_12, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL Icons on the list" ); if( ( NULL != itemNextIndicator.Size() ) && ( i < itemNextIndicator.Length() ) ) { @@ -419,8 +414,7 @@ if ( KErrNoMemory == menu.AddItem( newItem, itemNextIndicator[i], iconIdList[i] ) ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::\ - CompleteNotifyL, Menu item length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_13, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Menu item length exceeded"); // Too many or long menu items ret = KErrCorrupt; } @@ -429,8 +423,7 @@ else if ( KErrNoMemory == menu.AddItemIcon( newItem, iconIdList[i] ) ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::\ - CompleteNotifyL, Menu item length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_14, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Menu item length exceeded"); // Too many or long menu items ret = KErrCorrupt; } @@ -445,8 +438,7 @@ if ( KErrNoMemory == menu.AddItem( newItem, itemNextIndicator[i] ) ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::\ - CompleteNotifyL, Menu item length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_15, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Menu item length exceeded"); // Too many or long menu items ret = KErrCorrupt; } @@ -457,8 +449,7 @@ TInt retAdd = menu.AddItem( newItem ); if ( KErrNoMemory == retAdd ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::\ - CompleteNotifyL, Menu item length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_16, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Menu item length exceeded"); // Too many or long menu items // If there is not enough space left in the buffer used // by the menu KErrNoMemory is returned. @@ -487,14 +478,12 @@ } // Complete to the client side - TFLOGSTRING2("CSAT: Completing CSatNotifySetUpMenu: error %d", - aErrorCode ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_17, "CSAT: Completing CSatNotifySetUpMenu: error %d",aErrorCode ); iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, ret ); } else { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CompleteNotifyL, \ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_18, "CSAT: CSatNotifySetUpMenu::CompleteNotifyL, Request not ongoing"); TBuf16<1>additionalInfo; additionalInfo.Append ( RSat::KNoSpecificMeProblem ); CreateTerminalRespL( pCmdNumber, @@ -513,7 +502,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_TERMINALRESPONSEL_1, "CSAT: CSatNotifySetUpMenu::TerminalResponseL"); TInt ret( KErrNone ); TBuf16<1> additionalInfo; @@ -552,8 +541,7 @@ if( RSat::KSuccess == rspV1.iGeneralResult && iItemsNextIndicatorRemoved ) { - TFLOGSTRING("CSatNotifySetUpMenu::TerminalResponseL, \ - iItemsNextIndicatorRemoved"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_TERMINALRESPONSEL_2, "CSatNotifySetUpMenu::TerminalResponseL, iItemsNextIndicatorRemoved"); rspV1.iGeneralResult = RSat::KPartialComprehension; } @@ -578,7 +566,7 @@ const TDesC16& aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifySetUpMenu::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSETUPMENU_CREATETERMINALRESPL_1, "CSAT: CSatNotifySetUpMenu::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; // Create General Result TLV here diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifySimSessionEnd.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifySimSessionEnd.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifySimSessionEnd.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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,11 +20,16 @@ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSatNotifySimSessionEndTraces.h" +#endif + #include "CSatTsy.h" // Main tsy class header #include "CSatNotifySimSessionEnd.h" // Class header #include "CSatNotificationsTsy.h" // Tsy class header #include "CSatDataPackage.h" // Parameter packing -#include "TfLogger.h" // For TFLOGSTRING #include "CSatTsyReqHandleStore.h" // Request handle class #include "CBerTlv.h" // Ber Tlv data handling #include "TSatUtility.h" // (U)SIM Status constants @@ -39,13 +44,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_NEWL_1, "CSAT: CSatNotifySimSessionEnd::NewL"); CSatNotifySimSessionEnd* const satNotifySimSessionEnd = new ( ELeave ) CSatNotifySimSessionEnd( aNotificationsTsy ); CleanupStack::PushL( satNotifySimSessionEnd ); satNotifySimSessionEnd->ConstructL(); CleanupStack::Pop( satNotifySimSessionEnd ); - TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_NEWL_2, "CSAT: CSatNotifySimSessionEnd::NewL, end of method"); return satNotifySimSessionEnd; } @@ -59,7 +64,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::~CSatNotifySimSessionEnd"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_DTOR_1, "CSAT: CSatNotifySimSessionEnd::~CSatNotifySimSessionEnd"); } // ----------------------------------------------------------------------------- @@ -85,7 +90,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_CONSTRUCTL_1, "CSAT: CSatNotifySimSessionEnd::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -99,7 +104,7 @@ const TDataPackage& /*aPackage*/ ) { - TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_NOTIFY_1, "CSAT: CSatNotifySimSessionEnd::Notify"); // Save the request handle iNotificationsTsy->iSatTsy->SaveReqHandle( aTsyReqHandle, CSatTsy::ESatNotifyProactiveSimSessionEndReqType ); @@ -121,7 +126,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_CANCELNOTIFICATION_1, "CSAT: CSatNotifySimSessionEnd::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = @@ -143,7 +148,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_COMPLETENOTIFYL_1, "CSAT: CSatNotifySimSessionEnd::CompleteNotifyL"); // Unpack data TUint8 sw1; @@ -159,8 +164,7 @@ // In case the request was ongoing, complete the request to the client. if ( CSatTsy::ESatReqHandleUnknown != reqHandle ) { - TFLOGSTRING("CSAT: CSatNotifySimSessionEnd::CompleteNotifyL, \ - SIM SESSION END"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSIMSESSIONEND_COMPLETENOTIFYL_2, "CSAT: CSatNotifySimSessionEnd::CompleteNotifyL, SIM SESSION END"); iNotificationsTsy->iSatTsy->ReqCompleted( reqHandle, aErrorCode ); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatNotifyTimerMgmt.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyTimerMgmt.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyTimerMgmt.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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 "CSatNotifyTimerMgmtTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyTimerMgmt.h" // 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 "cmmmessagemanagerbase.h" // Message manager class for forwarding req. #include "MSatTsy_IPCDefs.h" // Sat Tsy internal request types @@ -43,13 +48,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_NEWL_1, "CSAT: CSatNotifyTimerMgmt::NewL"); CSatNotifyTimerMgmt* const satNotifyTimerMgmt = new ( ELeave ) CSatNotifyTimerMgmt( aNotificationsTsy ); CleanupStack::PushL( satNotifyTimerMgmt ); satNotifyTimerMgmt->ConstructL(); CleanupStack::Pop( satNotifyTimerMgmt ); - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_NEWL_2, "CSAT: CSatNotifyTimerMgmt::NewL, end of method"); return satNotifyTimerMgmt; } @@ -63,7 +68,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::~CSatNotifyTimerMgmt"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_DTOR_1, "CSAT: CSatNotifyTimerMgmt::~CSatNotifyTimerMgmt"); } // ----------------------------------------------------------------------------- @@ -89,7 +94,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::ConstructL, does nothing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_CONSTRUCTL_1, "CSAT: CSatNotifyTimerMgmt::ConstructL, does nothing"); } // ----------------------------------------------------------------------------- @@ -103,7 +108,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_1, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); @@ -185,22 +190,19 @@ if ( KErrNone != ret ) { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\ - CompleteNotifyL, Unable to process cmd"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_2, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Unable to process cmd"); generalResult = RSat::KMeUnableToProcessCmd; } } else { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\ - CompleteNotifyL, Data not understood"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_3, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Data not understood"); generalResult = RSat::KCmdDataNotUnderstood; } } else { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\ - CompleteNotifyL, Timer value missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_4, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Timer value missing"); generalResult = RSat::KErrorRequiredValuesMissing; } } @@ -243,23 +245,20 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\ - CompleteNotifyL, Contradiction with timer state"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_5, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Contradiction with timer state"); generalResult = RSat::KContradictionWithTimerState; } } else { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\ - CompleteNotifyL, Cmd type not understood"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_6, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Cmd type not understood"); generalResult = RSat::KCmdTypeNotUnderstood; } } } else { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::\ - CompleteNotifyL, Required values missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_7, "CSAT: CSatNotifyTimerMgmt::CompleteNotifyL, Required values missing"); generalResult = RSat::KErrorRequiredValuesMissing; } @@ -282,7 +281,7 @@ TUint8 aGeneralResult ) { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_CREATETERMINALRESPL_1, "CSAT: CSatNotifyTimerMgmt::CreateTerminalRespL"); // Create and append response data TTlv tlvSpecificData; @@ -351,7 +350,7 @@ TPtrC8 time ) { - TFLOGSTRING("CSAT: CSatNotifyTimerMgmt::ConvertToSeconds"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYTIMERMGMT_CONVERTTOSECONDS_1, "CSAT: CSatNotifyTimerMgmt::ConvertToSeconds"); TUint32 timeValue( 0 ); // Value of a timer, expressed using // the format hour, minute, second diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CSatTsyReqHandleStore.cpp --- a/telephonyserverplugins/simatktsy/src/CSatTsyReqHandleStore.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CSatTsyReqHandleStore.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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,9 +20,14 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSatTsyReqHandleStoreTraces.h" +#endif + #include "CSatTsyReqHandleStore.h" // Class header #include "CSatTsy.h" // Main tsy class header -#include "TfLogger.h" // For TFLOGSTRING // ----------------------------------------------------------------------------- // CSatTsyReqHandleStore::NewL @@ -37,7 +42,7 @@ TTsyReqHandle* aFirstElement // Pointer to the first element ) { - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::NewL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_NEWL_1, "CSAT: CSatTsyReqHandleStore::NewL" ); CSatTsyReqHandleStore* tsyReqHandleStore = new ( ELeave ) CSatTsyReqHandleStore(); @@ -52,7 +57,7 @@ } CleanupStack::Pop( tsyReqHandleStore ); - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::NewL, end of method" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_NEWL_2, "CSAT: CSatTsyReqHandleStore::NewL, end of method" ); return tsyReqHandleStore; } @@ -67,7 +72,7 @@ // None ) { - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::~CSatTsyReqHandleStore" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_DTOR_1, "CSAT: CSatTsyReqHandleStore::~CSatTsyReqHandleStore" ); } // ----------------------------------------------------------------------------- @@ -80,7 +85,7 @@ // None ) { - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::CSatTsyReqHandleStore" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_CTOR_1, "CSAT: CSatTsyReqHandleStore::CSatTsyReqHandleStore" ); } // ----------------------------------------------------------------------------- @@ -93,7 +98,7 @@ // None ) { - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::ConstructL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_CONSTRUCTL_1, "CSAT: CSatTsyReqHandleStore::ConstructL" ); } // ----------------------------------------------------------------------------- @@ -106,7 +111,7 @@ const TInt aIndex // TSY req handle index ) { - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::TsyReqHandle" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_TSYREQHANDLE_1, "CSAT: CSatTsyReqHandleStore::TsyReqHandle" ); TTsyReqHandle ret( NULL ); // Check the bounds @@ -116,8 +121,7 @@ } else { - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::TsyReqHandle, \ - Out of bounds" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_TSYREQHANDLE_2, "CSAT: CSatTsyReqHandleStore::TsyReqHandle, Out of bounds" ); } return ret; } @@ -133,17 +137,15 @@ const TTsyReqHandle aTsyReqHandle // Request handle ) { - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_1, "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle" ); if ( ( aIndex >= 0 ) && ( aIndex < iNumOfRequests ) ) { *( iReqHandles + aIndex ) = aTsyReqHandle; - TFLOGSTRING2( "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle, %d saved", - aTsyReqHandle ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_2, "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle, %d saved", aTsyReqHandle ); } else { - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle,\ - Request handle not saved" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_3, "CSAT: CSatTsyReqHandleStore::SetTsyReqHandle, Request handle not saved" ); } } @@ -160,7 +162,7 @@ ) { - TFLOGSTRING( "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_1, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle" ); // Req handle was not used. TInt ret = 0; @@ -174,13 +176,11 @@ // Reset req handle *( iReqHandles + aIndex ) = 0; - TFLOGSTRING2( "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle, index \ - %d removed", aIndex ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_2, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle, index %d removed", aIndex ); } else { - TFLOGSTRING("CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle,\ - Not in use"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_3, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle, Not in use"); } } else @@ -188,8 +188,7 @@ // Do nothing } - TFLOGSTRING2("CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle \ - reqHandle is :%d", ret ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_4, "CSAT: CSatTsyReqHandleStore::ResetTsyReqHandle reqHandle is :%d", ret ); return ret; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/CTsyDelegates.cpp --- a/telephonyserverplugins/simatktsy/src/CTsyDelegates.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/CTsyDelegates.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,9 +16,14 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CTsyDelegatesTraces.h" +#endif + #include "ctsydelegates.h" #include "cmmmessagemanagerbase.h" -#include "tflogger.h" // ======== MEMBER FUNCTIONS ======== @@ -44,7 +49,7 @@ CBase* CTsyDelegates::GetTsyObject( CMmMessageManagerBase::TTsyObjects aObject ) { -TFLOGSTRING2("TSY: CTsyDelegates::GetTsyObject object=%d", aObject ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_GETTSYOBJECT_1, "TSY: CTsyDelegates::GetTsyObject object=%d", aObject ); CBase* object = NULL; object = iTsyObjectArray.At( aObject ); @@ -61,7 +66,7 @@ CMmMessageManagerBase::TTsyObjects aTsyObjectType, CBase* aTsyObject ) { -TFLOGSTRING3("TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%x", TInt( aTsyObjectType ), aTsyObject ); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_REGISTERTSYOBJECT_1, "TSY: CTsyDelegates::RegisterTsyObject type=%d address=0x%x", TInt( aTsyObjectType ), aTsyObject ); iTsyObjectArray[ aTsyObjectType ] = aTsyObject; } @@ -74,7 +79,7 @@ // void CTsyDelegates::DeregisterTsyObject( CBase* aTsyObject ) { -TFLOGSTRING2("TSY: CTsyDelegates::DeregisterTsyObject address=0x%x", aTsyObject ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYDELEGATES_DEREGISTERTSYOBJECT_1, "TSY: CTsyDelegates::DeregisterTsyObject address=0x%x", aTsyObject ); for( TInt i = 0; i < TInt( CMmMessageManagerBase::EMaxNumOfTsyObjects ); i++ ) diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/TSatEventList.cpp --- a/telephonyserverplugins/simatktsy/src/TSatEventList.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/TSatEventList.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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" @@ -19,8 +19,13 @@ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "TSatEventListTraces.h" +#endif + #include "TSatEventList.h" // Class header -#include "TfLogger.h" // For TFLOGSTRING // ----------------------------------------------------------------------------- // TSatEventList::TSatEventList @@ -32,7 +37,7 @@ void ) : iEvents( 0 ) { - TFLOGSTRING( "CSAT: TSatEventList::TSatEventList" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS ,TSATEVENTLIST_CTOR_1, "CSAT: TSatEventList::TSatEventList" ); } // ----------------------------------------------------------------------------- @@ -48,14 +53,12 @@ if( iEvents & TUint32( aEvent ) ) { - TFLOGSTRING2( "CSAT: TSatEventList::IsEventEnabled, \ - Event Enabled: %d", aEvent ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_ISENABLED_1, "CSAT: TSatEventList::IsEventEnabled, Event Enabled: %d", aEvent ); return ETrue; } else { - TFLOGSTRING( "CSAT: TSatEventList::IsEventEnabled, \ - Event Not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_ISENABLED_2, "CSAT: TSatEventList::IsEventEnabled, Event Not enabled" ); return EFalse; } @@ -71,7 +74,7 @@ RSat::TEventList aEvent ) { - TFLOGSTRING( "CSAT: TSatEventList::RemoveFromEventList" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_REMOVEFROMEVENTLIST_1, "CSAT: TSatEventList::RemoveFromEventList" ); iEvents &= ~TUint32( aEvent ); } @@ -85,7 +88,7 @@ RSat::TEventList aEvent ) { - TFLOGSTRING( "CSAT: TSatEventList::AddToEventList" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_ADDTOEVENTLIST_1, "CSAT: TSatEventList::AddToEventList" ); iEvents |= TUint32( aEvent ); } @@ -99,7 +102,7 @@ TUint32 aEvent ) { - TFLOGSTRING2( "CSAT: TSatEventList::SetEventList aEvent:%d", aEvent ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSATEVENTLIST_SETEVENTLIST_1, "CSAT: TSatEventList::SetEventList aEvent:%d", aEvent ); iEvents = aEvent; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/cmmmessagemanagerbase.cpp --- a/telephonyserverplugins/simatktsy/src/cmmmessagemanagerbase.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/cmmmessagemanagerbase.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -16,8 +16,13 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmmmessagemanagerbaseTraces.h" +#endif + #include "cmmmessagemanagerbase.h" -#include "tflogger.h" #include "ctsydelegates.h" #include "csatmessagerouterproxy.h" #include @@ -71,7 +76,7 @@ TInt CMmMessageManagerBase::HandleRequestL( const TInt aIpc ) { -TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); return HandleRequestL( aIpc, REINTERPRET_CAST( const CMmDataPackage*, NULL ) ); } @@ -86,7 +91,7 @@ const TInt aIpc, const CMmDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL1_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); return iMessageRouter.ExtFuncL( aIpc, aDataPackage ); } @@ -101,7 +106,7 @@ const TInt aIpc, const TDataPackage* aDataPackage ) { -TFLOGSTRING2("TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); +OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMMESSAGEMANAGERBASE_HANDLEREQUESTL2_1, "TSY: CMmMessageManagerBase::HandleRequestL. IPC = %d", aIpc ); // map the TDataPackage into a CMmDataPackage // Non-core Methods from the SOS layer using the DOS layer will perforn diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/csatcctsy.cpp --- a/telephonyserverplugins/simatktsy/src/csatcctsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/csatcctsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -21,13 +21,18 @@ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csatcctsyTraces.h" +#endif + #include "etelsat.h" // SAT specific Etel definitions #include "CSatDataPackage.h" // Parameter packing #include "CSatCCTsy.h" // Class header #include "CSatTsy.h" // SAT TSY general class #include "CSatNotificationsTsy.h" // SAT TSY Notifications class #include "cmmmessagemanagerbase.h" // Message manager class for forwarding req. -#include "TfLogger.h" // For TFLOGSTRING #include "msattsy_ipcdefs.h" // Sat Tsy specific request types #include "TSatUtility.h" // Utility class #include "TTlv.h" // TTlv class @@ -44,13 +49,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatCCTsy::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_NEWL_1, "CSAT: CSatCCTsy::NewL"); CSatCCTsy* const satCcTsy = new ( ELeave ) CSatCCTsy( aNotificationsTsy ); CleanupStack::PushL( satCcTsy ); satCcTsy->iSatTsy = aSatTsy; satCcTsy->ConstructL(); CleanupStack::Pop( satCcTsy ); - TFLOGSTRING("CSAT: CSatCCTsy::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_NEWL_2, "CSAT: CSatCCTsy::NewL, end of method"); return satCcTsy; } @@ -64,7 +69,7 @@ //None ) { - TFLOGSTRING("CSAT: CSatCCTsy::~CSatCCTsy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_DTOR_1, "CSAT: CSatCCTsy::~CSatCCTsy"); // Unregister. iSatTsy->MessageManager()->RegisterTsyObject( CMmMessageManagerBase::ESatCCTsyObjType, NULL ); @@ -80,7 +85,7 @@ //None ) { - TFLOGSTRING("CSAT: CSatCCTsy::ConstructL\n" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CONSTRUCTL_1, "CSAT: CSatCCTsy::ConstructL\n" ); // Register. iSatTsy->MessageManager()->RegisterTsyObject( CMmMessageManagerBase::ESatCCTsyObjType, this ); @@ -117,7 +122,7 @@ TInt /*aResult*/ ) { - TFLOGSTRING("CSAT: CSatCCTsy::CompleteBearerCapability"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_COMPLETEBEARERCAPABILITY_1, "CSAT: CSatCCTsy::CompleteBearerCapability"); TPtrC8* bearerData = NULL; // Unpack parameters @@ -134,7 +139,7 @@ CSatDataPackage* aDataPackage ) { - TFLOGSTRING("CSAT: CSatCCTsy::CreateEnvelope"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATEENVELOPEL_1, "CSAT: CSatCCTsy::CreateEnvelope"); TCCInfo* ccInfo; // Unpack parameters @@ -159,8 +164,7 @@ } default: { - TFLOGSTRING2("CSAT: CSatCCTsy::CreateEnvelope,\ - Unidentified tag: %d", ccInfo->iTag ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATEENVELOPEL_2, "CSAT: CSatCCTsy::CreateEnvelope, Unidentified tag: %d", ccInfo->iTag ); } } } @@ -175,7 +179,7 @@ CSatDataPackage* aDataPackage ) { - TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_1, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent"); TDesC8* atkData; RSat::TControlResult* result; @@ -267,8 +271,7 @@ // can be made. if ( 0 != alphaIdLength ) { - TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent.\ - inform user."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_2, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent. inform user."); TPtrC8 sourceString; sourceString.Set( ( *atkData ).Mid( index + @@ -283,8 +286,7 @@ } else { - TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent.\ - AlphaID length: 0."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_3, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent. AlphaID length: 0."); } // Update index @@ -293,8 +295,7 @@ } default: { - TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent\ - Unknown tag."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_4, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent Unknown tag."); index = envLength; break; } @@ -304,8 +305,7 @@ } else { - TFLOGSTRING("CSAT: CSatCCTsy::CheckIfAlphaIdPresent. \ - Input data missing!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CHECKIFALPHAIDPRESENT_5, "CSAT: CSatCCTsy::CheckIfAlphaIdPresent. Input data missing!"); } } @@ -320,7 +320,7 @@ CSatDataPackage* aDataPackage ) { - TFLOGSTRING2("CSAT: CSatCCTsy::CompleteCCEventL, aIpc: %d", aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_COMPLETECCEVENTL_1, "CSAT: CSatCCTsy::CompleteCCEventL, aIpc: %d", aIpc); TCCInfo* ccInfo; // Unpack parameters @@ -387,7 +387,7 @@ } default: { - TFLOGSTRING("CSAT: CSatCCTsy::CompleteCCEventL, Unknown event!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_COMPLETECCEVENTL_2, "CSAT: CSatCCTsy::CompleteCCEventL, Unknown event!"); } } } @@ -404,7 +404,7 @@ const TUint8 aTonNpi ) { - TFLOGSTRING("CSAT: CSatCCTsy::SetTonNpiForSS"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_SETTONNPIFORSS_1, "CSAT: CSatCCTsy::SetTonNpiForSS"); iTonNpiForSS = aTonNpi; iTonNpiPresent = ETrue; } @@ -419,7 +419,7 @@ CSatDataPackage* aDataPackage ) { - TFLOGSTRING("CSAT: CSatCCTsy::SetUssdStatus." ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_SETUSSDSTATUS_1, "CSAT: CSatCCTsy::SetUssdStatus." ); // Unpack parameters aDataPackage->UnPackData( iUssdTlvSupported ); } @@ -436,12 +436,12 @@ const TDesC8& aAddress ) { - TFLOGSTRING("CSAT: CSatCCTsy::StoreAddressForCC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_STOREADDRESSFORCC_1, "CSAT: CSatCCTsy::StoreAddressForCC"); if ( NULL == &aAddress ) { iProactiveCommandAddress.Zero(); - TFLOGSTRING("CSAT: CSatCCTsy::StoreAddressForCC, address cleared"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_STOREADDRESSFORCC_2, "CSAT: CSatCCTsy::StoreAddressForCC, address cleared"); } else { @@ -456,7 +456,7 @@ iProactiveCommandAddress.Delete( 0, 1 ); } } - TFLOGSTRING("CSAT: CSatCCTsy::StoreAddressForCC, Address stored"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_STOREADDRESSFORCC_3, "CSAT: CSatCCTsy::StoreAddressForCC, Address stored"); } } @@ -470,7 +470,7 @@ const TCCInfo* aCCInfo ) { - TFLOGSTRING("CSAT: CSatCCTsy::CreateCallEnvelopeL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATECALLENVELOPEL_1, "CSAT: CSatCCTsy::CreateCallEnvelopeL" ); // Create envelope TTlv envelope; envelope.Begin( KBerTlvCallControlTag ); @@ -527,8 +527,7 @@ } else { - TFLOGSTRING("CSAT: CSatCCTsy::CreateCallEnvelopeL,\ - Bearer data length exceeded, data not added" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATECALLENVELOPEL_2, "CSAT: CSatCCTsy::CreateCallEnvelopeL, Bearer data length exceeded, data not added" ); } } @@ -562,7 +561,7 @@ const TCCInfo* aCCInfo ) { - TFLOGSTRING("CSAT: CSatCCTsy::CreateSSEnvelopeL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATESSENVELOPEL_1, "CSAT: CSatCCTsy::CreateSSEnvelopeL" ); // There is no TON and NPI in SS cc request. Information is part of the // number string: Spec ETSI TS 122 030 v5.0.0 says that if number starts // with +, TON is international and if it starts without it, it's unknown. @@ -694,7 +693,7 @@ const TCCInfo* aCCInfo ) { - TFLOGSTRING("CSAT: CSatCCTsy::CreateUSSDEnvelopeL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_CREATEUSSDENVELOPEL_1, "CSAT: CSatCCTsy::CreateUSSDEnvelopeL" ); // Create USSD envelope TTlv envelope; @@ -773,7 +772,7 @@ const TDesC8& aUSSDString ) { - TFLOGSTRING("CSAT: CSatCCTsy::IsOnlyDigitsInUssd." ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_ISONLYDIGITSINUSSD_1, "CSAT: CSatCCTsy::IsOnlyDigitsInUssd." ); // Unpack it TBuf8 ussdString; TSatUtility::Packed7to8Unpacked( aUSSDString, ussdString ); @@ -804,7 +803,7 @@ const TDesC8& aAddress ) { - TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_1, "CSAT: CSatCCTsy::HasProactiveOrigin"); TBool match( EFalse ); if ( aAddress.Length() ) @@ -815,21 +814,20 @@ // It means we need to drop the first character out from comparison if ( iProactiveCommandAddress == aAddress.Mid( 1 ) ) { - TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin, Match!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_2, "CSAT: CSatCCTsy::HasProactiveOrigin, Match!"); match = ETrue; } } // Otherwise we can use the whole string for checking else if ( iProactiveCommandAddress == aAddress ) { - TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin, Match!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_3, "CSAT: CSatCCTsy::HasProactiveOrigin, Match!"); match = ETrue; } } else { - TFLOGSTRING("CSAT: CSatCCTsy::HasProactiveOrigin, \ - Invalid input address"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATCCTSY_HASPROACTIVEORIGIN_4, "CSAT: CSatCCTsy::HasProactiveOrigin, Invalid input address"); } return match; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/csatdatadownloadtsy.cpp --- a/telephonyserverplugins/simatktsy/src/csatdatadownloadtsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/csatdatadownloadtsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -19,6 +19,12 @@ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csatdatadownloadtsyTraces.h" +#endif + #include // Etel SAT IPC definitions #include // Etel MM Definitions #include "CSatDataPackage.h" // Parameter packing @@ -26,7 +32,6 @@ #include "CSatTsy.h" // Sat Tsy class #include "TSatUtility.h" // Utilities #include "cmmmessagemanagerbase.h" // Message manager class for forwarding req. -#include "TfLogger.h" // For TFLOGSTRING #include "CBerTlv.h" // Ber Tlv #include "TTlv.h" // TTlv class #include "MSatTsy_IPCDefs.h" // Sat Tsy internal request types @@ -41,14 +46,14 @@ CSatTsy* aSatTsy ) { - TFLOGSTRING( "CSAT: CSatDataDownloadTsy::NewL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_NEWL_1, "CSAT: CSatDataDownloadTsy::NewL" ); CSatDataDownloadTsy* const satDataDownloadTsy = new ( ELeave ) CSatDataDownloadTsy(); CleanupStack::PushL( satDataDownloadTsy ); satDataDownloadTsy->iSatTsy = aSatTsy; satDataDownloadTsy->ConstructL(); CleanupStack::Pop( satDataDownloadTsy ); - TFLOGSTRING( "CSAT: CSatDataDownloadTsy::NewL, end of method" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_NEWL_2, "CSAT: CSatDataDownloadTsy::NewL, end of method" ); return satDataDownloadTsy; } @@ -62,7 +67,7 @@ void ) { - TFLOGSTRING( "CSAT: CSatDataDownloadTsy::~CSatDataDownloadTsy" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_DTOR_1, "CSAT: CSatDataDownloadTsy::~CSatDataDownloadTsy" ); // Unregister iSatTsy->MessageManager()->RegisterTsyObject( CMmMessageManagerBase::ESatDataDownloadTsyObjType, NULL ); @@ -91,7 +96,7 @@ void ) { - TFLOGSTRING( "CSAT: CSatDataDownloadTsy::ConstructL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CONSTRUCTL_1, "CSAT: CSatDataDownloadTsy::ConstructL" ); // Register iSatTsy->MessageManager()->RegisterTsyObject( CMmMessageManagerBase::ESatDataDownloadTsyObjType, this ); @@ -110,7 +115,7 @@ const CSatDataPackage* aDataPackage ) { - TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CompleteCellBroadcastDdlL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_COMPLETECELLBROADCASTDDLL_1, "CSAT:CSatDataDownloadTsy::CompleteCellBroadcastDdlL" ); TBuf8 aPdu; aDataPackage->UnPackData( aPdu ); @@ -152,7 +157,7 @@ const CSatDataPackage* aDataPackage ) { - TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CompleteSmsPpDdlL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_COMPLETESMSPPDDLL_1, "CSAT:CSatDataDownloadTsy::CompleteSmsPpDdlL" ); TBuf8 smsScAddress; TBuf8 smsTpdu; @@ -172,8 +177,7 @@ KSmsTpduProtcolIdUSimDdl == iSmsTpdu.iProtocolId && ( !( iSmsTpdu.iDcs & 0x01 ) ) && ( iSmsTpdu.iDcs & 0x02 ) ) { - TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CompleteSmsPpDdlL,\ - SMS PP DDL is not supported, Store SMS to EFsms" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_COMPLETESMSPPDDLL_2, "CSAT:CSatDataDownloadTsy::CompleteSmsPpDdlL, SMS PP DDL is not supported, Store SMS to EFsms" ); CreateEntryForSavingSmsL( smsScAddress, smsTpdu ); } } @@ -191,8 +195,7 @@ const TDesC8& aSmsTpdu ) { - TFLOGSTRING2( "CSAT:CSatDataDownloadTsy::CreateEntryForSavingSms\ - SC Addr. length: %d", aSmsScAddress.Length() ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATEENTRYFORSAVINGSMSL_1, "CSAT:CSatDataDownloadTsy::CreateEntryForSavingSms SC Addr. length: %d", aSmsScAddress.Length() ); TInt offset = 0; // Check that the SC address length contains the length in @@ -228,8 +231,7 @@ // Copy the Service Centre address and TPDU data smsEntry.iServiceCentre.iTelNumber.Copy( scAddress16 ); - TFLOGSTRING2("CSAT:CSatDataDownloadTsy::CreateEntryForSavingSms,\ - iTelNumber: %S", &smsEntry.iServiceCentre.iTelNumber ); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATEENTRYFORSAVINGSMSL_2, "CSAT:CSatDataDownloadTsy::CreateEntryForSavingSms, iTelNumber: %S", smsEntry.iServiceCentre.iTelNumber ); smsEntry.iMsgData.Copy( aSmsTpdu ); @@ -260,7 +262,7 @@ TInt aResult ) { - TFLOGSTRING("CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_1, "CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL"); TBuf8 reportData; // Get User Data length @@ -269,8 +271,7 @@ // Check that SMS TPDU data exists by checking the last mandatory item if ( KSmsTpduByteUnknownOrReserved != iSmsTpdu.iDcs ) { - TFLOGSTRING("CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL,\ - SMS TPDU OK"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_2, "CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL, SMS TPDU OK"); reportData.Zero(); reportData.Append( iSmsTpdu.iParameters ); // 1st byte -> parameters reportData.Append( KAllOptParamsPresent ); // TP-Parameter-Indicator @@ -289,8 +290,7 @@ // Cause must be inserted after the parameters if ( KErrNone != aResult ) { - TFLOGSTRING("CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL,\ - Add TP Failure Cause: KDataDownloadError"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_3, "CSAT: CSatDataDownloadTsy::CreateSmsDeliverReportL, Add TP Failure Cause: KDataDownloadError"); TBuf8<1> failureCause; failureCause.Zero(); failureCause.Append( KDataDownloadError ); @@ -319,12 +319,11 @@ const TDesC8& aSmsTpdu ) { - TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CreateSmsPpDdlEnvelopeL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSPPDDLENVELOPEL_1, "CSAT:CSatDataDownloadTsy::CreateSmsPpDdlEnvelopeL" ); // Check that the data exists if ( aSmsScAddress.Length() && aSmsTpdu.Length() ) { - TFLOGSTRING( "CSAT:CSatDataDownloadTsy::CreateSmsPpDdlEnvelopeL,\ - Data Ok" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_CREATESMSPPDDLENVELOPEL_2, "CSAT:CSatDataDownloadTsy::CreateSmsPpDdlEnvelopeL, Data Ok" ); TTlv envelope; envelope.Begin( KBerTlvSmsPpDownloadTag ); @@ -357,7 +356,7 @@ void ) { - TFLOGSTRING( "CSAT: CSatDataDownloadTsy::CompleteReadCbmids" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_COMPLETEREADCBMIDSL_1, "CSAT: CSatDataDownloadTsy::CompleteReadCbmids" ); // Convert constants and append to simFilePath TBuf8 simFilePath; // Append data @@ -390,8 +389,7 @@ ) { aDataPackage->UnPackData( iIsSmsPpDdlSupported ); - TFLOGSTRING2("CSAT: CSatNotifyMoSmControlRequest::SetActivationStatus, %d", - iIsSmsPpDdlSupported ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_SETSMSPPDDLSTATUS_1, "CSAT: CSatNotifyMoSmControlRequest::SetActivationStatus, %d",iIsSmsPpDdlSupported ); } // ----------------------------------------------------------------------------- @@ -404,7 +402,7 @@ const TDesC8& aSmsTpdu ) { - TFLOGSTRING("CSAT: CSatDataDownloadTsy::ParseSmsTpdu"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_PARSESMSTPDU_1, "CSAT: CSatDataDownloadTsy::ParseSmsTpdu"); TInt ret( KErrCorrupt ); // Initialize values @@ -439,8 +437,7 @@ // Just to be on the safe side, check that the offset is not too big if ( aSmsTpdu.Length() > ( offset + 1 + KSmsTpduSctsLength ) ) { - TFLOGSTRING( "CSAT:CSatDataDownloadTsy::ParseSmsTpdu,\ - SmsTpdu length Ok" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_PARSESMSTPDU_2, "CSAT:CSatDataDownloadTsy::ParseSmsTpdu, SmsTpdu length Ok" ); // Set protocol id and data coding shceme iSmsTpdu.iProtocolId = aSmsTpdu[offset]; iSmsTpdu.iDcs = aSmsTpdu[++offset] ; @@ -453,8 +450,7 @@ if ( tpduUserDataLength ) { iSmsTpdu.iUserData.Copy( aSmsTpdu.Mid( ++offset ) ); - TFLOGSTRING2( "CSAT:CSatDataDownloadTsy::ParseSmsTpdu,\ - iUserData length: %d", iSmsTpdu.iUserData.Length() ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATDATADOWNLOADTSY_PARSESMSTPDU_3, "CSAT:CSatDataDownloadTsy::ParseSmsTpdu, iUserData length: %d", iSmsTpdu.iUserData.Length() ); } ret = KErrNone; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/csateventdownloadtsy.cpp --- a/telephonyserverplugins/simatktsy/src/csateventdownloadtsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/csateventdownloadtsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -19,12 +19,17 @@ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csateventdownloadtsyTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatDataPackage.h" // Parameter packing #include "CSatEventDownloadTsy.h" // Class header #include "CSatTsy.h" // Sat Tsy class #include "cmmmessagemanagerbase.h" // Message manager class for forwarding req. -#include "TfLogger.h" // For TFLOGSTRING #include "CBerTlv.h" // Ber Tlv #include "TTlv.h" // TTlv class #include "MSatTsy_IPCDefs.h" // Sat Tsy internal request types @@ -40,14 +45,14 @@ CSatTsy* aSatTsy ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::NewL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_NEWL_1, "CSAT: CSatEventDownloadTsy::NewL" ); CSatEventDownloadTsy* const satEventDownloadTsy = new ( ELeave ) CSatEventDownloadTsy(); CleanupStack::PushL( satEventDownloadTsy ); satEventDownloadTsy->iSatTsy = aSatTsy; satEventDownloadTsy->ConstructL(); CleanupStack::Pop( satEventDownloadTsy ); - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::NewL, end of method" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_NEWL_2, "CSAT: CSatEventDownloadTsy::NewL, end of method" ); return satEventDownloadTsy; } @@ -61,7 +66,7 @@ void ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::~CSatEventDownloadTsy" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_DTOR_1, "CSAT: CSatEventDownloadTsy::~CSatEventDownloadTsy" ); // Unregister. iSatTsy->MessageManager()->RegisterTsyObject( CMmMessageManagerBase::ESatEventDownloadTsyObjType, NULL ); @@ -77,7 +82,7 @@ void ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CSatEventDownloadTsy" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CTOR_1, "CSAT: CSatEventDownloadTsy::CSatEventDownloadTsy" ); } // ----------------------------------------------------------------------------- @@ -90,7 +95,7 @@ void ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::ConstructL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CONSTRUCTL_1, "CSAT: CSatEventDownloadTsy::ConstructL" ); // Register . iSatTsy->MessageManager()->RegisterTsyObject( CMmMessageManagerBase::ESatEventDownloadTsyObjType, this ); @@ -110,8 +115,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::DoExtFuncL\ - . Handle:%d", aTsyReqHandle ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_DOEXTFUNCL_1, "CSAT: CSatEventDownloadTsy::DoExtFuncL. Handle:%d", aTsyReqHandle ); TInt ret ( KErrNotSupported ); @@ -182,7 +186,7 @@ default: { ret = KErrNotSupported; - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::DoExtFuncL, not supported" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_DOEXTFUNCL_2, "CSAT: CSatEventDownloadTsy::DoExtFuncL, not supported" ); break; } } // End switch @@ -205,7 +209,7 @@ TUint32 aEvents // Bit mask of enabled events ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::SetUpEventList" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_SETUPEVENTLIST_1, "CSAT: CSatEventDownloadTsy::SetUpEventList" ); iEventList.SetEventList( aEvents ); // Force sending of envelope at least once, if location status event set @@ -230,7 +234,7 @@ const TBool aStatus // SetUpCall status ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::SetSetUpCallStatus" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_SETSETUPCALLSTATUS_1, "CSAT: CSatEventDownloadTsy::SetSetUpCallStatus" ); iSetUpCallOngoing = aStatus; } @@ -246,7 +250,7 @@ const TTsyReqHandle /*aTsyReqHandle*/ ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CancelService" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CANCELSERVICE_1, "CSAT: CSatEventDownloadTsy::CancelService" ); // Since event download is served at once, there's anything to do here return KErrNone; } @@ -262,7 +266,7 @@ const CSatDataPackage* aDataPackage ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_1, "CSAT: CSatEventDownloadTsy::CompleteMTCallL" ); TInt ret( KErrNone ); if ( iEventList.IsEnabled( RSat::KMTCall ) ) @@ -304,14 +308,12 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL,\ - Dialling number missing" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_2, "CSAT: CSatEventDownloadTsy::CompleteMTCallL, Dialling number missing" ); } } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL,\ - TON and NPI missing" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_3, "CSAT: CSatEventDownloadTsy::CompleteMTCallL, TON and NPI missing" ); } // If subaddress present @@ -323,8 +325,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL,\ - Subaddress missing" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_4, "CSAT: CSatEventDownloadTsy::CompleteMTCallL, Subaddress missing" ); } // Prepare data @@ -338,8 +339,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteMTCallL\ - Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_5, "CSAT: CSatEventDownloadTsy::CompleteMTCallL Event not enabled" ); } return ret; @@ -355,7 +355,7 @@ const CSatDataPackage* aDataPackage ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_1, "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL" ); TInt ret = KErrNone; if ( iEventList.IsEnabled( RSat::KCallConnected ) ) @@ -364,8 +364,7 @@ TBool nearEnd; aDataPackage->UnPackData( cmdNumber, nearEnd ); - TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL \ - ( cmdNumber=%d )", ( TInt )cmdNumber ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_2, "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL ( cmdNumber=%d )", ( TInt )cmdNumber ); // Create envelope TTlv envelope; @@ -402,8 +401,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL,\ - Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_3, "CSAT: CSatEventDownloadTsy::CompleteCallConnectedL, Event not enabled" ); } return ret; } @@ -418,7 +416,7 @@ const CSatDataPackage* aDataPackage ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_1, "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL" ); TInt ret = KErrNone; if ( iEventList.IsEnabled( RSat::KCallDisconnected ) ) @@ -431,8 +429,7 @@ TBool nearEnd = callDisconnectedEnvelope->iNearEnd; TBool causeGiven = callDisconnectedEnvelope->iCauseGiven; const TDesC8& cause = callDisconnectedEnvelope->iCause; - TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL \ - ( cmdNumber=%d )", ( TInt )cmdNumber ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_2, "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL ( cmdNumber=%d )", ( TInt )cmdNumber ); // Create envelope TTlv envelope; envelope.Begin ( KBerTlvEventDownloadTag ); @@ -454,8 +451,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\ - CompleteCallDisconnectedL, cause not given" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_3, "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL, cause not given" ); } // Prepare data TPtrC8 data = envelope.End(); @@ -468,8 +464,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL,\ - Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_4, "CSAT: CSatEventDownloadTsy::CompleteCallDisconnectedL, Event not enabled" ); } return ret; } @@ -485,7 +480,7 @@ const CSatDataPackage* aDataPackage ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CompleteLocationStatusL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_1, "CSAT: CSatEventDownloadTsy::CompleteLocationStatusL" ); TInt ret( KErrNone ); if ( iEventList.IsEnabled( RSat::KLocationStatus ) ) @@ -500,8 +495,7 @@ TUint16 locationAreaCode = locationStatusEnvelope->iLocationAreaCode; TUint16 cellId = locationStatusEnvelope->iCellId; - TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::CompleteLocationStatusL \ - ( locationStatus=%d )", ( TInt )locationStatus ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_2, "CSAT: CSatEventDownloadTsy::CompleteLocationStatusL ( locationStatus=%d )", ( TInt )locationStatus ); // Send location status envelope only if there // have been changes or we're sending first @@ -512,8 +506,7 @@ ( iCellId != cellId ) || iForceLocationStatusEnvelope ) { - TFLOGSTRING( "CSAT: CSatEventDownload::\ - CompleteLocationStatusEnvelopeL, -- saving" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_3, "CSAT: CSatEventDownload::CompleteLocationStatusEnvelopeL, -- saving" ); // Cache values iLocationStatus = locationStatus; @@ -539,8 +532,7 @@ // normal service if ( KLocationStatusNormalService == locationStatus ) { - TFLOGSTRING( "CSAT: CSatEventDownload::CompleteLocationStatusEnvelopeL\ - -- sending" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_4, "CSAT: CSatEventDownload::CompleteLocationStatusEnvelopeL -- sending" ); envelope.AddTag ( KTlvLocationInformationTag ); envelope.AddData( operatorCode ); // Mobile country & network codes @@ -573,8 +565,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\ - CompleteLocationStatusEnvelopeL, Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_5, "CSAT: CSatEventDownloadTsy::CompleteLocationStatusEnvelopeL, Event not enabled" ); } return ret; @@ -590,8 +581,7 @@ const CSatDataPackage* aDataPackage ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\ - CompleteAccessTechnologyChangeEnvelopeL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEACCESSTECHNOLOGYCHANGEL_1, "CSAT: CSatEventDownloadTsy::CompleteAccessTechnologyChangeEnvelopeL" ); TInt ret( KErrNone ); if ( iEventList.IsEnabled( RSat::KAccessTechnologyChange ) ) @@ -626,8 +616,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\ - CompleteAccessTechnologyChangeL, Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_COMPLETEACCESSTECHNOLOGYCHANGEL_2, "CSAT: CSatEventDownloadTsy::CompleteAccessTechnologyChangeL, Event not enabled" ); } return ret; @@ -642,7 +631,7 @@ // None ) { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CreateUserActivityEnvelopeL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEUSERACTIVITYENVELOPEL_1, "CSAT: CSatEventDownloadTsy::CreateUserActivityEnvelopeL" ); TInt ret = KErrNone; if ( iEventList.IsEnabled( RSat::KUserActivity ) ) { @@ -670,8 +659,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CreateUserActivityEnvelopeL,\ - Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEUSERACTIVITYENVELOPEL_2, "CSAT: CSatEventDownloadTsy::CreateUserActivityEnvelopeL, Event not enabled" ); } return ret; } @@ -686,8 +674,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatEventDownloadTsy::\ - CreateIdleScreenAvailableEnvelopeL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_1, "CSAT: CSatEventDownloadTsy::CreateIdleScreenAvailableEnvelopeL"); TInt ret = KErrNone; if ( iEventList.IsEnabled( RSat::KIdleScreenAvailable ) ) @@ -718,14 +705,12 @@ } else { - TFLOGSTRING("CSAT: CSatEventDownloadTsy::\ - CreateIdleScreenAvailableEnvelopeL, Error in forwarding req."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_2, "CSAT: CSatEventDownloadTsy::CreateIdleScreenAvailableEnvelopeL, Error in forwarding req."); } } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\ - CreateIdleScreenAvailableEnvelopeL, Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_3, "CSAT: CSatEventDownloadTsy::CreateIdleScreenAvailableEnvelopeL, Event not enabled" ); } return ret; } @@ -740,8 +725,7 @@ const RSat::TBrowserTerminationCause aCause ) { - TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::\ - CreateBrowserTerminationEnvelopeL, ( cause=%d )",( TInt )aCause ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEBROWSERTERMINATIONENVELOPEL_1, "CSAT: CSatEventDownloadTsy::CreateBrowserTerminationEnvelopeL, ( cause=%d )",( TInt )aCause ); TInt ret = KErrNone; @@ -773,8 +757,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\ - CreateBrowserTerminationEnvelopeL, Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEBROWSERTERMINATIONENVELOPEL_2, "CSAT: CSatEventDownloadTsy::CreateBrowserTerminationEnvelopeL, Event not enabled" ); } return ret; @@ -791,8 +774,7 @@ const TUint16 aLanguage ) { - TFLOGSTRING2( "CSAT: CSatEventDownloadTsy::\ - CreateLanguageSelectionEnvelopeL, (language=%d)", ( TInt )aLanguage ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATELANGUAGESELECTIONENVELOPEL_1, "CSAT: CSatEventDownloadTsy::CreateLanguageSelectionEnvelopeL, (language=%d)", ( TInt )aLanguage ); TInt ret = KErrNone; @@ -824,8 +806,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::\ - CreateLanguageSelectionEnvelopeL, Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATELANGUAGESELECTIONENVELOPEL_2, "CSAT: CSatEventDownloadTsy::CreateLanguageSelectionEnvelopeL, Event not enabled" ); } return ret; } @@ -841,7 +822,7 @@ const TInt8 aLength ) { - TFLOGSTRING("CSAT: CSatEventDownload::CreateDataAvailableEnvelopeL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEDATAAVAILABLEENVELOPEL_1, "CSAT: CSatEventDownload::CreateDataAvailableEnvelopeL"); TInt ret = KErrNone; @@ -874,8 +855,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CreateDataAvailableEnvelopeL\ - Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATEDATAAVAILABLEENVELOPEL_2, "CSAT: CSatEventDownloadTsy::CreateDataAvailableEnvelopeL Event not enabled" ); } return ret; } @@ -890,7 +870,7 @@ const RSat::TChannelStatus aStatus ) { - TFLOGSTRING("CSAT: CSatEventDownloadTsy::CreateChannelStatusEnvelopeL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATECHANNELSTATUSENVELOPEL_1, "CSAT: CSatEventDownloadTsy::CreateChannelStatusEnvelopeL"); TInt ret( KErrNone ); @@ -920,8 +900,7 @@ } else { - TFLOGSTRING( "CSAT: CSatEventDownloadTsy::CreateChannelStatusEnvelopeL\ - Event not enabled" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATEVENTDOWNLOADTSY_CREATECHANNELSTATUSENVELOPEL_2, "CSAT: CSatEventDownloadTsy::CreateChannelStatusEnvelopeL Event not enabled" ); } return ret; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/csaticontsy.cpp --- a/telephonyserverplugins/simatktsy/src/csaticontsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/csaticontsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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,10 +20,15 @@ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csaticontsyTraces.h" +#endif + #include // ETel Ipcs #include "cmmmessagemanagerbase.h" // Message manager class for forwarding req. //#include // For icon color coding -#include "TfLogger.h" // For TFLOGSTRING #include "CSatDataPackage.h" // Parameter packing #include "CSatIconTsy.h" // Class header @@ -43,13 +48,13 @@ CSatTsy* aSatTsy ) { - TFLOGSTRING("CSAT: CSatIconTsy::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_NEWL_1, "CSAT: CSatIconTsy::NewL"); CSatIconTsy* const satIconTsy = new ( ELeave ) CSatIconTsy(); CleanupStack::PushL( satIconTsy ); satIconTsy->iSatTsy = aSatTsy; satIconTsy->ConstructL(); CleanupStack::Pop( satIconTsy ); - TFLOGSTRING("CSAT: CSatIconTsy::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_NEWL_2, "CSAT: CSatIconTsy::NewL, end of method"); return satIconTsy; } @@ -64,7 +69,7 @@ void ) { - TFLOGSTRING("CSAT: CSatIconTsy::~CSatIconTsy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_DTOR_1, "CSAT: CSatIconTsy::~CSatIconTsy"); // Unregister. iSatTsy->MessageManager()->RegisterTsyObject( CMmMessageManagerBase::ESatIconTsyObjType, NULL ); @@ -80,7 +85,7 @@ void ) { - TFLOGSTRING("CSAT: CSatIconTsy::ConstructL\n" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_CONSTRUCTL_1, "CSAT: CSatIconTsy::ConstructL\n" ); iIconReqTypeOngoing = ERequestTypeUnknown; // Register. iSatTsy->MessageManager()->RegisterTsyObject( @@ -117,8 +122,7 @@ ) { - TFLOGSTRING3("CSAT: CSatIconTsy::DoExtFuncL.\n \t\t\t IPC:%d\n \ - \t\t\t Handle:%d", aIpc, aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_DOEXTFUNCL_1, "CSAT: CSatIconTsy::DoExtFuncL.\n \t\t\t IPC:%d\n \t\t\t Handle:%d", aIpc, aTsyReqHandle); TInt ret( KErrNone ); @@ -149,8 +153,7 @@ } default: { - TFLOGSTRING2("CSAT: CSatIconTsy::DoExtFuncL unsupported IPC %d", - aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_DOEXTFUNCL_2, "CSAT: CSatIconTsy::DoExtFuncL unsupported IPC %d",aIpc); break; } } @@ -170,7 +173,7 @@ TInt aResult ) { - TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetIcon"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_1, "CSAT: CSatIconTsy::CompleteGetIcon"); TPtrC8* icon = NULL; TInt iconLength = 0; @@ -187,28 +190,24 @@ { if ( KErrNone == aResult && iconLength ) { - TFLOGSTRING2("CSAT: CSatIconTsy::CompleteGetIcon,\ - Icon data length: %d", iconLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_2, "CSAT: CSatIconTsy::CompleteGetIcon, Icon data length: %d", iconLength); // Check the size... if ( iIconData->MaxLength() >= iconLength ) { iIconData->Copy( icon->Ptr(), iconLength ); - TFLOGSTRING2("CSAT: CSatIconTsy::CompleteGetIcon,\ - iIconData length: %d", iIconData->Length() ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_3, "CSAT: CSatIconTsy::CompleteGetIcon, iIconData length: %d", iIconData->Length() ); iRecordData.Copy( *iIconData ); } else // Data is too big for client's buffer { - TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetIcon,\ - Icon data length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_4, "CSAT: CSatIconTsy::CompleteGetIcon, Icon data length exceeded"); aResult = KErrOverflow; iIconData->Zero(); } } else { - TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetIcon,\ - Error occured in LSAT, or Icon length is 0"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETICON_5, "CSAT: CSatIconTsy::CompleteGetIcon, Error occured in LSAT, or Icon length is 0"); // Reset the length iIconData->Zero(); } @@ -229,7 +228,7 @@ TInt aResult ) { - TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetImageInstance"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_1, "CSAT: CSatIconTsy::CompleteGetImageInstance"); TPtrC8* icon = NULL; TDes8* info; @@ -250,8 +249,7 @@ // Check the size.... if ( iIconData->MaxLength() >= iconLength ) { - TFLOGSTRING2("CSAT: CSatIconTsy::CompleteGetImageInstance,\ - Icon length: %d", iconLength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_2, "CSAT: CSatIconTsy::CompleteGetImageInstance, Icon length: %d", iconLength); // Icon body if( info->Length() == KIconInfoLength ) { @@ -262,8 +260,7 @@ // between the color and b&w icons if ( RSat::KBasic == colorCoding ) { - TFLOGSTRING("CSAT: CSatIconTsy::\ - CompleteGetImageInstance,B&W"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_3, "CSAT: CSatIconTsy::CompleteGetImageInstance,B&W"); iIconData->Copy( ( *info ).Mid( 0, 2) ); } else @@ -281,16 +278,14 @@ } else // Data is too big for client's buffer { - TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetImageInstance,\ - Icon length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_4, "CSAT: CSatIconTsy::CompleteGetImageInstance, Icon length exceeded"); aResult = KErrOverflow; iIconData->Zero(); } } else { - TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetImageInstance,\ - Error occured in LSAT or Icon length is 0"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETIMAGEINSTANCE_5, "CSAT: CSatIconTsy::CompleteGetImageInstance, Error occured in LSAT or Icon length is 0"); // Reset the length iIconData->Zero(); } @@ -313,7 +308,7 @@ TInt aResult ) { - TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetClut"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETCLUT_1, "CSAT: CSatIconTsy::CompleteGetClut"); TPtrC8* clut = NULL; // Unpack parameters @@ -335,16 +330,14 @@ } else // Data is too big for client's buffer { - TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetClut,\ - Clut length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETCLUT_2, "CSAT: CSatIconTsy::CompleteGetClut, Clut length exceeded"); aResult = KErrOverflow; iIconData->Zero(); } } else { - TFLOGSTRING("CSAT: CSatIconTsy::CompleteGetClut,\ - Error occured in LSAT or Icon length is 0"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_COMPLETEGETCLUT_3, "CSAT: CSatIconTsy::CompleteGetClut, Error occured in LSAT or Icon length is 0"); // Reset the length iIconData->Zero(); } @@ -369,7 +362,7 @@ RSat::TIcon* aIconEf ) { - TFLOGSTRING("CSAT: CSatIconTsy::GetIconL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETICONL_1, "CSAT: CSatIconTsy::GetIconL"); TInt ret = KErrNone; iImageInstanceNoInRecord = 0; @@ -381,7 +374,7 @@ // In case the request was ongoing, complete right away.. if ( CSatTsy::ESatReqHandleUnknown != reqHandle ) { - TFLOGSTRING("CSAT: CSatIcon::GetIconL, KErrServerBusy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETICONL_2, "CSAT: CSatIcon::GetIconL, KErrServerBusy"); iSatTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy); } else @@ -448,7 +441,7 @@ TDes8* aInstance ) { - TFLOGSTRING("CSAT: CSatIconTsy::GetImageInstanceL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETIMAGEINSTANCEL_1, "CSAT: CSatIconTsy::GetImageInstanceL"); TInt ret = KErrNone; // Get possibly existing request handle @@ -458,7 +451,7 @@ // In case the request was ongoing, complete right away.. if ( CSatTsy::ESatReqHandleUnknown != reqHandle ) { - TFLOGSTRING("CSAT: CSatIcon::GetImageInstanceL, KErrServerBusy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETIMAGEINSTANCEL_2, "CSAT: CSatIcon::GetImageInstanceL, KErrServerBusy"); iSatTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy); } else @@ -534,7 +527,7 @@ TDes8* aClut ) { - TFLOGSTRING("CSAT: CSatIconTsy::GetClutL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETCLUTL_1, "CSAT: CSatIconTsy::GetClutL"); TInt ret = KErrNone; // Get possibly existing request handle @@ -544,7 +537,7 @@ // In case the request was ongoing, complete right away.. if ( CSatTsy::ESatReqHandleUnknown != reqHandle ) { - TFLOGSTRING("CSAT: CSatIcon::GetClutL : KErrServerBusy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATICONTSY_GETCLUTL_2, "CSAT: CSatIcon::GetClutL : KErrServerBusy"); iSatTsy->ReqCompleted( aTsyReqHandle, KErrServerBusy); } else diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/csatmessagerouterproxy.cpp --- a/telephonyserverplugins/simatktsy/src/csatmessagerouterproxy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/csatmessagerouterproxy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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 @@ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csatmessagerouterproxyTraces.h" +#endif + #include // Tsy module files #include "CSatDataPackage.h" @@ -55,7 +61,6 @@ #include "CSatEventDownloadTsy.h" #include "CSatDataDownloadTsy.h" // Utilities -#include "tflogger.h" #include "msattsy_ipcdefs.h" #include "ctsydelegates.h" @@ -94,7 +99,7 @@ // CSatMessageRouterProxy* CSatMessageRouterProxy::NewL(CTsyDelegates& aTsyDelegates) { - TFLOGSTRING( "CSAT: CSatMessageRouterProxy::NewL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_NEWL_1, "CSAT: CSatMessageRouterProxy::NewL" ); CSatMessageRouterProxy* satMessageRouterProxy = new ( ELeave ) CSatMessageRouterProxy(aTsyDelegates); @@ -102,7 +107,7 @@ satMessageRouterProxy->ConstructL(); CleanupStack::Pop(); - TFLOGSTRING("CSAT: CSatMessageRouterProxy::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_NEWL_2, "CSAT: CSatMessageRouterProxy::NewL, end of method"); return satMessageRouterProxy; } @@ -116,7 +121,7 @@ void ) { - TFLOGSTRING( "CSAT: CSatMessageRouterProxy::~CSatMessageRouterProxy" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_DTOR_1, "CSAT: CSatMessageRouterProxy::~CSatMessageRouterProxy" ); } // ----------------------------------------------------------------------------- @@ -140,7 +145,7 @@ void ) { - TFLOGSTRING( "CSAT: CSatMessageRouterProxy::ConstructL, noes nothing" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_CONSTRUCTL_1, "CSAT: CSatMessageRouterProxy::ConstructL, noes nothing" ); } // ----------------------------------------------------------------------------- @@ -154,7 +159,7 @@ ) { // Dummy implementation - TFLOGSTRING( "CSAT: CSatMessageRouterProxy::RouteRequest: DUMMY" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTEREQUEST_1, "CSAT: CSatMessageRouterProxy::RouteRequest: DUMMY" ); return NULL; } @@ -176,8 +181,7 @@ if ( KErrNone != trapError ) { - TFLOGSTRING2("CSatMessageRouterProxy::RouteCompletion, trapError=%d", - trapError); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTECOMPLETION_1, "CSatMessageRouterProxy::RouteCompletion, trapError=%d", trapError); } } @@ -194,7 +198,7 @@ CSatDataPackage* /*aDataPackage*/ ) { - TFLOGSTRING("CSAT: CMmMessageRouterBase::GetObjectForCompletion"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_GETOBJECTFORCOMPLETION_1, "CSAT: CMmMessageRouterBase::GetObjectForCompletion"); CBase* satObject = NULL; CMmMessageManagerBase::TTsyObjects tsyObject = @@ -216,7 +220,7 @@ ) const { - TFLOGSTRING( "CSAT: CSatMessageRouterProxy::GetTsyObjectFromIpc" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_GETTSYOBJECTFROMIPC_1, "CSAT: CSatMessageRouterProxy::GetTsyObjectFromIpc" ); // A default value must be given as a initialization, however, nothing will // be done if the IPC does not mach as well in RouteCompletion CMmMessageManagerBase::TTsyObjects retObject = @@ -347,7 +351,7 @@ CMmDataPackage* aData, TInt aResult ) { -TFLOGSTRING3("TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult); +OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_COMPLETE_1, "TSY: CMmMessageRouterProxy::Complete. IPC = %d, result: %d", aIpc, aResult); RouteCompletion( aIpc, static_cast(aData), aResult ); } @@ -376,8 +380,7 @@ TInt aResult ) { - TFLOGSTRING3("CSAT: CSatMessageRouterProxy::RouteCompletion ipc=%d, \ - error: %d", aIpc, aResult); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_1, "CSAT: CSatMessageRouterProxy::RouteCompletion ipc=%d, error: %d", aIpc, aResult); CBase* object = GetObjectForCompletion( aIpc, aDataPackage ); if ( NULL != object ) @@ -620,7 +623,7 @@ } else { - TFLOGSTRING("CSatMessageRouterProxy::RouteCompletion, IPC NOT HANDLED.!!!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_2, "CSatMessageRouterProxy::RouteCompletion, IPC NOT HANDLED.!!!"); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/csatnotificationstsy.cpp --- a/telephonyserverplugins/simatktsy/src/csatnotificationstsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/csatnotificationstsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -21,6 +21,12 @@ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csatnotificationstsyTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatDataPackage.h" // Parameter packing #include "CSatTsy.h" // Sat Tsy class @@ -58,7 +64,6 @@ #include "CSatNotifyReceiveData.h" // Receive data notification notify class #include "CSatNotifyMoreTime.h" // More time notification notify class #include "CSatTsyReqHandleStore.h" // Request handle class -#include "TfLogger.h" // For TFLOGSTRING #include "CBerTlv.h" // Ber Tlv #include "TTlv.h" // TTlv class #include "msattsy_ipcdefs.h" // Sat Tsy specific request types @@ -76,7 +81,7 @@ CSatTsyReqHandleStore* aSatReqHandleStore ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NEWL_1, "CSAT: CSatNotificationsTsy::NewL"); CSatNotificationsTsy* const satNotificationsTsy = new ( ELeave ) CSatNotificationsTsy( aSatTsy, aSatReqHandleStore ); @@ -84,7 +89,7 @@ satNotificationsTsy->ConstructL(); CleanupStack::Pop(); - TFLOGSTRING("CSAT: CSatNotificationsTsy::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NEWL_2, "CSAT: CSatNotificationsTsy::NewL, end of method"); return satNotificationsTsy; } @@ -98,7 +103,7 @@ void ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::~CSatNotificationsTsy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_DTOR_1, "CSAT: CSatNotificationsTsy::~CSatNotificationsTsy"); delete iSatTimer; @@ -136,8 +141,7 @@ // Unregister. iSatTsy->MessageManager()->RegisterTsyObject( CMmMessageManagerBase::ESatNotificationsTsyObjType, NULL ); - TFLOGSTRING("CSAT: CSatNotificationsTsy::~CSatNotificationsTsy, \ - end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_DTOR_2, "CSAT: CSatNotificationsTsy::~CSatNotificationsTsy, end of method"); } // ----------------------------------------------------------------------------- @@ -165,7 +169,7 @@ void ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::ConstructL\n" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_CONSTRUCTL_1, "CSAT: CSatNotificationsTsy::ConstructL\n" ); // Register iSatTsy->MessageManager()->RegisterTsyObject( @@ -324,7 +328,7 @@ // Checks if MO-SMS control should be activated //unnecassary IPC request as this is already called in CSatNotifyMoSmControlRequest::ConstructL //iSatTsy->MessageManager()->HandleRequestL( ESatTsyQueryMoSmsControlActivated ); - TFLOGSTRING("CSAT: CSatNotificationsTsy::ConstructL, end of method" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_CONSTRUCTL_2, "CSAT: CSatNotificationsTsy::ConstructL, end of method" ); } // ----------------------------------------------------------------------------- @@ -339,8 +343,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING3("CSAT: CSatNotificationsTsy::DoExtFuncL\t IPC:%d,\t Handle:%d", - aIpc, aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_DOEXTFUNCL_1, "CSAT: CSatNotificationsTsy::DoExtFuncL\t IPC:%d,\t Handle:%d",aIpc, aTsyReqHandle); TInt ret ( KErrNone ); @@ -502,8 +505,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotificationsTsy::DoExtFuncL, \ - IPC not supported"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_DOEXTFUNCL_2, "CSAT: CSatNotificationsTsy::DoExtFuncL, IPC not supported"); ret = KErrNotSupported; break; } @@ -522,8 +524,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING2("CSAT: CSatNotificationsTsy::CancelService.\ - \n\t\t\t Handle:%d\n\t\t\t", aTsyReqHandle ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_CANCELSERVICE_1, "CSAT: CSatNotificationsTsy::CancelService.\n\t\t\t Handle:%d\n\t\t\t", aTsyReqHandle ); TInt ret ( KErrNotSupported ); @@ -691,7 +692,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::SetPollingResultL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_1, "CSAT: CSatNotificationsTsy::SetPollingResultL"); TUint8 pCmdNumber; TUint8 interval; TBuf additionalInfo; @@ -702,8 +703,7 @@ { if ( iPollingOff ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::SetPollingResultL, \ - Polling Off"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_2, "CSAT: CSatNotificationsTsy::SetPollingResultL, Polling Off"); additionalInfo.Zero(); additionalInfo.Append( RSat::KNoAdditionalInfo ); iNotifyPollingOff->CreateTerminalRespL( pCmdNumber, @@ -718,9 +718,7 @@ // NAA status not OK else { - TFLOGSTRING("CSAT: CSatNotificationsTsy::SetPollingResultL, \ - NAA Status Not OK, means that value in request is out of range\ - and default value is used."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_3, "CSAT: CSatNotificationsTsy::SetPollingResultL, NAA Status Not OK, means that value in request is out of range and default value is used."); if ( iPollingOff ) { iPollingOff = EFalse; @@ -735,8 +733,7 @@ // renew the request with legacy maximum.. if ( iLongPollIntervalReq ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::SetPollingResultL, \ - Request set to legacy maximum (25 seconds)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_4, "CSAT: CSatNotificationsTsy::SetPollingResultL, Request set to legacy maximum (25 seconds)"); SetPollingIntervalL( KMaxLegacyPollInterval ); iLongPollIntervalReq = EFalse; } @@ -764,8 +761,7 @@ TUint8 aValue ) { - TFLOGSTRING2("CSAT: CSatNotificationsTsy::SetPollingIntervalL, Value: %d", - aValue); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGINTERVALL_1, "CSAT: CSatNotificationsTsy::SetPollingIntervalL, Value: %d",aValue); if ( KMaxLegacyPollInterval < aValue ) { @@ -792,7 +788,7 @@ TUint32 aTimerValue ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::TimerExpirationL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_TIMEREXPIRATIONL_1, "CSAT: CSatNotificationsTsy::TimerExpirationL"); TUint8 time[3] = {0, 0, 0}; TInt num[3]; num[0] = aTimerValue / 3600; // Hours @@ -844,7 +840,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::GetSatTimer"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_GETSATTIMER_1, "CSAT: CSatNotificationsTsy::GetSatTimer"); // Pointer to SAT timer return iSatTimer; } @@ -859,7 +855,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::SatNotifySetUpCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SATNOTIFYSETUPCALL_1, "CSAT: CSatNotificationsTsy::SatNotifySetUpCall"); // Pointer to NotifySetupCall return iNotifySetUpCall; } @@ -875,8 +871,7 @@ TInt /*aResult*/ ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::\ - SetProactiveCommandOnGoingStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPROACTIVECOMMANDONGOINGSTATUS_1, "CSAT: CSatNotificationsTsy::SetProactiveCommandOnGoingStatus"); TBool ProactiveCommandOngoingStatus; aDataPackage->UnPackData( ProactiveCommandOngoingStatus ); iSatTimer->SetProactiveCommandOnGoingStatus( @@ -895,7 +890,7 @@ TInt aResult ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::CompletePCmdL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMPLETEPCMDL_1, "CSAT: CSatNotificationsTsy::CompletePCmdL"); TPtrC8* data; aDataPackage->UnPackData( &data ); @@ -1046,8 +1041,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotificationsTsy::CompletePCmdL, \ - Proactive command not supported" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMPLETEPCMDL_2, "CSAT: CSatNotificationsTsy::CompletePCmdL, Proactive command not supported" ); // If proactive command is not supported, terminal response // with "Command is beyond ME's capabilities" information // will be send. @@ -1082,7 +1076,7 @@ void ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::IsMoSmControlActivated"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_ISMOSMCONTROLACTIVATED_1, "CSAT: CSatNotificationsTsy::IsMoSmControlActivated"); return iNotifyMoSmControlRequest->ActivationStatus(); } @@ -1096,8 +1090,7 @@ TBool aPollingOff ) { - TFLOGSTRING2("CSAT: CSatNotificationsTsy::SetPollingOffStatus \ - status: %d", aPollingOff); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_SETPOLLINGOFFSTATUS_1, "CSAT: CSatNotificationsTsy::SetPollingOffStatus status: %d", aPollingOff); iPollingOff = aPollingOff; } @@ -1111,7 +1104,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::PollingOffStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_POLLINGOFFSTATUS_1, "CSAT: CSatNotificationsTsy::PollingOffStatus"); return iPollingOff; } @@ -1125,7 +1118,7 @@ TTlv& aTlv ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::AddLocationInformationToTlv"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_ADDLOCATIONINFORMATIONTOTLV_1, "CSAT: CSatNotificationsTsy::AddLocationInformationToTlv"); // Get the current location data from CSatNotifyLocalInfo const TLocalInformation& locInfo = iNotifyLocalInfo->LocalInformation(); @@ -1153,7 +1146,7 @@ RSat::TControlResult aResult ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::NotifyClientForAlphaId"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYCLIENTFORALPHAID_1, "CSAT: CSatNotificationsTsy::NotifyClientForAlphaId"); iNotifyCallControlRequest->CompleteAlphaId( aAlphaId, aResult, KErrNone ); } @@ -1167,7 +1160,7 @@ void ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::RequestHandleStore"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_REQUESTHANDLESTORE_1, "CSAT: CSatNotificationsTsy::RequestHandleStore"); return iSatReqHandleStore; } @@ -1182,7 +1175,7 @@ TUint8 aPCmdMsgType ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::NotifySatReadyForNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYSATREADYFORNOTIFICATION_1, "CSAT: CSatNotificationsTsy::NotifySatReadyForNotification"); TInt ret( KErrNone ); // Pack parameter for DOS call CSatDataPackage dataPackage; @@ -1194,8 +1187,7 @@ if ( trapError ) { ret = trapError; - TFLOGSTRING2("CSAT: CSatNotificationsTsy::NotifySatReadyForNotification\ - Trap error: %d", trapError); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYSATREADYFORNOTIFICATION_2, "CSAT: CSatNotificationsTsy::NotifySatReadyForNotification Trap error: %d", trapError); } return ret; @@ -1213,8 +1205,7 @@ TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING2("CSAT: CSatNotificationsTsy::TerminalResponseL.\ - \n\t\t\t Handle:%d\n\t\t\t", aTsyReqHandle ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_TERMINALRESPONSEL_1, "CSAT: CSatNotificationsTsy::TerminalResponseL.\n\t\t\t Handle:%d\n\t\t\t", aTsyReqHandle ); TInt ret( KErrNone ); @@ -1334,8 +1325,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotificationsTsy::TerminalResponseL.\ - Proactive command unknown" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_TERMINALRESPONSEL_2, "CSAT: CSatNotificationsTsy::TerminalResponseL. Proactive command unknown" ); ret = KErrGeneral; break; } @@ -1358,8 +1348,7 @@ TInt aErrorCode // Error code ) { - TFLOGSTRING2("CSAT: CSatNotificationsTsy::CompleteTerminalResponse - \ - Error:%d", aErrorCode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMPLETETERMINALRESPONSE_1, "CSAT: CSatNotificationsTsy::CompleteTerminalResponse - Error:%d", aErrorCode); TTsyReqHandle reqHandle = iSatTsy->GetSatReqHandleStore()-> ResetTsyReqHandle( CSatTsy::ESatTerminalRspReqType ); @@ -1383,7 +1372,7 @@ TUint8 aGeneralResult ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::CommandPerformedSuccessfully"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMMANDPERFORMEDSUCCESSFULLY_1, "CSAT: CSatNotificationsTsy::CommandPerformedSuccessfully"); TBool ret( EFalse ); switch ( aGeneralResult ) { @@ -1402,8 +1391,7 @@ } default: { - TFLOGSTRING("CSAT: CSatNotificationsTsy:: \ - CommandPerformedSuccessfully, EFalse"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_COMMANDPERFORMEDSUCCESSFULLY_2, "CSAT: CSatNotificationsTsy::CommandPerformedSuccessfully, EFalse"); ret = EFalse; break; } @@ -1421,7 +1409,7 @@ TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::NotifyCbDownload"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYCBDOWNLOAD_1, "CSAT: CSatNotificationsTsy::NotifyCbDownload"); TInt ret( KErrNone ); iSatTsy->ReqCompleted( aTsyReqHandle, ret ); return ret; @@ -1437,7 +1425,7 @@ TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotificationsTsy::NotifySmsPpDownload"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFICATIONSTSY_NOTIFYSMSPPDOWNLOAD_1, "CSAT: CSatNotificationsTsy::NotifySmsPpDownload"); TInt ret( KErrNone ); iSatTsy->ReqCompleted( aTsyReqHandle, ret ); return ret; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/csattimer.cpp --- a/telephonyserverplugins/simatktsy/src/csattimer.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/csattimer.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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,8 +20,13 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csattimerTraces.h" +#endif + #include "CSatTimer.h" // Class header -#include "TfLogger.h" // For TFLOGSTRING #include "CSatNotificationsTsy.h" // Sat Tsy class #include "CSatDataPackage.h" // For data packages @@ -51,7 +56,7 @@ ) { - TFLOGSTRING( "CSAT: CSatTimer::ConstructL" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_CONSTRUCTL_1, "CSAT: CSatTimer::ConstructL" ); iSatNotificationsTsy = aSatNotificationsTsy; iTimerTable = new ( ELeave ) RArray( KMaxNumberOfParallelTimers ); // Neutral priority, 0 @@ -80,7 +85,7 @@ //None ) { - TFLOGSTRING( "CSAT: CSatTimer::~CSatTimer" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_DTOR_1, "CSAT: CSatTimer::~CSatTimer" ); if ( iTimer ) { // Stop calling Beat... @@ -106,7 +111,7 @@ TUint32 aTimerValue // Timer value ) { - TFLOGSTRING( "CSAT: CSatTimer::Start" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_START_1, "CSAT: CSatTimer::Start" ); TInt ret( KErrNone ); // Check if the entry is already in the table @@ -146,7 +151,7 @@ //None ) { - TFLOGSTRING( "CSAT: CSatTimer::Stop" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_STOP_1, "CSAT: CSatTimer::Stop" ); // Check if active if ( iTimer->IsActive () ) { @@ -188,8 +193,7 @@ if ( trapError ) { ret = trapError; - TFLOGSTRING2("CSAT: CSatTimer::Beat, Trap error: %d", - trapError); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_BEAT_1, "CSAT: CSatTimer::Beat, Trap error: %d", trapError); } // Remove timer from the table @@ -217,7 +221,7 @@ // None ) { - TFLOGSTRING( "CSAT: CSatTimer::Synchronize" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_SYNCHRONIZE_1, "CSAT: CSatTimer::Synchronize" ); iBeatCounter++; } @@ -232,7 +236,7 @@ ) { - TFLOGSTRING( "CSAT: CSatTimer::CheckTimerTable" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_CHECKTIMERTABLE_1, "CSAT: CSatTimer::CheckTimerTable" ); TBool ret( EFalse ); // Create the entry with meaningful values only @@ -262,7 +266,7 @@ ) { - TFLOGSTRING( "CSAT: CSatTimer::DeleteTimerById" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_DELETETIMERBYID_1, "CSAT: CSatTimer::DeleteTimerById" ); TInt ret( KErrNotFound ); // Create the entry with meaningful values only @@ -300,7 +304,7 @@ TInt aTimerId // Timer identifier ) { - TFLOGSTRING( "CSAT: CSatTimer::CurrentValueOfTimerById" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_CURRENTVALUEOFTIMERBYID_1, "CSAT: CSatTimer::CurrentValueOfTimerById" ); TInt ret( KErrNotFound ); // Create the entry with meaningful values only @@ -344,7 +348,7 @@ TBool aStatus ) { - TFLOGSTRING( "CSAT: CSatTimer::SetProactiveCommandOnGoingStatus" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_SETPROACTIVECOMMANDONGOINGSTATUS_1, "CSAT: CSatTimer::SetProactiveCommandOnGoingStatus" ); iIsProactiveCommandOnGoing = aStatus; } @@ -361,7 +365,7 @@ ): iTimerId( aTimerId ), iStartTime( aStartTime ), iTimeStamp( aTimeStamp ) { - TFLOGSTRING( "CSAT: TTimer::TTimer" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_TTIMER_1, "CSAT: TTimer::TTimer" ); } // ----------------------------------------------------------------------------- @@ -374,7 +378,7 @@ // None ) { - TFLOGSTRING( "CSAT: TTimer::TimeStamp" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_TIMESTAMP_1, "CSAT: TTimer::TimeStamp" ); return iTimeStamp; } @@ -388,7 +392,7 @@ // None ) { - TFLOGSTRING( "CSAT: TTimer::TimerId" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_TIMERID_1, "CSAT: TTimer::TimerId" ); return iTimerId; } @@ -402,7 +406,7 @@ // None ) { - TFLOGSTRING( "CSAT: TTimer::TimerStartTime" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_TIMERSTARTTIME_1, "CSAT: TTimer::TimerStartTime" ); return iStartTime; } @@ -417,7 +421,7 @@ const CSatTimer::TTimer& aArg2 ) { - TFLOGSTRING( "CSAT: CSatTimer::TTimer::CompareEntries" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_COMPAREENTRIES_1, "CSAT: CSatTimer::TTimer::CompareEntries" ); TBool ret( EFalse ); // We are interested only in the timer id @@ -427,7 +431,7 @@ } else { - TFLOGSTRING( "CSAT: CSatTimer::TTimer::CompareEntries, Not equal" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_COMPAREENTRIES_2, "CSAT: CSatTimer::TTimer::CompareEntries, Not equal" ); } return ret; } @@ -443,7 +447,7 @@ const CSatTimer::TTimer& aArg2 ) { - TFLOGSTRING( "CSAT: CSatTimer::TTimer::OrderEntries" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_ORDERENTRIES_1, "CSAT: CSatTimer::TTimer::OrderEntries" ); TInt ret( KFirstTimeStampSmaller ); // We are interested only in the time stamp @@ -457,8 +461,7 @@ } else { - TFLOGSTRING( "CSAT: CSatTimer::TTimer::OrderEntries, \ - KFirstTimeStampSmaller" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTIMER_TTIMER_ORDERENTRIES_2, "CSAT: CSatTimer::TTimer::OrderEntries, KFirstTimeStampSmaller" ); } return ret; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/csattsy.cpp --- a/telephonyserverplugins/simatktsy/src/csattsy.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/csattsy.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csattsyTraces.h" +#endif + #include // Etel SAT API #include // Etel SAT API //#include "CMmPhoneTsy.h" // Phone Tsy class @@ -42,7 +48,6 @@ #include "CSatDataDownloadTsy.h" // SatDataDownload class #include "msattsy_ipcdefs.h" // Sat Tsy specific request types -#include "TfLogger.h" // For TFLOGSTRING #include "TSatUtility.h" // Sat Tsy Utility class #include "TTlv.h" // TTlv class #include "CSatTsyReqHandleStore.h" // Request handle storage @@ -60,7 +65,7 @@ MCtsySatService& aSatService ) { - TFLOGSTRING("CSAT: CSatTsy::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_NEWL_1, "CSAT: CSatTsy::NewL"); // Create subsession CSatTsy* subsession = new ( ELeave ) CSatTsy( aMmMessageRouter, aSatService ); @@ -69,7 +74,7 @@ subsession->ConstructL(); CleanupStack::Pop(); - TFLOGSTRING("CSAT: CSatTsy::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_NEWL_2, "CSAT: CSatTsy::NewL, end of method"); return subsession; } @@ -83,7 +88,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatTsy::~CSatTsy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DTOR_1, "CSAT: CSatTsy::~CSatTsy"); // Unregister. iMessageManager->RegisterTsyObject( @@ -99,7 +104,7 @@ delete iMessageManager; // Request handle store delete iSatReqHandleStore; - TFLOGSTRING("CSAT: CSatTsy::~CSatTsy, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DTOR_2, "CSAT: CSatTsy::~CSatTsy, end of method"); } // ----------------------------------------------------------------------------- @@ -127,7 +132,7 @@ ( ) { - TFLOGSTRING("CSAT: CSatTsy::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_CONSTRUCTL_1, "CSAT: CSatTsy::ConstructL"); // Set pointer to the message router iMessageManager = CMmMessageManagerBase::NewL(iMessageRouter); @@ -182,7 +187,7 @@ // Get SMS Point to Point Data Download support status iMessageManager->HandleRequestL( ESatTsySmsPpDdlStatus ); - TFLOGSTRING("CSAT: CSatTsy::ConstructL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_CONSTRUCTL_2, "CSAT: CSatTsy::ConstructL, end of method"); } // ----------------------------------------------------------------------------- @@ -197,8 +202,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING3("CSAT: CSatTsy::ExtFunc ReqHandle=%d IPC=%d", aTsyReqHandle, - aIpc); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_EXTFUNC_1, "CSAT: CSatTsy::ExtFunc ReqHandle=0x%08x IPC=%d", (TUint)aTsyReqHandle, aIpc); TInt ret( KErrNone ); // Some SAT functions need trapping so we use two level function where @@ -215,12 +219,12 @@ if ( KErrNone != trapError ) { - TFLOGSTRING2("CSAT: CSatTsy::ExtFunc, trapError: %d", trapError ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_EXTFUNC_2, "CSAT: CSatTsy::ExtFunc, trapError: %d", trapError ); ReqCompleted( aTsyReqHandle, trapError ); } else if ( KErrNone != ret ) { - TFLOGSTRING2("CSAT: CSatTsy::ExtFunc, ret: %d", ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_EXTFUNC_3, "CSAT: CSatTsy::ExtFunc, ret: %d", ret); ReqCompleted( aTsyReqHandle, ret ); } else @@ -243,8 +247,7 @@ const TSatRequestTypes aSatRequestType ) { - TFLOGSTRING3("CSAT: CSatTsy::SaveReqHandle ReqHandle=%d ReqHandleType=%d", - aTsyReqHandle, aSatRequestType); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SAVEREQHANDLE_1, "CSAT: CSatTsy::SaveReqHandle ReqHandle=0x%08x ReqHandleType=%d", (TUint)aTsyReqHandle, aSatRequestType); // Don't save the request handle if the type is unknown. if ( ESatReqHandleUnknown != aSatRequestType ) @@ -265,7 +268,7 @@ const TInt aIpc ) { - TFLOGSTRING("CSAT: CSatTsy::ReqModeL."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REQMODEL_1, "CSAT: CSatTsy::ReqModeL."); CTelObject::TReqMode ret = 0; switch ( aIpc ) @@ -319,7 +322,7 @@ } default: { - TFLOGSTRING2("CSAT: CSatTsy::ReqModeL unsupported IPC %d", aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REQMODEL_2, "CSAT: CSatTsy::ReqModeL unsupported IPC %d", aIpc); User::Leave( KErrNotSupported ); break; } @@ -338,8 +341,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING3("CSAT: CSatTsy::CancelService ReqHandle=%d IPC=%d", - aTsyReqHandle, aIpc); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_CANCELSERVICE_1, "CSAT: CSatTsy::CancelService ReqHandle=0x%08x IPC=%d", (TUint)aTsyReqHandle, aIpc); TInt ret( KErrNotSupported ); // When the clients close their sub-sessions (eg. by calling RLine::Close), @@ -408,7 +410,7 @@ default: { - TFLOGSTRING2("CSAT: CSatTsy::CancelService invalid IPC %d", aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_CANCELSERVICE_2, "CSAT: CSatTsy::CancelService invalid IPC %d", aIpc); ret = KErrGeneral; break; } @@ -430,7 +432,7 @@ const TInt aIpc // IPC number of request ) { - TFLOGSTRING("CSAT: CSatTsy::RegisterNotification."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REGISTERNOTIFICATION_1, "CSAT: CSatTsy::RegisterNotification."); // Initialize return value TInt ret( KErrNone ); @@ -470,8 +472,7 @@ default: { // Unknown or invalid IPC - TFLOGSTRING2("CSAT: CSatTsy::RegisterNotification, \ - Unsupported IPC %d", aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REGISTERNOTIFICATION_2, "CSAT: CSatTsy::RegisterNotification, Unsupported IPC %d", aIpc); ret = KErrNotSupported; break; } @@ -493,7 +494,7 @@ const TInt aIpc // IPC number of request ) { - TFLOGSTRING("CSAT: CSatTsy::DeregisterNotification."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DEREGISTERNOTIFICATION_1, "CSAT: CSatTsy::DeregisterNotification."); // Initialize return value TInt ret( KErrNone ); @@ -533,8 +534,7 @@ default: { // Unknown or invalid IPC - TFLOGSTRING2("CSAT: CSatTsy::DeregisterNotification, \ - Unsupported IPC %d", aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DEREGISTERNOTIFICATION_2, "CSAT: CSatTsy::DeregisterNotification, Unsupported IPC %d", aIpc); ret = KErrNotSupported; break; } @@ -555,7 +555,7 @@ const TInt aIpc // IPC number of request ) { - TFLOGSTRING("CSAT: CSatTsy::NumberOfSlotsL."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_NUMBEROFSLOTSL_1, "CSAT: CSatTsy::NumberOfSlotsL."); TInt numberOfSlots( 1 ); switch ( aIpc ) @@ -670,8 +670,7 @@ default: { // Unknown or invalid IPC - TFLOGSTRING2("CSAT: CSatTsy::NumberOfSlotsL, Unsupported IPC %d", - aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_NUMBEROFSLOTSL_2, "CSAT: CSatTsy::NumberOfSlotsL, Unsupported IPC %d", aIpc); User::Leave( KErrNotSupported ); break; } @@ -690,7 +689,7 @@ TInt aRet ) { - TFLOGSTRING2("CSAT: CSatTsy::ReqCompleted, ReqHandle=%d ", aReqHandle); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_REQCOMPLETED_1, "CSAT: CSatTsy::ReqCompleted, ReqHandle=%d ", aReqHandle); #ifdef USING_CTSY_DISPATCHER CTelObject::ReqCompleted( aReqHandle, aRet ); #else @@ -708,7 +707,7 @@ const TDesC8& aEnvelope ) { - TFLOGSTRING("CSAT: CSatTsy::StoreCallConnectedEvent"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_STORECALLCONNECTEDEVENT_1, "CSAT: CSatTsy::StoreCallConnectedEvent"); iSatNotificationsTsy->SatNotifySetUpCall()->StoreCallConnectedEvent( aEnvelope ); } @@ -723,7 +722,7 @@ const TBool aStatus ) { - TFLOGSTRING("CSAT: CSatTsy::SetSetUpCallStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SETSETUPCALLSTATUS_1, "CSAT: CSatTsy::SetSetUpCallStatus"); iSatEventDownloadTsy->SetSetUpCallStatus( aStatus ); } @@ -737,7 +736,7 @@ TUint32 aEvents // events to be monitored ) { - TFLOGSTRING("CSAT: CSatTsy::SetUpEventList"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SETUPEVENTLIST_1, "CSAT: CSatTsy::SetUpEventList"); iSatEventDownloadTsy->SetUpEventList( aEvents ); } @@ -751,7 +750,7 @@ // none ) { - TFLOGSTRING("CSAT: CSatTsy::MessageManager"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_MESSAGEMANAGER_1, "CSAT: CSatTsy::MessageManager"); return iMessageManager; } @@ -765,7 +764,7 @@ // none ) { - TFLOGSTRING("CSAT: CSatTsy::SatCCTsy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SATCCTSY_1, "CSAT: CSatTsy::SatCCTsy"); return iSatCCTsy; } @@ -779,7 +778,7 @@ //none ) { - TFLOGSTRING("CSAT: CSatTsy::GetSatReqHandleStore"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_GETSATREQHANDLESTORE_1, "CSAT: CSatTsy::GetSatReqHandleStore"); return iSatReqHandleStore; } @@ -793,7 +792,7 @@ //none ) { - TFLOGSTRING("CSAT: CSatTsy::GetReqHandleType"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_GETREQHANDLETYPE_1, "CSAT: CSatTsy::GetReqHandleType"); return &iReqHandleType; } @@ -807,7 +806,7 @@ TInt aStatus ) { - TFLOGSTRING("CSAT: CSatTsy::CompleteSendSmsMessage"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_COMPLETESENDSMSMESSAGE_1, "CSAT: CSatTsy::CompleteSendSmsMessage"); // Reset req handle. Returns the deleted req handle TTsyReqHandle reqHandle = iSatNotificationsTsy->RequestHandleStore()-> @@ -832,7 +831,7 @@ void ) { - TFLOGSTRING("CSAT: CSatTsy::IsMoSmControlBySimActivated"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_ISMOSMCONTROLBYSIMACTIVATED_1, "CSAT: CSatTsy::IsMoSmControlBySimActivated"); return iSatNotificationsTsy->IsMoSmControlActivated(); } @@ -849,7 +848,7 @@ const TDesC8& aAddress ) { - TFLOGSTRING("CSAT: CSatTsy::IsSimOriginatedCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_ISSIMORIGINATEDCALL_1, "CSAT: CSatTsy::IsSimOriginatedCall"); TBool ret = EFalse; if (iSatCCTsy) { @@ -871,7 +870,7 @@ const TDesC8* aAddress ) { - TFLOGSTRING("CSAT: CSatTsy::StoreProactiveAddress"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_STOREPROACTIVEADDRESS_1, "CSAT: CSatTsy::StoreProactiveAddress"); iSatCCTsy->StoreAddressForCC( *aAddress ); } @@ -885,7 +884,7 @@ const TUint8 aTonNpi ) { - TFLOGSTRING("CSAT: CSatTsy::SetTonNpi"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SETTONNPI_1, "CSAT: CSatTsy::SetTonNpi"); iSatCCTsy->SetTonNpiForSS( aTonNpi ); } @@ -901,8 +900,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING3("CSAT: CSatTsy::DoExtFuncL\t IPC:%d,\t Handle:%d", - aIpc, aTsyReqHandle); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DOEXTFUNCL_1, "CSAT: CSatTsy::DoExtFuncL\t IPC:%d,\t Handle:%d",aIpc, aTsyReqHandle); TInt ret( KErrNone ); // Add here ALL supported Sat request types, and call either the correct @@ -1000,7 +998,7 @@ // Complete with KErrNotSupported, function not supported default: { - TFLOGSTRING2("CSAT: CSatTsy::DoExtFuncL unsupported IPC %d", aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_DOEXTFUNCL_2, "CSAT: CSatTsy::DoExtFuncL unsupported IPC %d", aIpc); ReqCompleted( aTsyReqHandle, KErrNotSupported ); break; } @@ -1020,15 +1018,14 @@ RSat::TMenuSelectionV1Pckg* aSelection ) { - TFLOGSTRING("CSAT: CSatTsy::MenuSelection"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_MENUSELECTIONL_1, "CSAT: CSatTsy::MenuSelection"); TInt ret( KErrNone ); // It should not be possible that the request is asked more than once at // time, therefore we do not need to check whether it is already ongoing RSat::TMenuSelectionV1& selectionV1 = ( *aSelection ) (); - TFLOGSTRING3("CSAT:MenuSelection, iItemId %x, Help: %c", - selectionV1.iItemId, selectionV1.iHelp ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_MENUSELECTIONL_2, "CSAT:MenuSelection, iItemId %x, Help: %c", selectionV1.iItemId, selectionV1.iHelp ); TTlv tlvSpecificData; @@ -1073,7 +1070,7 @@ TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatTsy::SendMessageNoLogging"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SENDMESSAGENOLOGGING_1, "CSAT: CSatTsy::SendMessageNoLogging"); TInt ret( KErrNone ); // Save the request handle @@ -1185,23 +1182,21 @@ // Call SMS sending function from MMSMS ret = iSatService.SendSatMessage( *this, pdu, sca, &numberType, &numberPlan, EFalse, aTsyReqHandle ); - TFLOGSTRING2("CSAT: CSatTsy::SendMessageNoLogging, \ - SendSmsMessage done, ret: %x", ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SENDMESSAGENOLOGGING_2, "CSAT: CSatTsy::SendMessageNoLogging, SendSmsMessage done, ret: %x", ret); } else // SCA missing { ret = KErrGeneral; - TFLOGSTRING("CSAT: CSatTsy::SendMessageNoLogging, SCA missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SENDMESSAGENOLOGGING_3, "CSAT: CSatTsy::SendMessageNoLogging, SCA missing"); } // Failure in sending of SAT SMS, call complete method if ( KErrNone != ret ) { CompleteSendSmsMessage( ret ); - TFLOGSTRING("CSAT: CSatTsy::SendMessageNoLogging, \ - failure sending SAT SMS, complete"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATTSY_SENDMESSAGENOLOGGING_4, "CSAT: CSatTsy::SendMessageNoLogging, failure sending SAT SMS, complete"); } return KErrNone; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/src/csattsyfactory.cpp --- a/telephonyserverplugins/simatktsy/src/csattsyfactory.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/src/csattsyfactory.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/simatktsy/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/simatktsy/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,800 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL1_1=0x311 +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL2_1=0x312 +[TRACE]TRACE_INTERNALS[0x88]_CMMMESSAGEMANAGERBASE_HANDLEREQUESTL_1=0x310 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_1=0xb +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_2=0xc +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_3=0xd +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_4=0xe +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CHECKIFALPHAIDPRESENT_5=0xf +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_COMPLETEBEARERCAPABILITY_1=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_COMPLETECCEVENTL_1=0x10 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_COMPLETECCEVENTL_2=0x11 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CONSTRUCTL_1=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATECALLENVELOPEL_1=0x17 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATECALLENVELOPEL_2=0x18 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATEENVELOPEL_1=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATEENVELOPEL_2=0xa +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATESSENVELOPEL_1=0x19 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_CREATEUSSDENVELOPEL_1=0x1a +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_HASPROACTIVEORIGIN_1=0x1c +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_HASPROACTIVEORIGIN_2=0x1d +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_HASPROACTIVEORIGIN_3=0x1e +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_HASPROACTIVEORIGIN_4=0x1f +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_ISONLYDIGITSINUSSD_1=0x1b +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_NEWL_1=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_NEWL_2=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_NEWL_3=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_SETTONNPIFORSS_1=0x12 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_SETUSSDSTATUS_1=0x13 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_STOREADDRESSFORCC_1=0x14 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_STOREADDRESSFORCC_2=0x15 +[TRACE]TRACE_INTERNALS[0x88]_CSATCCTSY_STOREADDRESSFORCC_3=0x16 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_COMPLETECELLBROADCASTDDLL_1=0x24 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_COMPLETEREADCBMIDSL_1=0x2e +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_COMPLETESMSPPDDLL_1=0x25 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_COMPLETESMSPPDDLL_2=0x26 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CONSTRUCTL_1=0x23 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATEENTRYFORSAVINGSMSL_1=0x27 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATEENTRYFORSAVINGSMSL_2=0x28 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_1=0x29 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_2=0x2a +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSDELIVERREPORTL_3=0x2b +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSPPDDLENVELOPEL_1=0x2c +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_CREATESMSPPDDLENVELOPEL_2=0x2d +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_NEWL_1=0x20 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_NEWL_2=0x21 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_NEWL_3=0x22 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_PARSESMSTPDU_1=0x30 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_PARSESMSTPDU_2=0x31 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_PARSESMSTPDU_3=0x32 +[TRACE]TRACE_INTERNALS[0x88]_CSATDATADOWNLOADTSY_SETSMSPPDDLSTATUS_1=0x2f +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CANCELSERVICE_1=0x3c +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEACCESSTECHNOLOGYCHANGEL_1=0x4e +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEACCESSTECHNOLOGYCHANGEL_2=0x4f +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_1=0x42 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_2=0x43 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLCONNECTEDL_3=0x44 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_1=0x45 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_2=0x46 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_3=0x47 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETECALLDISCONNECTEDL_4=0x48 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_1=0x49 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_2=0x4a +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_3=0x4b +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_4=0x4c +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETELOCATIONSTATUSL_5=0x4d +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_1=0x3d +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_2=0x3e +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_3=0x3f +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_4=0x40 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_COMPLETEMTCALLL_5=0x41 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CONSTRUCTL_1=0x37 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEBROWSERTERMINATIONENVELOPEL_1=0x55 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEBROWSERTERMINATIONENVELOPEL_2=0x56 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATECHANNELSTATUSENVELOPEL_1=0x5b +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATECHANNELSTATUSENVELOPEL_2=0x5c +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEDATAAVAILABLEENVELOPEL_1=0x59 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEDATAAVAILABLEENVELOPEL_2=0x5a +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_1=0x52 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_2=0x53 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEIDLESCREENAVAILABLEENVELOPEL_3=0x54 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATELANGUAGESELECTIONENVELOPEL_1=0x57 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATELANGUAGESELECTIONENVELOPEL_2=0x58 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEUSERACTIVITYENVELOPEL_1=0x50 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_CREATEUSERACTIVITYENVELOPEL_2=0x51 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_DOEXTFUNCL_1=0x38 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_DOEXTFUNCL_2=0x39 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_NEWL_1=0x33 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_NEWL_2=0x34 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_NEWL_3=0x35 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_NEWL_4=0x36 +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_SETSETUPCALLSTATUS_1=0x3b +[TRACE]TRACE_INTERNALS[0x88]_CSATEVENTDOWNLOADTSY_SETUPEVENTLIST_1=0x3a +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETCLUT_1=0x6d +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETCLUT_2=0x6e +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETCLUT_3=0x6f +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_1=0x63 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_2=0x64 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_3=0x65 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_4=0x66 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETICON_5=0x67 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_1=0x68 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_2=0x69 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_3=0x6a +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_4=0x6b +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_COMPLETEGETIMAGEINSTANCE_5=0x6c +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_CONSTRUCTL_1=0x60 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_DOEXTFUNCL_1=0x61 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_DOEXTFUNCL_2=0x62 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETCLUTL_1=0x74 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETCLUTL_2=0x75 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETICONL_1=0x70 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETICONL_2=0x71 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETIMAGEINSTANCEL_1=0x72 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_GETIMAGEINSTANCEL_2=0x73 +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_NEWL_1=0x5d +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_NEWL_2=0x5e +[TRACE]TRACE_INTERNALS[0x88]_CSATICONTSY_NEWL_3=0x5f +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_COMPLETE_1=0x31b +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_CONSTRUCTL_1=0x316 +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_GETOBJECTFORCOMPLETION_1=0x319 +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_GETOBJECTFORCOMPLETION_2=0x31a +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_NEWL_1=0x313 +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_NEWL_2=0x314 +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_NEWL_3=0x315 +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_1=0x31c +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_ROUTECOMPLETIONL_2=0x31d +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_ROUTECOMPLETION_1=0x318 +[TRACE]TRACE_INTERNALS[0x88]_CSATMESSAGEROUTERPROXY_ROUTEREQUEST_1=0x317 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_ADDLOCATIONINFORMATIONTOTLV_1=0x8d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_CANCELSERVICE_1=0x7e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMMANDPERFORMEDSUCCESSFULLY_1=0x95 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMMANDPERFORMEDSUCCESSFULLY_2=0x96 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMPLETEPCMDL_1=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMPLETEPCMDL_2=0x89 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_COMPLETETERMINALRESPONSE_1=0x94 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_CONSTRUCTL_1=0x7a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_CONSTRUCTL_2=0x7b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_DOEXTFUNCL_1=0x7c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_DOEXTFUNCL_2=0x7d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_GETSATTIMER_1=0x85 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_ISMOSMCONTROLACTIVATED_1=0x8a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NEWL_1=0x76 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NEWL_2=0x77 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NEWL_3=0x78 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NEWL_4=0x79 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYCBDOWNLOAD_1=0x97 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYCLIENTFORALPHAID_1=0x8e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYSATREADYFORNOTIFICATION_1=0x90 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYSATREADYFORNOTIFICATION_2=0x91 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_NOTIFYSMSPPDOWNLOAD_1=0x98 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_POLLINGOFFSTATUS_1=0x8c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_REQUESTHANDLESTORE_1=0x8f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SATNOTIFYSETUPCALL_1=0x86 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGINTERVALL_1=0x83 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGOFFSTATUS_1=0x8b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_1=0x7f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_2=0x80 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_3=0x81 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPOLLINGRESULTL_4=0x82 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_SETPROACTIVECOMMANDONGOINGSTATUS_1=0x87 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_TERMINALRESPONSEL_1=0x92 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_TERMINALRESPONSEL_2=0x93 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_TIMEREXPIRATIONL_1=0x84 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFICATIONSTSY_TLOCALINFORMATION_1=0x141 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_CANCELNOTIFICATION_1=0x9e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_1=0xa0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_2=0xa1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_COMPLETEALPHAID_3=0xa2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFYL_1=0x9f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_CONSTRUCTL_1=0x9c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_NEWL_1=0x99 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_NEWL_2=0x9a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_NEWL_3=0x9b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCALLCONTROLREQUEST_NOTIFY_1=0x9d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_CANCELNOTIFICATION_1=0xa8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_1=0xa9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_2=0xaa +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_3=0xab +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_4=0xac +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_COMPLETENOTIFYL_5=0xad +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_CONSTRUCTL_1=0xa6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_1=0xb2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_CREATETERMINALRESPL_2=0xb3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_NEWL_1=0xa3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_NEWL_2=0xa4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_NEWL_3=0xa5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_NOTIFY_1=0xa7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_1=0xae +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_2=0xaf +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_3=0xb0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSEL_4=0xb1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_CANCELNOTIFICATION_1=0xb9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_1=0xba +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_2=0xbb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_3=0xbc +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_4=0xbd +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_COMPLETENOTIFYL_5=0xbe +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_CONSTRUCTL_1=0xb7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_CREATETERMINALRESPL_1=0xc2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_DTOR_1=0xb6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_NEWL_1=0xb4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_NEWL_2=0xb5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_NOTIFY_1=0xb8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_1=0xbf +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_2=0xc0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSEL_3=0xc1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_CANCELNOTIFICATION_1=0xc8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_1=0xc9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_2=0xca +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_COMPLETENOTIFYL_3=0xcb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_CONSTRUCTL_1=0xc6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_1=0xcf +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_CREATETERMINALRESPL_2=0xd0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_NEWL_1=0xc3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_NEWL_2=0xc4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_NEWL_3=0xc5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_NOTIFY_1=0xc7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_1=0xcc +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_2=0xcd +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSEL_3=0xce +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_CANCELNOTIFICATION_1=0xd6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_COMPLETENOTIFYL_1=0xd7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_COMPLETENOTIFYL_2=0xd8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_COMPLETENOTIFYL_3=0xd9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_COMPLETENOTIFYL_4=0xda +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_CONSTRUCTL_1=0xd4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_CREATETERMINALRESPL_1=0xe1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_CREATETERMINALRESPL_2=0xe2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_NEWL_1=0xd1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_NEWL_2=0xd2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_NEWL_3=0xd3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_NOTIFY_1=0xd5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_1=0xdb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_2=0xdc +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_3=0xdd +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_4=0xde +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_5=0xdf +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINKEY_TERMINALRESPONSEL_6=0xe0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CANCELNOTIFICATION_1=0xe8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_1=0xe9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_2=0xea +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_3=0xeb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_4=0xec +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_5=0xed +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_6=0xee +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_COMPLETENOTIFYL_7=0xef +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CONSTRUCTL_1=0xe6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_1=0xf5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_2=0xf6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_3=0xf7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_4=0xf8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_5=0xf9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_CREATETERMINALRESPL_6=0xfa +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_NEWL_1=0xe3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_NEWL_2=0xe4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_NEWL_3=0xe5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_NOTIFY_1=0xe7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_1=0xf0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_2=0xf1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_3=0xf2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_4=0xf3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYGETINPUT_TERMINALRESPONSEL_5=0xf4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_CANCELNOTIFICATION_1=0x100 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_1=0x101 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_2=0x102 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_COMPLETENOTIFYL_3=0x103 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_CONSTRUCTL_1=0xfe +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_CREATETERMINALRESPL_1=0x105 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_NEWL_1=0xfb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_NEWL_2=0xfc +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_NEWL_3=0xfd +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_NOTIFY_1=0xff +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLANGUAGENOTIFICATION_TERMINALRESPONSEL_1=0x104 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_CANCELNOTIFICATION_1=0x10b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_1=0x10c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_2=0x10d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_3=0x10e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_4=0x10f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_5=0x110 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_6=0x111 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_7=0x112 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_CONSTRUCTL_1=0x109 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_CREATETERMINALRESPL_1=0x123 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_NEWL_1=0x106 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_NEWL_2=0x107 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_NEWL_3=0x108 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_NOTIFY_1=0x10a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_1=0x120 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_2=0x121 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_3=0x122 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_1=0x118 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_2=0x119 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_1=0x11d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_2=0x11e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_3=0x11f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEURLL_1=0x11a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEURLL_2=0x11b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_PARSEURLL_3=0x11c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_SETSSSTATUS_1=0x117 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_1=0x113 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_2=0x114 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_3=0x115 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_4=0x116 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CANCELNOTIFICATION_1=0x129 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_1=0x12a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_2=0x12b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_3=0x12c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_4=0x12d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_5=0x12e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_6=0x12f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_7=0x130 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_8=0x131 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETENOTIFYL_9=0x132 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETETERMINALRESPDATAL_1=0x13a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATEACCTECH_1=0x13e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATEIMEI_1=0x13f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATELOCALINFO_1=0x13b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATENETINFO_1=0x13c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATETIMEZONE_1=0x140 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_COMPLETEUPDATETIMINGADVANDMESTATUS_1=0x13d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CONSTRUCTL_1=0x127 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_1=0x136 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_2=0x137 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_3=0x138 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_CREATETERMINALRESPL_4=0x139 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_NEWL_1=0x124 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_NEWL_2=0x125 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_NEWL_3=0x126 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_NOTIFY_1=0x128 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_SETDATETIMETIMEZONE_1=0x142 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_SETINFORMATIONNMR_1=0x143 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_1=0x133 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_2=0x134 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYLOCALINFO_TERMINALRESPONSEL_3=0x135 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_COMPLETENOTIFYL_1=0x161 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_CONSTRUCTL_1=0x160 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_CREATETERMINALRESPL_1=0x162 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_NEWL_1=0x15d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_NEWL_2=0x15e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMORETIME_NEWL_3=0x15f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_ACTIVATIONSTATUS_1=0x155 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CANCELNOTIFICATION_1=0x14a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CLEANADDRESSDATA_1=0x156 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_1=0x14b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_2=0x14c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_3=0x14d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_4=0x14e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_5=0x14f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_6=0x150 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFYL_7=0x151 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CONSTRUCTL_1=0x147 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CONSTRUCTL_2=0x148 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CREATEMOSMSCTRLENVELOPEL_1=0x152 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_CREATEMOSMSCTRLENVELOPEL_2=0x153 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_NEWL_1=0x144 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_NEWL_2=0x145 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_NEWL_3=0x146 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_NOTIFY_1=0x149 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_1=0x157 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_2=0x158 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_3=0x159 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_4=0x15a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_PARSENOTIFICATION_5=0x15b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_SETACTIVATIONSTATUS_1=0x154 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYMOSMCONTROLREQUEST_VERIFYNOTIFICATIONDATA_1=0x15c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CANCELNOTIFICATION_1=0x168 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_1=0x169 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_10=0x172 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_11=0x173 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_12=0x174 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_13=0x175 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_14=0x176 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_15=0x177 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_16=0x178 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_2=0x16a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_3=0x16b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_4=0x16c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_5=0x16d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_6=0x16e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_7=0x16f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_8=0x170 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_COMPLETENOTIFYL_9=0x171 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CONSTRUCTL_1=0x166 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_1=0x17e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_2=0x17f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_CREATETERMINALRESPL_3=0x180 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_NEWL_1=0x163 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_NEWL_2=0x164 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_NEWL_3=0x165 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_NOTIFY_1=0x167 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_1=0x179 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_2=0x17a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_3=0x17b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_4=0x17c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYOPENCHANNEL_TERMINALRESPONSEL_5=0x17d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_CANCELNOTIFICATION_1=0x186 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_1=0x187 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_2=0x188 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_3=0x189 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_4=0x18a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_COMPLETENOTIFYL_5=0x18b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_CONSTRUCTL_1=0x184 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_CREATETERMINALRESPL_1=0x190 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_NEWL_1=0x181 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_NEWL_2=0x182 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_NEWL_3=0x183 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_NOTIFY_1=0x185 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_1=0x18c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_2=0x18d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_3=0x18e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPLAYTONE_TERMINALRESPONSEL_4=0x18f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_COMPLETENOTIFYL_1=0x19d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_CONSTRUCTL_1=0x19c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_CREATETERMINALRESPL_1=0x19e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_CREATETERMINALRESPL_2=0x19f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_NEWL_1=0x199 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_NEWL_2=0x19a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINGOFF_NEWL_3=0x19b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_1=0x195 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_COMPLETENOTIFYL_2=0x196 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_CONSTRUCTL_1=0x194 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_1=0x197 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_CREATETERMINALRESPL_2=0x198 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_NEWL_1=0x191 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_NEWL_2=0x192 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYPOLLINTERVAL_NEWL_3=0x193 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_CANCELNOTIFICATION_1=0x1a5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_1=0x1a6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_2=0x1a7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_3=0x1a8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_COMPLETENOTIFYL_4=0x1a9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_CONSTRUCTL_1=0x1a3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_CREATETERMINALRESPL_1=0x1ad +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_NEWL_1=0x1a0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_NEWL_2=0x1a1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_NEWL_3=0x1a2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_NOTIFY_1=0x1a4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_1=0x1aa +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_2=0x1ab +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYRECEIVEDATA_TERMINALRESPONSEL_3=0x1ac +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_CANCELNOTIFICATION_1=0x1b4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_CANCELREFRESHREQUIREDNOTIFICATION_1=0x1b5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEIMSICHANGE_1=0x1c6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEIMSICHANGE_2=0x1c7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_1=0x1b6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_10=0x1bf +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_11=0x1c0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_12=0x1c1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_13=0x1c2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_14=0x1c3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_2=0x1b7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_3=0x1b8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_4=0x1b9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_5=0x1ba +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_6=0x1bb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_7=0x1bc +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_8=0x1bd +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETENOTIFYL_9=0x1be +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEREQUEST1_1=0x1ce +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEREQUEST1_2=0x1cf +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEREQUEST_1=0x1cc +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETEREQUEST_2=0x1cd +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_COMPLETETERMINALRESPDATAL_1=0x1cb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_CONSTRUCTL_1=0x1b1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_CREATETERMINALRESPL_1=0x1c8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NEWL_1=0x1ae +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NEWL_2=0x1af +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NEWL_3=0x1b0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NOTIFYREFRESHREQUIRED_1=0x1b3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_NOTIFY_1=0x1b2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_REFRESHALLOWEDL_1=0x1c9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_REFRESHALLOWEDL_2=0x1ca +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_TERMINALRESPONSEL_1=0x1c4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYREFRESH_TERMINALRESPONSEL_2=0x1c5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_CANCELNOTIFICATION_1=0x1d5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_1=0x1d6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_2=0x1d7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_3=0x1d8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_4=0x1d9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_5=0x1da +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_6=0x1db +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_COMPLETENOTIFYL_7=0x1dc +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_CONSTRUCTL_1=0x1d3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_CREATETERMINALRESPL_1=0x1e4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_1=0x1e5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_2=0x1e6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_3=0x1e7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_4=0x1e8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_HANDLEITEMSL_5=0x1e9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_NEWL_1=0x1d0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_NEWL_2=0x1d1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_NEWL_3=0x1d2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_NOTIFY_1=0x1d4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_1=0x1dd +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_2=0x1de +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_3=0x1df +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_4=0x1e0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_5=0x1e1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_6=0x1e2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSELECTITEM_TERMINALRESPONSEL_7=0x1e3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_CANCELNOTIFICATION_1=0x1ef +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_1=0x1f0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_2=0x1f1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_3=0x1f2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_4=0x1f3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_COMPLETENOTIFYL_5=0x1f4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_CONSTRUCTL_1=0x1ed +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_CREATETERMINALRESPL_1=0x1f8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_CREATETERMINALRESPL_2=0x1f9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_NEWL_1=0x1ea +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_NEWL_2=0x1eb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_NEWL_3=0x1ec +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_NOTIFY_1=0x1ee +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_TERMINALRESPONSEL_1=0x1f5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_TERMINALRESPONSEL_2=0x1f6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDATA_TERMINALRESPONSEL_3=0x1f7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_CANCELNOTIFICATION_1=0x1ff +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_1=0x200 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_2=0x201 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_3=0x202 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_4=0x203 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_5=0x204 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_6=0x205 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_COMPLETENOTIFYL_7=0x206 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_CONSTRUCTL_1=0x1fd +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_CREATETERMINALRESPL_1=0x20a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_NEWL_1=0x1fa +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_NEWL_2=0x1fb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_NEWL_3=0x1fc +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_NOTIFY_1=0x1fe +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_1=0x207 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_2=0x208 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDDTMF_TERMINALRESPONSEL_3=0x209 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CANCELNOTIFICATION_1=0x210 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_1=0x224 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_2=0x225 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_3=0x226 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_4=0x227 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CHECKTPDU_5=0x228 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_1=0x211 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_2=0x212 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_3=0x213 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_4=0x214 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_5=0x215 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_COMPLETENOTIFYL_6=0x216 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CONSTRUCTL_1=0x20e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CREATETERMINALRESPL_1=0x21b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_CREATETERMINALRESPL_2=0x21c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_GETTPDCS_1=0x22a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_GETTPUDL_1=0x229 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_NEWL_1=0x20b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_NEWL_2=0x20c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_NEWL_3=0x20d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_NOTIFY_1=0x20f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_PACKSMS_1=0x22b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_PACKSMS_2=0x22c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_PACKSMS_3=0x22d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_1=0x21d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_2=0x21e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_3=0x21f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_4=0x220 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_5=0x221 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_6=0x222 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_SETALPHAIDANDADDRESSDATA_7=0x223 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_TERMINALRESPONSEL_1=0x217 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_TERMINALRESPONSEL_2=0x218 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_TERMINALRESPONSEL_3=0x219 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSM_TERMINALRESPONSEL_4=0x21a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CANCELNOTIFICATION_1=0x233 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKCALLFORWARDING_1=0x23f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKCALLFORWARDING_2=0x240 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_1=0x241 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_2=0x242 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_3=0x243 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_1=0x234 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_2=0x235 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_3=0x236 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_4=0x237 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_5=0x238 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_6=0x239 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_COMPLETENOTIFYL_7=0x23a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CONSTRUCTL_1=0x231 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_CREATETERMINALRESPL_1=0x23e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_NEWL_1=0x22e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_NEWL_2=0x22f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_NEWL_3=0x230 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_NOTIFY_1=0x232 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_TERMINALRESPONSEL_1=0x23b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_TERMINALRESPONSEL_2=0x23c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDSS_TERMINALRESPONSEL_3=0x23d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_CANCELNOTIFICATION_1=0x249 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_1=0x24a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_2=0x24b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_3=0x24c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_4=0x24d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_5=0x24e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_6=0x24f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_COMPLETENOTIFYL_7=0x250 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_CONSTRUCTL_1=0x247 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_CREATETERMINALRESPL_1=0x255 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_CREATETERMINALRESPL_2=0x256 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_NEWL_1=0x244 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_NEWL_2=0x245 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_NEWL_3=0x246 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_NOTIFY_1=0x248 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_1=0x251 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_2=0x252 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_3=0x253 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSENDUSSD_TERMINALRESPONSEL_4=0x254 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_CANCELNOTIFICATION_1=0x25d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_1=0x25e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_10=0x267 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_11=0x268 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_12=0x269 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_13=0x26a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_14=0x26b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_15=0x26c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_16=0x26d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_17=0x26e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_2=0x25f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_3=0x260 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_4=0x261 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_5=0x262 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_6=0x263 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_7=0x264 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_8=0x265 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_COMPLETENOTIFYL_9=0x266 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_CONSTRUCTL_1=0x25a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_CREATETERMINALRESPL_1=0x272 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_CREATETERMINALRESPL_2=0x273 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NEWL_1=0x257 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NEWL_2=0x258 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NEWL_3=0x259 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NOTIFY_1=0x25b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_NOTIFY_2=0x25c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_STORECALLCONNECTEDEVENT_1=0x274 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_1=0x26f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_2=0x270 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPCALL_TERMINALRESPONSEL_3=0x271 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_CANCELNOTIFICATION_1=0x27a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_1=0x27b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_2=0x27c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_3=0x27d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_4=0x27e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_COMPLETENOTIFYL_5=0x27f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_CONSTRUCTL_1=0x278 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_CREATETERMINALRESPL_1=0x284 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_NEWL_1=0x275 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_NEWL_2=0x276 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_NEWL_3=0x277 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_NOTIFY_1=0x279 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_1=0x280 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_2=0x281 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_3=0x282 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSEL_4=0x283 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_CANCELNOTIFICATION_1=0x28a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_1=0x28b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_2=0x28c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_COMPLETENOTIFYL_3=0x28d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_CONSTRUCTL_1=0x288 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_CREATETERMINALRESPL_1=0x291 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_NEWL_1=0x285 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_NEWL_2=0x286 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_NEWL_3=0x287 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_NOTIFY_1=0x289 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_1=0x28e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_2=0x28f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSEL_3=0x290 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_CANCELNOTIFICATION_1=0x297 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_1=0x298 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_10=0x2a1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_11=0x2a2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_12=0x2a3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_13=0x2a4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_14=0x2a5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_15=0x2a6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_16=0x2a7 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_17=0x2a8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_18=0x2a9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_2=0x299 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_3=0x29a +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_4=0x29b +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_5=0x29c +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_6=0x29d +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_7=0x29e +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_8=0x29f +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_COMPLETENOTIFYL_9=0x2a0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_CONSTRUCTL_1=0x295 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_CREATETERMINALRESPL_1=0x2ac +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_NEWL_1=0x292 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_NEWL_2=0x293 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_NEWL_3=0x294 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_NOTIFY_1=0x296 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_TERMINALRESPONSEL_1=0x2aa +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSETUPMENU_TERMINALRESPONSEL_2=0x2ab +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_CANCELNOTIFICATION_1=0x2b2 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_COMPLETENOTIFYL_1=0x2b3 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_COMPLETENOTIFYL_2=0x2b4 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_CONSTRUCTL_1=0x2b0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_NEWL_1=0x2ad +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_NEWL_2=0x2ae +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_NEWL_3=0x2af +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYSIMSESSIONEND_NOTIFY_1=0x2b1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_1=0x2b9 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_2=0x2ba +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_3=0x2bb +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_4=0x2bc +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_5=0x2bd +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_6=0x2be +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_COMPLETENOTIFYL_7=0x2bf +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_CONSTRUCTL_1=0x2b8 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_CONVERTTOSECONDS_1=0x2c1 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_CREATETERMINALRESPL_1=0x2c0 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_NEWL_1=0x2b5 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_NEWL_2=0x2b6 +[TRACE]TRACE_INTERNALS[0x88]_CSATNOTIFYTIMERMGMT_NEWL_3=0x2b7 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_BEAT_1=0x2c6 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_CHECKTIMERTABLE_1=0x2c8 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_CONSTRUCTL_1=0x2c2 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_CTOR_1=0x2c3 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_CURRENTVALUEOFTIMERBYID_1=0x2ca +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_DELETETIMERBYID_1=0x2c9 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_SETPROACTIVECOMMANDONGOINGSTATUS_1=0x2cb +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_SETPROACTIVECOMMANDONGOINGSTATUS_2=0x2cc +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_START_1=0x2c4 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_STOP_1=0x2c5 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_SYNCHRONIZE_1=0x2c7 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER1_1=0x2ce +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER2_1=0x2cf +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER3_1=0x2d0 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER3_2=0x2d1 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER4_1=0x2d2 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER4_2=0x2d3 +[TRACE]TRACE_INTERNALS[0x88]_CSATTIMER_TTIMER_1=0x2cd +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_CONSTRUCTL_1=0x301 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_NEWL_1=0x2fd +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_NEWL_2=0x2fe +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_NEWL_3=0x2ff +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_NEWL_4=0x300 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_1=0x307 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_2=0x308 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_3=0x309 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_RESETTSYREQHANDLE_4=0x30a +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_1=0x304 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_2=0x305 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_SETTSYREQHANDLE_3=0x306 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_TSYREQHANDLE_1=0x302 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSYREQHANDLESTORE_TSYREQHANDLE_2=0x303 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_CANCELSERVICE_1=0x2e0 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_CANCELSERVICE_2=0x2e1 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_COMPLETESENDSMSMESSAGE_1=0x2f0 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_CONSTRUCTL_1=0x2d8 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_CONSTRUCTL_2=0x2d9 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_DEREGISTERNOTIFICATION_1=0x2e4 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_DEREGISTERNOTIFICATION_2=0x2e5 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_DOEXTFUNCL_1=0x2f5 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_DOEXTFUNCL_2=0x2f6 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_EXTFUNC_1=0x2da +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_EXTFUNC_2=0x2db +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_EXTFUNC_3=0x2dc +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_GETREQHANDLETYPE_1=0x2ef +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_GETSATREQHANDLESTORE_1=0x2ee +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_ISMOSMCONTROLBYSIMACTIVATED_1=0x2f1 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_ISSIMORIGINATEDCALL_1=0x2f2 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_MENUSELECTIONL_1=0x2f7 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_MENUSELECTIONL_2=0x2f8 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_MESSAGEMANAGER_1=0x2ec +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NEWL_1=0x2d4 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NEWL_2=0x2d5 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NEWL_3=0x2d6 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NEWL_4=0x2d7 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NUMBEROFSLOTSL_1=0x2e6 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_NUMBEROFSLOTSL_2=0x2e7 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REGISTERNOTIFICATION_1=0x2e2 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REGISTERNOTIFICATION_2=0x2e3 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REQCOMPLETED_1=0x2e8 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REQMODEL_1=0x2de +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_REQMODEL_2=0x2df +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SATCCTSY_1=0x2ed +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SAVEREQHANDLE_1=0x2dd +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SENDMESSAGENOLOGGING_1=0x2f9 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SENDMESSAGENOLOGGING_2=0x2fa +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SENDMESSAGENOLOGGING_3=0x2fb +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SENDMESSAGENOLOGGING_4=0x2fc +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SETSETUPCALLSTATUS_1=0x2ea +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SETTONNPI_1=0x2f4 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_SETUPEVENTLIST_1=0x2eb +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_STORECALLCONNECTEDEVENT_1=0x2e9 +[TRACE]TRACE_INTERNALS[0x88]_CSATTSY_STOREPROACTIVEADDRESS_1=0x2f3 +[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_DEREGISTERTSYOBJECT_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_GETTSYOBJECT_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CTSYDELEGATES_REGISTERTSYOBJECT_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_ADDTOEVENTLIST_1=0x30e +[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_CTOR_1=0x31e +[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_ISENABLED_1=0x30b +[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_ISENABLED_2=0x30c +[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_REMOVEFROMEVENTLIST_1=0x30d +[TRACE]TRACE_INTERNALS[0x88]_TSATEVENTLIST_SETEVENTLIST_1=0x30f diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/utility/src/cbertlv.cpp --- a/telephonyserverplugins/simatktsy/utility/src/cbertlv.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/utility/src/cbertlv.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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" @@ -21,8 +21,13 @@ // Include Files + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cbertlvTraces.h" +#endif + #include "CBerTlv.h" // Header of this class -#include "tflogger.h" // For logging // External Data Structures // none @@ -76,7 +81,7 @@ TInt itemNbr // Item number ) { - TFLOGSTRING("UTILITY: CBerTlv::TlvByTagValue"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CBERTLV_TLVBYTAGVALUE_1, "UTILITY: CBerTlv::TlvByTagValue"); TInt currentTlv( 0 ); TInt tlvLength( 0 ); TInt index( 0 ); @@ -146,7 +151,7 @@ TUint8 aTlvTagValue // Tag of TLV to find ) { - TFLOGSTRING("UTILITY: CBerTlv::TlvByTagValueMulti"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CBERTLV_TLVBYTAGVALUEMULTI_1, "UTILITY: CBerTlv::TlvByTagValueMulti"); TInt currentTlv( 0 ); TInt16 tlvLength( 0 ); TInt indMulti( 0 ); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/utility/src/ctlv.cpp --- a/telephonyserverplugins/simatktsy/utility/src/ctlv.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/utility/src/ctlv.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -21,7 +21,12 @@ // Include Files -#include "tflogger.h" // For logging + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ctlvTraces.h" +#endif + #include "CTlv.h" // Header of this class #include "TSatUtility.h" // Utility methods @@ -48,7 +53,7 @@ // None ) const { - TFLOGSTRING("UTILITY: CTlvBase::Data"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_DATA_1, "UTILITY: CTlvBase::Data"); return iData; } @@ -63,7 +68,7 @@ TPtrC8 aData ) { - TFLOGSTRING("UTILITY: CTlvBase::SetData"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_SETDATA_1, "UTILITY: CTlvBase::SetData"); iData.Set( aData ); } @@ -77,7 +82,7 @@ // None ) const { - TFLOGSTRING("UTILITY: CTlvBase::GetSize"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETSIZE_1, "UTILITY: CTlvBase::GetSize"); return iData.Length(); } @@ -91,7 +96,7 @@ // None ) const { - TFLOGSTRING("UTILITY: CTlvBase::GetTag"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETTAG_1, "UTILITY: CTlvBase::GetTag"); return TUint8(iData[0] & KTagValueMask); } @@ -105,7 +110,7 @@ // None ) const { - TFLOGSTRING("UTILITY: CTlvBase::GetComprehensionRequired"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETCOMPREHENSIONREQUIRED_1, "UTILITY: CTlvBase::GetComprehensionRequired"); return (iData[0] & KTagCrMask) ? ETrue : EFalse; } @@ -119,7 +124,7 @@ // None ) const { - TFLOGSTRING("UTILITY: CTlvBase::GetLength"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETLENGTH_1, "UTILITY: CTlvBase::GetLength"); return (KTwoByteLengthCoding == iData[KTlvLengthStartPosition]) ? iData[KTlvLengthStartPosition + 1] : iData[KTlvLengthStartPosition]; @@ -135,7 +140,7 @@ // None ) const { - TFLOGSTRING("UTILITY: CTlvBase::GetValue"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLVBASE_GETVALUE_1, "UTILITY: CTlvBase::GetValue"); TInt offset = (KTwoByteLengthCoding == iData[1]) ? 1 : 0; return iData.Mid(2+offset, iData[1+offset]); } @@ -163,7 +168,7 @@ TTlvSpesificDataType aType // Info spesific data type ) { - TFLOGSTRING2("UTILITY: CTlv::GetShortInfo, type: %d", aType); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETSHORTINFO_1, "UTILITY: CTlv::GetShortInfo, type: %d", aType); // Information is generally at index 2. TInt ind ( KTlvDataAreaStartPosition ); TUint8 offset( 0 ); @@ -267,7 +272,7 @@ } default: { - TFLOGSTRING("UTILITY: CTlv::GetShortInfo, Type unknown"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETSHORTINFO_2, "UTILITY: CTlv::GetShortInfo, Type unknown"); break; } } @@ -285,7 +290,7 @@ TTlvSpesificDataType aType //Info spesific data type ) { - TFLOGSTRING2("UTILITY: CTlv::GetData, Data length: %d", iData.Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_1, "UTILITY: CTlv::GetData, Data length: %d", iData.Length()); // Information is generally at index 2. TInt ind ( 2 ); TUint8 offset( 0 ); @@ -379,20 +384,19 @@ } else { - TFLOGSTRING("UTILITY: CTlv::GetData, Data length 0"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_2, "UTILITY: CTlv::GetData, Data length 0"); return 0; } break; } default: { - TFLOGSTRING("UTILITY: CTlv::GetData, Type unknown"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_3, "UTILITY: CTlv::GetData, Type unknown"); break; } } - TFLOGSTRING3("UTILITY: CTlv::GetData, length: %d, ind: %d", - length, ind); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETDATA_4, "UTILITY: CTlv::GetData, length: %d, ind: %d", length, ind); return iData.Mid( ind, length ); } @@ -406,7 +410,7 @@ TTlvSpesificDataType aType // Info spesific data type ) { - TFLOGSTRING2("UTILITY: CTlv::GetLongInfo, type: %d", aType); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETLONGINFO_1, "UTILITY: CTlv::GetLongInfo, type: %d", aType); TUint16 ret( 0x0000 ); switch( aType ) @@ -450,7 +454,7 @@ } default: { - TFLOGSTRING("UTILITY: CTlv::GetLongInfo, Type unknown"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CTLV_GETLONGINFO_2, "UTILITY: CTlv::GetLongInfo, Type unknown"); break; } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/utility/src/tsatutility.cpp --- a/telephonyserverplugins/simatktsy/utility/src/tsatutility.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/utility/src/tsatutility.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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,8 +20,13 @@ // INCLUDE FILES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "tsatutilityTraces.h" +#endif + #include "tsatutility.h" // Class header -#include "tflogger.h" // TFLOGSTRING #include // TON and NPI constants // ----------------------------------------------------------------------------- @@ -36,7 +41,7 @@ RSat::TNumberingPlan* aNpi ) { - TFLOGSTRING( "UTILITY: TSatUtility::TonAndNpi" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_TONANDNPI_1, "UTILITY: TSatUtility::TonAndNpi" ); TInt ton( ( aTonAndNpi >> 4 ) & KTONMask ); // TON mask value 0x07 switch ( ton ) @@ -152,7 +157,7 @@ TDes8& aTarget ) { - TFLOGSTRING( "UTILITY: TSatUtility::Packed7to8Unpacked" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_PACKED7TO8UNPACKED_1, "UTILITY: TSatUtility::Packed7to8Unpacked" ); TInt ret( KErrNone ); // The string is in packed GSM default alphabet format. // Converted to 8-bit format @@ -198,9 +203,7 @@ if ( length < sourceLength ) { ret = KErrOverflow; - TFLOGSTRING2( "UTILITY: TSatUtility::Packed7to8Unpacked,\ - Input data too long. %d bytes could not be converted", - ( sourceLength - length ) ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_PACKED7TO8UNPACKED_2, "UTILITY: TSatUtility::Packed7to8Unpacked,Input data too long. %d bytes could not be converted", ( sourceLength - length ) ); } return ret; @@ -217,7 +220,7 @@ TDes8& aOutput ) { - TFLOGSTRING( "UTILITY: TSatUtility::UCSToPacked7" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_UCSTOPACKED7_1, "UTILITY: TSatUtility::UCSToPacked7" ); TBuf8 string; @@ -284,7 +287,7 @@ TDes8& aOutput ) { - TFLOGSTRING( "UTILITY: TSatUtility::BCDToAscii" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_BCDTOASCII_1, "UTILITY: TSatUtility::BCDToAscii" ); TInt ret( KErrNone ); // Convert Abbreviated dialling numbers format back to ASCII format. @@ -311,8 +314,7 @@ if ( length < aInput.Length() ) { ret = KErrOverflow; - TFLOGSTRING2( "UTILITY: TSatUtility::BCDToAscii,Input data too long.\ - %d bytes could not be converted", ( aInput.Length() - length ) ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_BCDTOASCII_2, "UTILITY: TSatUtility::BCDToAscii,Input data too long.%d bytes could not be converted", ( aInput.Length() - length ) ); } return ret; @@ -330,7 +332,7 @@ TDes8& aOutput ) { - TFLOGSTRING( "UTILITY: TSatUtility::AsciiToBCD" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_ASCIITOBCD_1, "UTILITY: TSatUtility::AsciiToBCD" ); TInt ret( KErrNone ); TInt i; TInt j; @@ -373,7 +375,7 @@ } else { - TFLOGSTRING( "UTILITY: TSatUtility::AsciiToBCD, Overflow!" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_ASCIITOBCD_2, "UTILITY: TSatUtility::AsciiToBCD, Overflow!" ); ret = KErrOverflow; } @@ -381,8 +383,7 @@ } else { - TFLOGSTRING3("UTILITY: TSatUtility::AsciiToBCD -- dropped \ - character %d at i=%d", TInt( aInput[i] ), i ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_ASCIITOBCD_3, "UTILITY: TSatUtility::AsciiToBCD -- dropped character %d at i=%d", TInt( aInput[i] ), i ); } } // For @@ -408,7 +409,7 @@ TDes8& aOutput ) { - TFLOGSTRING( "UTILITY: TSatUtility::RemoveWildAndExpansionDigit" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_REMOVEWILDANDEXPANSIONDIGIT_1, "UTILITY: TSatUtility::RemoveWildAndExpansionDigit" ); aOutput.Zero(); TUint8 i( 0 ); TInt maxLength = aOutput.MaxLength(); @@ -436,7 +437,7 @@ TDes& aAlphaId ) { - TFLOGSTRING( "UTILITY: TSatUtility::SetAlphaId" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_SETALPHAID_1, "UTILITY: TSatUtility::SetAlphaId" ); if ( ( KUCS2ArabicCoding == aRawData[0] ) || ( KUCS2GreekCoding == aRawData[0] ) || ( KUCS2TurkishCoding == aRawData[0] ) ) @@ -463,7 +464,7 @@ const TInt aTime ) { - TFLOGSTRING( "UTILITY: TSatUtility::ConvertToSemiOctet" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTTOSEMIOCTET_1, "UTILITY: TSatUtility::ConvertToSemiOctet" ); // Converting given time to meet the TP-Service-Centre-Time-Stamp format in // 3GPP TS 23.040. @@ -484,7 +485,7 @@ TDes16& aOutput ) { - TFLOGSTRING( "UTILITY: TSatUtility::Convert7BitToUnicode16" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERT7BITTOUNICODE16_1, "UTILITY: TSatUtility::Convert7BitToUnicode16" ); TInt i( 0 ); aOutput.Zero(); @@ -582,7 +583,7 @@ TDes8& aOutput ) { - TFLOGSTRING( "UTILITY: TSatUtility::ConvertUnicode16To7Bit" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTUNICODE16TO7BIT_1, "UTILITY: TSatUtility::ConvertUnicode16To7Bit" ); TInt i( 0 ); TInt j( 0 ); TInt ret( KErrNone ); @@ -616,9 +617,7 @@ if ( length < aInput.Length() ) { ret = KErrOverflow; - TFLOGSTRING2( "UTILITY: TSatUtility::ConvertUnicode16To7Bit,\ - Input data too long. %d bytes could not be converted", - ( aInput.Length() - length ) ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTUNICODE16TO7BIT_2, "UTILITY: TSatUtility::ConvertUnicode16To7Bit,Input data too long. %d bytes could not be converted", ( aInput.Length() - length ) ); } return ret; @@ -635,7 +634,7 @@ RSat::TDuration& aTDuration ) { - TFLOGSTRING( "UTILITY: TSatUtility::FillDurationStructure" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_FILLDURATIONSTRUCTURE_1, "UTILITY: TSatUtility::FillDurationStructure" ); CTlv duration; aTDuration.iTimeUnit = RSat::ENoDurationAvailable; TInt returnValue( aBerTlv.TlvByTagValue( @@ -686,7 +685,7 @@ const TInt aItemNmb ) { - TFLOGSTRING( "UTILITY: TSatUtility::FillIconStructure" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_FILLICONSTRUCTURE_1, "UTILITY: TSatUtility::FillIconStructure" ); CTlv iconId; aTIconId.iQualifier = RSat::ENoIconId; TInt returnValue( aBerTlv.TlvByTagValue( &iconId, KTlvIconIdentifierTag, @@ -719,7 +718,7 @@ TDes& aUnicodeOutput ) { - TFLOGSTRING( "UTILITY: TSatUtility::SetText" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_SETTEXT_1, "UTILITY: TSatUtility::SetText" ); if ( aTextTlv.GetLength() ) { TPtrC8 sourceString; @@ -780,7 +779,7 @@ TDes& aTarget ) { - TFLOGSTRING( "UTILITY: TSatUtility::ConvertAlphaFieldsToUnicode" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_CONVERTALPHAFIELDSTOUNICODE_1, "UTILITY: TSatUtility::ConvertAlphaFieldsToUnicode" ); // ArabicCoding, GreekCoding and TurkishCoding have different coding // methods. There is a tag for each type of alphabet (resp. 80, 81 or 82) // before the text, and there are base pointers used for expanding 1 byte @@ -883,14 +882,14 @@ TDes8& aTarget ) { - TFLOGSTRING( "UTILITY: TSatUtility::Copy16to8LE" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY16TO8LE_1, "UTILITY: TSatUtility::Copy16to8LE" ); TInt ret( KErrNone ); TInt length( 0 ); // Checks that data length are acceblable if ( aSource.Size() > aTarget.MaxSize() ) { - TFLOGSTRING( "UTILITY: TSatUtility::Copy16to8LE, Length exceeded!" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY16TO8LE_2, "UTILITY: TSatUtility::Copy16to8LE, Length exceeded!" ); ret = KErrOverflow; length = ( aTarget.MaxSize() / 2 ); } @@ -920,7 +919,7 @@ TDes16& aTarget ) { - TFLOGSTRING( "UTILITY: TSatUtility::Copy8to16LE" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY8TO16LE_1, "UTILITY: TSatUtility::Copy8to16LE" ); TInt ret( KErrNone ); // Check out which string is the shortest and use its length as a limit TInt length ( Min( ( ( aSource.Length() / 2 ) * 2 ), aTarget.MaxSize() ) ); @@ -935,9 +934,7 @@ if ( length < aSource.Length() ) { ret = KErrOverflow; - TFLOGSTRING2( "UTILITY: TSatUtility::ConvertUnicode16To7Bit,\ - Input data too long. %d bytes could not be converted", - ( aSource.Length() - length ) ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPY8TO16LE_2, "UTILITY: TSatUtility::ConvertUnicode16To7Bit,Input data too long. %d bytes could not be converted", ( aSource.Length() - length ) ); } return ret; @@ -955,7 +952,7 @@ const TUint8 aDcs ) { - TFLOGSTRING("UTILITY: TSatUtility::DecodeCbsDcs"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_DECODECBSDCS_1, "UTILITY: TSatUtility::DecodeCbsDcs"); // Constant values are not defined in order to // avoid confusion with too many constants names. @@ -1038,7 +1035,7 @@ default: { // the DCS value is reserved. - TFLOGSTRING("UTILITY: TSatUtility::DecodeCbsDcs, reserved value"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_DECODECBSDCS_2, "UTILITY: TSatUtility::DecodeCbsDcs, reserved value"); break; } } @@ -1058,7 +1055,7 @@ const TInt aIndex ) { - TFLOGSTRING("UTILITY: TSatUtility::CopyTwo8toOne16LE"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPYTWO8TOONE16LE_1, "UTILITY: TSatUtility::CopyTwo8toOne16LE"); TInt ret( KErrNone ); // Check first that we dont try to read data that is not there.. if ( aSource.Length() > aIndex + 1 ) @@ -1069,8 +1066,7 @@ else { ret = KErrOverflow; - TFLOGSTRING3("UTILITY: TSatUtility::CopyTwo8toOne16LE, Index too high\ - Index: %d, Source data length: %d", aIndex, aSource.Length() ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSATUTILITY_COPYTWO8TOONE16LE_2, "UTILITY: TSatUtility::CopyTwo8toOne16LE, Index too highIndex: %d, Source data length: %d", aIndex, aSource.Length() ); } return ret; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simatktsy/utility/src/ttlv.cpp --- a/telephonyserverplugins/simatktsy/utility/src/ttlv.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simatktsy/utility/src/ttlv.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -21,8 +21,13 @@ // Include Files + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ttlvTraces.h" +#endif + #include "TTlv.h" // Header of this class -#include "tflogger.h" // For logging // External Data Structures // none @@ -75,7 +80,7 @@ TUint8 aTag ) { - TFLOGSTRING("UTILITY: TTlvBase::Begin"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_BEGIN_1, "UTILITY: TTlvBase::Begin"); iData.Zero(); iData.Append( aTag ); iData.Append( 0 ); @@ -91,7 +96,7 @@ TUint8 aTag ) { - TFLOGSTRING("UTILITY: TTlvBase::AddTag"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_ADDTAG_1, "UTILITY: TTlvBase::AddTag"); iData.Append( aTag ); // tag iData.Append( 0 ); // length iLenIndex = iData.Length() - 1; // index to tag length @@ -107,7 +112,7 @@ TUint8 aValue ) { - TFLOGSTRING("UTILITY: TTlvBase::AddByte"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_ADDBYTE_1, "UTILITY: TTlvBase::AddByte"); iData.Append( aValue ); iData[iLenIndex]++; } @@ -122,7 +127,7 @@ const TDesC8& aValue ) { - TFLOGSTRING("UTILITY: TTlvBase::AddData"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_ADDDATA_1, "UTILITY: TTlvBase::AddData"); iData.Append( aValue ); iData[ iLenIndex ] = static_cast( iData[ iLenIndex ] + aValue.Length() ); @@ -140,7 +145,7 @@ // None ) { - TFLOGSTRING("UTILITY: TTlvBase::End"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_END_1, "UTILITY: TTlvBase::End"); _LIT8( KLenTag, "\x81" ); TInt i( 3 ); // Index to tag length @@ -181,7 +186,7 @@ // None ) { - TFLOGSTRING("UTILITY: TTlvBase::GetDataWithoutTopLevelTag"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TTLVBASE_GETDATAWITHOUTTOPLEVELTAG_1, "UTILITY: TTlvBase::GetDataWithoutTopLevelTag"); _LIT8( KLenTag, "\x81" ); TInt i( 1 ); // Index to tag length diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/group/bld.inf --- a/telephonyserverplugins/simtsy/group/bld.inf Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1999-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" @@ -22,9 +22,7 @@ PRJ_EXPORTS ../inc/SimTsy.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(simtsy.h) -#ifdef SYMBIAN_OLD_EXPORT_LOCATION -../inc/Simlog.h /epoc32/include/simlog.h -#endif + ../group/simtsy.iby /epoc32/rom/include/simtsy.iby ../SimTsyCPM/SimTsy.cmi z:/private/101f7988/simtsy.cmi diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/group/configsms.txt --- a/telephonyserverplugins/simtsy/group/configsms.txt Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/group/configsms.txt Tue Jun 22 11:02:32 2010 +0100 @@ -6,104 +6,104 @@ SmsRxPeriod= 2 SmsRx= 01A0, 01632960000 SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A0, 01632960000 -SmsRx= 01A1, 01632960000 -SmsRx= 01A1, 01632960000 -SmsStartRxDelay= 4207, 2, 4 - +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A0, 01632960000 +SmsRx= 01A1, 01632960000 +SmsRx= 01A1, 01632960000 +SmsStartRxDelay= 4207, 2, 4 + SmsAckNackPause= 1 SmsResumePause= 1 SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 -SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 +SmsTx= 01A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A001A0, +441632960000, 12, 01A0, 0 SmsTxPause= 2 -SmsStore= S14, 10 -SmsStoreEntry= S14, 1, 4, 01A2 -SmsStoreIndividualReqPause= 1 -SmsStoreBatchReqPause= 2 +SmsStore= S14, 10 +SmsStoreEntry= S14, 1, 4, 01A2 +SmsStoreIndividualReqPause= 1 +SmsStoreBatchReqPause= 2 diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/group/simtsy.mmp --- a/telephonyserverplugins/simtsy/group/simtsy.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/group/simtsy.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -26,8 +26,6 @@ UID 0x10003D3C 0x100039c2 VENDORID 0x70000001 -MACRO SIM_LOGGER - SOURCEPATH ../src SOURCE CSimCall.cpp SOURCE CSimDataCall.cpp @@ -77,12 +75,12 @@ SOURCE CSimMbmsPacketContext.cpp USERINCLUDE ../inc +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY efsrv.lib euser.lib etel.lib etelmm.lib -LIBRARY testconfigfileparser.lib c32.lib flogger.lib etelpckt.lib -DEBUGLIBRARY comsdbgutil.lib +LIBRARY testconfigfileparser.lib c32.lib etelpckt.lib UNPAGED diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/group/telephony_simtsy.mrp --- a/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_simtsy source \sf\os\cellularsrv\telephonyserverplugins\simtsy binary \sf\os\cellularsrv\telephonyserverplugins\simtsy\group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/inc/CSimMbmsPacketContext.h --- a/telephonyserverplugins/simtsy/inc/CSimMbmsPacketContext.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/inc/CSimMbmsPacketContext.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2008-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" @@ -196,7 +196,7 @@ TInt GetMbmsSessionsPhase2(const TTsyReqHandle aTsyReqHandle, TClientId* aClient, TDes8* aBufSize); TInt GetMbmsSessionsCancel(const TTsyReqHandle aTsyReqHandle); - TInt UpdateMbmsSessionListL(const TTsyReqHandle aTsyReqHandle,TMbmsAction* aAction, TUint* aSessionId); + TInt UpdateMbmsSessionList(const TTsyReqHandle aTsyReqHandle,TMbmsAction* aAction, TUint* aSessionId); TInt UpdateMbmsSessionListCancel(const TTsyReqHandle aTsyReqHandle); TInt InitialiseContext(const TTsyReqHandle aTsyReqHandle, TDes8* aDataChannelV2Pckg); // This method supersedes the LoanCommPort() and RecoverCommPort() methods. diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/inc/Simlog.h --- a/telephonyserverplugins/simtsy/inc/Simlog.h Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,480 +0,0 @@ -// Copyright (c) 2002-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// - -#ifndef _SIMTSYLOG_H_ -#define _SIMTSYLOG_H_ - -/** - * @file - * - * Logging macros for SimTSY. These use the Comms Debug Utility framework - * (aka Flogger V2). - * - * To enable logging create a file called "comsdbg.ini" in the Symbian OS - * "C:\Logs\" directory which contains the following lines: - * - * MEDIA FILE - * LOG SIMTSY Common - * LOG SIMTSY Config - * LOG SIMTSY Phone - * LOG SIMTSY Line - * LOG SIMTSY Call - * LOG SIMTSY Voice - * LOG SIMTSY Data - * LOG SIMTSY Network - * LOG SIMTSY PhBk - * LOG SIMTSY Misc - * LOG SIMTSY Sms - * LOG SIMTSY Packet - * LOG SIMTSY Ss - * - * Each line relates to a particular part of the SIMTSY, enabling you to - * log only the parts of interest. - * - * By default logging is only present on UDEB builds. To enable UREL logging - * on a device, you will need to rebuild your ROM with UDEB SIMTSY components. - * - * To enable logging on a device, place the "comsdbg.ini" file in the ROM - * under the "Z:\Logs\" directory. The log file will be written in the - * "C:\Logs\" directory on the device. - * - * To enable logging to the serial port change the "MEDIA FILE" line to - * "MEDIA SERIAL::1" or "MEDIA SERIAL::2". Note that this may no longer - * work due to a defect in the Comms Debug Framework. - * - * If you wish to have individual logs for each component, then use the - * extractlog.pl utility found in the %EPOCROOT%\Epoc32\Tools\ directory. E.g. - * - * extractlog.pl \EPOC32\WINSCW\C\LOGS\LOG.TXT - * - * @internalComponent - */ - -#include -#include -#include "SimTsy.h" - -#ifdef _DEBUG -#define _SIMTSY_LOGGING_ENABLED -#endif - - -#ifdef _SIMTSY_LOGGING_ENABLED - -#define SIMTSYFLOG1(N,A) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC0(KSIMTSYSubSystem,(N),KLogString); \ - } -#define SIMTSYFLOG2(N,A,B) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC1(KSIMTSYSubSystem,(N),KLogString,(B)); \ - } -#define SIMTSYFLOG3(N,A,B,C) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC2(KSIMTSYSubSystem,(N),KLogString,(B),(C)); \ - } -#define SIMTSYFLOG4(N,A,B,C,D) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC3(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D)); \ - } -#define SIMTSYFLOG5(N,A,B,C,D,E) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC4(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D),(E)); \ - } -#define SIMTSYFLOG6(N,A,B,C,D,E,F) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC5(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D),(E),(F)); \ - } -#define SIMTSYFLOG7(N,A,B,C,D,E,F,G) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC6(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G)); \ - } -#define SIMTSYFLOG8(N,A,B,C,D,E,F,G,H) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC7(KSIMTSYSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G),(H)); \ - } - -_LIT8(KSIMTSYCommon, "Common"); -_LIT8(KSIMTSYConfig, "Config"); -_LIT8(KSIMTSYPhone, "Phone"); -_LIT8(KSIMTSYLine, "Line"); -_LIT8(KSIMTSYCall, "Call"); -_LIT8(KSIMTSYVoice, "Voice"); -_LIT8(KSIMTSYData, "Data"); -_LIT8(KSIMTSYNetwork, "Network"); -_LIT8(KSIMTSYPhBk, "PhBk"); -_LIT8(KSIMTSYMisc, "Misc"); -_LIT8(KSIMTSYSms, "Sms"); -_LIT8(KSIMTSYPacket, "Packet"); -_LIT8(KSIMTSYSs, "Ss"); - - -#define LOGSCOMMON1(A) SIMTSYFLOG1(KSIMTSYCommon,A) -#define LOGSCOMMON2(A,B) SIMTSYFLOG2(KSIMTSYCommon,A,(B)) -#define LOGSCOMMON3(A,B,C) SIMTSYFLOG3(KSIMTSYCommon,A,(B),(C)) -#define LOGSCOMMON4(A,B,C,D) SIMTSYFLOG4(KSIMTSYCommon,A,(B),(C),(D)) -#define LOGSCOMMON5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYCommon,A,(B),(C),(D),(E)) -#define LOGSCOMMON6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYCommon,A,(B),(C),(D),(E),(F)) -#define LOGSCOMMON7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYCommon,A,(B),(C),(D),(E),(F),(G)) -#define LOGSCOMMON8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYCommon,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGSCOMMONTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGSCOMMON5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGCONFIG1(A) SIMTSYFLOG1(KSIMTSYConfig,A) -#define LOGCONFIG2(A,B) SIMTSYFLOG2(KSIMTSYConfig,A,(B)) -#define LOGCONFIG3(A,B,C) SIMTSYFLOG3(KSIMTSYConfig,A,(B),(C)) -#define LOGCONFIG4(A,B,C,D) SIMTSYFLOG4(KSIMTSYConfig,A,(B),(C),(D)) -#define LOGCONFIG5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYConfig,A,(B),(C),(D),(E)) -#define LOGCONFIG6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYConfig,A,(B),(C),(D),(E),(F)) -#define LOGCONFIG7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYConfig,A,(B),(C),(D),(E),(F),(G)) -#define LOGCONFIG8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYConfig,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGCONFIGTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGCONFIG5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } -#define LOGPARSERR(A,B,C,D) LOGCONFIG7("WARNING - CONFIGURATION FILE PARSING - %s at line: %d. Reading element no. %d (%s) from tag %S returned %d.",__FILE__,__LINE__,C,A,D,B) -#define LOGPARSERREXP(A,B,C,D,E) LOGCONFIG8("WARNING - CONFIGURATION FILE PARSING - %s at line: %d. Reading element no. %d (%s) from tag %S returned %d, expected %d.",__FILE__,__LINE__,C,A,D,B,E) -#define LOGPARSERRANGE(A,B,C,D,E) LOGCONFIG8("WARNING - CONFIGURATION FILE PARSING - %s at line: %d. Reading element no. %d (%s) from tag %S returned %d, expected %s.",__FILE__,__LINE__,C,A,D,B,E) - -#define LOGPHONE1(A) SIMTSYFLOG1(KSIMTSYPhone,A) -#define LOGPHONE2(A,B) SIMTSYFLOG2(KSIMTSYPhone,A,(B)) -#define LOGPHONE3(A,B,C) SIMTSYFLOG3(KSIMTSYPhone,A,(B),(C)) -#define LOGPHONE4(A,B,C,D) SIMTSYFLOG4(KSIMTSYPhone,A,(B),(C),(D)) -#define LOGPHONE5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYPhone,A,(B),(C),(D),(E)) -#define LOGPHONE6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYPhone,A,(B),(C),(D),(E),(F)) -#define LOGPHONE7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYPhone,A,(B),(C),(D),(E),(F),(G)) -#define LOGPHONE8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYPhone,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGPHONETIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGPHONE5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - - -#define LOGLINE1(A) SIMTSYFLOG1(KSIMTSYLine,A) -#define LOGLINE2(A,B) SIMTSYFLOG2(KSIMTSYLine,A,(B)) -#define LOGLINE3(A,B,C) SIMTSYFLOG3(KSIMTSYLine,A,(B),(C)) -#define LOGLINE4(A,B,C,D) SIMTSYFLOG4(KSIMTSYLine,A,(B),(C),(D)) -#define LOGLINE5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYLine,A,(B),(C),(D),(E)) -#define LOGLINE6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYLine,A,(B),(C),(D),(E),(F)) -#define LOGLINE7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYLine,A,(B),(C),(D),(E),(F),(G)) -#define LOGLINE8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYLine,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGLINETIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGLINE5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGCALL1(A) SIMTSYFLOG1(KSIMTSYCall,A) -#define LOGCALL2(A,B) SIMTSYFLOG2(KSIMTSYCall,A,(B)) -#define LOGCALL3(A,B,C) SIMTSYFLOG3(KSIMTSYCall,A,(B),(C)) -#define LOGCALL4(A,B,C,D) SIMTSYFLOG4(KSIMTSYCall,A,(B),(C),(D)) -#define LOGCALL5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYCall,A,(B),(C),(D),(E)) -#define LOGCALL6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYCall,A,(B),(C),(D),(E),(F)) -#define LOGCALL7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYCall,A,(B),(C),(D),(E),(F),(G)) -#define LOGCALL8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYCall,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGCALLTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGCALL5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGVOICE1(A) SIMTSYFLOG1(KSIMTSYVoice,A) -#define LOGVOICE2(A,B) SIMTSYFLOG2(KSIMTSYVoice,A,(B)) -#define LOGVOICE3(A,B,C) SIMTSYFLOG3(KSIMTSYVoice,A,(B),(C)) -#define LOGVOICE4(A,B,C,D) SIMTSYFLOG4(KSIMTSYVoice,A,(B),(C),(D)) -#define LOGVOICE5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYVoice,A,(B),(C),(D),(E)) -#define LOGVOICE6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYVoice,A,(B),(C),(D),(E),(F)) -#define LOGVOICE7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYVoice,A,(B),(C),(D),(E),(F),(G)) -#define LOGVOICE8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYVoice,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGVOICETIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGVOICE5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGDATA1(A) SIMTSYFLOG1(KSIMTSYData,A) -#define LOGDATA2(A,B) SIMTSYFLOG2(KSIMTSYData,A,(B)) -#define LOGDATA3(A,B,C) SIMTSYFLOG3(KSIMTSYData,A,(B),(C)) -#define LOGDATA4(A,B,C,D) SIMTSYFLOG4(KSIMTSYData,A,(B),(C),(D)) -#define LOGDATA5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYData,A,(B),(C),(D),(E)) -#define LOGDATA6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYData,A,(B),(C),(D),(E),(F)) -#define LOGDATA7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYData,A,(B),(C),(D),(E),(F),(G)) -#define LOGDATA8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYData,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGDATATIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGDATA5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGNETWORK1(A) SIMTSYFLOG1(KSIMTSYNetwork,A) -#define LOGNETWORK2(A,B) SIMTSYFLOG2(KSIMTSYNetwork,A,(B)) -#define LOGNETWORK3(A,B,C) SIMTSYFLOG3(KSIMTSYNetwork,A,(B),(C)) -#define LOGNETWORK4(A,B,C,D) SIMTSYFLOG4(KSIMTSYNetwork,A,(B),(C),(D)) -#define LOGNETWORK5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYNetwork,A,(B),(C),(D),(E)) -#define LOGNETWORK6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYNetwork,A,(B),(C),(D),(E),(F)) -#define LOGNETWORK7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYNetwork,A,(B),(C),(D),(E),(F),(G)) -#define LOGNETWORK8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYNetwork,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGNETWORKTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGNETWORK5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGPHBK1(A) SIMTSYFLOG1(KSIMTSYPhBk,A) -#define LOGPHBK2(A,B) SIMTSYFLOG2(KSIMTSYPhBk,A,(B)) -#define LOGPHBK3(A,B,C) SIMTSYFLOG3(KSIMTSYPhBk,A,(B),(C)) -#define LOGPHBK4(A,B,C,D) SIMTSYFLOG4(KSIMTSYPhBk,A,(B),(C),(D)) -#define LOGPHBK5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYPhBk,A,(B),(C),(D),(E)) -#define LOGPHBK6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYPhBk,A,(B),(C),(D),(E),(F)) -#define LOGPHBK7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYPhBk,A,(B),(C),(D),(E),(F),(G)) -#define LOGPHBK8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYPhBk,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGPHBKTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGPHBK5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGMISC1(A) SIMTSYFLOG1(KSIMTSYMisc,A) -#define LOGMISC2(A,B) SIMTSYFLOG2(KSIMTSYMisc,A,(B)) -#define LOGMISC3(A,B,C) SIMTSYFLOG3(KSIMTSYMisc,A,(B),(C)) -#define LOGMISC4(A,B,C,D) SIMTSYFLOG4(KSIMTSYMisc,A,(B),(C),(D)) -#define LOGMISC5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYMisc,A,(B),(C),(D),(E)) -#define LOGMISC6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYMisc,A,(B),(C),(D),(E),(F)) -#define LOGMISC7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYMisc,A,(B),(C),(D),(E),(F),(G)) -#define LOGMISC8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYMisc,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGMISCTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGMISC5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGSMS1(A) SIMTSYFLOG1(KSIMTSYSms,A) -#define LOGSMS2(A,B) SIMTSYFLOG2(KSIMTSYSms,A,(B)) -#define LOGSMS3(A,B,C) SIMTSYFLOG3(KSIMTSYSms,A,(B),(C)) -#define LOGSMS4(A,B,C,D) SIMTSYFLOG4(KSIMTSYSms,A,(B),(C),(D)) -#define LOGSMS5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYSms,A,(B),(C),(D),(E)) -#define LOGSMS6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYSms,A,(B),(C),(D),(E),(F)) -#define LOGSMS7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYSms,A,(B),(C),(D),(E),(F),(G)) -#define LOGSMS8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYSms,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGSMSTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGSMS5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGPACKET1(A) SIMTSYFLOG1(KSIMTSYPacket,A) -#define LOGPACKET2(A,B) SIMTSYFLOG2(KSIMTSYPacket,A,(B)) -#define LOGPACKET3(A,B,C) SIMTSYFLOG3(KSIMTSYPacket,A,(B),(C)) -#define LOGPACKET4(A,B,C,D) SIMTSYFLOG4(KSIMTSYPacket,A,(B),(C),(D)) -#define LOGPACKET5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYPacket,A,(B),(C),(D),(E)) -#define LOGPACKET6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYPacket,A,(B),(C),(D),(E),(F)) -#define LOGPACKET7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYPacket,A,(B),(C),(D),(E),(F),(G)) -#define LOGPACKET8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYPacket,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGPACKETTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGPACKET5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGSS1(A) SIMTSYFLOG1(KSIMTSYSs,A) -#define LOGSS2(A,B) SIMTSYFLOG2(KSIMTSYSs,A,(B)) -#define LOGSS3(A,B,C) SIMTSYFLOG3(KSIMTSYSs,A,(B),(C)) -#define LOGSS4(A,B,C,D) SIMTSYFLOG4(KSIMTSYSs,A,(B),(C),(D)) -#define LOGSS5(A,B,C,D,E) SIMTSYFLOG5(KSIMTSYSs,A,(B),(C),(D),(E)) -#define LOGSS6(A,B,C,D,E,F) SIMTSYFLOG6(KSIMTSYSs,A,(B),(C),(D),(E),(F)) -#define LOGSS7(A,B,C,D,E,F,G) SIMTSYFLOG7(KSIMTSYSs,A,(B),(C),(D),(E),(F),(G)) -#define LOGSS8(A,B,C,D,E,F,G,H) SIMTSYFLOG8(KSIMTSYSs,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGSSTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGSS5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - - - -#else // _SIMTSY_LOGGING_ENABLED - -#define LOGSCOMMON1(A) -#define LOGSCOMMON2(A,B) -#define LOGSCOMMON3(A,B,C) -#define LOGSCOMMON4(A,B,C,D) -#define LOGSCOMMON5(A,B,C,D,E) -#define LOGSCOMMON6(A,B,C,D,E,F) -#define LOGSCOMMON7(A,B,C,D,E,F,G) -#define LOGSCOMMON8(A,B,C,D,E,F,G,H) -#define LOGSCOMMONTIMESTAMP() - -#define LOGCONFIG1(A) -#define LOGCONFIG2(A,B) -#define LOGCONFIG3(A,B,C) -#define LOGCONFIG4(A,B,C,D) -#define LOGCONFIG5(A,B,C,D,E) -#define LOGCONFIG6(A,B,C,D,E,F) -#define LOGCONFIG7(A,B,C,D,E,F,G) -#define LOGCONFIG8(A,B,C,D,E,F,G,H) -#define LOGCONFIGTIMESTAMP() - -#define LOGPARSERR(A,B,C,D) -#define LOGPARSERREXP(A,B,C,D,E) -#define LOGPARSERRANGE(A,B,C,D,E) - -#define LOGPHONE1(A) -#define LOGPHONE2(A,B) -#define LOGPHONE3(A,B,C) -#define LOGPHONE4(A,B,C,D) -#define LOGPHONE5(A,B,C,D,E) -#define LOGPHONE6(A,B,C,D,E,F) -#define LOGPHONE7(A,B,C,D,E,F,G) -#define LOGPHONE8(A,B,C,D,E,F,G,H) -#define LOGPHONETIMESTAMP() - -#define LOGLINE1(A) -#define LOGLINE2(A,B) -#define LOGLINE3(A,B,C) -#define LOGLINE4(A,B,C,D) -#define LOGLINE5(A,B,C,D,E) -#define LOGLINE6(A,B,C,D,E,F) -#define LOGLINE7(A,B,C,D,E,F,G) -#define LOGLINE8(A,B,C,D,E,F,G,H) -#define LOGLINETIMESTAMP() - -#define LOGCALL1(A) -#define LOGCALL2(A,B) -#define LOGCALL3(A,B,C) -#define LOGCALL4(A,B,C,D) -#define LOGCALL5(A,B,C,D,E) -#define LOGCALL6(A,B,C,D,E,F) -#define LOGCALL7(A,B,C,D,E,F,G) -#define LOGCALL8(A,B,C,D,E,F,G,H) -#define LOGCALLTIMESTAMP() - -#define LOGVOICE1(A) -#define LOGVOICE2(A,B) -#define LOGVOICE3(A,B,C) -#define LOGVOICE4(A,B,C,D) -#define LOGVOICE5(A,B,C,D,E) -#define LOGVOICE6(A,B,C,D,E,F) -#define LOGVOICE7(A,B,C,D,E,F,G) -#define LOGVOICE8(A,B,C,D,E,F,G,H) -#define LOGVOICETIMESTAMP() - -#define LOGDATA1(A) -#define LOGDATA2(A,B) -#define LOGDATA3(A,B,C) -#define LOGDATA4(A,B,C,D) -#define LOGDATA5(A,B,C,D,E) -#define LOGDATA6(A,B,C,D,E,F) -#define LOGDATA7(A,B,C,D,E,F,G) -#define LOGDATA8(A,B,C,D,E,F,G,H) -#define LOGDATATIMESTAMP() - -#define LOGNETWORK1(A) -#define LOGNETWORK2(A,B) -#define LOGNETWORK3(A,B,C) -#define LOGNETWORK4(A,B,C,D) -#define LOGNETWORK5(A,B,C,D,E) -#define LOGNETWORK6(A,B,C,D,E,F) -#define LOGNETWORK7(A,B,C,D,E,F,G) -#define LOGNETWORK8(A,B,C,D,E,F,G,H) -#define LOGNETWORKTIMESTAMP() - -#define LOGPHBK1(A) -#define LOGPHBK2(A,B) -#define LOGPHBK3(A,B,C) -#define LOGPHBK4(A,B,C,D) -#define LOGPHBK5(A,B,C,D,E) -#define LOGPHBK6(A,B,C,D,E,F) -#define LOGPHBK7(A,B,C,D,E,F,G) -#define LOGPHBK8(A,B,C,D,E,F,G,H) -#define LOGPHBKTIMESTAMP() - -#define LOGMISC1(A) -#define LOGMISC2(A,B) -#define LOGMISC3(A,B,C) -#define LOGMISC4(A,B,C,D) -#define LOGMISC5(A,B,C,D,E) -#define LOGMISC6(A,B,C,D,E,F) -#define LOGMISC7(A,B,C,D,E,F,G) -#define LOGMISC8(A,B,C,D,E,F,G,H) -#define LOGMISCTIMESTAMP() - -#define LOGSMS1(A) -#define LOGSMS2(A,B) -#define LOGSMS3(A,B,C) -#define LOGSMS4(A,B,C,D) -#define LOGSMS5(A,B,C,D,E) -#define LOGSMS6(A,B,C,D,E,F) -#define LOGSMS7(A,B,C,D,E,F,G) -#define LOGSMS8(A,B,C,D,E,F,G,H) -#define LOGSMSTIMESTAMP() - -#define LOGPACKET1(A) -#define LOGPACKET2(A,B) -#define LOGPACKET3(A,B,C) -#define LOGPACKET4(A,B,C,D) -#define LOGPACKET5(A,B,C,D,E) -#define LOGPACKET6(A,B,C,D,E,F) -#define LOGPACKET7(A,B,C,D,E,F,G) -#define LOGPACKET8(A,B,C,D,E,F,G,H) -#define LOGPACKETTIMESTAMP() - -#define LOGSS1(A) -#define LOGSS2(A,B) -#define LOGSS3(A,B,C) -#define LOGSS4(A,B,C,D) -#define LOGSS5(A,B,C,D,E) -#define LOGSS6(A,B,C,D,E,F) -#define LOGSS7(A,B,C,D,E,F,G) -#define LOGSS8(A,B,C,D,E,F,G,H) -#define LOGSSTIMESTAMP() - - - -#endif // _SIMTSY_LOGGING_ENABLED - -#endif // _SIMTSYLOG_H_ - - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimBatteryCharger.cpp --- a/telephonyserverplugins/simtsy/src/CSimBatteryCharger.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimBatteryCharger.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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,10 +20,16 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimBatteryChargerTraces.h" +#endif + #include #include "CSimBatteryCharger.h" #include "CSimPhone.h" -#include "Simlog.h" const TInt KChargerGranularity=5; // < Granularity for Battery Charger list array @@ -68,7 +74,7 @@ iTimer=CSimTimer::NewL(iPhone); iBatteryChargerInfo=new(ELeave) CArrayFixFlat(KChargerGranularity); - LOGMISC1("Starting to parse Battery Charger config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_1, "Starting to parse Battery Charger config parameters..."); TInt count=CfgFile()->ItemCount(KBatteryCharger); const CTestConfigItem* item=NULL; TInt ret=KErrNone; @@ -85,20 +91,20 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KBatteryCharger); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KBatteryCharger); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,status); if(ret!=KErrNone) { - LOGPARSERR("status",ret,1,&KBatteryCharger); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,1,KBatteryCharger); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,level); if(ret!=KErrNone) { - LOGPARSERR("level",ret,2,&KBatteryCharger); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element LEVEL returned %d (element no. %d) from tag %s.",ret,2,KBatteryCharger); continue; } @@ -114,7 +120,7 @@ iBatteryChargerInfo->AppendL(chargerInfo); } - LOGMISC2("Finished parsing Battery Charger config parameters...%d items found",count); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_CONSTRUCTL_5, "Finished parsing Battery Charger config parameters...%d items found",count); if(iBatteryChargerInfo->Count()!=0) { @@ -188,7 +194,7 @@ * @return TInt Standard error value. */ { - LOGMISC1(">>CSimBatteryCharger::GetBatteryInfo"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_GETBATTERYINFO_1, ">>CSimBatteryCharger::GetBatteryInfo"); TPckg* batteryInfoPckg = (TPckg*)aInfo; RMobilePhone::TMobilePhoneBatteryInfoV1& batteryInfo = (*batteryInfoPckg)(); @@ -208,7 +214,7 @@ batteryInfo.iChargeLevel=iCurrentBatteryCharger; batteryInfo.iStatus = iCurrentStatus; - LOGMISC3("<ReqCompleted(aReqHandle,iCurrentErr); return KErrNone; } @@ -223,7 +229,7 @@ * @return TInt Standard error value. */ { - LOGMISC1(">>CSimBatteryCharger::NotifyBatteryInfoChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCHANGE_1, ">>CSimBatteryCharger::NotifyBatteryInfoChange"); TPckg* batteryInfoPckg=(TPckg*)aInfo; RMobilePhone::TMobilePhoneBatteryInfoV1& batteryInfo=(*batteryInfoPckg)(); @@ -255,12 +261,12 @@ { if(iBatteryChargerNotificationPending) { - LOGMISC1("CSimBatteryCharger::NotifyBatteryInfoChange has been cancelled"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCANCEL_1, "CSimBatteryCharger::NotifyBatteryInfoChange has been cancelled"); iBatteryChargerNotificationPending=EFalse; iPhone->ReqCompleted(iBatteryChargerNotificationReqHandle,KErrCancel); } else - LOGMISC1("CSimBatteryCharger::NotifyBatteryInfoChange was not outstanding and hasn't been cancelled"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCANCEL_2, "CSimBatteryCharger::NotifyBatteryInfoChange was not outstanding and hasn't been cancelled"); } @@ -294,7 +300,7 @@ iBatteryChargerNotificationPending=EFalse; (*iBatteryChargerNofificationValue).iChargeLevel=iCurrentBatteryCharger; (*iBatteryChargerNofificationValue).iStatus=iCurrentStatus; - LOGMISC3("<ReqCompleted(iBatteryChargerNotificationReqHandle,iCurrentErr); } iTimer->Start(iBatteryChargerInfo->At(iBatteryChargerIndex).iDuration,this); diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimCall.cpp --- a/telephonyserverplugins/simtsy/src/CSimCall.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimCall.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -21,9 +21,14 @@ @file */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimCallTraces.h" +#endif + #include "CSimCall.h" #include "CSimPhone.h" -#include "Simlog.h" void CSimCall::CloseCall(TAny* aObj) /** @@ -81,7 +86,7 @@ // in order to check the type of request it has CTelObject::TReqMode reqMode=0; - LOGCALL2("CSimCall::ReqModeL called with IPC number %d",aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_REQMODEL_1, "CSimCall::ReqModeL called with IPC number %d",aIpc); switch (aIpc) { // @@ -145,10 +150,10 @@ case EMobileCallNotifyMobileCallStatusChange: case EMobileCallNotifyMobileCallCapsChange: case EMobileCallNotifyRemotePartyInfoChange: - LOGCALL1("CSimCall: Registered with default number of slots"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NUMBEROFSLOTSL_1, "CSimCall: Registered with default number of slots"); return KDefaultNumberOfSlots; default: - LOGCALL1("CSimCall::NumberOfSlotsL: No match for IPC, defering to base function"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NUMBEROFSLOTSL_2, "CSimCall::NumberOfSlotsL: No match for IPC, defering to base function"); break; } return CCallBase::NumberOfSlotsL(aIpc); @@ -290,11 +295,11 @@ * @return KErrNone */ { - LOGCALL1(">>CSimCall::NotifyHookChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGE_1, ">>CSimCall::NotifyHookChange"); iNotifyHookChange.iNotifyPending = ETrue; iNotifyHookChange.iNotifyHandle = aTsyReqHandle; iNotifyHookChange.iNotifyData = aHookStatus; - LOGCALL1("<>CSimCall::NotifyHookChangeCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGECANCEL_1, ">>CSimCall::NotifyHookChangeCancel"); if(iNotifyHookChange.iNotifyPending) { iNotifyHookChange.iNotifyPending=EFalse; ReqCompleted(iNotifyHookChange.iNotifyHandle,KErrCancel); } - LOGCALL1("<>CSimCall::NotifyMobileCallStatusChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGE_1, ">>CSimCall::NotifyMobileCallStatusChange"); __ASSERT_ALWAYS(!iMobileNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); iMobileNotifyStatusChange.iNotifyPending = ETrue; iMobileNotifyStatusChange.iNotifyHandle = aTsyReqHandle; iMobileNotifyStatusChange.iNotifyData = aStatus; - LOGCALL1("<>CSimCall::NotifyMobileCallStatusChangeCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGECANCEL_1, ">>CSimCall::NotifyMobileCallStatusChangeCancel"); if(iMobileNotifyStatusChange.iNotifyPending) { iMobileNotifyStatusChange.iNotifyPending=EFalse; ReqCompleted(iMobileNotifyStatusChange.iNotifyHandle,KErrCancel); } - LOGCALL1("<>CSimCall::NotifyStatusChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGE_1, ">>CSimCall::NotifyStatusChange"); __ASSERT_ALWAYS(!iNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); iNotifyStatusChange.iNotifyPending = ETrue; iNotifyStatusChange.iNotifyHandle = aTsyReqHandle; iNotifyStatusChange.iNotifyData = aStatus; - LOGCALL1("<>CSimCall::NotifyStatusChangeCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGECANCEL_1, ">>CSimCall::NotifyStatusChangeCancel"); if(iNotifyStatusChange.iNotifyPending) { iNotifyStatusChange.iNotifyPending=EFalse; ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrCancel); } - LOGCALL1("<iLineName); - LOGCALL2("CSimCall::GetMobileCallInfo request completed with %d",iState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETMOBILECALLINFO_1, "CSimCall::GetMobileCallInfo request completed with %d",iState); ReqCompleted(aTsyReqHandle,KErrNone); return KErrNone; } @@ -519,10 +524,10 @@ * @return KErrNone */ { - LOGCALL1(">>CSimCall::GetStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETSTATUS_1, ">>CSimCall::GetStatus"); *aCallStatus=GetCoreCallStatus(); ReqCompleted(aTsyReqHandle,KErrNone); - LOGCALL1("<>CSimCall::GetMobileCallStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETMOBILECALLSTATUS_1, ">>CSimCall::GetMobileCallStatus"); *aCallStatus=iState; ReqCompleted(aTsyReqHandle,KErrNone); - LOGCALL1("<>CSimCall::GetCallDuration"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETCALLDURATION_1, ">>CSimCall::GetCallDuration"); iCallDurationHandler->GetDuration(aTime); ReqCompleted(aTsyReqHandle,KErrNone); - LOGCALL1("<>CSimCall::ChangeState 0x%08x [newState=%d] entry", this,aNewState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_CHANGESTATEL_1, ">>CSimCall::ChangeState 0x%08x [newState=%d] entry", (TUint)this,aNewState); if(!aNoPropagation) { @@ -734,7 +739,7 @@ if((aNewState == RMobileCall::EStatusConnected && !aSwap)|| aNewState == RMobileCall::EStatusDisconnecting) iLine->UpdatePhoneNotifiers(this,aNewState); - LOGCALL2("<>CSimCall::UpdateNotifiers 0x%08x entry", this); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_UPDATENOTIFIERS_1, ">>CSimCall::UpdateNotifiers 0x%08x entry", this); // Check for call duration change if (!iCallDurationHandler) @@ -805,7 +810,7 @@ } } - LOGCALL2("<>CSimCall::NotifyRemotePartyInfoChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGE_1, ">>CSimCall::NotifyRemotePartyInfoChange"); __ASSERT_ALWAYS(iNotifyRemotePartyInfoTimer, SimPanic(EOjectNotConstructed)); __ASSERT_ALWAYS(!iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending,SimPanic(ENotificationAlreadyPending)); @@ -1027,7 +1032,7 @@ iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending = ETrue; iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyHandle = aTsyReqHandle; iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyData = &remoteparty; - LOGCALL1("<>CSimCall::NotifyRemotePartyInfoChangeCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGECANCEL_1, ">>CSimCall::NotifyRemotePartyInfoChangeCancel"); if(iNotifyRemotePartyInfoTimer && iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending) { iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyPending=EFalse; ReqCompleted(iNotifyRemotePartyInfoTimer->iNotifyRemotePartyInfo.iNotifyHandle,KErrCancel); } - LOGCALL1("< #include "CSimCallBarring.h" #include "CSimPhone.h" -#include "Simlog.h" // The Mobile Basic Service Groups used - originally were magic numbers from 1 to 6 incl; const TInt KMobServiceIndxStart = 1; @@ -59,13 +65,13 @@ Retrieves all the Call Barring related tags from the config file */ { - LOGCALL1("Starting to parse Call Barring config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_CONSTRUCTL_1, "Starting to parse Call Barring config parameters..."); iPassword.Copy(CfgFile()->ItemValue(KCBPassword,KCBDefaultPassword)); iGetCBStatus = new(ELeave) CArrayPtrFlat(1); FindAndCreateCBListL(); - LOGCALL1("...Finished parsing Call Barring config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_CONSTRUCTL_2, "...Finished parsing Call Barring config parameters..."); } void CSimCallBarring::FindAndCreateCBListL() @@ -74,7 +80,7 @@ Retrieves all the Call barring tags that define the original status of Call barring from the config file */ - LOGCALL1("CSimPhone::FindAndCreateCBListL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_1, "CSimPhone::FindAndCreateCBListL"); RMobilePhone::TMobilePhoneCBInfoEntryV1 entry; iCBList = CMobilePhoneCBList::NewL(); @@ -82,7 +88,7 @@ const CTestConfigItem* item=NULL; TInt ret=KErrNone; - LOGCALL1("Starting to Load and Parse CBList Config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_2, "Starting to Load and Parse CBList Config parameters"); TInt i; for(i=0;iValue(),KStdDelimiter,0,condition); if(ret!=KErrNone) { - LOGPARSERR("condition",ret,0,&KCBList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONDITION returned %d (element no. %d) from tag %s.",ret,0,KCBList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,serviceGroup); if(ret!=KErrNone) { - LOGPARSERR("serviceGroup",ret,1,&KCBList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICEGROUP returned %d (element no. %d) from tag %s.",ret,1,KCBList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,status); if(ret!=KErrNone) { - LOGPARSERR("status",ret,2,&KCBList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_FINDANDCREATECBLISTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,2,KCBList); continue; } @@ -194,7 +200,7 @@ iCBNotification.iCBChangeInfoNotificationPending=ETrue; iCBNotification.iCBChangeInfoReqHandle=aReqHandle; iCBNotification.iCurrentCBCondition=aCB; - LOGCALL1("Finished CSimCallBarring::NotifyCallBarringStatusChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_NOTIFYCALLBARRINGSTATUSCHANGE_1, "Finished CSimCallBarring::NotifyCallBarringStatusChange"); return KErrNone; } @@ -310,7 +316,7 @@ @param aReqData information about the request @param aBufSize Size of the buffer the client has to allocate for the 2nd pahase */ - LOGCALL1("CSimPhone::GetCallBarringStatusPhase1"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_1, "CSimPhone::GetCallBarringStatusPhase1"); TInt ret=KErrNone; TInt leaveCode=KErrNone; @@ -318,7 +324,7 @@ if (leaveCode != KErrNone) iPhone->ReqCompleted(aTsyReqHandle,leaveCode); - LOGCALL1("CSimPhone::GetCallBarringStatusPhase1"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_2, "CSimPhone::GetCallBarringStatusPhase1"); return ret; } @@ -333,7 +339,7 @@ @param aReqData information about the request @param aBufSize Size of the buffer the client has to allocate for the 2nd pahase */ - LOGCALL1("CSimCallBarring::ProcessGetCallBarringStatusPhase1L"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_1, "CSimCallBarring::ProcessGetCallBarringStatusPhase1L"); CMobilePhoneCBList* list=CMobilePhoneCBList::NewL(); CleanupStack::PushL(list); @@ -395,7 +401,7 @@ // Complete first phase of list retrieval iPhone->ReqCompleted(aTsyReqHandle,KErrNone); - LOGCALL1("CSimCallBarring::ProcessGetCallBarringStatusPhase1L"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_2, "CSimCallBarring::ProcessGetCallBarringStatusPhase1L"); return KErrNone; } @@ -408,7 +414,7 @@ @param aClient Ponter to the client @param aBuf Buffer containiong the call barring status list */ - LOGCALL1("CSimCallBarring::GetCallBarringStatusPhase2"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_1, "CSimCallBarring::GetCallBarringStatusPhase2"); CListReadAllAttempt* read=NULL; // Find the get detected network attempt from this client for (TInt i=0; iCount(); ++i) @@ -427,7 +433,7 @@ } } // Should handle error case of not finding the matching client from read all phase 1 - LOGCALL1("CSimCallBarring::GetCallBarringStatusPhase2"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_2, "CSimCallBarring::GetCallBarringStatusPhase2"); return KErrNotFound; } @@ -437,7 +443,7 @@ Cancels a Request to retrieve the call barring status list @param aReqHandle Handle to the request */ - LOGCALL1("CSimCallBarring::GetCallBarringStatusCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_1, "CSimCallBarring::GetCallBarringStatusCancel"); iPhone->ReqCompleted(aTsyReqHandle,KErrNone); // Remove the read all attempt from iGetCBStatus CListReadAllAttempt* read=NULL; @@ -452,7 +458,7 @@ } } iPhone->ReqCompleted(aTsyReqHandle,KErrCancel); - LOGCALL1("CSimCallBarring::GetCallBarringStatusCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_2, "CSimCallBarring::GetCallBarringStatusCancel"); return KErrNone; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimCallForwarding.cpp --- a/telephonyserverplugins/simtsy/src/CSimCallForwarding.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimCallForwarding.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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,10 +20,16 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimCallForwardingTraces.h" +#endif + #include #include "CSimCallForwarding.h" #include "CSimPhone.h" -#include "Simlog.h" const TInt KSettingListGranularity=5; // < The granularity used for parameter list arrays. const TInt KInvalidTimeout = -1; // Value used when timeout period does not matter @@ -59,7 +65,7 @@ Retrieves all the Call forwarding and Identity services tags from the config file */ { - LOGCALL1("Starting to parse Call Forwarding config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_1, "Starting to parse Call Forwarding config parameters..."); iIdentityServiceStatus=new(ELeave) CArrayFixFlat(KSettingListGranularity); @@ -80,13 +86,13 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,service); if(ret!=KErrNone) { - LOGPARSERR("service",ret,0,&KIdentityServiceStatus); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICE returned %d (element no. %d) from tag %s.",ret,0,KIdentityServiceStatus); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,status); if(ret!=KErrNone) { - LOGPARSERR("status",ret,1,&KIdentityServiceStatus); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,1,KIdentityServiceStatus); continue; } @@ -96,7 +102,7 @@ iIdentityServiceStatus->AppendL(identityServiceStatus); } - LOGCALL1("...Finished parsing Call Forwarding config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_CONSTRUCTL_4, "...Finished parsing Call Forwarding config parameters..."); } CSimCallForwarding::~CSimCallForwarding() @@ -179,7 +185,7 @@ /** Creates the Call forwarding list from the config file */ - LOGCALL1("CSimPhone::FindAndCreateCFListL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_1, "CSimPhone::FindAndCreateCFListL"); RMobilePhone::TMobilePhoneCFInfoEntryV1 entry; if(iCFList) @@ -191,7 +197,7 @@ const CTestConfigItem* item=NULL; TInt ret=KErrNone; - LOGCALL1("Starting to Load and Parse CFList Config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_2, "Starting to Load and Parse CFList Config parameters"); TInt i; for(i=0;iValue(),KStdDelimiter,0,condition); if(ret!=KErrNone) { - LOGPARSERR("condition",ret,0,&KCFList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONDITION returned %d (element no. %d) from tag %s.",ret,0,KCFList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,serviceGroup); if(ret!=KErrNone) { - LOGPARSERR("serviceGroup",ret,1,&KCFList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICEGROUP returned %d (element no. %d) from tag %s.",ret,1,KCFList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,status); if(ret!=KErrNone) { - LOGPARSERR("status",ret,2,&KCFList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,2,KCFList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,timeout); if(ret!=KErrNone) { - LOGPARSERR("timeout",ret,3,&KCFList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element TIMEOUT returned %d (element no. %d) from tag %s.",ret,3,KCFList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,number); if(ret!=KErrNone) { - LOGPARSERR("number",ret,4,&KCFList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_FINDANDCREATECFLISTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element NUMBER returned %d (element no. %d) from tag %s.",ret,4,KCFList); continue; } @@ -354,7 +360,7 @@ iCFNotification.iCFChangeInfoNotificationPending=ETrue; iCFNotification.iCFChangeInfoReqHandle=aReqHandle; iCFNotification.iCurrentCFCondition=aCF; - LOGCALL1("Finished CSimCallForwarding::NotifyCallForwardingStatusChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_NOTIFYCALLFORWARDINGSTATUSCHANGE_1, "Finished CSimCallForwarding::NotifyCallForwardingStatusChange"); return KErrNone; } @@ -395,7 +401,7 @@ } iPhone->ReqCompleted(aReqHandle,err); - LOGCALL1("Finished CSimCallForwarding::SetCallForwardingStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_SETCALLFORWARDINGSTATUS_1, "Finished CSimCallForwarding::SetCallForwardingStatus"); return KErrNone; } @@ -420,7 +426,7 @@ @param aReqData contains details of the request @param aBufSize size of the buffer the client needs to allocate for phase 2 */ - LOGCALL1("CSimPhone::GetCallForwardingStatusPhase1"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_1, "CSimPhone::GetCallForwardingStatusPhase1"); TInt ret=KErrNone; // for forwarding we cannot querry for all conditions; @@ -439,7 +445,7 @@ if (leaveCode != KErrNone) iPhone->ReqCompleted(aTsyReqHandle,leaveCode); } - LOGCALL1("CSimPhone::GetCallForwardingStatusPhase1"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_2, "CSimPhone::GetCallForwardingStatusPhase1"); return ret; } @@ -455,7 +461,7 @@ @param aBufSize Size of the buffer the client has to allocate for the 2nd pahase */ - LOGCALL1("CSimPhone::ProcessGetCallForwardingStatusPhase1L"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_1, "CSimPhone::ProcessGetCallForwardingStatusPhase1L"); CMobilePhoneCFList* list=CMobilePhoneCFList::NewL(); CleanupStack::PushL(list); @@ -503,7 +509,7 @@ // Complete first phase of list retrieval iPhone->ReqCompleted(aTsyReqHandle,KErrNone); - LOGCALL1("CSimPhone::ProcessGetCallForwardingStatusPhase1L"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_2, "CSimPhone::ProcessGetCallForwardingStatusPhase1L"); return KErrNone; } @@ -516,7 +522,7 @@ @param aBuf buffer that contains the call forwarding list */ { - LOGCALL1("CSimPhone::GetCallForwardingStatusPhase2"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_1, "CSimPhone::GetCallForwardingStatusPhase2"); CListReadAllAttempt* read=NULL; // Find the get detected network attempt from this client for (TInt i=0; iCount(); ++i) @@ -535,7 +541,7 @@ } } // Should handle error case of not finding the matching client from read all phase 1 - LOGCALL1("CSimPhone::GetCallForwardingStatusPhase2"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_2, "CSimPhone::GetCallForwardingStatusPhase2"); return KErrNotFound; } @@ -546,7 +552,7 @@ Cancel the request to retrieve the status of call forwarding @param aTsyReqHandle handle to the request */ - LOGCALL1("CSimPhone::GetCallForwardingStatusCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_1, "CSimPhone::GetCallForwardingStatusCancel"); iPhone->ReqCompleted(aTsyReqHandle,KErrNone); // Remove the read all attempt from iGetCFStatus CListReadAllAttempt* read=NULL; @@ -561,7 +567,7 @@ } } iPhone->ReqCompleted(aTsyReqHandle,KErrCancel); - LOGCALL1("CSimPhone::GetCallForwardingStatusCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_2, "CSimPhone::GetCallForwardingStatusCancel"); return KErrNone; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimCallWaiting.cpp --- a/telephonyserverplugins/simtsy/src/CSimCallWaiting.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimCallWaiting.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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,11 +20,16 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimCallWaitingTraces.h" +#endif + #include #include "CSimCallWaiting.h" #include "CSimPhone.h" -#include "Simlog.h" - const TInt KMobServiceIndxStart = 1; const TInt KMobServiceIndxEnd = 5; @@ -58,11 +63,11 @@ Retrieves all the Call waiting related tags from the config file */ { - LOGCALL1("Starting to parse Call waiting config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_CONSTRUCTL_1, "Starting to parse Call waiting config parameters..."); iGetCWStatus = new(ELeave) CArrayPtrFlat(1); FindAndCreateCWListL(); - LOGCALL1("...Finished parsing Call waiting config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_CONSTRUCTL_2, "...Finished parsing Call waiting config parameters..."); } void CSimCallWaiting::FindAndCreateCWListL() @@ -71,7 +76,7 @@ Retrieves all the Call waiting tags that define the original status of Call waiting from the config file */ - LOGCALL1("CSimPhone::FindAndCreateCWListL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_FINDANDCREATECWLISTL_1, "CSimPhone::FindAndCreateCWListL"); RMobilePhone::TMobilePhoneCWInfoEntryV1 entry; iCWList = CMobilePhoneCWList::NewL(); @@ -79,7 +84,7 @@ const CTestConfigItem* item=NULL; TInt ret=KErrNone; - LOGCALL1("Starting to Load and Parse CWList Config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_FINDANDCREATECWLISTL_2, "Starting to Load and Parse CWList Config parameters"); TInt i; for(i=0;iValue(),KStdDelimiter,0,serviceGroup); if(ret!=KErrNone) { - LOGPARSERR("serviceGroup",ret,0,&KCWList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_FINDANDCREATECWLISTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICEGROUP returned %d (element no. %d) from tag %s.",ret,0,KCWList); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,status); if(ret!=KErrNone) { - LOGPARSERR("status",ret,1,&KCWList); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_FINDANDCREATECWLISTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,1,KCWList); continue; } @@ -181,7 +186,7 @@ iCWNotification.iCWChangeInfoNotificationPending=ETrue; iCWNotification.iCWChangeInfoReqHandle=aReqHandle; iCWNotification.iCWInfo=aCW; - LOGCALL1("Finished CSimCallWaiting::NotifyCallWaitingStatusChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_NOTIFYCALLWAITINGSTATUSCHANGE_1, "Finished CSimCallWaiting::NotifyCallWaitingStatusChange"); return KErrNone; } @@ -282,7 +287,7 @@ @param aReqData information about the request @param aBufSize Size of the buffer the client has to allocate for the 2nd pahase */ - LOGCALL1("CSimCallWaiting::GetCalWaitingStatusPhase1"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE1_1, "CSimCallWaiting::GetCalWaitingStatusPhase1"); TInt ret=KErrNone; TInt leaveCode=KErrNone; @@ -290,7 +295,7 @@ if (leaveCode != KErrNone) iPhone->ReqCompleted(aTsyReqHandle,leaveCode); - LOGCALL1("CSimCallWaiting::GetCalWaitingStatusPhase1"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE1_2, "CSimCallWaiting::GetCalWaitingStatusPhase1"); return ret; } @@ -305,7 +310,7 @@ @param aReqData information about the request @param aBufSize Size of the buffer the client has to allocate for the 2nd pahase */ - LOGCALL1("CSimCallWaiting::ProcessGetCallWaitingStatusPhase1L"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_PROCESSGETCALLWAITINGSTATUSPHASE1L_1, "CSimCallWaiting::ProcessGetCallWaitingStatusPhase1L"); CMobilePhoneCWList* list=CMobilePhoneCWList::NewL(); CleanupStack::PushL(list); @@ -356,7 +361,7 @@ // Complete first phase of list retrieval iPhone->ReqCompleted(aTsyReqHandle,KErrNone); - LOGCALL1("CSimCallWaiting::ProcessGetCallWaitingStatusPhase1L"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_PROCESSGETCALLWAITINGSTATUSPHASE1L_2, "CSimCallWaiting::ProcessGetCallWaitingStatusPhase1L"); return KErrNone; } @@ -369,7 +374,7 @@ @param aClient Ponter to the client @param aBuf Buffer containiong the call waiting status list */ - LOGCALL1("CSimCallWaiting::GetCallWaitingStatusPhase2"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE2_1, "CSimCallWaiting::GetCallWaitingStatusPhase2"); CListReadAllAttempt* read=NULL; // Find the get detected network attempt from this client for (TInt i=0; iCount(); ++i) @@ -388,7 +393,7 @@ } } // Should handle error case of not finding the matching client from read all phase 1 - LOGCALL1("CSimCallWaiting::GetCallWaitingStatusPhase2"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE2_2, "CSimCallWaiting::GetCallWaitingStatusPhase2"); return KErrNotFound; } @@ -398,7 +403,7 @@ Cancels a Request to retrieve the call waiting status list @param aReqHandle Handle to the request */ - LOGCALL1("CSimCallWaiting::GetCallWaitingStatusCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSCANCEL_1, "CSimCallWaiting::GetCallWaitingStatusCancel"); iPhone->ReqCompleted(aTsyReqHandle,KErrNone); // Remove the read all attempt from iGetCBStatus CListReadAllAttempt* read=NULL; @@ -413,7 +418,7 @@ } } iPhone->ReqCompleted(aTsyReqHandle,KErrCancel); - LOGCALL1("CSimCallWaiting::GetCallWaitingStatusCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALLWAITING_GETCALLWAITINGSTATUSCANCEL_2, "CSimCallWaiting::GetCallWaitingStatusCancel"); return KErrNone; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimContextHelper.cpp --- a/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -14,10 +14,16 @@ // + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimContextHelperTraces.h" +#endif + #include "CSimContextHelper.h" #include "CSimPacketContext.h" -#include "Simlog.h" //const RPacketContext::TContextConfigGPRS& aContextConfigV1 void CSimContextHelper::SetTContextConfigParamFromTContextConfigGPRS( TContextConfigParam& aContextConfigToSet, const RPacketContext::TContextConfigGPRS& aContextConfigV1 ) @@ -218,7 +224,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,protocolType); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigParams::protocolType",ret,0,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PROTOCOLTYPE returned %d (element no. %d) from tag %s.",ret,0,aTag); continue; } else @@ -231,7 +237,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,gsnAddress); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigParams::gsnAddress",ret,1,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::GSNADDRESS returned %d (element no. %d) from tag %s.",ret,1,aTag); continue; } else @@ -244,7 +250,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,protocolAddress); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigParams::protocolAddress",ret,2,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PROTOCOLADDRESS returned %d (element no. %d) from tag %s.",ret,2,aTag); continue; } else @@ -260,7 +266,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,pdpCompression); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigParams::pdpCompression",ret,3,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PDPCOMPRESSION returned %d (element no. %d) from tag %s.",ret,3,aTag); continue; } else @@ -295,7 +301,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,pdpHeaderCompression); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigParams::pdpHeaderCompression",ret,12,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PDPHEADERCOMPRESSION returned %d (element no. %d) from tag %s.",ret,12,aTag); continue; } else @@ -307,7 +313,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,pdpDataCompression); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigParams::pdpDataCompression",ret,13,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::PDPDATACOMPRESSION returned %d (element no. %d) from tag %s.",ret,13,aTag); continue; } else @@ -328,7 +334,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,anonymousAccess); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigParams::anonymousAccess",ret,4,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::ANONYMOUSACCESS returned %d (element no. %d) from tag %s.",ret,4,aTag); continue; } else @@ -355,7 +361,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,useEdge); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigParams::useEdge",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGPARAMS::USEEDGE returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); continue; } else @@ -377,7 +383,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,protocol); if(ret!=KErrNone) { - LOGPARSERR("ProtocolConfigOption::protocol",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::PROTOCOL returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); } else { @@ -398,7 +404,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,username); if(ret!=KErrNone) { - LOGPARSERR("ProtocolConfigOption::username",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::USERNAME returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); } else { @@ -419,7 +425,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,password); if(ret!=KErrNone) { - LOGPARSERR("ProtocolConfigOption::password",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::PASSWORD returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); } else { @@ -440,7 +446,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,challenge); if(ret!=KErrNone) { - LOGPARSERR("ProtocolConfigOption::challenge",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::CHALLENGE returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); } else { @@ -461,7 +467,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,response); if(ret!=KErrNone) { - LOGPARSERR("ProtocolConfigOption::response",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::RESPONSE returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); } else { @@ -482,7 +488,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,primaryDNS); if(ret!=KErrNone) { - LOGPARSERR("ProtocolConfigOption::primaryDNS",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::PRIMARYDNS returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); } else { @@ -503,7 +509,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,secondaryDNS); if(ret!=KErrNone) { - LOGPARSERR("ProtocolConfigOption::secondaryDNS",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::SECONDARYDNS returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); } else { @@ -524,7 +530,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterField,id); if(ret!=KErrNone) { - LOGPARSERR("ProtocolConfigOption::id",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::ID returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); } else { @@ -553,7 +559,7 @@ if(ret!=KErrNone) { - LOGPARSERR("ProtocolConfigOption::numAdditionalParams",ret,delimiterField,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::NUMADDITIONALPARAMS returned %d (element no. %d) from tag %s.",ret,delimiterField,aTag); } else { @@ -598,7 +604,7 @@ ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,0,additionalParamId); if(ret!=KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamId",ret,0,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMID returned %d (element no. %d) from tag %s.",ret,0,aTag); continue; } else @@ -609,7 +615,7 @@ } else { - LOGPARSERR("AdditionalParamItem::additionalParamId",KErrArgument,0,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMID returned %d (element no. %d) from tag %s.",KErrArgument,0,aTag); continue; } } @@ -621,14 +627,14 @@ { // AdditionalParamDataFormat not been specified, // default to plain ASCII - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",ret,2,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",ret,2,aTag); format = EConfigDataFormatAscii; } else { if (AsciiToNum(additionalParamDataFormat, format) != KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,aTag); format = EConfigDataFormatAscii; } @@ -637,7 +643,7 @@ // default to ASCII if not. if (format >= EMaxConfigDataFormat) { - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,aTag); format = EConfigDataFormatAscii; } } @@ -646,7 +652,7 @@ ret=CTestConfig::GetElement(item2->Value(),KStdDelimiter,1,additionalParamData); if(ret!=KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamContent",ret,1,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",ret,1,aTag); continue; } else @@ -663,7 +669,7 @@ if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamContent",KErrArgument,1,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",KErrArgument,1,aTag); SimPanic(EInvalidParameterFormatInConfigFile); } TPtr8 additionalParamDataPtr(const_cast(additionalParamDataBuffer.Ptr()), diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimDataCall.cpp --- a/telephonyserverplugins/simtsy/src/CSimDataCall.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimDataCall.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -21,10 +21,16 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimDataCallTraces.h" +#endif + #include #include "CSimDataCall.h" #include "CSimPhone.h" -#include "Simlog.h" CSimDataCall* CSimDataCall::NewL(CSimLine* aLine,const TDesC& aName, CSimPhone* aPhone) /** @@ -61,7 +67,7 @@ * @param aName name of the data call to be constructed */ { - LOGDATA1("Starting to parse Data Call config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_1, "Starting to parse Data Call config parameters..."); iDiallingPause=iLine->CfgFile()->ItemValue(KDiallingPauseDuration,KDefaultDiallingPauseDuration); iConnectingPause=iLine->CfgFile()->ItemValue(KConnectingPauseDuration,KDefaultConnectingPauseDuration); @@ -83,7 +89,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,speedCaps); if(ret!=KErrNone) { - LOGPARSERR("speedCaps",ret,0,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SPEEDCAPS returned %d (element no. %d) from tag %s.",ret,0,KDataCallCaps); } else if(AsciiToNum(speedCaps, digit)==KErrNone) @@ -92,7 +98,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,protocolCaps); if(ret!=KErrNone) { - LOGPARSERR("protocolCaps",ret,1,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCAPS returned %d (element no. %d) from tag %s.",ret,1,KDataCallCaps); } else if(AsciiToNum(protocolCaps, digit)==KErrNone) @@ -101,7 +107,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,serviceCaps); if(ret!=KErrNone) { - LOGPARSERR("serviceCaps",ret,2,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SERVICECAPS returned %d (element no. %d) from tag %s.",ret,2,KDataCallCaps); } else if(AsciiToNum(serviceCaps, digit)==KErrNone) @@ -111,7 +117,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,qosCaps); if(ret!=KErrNone) { - LOGPARSERR("qosCaps",ret,3,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSCAPS returned %d (element no. %d) from tag %s.",ret,3,KDataCallCaps); } else if(AsciiToNum(qosCaps, digit)==KErrNone) @@ -120,7 +126,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,hscsdSupport); if(ret!=KErrNone) { - LOGPARSERR("hscsdSupport",ret,4,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element HSCSDSUPPORT returned %d (element no. %d) from tag %s.",ret,4,KDataCallCaps); } else iMobileCallCaps.iHscsdSupport = hscsdSupport; @@ -128,7 +134,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,mClass); if(ret!=KErrNone) { - LOGPARSERR("mClass",ret,5,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element MCLASS returned %d (element no. %d) from tag %s.",ret,5,KDataCallCaps); } else iMobileCallCaps.iMClass = mClass; @@ -136,7 +142,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,MaxRxTimeslots); if(ret!=KErrNone) { - LOGPARSERR("MaxRxTimeslots",ret,6,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXRXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,6,KDataCallCaps); } else iMobileCallCaps.iMaxRxTimeSlots = MaxRxTimeslots; @@ -144,7 +150,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,MaxTxTimeslots); if(ret!=KErrNone) { - LOGPARSERR("MaxTxTimeslots",ret,7,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXTXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,7,KDataCallCaps); } else iMobileCallCaps.iMaxTxTimeSlots = MaxTxTimeslots; @@ -153,7 +159,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,totalRxTxTimeslots); if(ret!=KErrNone) { - LOGPARSERR("totalRxTxTimeslots",ret,8,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element TOTALRXTXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,8,KDataCallCaps); } else iMobileCallCaps.iTotalRxTxTimeSlots = totalRxTxTimeslots; @@ -162,7 +168,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,codingCaps); if(ret!=KErrNone) { - LOGPARSERR("codingCaps",ret,9,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element CODINGCAPS returned %d (element no. %d) from tag %s.",ret,9,KDataCallCaps); } else if(AsciiToNum(codingCaps, digit)==KErrNone) @@ -171,7 +177,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,asymmetryCaps); if(ret!=KErrNone) { - LOGPARSERR("asymmetryCaps",ret,10,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element ASYMMETRYCAPS returned %d (element no. %d) from tag %s.",ret,10,KDataCallCaps); } else if(AsciiToNum(asymmetryCaps, digit)==KErrNone) @@ -180,7 +186,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,userInitUpgrade); if(ret!=KErrNone) { - LOGPARSERR("userInitUpgrade",ret,11,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element USERINITUPGRADE returned %d (element no. %d) from tag %s.",ret,11,KDataCallCaps); } else iMobileCallCaps.iUserInitUpgrade = userInitUpgrade; @@ -189,7 +195,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,rlpVersionCaps); if(ret!=KErrNone) { - LOGPARSERR("rlpVersionCaps",ret,10,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element RLPVERSIONCAPS returned %d (element no. %d) from tag %s.",ret,10,KDataCallCaps); } else if(AsciiToNum(rlpVersionCaps, digit)==KErrNone) @@ -198,7 +204,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,v42bisCaps); if(ret!=KErrNone) { - LOGPARSERR("v42bisCaps",ret,10,&KDataCallCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element V42BISCAPS returned %d (element no. %d) from tag %s.",ret,10,KDataCallCaps); } else if(AsciiToNum(v42bisCaps, digit)==KErrNone) @@ -241,7 +247,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,iRlpVersion); if(ret!=KErrNone) { - LOGPARSERR("iRlpVersion",ret,0,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element IRLPVERSION returned %d (element no. %d) from tag %s.",ret,0,KDataRLPparams); } else iMobileCallRLPItem.iRlpVersion = iRlpVersion; @@ -249,7 +255,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,iIWSMax); if(ret!=KErrNone) { - LOGPARSERR("iIWSMax",ret,0,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element IIWSMAX returned %d (element no. %d) from tag %s.",ret,0,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iIWSMax = iIWSMax; @@ -257,7 +263,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,iIWSMin); if(ret!=KErrNone) { - LOGPARSERR("iIWSMin",ret,1,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element IIWSMIN returned %d (element no. %d) from tag %s.",ret,1,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iIWSMin = iIWSMin; @@ -265,7 +271,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,iMWSMax); if(ret!=KErrNone) { - LOGPARSERR("iMWSMax",ret,2,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element IMWSMAX returned %d (element no. %d) from tag %s.",ret,2,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iMWSMax = iMWSMax; @@ -274,7 +280,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iMWSMin); if(ret!=KErrNone) { - LOGPARSERR("iMWSMin",ret,3,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element IMWSMIN returned %d (element no. %d) from tag %s.",ret,3,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iMWSMin = iMWSMin; @@ -282,7 +288,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,iT1Max); if(ret!=KErrNone) { - LOGPARSERR("iT1Max",ret,4,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element IT1MAX returned %d (element no. %d) from tag %s.",ret,4,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iT1Max = iT1Max; @@ -290,7 +296,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,iT1Min); if(ret!=KErrNone) { - LOGPARSERR("iT1Min",ret,5,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element IT1MIN returned %d (element no. %d) from tag %s.",ret,5,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iT1Min = iT1Min; @@ -298,7 +304,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,iN2Max); if(ret!=KErrNone) { - LOGPARSERR("iN2Max",ret,6,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element IN2MAX returned %d (element no. %d) from tag %s.",ret,6,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iN2Max = iN2Max; @@ -306,7 +312,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,iN2Min); if(ret!=KErrNone) { - LOGPARSERR("iN2Min",ret,7,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element IN2MIN returned %d (element no. %d) from tag %s.",ret,7,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iN2Min = iN2Min; @@ -314,7 +320,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,iT4Max); if(ret!=KErrNone) { - LOGPARSERR("iT4Max",ret,8,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element IT4MAX returned %d (element no. %d) from tag %s.",ret,8,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iT4Max = iT4Max; @@ -322,7 +328,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,iT4Min); if(ret!=KErrNone) { - LOGPARSERR("iT4Min",ret,9,&KDataRLPparams); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element IT4MIN returned %d (element no. %d) from tag %s.",ret,9,KDataRLPparams); } else iMobileCallRLPItem.iMobileCallRLP.iT4Min = iT4Min; @@ -357,7 +363,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,iAiur); if(ret!=KErrNone) { - LOGPARSERR("iAiur",ret,0,&KDynamicHSCSDInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element IAIUR returned %d (element no. %d) from tag %s.",ret,0,KDynamicHSCSDInfo); } else if(AsciiToNum(iAiur, digit)==KErrNone) @@ -366,7 +372,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,iRxTimeSlots); if(ret!=KErrNone) { - LOGPARSERR("iRxTimeSlots",ret,1,&KDynamicHSCSDInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_28, "WARNING - CONFIGURATION FILE PARSING - Reading element IRXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,1,KDynamicHSCSDInfo); } else iHscsdInfo.iRxTimeSlots = iRxTimeSlots; @@ -374,7 +380,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,iTxTimeSlots); if(ret!=KErrNone) { - LOGPARSERR("iTxTimeSlots",ret,2,&KDynamicHSCSDInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_29, "WARNING - CONFIGURATION FILE PARSING - Reading element ITXTIMESLOTS returned %d (element no. %d) from tag %s.",ret,2,KDynamicHSCSDInfo); } else iHscsdInfo.iTxTimeSlots = iTxTimeSlots; @@ -382,7 +388,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iCodings); if(ret!=KErrNone) { - LOGPARSERR("iCodings",ret,3,&KDynamicHSCSDInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_30, "WARNING - CONFIGURATION FILE PARSING - Reading element ICODINGS returned %d (element no. %d) from tag %s.",ret,3,KDynamicHSCSDInfo); } else if(AsciiToNum(iCodings, digit)==KErrNone) @@ -403,7 +409,7 @@ TInt err=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,csyName); // The 3rd parameter (0) represents the index of the variable on the config file line if (err!=KErrNone) { - LOGPARSERR("csyName",err,0,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_31, "WARNING - CONFIGURATION FILE PARSING - Reading element CSYNAME returned %d (element no. %d) from tag %s.",err,0,KCommSetup); iCsyName.Copy(KDefaultCsyName); } else @@ -412,7 +418,7 @@ err=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,portName); // The 3rd parameter (1) represents the index of the variable on the config file line if (err!=KErrNone) { - LOGPARSERR("portName",err,1,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_32, "WARNING - CONFIGURATION FILE PARSING - Reading element PORTNAME returned %d (element no. %d) from tag %s.",err,1,KCommSetup); iPortName.Copy(KDefaultPortName); } else @@ -422,7 +428,7 @@ err=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,dataRate); // The 3rd parameter (2) represents the index of the variable on the config file line if (err!=KErrNone) { - LOGPARSERR("dataRate",err,2,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element DATARATE returned %d (element no. %d) from tag %s.",err,2,KCommSetup); iConfig.iRate=KDefaultCommPortRate; } else @@ -431,7 +437,7 @@ err=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,handshake); // The 3rd parameter (3) represents the index of the variable on the config file line if (err!=KErrNone) { - LOGPARSERR("handshake",err,3,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element HANDSHAKE returned %d (element no. %d) from tag %s.",err,3,KCommSetup); iConfig.iHandshake=KDefaultHandshake; } else @@ -453,7 +459,7 @@ TInt err=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,bearerCaps); // The 3rd parameter (0) represents the index of the variable on the config file line if (err!=KErrNone) { - LOGPARSERR("bearerCaps",err,0,&KBearerService); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element BEARERCAPS returned %d (element no. %d) from tag %s.",err,0,KBearerService); iBearerService.iBearerCaps=KDefaultBearerCaps; } else @@ -462,7 +468,7 @@ err=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,bearerSpeed); // The 3rd parameter (1) represents the index of the variable on the config file line if (err!=KErrNone) { - LOGPARSERR("bearerSpeed",err,1,&KBearerService); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_36, "WARNING - CONFIGURATION FILE PARSING - Reading element BEARERSPEED returned %d (element no. %d) from tag %s.",err,1,KBearerService); iBearerService.iBearerSpeed=KDefaultBearerSpeed; } else @@ -492,17 +498,17 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,delay); if(ret!=KErrNone) { - LOGPARSERR("delay",ret,0,&KNotifyRemotePartyInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_37, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAY returned %d (element no. %d) from tag %s.",ret,0,KNotifyRemotePartyInfo); } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,callingname); if(ret!=KErrNone) { - LOGPARSERR("callingname",ret,1,&KNotifyRemotePartyInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_38, "WARNING - CONFIGURATION FILE PARSING - Reading element CALLINGNAME returned %d (element no. %d) from tag %s.",ret,1,KNotifyRemotePartyInfo); } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,remotenumber); if(ret!=KErrNone) { - LOGPARSERR("remotenumber",ret,2,&KNotifyRemotePartyInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_39, "WARNING - CONFIGURATION FILE PARSING - Reading element REMOTENUMBER returned %d (element no. %d) from tag %s.",ret,2,KNotifyRemotePartyInfo); } iNotifyRemotePartyInfoTimer->iDelay = delay; @@ -518,7 +524,7 @@ iNotifyRemotePartyInfoTimer->iRemotePartyInfoV1.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown; } - LOGDATA1("...Finished parsing Data Call config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_40, "...Finished parsing Data Call config parameters..."); } CSimDataCall::~CSimDataCall() @@ -553,7 +559,7 @@ TAny* dataPtr=aPackage.Ptr1(); TAny* dataPtr2=aPackage.Ptr2(); - LOGDATA2("CSimDataCall::ExtFunc: IPC Number is %d",aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_EXTFUNC_1, "CSimDataCall::ExtFunc: IPC Number is %d",aIpc); // The request data has to extracted from TDataPackage and the TAny* pointers have to // be "cast" to the expected request data type @@ -609,7 +615,7 @@ return NotifyRemotePartyInfoChange(aTsyReqHandle, aPackage.Des1n()); default: - LOGDATA2("CSimDataCall::ExtFunc: Unsupported IPC detected - number %d",aIpc); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_EXTFUNC_2, "CSimDataCall::ExtFunc: Unsupported IPC detected - number %d",aIpc); break; } @@ -651,7 +657,7 @@ return NotifyRemotePartyInfoChangeCancel(); default: - LOGDATA1("CSimDataCall::CancelService: No match for IPC, defering to base function"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CANCELSERVICE_1, "CSimDataCall::CancelService: No match for IPC, defering to base function"); break; } return CCallBase::CancelService(aIpc,aTsyReqHandle); @@ -667,7 +673,7 @@ * @return KErrNone */ { - LOGDATA1(">>CSimDataCall::Dial"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIAL_1, ">>CSimDataCall::Dial"); iDialRequestHandle=aTsyReqHandle; PopulateCallParams(aCallParams); @@ -675,7 +681,7 @@ if(err!=KErrNone) ReqCompleted(aTsyReqHandle,err); - LOGDATA1("<>CSimDataCall::DialCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIALCANCEL_1, ">>CSimDataCall::DialCancel"); switch(iState) { case RMobileCall::EStatusIdle: @@ -713,10 +719,10 @@ break; default: - LOGDATA2("CSimDataCall::DialCancel: No action taken - state: %d",iState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIALCANCEL_2, "CSimDataCall::DialCancel: No action taken - state: %d",iState); break; } - LOGDATA1("<>CSimDataCall::AnswerIncomingCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALL_1, ">>CSimDataCall::AnswerIncomingCall"); TInt err=iLine->SetAutoAnswerCallObject(this); if(err!=KErrNone) { @@ -754,7 +760,7 @@ ret = ActionEvent(ECallEventAnswerIncoming,KErrNone); } } - LOGDATA1("<>CSimDataCall::AnswerIncomingCallCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_1, ">>CSimDataCall::AnswerIncomingCallCancel"); if(iAnswerIncomingCall.iNotifyPending) { iAnswerIncomingCall.iNotifyPending=EFalse; iLine->ResetAutoAnswerCallObject(this); ReqCompleted(iAnswerIncomingCall.iNotifyHandle,KErrCancel); } - LOGDATA1("<>CSimDataCall::HangUp"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUP_1, ">>CSimDataCall::HangUp"); iHangUpRequestHandle=aTsyReqHandle; TInt err=ActionEvent(ECallEventHangUp,KErrNone); if(err!=KErrNone) ReqCompleted(aTsyReqHandle,err); - LOGDATA1("<>CSimDataCall::HangUpCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUPCANCEL_1, ">>CSimDataCall::HangUpCancel"); switch(iState) { case RMobileCall::EStatusIdle: @@ -838,10 +844,10 @@ break; default: - LOGDATA2("CSimDataCall::HangUpCancel: No action taken - state: %d",iState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUPCANCEL_2, "CSimDataCall::HangUpCancel: No action taken - state: %d",iState); break; } - LOGDATA1("<>CSimDataCall::ActionEvent = [ECallEventDial]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_1, ">>CSimDataCall::ActionEvent = [ECallEventDial]"); if(iState==RMobileCall::EStatusIdle) { TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusDialling,EFalse,EFalse)); @@ -1014,7 +1020,7 @@ case ECallEventHangUp: { - LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventHangUp]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_2, ">>CSimDataCall::ActionEvent = [ECallEventHangUp]"); switch(iState) { case RMobileCall::EStatusConnected: @@ -1037,7 +1043,7 @@ break; case ECallEventIncomingCall: - LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventIncomingCall]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_3, ">>CSimDataCall::ActionEvent = [ECallEventIncomingCall]"); if(iState==RMobileCall::EStatusIdle) { if(iAnswerIncomingCall.iNotifyPending) @@ -1056,7 +1062,7 @@ break; case ECallEventAnswerIncoming: - LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventAnswerIncoming]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_4, ">>CSimDataCall::ActionEvent = [ECallEventAnswerIncoming]"); if(iState==RMobileCall::EStatusRinging) { TRAP(ret, ret=ProcessAnswerIncomingCallL()); @@ -1066,7 +1072,7 @@ break; case ECallEventRemoteHangup: - LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventRemoteHangup]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_5, ">>CSimDataCall::ActionEvent = [ECallEventRemoteHangup]"); if(iState==RMobileCall::EStatusConnected) { TRAP(ret, ret=ProcessRemoteHangupL()); @@ -1077,18 +1083,18 @@ case ECallEventTimeOut: { - LOGDATA1(">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_6, ">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]"); switch(iState) { case RMobileCall::EStatusDialling: - LOGDATA1(">>CSimDataCall::State = [EStatusDialling]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_7, ">>CSimDataCall::State = [EStatusDialling]"); TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnecting,EFalse,EFalse)); if(ret==KErrNone) iTimer->Start(iConnectingPause,this); return ret; case RMobileCall::EStatusConnecting: - LOGDATA1(">>CSimDataCall::State = [EStatusConnecting]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_8, ">>CSimDataCall::State = [EStatusConnecting]"); // If the config file has not spec'ed a CSY, then fail the dial... if(iCsyName.Length()==0) { @@ -1104,19 +1110,19 @@ return ret; case RMobileCall::EStatusDisconnecting: - LOGDATA1(">>CSimDataCall::State = [EStatusDisconnecting]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_9, ">>CSimDataCall::State = [EStatusDisconnecting]"); TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusIdle,EFalse,EFalse)); ReqCompleted(iHangUpRequestHandle,ret); return ret; case RMobileCall::EStatusAnswering: - LOGDATA1(">>CSimDataCall::State = [EStatusAnswering]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_10, ">>CSimDataCall::State = [EStatusAnswering]"); TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,EFalse,EFalse)); ReqCompleted(iAnswerIncomingCall.iNotifyHandle,ret); return ret; default: - LOGDATA2(">>CSimDataCall::State = [%d]",iState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_11, ">>CSimDataCall::State = [%d]",iState); break; } } @@ -1152,10 +1158,10 @@ * function for further processing. */ { - LOGDATA1(">>CSimDataCall::TimerCallBack"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_TIMERCALLBACK_1, ">>CSimDataCall::TimerCallBack"); TInt err=ActionEvent(ECallEventTimeOut,KErrNone); __ASSERT_ALWAYS(err==KErrNone,SimPanic(ETimeOutEventActionFailed)); - LOGDATA1("<>CSimDataCall::ProcessAnswerIncomingCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_1, ">>CSimDataCall::ProcessAnswerIncomingCall"); TInt ret=ChangeStateL(RMobileCall::EStatusAnswering,EFalse,EFalse); if(ret!=KErrNone) return ret; iTimer->Start(iAnswerIncomingPause,this); iAnswerIncomingCall.iNotifyPending=EFalse; iLine->ResetAutoAnswerCallObject(this); - LOGDATA1("<>CSimDataCall::ProcessRemoteHangupL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSREMOTEHANGUPL_1, ">>CSimDataCall::ProcessRemoteHangupL"); TInt ret=ChangeStateL(RMobileCall::EStatusDisconnecting,EFalse,EFalse); if(ret!=KErrNone) return ret; iTimer->Start(iRemoteHangupPause,this); iLine->ResetRemoteHangupCallObject(this); - LOGDATA1("<>CSimDataLine::OpenNewObjectByNameL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATALINE_OPENNEWOBJECTBYNAMEL_1, ">>CSimDataLine::OpenNewObjectByNameL"); TInt i; for(i=0;iCount();i++) { @@ -118,7 +124,7 @@ return iCalls->At(i); } } - LOGDATA1("<>CSimDataLine::CreateNewCallL 0x%08x",newCall); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATALINE_CREATENEWCALLL_1, ">>CSimDataLine::CreateNewCallL 0x%08x",newCall); CleanupStack::Pop(newCall); return newCall; } @@ -218,7 +224,7 @@ return NotifyMobileLineStatusChangeCancel(aTsyReqHandle); default: - LOGDATA1("CSimDataLine::CancelService: No IPC match in SIM TSY, defering to core cancelservice function."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATALINE_CANCELSERVICE_1, "CSimDataLine::CancelService: No IPC match in SIM TSY, defering to core cancelservice function."); break; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimDtmf.cpp --- a/telephonyserverplugins/simtsy/src/CSimDtmf.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimDtmf.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -19,11 +19,17 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimDtmfTraces.h" +#endif + #include #include "CSimDtmf.h" #include "CSimPhone.h" #include "CSimVoiceCall.h" -#include "Simlog.h" const TInt KPauseDuration=2; //< The duration of a "pause" DTMF character. const TInt KDtmfToneDuration=3; //< The duration of a standard DTMF character (tone or "pause"). @@ -290,7 +296,7 @@ case EEventTimer: __ASSERT_ALWAYS(iState==ETxTone,SimPanic(EIllegalDtmfEvent)); __ASSERT_ALWAYS(iDtmfString,SimPanic(EIllegalDtmfEvent)); - LOGMISC1("Completed sending DTMF Tone"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_ACTIONEVENT1_1, "Completed sending DTMF Tone"); iDtmfStringIndex++; if(iDtmfStringIndexLength()) ret = ProcessTone((*iDtmfData)[iDtmfStringIndex],ETrue); @@ -306,7 +312,7 @@ return KErrInUse; if(iState!=ETxTone) // If there's been no StartDtmfTone, then return an error. return KErrUnknown; - LOGMISC1("Stopping DTMF Tone"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_ACTIONEVENT1_2, "Stopping DTMF Tone"); iState=EIdle; return KErrNone; @@ -314,7 +320,7 @@ if(iState!=EStopped) return KErrUnknown; __ASSERT_ALWAYS(iDtmfString,SimPanic(EIllegalDtmfEvent)); - LOGMISC1("Continuing Transmitting a DTMF string after a wait"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_ACTIONEVENT1_3, "Continuing Transmitting a DTMF string after a wait"); iDtmfStringIndex++; if(iDtmfStringIndexLength()) ret = ProcessTone((*iDtmfData)[iDtmfStringIndex],ETrue); @@ -364,14 +370,14 @@ if(aTone==wait) { - LOGMISC1("Starting to perform a DTMF wait; character w"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_PROCESSTONE_1, "Starting to perform a DTMF wait; character w"); iState=EStopped; CheckNotification(); return KErrNone; } else if(aTone.IsDigit()||(aTone>='A')&&(aTone<='D')) { - LOGMISC2("Starting to send DTMF Tone %c", TUint(aTone)); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_PROCESSTONE_2, "Starting to send DTMF Tone %u", TUint(aTone)); iState=ETxTone; if(aStartTimer) { @@ -385,7 +391,7 @@ { return KErrArgument; // can't tx a single "pause" character } - LOGMISC1("Starting to perform a DTMF pause; character p"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDTMF_PROCESSTONE_3, "Starting to perform a DTMF pause; character p"); iState=ETxTone; iTimer->Start(KPauseDuration,this); return KErrNone; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimIncomingContextManager.cpp --- a/telephonyserverplugins/simtsy/src/CSimIncomingContextManager.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimIncomingContextManager.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -13,12 +13,18 @@ // Description: // + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimIncomingContextManagerTraces.h" +#endif + #include "CSimIncomingContextManager.h" #include #include "SimConstants.h" -#include "Simlog.h" #include "SimTsy.h" #include "CSimPhone.h" #include "csimtimer.h" @@ -77,7 +83,7 @@ * @leave Leaves no memory or any data member does not construct for any reason. */ { - LOGPACKET1("CSimIncomingContextManager: Entered ConstructL()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_CONSTRUCTL_1, "CSimIncomingContextManager: Entered ConstructL()"); iSimPacketService = aSimPacketService; @@ -126,7 +132,7 @@ void CSimIncomingContextManager::LoadIncomingContextsL( TPtrC8 aTag ) { - LOGPACKET1("CSimIncomingContextManager: Entered LoadIncomingContextsL()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_1, "CSimIncomingContextManager: Entered LoadIncomingContextsL()"); TDelayIncomingContext incomingContext; TInt error=KErrNone; @@ -139,43 +145,43 @@ if(!item) { error = KErrArgument; - LOGPARSERR("DelayIncomingContext::No parameters in tag",error,0,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAYINCOMINGCONTEXT::NO PARAMETERS IN TAG returned %d (element no. %d) from tag %s.",error,0,aTag); break; } GetConfigType( (*item), 0, incomingContext.iExtensionId, error ); if (error) { - LOGPARSERR("DelayIncomingContext::ConfigType",error,0,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAYINCOMINGCONTEXT::CONFIGTYPE returned %d (element no. %d) from tag %s.",error,0,aTag); } GetContextIndex( (*item), 1, incomingContext.iIndex, error ); if (error) { - LOGPARSERR("DelayIncomingContext::Index",error,0,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAYINCOMINGCONTEXT::INDEX returned %d (element no. %d) from tag %s.",error,0,aTag); } GetDelay( (*item), 2, incomingContext.iDelay, error ); if (error) { - LOGPARSERR("DelayIncomingContext::Delay",error,0,&aTag); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAYINCOMINGCONTEXT::DELAY returned %d (element no. %d) from tag %s.",error,0,aTag); } iDelayIncomingContext->AppendL(incomingContext); } - LOGMISC2("Finished parsing DelayIncomingContext config parameters...%d items found",count); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_6, "Finished parsing DelayIncomingContext config parameters...%d items found",count); } void CSimIncomingContextManager::StartFirstIncomingEvent( ) { - LOGPACKET1("CSimIncomingContextManager: Entered StartFirstIncomingEvent()" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_STARTFIRSTINCOMINGEVENT_1, "CSimIncomingContextManager: Entered StartFirstIncomingEvent()" ); if(iDelayIncomingContext->Count()!=0) { iCurrentDelayIndex = 0; const TDelayIncomingContext& delayIncomingContext = iDelayIncomingContext->At(0); - LOGPACKET2("CSimIncomingContextManager: Entered StartFirstIncomingEvent() delay = %d", delayIncomingContext.iDelay); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_STARTFIRSTINCOMINGEVENT_2, "CSimIncomingContextManager: Entered StartFirstIncomingEvent() delay = %d", delayIncomingContext.iDelay); iTimer->Start(delayIncomingContext.iDelay, iSimPacketService, ETimerIdContextActivationRequestedChange); } } @@ -185,17 +191,17 @@ // And then sets the index void CSimIncomingContextManager::NextIncomingEvent( TDes8* aPckg ) { - LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent()" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_1, "CSimIncomingContextManager: Entered NextIncomingEvent()" ); if (iDelayIncomingContext->Count()==0) { // We have no incoming events. This is an error. - LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() No events at all!" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_2, "CSimIncomingContextManager: Entered NextIncomingEvent() No events at all!" ); SimPanic(EGeneral); return; } if(iCurrentDelayIndex >= iDelayIncomingContext->Count()) { // No more incoming contexts. . - LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() No next event" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_3, "CSimIncomingContextManager: Entered NextIncomingEvent() No next event" ); return; } // else we have an incoming context. @@ -208,18 +214,18 @@ delayIncomingContext->iExtensionId, delayIncomingContext->iIndex ); if ( !context ) { // Unable to find a valid pre allocated context that we can use. - LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() failed unable to identify a valid context." ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_4, "CSimIncomingContextManager: Entered NextIncomingEvent() failed unable to identify a valid context." ); SimPanic(EGeneral); return ; } if ( GetContextInCorrectFormatForEtel(context, aPckg) ) { // Okay got data. This will be sent to ETEL to activate the context. - LOGPACKET2("CSimIncomingContextManager: Entered NextIncomingEventt() delay = %d", delayIncomingContext->iDelay); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_5, "CSimIncomingContextManager: Entered NextIncomingEventt() delay = %d", delayIncomingContext->iDelay); } else { // Error. Unable to format the data. - LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() failed unable format data for choosn context" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_6, "CSimIncomingContextManager: Entered NextIncomingEvent() failed unable format data for choosn context" ); SimPanic(EGeneral); return; } @@ -235,18 +241,18 @@ void CSimIncomingContextManager::Cancel( ) { - LOGPACKET1("CSimIncomingContextManager::Cancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_CANCEL_1, "CSimIncomingContextManager::Cancel called"); iTimer->Cancel(); } void CSimIncomingContextManager::ForcedIncoming(TInt aIndex, TDes8* aPckg ) { - LOGPACKET1("CSimIncomingContextManager::ForcedIncoming called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_1, "CSimIncomingContextManager::ForcedIncoming called"); if(iDelayIncomingContext->Count()<=aIndex ) { - LOGPACKET1("CSimIncomingContextManager::ForcedIncoming invalid context"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_2, "CSimIncomingContextManager::ForcedIncoming invalid context"); return; } // else we have a valid incoming context. @@ -262,7 +268,7 @@ if ( !context ) { // Unable to find a valid pre allocated context that we can use. - LOGPACKET1("CSimIncomingContextManager::ForcedIncoming invalid type, index leading to invalid context"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_3, "CSimIncomingContextManager::ForcedIncoming invalid type, index leading to invalid context"); SimPanic(EGeneral); return ; } @@ -272,7 +278,7 @@ } else { // Error. Unable to format the data. - LOGPACKET1("CSimIncomingContextManager: Entered NextIncomingEvent() failed unable format data for choosn context" ); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_4, "CSimIncomingContextManager: Entered NextIncomingEvent() failed unable format data for choosn context" ); SimPanic(EGeneral); return; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimIndicator.cpp --- a/telephonyserverplugins/simtsy/src/CSimIndicator.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimIndicator.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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,10 +20,16 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimIndicatorTraces.h" +#endif + #include #include "CSimIndicator.h" #include "CSimPhone.h" -#include "Simlog.h" const TInt KIndicatorsGranularity=5; // < Granularity for indicators list array @@ -67,7 +73,7 @@ { iIndicatorsInfo=new(ELeave) CArrayFixFlat(KIndicatorsGranularity); - LOGPHONE1("Starting to parse Indicators config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_1, "Starting to parse Indicators config parameters..."); TInt count=CfgFile()->ItemCount(KIndicators); const CTestConfigItem* item=NULL; TInt ret=KErrNone; @@ -84,13 +90,13 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,number); if(ret!=KErrNone) { - LOGPARSERR("number",ret,0,&KIndicators); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NUMBER returned %d (element no. %d) from tag %s.",ret,0,KIndicators); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,error); if(ret!=KErrNone) { - LOGPARSERR("error",ret,1,&KIndicators); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ERROR returned %d (element no. %d) from tag %s.",ret,1,KIndicators); continue; } TPhoneIndicatorsInfo indicInfo; @@ -98,14 +104,14 @@ indicInfo.iError=error; iIndicatorsInfo->AppendL(indicInfo); } - LOGPHONE2("Finished parsing Indicators config parameters...%d items found", count); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_4, "Finished parsing Indicators config parameters...%d items found", count); iIndicatorCheckPeriod = 1; count = CfgFile()->ItemCount(KIndicatorCheckPeriod); if (count > 1) { - LOGPHONE1("Warning: Error parsing IndicatorCheckPeriod in config file."); - LOGPHONE1(" More than one value found, using default value."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_5, "Warning: Error parsing IndicatorCheckPeriod in config file."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_6, " More than one value found, using default value."); } else { @@ -117,8 +123,8 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,period); if(ret!=KErrNone) { - LOGPHONE1("Warning: Error parsing IndicatorCheckPeriod in config file."); - LOGPHONE1(" No value for IndicatorCheckPeriod found."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_7, "Warning: Error parsing IndicatorCheckPeriod in config file."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CONSTRUCTL_8, " No value for IndicatorCheckPeriod found."); } else { @@ -185,7 +191,7 @@ * @return TInt Standard error value. */ { - LOGPHONE2("CSimIndicator::GetIndicator request made: returning %d",iCurrentIndicator); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_GETINDICATOR_1, "CSimIndicator::GetIndicator request made: returning %d",iCurrentIndicator); TPckg* indicPckg=(TPckg*)aPckg1; TUint32& indic=(*indicPckg)(); @@ -204,7 +210,7 @@ * @return TInt Standard error value. */ { - LOGPHONE1("CSimIndicator::NotifyIndicatorChange notification posted"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_NOTIFYINDICATORCHANGE_1, "CSimIndicator::NotifyIndicatorChange notification posted"); TPckg* indicPckg=(TPckg*)aPckg1; TUint32& indic=(*indicPckg)(); @@ -224,7 +230,7 @@ { if(iIndicatorsChangeNotificationPending) { - LOGPHONE1("CSimIndicator::NotifyIndicatorChange notification cancelled"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_NOTIFYINDICATORCHANGECANCEL_1, "CSimIndicator::NotifyIndicatorChange notification cancelled"); iIndicatorsChangeNotificationPending=EFalse; iPhone->ReqCompleted(iIndicatorsChangeNotificationReqHandle,KErrCancel); } @@ -262,7 +268,7 @@ // Trigger notification with appropriate data and result codes iIndicatorsChangeNotificationPending=EFalse; *iIndicatorsChangeNofificationValue=iCurrentIndicator; - LOGPHONE2("CSimIndicator::NotifyIndicatorChange triggered: returned %d",iCurrentIndicator); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMINDICATOR_CHECKNOTIFICATION_1, "CSimIndicator::NotifyIndicatorChange triggered: returned %d",iCurrentIndicator); iPhone->ReqCompleted(iIndicatorsChangeNotificationReqHandle,ret); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimLine.cpp --- a/telephonyserverplugins/simtsy/src/CSimLine.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimLine.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,5 +1,5 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -21,11 +21,17 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimLineTraces.h" +#endif + #include #include "CSimLine.h" #include "CSimPhone.h" #include "CSimCall.h" -#include "Simlog.h" #include "CSimPubSub.h" void CSimLine::CloseLine(TAny* aObj) @@ -55,7 +61,7 @@ * @param aName name of the Line to be created. */ { - LOGLINE2(">>CSimLine::ConstructL [aLineName=%S]", &aName); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CONSTRUCTL_1, ">>CSimLine::ConstructL [aLineName=%S]", aName); iLineName = aName; iSimPubSubIC = CSimPubSub::NewL(this,iICProperty); iSimPubSubIC->Start(); @@ -66,7 +72,7 @@ iNotifyIncomingCallPause=this->CfgFile()->ItemValue(KNotifyIncomingCallPauseDuration,KDefaultNotifyIncomingCallPauseDuration); iTimer = CSimTimer::NewL(iPhone); - LOGLINE1("<>CSimLine::NotifyIncomingCall"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALL_1, ">>CSimLine::NotifyIncomingCall"); iNotifyIncomingCall.iNotifyPending=ETrue; iNotifyIncomingCall.iNotifyHandle=aTsyReqHandle; iNotifyIncomingCall.iNotifyData=(TAny*)aName; - LOGLINE1("<>CSimLine::NotifyIncomingCallCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALLCANCEL_1, ">>CSimLine::NotifyIncomingCallCancel"); if(iNotifyIncomingCall.iNotifyPending) { iTimer->Cancel(); iNotifyIncomingCall.iNotifyPending=EFalse; ReqCompleted(iNotifyIncomingCall.iNotifyHandle, KErrCancel); } - LOGLINE1("<>CSimLine::NotifyHookChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGE_1, ">>CSimLine::NotifyHookChange"); iNotifyHookChange.iNotifyPending=ETrue; iNotifyHookChange.iNotifyHandle=aTsyReqHandle; iNotifyHookChange.iNotifyData=(TAny*)aHookStatus; - LOGLINE1("<>CSimLine::NotifyHookChangeCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGECANCEL_1, ">>CSimLine::NotifyHookChangeCancel"); if(iNotifyHookChange.iNotifyPending) { iNotifyHookChange.iNotifyPending=EFalse; ReqCompleted(iNotifyHookChange.iNotifyHandle,KErrCancel); } - LOGLINE1("<>CSimLine::NotifyMobileLineStatusChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_1, ">>CSimLine::NotifyMobileLineStatusChange"); iNotifyMobileStatusChange.iNotifyPending=ETrue; iNotifyMobileStatusChange.iNotifyHandle=aTsyReqHandle; iNotifyMobileStatusChange.iNotifyData=aStatus; - LOGLINE1("<>CSimLine::NotifyMobileLineStatusChangeCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_1, ">>CSimLine::NotifyMobileLineStatusChangeCancel"); if(iNotifyMobileStatusChange.iNotifyPending) { iNotifyMobileStatusChange.iNotifyPending=EFalse; ReqCompleted(iNotifyMobileStatusChange.iNotifyHandle,KErrCancel); } - LOGLINE1("<>CSimLine::NotifyStatusChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGE_1, ">>CSimLine::NotifyStatusChange"); iNotifyStatusChange.iNotifyPending=ETrue; iNotifyStatusChange.iNotifyHandle=aTsyReqHandle; iNotifyStatusChange.iNotifyData=aStatus; - LOGLINE1("<>CSimLine::NotifyStatusChangeCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGECANCEL_1, ">>CSimLine::NotifyStatusChangeCancel"); if(iNotifyStatusChange.iNotifyPending) { iNotifyStatusChange.iNotifyPending=EFalse; ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrCancel); } - LOGLINE1("<>CSimLine::NotifyCallAdded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDED_1, ">>CSimLine::NotifyCallAdded"); iNotifyCallAdded.iNotifyPending=ETrue; iNotifyCallAdded.iNotifyHandle=aTsyReqHandle; iNotifyCallAdded.iNotifyData=(TAny*)aName; - LOGLINE1("<>CSimLine::NotifyCallAddedCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDEDCANCEL_1, ">>CSimLine::NotifyCallAddedCancel"); if(iNotifyCallAdded.iNotifyPending) { iNotifyCallAdded.iNotifyPending=EFalse; ReqCompleted(iNotifyCallAdded.iNotifyHandle,KErrCancel); } - LOGLINE1("<>CSimLine::HandleNewCallAddedNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_1, ">>CSimLine::HandleNewCallAddedNotification"); iNameOfLastCallAdded.Copy(aNewName); if(iNotifyCallAdded.iNotifyPending) { @@ -389,7 +395,7 @@ ((TName*)iNotifyCallAdded.iNotifyData)->Copy(aNewName); ReqCompleted(iNotifyCallAdded.iNotifyHandle,KErrNone); } - LOGLINE1("<>CSimLine::GetInfo"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETINFO_1, ">>CSimLine::GetInfo"); aLineInfo->iHookStatus=iHookState; aLineInfo->iStatus=(RCall::TStatus)iState; aLineInfo->iNameOfLastCallAdded.Copy(iNameOfLastCallAdded); @@ -459,7 +465,7 @@ aLineInfo->iNameOfCallForAnswering.Zero(); ReqCompleted(aTsyReqHandle,KErrNone); - LOGLINE1("<>CSimLine::GetStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETSTATUS_1, ">>CSimLine::GetStatus"); *aLineStatus=GetCoreLineStatus(); ReqCompleted(aTsyReqHandle,KErrNone); - LOGLINE1("<>CSimLine::GetMobileLineStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETMOBILELINESTATUS_1, ">>CSimLine::GetMobileLineStatus"); *aLineStatus=iState; ReqCompleted(aTsyReqHandle,KErrNone); - LOGLINE1("<>CSimLine::GetHookStatus"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETHOOKSTATUS_1, ">>CSimLine::GetHookStatus"); *aHookStatus=iHookState; ReqCompleted(aTsyReqHandle,KErrNone); - LOGLINE1("<>CSimLine::CfgFile"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CFGFILE_1, ">>CSimLine::CfgFile"); return iPhone->CfgFile(); } @@ -573,7 +579,7 @@ TInt count=iCalls->Count(); for(i=0;i>CSimLine::ChangeState0 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_1, ">>CSimLine::ChangeState0 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); } TInt ret=KErrGeneral; @@ -593,7 +599,7 @@ if(ret!=KErrNone && !(aSwap && iState==RMobileCall::EStatusConnected && aNewState==RMobileCall::EStatusConnected)) return ret; - LOGLINE2(">>CSimLine::ChangeState 0x%08x",aOriginatingCall); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_2, ">>CSimLine::ChangeState 0x%08x",aOriginatingCall); if(aNewState==RMobileCall::EStatusIdle) { if(iState==RMobileCall::EStatusIdle) @@ -604,7 +610,7 @@ TInt count=iCalls->Count(); for(i=0;i>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_3, ">>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); if(aOriginatingCall!=iCalls->At(i) && iCalls->At(i)->iState != RMobileCall::EStatusIdle) { @@ -627,7 +633,7 @@ TInt count=iCalls->Count(); for(i=0;i>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_4, ">>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); if(iCalls->At(i) != aOriginatingCall && iCalls->At(i)->iState == RMobileCall::EStatusHold) { if(aSwap) @@ -647,7 +653,7 @@ TInt count=iCalls->Count(); for(i=0;i>CSimLine::ChangeState1 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_5, ">>CSimLine::ChangeState1 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); if(iCalls->At(i) != aOriginatingCall) { if(iCalls->At(i)->iState == RMobileCall::EStatusConnected) @@ -669,7 +675,7 @@ } // Actually change the state. - LOGLINE3(">>CSimLine::ChangeState [oldState=%d] [newState=%d]", iState, aNewState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_6, ">>CSimLine::ChangeState [oldState=%d] [newState=%d]", iState, aNewState); if(iState != aNewState) { @@ -724,10 +730,10 @@ for(i=0;iCount();i++) { - LOGLINE3(">>CSimLine::ChangeState5 0x%08x %d",iCalls->At(i),iCalls->At(i)->iState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_7, ">>CSimLine::ChangeState5 0x%08x %d",(TUint)iCalls->At(i),iCalls->At(i)->iState); } - LOGLINE1("<>CSimLine::SimPSEvent"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SIMPSEVENT_1, ">>CSimLine::SimPSEvent"); if(aProperty==iICProperty) // check for this here still, start the timer for amount specified in config file. ProcessIncomingCallEvent(); if(aProperty==iRHProperty) ProcessRemoteHangupEvent(); - LOGLINE1("<>CSimLine::SetAnswerCallObject"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETAUTOANSWERCALLOBJECT_1, ">>CSimLine::SetAnswerCallObject"); if(iAnswerIncomingCallReqPending) // Is there a request already outstanding? return KErrEtelAnswerAlreadyOutstanding; @@ -770,7 +776,7 @@ iAnswerNextIncomingCall=aCallObject; // Set the "answer next call" object iAnswerNextIncomingCall->Open(); } - LOGLINE1("<>CSimLine::ResetAnswerCallObject"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_RESETAUTOANSWERCALLOBJECT_1, ">>CSimLine::ResetAnswerCallObject"); __ASSERT_ALWAYS(iAnswerNextIncomingCall==aCallObject,SimPanic(EIllegalAnswerNextIncomingCallInconsistancy)); iAnswerNextIncomingCall->Close(); iAnswerNextIncomingCall=iSpareCall; @@ -794,7 +800,7 @@ * Process an incoming call event. */ { - LOGLINE1(">>CSimLine::ProcessIncomingCallEvent "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSINCOMINGCALLEVENT_1, ">>CSimLine::ProcessIncomingCallEvent "); if (iSpareCall == iAnswerNextIncomingCall) { @@ -811,7 +817,7 @@ iTimer->Start(iNotifyIncomingCallPause, this); __ASSERT_ALWAYS(iAnswerNextIncomingCall->ActionEvent(CSimCall::ECallEventIncomingCall,KErrNone) == KErrNone, SimPanic(EGeneral)); - LOGLINE1("<>CSimLine::SetRemoteHangupCallObject"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETREMOTEHANGUPCALLOBJECT_1, ">>CSimLine::SetRemoteHangupCallObject"); if(iRemoteHangupCallReqPending) // Is there a request already outstanding? return KErrEtelInitialisationFailure; @@ -833,7 +839,7 @@ { iRemoteHangupCall=aCallObject; // Set the "remote hang up" object } - LOGLINE1("<>CSimLine::ResetRemoteHangupCallObject"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_RESETREMOTEHANGUPCALLOBJECT_1, ">>CSimLine::ResetRemoteHangupCallObject"); __ASSERT_ALWAYS(iRemoteHangupCall==aCallObject,SimPanic(EIllegalAnswerRemoteHangupCallInconsistency)); iRemoteHangupCallReqPending=EFalse; } @@ -855,7 +861,7 @@ * Process a remote hangup event. */ { - LOGLINE1(">>CSimLine::ProcessRemoteHangupEvent"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_1, ">>CSimLine::ProcessRemoteHangupEvent"); if (iRemoteHangupCall == NULL) { @@ -865,15 +871,15 @@ err = iRemoteHangupCall->ActionEvent(CSimCall::ECallEventRemoteHangup,KErrNone); if(err != KErrNone) { - LOGLINE2("ERROR: CSimLine::ProcessRemoteHangupEvent returned: %d", err); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_2, "ERROR: CSimLine::ProcessRemoteHangupEvent returned: %d", err); } } else { - LOGLINE1("No outstanding call to hang up remotely"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_3, "No outstanding call to hang up remotely"); } } - LOGLINE1("<>CSimLine::ProcessNotifyIncomingCallEvent"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_1, ">>CSimLine::ProcessNotifyIncomingCallEvent"); if(iNotifyIncomingCall.iNotifyPending) { iNotifyIncomingCall.iNotifyPending=EFalse; ((TName*)iNotifyIncomingCall.iNotifyData)->Copy(iAnswerNextIncomingCall->iName); ReqCompleted(iNotifyIncomingCall.iNotifyHandle,KErrNone); } - LOGLINE1("<>CSimMbmsPacketContext::TimerCallBack Default Case for Context Events"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_4, ">>CSimMbmsPacketContext::TimerCallBack Default Case for Context Events"); switch(iCurrentEvent) { case EMbmsContextEventNone: - LOGPACKET1("TimerCallBack - iCurrentEvent = [EMbmsContextEventNone]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_5, "TimerCallBack - iCurrentEvent = [EMbmsContextEventNone]"); break; case EMbmsContextEventActivate: - LOGPACKET1("TimerCallBack - iCurrentEvent = [EMbmsContextEventActivate]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_6, "TimerCallBack - iCurrentEvent = [EMbmsContextEventActivate]"); if(iState==RPacketContext::EStatusActivating) { TInt activateValue = iMbmsContextConfigParams->At(iMbmsContextConfigParamsIndex).iActivateCode; @@ -615,11 +621,11 @@ } else { - LOGPACKET1("Unexpected iState for iCurrentEvent[EMbmsContextEventActivate]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_7, "Unexpected iState for iCurrentEvent[EMbmsContextEventActivate]"); } break; case EMbmsContextEventDeactivate: - LOGPACKET1("TimerCallBack - iCurrentEvent = [EMbmsContextEventDeactivate]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_8, "TimerCallBack - iCurrentEvent = [EMbmsContextEventDeactivate]"); if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusDeactivating)) && (iCurrentEvent==EMbmsContextEventDeactivate)) { @@ -630,11 +636,11 @@ } else { - LOGPACKET1("Unexpected iState for iCurrentEvent[EMbmsContextEventActivate]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_9, "Unexpected iState for iCurrentEvent[EMbmsContextEventActivate]"); } break; case EMbmsContextEventDelete: - LOGPACKET1("TimerCallBack - iCurrentEvent = [EMbmsContextEventDelete]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_10, "TimerCallBack - iCurrentEvent = [EMbmsContextEventDelete]"); if(iState == RPacketContext::EStatusInactive && !iIsActive ) { TInt ret = ChangeState(RPacketContext::EStatusDeleted); @@ -649,8 +655,8 @@ break; default: { - LOGPACKET1("CSimMbmsPacketContext::TimerCallBack"); - LOGPACKET1("<CfgFile(); } @@ -690,7 +696,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::SetConfig called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_SETCONFIG_1, "CSimMbmsPacketContext::SetConfig called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -780,7 +786,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::GetConfig called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETCONFIG_1, "CSimMbmsPacketContext::GetConfig called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -816,7 +822,7 @@ * @return err KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::GetConfigCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETCONFIGCANCEL_1, "CSimMbmsPacketContext::GetConfigCancel called"); return KErrNone; } @@ -829,7 +835,7 @@ * @return KerrNone */ { - LOGPACKET1("CSimMbmsPacketContext::GetStatus called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETSTATUS_1, "CSimMbmsPacketContext::GetStatus called"); *aContextStatus = iState; ReqCompleted(aTsyReqHandle,KErrNone); return KErrNone; @@ -863,7 +869,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::ActivateCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIVATECANCEL_1, "CSimMbmsPacketContext::ActivateCancel called"); iMbmsContextTimer->Cancel(); if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusActivating)) && (iCurrentEvent==EMbmsContextEventActivate)) @@ -902,7 +908,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::Deactivate called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEACTIVATE_1, "CSimMbmsPacketContext::Deactivate called"); iDeactivateRequestHandle = aTsyReqHandle; TInt ret = ActionEvent(EMbmsContextEventDeactivate); return ret; @@ -919,7 +925,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::DeactivateCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEACTIVATECANCEL_1, "CSimMbmsPacketContext::DeactivateCancel called"); iMbmsContextTimer->Cancel(); if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusDeactivating)) && (iCurrentEvent==EMbmsContextEventDeactivate)) @@ -993,7 +999,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::Delete called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DELETE_1, "CSimMbmsPacketContext::Delete called"); iDeleteRequestHandle = aTsyReqHandle; TInt ret = ActionEvent(EMbmsContextEventDelete); return ret; @@ -1009,7 +1015,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::DeleteCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DELETECANCEL_1, "CSimMbmsPacketContext::DeleteCancel called"); iMbmsContextTimer->Cancel(); if((iState == RPacketContext::EStatusInactive) && (iCurrentEvent==EMbmsContextEventDelete)) { @@ -1028,7 +1034,7 @@ * @return KerrNone */ { - LOGPACKET1("CSimMbmsPacketContext::GetLastErrorCause called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETLASTERRORCAUSE_1, "CSimMbmsPacketContext::GetLastErrorCause called"); ReqCompleted(aTsyReqHandle,iLastError); return KErrNone; @@ -1044,7 +1050,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::NotifyConfigChanged called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGED_1, "CSimMbmsPacketContext::NotifyConfigChanged called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -1058,7 +1064,7 @@ } else { - LOGPACKET1("CSimMbmsPacketContext::NotifyConfigChanged Unexpected config for MBMS context"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGED_2, "CSimMbmsPacketContext::NotifyConfigChanged Unexpected config for MBMS context"); } return KErrNone; @@ -1073,7 +1079,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::NotifyConfigChangedCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGEDCANCEL_1, "CSimMbmsPacketContext::NotifyConfigChangedCancel called"); if(iNotifyConfigMBMS.iNotifyPending && iNotifyConfigMBMS.iNotifyHandle == aTsyReqHandle) { @@ -1100,7 +1106,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::NotifyStatusChange called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYSTATUSCHANGE_1, "CSimMbmsPacketContext::NotifyStatusChange called"); __ASSERT_ALWAYS(!iNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); iNotifyStatusChange.iNotifyPending = ETrue; iNotifyStatusChange.iNotifyHandle = aTsyReqHandle; @@ -1117,7 +1123,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::NotifyStatusChangeCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NOTIFYSTATUSCHANGECANCEL_1, "CSimMbmsPacketContext::NotifyStatusChangeCancel called"); if(iNotifyStatusChange.iNotifyPending) { iNotifyStatusChange.iNotifyPending=EFalse; @@ -1130,7 +1136,7 @@ return KErrNone; } -TInt CSimMbmsPacketContext::UpdateMbmsSessionListL(const TTsyReqHandle aTsyReqHandle,TMbmsAction* aAction, TUint* aSessionId) +TInt CSimMbmsPacketContext::UpdateMbmsSessionList(const TTsyReqHandle aTsyReqHandle,TMbmsAction* aAction, TUint* aSessionId) /** * client's interest in updating the MBMS session's list. * This is achieved by updating the list maintained internally by the context @@ -1141,7 +1147,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionListL called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_1, "CSimMbmsPacketContext::UpdateMbmsSessionList called"); TInt error=KErrNone; iUpdateSessionHandle = aTsyReqHandle; @@ -1151,29 +1157,34 @@ switch(*aAction) { case SIMTSY_PACKET_MBMS_ADD_ENTRIES: - LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionListL Action: ADD "); - TRAP(error,iSessionIdList->AppendL(*aSessionId)); - if(error == KErrNone) - { - //iSessionIdList->At(0) = ++iNumOfSessionId; - iSessionIdList->Delete(0); - iSessionIdList->InsertL(0,++iNumOfSessionId); - iMbmsUpdateSessionTimer->Start(RandTime(),this,ETimerIdMbmsUpdateSessionId); - } - else + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_2, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: ADD "); + + // TRAP can contain multiple statments + TRAP(error,iSessionIdList->AppendL(*aSessionId); + //iSessionIdList->At(0) = ++iNumOfSessionId; + iSessionIdList->Delete(0); + iSessionIdList->InsertL(0,++iNumOfSessionId)); + + iMbmsUpdateSessionTimer->Start(RandTime(),this,ETimerIdMbmsUpdateSessionId); + + if(error != KErrNone) { ReqCompleted(iUpdateSessionHandle,error); } break; case SIMTSY_PACKET_MBMS_REM_ENTRIES: - LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionListL Action: REMOVE "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_3, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE "); iSessionIdList->Find(*aSessionId,key,position); if(position != -1) { iSessionIdList->Delete(position); //iSessionIdList->At(0) = --iNumOfSessionId; - iSessionIdList->InsertL(0,--iNumOfSessionId); + TRAP(error, iSessionIdList->InsertL(0,--iNumOfSessionId)); + if(error != KErrNone) + { + ReqCompleted(iUpdateSessionHandle,error); + } iMbmsUpdateSessionTimer->Start(RandTime(),this,ETimerIdMbmsUpdateSessionId); } else @@ -1184,16 +1195,20 @@ break; case SIMTSY_PACKET_MBMS_REM_ALL_ENTRIES: - LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionListL Action: REMOVE_ALL "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_4, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE_ALL "); iNumOfSessionId=0; //iSessionIdList->At(0) = iNumOfSessionId; - iSessionIdList->InsertL(0,iNumOfSessionId); + TRAP(error, iSessionIdList->InsertL(0,iNumOfSessionId)); + if(error != KErrNone) + { + ReqCompleted(iUpdateSessionHandle,error); + } iSessionIdList->Delete(1,iSessionIdList->Count()); // removing all session ids from the list ReqCompleted(aTsyReqHandle, KErrNone); break; default: - LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionListL Action: Default "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_5, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: Default "); ReqCompleted(aTsyReqHandle,KErrNotFound); break; } @@ -1208,7 +1223,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionListCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTCANCEL_1, "CSimMbmsPacketContext::UpdateMbmsSessionListCancel called"); iMbmsUpdateSessionTimer->Cancel(); if( iUpdateSessionHandle == aTsyReqHandle ) { @@ -1291,7 +1306,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::GetMbmsSessionsPhase1 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSPHASE1_1, "CSimMbmsPacketContext::GetMbmsSessionsPhase1 called"); iGetMbmsSessionHandle = aTsyReqHandle; TInt ret=KErrNone; TInt leaveCode=KErrNone; @@ -1317,7 +1332,7 @@ { // Retrieve MBMS session list, // Store the sessions and then return the size of the buffer to the client - LOGPACKET1("CSimMbmsPacketContext::ProcessGetMbmsSessionsPhase1L called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_PROCESSGETMBMSSESSIONSPHASE1L_1, "CSimMbmsPacketContext::ProcessGetMbmsSessionsPhase1L called"); RPacketMbmsContext::CMbmsSession* mbmsSession=RPacketMbmsContext::CMbmsSession::NewL(); CleanupStack::PushL(mbmsSession); @@ -1366,7 +1381,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::GetMbmsSessionsPhase2 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSPHASE2_1, "CSimMbmsPacketContext::GetMbmsSessionsPhase2 called"); CPcktListReadAllAttempt* read=NULL; // Find the get Mbms monitored services from this client for (TInt i=0; iCount(); ++i) @@ -1397,7 +1412,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimMbmsPacketContext::GetMbmsSessionsCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSCANCEL_1, "CSimMbmsPacketContext::GetMbmsSessionsCancel called"); // Remove the MBMS sessions from iMbmsSessionList CPcktListReadAllAttempt* read=NULL; @@ -1425,7 +1440,7 @@ * @return Error indication if change of state is successful or not */ { - LOGPACKET2("CSimMbmsPacketContext::ChangeState [newState=%d]", aNewState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CHANGESTATE_1, "CSimMbmsPacketContext::ChangeState [newState=%d]", aNewState); __ASSERT_ALWAYS(aNewState!=RPacketContext::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal)); if(iState==aNewState) @@ -1474,7 +1489,7 @@ ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrNone); } - LOGPACKET1("< #include #include #include "CSimNetworkStatus.h" #include "CSimPhone.h" -#include "Simlog.h" #include "CSimPubSubChange.h" #include "CSimTsyMode.h" #include "etelmmerr.h" @@ -107,7 +113,7 @@ * A number of these tags may be included to create a Cell Information Profile. */ { - LOGNETWORK1("Starting to parse Network Status config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_1, "Starting to parse Network Status config parameters..."); iRegStatTimer=CSimTimer::NewL(iPhone); iNitzTimer=CSimTimer::NewL(iPhone); iRadioModeTimer=CSimTimer::NewL(iPhone); @@ -138,37 +144,37 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,countryCode); if(ret!=KErrNone) { - LOGPARSERR("countryCode",ret,0,&KNetworkInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNTRYCODE returned %d (element no. %d) from tag %s.",ret,0,KNetworkInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,networkIdentify); if(ret!=KErrNone) { - LOGPARSERR("networkIdentify",ret,1,&KNetworkInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element NETWORKIDENTIFY returned %d (element no. %d) from tag %S.",ret,1,KNetworkInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,displayTag); if(ret!=KErrNone) { - LOGPARSERR("displayTag",ret,2,&KNetworkInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAYTAG returned %d (element no. %d) from tag %s.",ret,2,KNetworkInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,shortName); if(ret!=KErrNone) { - LOGPARSERR("shortName",ret,3,&KNetworkInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element SHORTNAME returned %d (element no. %d) from tag %s.",ret,3,KNetworkInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,longName); if(ret!=KErrNone) { - LOGPARSERR("longName",ret,4,&KNetworkInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element LONGNAME returned %d (element no. %d) from tag %s.",ret,4,KNetworkInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,status); if(ret!=KErrNone) { - LOGPARSERR("status",ret,5,&KNetworkInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element STATUS returned %d (element no. %d) from tag %s.",ret,5,KNetworkInfo); continue; } RMobilePhone::TMobilePhoneNetworkInfoV2 networkInfo; @@ -233,13 +239,13 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KRegStatus); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KRegStatus); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,regStat); if(ret!=KErrNone) { - LOGPARSERR("regStat",ret,1,&KRegStatus); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element REGSTAT returned %d (element no. %d) from tag %s.",ret,1,KRegStatus); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,networkIndex); @@ -266,13 +272,13 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KRadioMode); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KRadioMode); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,radioStatus); if(ret!=KErrNone) { - LOGPARSERR("radioStatus",ret,1,&KRadioMode); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element RADIOSTATUS returned %d (element no. %d) from tag %s.",ret,1,KRadioMode); continue; } @@ -296,61 +302,61 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KNitzInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,year); if(ret!=KErrNone) { - LOGPARSERR("year",ret,1,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element YEAR returned %d (element no. %d) from tag %s.",ret,1,KNitzInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,month); if(ret!=KErrNone) { - LOGPARSERR("month",ret,2,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element MONTH returned %d (element no. %d) from tag %s.",ret,2,KNitzInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,day); if(ret!=KErrNone) { - LOGPARSERR("day",ret,3,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element DAY returned %d (element no. %d) from tag %s.",ret,3,KNitzInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,hour); if(ret!=KErrNone) { - LOGPARSERR("hour",ret,4,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element HOUR returned %d (element no. %d) from tag %s.",ret,4,KNitzInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,min); if(ret!=KErrNone) { - LOGPARSERR("min",ret,5,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element MIN returned %d (element no. %d) from tag %s.",ret,5,KNitzInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,sec); if(ret!=KErrNone) { - LOGPARSERR("sec",ret,6,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element SEC returned %d (element no. %d) from tag %s.",ret,6,KNitzInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,microsec); if(ret!=KErrNone) { - LOGPARSERR("microsec",ret,7,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element MICROSEC returned %d (element no. %d) from tag %s.",ret,7,KNitzInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,tz); if(ret!=KErrNone) { - LOGPARSERR("tz",ret,8,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element TZ returned %d (element no. %d) from tag %s.",ret,8,KNitzInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,dst); if(ret!=KErrNone) { - LOGPARSERR("dst",ret,9,&KNitzInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element DST returned %d (element no. %d) from tag %s.",ret,9,KNitzInfo); continue; } @@ -380,31 +386,31 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KCellInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KCellInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,mode); if(ret!=KErrNone) { - LOGPARSERR("mode",ret,1,&KCellInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element MODE returned %d (element no. %d) from tag %s.",ret,1,KCellInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,cellId); if(ret!=KErrNone) { - LOGPARSERR("cellId",ret,2,&KCellInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element CELLID returned %d (element no. %d) from tag %s.",ret,2,KCellInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,timingAdvance); if(ret!=KErrNone) { - LOGPARSERR("timingAdvance",ret,3,&KCellInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element TIMINGADVANCE returned %d (element no. %d) from tag %s.",ret,3,KCellInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,cellInfoStatus); if(ret!=KErrNone) { - LOGPARSERR("cellInfoStatus",ret,3,&KCellInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element CELLINFOSTATUS returned %d (element no. %d) from tag %s.",ret,3,KCellInfo); continue; } @@ -451,7 +457,7 @@ locationArea.iCellId= cellId; iLocationArea->AppendL(locationArea); } - LOGNETWORK1("...Finished parsing Network Status config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_27, "...Finished parsing Network Status config parameters..."); // If present load the first registration status settings and start the registration // status timer. @@ -460,7 +466,7 @@ iRegStatIndex=0; iCurrentRegStatus=iRegStatusInfo->At(0).iRegStatus; iCurrentNetworkIndex=iRegStatusInfo->At(0).iNetworkInfoIndex; - LOGNETWORK2("Starting ETimerIdNtwkStatRegStat for duration:%d", iRegStatusInfo->At(0).iDuration); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_28, "Starting ETimerIdNtwkStatRegStat for duration:%d", iRegStatusInfo->At(0).iDuration); iRegStatTimer->Start(iRegStatusInfo->At(0).iDuration,this,ETimerIdNtwkStatRegStat); } @@ -487,14 +493,14 @@ if(iRadioMode.iRadioOn==EFalse) { RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOff); - LOGNETWORK1("Radio Mode = OFF (from config)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_29, "Radio Mode = OFF (from config)"); } else { RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOn); - LOGNETWORK1("Radio Mode = ON (from config)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_30, "Radio Mode = ON (from config)"); } - LOGNETWORK2("Radio Mode duration = %d (from config)", iRadioModeInfo->At(0).iDuration); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_31, "Radio Mode duration = %d (from config)", iRadioModeInfo->At(0).iDuration); iRadioModeTimer->Start(iRadioModeInfo->At(0).iDuration,this,ETimerIdNtwkStatRadioMode); } @@ -502,7 +508,7 @@ { //default to on RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOn); - LOGNETWORK1("Radio Mode = ON (no config)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_32, "Radio Mode = ON (no config)"); } //If present read in Service Provider settings @@ -514,17 +520,17 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,displayreq); if(ret!=KErrNone) { - LOGPARSERR("displayreq",ret,0,&KServiceProviderName); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAYREQ returned %d (element no. %d) from tag %s.",ret,0,KServiceProviderName); } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,spname); if(ret!=KErrNone) { - LOGPARSERR("spname",ret,1,&KServiceProviderName); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element SPNAME returned %d (element no. %d) from tag %s.",ret,1,KServiceProviderName); } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,plmnfield); if(ret!=KErrNone) { - LOGPARSERR("plmnfield",ret,2,&KServiceProviderName); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_CONSTRUCTL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element PLMNFIELD returned %d (element no. %d) from tag %s.",ret,2,KServiceProviderName); } iServiceProvider.iDisplayReq = static_cast(displayreq); @@ -577,7 +583,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,getTimer); if(ret!=KErrNone) { - LOGNETWORK1("WARNING: CSimNetworkStatus::FindRoamStatSettings found ERROR with Config"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_FINDROAMSTATSETTINGS_1, "WARNING: CSimNetworkStatus::FindRoamStatSettings found ERROR with Config"); } iRoamStatGetTimeout = getTimer; } @@ -1437,7 +1443,7 @@ TimerCallBackCellInfo(); break; default: - LOGNETWORK3("CSimNetworkStatus::TimerCallBack(%d), OOR [%d]",aId, ETimerIdNtwkStatRegStat); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACK_1, "CSimNetworkStatus::TimerCallBack(%d), OOR [%d]",aId, ETimerIdNtwkStatRegStat); SimPanic(EIllegalCallBackId); break; } @@ -1487,7 +1493,7 @@ } if(iCurrNetChangeV1NotificationPending) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_1, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1"); iCurrNetChangeV1NotificationPending = EFalse; RMobilePhone::TMobilePhoneNetworkInfoV1* changeNetInfoV1 = reinterpret_cast(iCurrNetChangeV1NotificationNetInfo); @@ -1497,7 +1503,7 @@ if(iCurrNetChangeV2NotificationPending) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_2, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2"); iCurrNetChangeV2NotificationPending = EFalse; RMobilePhone::TMobilePhoneNetworkInfoV2* changeNetInfoV2 = reinterpret_cast(iCurrNetChangeV2NotificationNetInfo); PopulateNetworkInfoV1(iCurrentNetworkIndex,*changeNetInfoV2); @@ -1508,7 +1514,7 @@ if(iCurrNetChangeV5NotificationPending) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_3, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5"); iCurrNetChangeV5NotificationPending = EFalse; RMobilePhone::TMobilePhoneNetworkInfoV5* changeNetInfoV5 = reinterpret_cast(iCurrNetChangeV5NotificationNetInfo); PopulateNetworkInfoV1(iCurrentNetworkIndex,*changeNetInfoV5); @@ -1521,7 +1527,7 @@ if(iCurrNetChangeV8NotificationPending) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_4, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8"); iCurrNetChangeV8NotificationPending = EFalse; RMobilePhone::TMobilePhoneNetworkInfoV8* changeNetInfoV8 = reinterpret_cast(iCurrNetChangeV8NotificationNetInfo); PopulateNetworkInfoV1(iCurrentNetworkIndex,*changeNetInfoV8); @@ -1535,7 +1541,7 @@ if(iCurrNetChangeEtelIsvNotificationPending) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TEtel3rdPartyMobileNetworkInfoV1"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_5, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TEtel3rdPartyMobileNetworkInfoV1"); iCurrNetChangeEtelIsvNotificationPending = EFalse; RMobilePhone::TEtel3rdPartyMobileNetworkInfoV1* changeNetInfoEtelIsv = reinterpret_cast(iCurrNetChangeEtelIsvNotificationNetInfo); @@ -1544,7 +1550,7 @@ } if(iCurrNetChangeNoLocV1NotificationPending) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1 (No Location)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_6, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV1 (No Location)"); iCurrNetChangeNoLocV1NotificationPending = EFalse; RMobilePhone::TMobilePhoneNetworkInfoV1* changeNetInfoV1 = reinterpret_cast(iCurrNetChangeNoLocV1NotificationNetInfo); @@ -1554,7 +1560,7 @@ if(iCurrNetChangeNoLocV2NotificationPending) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2 (No Location)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_7, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV2 (No Location)"); iCurrNetChangeNoLocV2NotificationPending = EFalse; RMobilePhone::TMobilePhoneNetworkInfoV2* changeNetInfoV2 = reinterpret_cast(iCurrNetChangeNoLocV2NotificationNetInfo); @@ -1566,7 +1572,7 @@ if(iCurrNetChangeNoLocV5NotificationPending) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5 (No Location)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_8, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV5 (No Location)"); iCurrNetChangeNoLocV5NotificationPending = EFalse; RMobilePhone::TMobilePhoneNetworkInfoV5* changeNetInfoV5 = reinterpret_cast(iCurrNetChangeNoLocV5NotificationNetInfo); @@ -1580,7 +1586,7 @@ if(iCurrNetChangeNoLocV8NotificationPending) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8 (No Location)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_9, "CSimNetworkStatus::TimerCallBackRegStat() - completing NotifyCurrentNetworkChange TMobilePhoneNetworkInfoV8 (No Location)"); iCurrNetChangeNoLocV8NotificationPending = EFalse; RMobilePhone::TMobilePhoneNetworkInfoV8* changeNetInfoV8 = reinterpret_cast(iCurrNetChangeNoLocV8NotificationNetInfo); @@ -1629,11 +1635,11 @@ * completes. */ { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRadioModeL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_1, "CSimNetworkStatus::TimerCallBackRadioModeL"); iRadioModeIndex++; if(iRadioModeInfo->Count()<=iRadioModeIndex) { - LOGNETWORK1("CSimNetworkStatus::TimerCallBackRadioModeL returning, no more config"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_2, "CSimNetworkStatus::TimerCallBackRadioModeL returning, no more config"); return; } @@ -1641,15 +1647,15 @@ if(iRadioMode.iRadioOn==EFalse) { RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOff); - LOGNETWORK1("Radio Mode = OFF (config duration passed)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_3, "Radio Mode = OFF (config duration passed)"); } else { RProperty::Set(KUidSystemCategory, KUidPhonePwrValue, ESAPhoneOn); - LOGNETWORK1("Radio Mode = ON (config duration passed)"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_4, "Radio Mode = ON (config duration passed)"); } - LOGNETWORK2("Next radio Mode duration = %d (from config)", iRadioModeInfo->At(iRadioModeIndex).iDuration); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_5, "Next radio Mode duration = %d (from config)", iRadioModeInfo->At(iRadioModeIndex).iDuration); iRadioModeTimer->Start(iRadioModeInfo->At(iRadioModeIndex).iDuration,this,ETimerIdNtwkStatRadioMode); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimNtRas.cpp --- a/telephonyserverplugins/simtsy/src/CSimNtRas.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimNtRas.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -19,8 +19,14 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimNtRasTraces.h" +#endif + #include "CSimNtras.h" -#include "Simlog.h" _LIT8(KNtRasWriteText,"CLIENT"); // < Solicitation text, send to start the NTRas server _LIT8(KNtRasReceiveText,"SERVER"); // < NTRas server response, indicating the PPP session can commence. @@ -87,7 +93,7 @@ * @return TInt Standard error value. */ { - LOGDATA1("Starting to attempt a NT RAS Connection"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_CONNECT_1, "Starting to attempt a NT RAS Connection"); iReadBuf.Zero(); iInputBuf.Zero(); @@ -131,7 +137,7 @@ * Transmit "CLIENT" and attempt a connection */ { - LOGDATA1("NTRAS Writing CLIENT..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_ATTEMPTCONNECT_1, "NTRAS Writing CLIENT..."); iAttemptCnt++; // Send the soliciting message, and await the NT Ras server's response. CommWrite(KNtRasWriteText); @@ -169,7 +175,7 @@ * @param aStatus Standard error value, indicating the result of the read request. */ { - LOGDATA2("NTRAS Rx Completion: %S",&iInputBuf); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_COMMREADCOMPLETE_1, "NTRAS Rx Completion: %s",iInputBuf); if(aStatus!=KErrNone) { iTimer->Cancel(); @@ -190,7 +196,7 @@ { iTimer->Cancel(); iCallback->NTRasCallBack(KErrNone); - LOGDATA1("NTRAS Received SERVER!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_COMMREADCOMPLETE_2, "NTRAS Received SERVER!"); return; } @@ -203,7 +209,7 @@ * has occurred. */ { - LOGDATA1("NTRAS Write Completion"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_COMMWRITECOMPLETE_1, "NTRAS Write Completion"); if(aStatus!=KErrNone) { iTimer->Cancel(); @@ -216,7 +222,7 @@ * Timer expired callback. Give up the attempted connection with a time-out error. */ { - LOGDATA1("NTRAS Timeout Occurred"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMNTRAS_TIMERCALLBACK_1, "NTRAS Timeout Occurred"); CommWriteCancel(); if(iAttemptCnt // @@ -70,7 +76,7 @@ * @param aMaxTextLen The maximum length of an alpha tag. */ { - LOGPHBK1("Starting to parse Own Number store additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CONSTRUCTL_1, "Starting to parse Own Number store additional config parameters..."); __ASSERT_ALWAYS(aMaxNumLen<=KONMaxTelNumSize,SimPanic(EOwnNumberNameOrNumberTooLarge)); __ASSERT_ALWAYS(aMaxTextLen<=KONMaxTextSize,SimPanic(EOwnNumberNameOrNumberTooLarge)); @@ -91,7 +97,7 @@ if(ret!=KErrNone) { iONStoreCaps=KDefaultONPhoneStoreCaps; - LOGPARSERR("value",ret,0,&KONPhoneStoreCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element VALUE returned %d (element no. %d) from tag %s.",ret,0,KONPhoneStoreCaps); } else { @@ -107,7 +113,7 @@ iONStoreCaps=KDefaultONPhoneStoreCaps; - LOGPHBK1("...Finished parsing Own Number store additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CONSTRUCTL_3, "...Finished parsing Own Number store additional config parameters..."); } void CSimONStore::PopulateStoreFromConfigFileL() @@ -120,7 +126,7 @@ * "PhBkStoreEntry = , , , " */ { - LOGPHBK1("Starting to read Own Number store entries..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_1, "Starting to read Own Number store entries..."); iONIndividualPause=CfgFile()->ItemValue(KONStoreIndividualReqPause,KDefaultONStoreIndividualReqPause); TInt count=CfgFile()->ItemCount(KONStoreEntry); @@ -143,7 +149,7 @@ ret=GetONEntry(item,0,index,telNum,name,typeOfNumber,service,mode,numberPlan); if(ret!=KErrNone) { - LOGPARSERR("Own Number Entry",ret,index,&KONStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element OWN NUMBER ENTRY returned %d (element no. %d) from tag %s.",ret,index,KONStoreEntry); continue; } @@ -155,7 +161,7 @@ iONStoreEntries[index].iNumberPlan=numberPlan; } - LOGPHBK1("...Finished reading Own Number store entries..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_3, "...Finished reading Own Number store entries..."); } @@ -544,6 +550,6 @@ * @return CTestConfigSection a pointer to the configuration file data section */ { - LOGPHBK1(">>CSimONStore::CfgFile"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMONSTORE_CFGFILE_1, ">>CSimONStore::CfgFile"); return iPhone->CfgFile(); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPacketContext.cpp --- a/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -19,7 +19,13 @@ @file */ -#include "Simlog.h" + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPacketContextTraces.h" +#endif + #include "CSimPhone.h" #include "CSimPacketContext.h" #include "CSimPacketService.h" @@ -122,7 +128,7 @@ * @leave Leaves no memory or any data member does not construct for any reason. */ { - LOGPACKET1("CSimPacketContext: Entered constructor"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_1, "CSimPacketContext: Entered constructor"); iSetConfigData = new (ELeave) CArrayFixFlat(1); iNotifyContextConfigChangeArray = new (ELeave) CArrayFixFlat(1); @@ -139,7 +145,7 @@ iNotifyContextConfigChangeTimer= CSimTimer::NewL(iPhone); iContextStatusChange = CSimPubSubChange::NewL(this, CSimPubSub::TPubSubProperty(KUidPSSimTsyCategory, KPSSimtsyPacketContextStatusChange, KPSSimtsyPacketContextStatusChangeKeyType)); - LOGPACKET1("Starting to Load and Parse Packet Context the Config File"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_2, "Starting to Load and Parse Packet Context the Config File"); GetCommSetupSettingsL(); GetContextConfigParamSettingsL(KSetContextConfigGPRS()); @@ -177,7 +183,7 @@ if(ret!=KErrNone) { - LOGPARSERR("CTFTMediaAuthorizationV3::authorizationToken",ret,0,&KAuthorizationToken); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CTFTMEDIAAUTHORIZATIONV3::AUTHORIZATIONTOKEN returned %d (element no. %d) from tag %s.",ret,0,KAuthorizationToken); CleanupStack::PopAndDestroy(mediaAuthorization); continue; } @@ -191,7 +197,7 @@ if(ret!=KErrNone || desiredResponse > 0) { - LOGPARSERR("desiredResponse",ret,1,&KAuthorizationToken); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DESIREDRESPONSE returned %d (element no. %d) from tag %s.",ret,1,KAuthorizationToken); CleanupStack::PopAndDestroy(mediaAuthorization); continue; } @@ -219,7 +225,7 @@ if(ret!=KErrNone || mediaComponentNumber < 0) { - LOGPARSERR("CTFTMediaAuthorizationV3::mediaComponentNumber",ret,0,&KFlowIdentifier); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CTFTMEDIAAUTHORIZATIONV3::MEDIACOMPONENTNUMBER returned %d (element no. %d) from tag %s.",ret,0,KFlowIdentifier); continue; } else @@ -231,7 +237,7 @@ if(ret!=KErrNone || IPFlowNumber < 0) { - LOGPARSERR("CTFTMediaAuthorizationV3::IPFlowNumber",ret,1,&KFlowIdentifier); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element CTFTMEDIAAUTHORIZATIONV3::IPFLOWNUMBER returned %d (element no. %d) from tag %s.",ret,1,KFlowIdentifier); continue; } else @@ -246,7 +252,7 @@ CleanupStack::Pop(mediaAuthorization); } - LOGPACKET1("...Finished parsing Packet Context config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTL_7, "...Finished parsing Packet Context config parameters..."); } void CSimPacketContext::GetCommSetupSettingsL() @@ -283,7 +289,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,csyName); if(ret!=KErrNone) { - LOGPARSERR("CommSetUp::csyName",ret,0,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::CSYNAME returned %d (element no. %d) from tag %s.",ret,0,KCommSetup); comm.iCsyName.Copy(KDefaultCsyName); } else @@ -292,7 +298,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,portName); if(ret!=KErrNone) { - LOGPARSERR("CommSetUp::portName",ret,1,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::PORTNAME returned %d (element no. %d) from tag %s.",ret,1,KCommSetup); comm.iPortName.Copy(KDefaultPortName); } else @@ -302,7 +308,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,dataRate); if(ret!=KErrNone) { - LOGPARSERR("CommSetUp::dataRate",ret,2,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::DATARATE returned %d (element no. %d) from tag %s.",ret,2,KCommSetup); comm.iConfig.iRate=KDefaultCommPortRate; } else @@ -311,7 +317,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,handshake); if(ret!=KErrNone) { - LOGPARSERR("CommSetUp::handShake",ret,3,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::HANDSHAKE returned %d (element no. %d) from tag %s.",ret,3,KCommSetup); comm.iConfig.iHandshake=KDefaultHandshake; } else @@ -321,7 +327,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,contextName); if(ret!=KErrNone) { - LOGPARSERR("CommSetUp::contextName",ret,4,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,4,KCommSetup); comm.iContextName=KDefaultSetting; } else @@ -330,7 +336,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,commReset); if(ret!=KErrNone) { - LOGPARSERR("CommSetUp::commReset",ret,5,&KCommSetup); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element COMMSETUP::COMMRESET returned %d (element no. %d) from tag %s.",ret,5,KCommSetup); comm.iCommReset=EFalse; } else @@ -422,7 +428,7 @@ if(ret != KErrNone || delay < 0) { - LOGPARSERR("SetConfigDelay",ret,0,&KSetConfigDelay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGDELAY returned %d (element no. %d) from tag %s.",ret,0,KSetConfigDelay); } else { @@ -439,7 +445,7 @@ if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::contextName",ret,0,&KSetConfigFail); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KSetConfigFail); } else { @@ -449,7 +455,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KSetConfigFail); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KSetConfigFail); } else { @@ -460,7 +466,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KSetConfigFail); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KSetConfigFail); } else { @@ -491,7 +497,7 @@ configChangeData.iDelay); if(ret!=KErrNone) { - LOGPARSERR("NotifyContextConfigChange::delay",ret,0,&KNotifyContextConfigChange); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTCONFIGCHANGE::DELAY returned %d (element no. %d) from tag %s.",ret,0,KNotifyContextConfigChange); continue; } @@ -500,8 +506,7 @@ configChangeData.iNewContextConfigIndex); if(ret!=KErrNone) { - LOGPARSERR("NotifyContextConfigChange::NewContextConfigIndex", - ret,0,&KNotifyContextConfigChange); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTCONFIGCHANGE::NEWCONTEXTCONFIGINDEX returned %d (element no. %d) from tag %s.",ret,0,KNotifyContextConfigChange); continue; } @@ -521,7 +526,7 @@ if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::contextName",ret,0,&KDeleteTftFail); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KDeleteTftFail); } else { @@ -531,7 +536,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KDeleteTftFail); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KDeleteTftFail); } else { @@ -542,7 +547,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KDeleteTftFail); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KDeleteTftFail); } else { @@ -560,7 +565,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::contextName",ret,0,&KCreateTftConfig); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KCreateTftConfig); } else { @@ -570,7 +575,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KCreateTftConfig); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_5, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KCreateTftConfig); } else { @@ -581,7 +586,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KCreateTftConfig); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_6, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KCreateTftConfig); } else { @@ -592,7 +597,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,delay); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::failErrorCode",ret,3,&KCreateTftConfig); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_7, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,3,KCreateTftConfig); } else { @@ -609,7 +614,7 @@ if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::contextName",ret,0,&KAddPacketFilter); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_8, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KAddPacketFilter); } else { @@ -619,7 +624,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::numberOfTimes",ret,1,&KAddPacketFilter); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_9, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KAddPacketFilter); } else { @@ -630,7 +635,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,failErrorCode); if(ret!=KErrNone) { - LOGPARSERR("SetConfigFail::failErrorCode",ret,2,&KAddPacketFilter); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_10, "WARNING - CONFIGURATION FILE PARSING - Reading element SETCONFIGFAIL::FAILERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KAddPacketFilter); } else { @@ -662,7 +667,7 @@ if(ret!=KErrNone) { - LOGPARSERR("ContextConfigRel99::contextName",ret,0,KContextConfigRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KContextConfigRel99); } else { @@ -672,7 +677,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,activatePause); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigRel99::activatePause",ret,1,&KContextConfigRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::ACTIVATEPAUSE returned %d (element no. %d) from tag %s.",ret,1,KContextConfigRel99); continue; } else @@ -681,7 +686,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,activateErrorCode); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigRel99::activateErrorCode",ret,2,&KContextConfigRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::ACTIVATEERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KContextConfigRel99); continue; } else @@ -690,7 +695,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,aDeactivatePause); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigRel99::deactivatePause",ret,3,&KContextConfigRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DEACTIVATEPAUSE returned %d (element no. %d) from tag %s.",ret,3,KContextConfigRel99); continue; } else @@ -699,7 +704,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,deactivateErrorCode); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigRel99::deactivateErrorCode",ret,4,&KContextConfigRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DEACTIVATEERRORCODE returned %d (element no. %d) from tag %s.",ret,4,KContextConfigRel99); continue; } else @@ -708,7 +713,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,deletionPause); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigRel99::deletetionPause",ret,5,&KContextConfigRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DELETETIONPAUSE returned %d (element no. %d) from tag %s.",ret,5,KContextConfigRel99); continue; } else @@ -717,7 +722,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6, deletionErrorCode); if(ret!=KErrNone) { - LOGPARSERR("ContextConfigRel99::deletionErrorCode",ret,6,&KContextConfigRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTEXTCONFIGREL99::DELETIONERRORCODE returned %d (element no. %d) from tag %s.",ret,6,KContextConfigRel99); continue; } else @@ -808,7 +813,7 @@ if(ret!=KErrNone) { - LOGPARSERR("NotifyContextStatusChange::contextName",ret,0,&KNotifyContextStatusChange); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTSTATUSCHANGE::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KNotifyContextStatusChange); continue; } else @@ -819,7 +824,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration); if(ret!=KErrNone) { - LOGPARSERR("NotifyContextStatusChange::duration",ret,1,&KNotifyContextStatusChange); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTSTATUSCHANGE::DURATION returned %d (element no. %d) from tag %s.",ret,1,KNotifyContextStatusChange); continue; } else @@ -828,7 +833,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,contextStatus); if(ret!=KErrNone) { - LOGPARSERR("NotifyContextStatusChange::duration",ret,2,&KNotifyContextStatusChange); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element NOTIFYCONTEXTSTATUSCHANGE::DURATION returned %d (element no. %d) from tag %s.",ret,2,KNotifyContextStatusChange); continue; } else @@ -879,7 +884,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::id",ret,0,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::ID returned %d (element no. %d) from tag %s.",ret,0,KPacketFilterInfo); continue; } else @@ -891,7 +896,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::evaluationPrecedenceIndex",ret,1,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::EVALUATIONPRECEDENCEINDEX returned %d (element no. %d) from tag %s.",ret,1,KPacketFilterInfo); continue; } else @@ -903,7 +908,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::srcAddr",ret,2,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCADDR returned %d (element no. %d) from tag %s.",ret,2,KPacketFilterInfo); continue; } else @@ -1014,7 +1019,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::srcAddrSubnetMask",ret,3,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCADDRSUBNETMASK returned %d (element no. %d) from tag %s.",ret,3,KPacketFilterInfo); continue; } else @@ -1124,7 +1129,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::protocolNumberOrNextNumber",ret,4,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::PROTOCOLNUMBERORNEXTNUMBER returned %d (element no. %d) from tag %s.",ret,4,KPacketFilterInfo); packetFilter.iProtocolNumberOrNextHeader = KUnsetInteger; } else @@ -1136,7 +1141,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::srcPortMin",ret,5,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCPORTMIN returned %d (element no. %d) from tag %s.",ret,5,KPacketFilterInfo); packetFilter.iSrcPortMin = KUnsetInteger; } else @@ -1148,7 +1153,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::srcPortMax",ret,6,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCPORTMAX returned %d (element no. %d) from tag %s.",ret,6,KPacketFilterInfo); packetFilter.iSrcPortMax = KUnsetInteger; } else @@ -1160,7 +1165,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::destPortMin",ret,7,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::DESTPORTMIN returned %d (element no. %d) from tag %s.",ret,7,KPacketFilterInfo); packetFilter.iDestPortMin = KUnsetInteger; } else @@ -1172,7 +1177,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::srcPortMax",ret,8,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::SRCPORTMAX returned %d (element no. %d) from tag %s.",ret,8,KPacketFilterInfo); packetFilter.iDestPortMax = KUnsetInteger; } else @@ -1184,7 +1189,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::ipSecSPI",ret,9,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::IPSECSPI returned %d (element no. %d) from tag %s.",ret,9,KPacketFilterInfo); packetFilter.iIPSecSPI = KUnsetInteger; } else @@ -1196,7 +1201,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::toSorTrafficClass",ret,10,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::TOSORTRAFFICCLASS returned %d (element no. %d) from tag %s.",ret,10,KPacketFilterInfo); continue; } else @@ -1208,7 +1213,7 @@ if(ret!=KErrNone) { - LOGPARSERR("PacketFilterInfo::flowLabel",ret,11,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::FLOWLABEL returned %d (element no. %d) from tag %s.",ret,11,KPacketFilterInfo); packetFilter.iFlowLabel = KUnsetInteger; } else @@ -1222,12 +1227,12 @@ { if(ret == KErrNotFound) { - LOGCONFIG1("CONFIGURATION FILE PARSING - PacketFilterInfo::TPacketFilterV2 info encountered"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_13, "CONFIGURATION FILE PARSING - PacketFilterInfo::TPacketFilterV2 info encountered"); packetFilter.iFilterType = RPacketContext::EPacketFilterTypeUnknown; } else { - LOGPARSERR("PacketFilterInfo::filterType",ret,12,&KPacketFilterInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element PACKETFILTERINFO::FILTERTYPE returned %d (element no. %d) from tag %s.",ret,12,KPacketFilterInfo); continue; } } @@ -1248,7 +1253,7 @@ * */ { - LOGPACKET1("CSimPacketContext: Entered destructor"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DTOR_1, "CSimPacketContext: Entered destructor"); if (iContextConfigParams != NULL) { @@ -1451,7 +1456,7 @@ return KErrNone; default: // Unknown or invalid IPC - LOGPACKET1("CSimPacketContext: Register error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_REGISTERNOTIFICATION_1, "CSimPacketContext: Register error, unknown IPC"); return KErrNotSupported; } } @@ -1474,11 +1479,11 @@ case EPacketContextNotifyConfigChanged: case EPacketContextNotifyStatusChange: case EPacketContextNotifyDataTransferred: - LOGPACKET1("CSimPacketContext: DeregisterNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_1, "CSimPacketContext: DeregisterNotification"); return KErrNone; default: // Unknown or invalid IPC - LOGPACKET1("CSimPacketContext: Deregister error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_2, "CSimPacketContext: Deregister error, unknown IPC"); return KErrNotSupported; } } @@ -1499,12 +1504,12 @@ case EPacketContextNotifyConfigChanged: case EPacketContextNotifyStatusChange: case EPacketContextNotifyDataTransferred: - LOGPACKET1("CGprsDGprsTsy: Registered with 5 slots"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NUMBEROFSLOTSL_1, "CGprsDGprsTsy: Registered with 5 slots"); numberOfSlots=5; break; default: // Unknown or invalid IPC - LOGPACKET1("CSimPacketContext: Number of Slots error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NUMBEROFSLOTSL_2, "CSimPacketContext: Number of Slots error, unknown IPC"); User::Leave(KErrNotSupported); break; } @@ -1553,7 +1558,7 @@ TRAPD(ret, iSetConfigData->AppendL(setConfigData) ); if (ret != KErrNone) { - LOGPACKET1("CSimPacketContext::ExtFunc AppendL call fail"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_EXTFUNC_1, "CSimPacketContext::ExtFunc AppendL call fail"); return ret; } @@ -1703,7 +1708,7 @@ * @return err KErrNone if request completes ok */ { - LOGPACKET1("CSimPacketContext: - CancelService called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CANCELSERVICE_1, "CSimPacketContext: - CancelService called"); switch (aIpc) { case EPacketContextSetConfig: @@ -1777,7 +1782,7 @@ */ { - LOGPACKET1("CSimPacketContext::SetConfig called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_SETCONFIG_1, "CSimPacketContext::SetConfig called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -1897,7 +1902,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::GetConfig called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETCONFIG_1, "CSimPacketContext::GetConfig called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -2002,7 +2007,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::NotifyConfigChangedCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYCONFIGCHANGEDCANCEL_1, "CSimPacketContext::NotifyConfigChangedCancel called"); if(iNotifyConfigGPRS.iNotifyPending && iNotifyConfigGPRS.iNotifyHandle == aTsyReqHandle) { @@ -2109,7 +2114,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::Deactivate called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEACTIVATE_1, "CSimPacketContext::Deactivate called"); iDeactivateRequestHandle = aTsyReqHandle; TInt ret; ret = ActionEvent(EContextEventDeactivate,KErrNone); @@ -2126,7 +2131,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::DeactivateCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DEACTIVATECANCEL_1, "CSimPacketContext::DeactivateCancel called"); if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusDeactivating)) && (iCurrentEvent==EContextEventDeactivate)) { @@ -2226,7 +2231,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::ActivateCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIVATECANCEL_1, "CSimPacketContext::ActivateCancel called"); if(((iState == RPacketContext::EStatusInactive) || (iState == RPacketContext::EStatusActivating)) && (iCurrentEvent==EContextEventActivate)) { @@ -2277,7 +2282,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::Delete called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DELETE_1, "CSimPacketContext::Delete called"); iDeleteRequestHandle = aTsyReqHandle; TInt ret; ret = ActionEvent(EContextEventDelete,KErrNone); @@ -2294,7 +2299,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::DeleteCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_DELETECANCEL_1, "CSimPacketContext::DeleteCancel called"); if((iState == RPacketContext::EStatusInactive) && (iCurrentEvent==EContextEventDelete)) { iTimer->Cancel(); @@ -2313,7 +2318,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::LoanCommPort called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_LOANCOMMPORT_1, "CSimPacketContext::LoanCommPort called"); if(iState != RPacketContext::EStatusActive) { @@ -2343,7 +2348,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::LoanCommPortCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_LOANCOMMPORTCANCEL_1, "CSimPacketContext::LoanCommPortCancel called"); return KErrNone; } @@ -2355,7 +2360,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::RecoverCommPort called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_RECOVERCOMMPORT_1, "CSimPacketContext::RecoverCommPort called"); if (!iCommPortLoaned) { ReqCompleted(aTsyReqHandle, KErrEtelPortNotLoanedToClient); @@ -2375,7 +2380,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::RecoverCommPortCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_RECOVERCOMMPORTCANCEL_1, "CSimPacketContext::RecoverCommPortCancel called"); return KErrNone; } @@ -2388,7 +2393,7 @@ * @return KerrNone */ { - LOGPACKET1("CSimPacketContext::GetStatus called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETSTATUS_1, "CSimPacketContext::GetStatus called"); *aContextStatus = iState; ReqCompleted(aTsyReqHandle,KErrNone); return KErrNone; @@ -2406,7 +2411,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::NotifyStatusChange called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGE_1, "CSimPacketContext::NotifyStatusChange called"); __ASSERT_ALWAYS(!iNotifyStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); iNotifyStatusChange.iNotifyPending = ETrue; iNotifyStatusChange.iNotifyHandle = aTsyReqHandle; @@ -2425,7 +2430,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::NotifyStatusChangeCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGECANCEL_1, "CSimPacketContext::NotifyStatusChangeCancel called"); if(iNotifyStatusChange.iNotifyPending) { iNotifyStatusChange.iNotifyPending=EFalse; @@ -2444,7 +2449,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketContext::GetDataVolumeTransferred called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETDATAVOLUMETRANSFERRED_1, "CSimPacketContext::GetDataVolumeTransferred called"); ReqCompleted(aTsyReqHandle,KErrNotSupported); return KErrNone; } @@ -2472,7 +2477,7 @@ * @return KerrNone */ { - LOGPACKET1("CSimPacketContext::NotifyDataTransferredCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_NOTIFYDATATRANSFERREDCANCEL_1, "CSimPacketContext::NotifyDataTransferredCancel called"); return KErrNone; } @@ -2485,7 +2490,7 @@ * @return KerrNone */ { - LOGPACKET1("CSimPacketContext::GetLastErrorCause called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETLASTERRORCAUSE_1, "CSimPacketContext::GetLastErrorCause called"); *aError = iLastError; ReqCompleted(aTsyReqHandle,iErrorCodeForGetLastErrorCause); iErrorCodeForGetLastErrorCause = KErrNone; @@ -2547,7 +2552,7 @@ else { - LOGMISC1(">>CSimPacketContext.cpp: Invalid new context config param index"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_TIMERCALLBACK_1, ">>CSimPacketContext.cpp: Invalid new context config param index"); } //Delete the current NotifyContextConfigChange item and set the next one if possible @@ -2568,10 +2573,10 @@ break; default: { - LOGPACKET1(">>CSimPacketContext::TimerCallBack"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_TIMERCALLBACK_2, ">>CSimPacketContext::TimerCallBack"); TInt ret=ActionEvent(EContextEventTimeOut,KErrNone); __ASSERT_ALWAYS(ret==KErrNone,SimPanic(ETimeOutEventActionFailed)); // Note: this is very crude error handling and should be replaced by something rather more elegant. - LOGPACKET1("<>CSimPacketContext::ChangeState [newState=%d]", aNewState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CHANGESTATE_1, ">>CSimPacketContext::ChangeState [newState=%d]", aNewState); __ASSERT_ALWAYS(aNewState!=RPacketContext::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal)); if(iState==aNewState) @@ -2718,7 +2723,7 @@ } - LOGPACKET1("<>CSimPacketContext::ActionEvent = [EContextEventActivate]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_1, ">>CSimPacketContext::ActionEvent = [EContextEventActivate]"); if(iState==RPacketContext::EStatusInactive) { iCurrentEvent=EContextEventActivate; @@ -2771,7 +2776,7 @@ break; case EContextEventDeactivate: - LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventDeactivate]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_2, ">>CSimPacketContext::ActionEvent = [EContextEventDeactivate]"); if(iState==RPacketContext::EStatusActive) { iCurrentEvent=EContextEventDeactivate; @@ -2791,7 +2796,7 @@ break; case EContextEventDelete: - LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventDelete]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_3, ">>CSimPacketContext::ActionEvent = [EContextEventDelete]"); if(iState==RPacketContext::EStatusInactive) { iCurrentEvent=EContextEventDelete; @@ -2827,7 +2832,7 @@ break; case EContextEventTimeOut: - LOGPACKET1(">>CSimPacketContext::ActionEvent = [EContextEventTimeOut]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_ACTIONEVENT_4, ">>CSimPacketContext::ActionEvent = [EContextEventTimeOut]"); switch(iCurrentEvent) { case EContextEventNone: @@ -3598,7 +3603,7 @@ TRAPD(ret, mediaAuthV3 = RPacketContext::CTFTMediaAuthorizationV3::NewL()); if (ret != KErrNone) { - LOGPACKET1("CSimPacketContext::GetAddMediaAuthorization NewL call fail"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_1, "CSimPacketContext::GetAddMediaAuthorization NewL call fail"); return ret; } @@ -3606,7 +3611,7 @@ if (ret != KErrNone) { delete mediaAuthV3; - LOGPACKET1("CSimPacketContext::GetAddMediaAuthorization InternalizeL call fail"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_2, "CSimPacketContext::GetAddMediaAuthorization InternalizeL call fail"); return ret; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPacketQoS.cpp --- a/telephonyserverplugins/simtsy/src/CSimPacketQoS.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPacketQoS.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1997-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" @@ -13,11 +13,17 @@ // Description: // + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPacketQoSTraces.h" +#endif + #include "CSimPacketQoS.h" #include "CSimPhone.h" #include #include "CSimPacketContext.h" -#include "Simlog.h" #include "utils.h" #include "CSimPubSubChange.h" @@ -237,7 +243,7 @@ * @leave Leaves no memory or any data member does not construct for any reason. */ { - LOGPACKET1("CSimPacketQoS: Entered constructor"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_CONSTRUCTL_1, "CSimPacketQoS: Entered constructor"); iQosNetworkNotificationCount = 0; iQosR5NetworkNotificationCount = 0; @@ -246,7 +252,7 @@ iSetQoSTimer = CSimTimer::NewL(iPhone); iSimQoSChange = CSimPubSubChange::NewL(this, CSimPubSub::TPubSubProperty(KUidPSSimTsyCategory, KPSSimTsyNetworkQoSChange, KPSSimTsyNetworkQoSChangeKeyType)); - LOGPACKET1("Starting to Load and Parse Packet Qos Config File"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_CONSTRUCTL_2, "Starting to Load and Parse Packet Qos Config File"); GetGPRSReqProfilesL(); GetGPRSNegProfilesL(); @@ -262,7 +268,7 @@ GetProfileFailSettings(); GetSetQoSSettings(); - LOGPACKET1("...Finished parsing Packet qos config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_CONSTRUCTL_3, "...Finished parsing Packet qos config parameters..."); } void CSimPacketQoS::GetGPRSReqProfilesL() @@ -287,7 +293,7 @@ TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,minPrecedence); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::minPrecedence",ret,0,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINPRECEDENCE returned %d (element no. %d) from tag %s.",ret,0,KQosProfileReqGPRS); continue; } else @@ -299,7 +305,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,reqPrecedence); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::reqPrecedence",ret,1,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQPRECEDENCE returned %d (element no. %d) from tag %s.",ret,1,KQosProfileReqGPRS); continue; } else @@ -311,7 +317,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,minDelay); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::minDelay",ret,2,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINDELAY returned %d (element no. %d) from tag %s.",ret,2,KQosProfileReqGPRS); continue; } else @@ -323,7 +329,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,reqDelay); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::reqDelay",ret,3,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQDELAY returned %d (element no. %d) from tag %s.",ret,3,KQosProfileReqGPRS); continue; } else @@ -335,7 +341,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,minReliability); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::minReliability",ret,4,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINRELIABILITY returned %d (element no. %d) from tag %s.",ret,4,KQosProfileReqGPRS); continue; } else @@ -347,7 +353,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,reqReliability); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::reqReliability",ret,5,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQRELIABILITY returned %d (element no. %d) from tag %s.",ret,5,KQosProfileReqGPRS); continue; } else @@ -359,7 +365,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,minPeek); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::minPeek",ret,6,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINPEEK returned %d (element no. %d) from tag %s.",ret,6,KQosProfileReqGPRS); continue; } else @@ -371,7 +377,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,reqPeek); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::reqPeek",ret,7,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQPEEK returned %d (element no. %d) from tag %s.",ret,7,KQosProfileReqGPRS); continue; } else @@ -383,7 +389,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,minMean); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::minMean",ret,8,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::MINMEAN returned %d (element no. %d) from tag %s.",ret,8,KQosProfileReqGPRS); continue; } else @@ -395,7 +401,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,reqMean); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::reqMean",ret,9,&KQosProfileReqGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSREQPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::REQMEAN returned %d (element no. %d) from tag %s.",ret,9,KQosProfileReqGPRS); continue; } else @@ -429,7 +435,7 @@ TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,negPrecedence); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::negPrecedence",ret,0,&KQosProfileNegGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGPRECEDENCE returned %d (element no. %d) from tag %s.",ret,0,KQosProfileNegGPRS); continue; } else @@ -439,7 +445,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,negDelay); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::negDelay",ret,1,&KQosProfileNegGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGDELAY returned %d (element no. %d) from tag %s.",ret,1,KQosProfileNegGPRS); continue; } else @@ -449,7 +455,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negReliability); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::negReliability",ret,2,&KQosProfileNegGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGRELIABILITY returned %d (element no. %d) from tag %s.",ret,2,KQosProfileNegGPRS); continue; } else @@ -459,7 +465,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negPeek); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::negPeek",ret,3,&KQosProfileNegGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGPEEK returned %d (element no. %d) from tag %s.",ret,3,KQosProfileNegGPRS); continue; } else @@ -469,7 +475,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negMean); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqGPRS::negMean",ret,4,&KQosProfileNegGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSNEGPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQGPRS::NEGMEAN returned %d (element no. %d) from tag %s.",ret,4,KQosProfileNegGPRS); continue; } else @@ -510,7 +516,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::contextName",ret,0,KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosProfileReqR99); continue; } else @@ -518,7 +524,7 @@ profileReq99.iContextName.Copy(contextName); if (profileReq99.iContextName.Match(iPacketContext->ContextName())==KErrNotFound) { - LOGPARSERR("QosProfileReqR99::contextName",KErrArgument,0,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::CONTEXTNAME returned %d (element no. %d) from tag %s.",KErrArgument,0,KQosProfileReqR99); continue; } } @@ -526,7 +532,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,reqTraffic); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqTraffic",ret,1,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQTRAFFIC returned %d (element no. %d) from tag %s.",ret,1,KQosProfileReqR99); continue; } else @@ -540,7 +546,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,minTraffic); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minTraffic",ret,2,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosProfileReqR99); continue; } else @@ -554,7 +560,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,reqDeliveryOrder); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqDeliveryOrder",ret,3,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosProfileReqR99); continue; } else @@ -568,7 +574,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,minDeliveryOrder); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minDeliveryOrder",ret,4,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,4,KQosProfileReqR99); continue; } else @@ -582,7 +588,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,reqErroneousSDU); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqErroneousSDU",ret,5,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQERRONEOUSSDU returned %d (element no. %d) from tag %s.",ret,5,KQosProfileReqR99); continue; } else @@ -596,7 +602,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,minErroneousSDU); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minErroneousSDU",ret,6,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINERRONEOUSSDU returned %d (element no. %d) from tag %s.",ret,6,KQosProfileReqR99); continue; } else @@ -610,7 +616,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,maxSDUSize); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::maxSDUSize",ret,7,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,7,KQosProfileReqR99); continue; } else @@ -621,7 +627,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,minSDUSize); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minSDUSize",ret,8,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINSDUSIZE returned %d (element no. %d) from tag %s.",ret,8,KQosProfileReqR99); continue; } else @@ -632,7 +638,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,reqUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqUpLinkBitRate",ret,9,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,9,KQosProfileReqR99); continue; } else @@ -643,7 +649,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,reqDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqDownLinkBitRate",ret,10,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosProfileReqR99); continue; } else @@ -654,7 +660,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,minUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minUpLinkBitRate",ret,11,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosProfileReqR99); continue; } else @@ -675,7 +681,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,reqBitErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqBitErrorRatio",ret,13,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,13,KQosProfileReqR99); continue; } else @@ -689,7 +695,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,14,minBitErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minBitErrorRatio",ret,14,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,14,KQosProfileReqR99); continue; } else @@ -703,7 +709,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,15,reqSDUErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("- QosProfileReqR99::reqSDUErrorRatio",ret,15,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element - QOSPROFILEREQR99::REQSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,15,KQosProfileReqR99); continue; } else @@ -717,7 +723,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,16,minSDUErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("- QosProfileReqR99::minSDUErrorRatio",ret,16,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element - QOSPROFILEREQR99::MINSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,16,KQosProfileReqR99); continue; } else @@ -731,7 +737,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,17,reqTrafficHandlingPriority); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqTrafficHandlingPriority",ret,17,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,17,KQosProfileReqR99); continue; } else @@ -745,7 +751,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,18,minTrafficHandlingPriority); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minTrafficHandlingPriority",ret,18,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,18,KQosProfileReqR99); continue; } else @@ -759,7 +765,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,19,reqTransferDelay); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqTransferDelay",ret,19,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,19,KQosProfileReqR99); continue; } else @@ -770,7 +776,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,20,minTransferDelay); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minTransferDelay",ret,20,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,20,KQosProfileReqR99); continue; } else @@ -781,7 +787,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,21,reqGuaranteedUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqGuaranteedUpLinkBitRate",ret,21,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,21,KQosProfileReqR99); continue; } else @@ -792,7 +798,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,22,reqGuaranteedDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::reqGuaranteedDownLinkBitRate",ret,22,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::REQGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,22,KQosProfileReqR99); continue; } else @@ -803,7 +809,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,23,minGuaranteedUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minGuaranteedUpLinkBitRate",ret,23,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,23,KQosProfileReqR99); continue; } else @@ -814,7 +820,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,24,minGuaranteedDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR99::minGuaranteedDownLinkBitRate",ret,24,&KQosProfileReqR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99REQPROFILESL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR99::MINGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,24,KQosProfileReqR99); continue; } else @@ -849,7 +855,7 @@ TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::contextName",ret,0,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosProfileNegR99); continue; } else @@ -857,7 +863,7 @@ profileNeg99.iContextName.Copy(contextName); if (profileNeg99.iContextName.Match(iPacketContext->ContextName())==KErrNotFound) { - LOGPARSERR("QosProfileNegR99::contextName",KErrArgument,0,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::CONTEXTNAME returned %d (element no. %d) from tag %s.",KErrArgument,0,KQosProfileNegR99); continue; } } @@ -865,7 +871,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::duration",ret,1,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::DURATION returned %d (element no. %d) from tag %s.",ret,1,KQosProfileNegR99); continue; } else @@ -877,7 +883,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negTraffic); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negTraffic",ret,2,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosProfileNegR99); continue; } else @@ -889,7 +895,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negDeliveryOrder); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negDeliveryOrder",ret,3,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosProfileNegR99); continue; } else @@ -901,7 +907,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negErroneousSDUDelivery); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negErroneousSDUDelivery",ret,4,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGERRONEOUSSDUDELIVERY returned %d (element no. %d) from tag %s.",ret,4,KQosProfileNegR99); continue; } else @@ -913,7 +919,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,negMaxSDUSize); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negMaxSDUSize",ret,5,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGMAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,5,KQosProfileNegR99); continue; } else @@ -924,7 +930,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,negBitErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negBitErrorRatio",ret,6,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,6,KQosProfileNegR99); continue; } else @@ -937,7 +943,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,negSDUErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negSDUErrorRatio",ret,7,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,7,KQosProfileNegR99); continue; } else @@ -949,7 +955,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,negTrafficHandlingPriority); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negTrafficHandlingPriority",ret,8,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,8,KQosProfileNegR99); continue; } else @@ -961,7 +967,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,negTransferDelay); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negTransferDelay",ret,9,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,9,KQosProfileNegR99); continue; } else @@ -972,7 +978,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,negGuaranteedUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negGuaranteedUpLinkBitRate",ret,10,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosProfileNegR99); continue; } else @@ -983,7 +989,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,negGuaranteedDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negGuaranteedDownLinkBitRate",ret,11,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosProfileNegR99); continue; } else @@ -994,7 +1000,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,negMaxUpLinkRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negMaxUpLinkRate",ret,12,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGMAXUPLINKRATE returned %d (element no. %d) from tag %s.",ret,12,KQosProfileNegR99); continue; } else @@ -1005,7 +1011,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,negMaxDownLinkRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR99::negMaxDownLinkRate",ret,13,&KQosProfileNegR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NEGPROFILESL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR99::NEGMAXDOWNLINKRATE returned %d (element no. %d) from tag %s.",ret,13,KQosProfileNegR99); continue; } else @@ -1053,7 +1059,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::contextName",ret,0,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosNetworkNotificationType); continue; } else @@ -1064,7 +1070,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::duration",ret,1,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::DURATION returned %d (element no. %d) from tag %s.",ret,1,KQosNetworkNotificationType); continue; } else @@ -1076,7 +1082,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negTraffic); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negTraffic",ret,2,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosNetworkNotificationType); continue; } else @@ -1088,7 +1094,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negDeliveryOrder); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negDeliveryOrder",ret,3,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosNetworkNotificationType); continue; } else @@ -1100,7 +1106,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negErroneousSDUDelivery); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negErroneousSDUDelivery",ret,4,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGERRONEOUSSDUDELIVERY returned %d (element no. %d) from tag %s.",ret,4,KQosNetworkNotificationType); continue; } else @@ -1112,7 +1118,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,negMaxSDUSize); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negMaxSDUSize",ret,5,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGMAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,5,KQosNetworkNotificationType); continue; } else @@ -1123,7 +1129,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,negBitErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negBitErrorRatio",ret,6,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,6,KQosNetworkNotificationType); continue; } else @@ -1135,7 +1141,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,negSDUErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negSDUErrorRatio",ret,7,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,7,KQosNetworkNotificationType); continue; } else @@ -1147,7 +1153,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,negTrafficHandlingPriority); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negTrafficHandlingPriority",ret,8,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,8,KQosNetworkNotificationType); continue; } else @@ -1159,7 +1165,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,negTransferDelay); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negTransferDelay",ret,9,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,9,KQosNetworkNotificationType); continue; } else @@ -1170,7 +1176,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,negGuaranteedUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negGuaranteedUpLinkBitRate",ret,10,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosNetworkNotificationType); continue; } else @@ -1181,7 +1187,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,negGuaranteedDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negGuaranteedDownLinkBitRate",ret,11,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosNetworkNotificationType); continue; } else @@ -1192,7 +1198,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,negMaxUpLinkRate); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negMaxUpLinkRate",ret,12,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGMAXUPLINKRATE returned %d (element no. %d) from tag %s.",ret,12,KQosNetworkNotificationType); continue; } else @@ -1203,7 +1209,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,negMaxDownLinkRate); if(ret!=KErrNone) { - LOGPARSERR("QosNetworkNotification::negMaxDownLinkRate",ret,13,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSNETWORKNOTIFICATION::NEGMAXDOWNLINKRATE returned %d (element no. %d) from tag %s.",ret,13,KQosNetworkNotificationType); continue; } else @@ -1232,7 +1238,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,trafficCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR99::trafficCap",ret,0,&KQosProfileCapsR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::TRAFFICCAP returned %d (element no. %d) from tag %s.",ret,0,KQosProfileCapsR99); } else if(AsciiToNum(trafficCap, digit)==KErrNone) @@ -1241,7 +1247,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,deliveryOrderReqCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR99::deliveryOrderReqCap",ret,1,&KQosProfileCapsR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::DELIVERYORDERREQCAP returned %d (element no. %d) from tag %s.",ret,1,KQosProfileCapsR99); } else if(AsciiToNum(deliveryOrderReqCap, digit)==KErrNone) @@ -1250,7 +1256,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,deliverErroneousSDUCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR99::deliverErroneousSDUCap",ret,2,&KQosProfileCapsR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::DELIVERERRONEOUSSDUCAP returned %d (element no. %d) from tag %s.",ret,2,KQosProfileCapsR99); } else if(AsciiToNum(deliverErroneousSDUCap, digit)==KErrNone) @@ -1259,7 +1265,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,BERCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR99::BERCap",ret,3,&KQosProfileCapsR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::BERCAP returned %d (element no. %d) from tag %s.",ret,3,KQosProfileCapsR99); } else if(AsciiToNum(BERCap, digit)==KErrNone) @@ -1268,7 +1274,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,SDUErrorRatioCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR99::SDUErrorRatioCap",ret,4,&KQosProfileCapsR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::SDUERRORRATIOCAP returned %d (element no. %d) from tag %s.",ret,4,KQosProfileCapsR99); } else if(AsciiToNum(SDUErrorRatioCap, digit)==KErrNone) @@ -1278,7 +1284,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,trafficHandlingPriorityCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR99::trafficHandlingPriorityCap",ret,5,&KQosProfileCapsR99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR99QOSPROFILECAPS_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR99::TRAFFICHANDLINGPRIORITYCAP returned %d (element no. %d) from tag %s.",ret,5,KQosProfileCapsR99); } else if(AsciiToNum(trafficHandlingPriorityCap, digit)==KErrNone) @@ -1302,7 +1308,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,trafficCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR5::trafficCap",ret,0,&KQosProfileCapsR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::TRAFFICCAP returned %d (element no. %d) from tag %s.",ret,0,KQosProfileCapsR5); } else if(AsciiToNum(trafficCap, digit)==KErrNone) @@ -1311,7 +1317,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,deliveryOrderReqCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR5::deliveryOrderReqCap",ret,1,&KQosProfileCapsR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::DELIVERYORDERREQCAP returned %d (element no. %d) from tag %s.",ret,1,KQosProfileCapsR5); } else if(AsciiToNum(deliveryOrderReqCap, digit)==KErrNone) @@ -1320,7 +1326,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,deliverErroneousSDUCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR5::deliverErroneousSDUCap",ret,2,&KQosProfileCapsR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::DELIVERERRONEOUSSDUCAP returned %d (element no. %d) from tag %s.",ret,2,KQosProfileCapsR5); } else if(AsciiToNum(deliverErroneousSDUCap, digit)==KErrNone) @@ -1329,7 +1335,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,BERCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR5::BERCap",ret,3,&KQosProfileCapsR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::BERCAP returned %d (element no. %d) from tag %s.",ret,3,KQosProfileCapsR5); } else if(AsciiToNum(BERCap, digit)==KErrNone) @@ -1338,7 +1344,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,SDUErrorRatioCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR5::SDUErrorRatioCap",ret,4,&KQosProfileCapsR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::SDUERRORRATIOCAP returned %d (element no. %d) from tag %s.",ret,4,KQosProfileCapsR5); } else if(AsciiToNum(SDUErrorRatioCap, digit)==KErrNone) @@ -1347,7 +1353,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,trafficHandlingPriorityCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR5::trafficHandlingPriorityCap",ret,5,&KQosProfileCapsR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::TRAFFICHANDLINGPRIORITYCAP returned %d (element no. %d) from tag %s.",ret,5,KQosProfileCapsR5); } else if(AsciiToNum(trafficHandlingPriorityCap, digit)==KErrNone) @@ -1356,7 +1362,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,signallingIndication); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR5::signallingIndication",ret,6,&KQosProfileCapsR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::SIGNALLINGINDICATION returned %d (element no. %d) from tag %s.",ret,6,KQosProfileCapsR5); } else if(AsciiToNum(signallingIndication, digit)==KErrNone) @@ -1365,7 +1371,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,sourceStatisticsDescriptor); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsR5::sourceStatisticsDescriptor",ret,7,&KQosProfileCapsR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5QOSPROFILECAPS_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSR5::SOURCESTATISTICSDESCRIPTOR returned %d (element no. %d) from tag %s.",ret,7,KQosProfileCapsR5); } else if(AsciiToNum(sourceStatisticsDescriptor, digit)==KErrNone) @@ -1389,7 +1395,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,numberOfTimes); if(ret!=KErrNone) { - LOGPARSERR("SetProfileFail::numberOfTimes",ret,1,&KSetProfileFail); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILEFAILSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETPROFILEFAIL::NUMBEROFTIMES returned %d (element no. %d) from tag %s.",ret,1,KSetProfileFail); } else { @@ -1400,7 +1406,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,errorCode); if(ret!=KErrNone) { - LOGPARSERR("SetProfileFail::errorCode",ret,2,&KSetProfileFail); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILEFAILSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETPROFILEFAIL::ERRORCODE returned %d (element no. %d) from tag %s.",ret,2,KSetProfileFail); } else { @@ -1428,7 +1434,7 @@ TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,negPrecedenceCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsGPRS::negPrecedenceCap",ret,0,&KQosProfileCapsGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGPRECEDENCECAP returned %d (element no. %d) from tag %s.",ret,0,KQosProfileCapsGPRS); } else if(AsciiToNum(negPrecedenceCap, digit)==KErrNone) @@ -1437,7 +1443,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,negDelayCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsGPRS::negDelayCap",ret,1,&KQosProfileCapsGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGDELAYCAP returned %d (element no. %d) from tag %s.",ret,1,KQosProfileCapsGPRS); } else if(AsciiToNum(negDelayCap, digit)==KErrNone) @@ -1446,7 +1452,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negReliabilityCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsGPRS::negReliabilityCap",ret,2,&KQosProfileCapsGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGRELIABILITYCAP returned %d (element no. %d) from tag %s.",ret,2,KQosProfileCapsGPRS); } else if(AsciiToNum(negReliabilityCap, digit)==KErrNone) @@ -1455,7 +1461,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negPeekCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsGPRS::negPeekCap",ret,3,&KQosProfileCapsGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGPEEKCAP returned %d (element no. %d) from tag %s.",ret,3,KQosProfileCapsGPRS); } else if(AsciiToNum(negPeekCap, digit)==KErrNone) @@ -1464,7 +1470,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negMeanCap); if(ret!=KErrNone) { - LOGPARSERR("QosProfileCapsGPRS::negMeanCap",ret,4,&KQosProfileCapsGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILECAPSGPRS::NEGMEANCAP returned %d (element no. %d) from tag %s.",ret,4,KQosProfileCapsGPRS); } else if(AsciiToNum(negMeanCap, digit)==KErrNone) @@ -1505,7 +1511,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::contextName",ret,0,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosProfileReqR5); continue; } else @@ -1513,7 +1519,7 @@ profileReq5.iContextName.Copy(contextName); if (profileReq5.iContextName.Match(iPacketContext->ContextName())==KErrNotFound) { - LOGPARSERR("QosProfileReqR5::contextName",KErrArgument,0,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::CONTEXTNAME returned %d (element no. %d) from tag %s.",KErrArgument,0,KQosProfileReqR5); continue; } } @@ -1521,7 +1527,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,reqTraffic); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqTraffic",ret,1,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQTRAFFIC returned %d (element no. %d) from tag %s.",ret,1,KQosProfileReqR5); continue; } else @@ -1535,7 +1541,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,minTraffic); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minTraffic",ret,2,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosProfileReqR5); continue; } else @@ -1549,7 +1555,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,reqDeliveryOrder); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqDeliveryOrder",ret,3,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosProfileReqR5); continue; } else @@ -1563,7 +1569,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,minDeliveryOrder); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minDeliveryOrder",ret,4,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,4,KQosProfileReqR5); continue; } else @@ -1577,7 +1583,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,reqErroneousSDU); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqErroneousSDU",ret,5,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQERRONEOUSSDU returned %d (element no. %d) from tag %s.",ret,5,KQosProfileReqR5); continue; } else @@ -1591,7 +1597,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,minErroneousSDU); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minErroneousSDU",ret,6,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINERRONEOUSSDU returned %d (element no. %d) from tag %s.",ret,6,KQosProfileReqR5); continue; } else @@ -1605,7 +1611,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,maxSDUSize); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::maxSDUSize",ret,7,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,7,KQosProfileReqR5); continue; } else @@ -1616,7 +1622,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,minSDUSize); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minSDUSize",ret,8,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINSDUSIZE returned %d (element no. %d) from tag %s.",ret,8,KQosProfileReqR5); continue; } else @@ -1627,7 +1633,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,reqUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqUpLinkBitRate",ret,9,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,9,KQosProfileReqR5); continue; } else @@ -1638,7 +1644,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,reqDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqDownLinkBitRate",ret,10,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosProfileReqR5); continue; } else @@ -1649,7 +1655,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,minUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minUpLinkBitRate",ret,11,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosProfileReqR5); continue; } else @@ -1670,7 +1676,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,reqBitErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqBitErrorRatio",ret,13,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,13,KQosProfileReqR5); continue; } else @@ -1684,7 +1690,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,14,minBitErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minBitErrorRatio",ret,14,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,14,KQosProfileReqR5); continue; } else @@ -1698,7 +1704,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,15,reqSDUErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("- QosProfileReqR5::reqSDUErrorRatio",ret,15,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element - QOSPROFILEREQR5::REQSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,15,KQosProfileReqR5); continue; } else @@ -1712,7 +1718,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,16,minSDUErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("- QosProfileReqR5::minSDUErrorRatio",ret,16,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element - QOSPROFILEREQR5::MINSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,16,KQosProfileReqR5); continue; } else @@ -1726,7 +1732,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,17,reqTrafficHandlingPriority); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqTrafficHandlingPriority",ret,17,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,17,KQosProfileReqR5); continue; } else @@ -1740,7 +1746,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,18,minTrafficHandlingPriority); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minTrafficHandlingPriority",ret,18,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,18,KQosProfileReqR5); continue; } else @@ -1754,7 +1760,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,19,reqTransferDelay); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqTransferDelay",ret,19,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,19,KQosProfileReqR5); continue; } else @@ -1765,7 +1771,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,20,minTransferDelay); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minTransferDelay",ret,20,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,20,KQosProfileReqR5); continue; } else @@ -1776,7 +1782,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,21,reqGuaranteedUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqGuaranteedUpLinkBitRate",ret,21,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,21,KQosProfileReqR5); continue; } else @@ -1787,7 +1793,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,22,reqGuaranteedDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqGuaranteedDownLinkBitRate",ret,22,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,22,KQosProfileReqR5); continue; } else @@ -1798,7 +1804,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,23,minGuaranteedUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minGuaranteedUpLinkBitRate",ret,23,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,23,KQosProfileReqR5); continue; } else @@ -1809,7 +1815,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,24,minGuaranteedDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::minGuaranteedDownLinkBitRate",ret,24,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::MINGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,24,KQosProfileReqR5); continue; } else @@ -1820,7 +1826,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,25,signallingIndication); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::signallingIndication",ret,25,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::SIGNALLINGINDICATION returned %d (element no. %d) from tag %s.",ret,25,KQosProfileReqR5); continue; } else @@ -1831,7 +1837,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,26,reqTSourceStatisticsDescriptor); if(ret!=KErrNone) { - LOGPARSERR("QosProfileReqR5::reqTSourceStatisticsDescriptor",ret,26,&KQosProfileReqR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5REQPROFILESL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILEREQR5::REQTSOURCESTATISTICSDESCRIPTOR returned %d (element no. %d) from tag %s.",ret,26,KQosProfileReqR5); continue; } else @@ -1871,7 +1877,7 @@ TInt ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::contextName",ret,0,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosProfileNegR5); continue; } else @@ -1879,7 +1885,7 @@ profileNeg5.iContextName.Copy(contextName); if (profileNeg5.iContextName.Match(iPacketContext->ContextName())==KErrNotFound) { - LOGPARSERR("QosProfileNegR5::contextName",KErrArgument,0,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::CONTEXTNAME returned %d (element no. %d) from tag %s.",KErrArgument,0,KQosProfileNegR5); continue; } } @@ -1887,7 +1893,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::duration",ret,1,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::DURATION returned %d (element no. %d) from tag %s.",ret,1,KQosProfileNegR5); continue; } else @@ -1899,7 +1905,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negTraffic); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negTraffic",ret,2,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosProfileNegR5); continue; } else @@ -1911,7 +1917,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negDeliveryOrder); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negDeliveryOrder",ret,3,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosProfileNegR5); continue; } else @@ -1923,7 +1929,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negErroneousSDUDelivery); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negErroneousSDUDelivery",ret,4,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGERRONEOUSSDUDELIVERY returned %d (element no. %d) from tag %s.",ret,4,KQosProfileNegR5); continue; } else @@ -1935,7 +1941,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,negMaxSDUSize); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negMaxSDUSize",ret,5,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGMAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,5,KQosProfileNegR5); continue; } else @@ -1946,7 +1952,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,negBitErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negBitErrorRatio",ret,6,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,6,KQosProfileNegR5); continue; } else @@ -1959,7 +1965,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,negSDUErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negSDUErrorRatio",ret,7,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,7,KQosProfileNegR5); continue; } else @@ -1971,7 +1977,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,negTrafficHandlingPriority); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negTrafficHandlingPriority",ret,8,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,8,KQosProfileNegR5); continue; } else @@ -1983,7 +1989,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,negTransferDelay); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negTransferDelay",ret,9,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,9,KQosProfileNegR5); continue; } else @@ -1994,7 +2000,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,negGuaranteedUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negGuaranteedUpLinkBitRate",ret,10,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosProfileNegR5); continue; } else @@ -2005,7 +2011,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,negGuaranteedDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negGuaranteedDownLinkBitRate",ret,11,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosProfileNegR5); continue; } else @@ -2016,7 +2022,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,negMaxUpLinkRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negMaxUpLinkRate",ret,12,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGMAXUPLINKRATE returned %d (element no. %d) from tag %s.",ret,12,KQosProfileNegR5); continue; } else @@ -2027,7 +2033,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,negMaxDownLinkRate); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::negMaxDownLinkRate",ret,13,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::NEGMAXDOWNLINKRATE returned %d (element no. %d) from tag %s.",ret,13,KQosProfileNegR5); continue; } else @@ -2038,7 +2044,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,14,signallingIndication); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::signallingIndication",ret,14,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::SIGNALLINGINDICATION returned %d (element no. %d) from tag %s.",ret,14,KQosProfileNegR5); continue; } else @@ -2049,7 +2055,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,15,reqTSourceStatisticsDescriptor); if(ret!=KErrNone) { - LOGPARSERR("QosProfileNegR5::reqTSourceStatisticsDescriptor",ret,15,&KQosProfileNegR5); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NEGPROFILESL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSPROFILENEGR5::REQTSOURCESTATISTICSDESCRIPTOR returned %d (element no. %d) from tag %s.",ret,15,KQosProfileNegR5); continue; } else @@ -2101,7 +2107,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,contextName); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::contextName",ret,0,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::CONTEXTNAME returned %d (element no. %d) from tag %s.",ret,0,KQosNetworkNotificationType); continue; } else @@ -2112,7 +2118,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,duration); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::duration",ret,1,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::DURATION returned %d (element no. %d) from tag %s.",ret,1,KQosNetworkNotificationType); continue; } else @@ -2124,7 +2130,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,negTraffic); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negTraffic",ret,2,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGTRAFFIC returned %d (element no. %d) from tag %s.",ret,2,KQosNetworkNotificationType); continue; } else @@ -2136,7 +2142,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,negDeliveryOrder); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negDeliveryOrder",ret,3,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGDELIVERYORDER returned %d (element no. %d) from tag %s.",ret,3,KQosNetworkNotificationType); continue; } else @@ -2148,7 +2154,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,negErroneousSDUDelivery); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negErroneousSDUDelivery",ret,4,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGERRONEOUSSDUDELIVERY returned %d (element no. %d) from tag %s.",ret,4,KQosNetworkNotificationType); continue; } else @@ -2160,7 +2166,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,negMaxSDUSize); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negMaxSDUSize",ret,5,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGMAXSDUSIZE returned %d (element no. %d) from tag %s.",ret,5,KQosNetworkNotificationType); continue; } else @@ -2171,7 +2177,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,negBitErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negBitErrorRatio",ret,6,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGBITERRORRATIO returned %d (element no. %d) from tag %s.",ret,6,KQosNetworkNotificationType); continue; } else @@ -2183,7 +2189,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,negSDUErrorRatio); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negSDUErrorRatio",ret,7,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGSDUERRORRATIO returned %d (element no. %d) from tag %s.",ret,7,KQosNetworkNotificationType); continue; } else @@ -2195,7 +2201,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,negTrafficHandlingPriority); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negTrafficHandlingPriority",ret,8,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGTRAFFICHANDLINGPRIORITY returned %d (element no. %d) from tag %s.",ret,8,KQosNetworkNotificationType); continue; } else @@ -2207,7 +2213,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,negTransferDelay); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negTransferDelay",ret,9,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGTRANSFERDELAY returned %d (element no. %d) from tag %s.",ret,9,KQosNetworkNotificationType); continue; } else @@ -2218,7 +2224,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,negGuaranteedUpLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negGuaranteedUpLinkBitRate",ret,10,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGGUARANTEEDUPLINKBITRATE returned %d (element no. %d) from tag %s.",ret,10,KQosNetworkNotificationType); continue; } else @@ -2229,7 +2235,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,negGuaranteedDownLinkBitRate); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negGuaranteedDownLinkBitRate",ret,11,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGGUARANTEEDDOWNLINKBITRATE returned %d (element no. %d) from tag %s.",ret,11,KQosNetworkNotificationType); continue; } else @@ -2240,7 +2246,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,12,negMaxUpLinkRate); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negMaxUpLinkRate",ret,12,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGMAXUPLINKRATE returned %d (element no. %d) from tag %s.",ret,12,KQosNetworkNotificationType); continue; } else @@ -2251,7 +2257,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,13,negMaxDownLinkRate); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::negMaxDownLinkRate",ret,13,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::NEGMAXDOWNLINKRATE returned %d (element no. %d) from tag %s.",ret,13,KQosNetworkNotificationType); continue; } else @@ -2262,7 +2268,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,14,signallingIndication); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::signallingIndication",ret,14,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::SIGNALLINGINDICATION returned %d (element no. %d) from tag %s.",ret,14,KQosNetworkNotificationType); continue; } else @@ -2273,7 +2279,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,15,reqTSourceStatisticsDescriptor); if(ret!=KErrNone) { - LOGPARSERR("qosR5NetworkNotification::reqTSourceStatisticsDescriptor",ret,15,&KQosNetworkNotificationType); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element QOSR5NETWORKNOTIFICATION::REQTSOURCESTATISTICSDESCRIPTOR returned %d (element no. %d) from tag %s.",ret,15,KQosNetworkNotificationType); continue; } else @@ -2303,7 +2309,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,delay); if(ret!=KErrNone || delay < 0) { - LOGPARSERR("SetQoSDelay::delay",ret,0,&KSetQoSDelay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETSETQOSSETTINGS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SETQOSDELAY::DELAY returned %d (element no. %d) from tag %s.",ret,0,KSetQoSDelay); } else { @@ -2314,7 +2320,7 @@ ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,1,at); if(ret != KErrNone) { - LOGPARSERR("SetQoSDelay::at",ret,1,&KSetQoSDelay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETSETQOSSETTINGS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SETQOSDELAY::AT returned %d (element no. %d) from tag %s.",ret,1,KSetQoSDelay); } else { @@ -2331,7 +2337,7 @@ * */ { - LOGPACKET1("CSimPacketQoS: Entered destructor"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_DTOR_1, "CSimPacketQoS: Entered destructor"); if (iProfiles != NULL) { @@ -2462,11 +2468,11 @@ switch (aIpc) { case EPacketQoSNotifyProfileChanged: - LOGPACKET1("CSimPacketQoS: RegisterNotification - Profile Changed"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_REGISTERNOTIFICATION_1, "CSimPacketQoS: RegisterNotification - Profile Changed"); return KErrNone; default: // Unknown or invalid IPC - LOGPACKET1("CSimPacketQoS: Register error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_REGISTERNOTIFICATION_2, "CSimPacketQoS: Register error, unknown IPC"); return KErrNotSupported; } } @@ -2487,11 +2493,11 @@ switch (aIpc) { case EPacketQoSNotifyProfileChanged: - LOGPACKET1("CSimPacketQoS: DeregisterNotification - Profile Changed"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_DEREGISTERNOTIFICATION_1, "CSimPacketQoS: DeregisterNotification - Profile Changed"); return KErrNone; default: // Unknown or invalid IPC - LOGPACKET1("CSimPacketQoS: Deregister error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_DEREGISTERNOTIFICATION_2, "CSimPacketQoS: Deregister error, unknown IPC"); return KErrNotSupported; } } @@ -2510,12 +2516,12 @@ switch (aIpc) { case EPacketQoSNotifyProfileChanged: - LOGPACKET1("CGprsDGprsTsy: Registered with 5 slots"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_NUMBEROFSLOTSL_1, "CGprsDGprsTsy: Registered with 5 slots"); numberOfSlots=5; break; default: // Unknown or invalid IPC - LOGPACKET1("CSimPacketQoS: Number of Slots error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_NUMBEROFSLOTSL_2, "CSimPacketQoS: Number of Slots error, unknown IPC"); User::Leave(KErrNotSupported); break; } @@ -2557,7 +2563,7 @@ TRAPD(ret, iSetQoSData->AppendL(setQoSData) ); if (ret != KErrNone) { - LOGPACKET1("CSimPacketQoS::ExtFunc AppendL call fail"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_EXTFUNC_1, "CSimPacketQoS::ExtFunc AppendL call fail"); return ret; } @@ -2612,7 +2618,7 @@ * @return err KErrNone if request completes ok */ { - LOGPACKET1("CSimPacketQoS: - CancelService called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_CANCELSERVICE_1, "CSimPacketQoS: - CancelService called"); switch (aIpc) { case EPacketQoSSetProfileParams: @@ -2640,7 +2646,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketQoS::SetProfile called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_1, "CSimPacketQoS::SetProfile called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -2703,34 +2709,34 @@ if (MatchContext(profile)==KErrNone) { - LOGPACKET1("====REQ QOS==="); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_2, "====REQ QOS==="); // LOGPACKET3("Req Traffic [%d] [%d]", qosConfigV1.iReqTrafficClass, profile.iReqTraffic); // LOGCOMMON3("Min Traffic [%d] [%d]", qosConfigV1.iMinTrafficClass, profile.iMinTraffic); - LOGPACKET3("Req Del order [%d] [%d]",qosConfigV1.iReqDeliveryOrderReqd, profile.iReqDeliveryOrder); - LOGPACKET3("Min Del order [%d] [%d]",qosConfigV1.iMinDeliveryOrderReqd , profile.iMinDeliveryOrder); - LOGPACKET3("Req Del err SDU [%d] [%d]",qosConfigV1.iReqDeliverErroneousSDU , profile.iReqErroneousSDU); - LOGPACKET3("Min Del err SDU [%d] [%d]",qosConfigV1.iMinDeliverErroneousSDU , profile.iMinErroneousSDU); - LOGPACKET3("Max Sdu Size [%d] [%d]",qosConfigV1.iReqMaxSDUSize , profile.iMaxSDUSize); - LOGPACKET3("Min Sdu Size [%d] [%d]",qosConfigV1.iMinAcceptableMaxSDUSize , profile.iMinSDUSize); - LOGPACKET3("Req Down [%d] [%d]",qosConfigV1.iReqMaxRate.iDownlinkRate , profile.iReqDownLinkTBitRate); - LOGPACKET3("Req Up [%d] [%d]", qosConfigV1.iReqMaxRate.iUplinkRate , profile.iReqUpLinkTBitRate); - LOGPACKET3("Min Guar Down[%d] [%d]",qosConfigV1.iMinGuaranteedRate.iDownlinkRate , profile.iMinGuaranteedDownLinkTBitRate); - LOGPACKET3("Min Guar Up [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iUplinkRate , profile.iMinGuaranteedUpLinkTBitRate); - LOGPACKET3("Req BER [%d] [%d]",qosConfigV1.iReqBER , profile.iReqTBitErrorRatio); - LOGPACKET3("Max BER [%d] [%d]",qosConfigV1.iMaxBER , profile.iMinTBitErrorRatio); - LOGPACKET3("Req SDU err ratio [%d] [%d]",qosConfigV1.iReqSDUErrorRatio , profile.iReqTSDUErrorRatio); - LOGPACKET3("Max SDU err ration [%d] [%d]",qosConfigV1.iMaxSDUErrorRatio , profile.iMinTSDUErrorRatio); - LOGPACKET3("Req Traffic Handling priority [%d] [%d]",qosConfigV1.iReqTrafficHandlingPriority , profile.iReqTTrafficHandlingPriority); - LOGPACKET3("Min Traffic Handling priority [%d] [%d]",qosConfigV1.iMinTrafficHandlingPriority , profile.iMinTTrafficHandlingPriority); - LOGPACKET3("Req Transfer Delay [%d] [%d]",qosConfigV1.iReqTransferDelay , profile.iReqTransferDelay); - LOGPACKET3("Max Transfer Delay [%d] [%d]",qosConfigV1.iMaxTransferDelay , profile.iMinTransferDelay); - LOGPACKET3("Req Guar downlink bitrate [%d] [%d]",qosConfigV1.iReqGuaranteedRate.iDownlinkRate , profile.iReqGuaranteedDownLinkTBitRate); - LOGPACKET3("Req Guar uplink bitrate [%d] [%d]",qosConfigV1.iReqGuaranteedRate.iUplinkRate , profile.iReqGuaranteedUpLinkTBitRate); - LOGPACKET3("Min Guar downlink [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iDownlinkRate , profile.iMinGuaranteedDownLinkTBitRate); - LOGPACKET3("Min Guar uplink [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iUplinkRate , profile.iMinGuaranteedUpLinkTBitRate); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_3, "Req Del order [%d] [%d]",qosConfigV1.iReqDeliveryOrderReqd, profile.iReqDeliveryOrder); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_4, "Min Del order [%d] [%d]",qosConfigV1.iMinDeliveryOrderReqd , profile.iMinDeliveryOrder); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_5, "Req Del err SDU [%d] [%d]",qosConfigV1.iReqDeliverErroneousSDU , profile.iReqErroneousSDU); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_6, "Min Del err SDU [%d] [%d]",qosConfigV1.iMinDeliverErroneousSDU , profile.iMinErroneousSDU); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_7, "Max Sdu Size [%d] [%d]",qosConfigV1.iReqMaxSDUSize , profile.iMaxSDUSize); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_8, "Min Sdu Size [%d] [%d]",qosConfigV1.iMinAcceptableMaxSDUSize , profile.iMinSDUSize); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_9, "Req Down [%d] [%d]",qosConfigV1.iReqMaxRate.iDownlinkRate , profile.iReqDownLinkTBitRate); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_10, "Req Up [%d] [%d]", qosConfigV1.iReqMaxRate.iUplinkRate , profile.iReqUpLinkTBitRate); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_11, "Min Guar Down[%d] [%d]",qosConfigV1.iMinGuaranteedRate.iDownlinkRate , profile.iMinGuaranteedDownLinkTBitRate); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_12, "Min Guar Up [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iUplinkRate , profile.iMinGuaranteedUpLinkTBitRate); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_13, "Req BER [%d] [%d]",qosConfigV1.iReqBER , profile.iReqTBitErrorRatio); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_14, "Max BER [%d] [%d]",qosConfigV1.iMaxBER , profile.iMinTBitErrorRatio); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_15, "Req SDU err ratio [%d] [%d]",qosConfigV1.iReqSDUErrorRatio , profile.iReqTSDUErrorRatio); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_16, "Max SDU err ration [%d] [%d]",qosConfigV1.iMaxSDUErrorRatio , profile.iMinTSDUErrorRatio); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_17, "Req Traffic Handling priority [%d] [%d]",qosConfigV1.iReqTrafficHandlingPriority , profile.iReqTTrafficHandlingPriority); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_18, "Min Traffic Handling priority [%d] [%d]",qosConfigV1.iMinTrafficHandlingPriority , profile.iMinTTrafficHandlingPriority); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_19, "Req Transfer Delay [%d] [%d]",qosConfigV1.iReqTransferDelay , profile.iReqTransferDelay); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_20, "Max Transfer Delay [%d] [%d]",qosConfigV1.iMaxTransferDelay , profile.iMinTransferDelay); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_21, "Req Guar downlink bitrate [%d] [%d]",qosConfigV1.iReqGuaranteedRate.iDownlinkRate , profile.iReqGuaranteedDownLinkTBitRate); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_22, "Req Guar uplink bitrate [%d] [%d]",qosConfigV1.iReqGuaranteedRate.iUplinkRate , profile.iReqGuaranteedUpLinkTBitRate); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_23, "Min Guar downlink [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iDownlinkRate , profile.iMinGuaranteedDownLinkTBitRate); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILE_24, "Min Guar uplink [%d] [%d]",qosConfigV1.iMinGuaranteedRate.iUplinkRate , profile.iMinGuaranteedUpLinkTBitRate); @@ -2861,7 +2867,7 @@ * @param aTsyReqHandle Tsy Request handle for the client request * @return err KErrNone */ - LOGPACKET1("CSimPacketQoS::SetProfileCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_SETPROFILECANCEL_1, "CSimPacketQoS::SetProfileCancel called"); TInt index = 0; if (TSetQoSData::Find(iSetQoSData, aTsyReqHandle, index) == KErrNone) @@ -2891,7 +2897,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketQoS::GetProfile called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILE_1, "CSimPacketQoS::GetProfile called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -3124,7 +3130,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketQoS::GetProfileCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILECANCEL_1, "CSimPacketQoS::GetProfileCancel called"); return KErrNone; } @@ -3140,7 +3146,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketQoS::GetProfileCaps called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILECAPS_1, "CSimPacketQoS::GetProfileCaps called"); TPckg* configBase = (TPckg*)aConfig; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -3199,7 +3205,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketQoS::GetProfileCapsCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_GETPROFILECAPSCANCEL_1, "CSimPacketQoS::GetProfileCapsCancel called"); return KErrNone; } @@ -3302,7 +3308,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketQoS::NotifyProfileChangedCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETQOS_NOTIFYPROFILECHANGEDCANCEL_1, "CSimPacketQoS::NotifyProfileChangedCancel called"); if(iNotifyProfileGPRS.iNotifyPending && iNotifyProfileGPRS.iNotifyHandle == aTsyReqHandle) { iNotifyProfileGPRS.iNotifyPending=EFalse; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPacketService.cpp --- a/telephonyserverplugins/simtsy/src/CSimPacketService.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPacketService.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -22,8 +22,14 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPacketServiceTraces.h" +#endif + #include "CSimPacketService.h" -#include "Simlog.h" #include #include "CSimPhone.h" #include "utils.h" @@ -108,7 +114,7 @@ * @panic Panics with SIMTSY EInvalidParameterFormatInConfigFile if an additional param data item is in an invalid format */ { - LOGPACKET1("CSimPacketService: Entered ConstructL()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_1, "CSimPacketService: Entered ConstructL()"); iTimer = CSimTimer::NewL(iPhone); iPcktRegTimer = CSimTimer::NewL(iPhone); @@ -380,14 +386,14 @@ { // AdditionalParamDataFormat not been specified, // default to plain ASCII - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",ret,2,&KDefaultGPRSAdditionalParamItem); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",ret,2,KDefaultGPRSAdditionalParamItem); format = EConfigDataFormatAscii; } else { if (AsciiToNum(additionalParamDataFormat, format) != KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultGPRSAdditionalParamItem); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultGPRSAdditionalParamItem); format = EConfigDataFormatAscii; } @@ -396,7 +402,7 @@ // default to ASCII if not. if (format >= EMaxConfigDataFormat) { - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultGPRSAdditionalParamItem); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultGPRSAdditionalParamItem); format = EConfigDataFormatAscii; } } @@ -417,7 +423,7 @@ if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamContent",KErrArgument,1,&KDefaultGPRSAdditionalParamItem); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",KErrArgument,1,KDefaultGPRSAdditionalParamItem); SimPanic(EInvalidParameterFormatInConfigFile); } @@ -445,7 +451,7 @@ } else { - LOGPARSERR("ProtocolConfigOption::numAdditionalParams",ret,14,&KDefaultContextparamGPRS); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::NUMADDITIONALPARAMS returned %d (element no. %d) from tag %s.",ret,14,KDefaultContextparamGPRS); } } @@ -552,14 +558,14 @@ { // AdditionalParamDataFormat not been specified, // default to plain ASCII - LOGPARSERR("No AdditionalParamItem::additionalParamDataFormat",ret,2,&KDefaultAdditionalParamItemRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element NO ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",ret,2,KDefaultAdditionalParamItemRel99); format = EConfigDataFormatAscii; } else { if (AsciiToNum(additionalParamDataFormat, format) != KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultAdditionalParamItemRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultAdditionalParamItemRel99); format = EConfigDataFormatAscii; } @@ -568,7 +574,7 @@ // default to ASCII if not. if (format >= EMaxConfigDataFormat) { - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultAdditionalParamItemRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultAdditionalParamItemRel99); format = EConfigDataFormatAscii; } } @@ -588,7 +594,7 @@ if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamContent",KErrArgument,1,&KDefaultAdditionalParamItemRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",KErrArgument,1,KDefaultAdditionalParamItemRel99); SimPanic(EInvalidParameterFormatInConfigFile); } @@ -615,7 +621,7 @@ } else { - LOGPARSERR("ProtocolConfigOption::numAdditionalParams",ret,12,&KDefaultContextparamRel99); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element PROTOCOLCONFIGOPTION::NUMADDITIONALPARAMS returned %d (element no. %d) from tag %s.",ret,12,KDefaultContextparamRel99); } } @@ -775,14 +781,14 @@ { // AdditionalParamDataFormat not been specified, // default to plain ASCII - LOGPARSERR("No AdditionalParamItem::additionalParamDataFormat",ret,2,&KDefaultAdditionalParamItem); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element NO ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",ret,2,KDefaultAdditionalParamItem); format = EConfigDataFormatAscii; } else { if (AsciiToNum(additionalParamDataFormat, format) != KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultAdditionalParamItem); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultAdditionalParamItem); format = EConfigDataFormatAscii; } @@ -791,7 +797,7 @@ // default to ASCII if not. if (format >= EMaxConfigDataFormat) { - LOGPARSERR("AdditionalParamItem::additionalParamDataFormat",KErrArgument,2,&KDefaultAdditionalParamItem); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMDATAFORMAT returned %d (element no. %d) from tag %s.",KErrArgument,2,KDefaultAdditionalParamItem); format = EConfigDataFormatAscii; } } @@ -811,7 +817,7 @@ if (ParseMixedBinaryAsciiDataL(additionalParamDataBuffer) != KErrNone) { - LOGPARSERR("AdditionalParamItem::additionalParamContent",KErrArgument,1,&KDefaultAdditionalParamItem); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CONSTRUCTL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONALPARAMITEM::ADDITIONALPARAMCONTENT returned %d (element no. %d) from tag %s.",KErrArgument,1,KDefaultAdditionalParamItem); SimPanic(EInvalidParameterFormatInConfigFile); } @@ -1002,7 +1008,7 @@ * */ { - LOGPACKET1("CSimPacketService: Entered destructor"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DTOR_1, "CSimPacketService: Entered destructor"); delete iIncomingContextManager; @@ -1438,11 +1444,11 @@ case EPacketNotifyAttachModeChange: case EPacketNotifyMbmsNetworkServiceStatusChange: case EPacketNotifyMbmsServiceAvailabilityChange: - LOGPACKET1("CSimPacketService: RegisterNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_REGISTERNOTIFICATION_1, "CSimPacketService: RegisterNotification"); return KErrNone; default: // Unknown or invalid IPC - LOGPACKET1("CSimPacketService: Register error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_REGISTERNOTIFICATION_2, "CSimPacketService: Register error, unknown IPC"); return KErrNotSupported; } } @@ -1472,11 +1478,11 @@ case EPacketNotifyAttachModeChange: case EPacketNotifyMbmsNetworkServiceStatusChange: case EPacketNotifyMbmsServiceAvailabilityChange: - LOGPACKET1("CSimPacketService: DeregisterNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DEREGISTERNOTIFICATION_1, "CSimPacketService: DeregisterNotification"); return KErrNone; default: // Unknown or invalid IPC - LOGPACKET1("CSimPacketService: Deregister error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DEREGISTERNOTIFICATION_2, "CSimPacketService: Deregister error, unknown IPC"); return KErrNotSupported; } } @@ -1497,7 +1503,7 @@ case EPacketNotifyStatusChange: case EPacketNotifyDynamicCapsChange: case EPacketNotifyMbmsNetworkServiceStatusChange: - LOGPACKET1("CSimPacketService: Registered with 10 slots"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NUMBEROFSLOTSL_1, "CSimPacketService: Registered with 10 slots"); numberOfSlots=10; break; case EPacketNotifyContextAdded: @@ -1507,12 +1513,12 @@ case EPacketNotifyReleaseModeChange: case EPacketNotifyAttachModeChange: case EPacketNotifyMbmsServiceAvailabilityChange: - LOGPACKET1("CSimPacketService: Registered with 2 slots"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NUMBEROFSLOTSL_2, "CSimPacketService: Registered with 2 slots"); numberOfSlots=2; break; default: // Unknown or invalid IPC - LOGPACKET1("CSimPacketService: Number of Slots error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NUMBEROFSLOTSL_3, "CSimPacketService: Number of Slots error, unknown IPC"); User::Leave(KErrNotSupported); break; } @@ -1679,7 +1685,7 @@ * @return err KErrNone if request completes ok */ { - LOGPACKET1("CSimPacketService: - CancelService called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CANCELSERVICE_1, "CSimPacketService: - CancelService called"); switch (aIpc) { case EPacketNotifyContextAdded: @@ -1772,7 +1778,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyContextAddedCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYCONTEXTADDEDCANCEL_1, "CSimPacketService::NotifyContextAddedCancel called"); if(iNotifyContextAdded.iNotifyPending) { iNotifyContextAdded.iNotifyPending=EFalse; @@ -1791,7 +1797,7 @@ * @return TInt KErrnone if request completes ok */ { - LOGPACKET1("CSimPacketService::Attach called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ATTACH_1, "CSimPacketService::Attach called"); iAttachRequestHandle=aTsyReqHandle; return ActionEvent(EPacketEventAttach); } @@ -1805,7 +1811,7 @@ * @return TInt KErrnone if request completes ok */ { - LOGPACKET1("CSimPacketService::AttachCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ATTACHCANCEL_1, "CSimPacketService::AttachCancel called"); if((iState == RPacketService::EStatusUnattached) && (iCurrentEvent==EPacketEventAttach)) { iTimer->Cancel(); @@ -1873,7 +1879,7 @@ * @return TInt KErrnone if request completes ok */ { - LOGPACKET1("CSimPacketService::Detach called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DETACH_1, "CSimPacketService::Detach called"); iDetachRequestHandle=aTsyReqHandle; return ActionEvent(EPacketEventDetach); } @@ -1888,7 +1894,7 @@ * @return TInt KErrnone if request completes ok */ { - LOGPACKET1("CSimPacketService::DetachCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_DETACHCANCEL_1, "CSimPacketService::DetachCancel called"); if((iState == RPacketService::EStatusAttached) && (iCurrentEvent==EPacketEventDetach)) { iTimer->Cancel(); @@ -1907,7 +1913,7 @@ * @return TInt err KErrNone if ok */ { - LOGPACKET1("CSimPacketService::GetStatus called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETSTATUS_1, "CSimPacketService::GetStatus called"); *aStatus = iState; ReqCompleted(aTsyReqHandle,KErrNone); return KErrNone; @@ -1942,7 +1948,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyStatusChangeCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYSTATUSCHANGECANCEL_1, "CSimPacketService::NotifyStatusChangeCancel called"); if(iNotifyStatusChange.iNotifyPending) { iNotifyStatusChange.iNotifyPending=EFalse; @@ -1967,7 +1973,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyContextActivationRequested called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYCONTEXTACTIVATIONREQUESTED_1, "CSimPacketService::NotifyContextActivationRequested called"); iConfigData.iTsyReqHandle = aTsyReqHandle; iConfigData.iData = aContextParameters; @@ -1994,7 +2000,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyContextActivationRequestedCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYCONTEXTACTIVATIONREQUESTEDCANCEL_1, "CSimPacketService::NotifyContextActivationRequestedCancel called"); iIncomingContextManager->Cancel(); iIncomingContextManager->SetUseTimerOff(); @@ -2041,7 +2047,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::EnumerateContexts called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ENUMERATECONTEXTS_1, "CSimPacketService::EnumerateContexts called"); // this should enumerate all primary and secondary contexts *aCount = iPrimaryContextNameInc + iSecondaryContextNameInc; *aMaxAllowed = KMaxContextPoolSize; @@ -2058,7 +2064,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::Enumerate Context Cancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ENUMERATECONTEXTSCANCEL_1, "CSimPacketService::Enumerate Context Cancel called"); return KErrNone; } @@ -2072,7 +2078,7 @@ * @return KErrNone if context is found in the list of contexts */ { - LOGPACKET1("CSimPacketService::GetContextInfo called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETCONTEXTINFO_1, "CSimPacketService::GetContextInfo called"); CSimPacketContext* packetContext; if((*aIndex >= iContextCount) || (*aIndex < 0)) @@ -2125,7 +2131,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::GetNtwkRegStatus called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETNTWKREGSTATUS_1, "CSimPacketService::GetNtwkRegStatus called"); *aRegistrationStatus = (RPacketService::TRegistrationStatus)iCurrentRegStatus; ReqCompleted(aTsyReqHandle,KErrNone); return KErrNone; @@ -2165,7 +2171,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyChangeOfNtwkRegStatusCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYCHANGEOFNTWKREGSTATUSCANCEL_1, "CSimPacketService::NotifyChangeOfNtwkRegStatusCancel called"); if(iNotifyChangeOfNtwk.iNotifyPending) { iNotifyChangeOfNtwk.iNotifyPending=EFalse; @@ -2271,7 +2277,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::GetStaticCaps called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETSTATICCAPS_1, "CSimPacketService::GetStaticCaps called"); *aCaps = KPacketServiceCaps; *aPdpType = RPacketContext::EPdpTypePPP; ReqCompleted(aTsyReqHandle,KErrNone); @@ -2287,7 +2293,7 @@ */ TInt CSimPacketService::GetDynamicCaps(const TTsyReqHandle aTsyReqHandle, RPacketService::TDynamicCapsFlags* aCaps) { - LOGPACKET1("CSimPacketService::GetDynamicCaps called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETDYNAMICCAPS_1, "CSimPacketService::GetDynamicCaps called"); if (iDynamicCapsArray->Count() == 0) { @@ -2308,7 +2314,7 @@ */ TInt CSimPacketService::NotifyDynamicCapsChange(const TTsyReqHandle aTsyReqHandle, RPacketService::TDynamicCapsFlags* aCaps) { - LOGPACKET1("CSimPacketService::NotifyDynamicCapsChange called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYDYNAMICCAPSCHANGE_1, "CSimPacketService::NotifyDynamicCapsChange called"); __ASSERT_ALWAYS(!iNotifyDynamicCapsChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); if (iDynamicCapsArray->Count() == 0) @@ -2331,7 +2337,7 @@ */ TInt CSimPacketService::NotifyDynamicCapsChangeCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPACKET1("CSimPacketService::NotifyDynamicCapsChangeCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYDYNAMICCAPSCHANGECANCEL_1, "CSimPacketService::NotifyDynamicCapsChangeCancel called"); if( (iNotifyDynamicCapsChange.iNotifyPending) && (aTsyReqHandle == iNotifyDynamicCapsChange.iNotifyHandle)) { iNotifyDynamicCapsChange.iNotifyPending=EFalse; @@ -2370,7 +2376,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::SetAttachMode called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_SETATTACHMODE_1, "CSimPacketService::SetAttachMode called"); if(*aMode != RPacketService::EAttachWhenNeeded) { ReqCompleted(aTsyReqHandle, KErrNotSupported); @@ -2399,7 +2405,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::GetAttachMode called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETATTACHMODE_1, "CSimPacketService::GetAttachMode called"); *aMode = iAttachMode; ReqCompleted(aTsyReqHandle,KErrNone); return KErrNone; @@ -2414,7 +2420,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyAttachModeChange called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYATTACHMODECHANGE_1, "CSimPacketService::NotifyAttachModeChange called"); __ASSERT_ALWAYS(!iNotifyChangeOfAttachMode.iNotifyPending,SimPanic(ENotificationAlreadyPending)); @@ -2434,7 +2440,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::SetDefaultContextParams called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_SETDEFAULTCONTEXTPARAMS_1, "CSimPacketService::SetDefaultContextParams called"); TPckg* configBase = (TPckg*)aPckg; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -2616,7 +2622,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::GetDefaultContextParams called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETGPRSDEFAULTCONTEXTPARAMS_1, "CSimPacketService::GetDefaultContextParams called"); TPckg* contextConfigGPRSPckg = (TPckg*)aPckg; RPacketContext::TContextConfigGPRS& contextConfigV1 = (*contextConfigGPRSPckg)(); @@ -2649,7 +2655,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::GetDefaultContextParams called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETDEFAULTCONTEXTPARAMS_1, "CSimPacketService::GetDefaultContextParams called"); TPckg* configBase = (TPckg*)aPckg; TPacketDataConfigBase& configBaseV1 = (*configBase)(); @@ -2746,7 +2752,7 @@ * @param aId an id identifying which timer callback is being called */ { - LOGPACKET1(">>CSimPacketService::TimerCallBack"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_TIMERCALLBACK_1, ">>CSimPacketService::TimerCallBack"); if(aId == ETimerIdPcktServPacket) { @@ -2819,7 +2825,7 @@ TInt ret = ActionEvent(EPacketEventTimeOut); __ASSERT_ALWAYS(ret==KErrNone,SimPanic(ETimeOutEventActionFailed)); // Note: this is very crude error handling and should be replaced by something rather more elegant. } - LOGPACKET1("<>CSimPacketService::ChangeState [newState=%d]", aNewState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CHANGESTATE_1, ">>CSimPacketService::ChangeState [newState=%d]", aNewState); if(iState == aNewState) return KErrNone; @@ -3068,7 +3074,7 @@ ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrNone); } - LOGPACKET1("<>CSimPacketService::ActionEvent = [EPacketEventAttach]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ACTIONEVENT_1, ">>CSimPacketService::ActionEvent = [EPacketEventAttach]"); if(iState==RPacketService::EStatusUnattached) { iCurrentEvent=EPacketEventAttach; @@ -3099,7 +3105,7 @@ break; case EPacketEventDetach: - LOGPACKET1(">>CSimPacketService::ActionEvent = [EPacketEventDetach]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ACTIONEVENT_2, ">>CSimPacketService::ActionEvent = [EPacketEventDetach]"); if(iState !=RPacketService::EStatusUnattached) { iCurrentEvent=EPacketEventDetach; @@ -3206,7 +3212,7 @@ TInt CSimPacketService::GetCurrentReleaseMode(const TTsyReqHandle aTsyReqHandle,RPacketService::TPacketReleaseMode* aReleaseMode) // return current release mode { - LOGPACKET1("CSimPacketService::GetCurrentReleaseMode called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETCURRENTRELEASEMODE_1, "CSimPacketService::GetCurrentReleaseMode called"); *aReleaseMode = (RPacketService::TPacketReleaseMode)iCurrentPacketReleaseMode; ReqCompleted(aTsyReqHandle, KErrNone); return KErrNone; @@ -3348,7 +3354,7 @@ */ TInt CSimPacketService::NotifyReleaseModeChangeCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPACKET1("CSimPacketService::NotifyChangeOfNtwkRegStatusCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYRELEASEMODECHANGECANCEL_1, "CSimPacketService::NotifyChangeOfNtwkRegStatusCancel called"); if(iNotifyChangeOfReleaseMode.iNotifyPending) { iNotifyChangeOfReleaseMode.iNotifyPending=EFalse; @@ -3394,7 +3400,7 @@ */ TInt CSimPacketService::NotifyAttachModeChangeCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPACKET1("CSimPacketService::NotifyAttachModeChangeCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYATTACHMODECHANGECANCEL_1, "CSimPacketService::NotifyAttachModeChangeCancel called"); if(iNotifyChangeOfAttachMode.iNotifyPending) { iNotifyChangeOfAttachMode.iNotifyPending=EFalse; @@ -3412,7 +3418,7 @@ * @return TInt err KErrNone if ok */ { - LOGPACKET1("CSimPacketService::GetMbmsNetworkServiceStatus called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETMBMSNETWORKSERVICESTATUS_1, "CSimPacketService::GetMbmsNetworkServiceStatus called"); *aStatus = (iMbmsBroadcastParamsArray->At(iCurrentMbmsParamsIndex).iMbmsNetworkStatus); if(aAttemptAttach) { @@ -3460,7 +3466,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyMbmsNetworkServiceStatusChange called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1, "CSimPacketService::NotifyMbmsNetworkServiceStatusChange called"); __ASSERT_ALWAYS(!iNotifyMbmsNetworkStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); iNotifyMbmsNetworkStatusChange.iNotifyPending = ETrue; @@ -3478,7 +3484,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyMbmsNetworkServiceStatusChangeCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYMBMSNETWORKSERVICESTATUSCHANGECANCEL_1, "CSimPacketService::NotifyMbmsNetworkServiceStatusChangeCancel called"); if(iNotifyMbmsNetworkStatusChange.iNotifyPending) { iNotifyMbmsNetworkStatusChange.iNotifyPending=EFalse; @@ -3498,7 +3504,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyMbmsServiceAvailabilityChange called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYMBMSSERVICEAVAILABILITYCHANGE_1, "CSimPacketService::NotifyMbmsServiceAvailabilityChange called"); __ASSERT_ALWAYS(!iNotifyMbmsNetworkStatusChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); iNotifyMbmsServAvailChange.iNotifyPending = ETrue; @@ -3516,7 +3522,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::NotifyMbmsServiceAvailabilityChangeCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_NOTIFYMBMSSERVICEAVAILABILITYCHANGECANCEL_1, "CSimPacketService::NotifyMbmsServiceAvailabilityChangeCancel called"); if(iNotifyMbmsServAvailChange.iNotifyPending) { iNotifyMbmsServAvailChange.iNotifyPending=EFalse; @@ -3537,7 +3543,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_1, "CSimPacketService::UpdateMbmsMonitorServiceListL called"); CPcktMbmsMonitoredServiceList* monServList = CPcktMbmsMonitoredServiceList::NewL(); CleanupStack::PushL(monServList); @@ -3552,7 +3558,7 @@ switch(*aAction) { case SIMTSY_PACKET_MBMS_ADD_ENTRIES: - LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL Action: ADD "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_2, "CSimPacketService::UpdateMbmsMonitorServiceListL Action: ADD "); monServList->RestoreL(*aBuffer); countAdd = monServList->Enumerate(); if(countAdd != SIMTSY_PACKET_MBMS_ADD_ENTRIES_COUNT) @@ -3606,7 +3612,7 @@ break; case SIMTSY_PACKET_MBMS_REM_ENTRIES: - LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL Action: REMOVE "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_3, "CSimPacketService::UpdateMbmsMonitorServiceListL Action: REMOVE "); monServList->RestoreL(*aBuffer); countRem = monServList->Enumerate(); if(countRem != SIMTSY_PACKET_MBMS_REM_ENTRIES_COUNT) @@ -3672,14 +3678,14 @@ case SIMTSY_PACKET_MBMS_REM_ALL_ENTRIES: iMbmsMonitorListCount = 0; iMbmsMonitorListParamsArray->Delete(0,iMbmsMonitorListParamsArray->Count()); - LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL Action: REMOVE_ALL "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_4, "CSimPacketService::UpdateMbmsMonitorServiceListL Action: REMOVE_ALL "); iUpdateMbmsServiceError = KErrNone; iUpdateMbmsServiceReqHandle = aTsyReqHandle; CleanupStack::PopAndDestroy(); // monServList break; default: - LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListL Action: Default "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_5, "CSimPacketService::UpdateMbmsMonitorServiceListL Action: Default "); ReqCompleted(aTsyReqHandle,KErrNotFound); CleanupStack::PopAndDestroy(); // monServList break; @@ -3695,7 +3701,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::UpdateMbmsMonitorServiceListCancel Called "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTCANCEL_1, "CSimPacketService::UpdateMbmsMonitorServiceListCancel Called "); ReqCompleted(aTsyReqHandle,KErrCancel); return KErrNone; } @@ -3713,7 +3719,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::GetMbmsMonitoredServicesListPhase1 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTPHASE1_1, "CSimPacketService::GetMbmsMonitoredServicesListPhase1 called"); TInt ret=KErrNone; TInt leaveCode=KErrNone; TRAP(leaveCode, ret=ProcessGetMbmsMonitoredServicesListPhase1L(aTsyReqHandle, aClient, aBufSize);); @@ -3737,7 +3743,7 @@ */ { - LOGPACKET1("CSimPacketService::ProcessGetMbmsMonitoredServicesListPhase1L called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_PROCESSGETMBMSMONITOREDSERVICESLISTPHASE1L_1, "CSimPacketService::ProcessGetMbmsMonitoredServicesListPhase1L called"); CPcktMbmsMonitoredServiceList* list=CPcktMbmsMonitoredServiceList::NewL(); CleanupStack::PushL(list); @@ -3752,7 +3758,7 @@ entry.iTmgi.SetMNC(iMbmsMonitorListParamsArray->At(i).iMNC); entry.iTmgi.SetServiceId(iMbmsMonitorListParamsArray->At(i).iServiceId); // Add the entry into the list, at the next empty location - LOGPACKET2("Adding the Entry no. %d to the List",i+1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_PROCESSGETMBMSMONITOREDSERVICESLISTPHASE1L_2, "Adding the Entry no. %d to the List",i+1); list->AddEntryL(entry); } @@ -3787,7 +3793,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::GetMbmsMonitoredServicesListPhase2 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTPHASE2_1, "CSimPacketService::GetMbmsMonitoredServicesListPhase2 called"); CPcktListReadAllAttempt* read=NULL; // Find the get MBMS Monitor Service List from this client for (TInt i=0; iCount(); ++i) @@ -3818,7 +3824,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::GetMbmsMonitoredServicesListCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTCANCEL_1, "CSimPacketService::GetMbmsMonitoredServicesListCancel called"); // Remove the read all attempt from iGetMbmsMonitoredServices CPcktListReadAllAttempt* read=NULL; @@ -3846,7 +3852,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::EnumerateMbmsMonitorServiceList called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ENUMERATEMBMSMONITORSERVICELIST_1, "CSimPacketService::EnumerateMbmsMonitorServiceList called"); *aCount = iMbmsMonitorListCount; *aMaxAllowed = KMaxMbmsMonitorContexts; iEnumerateMonitorListReqHandle = aTsyReqHandle; @@ -3883,7 +3889,7 @@ * @return KErrNone */ { - LOGPACKET1("CSimPacketService::EnumerateMbmsActiveServiceList called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_ENUMERATEMBMSACTIVESERVICELIST_1, "CSimPacketService::EnumerateMbmsActiveServiceList called"); *aCount = iMbmsNifWrappers.Count(); // The NifWrapper contains the list of mbmsContexts that are activated. *aMaxAllowed = KMaxMbmsActiveContexts; iEnumerateActiveListReqHandle = aTsyReqHandle; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPhBkStore.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhBkStore.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPhBkStore.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -19,9 +19,15 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPhBkStoreTraces.h" +#endif + #include "CSimPhBkStore.h" #include "CSimPhone.h" -#include "Simlog.h" #include const TUint16 KNpiTonInternational=145; // < The Number Plan Identifier and Type of Number for an international telephone number. @@ -74,7 +80,7 @@ * @param aMaxTextLen The maximum length of an alpha tag. */ { - LOGPHBK1("Starting to parse Phonebook store additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_1, "Starting to parse Phonebook store additional config parameters..."); __ASSERT_ALWAYS(aMaxNumLen<=KPhBkMaxTelNumSize,SimPanic(EPhonebookNameOrNumberTooLarge)); __ASSERT_ALWAYS(aMaxTextLen<=KPhBkMaxAlphaTagSize,SimPanic(EPhonebookNameOrNumberTooLarge)); @@ -100,7 +106,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,ipc); if(ret!=KErrNone) { - LOGPARSERR("ipc",ret,0,&KTriggerEventIPC); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element IPC returned %d (element no. %d) from tag %s.",ret,0,KTriggerEventIPC); } else iTriggerEventIPC.iIPC=ipc; @@ -108,7 +114,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,cnt); if(ret!=KErrNone) { - LOGPARSERR("cnt",ret,1,&KTriggerEventIPC); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CNT returned %d (element no. %d) from tag %s.",ret,1,KTriggerEventIPC); } else iTriggerEventIPC.iIPCCnt=cnt; @@ -116,7 +122,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,event); if(ret!=KErrNone) { - LOGPARSERR("event",ret,2,&KTriggerEventIPC); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element EVENT returned %d (element no. %d) from tag %s.",ret,2,KTriggerEventIPC); } else iTriggerEventIPC.iEvent=RMobilePhone::TMobilePhoneSecurityEvent(event); @@ -133,7 +139,7 @@ if(ret0!=KErrNone) { iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps; - LOGPARSERR("value0",ret0,0,&KPhBkPhoneStoreCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element VALUE0 returned %d (element no. %d) from tag %s.",ret0,0,KPhBkPhoneStoreCaps); } else { @@ -149,7 +155,7 @@ iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps; - LOGPHBK1("...Finished parsing Phonebook store additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CONSTRUCTL_6, "...Finished parsing Phonebook store additional config parameters..."); } void CSimPhBkStore::PopulateStoreFromConfigFileL() @@ -162,7 +168,7 @@ * "PhBkStoreEntry = , , , " */ { - LOGPHBK1("Starting to read Phonebook store entries..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_1, "Starting to read Phonebook store entries..."); iPhBkIndividualPause=CfgFile()->ItemValue(KPhBkStoreIndividualReqPause,KDefaultPhBkStoreIndividualReqPause); iPhBkBatchPause=CfgFile()->ItemValue(KPhBkStoreBatchReqPause,KDefaultPhBkStoreBatchReqPause); @@ -183,7 +189,7 @@ ret=GetPhBkEntry(item,0,phonebookName,index,telNum,alphaTag,npiTon); if(ret!=KErrNone) { - LOGPARSERR("Phonebook Entry",ret,index,&KPhBkStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOK ENTRY returned %d (element no. %d) from tag %s.",ret,index,KPhBkStoreEntry); continue; } if(phonebookName.MatchF(iPhBkStoreName)!=0)// Not this phonebook @@ -209,25 +215,25 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count); if(ret!=KErrNone) { - LOGPARSERR("count",ret,0,&KPhBkError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KPhBkError); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,error); if(ret!=KErrNone) { - LOGPARSERR("error",ret,1,&KPhBkError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element ERROR returned %d (element no. %d) from tag %s.",ret,1,KPhBkError); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,phonebookName); if(ret!=KErrNone) { - LOGPARSERR("phonebookName",ret,2,&KPhBkError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,2,KPhBkError); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,phonebookStore); if(ret!=KErrNone) { - LOGPARSERR("phonebookStore",ret,3,&KPhBkError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,3,KPhBkError); } else //not for the global phonebook continue; @@ -243,7 +249,7 @@ } PopulateOOBWrite(); PopulateOOBDelete(); - LOGPHBK1("...Finished reading Phonebook store entries..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_7, "...Finished reading Phonebook store entries..."); if(iPhBkOOBWriteDuration!=-1) iOOBWriteTimer->Start(iPhBkOOBWriteDuration,this,ETimerIdPhBkStorOOBWrite); @@ -268,7 +274,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count); if(ret!=KErrNone) { - LOGPARSERR("count",ret,0,&KOOBPhBkWrite); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBWRITE_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KOOBPhBkWrite); return; } @@ -278,7 +284,7 @@ ret=GetPhBkEntry(item,1,phonebookName,index,telNum,alphaTag,npiTon); if(ret!=KErrNone) { - LOGPARSERR("npiTon",ret,index,&KOOBPhBkWrite); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBWRITE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NPITON returned %d (element no. %d) from tag %s.",ret,index,KOOBPhBkWrite); return; } if(phonebookName.MatchF(iPhBkStoreName)!=0) @@ -308,7 +314,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count); if(ret!=KErrNone) { - LOGPARSERR("count",ret,0,&KOOBPhBkDelete); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBDELETE_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KOOBPhBkDelete); return; } @@ -316,7 +322,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,phonebookName); if(ret!=KErrNone) { - LOGPARSERR("phonebookName",ret,1,&KOOBPhBkDelete); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBDELETE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,1,KOOBPhBkDelete); return; } if(phonebookName.MatchF(iPhBkStoreName)!=0) @@ -326,7 +332,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,index); if(ret!=KErrNone) { - LOGPARSERR("index",ret,2,&KOOBPhBkDelete); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_POPULATEOOBDELETE_3, "WARNING - CONFIGURATION FILE PARSING - Reading element INDEX returned %d (element no. %d) from tag %s.",ret,2,KOOBPhBkDelete); return; } @@ -979,10 +985,10 @@ return KErrNone; } - LOGPHBK2("alphaTag Length = (%d)",alphaTag.Length()); - LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); - LOGPHBK2("TelNum Length = (%d)",telNum.Length()); - LOGPHBK2("TelNum Max Length = (%d)",iPhBkMaxTelNumLen); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_WRITE_1, "alphaTag Length = (%d)",alphaTag.Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_WRITE_2, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_WRITE_3, "TelNum Length = (%d)",telNum.Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_WRITE_4, "TelNum Max Length = (%d)",iPhBkMaxTelNumLen); if(alphaTag.Length()>iPhBkMaxTextLen) { @@ -1290,6 +1296,6 @@ * @return CTestConfigSection a pointer to the configuration file data section */ { - LOGPHBK1(">>CSimPhBkStore::CfgFile"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKSTORE_CFGFILE_1, ">>CSimPhBkStore::CfgFile"); return iPhone->CfgFile(); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPhBkUsimStore.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhBkUsimStore.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPhBkUsimStore.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -19,9 +19,15 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPhBkUsimStoreTraces.h" +#endif + #include "CSimPhBkUsimStore.h" #include "CSimPhone.h" -#include "Simlog.h" #include const TUint16 KNpiTonInternational=145; // < The Number Plan Identifier and Type of Number for an international telephone number. @@ -89,7 +95,7 @@ * @param aMaxAdditionalTextLen The maximum length of the alpha tag in an additional telephone number. */ { - LOGPHBK1("Starting to parse Phonebook store additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_1, "Starting to parse Phonebook store additional config parameters..."); __ASSERT_ALWAYS(aMaxNumLen<=KPhBkMaxTelNumSize,SimPanic(EPhonebookNameOrNumberTooLarge)); __ASSERT_ALWAYS(aMaxTextLen<=KPhBkMaxAlphaTagSize,SimPanic(EPhonebookNameOrNumberTooLarge)); @@ -135,7 +141,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,ipc); if(ret!=KErrNone) { - LOGPARSERR("ipc",ret,0,&KTriggerEventIPC); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element IPC returned %d (element no. %d) from tag %s.",ret,0,KTriggerEventIPC); } else iTriggerEventIPC.iIPC=ipc; @@ -143,7 +149,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,cnt); if(ret!=KErrNone) { - LOGPARSERR("cnt",ret,1,&KTriggerEventIPC); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CNT returned %d (element no. %d) from tag %s.",ret,1,KTriggerEventIPC); } else iTriggerEventIPC.iIPCCnt=cnt; @@ -151,7 +157,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,event); if(ret!=KErrNone) { - LOGPARSERR("event",ret,2,&KTriggerEventIPC); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element EVENT returned %d (element no. %d) from tag %s.",ret,2,KTriggerEventIPC); } else iTriggerEventIPC.iEvent=RMobilePhone::TMobilePhoneSecurityEvent(event); @@ -179,7 +185,7 @@ if(ret0!=KErrNone) { iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps; - LOGPARSERR("Caps:PhonebookStore",ret,0,&KPhBkPhoneUSimStoreCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element CAPS:PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,0,KPhBkPhoneUSimStoreCaps); } if(phonebookStore.MatchF(iPhBkStore)!=0)// Not this PhBkStore type @@ -189,7 +195,7 @@ if(ret0!=KErrNone) { iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps; - LOGPARSERR("phonebookName",ret,1,&KPhBkPhoneUSimStoreCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,1,KPhBkPhoneUSimStoreCaps); } if(phonebookName.MatchF(iPhBkStoreName)!=0)// Not this PhBkStoreName type @@ -199,7 +205,7 @@ if(ret0!=KErrNone) { iPhBkStoreCaps=KDefaultPhBkPhoneStoreCaps; - LOGPARSERR("caps",ret,2,&KPhBkPhoneUSimStoreCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element CAPS returned %d (element no. %d) from tag %s.",ret,2,KPhBkPhoneUSimStoreCaps); } else { @@ -217,7 +223,7 @@ } } } - LOGPHBK1("...Finished parsing Phonebook store additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CONSTRUCTL_8, "...Finished parsing Phonebook store additional config parameters..."); } void CSimPhBkUSimStore::PopulateStoreFromConfigFileL() @@ -231,7 +237,7 @@ * "PhBkStoreEntry = , , , " */ { - LOGPHBK1("Starting to read Phonebook store entries..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_1, "Starting to read Phonebook store entries..."); iPhBkIndividualPause=CfgFile()->ItemValue(KPhBkStoreIndividualReqPause,KDefaultPhBkStoreIndividualReqPause); iPhBkBatchPause=CfgFile()->ItemValue(KPhBkStoreBatchReqPause,KDefaultPhBkStoreBatchReqPause); @@ -256,7 +262,7 @@ ret=GetPhBkUSimEntry(item,parseIndex,phonebookStore,phonebookName,aid,index,telNum,alphaTag,npiTon,alphaTag2); if(ret!=KErrNone) { - LOGPARSERR("Phonebook Entry",ret,index,&KPhBkUSimStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOK ENTRY returned %d (element no. %d) from tag %s.",ret,index,KPhBkUSimStoreEntry); continue; } @@ -300,7 +306,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,additional); if(ret!=KErrNone) { - LOGPARSERR("additional",ret,parseIndex,&KPhBkUSimStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONAL returned %d (element no. %d) from tag %s.",ret,parseIndex,KPhBkUSimStoreEntry); } else { @@ -327,7 +333,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,emails); if(ret!=KErrNone) { - LOGPARSERR("emails",ret,parseIndex,&KPhBkUSimStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element EMAILS returned %d (element no. %d) from tag %s.",ret,parseIndex,KPhBkUSimStoreEntry); } else { @@ -348,7 +354,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,groups); if(ret!=KErrNone) { - LOGPARSERR("groups",ret,parseIndex,&KPhBkUSimStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element GROUPS returned %d (element no. %d) from tag %s.",ret,parseIndex,KPhBkUSimStoreEntry); } else { @@ -372,7 +378,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,hidden); if(ret!=KErrNone) { - LOGPARSERR("emails",ret,parseIndex,&KPhBkUSimStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element EMAILS returned %d (element no. %d) from tag %s.",ret,parseIndex,KPhBkUSimStoreEntry); } else iPhBkUSimStoreEntries[index].iHiddenEntry=hidden; @@ -394,26 +400,26 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count); if(ret!=KErrNone) { - LOGPARSERR("count",ret,0,&KPhBkError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KPhBkError); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,error); if(ret!=KErrNone) { - LOGPARSERR("error",ret,1,&KPhBkError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element ERROR returned %d (element no. %d) from tag %s.",ret,1,KPhBkError); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,phonebookName); if(ret!=KErrNone) { - LOGPARSERR("phonebookName",ret,2,&KPhBkError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,2,KPhBkError); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,phonebookStore); if(ret!=KErrNone) { - LOGPARSERR("phonebookStore",ret,3,&KPhBkError); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,3,KPhBkError); //global phonebook error continue; } @@ -430,7 +436,7 @@ } PopulateOOBWrite(); PopulateOOBDelete(); - LOGPHBK1("...Finished reading Phonebook store entries..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_11, "...Finished reading Phonebook store entries..."); if(iPhBkOOBWriteDuration!=-1) iOOBWriteTimer->Start(iPhBkOOBWriteDuration,this,ETimerIdPhBkUSimStorOOBWrite); @@ -456,7 +462,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,count); if(ret!=KErrNone) { - LOGPARSERR("count",ret,parseIndex,&KOOBPhBkUSimWrite); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite); return; } @@ -466,7 +472,7 @@ ret=GetPhBkUSimEntry(item,parseIndex,phonebookStore,phonebookName,aid,index,telNum,alphaTag,npiTon,alphaTag2); if(ret!=KErrNone) { - LOGPARSERR("Phonebook Entry",ret,parseIndex,&KOOBPhBkUSimWrite); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOK ENTRY returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite); return; } @@ -485,7 +491,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,additional); if(ret!=KErrNone) { - LOGPARSERR("additional",ret,parseIndex,&KOOBPhBkUSimWrite); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONAL returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite); } else { @@ -512,7 +518,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,groups); if(ret!=KErrNone) { - LOGPARSERR("groups",ret,parseIndex,&KOOBPhBkUSimWrite); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_4, "WARNING - CONFIGURATION FILE PARSING - Reading element GROUPS returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite); } else { @@ -535,7 +541,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,parseIndex++,emails); if(ret!=KErrNone) { - LOGPARSERR("emails",ret,parseIndex,&KOOBPhBkUSimWrite); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_5, "WARNING - CONFIGURATION FILE PARSING - Reading element EMAILS returned %d (element no. %d) from tag %s.",ret,parseIndex,KOOBPhBkUSimWrite); } else { @@ -575,7 +581,7 @@ TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,count); if(ret!=KErrNone) { - LOGPARSERR("count",ret,0,&KOOBPhBkUSimDelete); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_1, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNT returned %d (element no. %d) from tag %s.",ret,0,KOOBPhBkUSimDelete); return; } @@ -584,14 +590,14 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,phonebookStore); if(ret!=KErrNone) { - LOGPARSERR("phonebookStore",ret,1,&KOOBPhBkUSimDelete); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,1,KOOBPhBkUSimDelete); return; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,phonebookName); if(ret!=KErrNone) { - LOGPARSERR("phonebookName",ret,2,&KOOBPhBkUSimDelete); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,2,KOOBPhBkUSimDelete); return; } @@ -604,7 +610,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,index); if(ret!=KErrNone) { - LOGPARSERR("index",ret,3,&KOOBPhBkUSimDelete); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_4, "WARNING - CONFIGURATION FILE PARSING - Reading element INDEX returned %d (element no. %d) from tag %s.",ret,3,KOOBPhBkUSimDelete); return; } @@ -1544,8 +1550,8 @@ case RMobilePhoneBookStore::ETagPBText: ret=iPhBkRwBuffer->GetValue(alphaTag); - LOGPHBK2("alphaTag (ETagPBText) Length = (%d)",alphaTag.Length()); - LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_1, "alphaTag (ETagPBText) Length = (%d)",alphaTag.Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_2, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); if(!additional && ret==KErrNone && (alphaTag.Length()<=iPhBkMaxTextLen)) iPhBkUSimStoreEntries[index].iAlphaTag.Copy(alphaTag); @@ -1561,8 +1567,8 @@ case RMobilePhoneBookStore::ETagPBSecondName: ret=iPhBkRwBuffer->GetValue(alphaTag2); - LOGPHBK2("alphaTag2 (ETagPBSecondName) Length = (%d)",alphaTag2.Length()); - LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_3, "alphaTag2 (ETagPBSecondName) Length = (%d)",alphaTag2.Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_4, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); if(ret==KErrNone && (alphaTag2.Length()<=iPhBkMaxTextLen)) iPhBkUSimStoreEntries[index].iAlphaTag2.Copy(alphaTag2); @@ -1573,8 +1579,8 @@ case RMobilePhoneBookStore::ETagPBNumber: ret=iPhBkRwBuffer->GetValue(telNum); - LOGPHBK2("telNum (ETagPBNumber) Length = (%d)",telNum.Length()); - LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTelNumLen); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_5, "telNum (ETagPBNumber) Length = (%d)",telNum.Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_6, "Phonebook Max Text Length = (%d)",iPhBkMaxTelNumLen); if(!additional && ret==KErrNone && (telNum.Length()<=iPhBkMaxTelNumLen)) iPhBkUSimStoreEntries[index].iTelNum.Copy(telNum); @@ -1613,8 +1619,8 @@ case RMobilePhoneBookStore::ETagPBGroupName: ret=iPhBkRwBuffer->GetValue(bufPtr); - LOGPHBK2("bufPtr (ETagPBGroupName) Length = (%d)",bufPtr.Length()); - LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_7, "bufPtr (ETagPBGroupName) Length = (%d)",bufPtr.Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_8, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); if(ret==KErrNone && (bufPtr.Length()<=iPhBkMaxTextLen) && (iPhBkUSimStoreEntries[index].iGroups->Count() < KMaxGroups)) @@ -1628,8 +1634,8 @@ case RMobilePhoneBookStore::ETagPBEmailAddress: ret=iPhBkRwBuffer->GetValue(bufPtr); - LOGPHBK2("bufPtr (ETagPBEmailAddress) Length = (%d)",bufPtr.Length()); - LOGPHBK2("Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_9, "bufPtr (ETagPBEmailAddress) Length = (%d)",bufPtr.Length()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_WRITE_10, "Phonebook Max Text Length = (%d)",iPhBkMaxTextLen); if(ret==KErrNone && (bufPtr.Length()<=iPhBkMaxTextLen) && (iPhBkUSimStoreEntries[index].iEmails->Count() < iPhBkMaxEmail)) @@ -2066,7 +2072,7 @@ TRAPD(err,iPhBkUSimStoreEntries[iPhBkOOBWriteIndex].iAdditional=new(ELeave) CArrayFixFlat(iPhBkAdditional+1)); if (err!=KErrNone) { - LOGPHBK1("CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_TIMERCALLBACK_1, "CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure"); return; } @@ -2080,7 +2086,7 @@ TRAP(err,iPhBkUSimStoreEntries[iPhBkOOBWriteIndex].iGroups=new(ELeave) CArrayFixFlat(KMaxGroups)); if (err!=KErrNone) { - LOGPHBK1("CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_TIMERCALLBACK_2, "CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure"); return; } @@ -2094,7 +2100,7 @@ TRAP(err,iPhBkUSimStoreEntries[iPhBkOOBWriteIndex].iEmails=new(ELeave) CArrayFixFlat(iPhBkMaxEmail+1)); if (err!=KErrNone) { - LOGPHBK1("CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_TIMERCALLBACK_3, "CSimPhBkUSimStore::TimerCallBack - Memory Allocation Failure"); return; } @@ -2292,6 +2298,6 @@ * @return CTestConfigSection a pointer to the configuration file data section */ { - LOGPHBK1(">>CSimPhBkUSimStore::CfgFile"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHBKUSIMSTORE_CFGFILE_1, ">>CSimPhBkUSimStore::CfgFile"); return iPhone->CfgFile(); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPhone.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhone.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPhone.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -19,6 +19,13 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPhoneTraces.h" +#endif + #include #include "CSimPhone.h" #include "CSimCall.h" @@ -31,7 +38,6 @@ #include "CSimDtmf.h" #include "CSimIndicator.h" #include "utils.h" -#include "Simlog.h" #include "CSimPacketService.h" #include "CSimSat.h" #include "CSimBatteryCharger.h" @@ -56,7 +62,7 @@ GLDEF_C void SimPanic(TSimPanic aPanicNumber, TInt aLineNumber) { - LOGPHONE3("SMS.TSY Panic %d Line %d", aPanicNumber, aLineNumber); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, SIMPANIC_1, "SMS.TSY Panic %d Line %d", aPanicNumber, aLineNumber); (void) aLineNumber; _LIT(panicText,"SIM.TSY"); User::Panic(panicText,aPanicNumber); @@ -142,13 +148,13 @@ } } *aTable = pTable; - LOGPHONE2("Successfully populated %s table in simtsy", &aLookup); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_POPULATESERVICETABLEL_1, "Successfully populated %s table in simtsy", aLookup); } else { delete(pTable); pTable = NULL; - LOGPHONE2("Failed to populat %s table in simtsy", &aLookup); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_POPULATESERVICETABLEL_2, "Failed to populat %s table in simtsy", aLookup); } } @@ -188,13 +194,13 @@ } } *aTableV8 = pTable; - LOGPHONE2("Successfully populated %s table in simtsy", &aLookup); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_POPULATESERVICETABLEV8L_1, "Successfully populated %s table in simtsy", aLookup); } else { delete(pTable); pTable = NULL; - LOGPHONE2("Failed to populate %s table in simtsy", &aLookup); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_POPULATESERVICETABLEV8L_2, "Failed to populate %s table in simtsy", aLookup); } } @@ -216,7 +222,7 @@ } else { - LOGPHONE2("Section for requested test number (%d) not found in the Config File",testNumber); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_SETTESTNUMBERANDREADCONFIGURATIONFILE_1, "Section for requested test number (%d) not found in the Config File",testNumber); delete iConfigFile; iConfigFile = NULL; @@ -241,7 +247,7 @@ r=User::LoadLogicalDevice(LDD_NAME); #endif - LOGPHONE1("Starting to Load and Parse the Config File"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_1, "Starting to Load and Parse the Config File"); User::LeaveIfError(iFs.Connect()); @@ -314,7 +320,7 @@ TInt ret=CTestConfig::GetElement(itemSubscriberId->Value(),KStdDelimiter,0,IMSI); if( ret != KErrNone ) { - LOGPARSERR("IMSI",ret,0,&KSubscriberId); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element IMSI returned %d (element no. %d) from tag %s.",ret,0,KSubscriberId); } // coverity[check_return] CTestConfig::GetElement(itemSubscriberId->Value(),KStdDelimiter,1,iSubscriberId.iError); @@ -329,9 +335,9 @@ //get phone id from config file GetPhoneIdAndCaps(); - LOGPHONE1("Loading the version configuration"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_3, "Loading the version configuration"); iSimTsyVersion = CfgFile()->ItemValue(KTsyVersionNumber,KSimTsyDefaultVersion); - LOGPHONE2("Simulated SIMTSY version: %d", iSimTsyVersion); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_4, "Simulated SIMTSY version: %d", iSimTsyVersion); iPacketService = CSimPacketService::NewL(this); iBatteryCharger = CSimBatteryCharger::NewL(this); @@ -409,7 +415,7 @@ // end of network mode simulation setup iTestNumberObserver = CSimTestNumberObserver::NewL(*this); - LOGPHONE1("Completed Loading and Parsing the Config File"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CONSTRUCTL_5, "Completed Loading and Parsing the Config File"); } CSimReduceTimers* CSimPhone::GetReduceTimersSubject() @@ -426,12 +432,12 @@ if (ret == KErrNone && aTestNumber >= 0) { - LOGPHONE2("Got system property KUidPSSimTsyCategory/KPSSimTsyTestNumber. testNumber=%d", aTestNumber); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETTESTNUMBER_1, "Got system property KUidPSSimTsyCategory/KPSSimTsyTestNumber. testNumber=%d", aTestNumber); } else { aTestNumber = KDefaultTestNumber; - LOGPHONE2("Using the default test number. testNumber=%d", aTestNumber); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETTESTNUMBER_2, "Using the default test number. testNumber=%d", aTestNumber); } return KErrNone; @@ -447,7 +453,7 @@ if (ret == KErrNone) { - LOGPHONE2("Set system property KUidPSSimTsyCategory/KPSSimTsyTestNumberInUse. testNumber=%d", aTestNumber); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_SETTESTNUMBERINUSE_1, "Set system property KUidPSSimTsyCategory/KPSSimTsyTestNumberInUse. testNumber=%d", aTestNumber); } return ret; @@ -560,7 +566,7 @@ delete iTestNumberObserver; CSimTsyMode::FreeMode(); - LOGPHONE1("CSimPhone Destroyed"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_DTOR_1, "CSimPhone Destroyed"); } void CSimPhone::InitPhoneStatus() @@ -568,7 +574,7 @@ const CTestConfigItem* item = NULL; TInt ret = KErrNone; - LOGPHONE1("Starting to Load and Parse Phone Config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_INITPHONESTATUS_1, "Starting to Load and Parse Phone Config parameters"); item = CfgFile()->Item(KPhoneStatus); if(!item) @@ -593,7 +599,7 @@ const CTestConfigItem* item=NULL; TInt ret=KErrNone; - LOGPHONE1("Starting to Load and Parse PhoneBookStore Config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_1, "Starting to Load and Parse PhoneBookStore Config parameters"); TInt i; for(i=0;iValue(),KStdDelimiter,0,phonebookName); if(ret!=KErrNone) { - LOGPARSERR("phonebookName",ret,0,&KPhBkStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,0,KPhBkStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,maxNumSlots); if(ret!=KErrNone) { - LOGPARSERR("maxNumSlots",ret,1,&KPhBkStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXNUMSLOTS returned %d (element no. %d) from tag %s.",ret,1,KPhBkStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,telNumMaxLen); if(ret!=KErrNone) { - LOGPARSERR("telNumMaxLen",ret,2,&KPhBkStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element TELNUMMAXLEN returned %d (element no. %d) from tag %s.",ret,2,KPhBkStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,alphaTagMaxLen); if(ret!=KErrNone) { - LOGPARSERR("alphaTagMaxLen",ret,3,&KPhBkStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHATAGMAXLEN returned %d (element no. %d) from tag %s.",ret,3,KPhBkStore); continue; } @@ -641,7 +647,7 @@ count=CfgFile()->ItemCount(KPhBkUSimStore); - LOGPHONE1("Starting to Load and Parse USim PhoneBookStore Config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_6, "Starting to Load and Parse USim PhoneBookStore Config parameters"); for(i=0;iValue(),KStdDelimiter,0,phonebookStore); if(ret!=KErrNone) { - LOGPARSERR("phonebookStore",ret,0,&KPhBkUSimStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKSTORE returned %d (element no. %d) from tag %s.",ret,0,KPhBkUSimStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,phonebookName); if(ret!=KErrNone) { - LOGPARSERR("phonebookName",ret,1,&KPhBkUSimStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element PHONEBOOKNAME returned %d (element no. %d) from tag %s.",ret,1,KPhBkUSimStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,maxNumSlots); if(ret!=KErrNone) { - LOGPARSERR("maxNumSlots",ret,2,&KPhBkUSimStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXNUMSLOTS returned %d (element no. %d) from tag %s.",ret,2,KPhBkUSimStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,telNumMaxLen); if(ret!=KErrNone) { - LOGPARSERR("telNumMaxLen",ret,3,&KPhBkUSimStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element TELNUMMAXLEN returned %d (element no. %d) from tag %s.",ret,3,KPhBkUSimStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,alphaTagMaxLen); if(ret!=KErrNone) { - LOGPARSERR("alphaTagMaxLen",ret,4,&KPhBkUSimStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHATAGMAXLEN returned %d (element no. %d) from tag %s.",ret,4,KPhBkUSimStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,additional); if(ret!=KErrNone) { - LOGPARSERR("additional",ret,5,&KPhBkUSimStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element ADDITIONAL returned %d (element no. %d) from tag %s.",ret,5,KPhBkUSimStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,maxEmail); if(ret!=KErrNone) { - LOGPARSERR("maxEmail",ret,6,&KPhBkUSimStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXEMAIL returned %d (element no. %d) from tag %s.",ret,6,KPhBkUSimStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,maxAdditionalTelNumLen); if(ret!=KErrNone) { - LOGPHONE1("WARNING maxAdditionalTelNumLen missing, defaulting to telNumMaxLen"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_14, "WARNING maxAdditionalTelNumLen missing, defaulting to telNumMaxLen"); maxAdditionalTelNumLen = telNumMaxLen; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,maxAdditionalTextLen); if(ret!=KErrNone) { - LOGPHONE1("WARNING maxAdditionalTextLen missing, defaulting to alphaTagMaxLen"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_15, "WARNING maxAdditionalTextLen missing, defaulting to alphaTagMaxLen"); maxAdditionalTextLen = alphaTagMaxLen; } @@ -735,7 +741,7 @@ } if(foundShort) //warn but not fail! { - LOGPHONE1("WARNING! PhBkUSimStore and PhBkStore duplicate phonebook configuration"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_16, "WARNING! PhBkUSimStore and PhBkStore duplicate phonebook configuration"); } } for(TInt j=0; j < countStores; j++) @@ -770,7 +776,7 @@ { iPhBkUSimStores->At(i)->PopulateStoreFromConfigFileL(); } - LOGPHONE1("Finished parsing PhBkStores config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_FINDANDCREATEPHBKSTORESL_17, "Finished parsing PhBkStores config parameters"); } void CSimPhone::CreateONStoreL() @@ -778,7 +784,7 @@ const CTestConfigItem* item=NULL; TInt ret=KErrNone; - LOGPHONE1("Starting to Load and Parse Own Number Config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_1, "Starting to Load and Parse Own Number Config parameters"); TInt i=0; item=CfgFile()->Item(KONStore,i); @@ -789,21 +795,21 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,maxNumSlots); if(ret!=KErrNone) { - LOGPARSERR("maxNumSlots",ret,1,&KONStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXNUMSLOTS returned %d (element no. %d) from tag %s.",ret,1,KONStore); return; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,telNumMaxLen); if(ret!=KErrNone) { - LOGPARSERR("telNumMaxLen",ret,2,&KONStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element TELNUMMAXLEN returned %d (element no. %d) from tag %s.",ret,2,KONStore); return; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,alphaTagMaxLen); if(ret!=KErrNone) { - LOGPARSERR("alphaTagMaxLen",ret,3,&KONStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHATAGMAXLEN returned %d (element no. %d) from tag %s.",ret,3,KONStore); return; } @@ -812,7 +818,7 @@ // Populate the Own Number Store iONStore->PopulateStoreFromConfigFileL(); - LOGPHONE1("Finished parsing Own Number Store config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CREATEONSTOREL_5, "Finished parsing Own Number Store config parameters"); } TInt CSimPhone::ExtFunc(const TTsyReqHandle aReqHandle, const TInt aIpc, const TDataPackage& aPckg) @@ -1468,7 +1474,7 @@ * @leave Leaves if incorrect phone name */ { - LOGPHONE1(">>CSimPhone::OpenNewObjectByNameL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_OPENNEWOBJECTBYNAMEL_1, ">>CSimPhone::OpenNewObjectByNameL"); // Is it a voice line? if (aName.CompareF(KVoiceLineName) == 0) @@ -1538,18 +1544,18 @@ if (phoneScEap == NULL) { - LOGPHONE1("ERROR CSimSmartCardEap object not created, returning KErrGeneral"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_OPENNEWOBJECTBYNAMEL_2, "ERROR CSimSmartCardEap object not created, returning KErrGeneral"); User::Leave(KErrGeneral); } - LOGPHONE2("CSimPhone::OpenNewObjectByNameL CSimSmartCardEap object created [0x%08x]", phoneScEap); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_OPENNEWOBJECTBYNAMEL_3, "CSimPhone::OpenNewObjectByNameL CSimSmartCardEap object created [0x%08x]", phoneScEap); return phoneScEap; } // End of opening Smart Card EAP sub-session else if (aName.CompareF(KETelOwnNumberStore) == 0) { if(iONStore==NULL) { - LOGPHONE1("ERROR CSimONStore object not found. Please check config file."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_OPENNEWOBJECTBYNAMEL_4, "ERROR CSimONStore object not found. Please check config file."); User::Leave(KErrNotFound); } else @@ -2253,7 +2259,7 @@ // If there is no active line defined, then any state changes are fine. However, // we need to watch for a shift to an "active" status. - LOGPHONE1(">>CSimPhone::ValidateChangeState"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_VALIDATECHANGESTATE_1, ">>CSimPhone::ValidateChangeState"); if(!iActiveLine) { iMode=ConvertStateToMode(aState); @@ -2284,7 +2290,7 @@ (aState==RMobileCall::EStatusIdle)) return KErrNone; - LOGPHONE1("<>CSimPhone::ValidateChangeState packet"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_VALIDATECHANGESTATE1_1, ">>CSimPhone::ValidateChangeState packet"); __ASSERT_ALWAYS(iMode!=RPhone::EModeUnknown,SimPanic(EPhoneModeUnknownIllegal)); __ASSERT_ALWAYS(iNtwkMode!=RMobilePhone::ENetworkModeUnknown,SimPanic(ENetworkModeUnknownIllegal)); __ASSERT_ALWAYS(iPacketService->MSClass()!=RPacketService::EMSClassUnknown,SimPanic(EPacketMSClassUnKnown)); @@ -2413,16 +2419,16 @@ { TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,manufacturer); if(ret!=KErrNone) - LOGPARSERR("manufacturer",ret,0,&KPhoneId); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETPHONEIDANDCAPS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element MANUFACTURER returned %d (element no. %d) from tag %s.",ret,0,KPhoneId); ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,1,model); if(ret!=KErrNone) - LOGPARSERR("model",ret,1,&KPhoneId); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETPHONEIDANDCAPS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element MODEL returned %d (element no. %d) from tag %s.",ret,1,KPhoneId); ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,2,revision); if(ret!=KErrNone) - LOGPARSERR("revision",ret,2,&KPhoneId); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETPHONEIDANDCAPS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element REVISION returned %d (element no. %d) from tag %s.",ret,2,KPhoneId); ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,3,imei); if(ret!=KErrNone) - LOGPARSERR("imei",ret,3,&KPhoneId); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_GETPHONEIDANDCAPS_4, "WARNING - CONFIGURATION FILE PARSING - Reading element IMEI returned %d (element no. %d) from tag %s.",ret,3,KPhoneId); ret = CTestConfig::GetElement(item->Value(),KStdDelimiter,4,iPhoneId.iError); iPhoneId.iManufacturerId.Copy(manufacturer); @@ -3055,13 +3061,13 @@ */ void CSimPhone::CNetworkModeTimerCallBack::TimerCallBack(TInt /*aId*/) { - LOGPACKET1(">>CSimPhone::CNetworkModeTimerCallBack::TimerCallBack"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CNETWORKMODETIMERCALLBACK_TIMERCALLBACK_1, ">>CSimPhone::CNetworkModeTimerCallBack::TimerCallBack"); iPhone->TimerCallBackNetworkMode(); } TInt CSimPhone::NotifyModeChange(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TMobilePhoneNetworkMode* aCaps) { - LOGPACKET1("CSimPhone::NotifyModeChange called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_NOTIFYMODECHANGE_1, "CSimPhone::NotifyModeChange called"); __ASSERT_ALWAYS(!iNotifyNetworkModeChange.iNotifyPending,SimPanic(ENotificationAlreadyPending)); if (iNetworkModeArray->Count() == 0) @@ -3084,7 +3090,7 @@ */ TInt CSimPhone::NotifyModeChangeCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPACKET1("CSimPhone::NotifyModeChangeCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_NOTIFYMODECHANGECANCEL_1, "CSimPhone::NotifyModeChangeCancel called"); if( (iNotifyNetworkModeChange.iNotifyPending) && (aTsyReqHandle == iNotifyNetworkModeChange.iNotifyHandle)) { iNotifyNetworkModeChange.iNotifyPending=EFalse; @@ -3330,21 +3336,21 @@ void CSimPhone::CSimTestNumberObserver::ConstructL() { - LOGPHONE1("CSimPhone::CSimPhoneObserver::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CSIMTESTNUMBEROBSERVER_CONSTRUCTL_1, "CSimPhone::CSimPhoneObserver::ConstructL"); User::LeaveIfError(iProperty.Attach(KUidPSSimTsyCategory, KPSSimTsyTestNumber)); Start(); } void CSimPhone::CSimTestNumberObserver::Start() { - LOGPHONE1("CSimPhone::CSimPhoneObserver::Start"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CSIMTESTNUMBEROBSERVER_START_1, "CSimPhone::CSimPhoneObserver::Start"); iProperty.Subscribe(iStatus); SetActive(); } void CSimPhone::CSimTestNumberObserver::RunL() { - LOGPHONE2("CSimPhone::CSimPhoneObserver::RunL [iStatus=%d]", iStatus.Int()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CSIMTESTNUMBEROBSERVER_RUNL_1, "CSimPhone::CSimPhoneObserver::RunL [iStatus=%d]", iStatus.Int()); TInt err = iSimPhone.CheckConfigFile(); if( err == KErrNone ) { @@ -3356,7 +3362,7 @@ void CSimPhone::CSimTestNumberObserver::DoCancel() { - LOGPHONE1("CSimPhone::CSimPhoneObserver::DoCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_CSIMTESTNUMBEROBSERVER_DOCANCEL_1, "CSimPhone::CSimPhoneObserver::DoCancel"); iProperty.Cancel(); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -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" @@ -19,10 +19,16 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPhoneIMSAuthTraces.h" +#endif + #include #include #include "CSimPhone.h" -#include "Simlog.h" // // CSimPhoneIMSAuth @@ -60,10 +66,10 @@ { iTimer=CSimTimer::NewL(iPhone); iGetAuthorizationData = new CArrayPtrFlat(1); - LOGPHONE1("Starting to parse Phone IMS Authorization/Authentication config params..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_CONSTRUCTL_1, "Starting to parse Phone IMS Authorization/Authentication config params..."); ParseAuthorizationInfoL(); ParseAuthenticationInfoL(); - LOGPHONE1("Finished parsing Phone IMS Authorization/Authentication config params..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_CONSTRUCTL_2, "Finished parsing Phone IMS Authorization/Authentication config params..."); } @@ -101,7 +107,7 @@ * @return CTestConfigSection a pointer to the configuration file data section */ { - LOGPHONE1(">>CSimPhoneIMSAuth::CfgFile"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_CFGFILE_1, ">>CSimPhoneIMSAuth::CfgFile"); return iPhone->CfgFile(); } @@ -134,7 +140,7 @@ TInt IMPUCount, authorizationDataSource, infoChangeDelay; TAuthorizationInfo authorizationInfo; - LOGPHONE1("Starting to Parse IMS Authorization Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_1, "Starting to Parse IMS Authorization Info"); TInt count = CfgFile()->ItemCount(KAuthorizationInfo); TInt index; @@ -151,7 +157,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,IMPI); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_2, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -164,7 +170,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,IMPUCount); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_3, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -180,7 +186,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,IMPUValue); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_4, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); IMPUError = ETrue; break; } @@ -193,7 +199,7 @@ if(IMPUError) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -206,7 +212,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,HNDN); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -219,7 +225,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,authorizationDataSource); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -234,7 +240,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,delimiterNum,infoChangeDelay); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_8, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHORIZATION INFO TAG"); continue; } else @@ -259,7 +265,7 @@ TInt authErr; TAuthenticationInfo authenticationInfo; - LOGPHONE1("Starting to Parse IMS Authentication Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_1, "Starting to Parse IMS Authentication Info"); TInt count = CfgFile()->ItemCount(KAuthenticationInfo); TInt index; @@ -275,7 +281,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,AUTN); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_2, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -287,7 +293,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,RAND); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_3, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -299,7 +305,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,RES); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_4, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -311,7 +317,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,IK); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -323,7 +329,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,CK); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -335,7 +341,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,AUTS); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -347,7 +353,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,authErr); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_8, "ERROR IN CONFIGURATION FILE PARSING: BAD AUTHENTICATION INFO TAG"); continue; } else @@ -362,7 +368,7 @@ TInt CSimPhoneIMSAuth::GetAuthorizationInfoPhase1(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TClientId* aClientId,TInt* aBufSize) { - LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE1_1, "CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called"); TInt ret(KErrNone); TInt leaveCode(KErrNone); TRAP(leaveCode, ret=ProcessGetAuthorizationInfoPhase1L(aTsyReqHandle, aClientId, aBufSize);); @@ -378,7 +384,7 @@ TInt CSimPhoneIMSAuth::ProcessGetAuthorizationInfoPhase1L(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TClientId* aClientId, TInt* aBufSize) { - LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_PROCESSGETAUTHORIZATIONINFOPHASE1L_1, "CSimPhoneIMSAuth::GetAuthorizationInfoPhase1 called"); // Store the streamed list and the client ID CListReadAllAttempt* read=CListReadAllAttempt::NewL(*aClientId,aTsyReqHandle); @@ -439,7 +445,7 @@ TInt CSimPhoneIMSAuth::GetAuthorizationInfoPhase2(const TTsyReqHandle aTsyReqHandle, RMobilePhone::TClientId* aClientId, TDes8* aBuffer) { - LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoPhase2 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE2_1, "CSimPhoneIMSAuth::GetAuthorizationInfoPhase2 called"); CListReadAllAttempt* read=NULL; // Find the get Authorization Info attempt from this client @@ -466,7 +472,7 @@ TInt CSimPhoneIMSAuth::GetAuthorizationInfoCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimPhoneIMSAuth::GetAuthorizationInfoCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOCANCEL_1, "CSimPhoneIMSAuth::GetAuthorizationInfoCancel called"); // Remove the read all attempt from iGetAuthorizationData CListReadAllAttempt* read=NULL; @@ -489,7 +495,7 @@ TInt CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChanged(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChanged called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGED_1, "CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChanged called"); __ASSERT_ALWAYS(!iAuthInfoChangeNotifyPending,SimPanic(ENotificationReqAlreadyOutstanding)); TInt count=iAuthorizationInfoList.Count(); @@ -508,7 +514,7 @@ TInt CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChangedCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChangedCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGEDCANCEL_1, "CSimPhoneIMSAuth::NotifyImsAuthorizationInfoChangedCancel called"); if(iAuthInfoChangeNotifyPending) { if(iTimerStarted) @@ -526,7 +532,7 @@ TInt CSimPhoneIMSAuth::GetAuthenticationData(const TTsyReqHandle aTsyReqHandle,TDes8* aAuthenticationData) { - LOGPHONE1("CSimPhoneIMSAuth::AuthentificationData called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATA_1, "CSimPhoneIMSAuth::AuthentificationData called"); RMobilePhone::TImsAuthenticateDataV5Pckg* authenticateDataPckgd = (RMobilePhone::TImsAuthenticateDataV5Pckg*)aAuthenticationData; @@ -574,7 +580,7 @@ TInt CSimPhoneIMSAuth::GetAuthenticationDataCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimPhoneIMSAuth::AuthentificationDatCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATACANCEL_1, "CSimPhoneIMSAuth::AuthentificationDatCancel called"); iPhone->ReqCompleted(aTsyReqHandle, KErrCancel); return KErrNone; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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,7 +20,6 @@ @file */ -#include "Simlog.h" #include "utils.h" #include "CSimPhone.h" #include diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPhoneSecurity.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhoneSecurity.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPhoneSecurity.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -19,8 +19,14 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPhoneSecurityTraces.h" +#endif + #include "CSimPhone.h" -#include "Simlog.h" #include "utils.h" #include "CSimPhoneSecurity.h" #include @@ -66,7 +72,7 @@ * delays from the configuration file. */ { - LOGPHONE1("Starting to parse PhoneSecurity additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_1, "Starting to parse PhoneSecurity additional config parameters..."); iNotifySettingsTimer = CIccTimer::NewL(); iNotifySecurityEventsTimer = CIccTimer::NewL(); @@ -86,14 +92,14 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,0,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,0,KSecurityCodes); } else iSecCodes.iPin1.Copy(temp); ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,1,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,1,KSecurityCodes); } else iSecCodes.iPin2.Copy(temp); @@ -101,7 +107,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,2,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,2,KSecurityCodes); } else iSecCodes.iPuk1.Copy(temp); @@ -109,7 +115,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,3,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,3,KSecurityCodes); } else iSecCodes.iPuk2.Copy(temp); @@ -117,7 +123,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,4,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,4,KSecurityCodes); } else iSecCodes.iPhonePassword.Copy(temp); @@ -125,7 +131,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,5,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,5,KSecurityCodes); } else iSecCodes.iSPC.Copy(temp); @@ -133,7 +139,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,6,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,6,KSecurityCodes); } else iSecCodes.iPhBkHiddenKey.Copy(temp); @@ -141,7 +147,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,7,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,7,KSecurityCodes); } else iSecCodes.iUSimAppPin.Copy(temp); @@ -149,7 +155,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,8,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,8,KSecurityCodes); } else iSecCodes.iSecondUSimAppPin.Copy(temp); @@ -157,7 +163,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,9,&KSecurityCodes); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,9,KSecurityCodes); } else iSecCodes.iUniversalPin.Copy(temp); @@ -172,14 +178,13 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,temp); if(ret!=KErrNone) { - LOGPARSERR(&KSecurityCodeAttempts,ret,0,&KSecurityCodeAttempts); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s." ,ret,0,KSecurityCodeAttempts); } else { if (temp <= 0) { - LOGPARSERRANGE(&KSecurityCodeAttempts,temp,"> 0",0,&KSecurityCodeAttempts); - LOGCONFIG1("Using default value..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_13, "Using default value..."); temp = KDefaultPinEntryAttempts; } iSecurityCodeRemainigAttempts.iPin1=temp; @@ -188,14 +193,14 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,temp); if(ret!=KErrNone) { - LOGPARSERR(&KSecurityCodeAttempts,ret,1,&KSecurityCodeAttempts); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s." ,ret,1,KSecurityCodeAttempts); } else { if (temp <= 0) { - LOGPARSERRANGE(&KSecurityCodeAttempts,temp,"> 0",1,&KSecurityCodeAttempts); - LOGCONFIG1("Using default value..."); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_15, "Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s expected > 0" ,temp,1,KSecurityCodeAttempts); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_16, "Using default value..."); temp = KDefaultPinEntryAttempts; } iSecurityCodeRemainigAttempts.iPin2=temp; @@ -204,14 +209,14 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,temp); if(ret!=KErrNone) { - LOGPARSERR(&KSecurityCodeAttempts,ret,2,&KSecurityCodeAttempts); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s." ,ret,2,KSecurityCodeAttempts); } else { if (temp <= 0) { - LOGPARSERRANGE(&KSecurityCodeAttempts,temp,"> 0",2,&KSecurityCodeAttempts); - LOGCONFIG1("Using default value..."); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_18, "Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s expected > 0" ,temp,2,KSecurityCodeAttempts); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_19, "Using default value..."); temp = KDefaultPukEntryAttempts; } iSecurityCodeRemainigAttempts.iPuk1=temp; @@ -220,14 +225,14 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,temp); if(ret!=KErrNone) { - LOGPARSERR(&KSecurityCodeAttempts,ret,3,&KSecurityCodeAttempts); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s." ,ret,3,KSecurityCodeAttempts); } else { if (temp <= 0) { - LOGPARSERRANGE(&KSecurityCodeAttempts,temp,"> 0",3,&KSecurityCodeAttempts); - LOGCONFIG1("Using default value..."); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_21, "Reading element SECURITYCODEATTEMPTS returned %d (element no. %d) from tag %s expected > 0" ,temp,3,KSecurityCodeAttempts); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_22, "Using default value..."); temp = KDefaultPukEntryAttempts; } iSecurityCodeRemainigAttempts.iPuk2=temp; @@ -236,7 +241,7 @@ } else { - LOGPHONE2("NOTE tag %S not defined, using default values",&KSecurityCodeAttempts); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_23, "NOTE tag %s not defined, using default values",KSecurityCodeAttempts); iSecurityCodeDefaultRemainigAttempts.iPin1= KDefaultPinEntryAttempts; iSecurityCodeRemainigAttempts.iPin1= iSecurityCodeDefaultRemainigAttempts.iPin1; iSecurityCodeDefaultRemainigAttempts.iPin2= KDefaultPinEntryAttempts; @@ -255,7 +260,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,0,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,0,KICCLockedAtStart); } else { @@ -265,7 +270,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,1,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,1,KICCLockedAtStart); } else { @@ -275,7 +280,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,2,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,2,KICCLockedAtStart); } else { @@ -285,7 +290,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,3,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,3,KICCLockedAtStart); } else { @@ -295,7 +300,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,4,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_28, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,4,KICCLockedAtStart); } else { @@ -305,7 +310,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,5,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_29, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,5,KICCLockedAtStart); } else iSecStatus.iSPC=(RMobilePhone::TMobilePhoneLockStatus) temp; @@ -313,7 +318,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,6,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_30, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,6,KICCLockedAtStart); } else { @@ -323,7 +328,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,7,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_31, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,7,KICCLockedAtStart); } else { @@ -333,7 +338,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,8,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_32, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,8,KICCLockedAtStart); } else { @@ -343,7 +348,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,temp); if(ret!=KErrNone) { - LOGPARSERR("temp",ret,9,&KICCLockedAtStart); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element TEMP returned %d (element no. %d) from tag %s.",ret,9,KICCLockedAtStart); } else { @@ -364,14 +369,14 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KICCStatus); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KICCStatus); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,ICCStatus); if(ret!=KErrNone) { - LOGPARSERR("ICCStatus",ret,1,&KICCStatus); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element ICCSTATUS returned %d (element no. %d) from tag %s.",ret,1,KICCStatus); continue; } @@ -395,28 +400,28 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KICCSetting); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_36, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KICCSetting); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,lock); if(ret!=KErrNone) { - LOGPARSERR("lock",ret,1,&KICCSetting); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_37, "WARNING - CONFIGURATION FILE PARSING - Reading element LOCK returned %d (element no. %d) from tag %s.",ret,1,KICCSetting); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,lockSetting); if(ret!=KErrNone) { - LOGPARSERR("lockSetting",ret,2,&KICCSetting); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_38, "WARNING - CONFIGURATION FILE PARSING - Reading element LOCKSETTING returned %d (element no. %d) from tag %s.",ret,2,KICCSetting); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,lockStatus); if(ret!=KErrNone) { - LOGPARSERR("lockStatus",ret,3,&KICCSetting); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CONSTRUCTL_39, "WARNING - CONFIGURATION FILE PARSING - Reading element LOCKSTATUS returned %d (element no. %d) from tag %s.",ret,3,KICCSetting); continue; } @@ -637,7 +642,7 @@ return KDefaultNumberOfSlots; default: - LOGPHONE1("CSimPhoneSecurity: Number of Slots error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_NUMBEROFSLOTSL_1, "CSimPhoneSecurity: Number of Slots error, unknown IPC"); User::Leave(KErrNotSupported); break; } @@ -694,7 +699,7 @@ * @return CTestConfigSection a pointer to the configuration file data section */ { - LOGPHONE1(">>CSimPhoneSecurity::CfgFile"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_CFGFILE_1, ">>CSimPhoneSecurity::CfgFile"); return iPhone->CfgFile(); } @@ -1418,8 +1423,7 @@ case RMobilePhone::ESPCChanged: // FALLTHRU default: - LOGPHONE4("CSimPhoneSecurity::SecurityEvent %d OOR [%d,%d]", - aEvent, RMobilePhone::ENoICCFound, RMobilePhone::ESPCChanged); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESECURITY_SECURITYEVENT_1, "CSimPhoneSecurity::SecurityEvent %d OOR [%d,%d]",aEvent, RMobilePhone::ENoICCFound, RMobilePhone::ESPCChanged); return; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPhoneSmartCardApp.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhoneSmartCardApp.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPhoneSmartCardApp.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -19,10 +19,16 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPhoneSmartCardAppTraces.h" +#endif + #include #include #include "CSimPhone.h" -#include "Simlog.h" // // CSimPhoneSmartCardApp @@ -61,11 +67,11 @@ * @leave Leaves due to not enough memory or if any data member does not construct for any reason. */ { - LOGPHONE1("Starting to parse Phone Smart Card applications additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_CONSTRUCTL_1, "Starting to parse Phone Smart Card applications additional config parameters..."); ParseSmartCardApplicationInfoL(); ParseSmartCardFileInfoL(); MapUSimAppsL(); - LOGPHONE1("Finished parsing Phone Smart Card applications additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_CONSTRUCTL_2, "Finished parsing Phone Smart Card applications additional config parameters..."); } @@ -295,7 +301,7 @@ numberOfSlots = KDefaultNumberOfSlots; break; default: - LOGPHONE1("CSimPhoneSmartCardApp: Number of Slots error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_NUMBEROFSLOTSL_1, "CSimPhoneSmartCardApp: Number of Slots error, unknown IPC"); User::Leave(KErrNotSupported); break; } @@ -373,7 +379,7 @@ * @return CTestConfigSection a pointer to the configuration file data section */ { - LOGPHONE1(">>CSimPhoneSmartCardApp::CfgFile"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_CFGFILE_1, ">>CSimPhoneSmartCardApp::CfgFile"); return iPhone->CfgFile(); } @@ -486,7 +492,7 @@ //check that the client has specified a valid start offset else if(aFilePathOffsets.iStartOffset < 1 || aFilePathOffsets.iStartOffset > iNumberRecords) { - LOGPHONE1("ERROR: File start offset information invalid."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TCYCLICSMARTCARDFILE_READFILE_1, "ERROR: File start offset information invalid."); return KErrMMEtelScRecordNotFound; } @@ -585,7 +591,7 @@ //check that the client has specified a valid start offset else if(aFilePathOffsets.iStartOffset < 1 || aFilePathOffsets.iStartOffset > iNumberRecords) { - LOGPHONE1("ERROR: File start offset information invalid."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_READFILE_1, "ERROR: File start offset information invalid."); return KErrMMEtelScRecordNotFound; } else @@ -626,7 +632,7 @@ //check that the client has specified a valid start offset else if(aFilePathOffsets.iStartOffset < 1 || aFilePathOffsets.iStartOffset > iNumberRecords) { - LOGPHONE1("ERROR: File start offset information invalid."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_UPDATEFILE_1, "ERROR: File start offset information invalid."); return KErrMMEtelScRecordNotFound; } else @@ -665,7 +671,7 @@ //check that the client has specified a valid start offset else if(aFilePathOffsets.iStartOffset >= (TUint)iTotalLength) { - LOGPHONE1("ERROR: File start offset information invalid."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_1, "ERROR: File start offset information invalid."); return KErrMMEtelScReferencedDataNotFound; } @@ -673,7 +679,7 @@ //off the end of the file else if((bytesToRead + filePointer) > iTotalLength) { - LOGPHONE1("ERROR: Path offset information results in reading off the end of the file"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_2, "ERROR: Path offset information results in reading off the end of the file"); return KErrMMEtelScEofReached; } else @@ -717,7 +723,7 @@ //check that the client has specified a valid start offset else if(aFilePathOffsets.iStartOffset >= (TUint)iTotalLength) { - LOGPHONE1("ERROR: File start offset information invalid."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_1, "ERROR: File start offset information invalid."); return KErrMMEtelScReferencedDataNotFound; } @@ -725,7 +731,7 @@ //off the end of the file else if((bytesToWrite + filePointer) > iTotalLength) { - LOGPHONE1("ERROR: Path offset information results in reading off the end of the file"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_2, "ERROR: Path offset information results in reading off the end of the file"); return KErrMMEtelScEofReached; } else @@ -1354,7 +1360,7 @@ */ { - LOGPHONE1("CSimPhoneSmartCardApp::GetScFileInfo called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_GETSCFILEINFO_1, "CSimPhoneSmartCardApp::GetScFileInfo called"); RMobilePhone::TScFileInfoV5Pckg *scFileInfoPckg = reinterpret_cast(aInfo); RMobilePhone::TScFileInfoV5 &scFileInfo = (*scFileInfoPckg)(); @@ -1397,7 +1403,7 @@ * */ { - LOGPHONE1("CSimPhoneSmartCardApp::GetScFileInfoCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_GETSCFILEINFOCANCEL_1, "CSimPhoneSmartCardApp::GetScFileInfoCancel called"); iPhone->ReqCompleted(aTsyReqHandle, KErrNone); return KErrNone; @@ -1432,7 +1438,7 @@ * */ { - LOGPHONE1("CSimPhoneSmartCardApp::ReadScFileInfoCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_READSCFILECANCEL_1, "CSimPhoneSmartCardApp::ReadScFileInfoCancel called"); iPhone->ReqCompleted(aTsyReqHandle, KErrNone); return KErrNone; @@ -1467,7 +1473,7 @@ * */ { - LOGPHONE1("CSimPhoneSmartCardApp::UpdateScFileInfoCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_UPDATESCFILECANCEL_1, "CSimPhoneSmartCardApp::UpdateScFileInfoCancel called"); iPhone->ReqCompleted(aTsyReqHandle, KErrNone); return KErrNone; @@ -1491,22 +1497,22 @@ TRAP_IGNORE(iTimer=CSimTimer::NewL(iPhone)); - LOGPHONE1("Starting to Parse MaxActiveSmartCardApp Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_1, "Starting to Parse MaxActiveSmartCardApp Info"); iMaxActiveSmartCardApps = CfgFile()->ItemValue(KMaxActiveSmartCardApps ,KDefaultMaxActiveSmartCardApps); - LOGPHONE1("Starting to Parse ActiveUSIMApp Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_2, "Starting to Parse ActiveUSIMApp Info"); activeUSimApp.Set(CfgFile()->ItemValue(KActiveUSIMApp, KEmptyString)); if(activeUSimApp.Length() == 0) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: ACTIVE USIM APP NOT SPECIFIED!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_3, "ERROR IN CONFIGURATION FILE PARSING: ACTIVE USIM APP NOT SPECIFIED!"); } TInt count = CfgFile()->ItemCount(KSmartCardAppInfo); iSmartCardAppList=new(ELeave) CArrayFixFlat(count+1); - LOGPHONE1("Starting to Load and Parse Smart Card Application Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_4, "Starting to Load and Parse Smart Card Application Info"); for(index=0;indexItem(KSmartCardAppInfo,index); @@ -1518,7 +1524,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,aid); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG"); continue; } else @@ -1529,7 +1535,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,label); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG"); continue; } else @@ -1540,7 +1546,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,type); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD APP INFO TAG"); continue; } else @@ -1563,7 +1569,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, eap); if (ret != KErrNone) { - LOGPHONE2("CONFIGURATION FILE PARSING: BAD OR NO (OPTIONAL) EAP LIST @ SMARTCARD APP INFO TAG [%d]", index); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_8, "CONFIGURATION FILE PARSING: BAD OR NO (OPTIONAL) EAP LIST @ SMARTCARD APP INFO TAG [%d]", index); _LIT8(emptyEapList, ""); eap.Set(emptyEapList); } @@ -1576,7 +1582,7 @@ if(iActiveUSimApp.Length() == 0) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: AID FOR ACTIVE USIM APP NOT FOUND!"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_9, "ERROR IN CONFIGURATION FILE PARSING: AID FOR ACTIVE USIM APP NOT FOUND!"); } @@ -1585,7 +1591,7 @@ TSmartCardAppEvent appEvent; TInt duration, action; - LOGPHONE1("Starting to Load and Parse Smart Card Application Event Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_10, "Starting to Load and Parse Smart Card Application Event Info"); for(index=0;indexValue(),KStdDelimiter,0, duration); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMART CARD APP EVENT TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_11, "ERROR IN CONFIGURATION FILE PARSING: BAD SMART CARD APP EVENT TAG"); continue; } else @@ -1609,7 +1615,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1, aid); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_12, "ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG"); continue; } else @@ -1620,7 +1626,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2, action); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_13, "ERROR IN CONFIGURATION FILE PARSING; BAD SMART CARD APP EVENT TAG"); continue; } else @@ -1645,7 +1651,7 @@ TInt aidIndex, fileType, fileLength, recordLength, numRecords, index; TSmartCardFile* file = NULL; - LOGPHONE1("Starting to Parse Smart Card File Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_1, "Starting to Parse Smart Card File Info"); TInt count = CfgFile()->ItemCount(KSmartCardFile); iSmartCardFileList = new(ELeave) CArrayPtrFlat(count+1); @@ -1661,7 +1667,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,fileType); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_2, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); continue; } else @@ -1678,8 +1684,8 @@ file = new(ELeave) TTransparentSmartCardFile; break; default: - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING:"); - LOGPHONE1("ENCOUNTERED UNKNOWN SMART CARD FILE TYPE."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_3, "ERROR IN CONFIGURATION FILE PARSING:"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_4, "ENCOUNTERED UNKNOWN SMART CARD FILE TYPE."); continue; } file->iType = (RMobilePhone::TScFileType)fileType; @@ -1689,14 +1695,14 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,fileId); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_5, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); delete file; continue; } //check that the FID is precisely 4 bytes long else if(fileId.Length() != KMaxHexFIDLen) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE FID"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_6, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE FID"); delete file; continue; } @@ -1711,7 +1717,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,aidIndex); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_7, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); delete file; continue; } @@ -1724,7 +1730,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,filePath); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_8, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); delete file; continue; } @@ -1737,7 +1743,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,fileLength); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_9, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); delete file; continue; } @@ -1750,7 +1756,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,recordLength); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_10, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); delete file; continue; } @@ -1763,7 +1769,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,numRecords); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_11, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); delete file; continue; } @@ -1776,8 +1782,8 @@ //Check that record Length * number of records = Total length of file if((fileType != RMobilePhone::ETransparent) && ((recordLength*numRecords) != fileLength)) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING:..."); - LOGPHONE1("...Record Length * Number of Records != File Length"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_12, "ERROR IN CONFIGURATION FILE PARSING:..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_13, "...Record Length * Number of Records != File Length"); delete file; continue; } @@ -1786,13 +1792,13 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,fileData); if(ret!=KErrNone) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_14, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE TAG"); delete file; continue; } else if((fileData.Length() % 2 ) != 0) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE DATA"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_15, "ERROR IN CONFIGURATION FILE PARSING: BAD SMARTCARD FILE DATA"); continue; } else @@ -1801,7 +1807,7 @@ TextToBin(fileData, fileDataBuffer); if(fileDataBuffer.Length() != fileLength) { - LOGPHONE1("ERROR IN CONFIGURATION FILE PARSING:INCONSISTANT DATA FILE LENGTH"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_16, "ERROR IN CONFIGURATION FILE PARSING:INCONSISTANT DATA FILE LENGTH"); delete file; continue; } @@ -1940,13 +1946,13 @@ { if(smartCardApp->iAppStatus == CSimPhoneSmartCardApp::EActive) { - LOGPHONE1("REACTIVATING AN ALREADY ACTIVE APPLICATION"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_1, "REACTIVATING AN ALREADY ACTIVE APPLICATION"); return KErrNone; } else { //iMaxActiveSmartCardApps will be exceeded - LOGPHONE1("WARNING: CANNOT PROCESS ACTIVATING APPLICATION"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_2, "WARNING: CANNOT PROCESS ACTIVATING APPLICATION"); return KErrMMEtelScMaxApplicationsActive; } } @@ -1954,7 +1960,7 @@ } }//end for loop - LOGPHONE1("WARNING: AID NOT FOUND. CANNOT PROCESS EVENT"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_3, "WARNING: AID NOT FOUND. CANNOT PROCESS EVENT"); return KErrNotFound; } @@ -1988,13 +1994,13 @@ } else { - LOGPHONE1("ATTEMPTED TO TERMINATE NON-ACTIVE APPLICATION"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_1, "ATTEMPTED TO TERMINATE NON-ACTIVE APPLICATION"); return KErrMMEtelScApplicationNotActive; } } }//end for loop - LOGPHONE1("WARNING: AID NOT FOUND. CANNOT PROCESS EVENT"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_2, "WARNING: AID NOT FOUND. CANNOT PROCESS EVENT"); return KErrNotFound; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPhoneUSimApp.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhoneUSimApp.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPhoneUSimApp.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-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" @@ -19,8 +19,14 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPhoneUSimAppTraces.h" +#endif + #include "CSimPhone.h" -#include "Simlog.h" #include /** @@ -65,7 +71,7 @@ */ void CSimPhoneUSimApp::ConstructL() { - LOGPHONE1("Starting to parse PhoneUSim applications additional config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_1, "Starting to parse PhoneUSim applications additional config parameters..."); const CTestConfigItem* item=NULL; TInt ret=KErrNone; @@ -77,7 +83,7 @@ iUSimAppInfo=new(ELeave) CArrayFixFlat(KMaxUSimApps+1); TInt count=CfgFile()->ItemCount(KUSIMAppInfo); - LOGPHONE1("Starting to Load and Parse USim Application Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_2, "Starting to Load and Parse USim Application Info"); for(i=0;iValue(),KStdDelimiter,0, aid); if(ret!=KErrNone) { - LOGPARSERR("aid",ret,0,&KUSIMAppInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element AID returned %d (element no. %d) from tag %s.",ret,0,KUSIMAppInfo); continue; } else @@ -100,7 +106,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1, label); if(ret!=KErrNone) { - LOGPARSERR("label",ret,1,&KUSIMAppInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element LABEL returned %d (element no. %d) from tag %s.",ret,1,KUSIMAppInfo); continue; } else @@ -116,7 +122,7 @@ count=CfgFile()->ItemCount(KUSIMAppSwitching); - LOGPHONE1("Starting to Load and Parse USim Application Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_5, "Starting to Load and Parse USim Application Info"); for(i=0;iValue(),KStdDelimiter,0, duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KUSIMAppSwitching); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KUSIMAppSwitching); continue; } else @@ -136,7 +142,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1, aid); if(ret!=KErrNone) { - LOGPARSERR("aid",ret,1,&KUSIMAppSwitching); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element AID returned %d (element no. %d) from tag %s.",ret,1,KUSIMAppSwitching); continue; } else @@ -306,7 +312,7 @@ return KDefaultNumberOfSlots; default: - LOGPHONE1("CSimPhoneUSimApp: Number of Slots error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_NUMBEROFSLOTSL_1, "CSimPhoneUSimApp: Number of Slots error, unknown IPC"); User::Leave(KErrNotSupported); break; } @@ -355,7 +361,7 @@ */ const CTestConfigSection* CSimPhoneUSimApp::CfgFile() { - LOGPHONE1(">>CSimPhoneUSimApp::CfgFile"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONEUSIMAPP_CFGFILE_1, ">>CSimPhoneUSimApp::CfgFile"); return iPhone->CfgFile(); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimPubSub.cpp --- a/telephonyserverplugins/simtsy/src/CSimPubSub.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimPubSub.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2004-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" @@ -15,8 +15,14 @@ // // + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimPubSubTraces.h" +#endif + #include "CSimPubSub.h" -#include "Simlog.h" /** @@ -27,12 +33,12 @@ */ CSimPubSub* CSimPubSub::NewL(MPSSimObserver* aPSSimObserver, const CSimPubSub::TPubSubProperty aProperty) { - LOGSCOMMON1(">>CSimPubSub::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPUBSUB_NEWL_1, ">>CSimPubSub::NewL"); CSimPubSub* pubsub=new(ELeave) CSimPubSub(aPSSimObserver,aProperty); CleanupStack::PushL(pubsub); pubsub->ConstructL(); CleanupStack::Pop(); - LOGSCOMMON1("<>CSimReduceTimers.cpp: Reduce Timer event fired for all timers"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_SIMPSEVENT_1, ">>CSimReduceTimers.cpp: Reduce Timer event fired for all timers"); Notify(); } else if(aProperty == iPSProperty && aStatus > 0) { - LOGMISC2(">>CSimReduceTimers.cpp: Reduce Timer event fired for event ID %d", aStatus); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_SIMPSEVENT_2, ">>CSimReduceTimers.cpp: Reduce Timer event fired for event ID %d", aStatus); Notify(aStatus); } } void CSimReduceTimers::AttachL(MSimTimerUpdateObserver* aObserver) { - LOGMISC1("CSimReduceTimers::AttachL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_ATTACHL_1, "CSimReduceTimers::AttachL"); User::LeaveIfError(iObservers.Append(aObserver)); } void CSimReduceTimers::DetachL(MSimTimerUpdateObserver* aObserver) { TInt pos = iObservers.Find(aObserver); - LOGMISC2("CSimReduceTimers::DetachL, from position %d", pos); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_DETACHL_1, "CSimReduceTimers::DetachL, from position %d", pos); User::LeaveIfError(pos); iObservers.Remove(pos); } @@ -111,10 +117,10 @@ void CSimReduceTimers::Notify() { TInt totalItems = iObservers.Count(); - LOGMISC2("CSimReduceTimers::Notify, %d observers registered", totalItems); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_1, "CSimReduceTimers::Notify, %d observers registered", totalItems); if (totalItems <= 0) { - LOGMISC1("CSimReduceTimers::Notify, No timers to reduce."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_2, "CSimReduceTimers::Notify, No timers to reduce."); return; } @@ -123,7 +129,7 @@ for (num = 0; num < totalItems; num++) { TInt temp = iObservers[num]->GetRemainingSeconds(); - LOGMISC3("CSimReduceTimers::Notify, iObservers[%d] remaining time = %d", num, temp); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_3, "CSimReduceTimers::Notify, iObservers[%d] remaining time = %d", num, temp); // Ensure no error is returned and check if the current itteration gives a lower time remaining. if (temp > 0 && temp < minTimeReduce) @@ -134,16 +140,16 @@ if (minTimeReduce == KMaxTInt) { - LOGMISC1("CSimReduceTimers::Notify, No running timers."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_4, "CSimReduceTimers::Notify, No running timers."); return; } - LOGMISC2("CSimReduceTimers::Notify, Min time to reduce all timers: %d", minTimeReduce); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_5, "CSimReduceTimers::Notify, Min time to reduce all timers: %d", minTimeReduce); // Ensure that reducing timers by minTimeReduce does not reduce any timer to less than KTimerDelayOnReduceTimeSignal. minTimeReduce -= KTimerDelayOnReduceTimeSignal; if (minTimeReduce <= 0) { - LOGMISC1("CSimReduceTimers::Notify, Min time to reduce <= KTimerDelayOnReduceTimeSignal, no change to timers."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY_6, "CSimReduceTimers::Notify, Min time to reduce <= KTimerDelayOnReduceTimeSignal, no change to timers."); return; } @@ -156,10 +162,10 @@ void CSimReduceTimers::Notify(TInt aTimerEventId) { TInt totalItems = iObservers.Count(); - LOGMISC2("CSimReduceTimers::Notify, %d observers registered", totalItems); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_1, "CSimReduceTimers::Notify, %d observers registered", totalItems); if (totalItems <= 0) { - LOGMISC1("CSimReduceTimers::Notify, No timers to reduce."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_2, "CSimReduceTimers::Notify, No timers to reduce."); return; } @@ -182,8 +188,7 @@ if(indexOfLowest == KErrNotFound) { - LOGMISC2(">>CSimReduceTimers::Notify, No observers with event ID %d found", - aTimerEventId); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_3, ">>CSimReduceTimers::Notify, No observers with event ID %d found", aTimerEventId); return; } @@ -191,13 +196,11 @@ TInt reduceBy = lowestTime - KTimerDelayOnReduceTimeSignal; if(reduceBy >= lowestTime) { - LOGMISC3("CSimReduceTimers::Notify, Lowest timer for event ID %d already less than %d sec. No timer reduced.", - KTimerDelayOnReduceTimeSignal, aTimerEventId); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_4, "CSimReduceTimers::Notify, Lowest timer for event ID %d already less than %d sec. No timer reduced.",KTimerDelayOnReduceTimeSignal, aTimerEventId); } else { - LOGMISC3(">>CSimReduceTimers::Notify, Timer for observer with event ID %d, reduced by %d sec", - aTimerEventId, reduceBy); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMREDUCETIMERS_NOTIFY1_5, ">>CSimReduceTimers::Notify, Timer for observer with event ID %d, reduced by %d sec", aTimerEventId, reduceBy); iObservers[indexOfLowest]->Update(reduceBy); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimSat.cpp --- a/telephonyserverplugins/simtsy/src/CSimSat.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimSat.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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,8 +20,14 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimSatTraces.h" +#endif + #include "CSimSat.h" -#include "Simlog.h" #include "CSimPhone.h" #include "utils.h" #include @@ -70,13 +76,13 @@ */ { - LOGMISC1("CSimSat: Entered ConstructL()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_1, "CSimSat: Entered ConstructL()"); iSatInfo =new(ELeave) CArrayFixFlat(KSatGranularity); iTimer = CSimTimer::NewL(iPhone); - LOGMISC1("Starting to parse Sat config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_2, "Starting to parse Sat config parameters..."); TInt count =CfgFile()->ItemCount(KSatRefresh); const CTestConfigItem* item=NULL; @@ -95,19 +101,19 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KSatRefresh); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KSatRefresh); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,type); if(ret!=KErrNone) { - LOGPARSERR("type",ret,1,&KSatRefresh); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element TYPE returned %d (element no. %d) from tag %s.",ret,1,KSatRefresh); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,fileList); if(ret!=KErrNone) { - LOGPARSERR("fileList",ret,2,&KSatRefresh); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element FILELIST returned %d (element no. %d) from tag %s.",ret,2,KSatRefresh); continue; } @@ -122,7 +128,7 @@ iSatInfo->AppendL(satInfo); } - LOGMISC1("...Finished parsing Sat config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONSTRUCTL_6, "...Finished parsing Sat config parameters..."); if(iSatInfo->Count()!=0) { @@ -138,7 +144,7 @@ * */ { - LOGMISC1("CSimSat: Entered destructor"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_DTOR_1, "CSimSat: Entered destructor"); delete iTimer; if(iSatInfo) { @@ -330,7 +336,7 @@ case ESatNotifyGetInkeyPCmd: case ESatNotifySendSsPCmd: case ESatNotifyLaunchBrowserPCmd: - LOGMISC1("CSimSat: ReqModeL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_REQMODEL_1, "CSimSat: ReqModeL"); ret=KReqModeMultipleCompletionEnabled | KReqModeRePostImmediately; break; case ESatRefreshAllowed: @@ -382,11 +388,11 @@ case ESatNotifyGetInkeyPCmd: case ESatNotifySendSsPCmd: case ESatNotifyLaunchBrowserPCmd: - LOGMISC1("CSimSat: RegisterNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_REGISTERNOTIFICATION_1, "CSimSat: RegisterNotification"); return KErrNone; default: // Unknown or invalid IPC - LOGMISC1("CSimSat: Register error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_REGISTERNOTIFICATION_2, "CSimSat: Register error, unknown IPC"); return KErrNotSupported; } } @@ -425,11 +431,11 @@ case ESatNotifyGetInkeyPCmd: case ESatNotifySendSsPCmd: case ESatNotifyLaunchBrowserPCmd: - LOGMISC1("CSimSat: DeregisterNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_DEREGISTERNOTIFICATION_1, "CSimSat: DeregisterNotification"); return KErrNone; default: // Unknown or invalid IPC - LOGMISC1("CSimSat: Deregister error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_DEREGISTERNOTIFICATION_2, "CSimSat: Deregister error, unknown IPC"); return KErrNotSupported; } } @@ -464,12 +470,12 @@ case ESatNotifyGetInkeyPCmd: case ESatNotifySendSsPCmd: case ESatNotifyLaunchBrowserPCmd: - LOGMISC1("CSimSat: Registered with 2 slot"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_NUMBEROFSLOTSL_1, "CSimSat: Registered with 2 slot"); numberOfSlots=2; break; default: // Unknown or invalid IPC - LOGMISC1("CSimSat: Number of Slots error, unknown IPC"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_NUMBEROFSLOTSL_2, "CSimSat: Number of Slots error, unknown IPC"); User::Leave(KErrNotSupported); break; } @@ -562,7 +568,7 @@ * @return err KErrNone if request completes ok */ { - LOGMISC1("CSimSat: - CancelService called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CANCELSERVICE_1, "CSimSat: - CancelService called"); switch (aIpc) { case ESatNotifyRefreshPCmd: @@ -732,7 +738,7 @@ RSat::TRefreshRspV1Pckg* aRspPckg = (RSat::TRefreshRspV1Pckg*)aRefreshAllowedRsp; RSat::TRefreshRspV1& rspV1 = (*aRspPckg)(); - LOGMISC2("RefreshAllowed: - aRefreshAllowedResult %d",rspV1.iGeneralResult); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_REFRESHALLOWED_1, "RefreshAllowed: - aRefreshAllowedResult %d",rspV1.iGeneralResult); /* Set simtsy status to reflect clients status */ RSat::TPCmdResult refreshAllowedResult = rspV1.iGeneralResult; @@ -1665,7 +1671,7 @@ TInt CSimSat::TerminalRsp(const TTsyReqHandle aTsyReqHandle, RSat::TPCmd* aPCmd, TDes8* aRsp) { - LOGMISC1(">>CSimSat::TerminalRsp"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_TERMINALRSP_1, ">>CSimSat::TerminalRsp"); iPendingTerRsp = ETrue; switch (*aPCmd) @@ -1726,7 +1732,7 @@ * @param aId an id identifying which timer callback is being called */ { - LOGMISC1(">>CSimSat::TimerCallBack"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_TIMERCALLBACK_1, ">>CSimSat::TimerCallBack"); // // Convert the SIM TSY text version into the RSat binary version... @@ -2077,7 +2083,7 @@ iTimer->Start(randTime(),this); } - LOGMISC1("<Value(),KStdDelimiter,0,destn); if(ret!=KErrNone) { - LOGPARSERR("destination",ret,0,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KMMRetrieve); continue; } tMMRetrieve.iDestn = destn; @@ -3446,7 +3452,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,alphaIDSts); if(ret!=KErrNone) { - LOGPARSERR("alphaIDStatus",ret,1,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHAIDSTATUS returned %d (element no. %d) from tag %s.",ret,1,KMMRetrieve); continue; } tMMRetrieve.iAlphaStatus=alphaIDSts; @@ -3454,7 +3460,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,alphaIDBuf); if(ret!=KErrNone) { - LOGPARSERR("alphaIDBuf",ret,2,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHAIDBUF returned %d (element no. %d) from tag %s.",ret,2,KMMRetrieve); continue; } location = alphaIDBuf.Locate('\n'); @@ -3470,7 +3476,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iconid); if(ret!=KErrNone) { - LOGPARSERR("IconID Identifier",ret,3,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element ICONID IDENTIFIER returned %d (element no. %d) from tag %s.",ret,3,KMMRetrieve); continue; } tMMRetrieve.iIconID = iconid; @@ -3478,7 +3484,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,iconidqlfr); if(ret!=KErrNone) { - LOGPARSERR("IconID qualifier",ret,4,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element ICONID QUALIFIER returned %d (element no. %d) from tag %s.",ret,4,KMMRetrieve); continue; } tMMRetrieve.iIconIDBuf = iconidqlfr; @@ -3486,7 +3492,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,msgRef); if(ret!=KErrNone) { - LOGPARSERR("Message Reference",ret,5,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element MESSAGE REFERENCE returned %d (element no. %d) from tag %s.",ret,5,KMMRetrieve); continue; } location = msgRef.Locate('\n'); @@ -3502,7 +3508,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,rcpFile); if(ret!=KErrNone) { - LOGPARSERR("Reception File",ret,6,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element RECEPTION FILE returned %d (element no. %d) from tag %s.",ret,6,KMMRetrieve); continue; } location = rcpFile.Locate('\n'); @@ -3518,7 +3524,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,conId); if(ret!=KErrNone) { - LOGPARSERR("Content Identifier",ret,7,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element CONTENT IDENTIFIER returned %d (element no. %d) from tag %s.",ret,7,KMMRetrieve); continue; } location = conId.Locate('\n'); @@ -3534,7 +3540,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,msgId); if(ret!=KErrNone) { - LOGPARSERR("Message Identifier",ret,8,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element MESSAGE IDENTIFIER returned %d (element no. %d) from tag %s.",ret,8,KMMRetrieve); continue; } location = msgId.Locate('\n'); @@ -3550,7 +3556,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,textStatus); if(ret!=KErrNone) { - LOGPARSERR("Text Attribute Status",ret,9,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE STATUS returned %d (element no. %d) from tag %s.",ret,9,KMMRetrieve); continue; } tMMRetrieve.iTextAttStatus = textStatus; @@ -3558,7 +3564,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,txtAttr); if(ret!=KErrNone) { - LOGPARSERR("Text Attribute",ret,10,&KMMRetrieve); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE returned %d (element no. %d) from tag %s.",ret,10,KMMRetrieve); continue; } location = txtAttr.Locate('\n'); @@ -3590,7 +3596,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn); if(ret!=KErrNone) { - LOGPARSERR("destination",ret,0,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KMMSubmit); continue; } tMMSubmit.iDestn = destn; @@ -3598,7 +3604,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,alphaIDSts); if(ret!=KErrNone) { - LOGPARSERR("alphaIDStatus",ret,1,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHAIDSTATUS returned %d (element no. %d) from tag %s.",ret,1,KMMSubmit); continue; } tMMSubmit.iAlphaStatus=alphaIDSts; @@ -3606,7 +3612,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,alphaIDBuf); if(ret!=KErrNone) { - LOGPARSERR("alphaIDBuf",ret,2,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element ALPHAIDBUF returned %d (element no. %d) from tag %s.",ret,2,KMMSubmit); continue; } location = alphaIDBuf.Locate('\n'); @@ -3618,7 +3624,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iconid); if(ret!=KErrNone) { - LOGPARSERR("IconID Identifier",ret,3,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element ICONID IDENTIFIER returned %d (element no. %d) from tag %s.",ret,3,KMMSubmit); continue; } tMMSubmit.iIconID = iconid; @@ -3626,7 +3632,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,iconidqlfr); if(ret!=KErrNone) { - LOGPARSERR("IconID qualifier",ret,4,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element ICONID QUALIFIER returned %d (element no. %d) from tag %s.",ret,4,KMMSubmit); continue; } tMMSubmit.iIconIDBuf = iconidqlfr; @@ -3635,7 +3641,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,subFile); if(ret!=KErrNone) { - LOGPARSERR("Submission File",ret,5,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element SUBMISSION FILE returned %d (element no. %d) from tag %s.",ret,5,KMMSubmit); continue; } location = subFile.Locate('\n'); @@ -3647,7 +3653,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,msgId); if(ret!=KErrNone) { - LOGPARSERR("Message Identifier",ret,6,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element MESSAGE IDENTIFIER returned %d (element no. %d) from tag %s.",ret,6,KMMSubmit); continue; } location = msgId.Locate('\n'); @@ -3659,7 +3665,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,textStatus); if(ret!=KErrNone) { - LOGPARSERR("Text Attribute Status",ret,7,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE STATUS returned %d (element no. %d) from tag %s.",ret,7,KMMSubmit); continue; } tMMSubmit.iTextAttStatus = textStatus; @@ -3667,7 +3673,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,txtAttr); if(ret!=KErrNone) { - LOGPARSERR("Text Attribute",ret,8,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE returned %d (element no. %d) from tag %s.",ret,8,KMMSubmit); continue; } location = txtAttr.Locate('\n'); @@ -3696,7 +3702,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn); if(ret!=KErrNone) { - LOGPARSERR("destination",ret,0,&KMMDisplay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KMMDisplay); continue; } tMMDisplay.iDestn = destn; @@ -3704,7 +3710,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,dispPrio); if(ret!=KErrNone) { - LOGPARSERR("Display Priority",ret,1,&KMMDisplay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAY PRIORITY returned %d (element no. %d) from tag %s.",ret,1,KMMDisplay); continue; } tMMDisplay.iDispPri = dispPrio; @@ -3712,7 +3718,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,clrScr); if(ret!=KErrNone) { - LOGPARSERR("ClearScreen",ret,2,&KMMDisplay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element CLEARSCREEN returned %d (element no. %d) from tag %s.",ret,2,KMMDisplay); continue; } tMMDisplay.iClrScr = clrScr; @@ -3720,7 +3726,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,dispFile); if(ret!=KErrNone) { - LOGPARSERR("Submission File",ret,3,&KMMDisplay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element SUBMISSION FILE returned %d (element no. %d) from tag %s.",ret,3,KMMDisplay); continue; } location = dispFile.Locate('\n'); @@ -3732,7 +3738,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,msgId); if(ret!=KErrNone) { - LOGPARSERR("Message Identifier",ret,4,&KMMSubmit); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_26, "WARNING - CONFIGURATION FILE PARSING - Reading element MESSAGE IDENTIFIER returned %d (element no. %d) from tag %s.",ret,4,KMMSubmit); continue; } location = msgId.Locate('\n'); @@ -3744,7 +3750,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,immRsp); if(ret!=KErrNone) { - LOGPARSERR("Immediate Response",ret,5,&KMMDisplay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element IMMEDIATE RESPONSE returned %d (element no. %d) from tag %s.",ret,5,KMMDisplay); continue; } tMMDisplay.iImmRsp = immRsp; @@ -3769,7 +3775,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn); if(ret!=KErrNone) { - LOGPARSERR("destination",ret,0,&KSetFrames); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_28, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KSetFrames); continue; } tSetFrms.iDestn = destn; @@ -3777,21 +3783,21 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,frameId); if(ret!=KErrNone) { - LOGPARSERR("Frame Identifier",ret,1,&KSetFrames); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_29, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME IDENTIFIER returned %d (element no. %d) from tag %s.",ret,1,KSetFrames); } tSetFrms.iFrmId = frameId; ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,frmLayout); if(ret!=KErrNone) { - LOGPARSERR("Frame Layout",ret,2,&KSetFrames); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_30, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME LAYOUT returned %d (element no. %d) from tag %s.",ret,2,KSetFrames); } tSetFrms.iFrmLayout = frmLayout; ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,frmLayoutBuf); if(ret!=KErrNone) { - LOGPARSERR("Frame Layout buffer",ret,3,&KSetFrames); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_31, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME LAYOUT BUFFER returned %d (element no. %d) from tag %s.",ret,3,KSetFrames); } location = frmLayoutBuf.Locate('\n'); if(location > 0) @@ -3802,14 +3808,14 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,defFrmLayout); if(ret!=KErrNone) { - LOGPARSERR("Default Frame Layout",ret,4,&KSetFrames); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_32, "WARNING - CONFIGURATION FILE PARSING - Reading element DEFAULT FRAME LAYOUT returned %d (element no. %d) from tag %s.",ret,4,KSetFrames); } tSetFrms.iDefFrmId = defFrmLayout; ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,frameSeparator); if(ret!=KErrNone) { - LOGPARSERR("Frame Separator",ret,5,&KSetFrames); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME SEPARATOR returned %d (element no. %d) from tag %s.",ret,5,KSetFrames); } tSetFrms.iFrmSeparator = frameSeparator; @@ -3832,7 +3838,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn); if(ret!=KErrNone) { - LOGPARSERR("destination",ret,0,&KGetFramesStatus); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KGetFramesStatus); continue; } tGetFrmsSts.iDestn = destn; @@ -3840,7 +3846,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,frameId); if(ret!=KErrNone) { - LOGPARSERR("Frame Id",ret,1,&KGetFramesStatus); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAME ID returned %d (element no. %d) from tag %s.",ret,1,KGetFramesStatus); continue; } tGetFrmsSts.iFrmId = frameId; @@ -3848,7 +3854,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,frmLayoutBuf); if(ret!=KErrNone) { - LOGPARSERR("FrameLayout Buffer",ret,1,&KGetFramesStatus); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_36, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAMELAYOUT BUFFER returned %d (element no. %d) from tag %s.",ret,1,KGetFramesStatus); continue; } location = frmLayoutBuf.Locate('\n'); @@ -3876,7 +3882,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,destn); if(ret!=KErrNone) { - LOGPARSERR("Destination",ret,0,&KLocalInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_37, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KLocalInfo); continue; } tLocalInfo.iDeviceId = destn; @@ -3884,7 +3890,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,infoType); if(ret!=KErrNone) { - LOGPARSERR("Information Type",ret,1,&KLocalInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_38, "WARNING - CONFIGURATION FILE PARSING - Reading element INFORMATION TYPE returned %d (element no. %d) from tag %s.",ret,1,KLocalInfo); continue; } tLocalInfo.iLocalInfoType = infoType; @@ -3892,7 +3898,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,utranQlfr); if(ret!=KErrNone) { - LOGPARSERR("UTRAN Qlfr",ret,2,&KLocalInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_39, "WARNING - CONFIGURATION FILE PARSING - Reading element UTRAN QLFR returned %d (element no. %d) from tag %s.",ret,2,KLocalInfo); continue; } tLocalInfo.iUTRANQlfr = utranQlfr; @@ -3916,7 +3922,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,brType); if(ret!=KErrNone) { - LOGPARSERR("Destination",ret,0,&KOpenChnl); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_40, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,0,KOpenChnl); continue; } tOpenChn.iBearerType = brType; @@ -3924,7 +3930,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,frameId); if(ret!=KErrNone) { - LOGPARSERR("Information Type",ret,1,&KOpenChnl); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_41, "WARNING - CONFIGURATION FILE PARSING - Reading element INFORMATION TYPE returned %d (element no. %d) from tag %s.",ret,1,KOpenChnl); continue; } tOpenChn.iFrameId = frameId; @@ -3950,7 +3956,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,frameId); if(ret!=KErrNone) { - LOGPARSERR("FrameId",ret,0,&KMiscCmd); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_42, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAMEID returned %d (element no. %d) from tag %s.",ret,0,KMiscCmd); continue; } tMiscCmd.iFrameId = frameId; @@ -3977,19 +3983,19 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KRefresh2); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_43, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KRefresh2); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,type); if(ret!=KErrNone) { - LOGPARSERR("Refresh Type",ret,1,&KRefresh2); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_44, "WARNING - CONFIGURATION FILE PARSING - Reading element REFRESH TYPE returned %d (element no. %d) from tag %s.",ret,1,KRefresh2); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,applId); if(ret!=KErrNone) { - LOGPARSERR("Application Id",ret,2,&KRefresh2); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_45, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLICATION ID returned %d (element no. %d) from tag %s.",ret,2,KRefresh2); continue; } @@ -4022,7 +4028,7 @@ ret= CTestConfig::GetElement(item->Value(),KStdDelimiter,0,textStatus); if(ret!=KErrNone) { - LOGPARSERR("Text Attribute Status",ret,0,&KSendUssd); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_46, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE STATUS returned %d (element no. %d) from tag %s.",ret,0,KSendUssd); continue; } tSendUssd.iTextAttStatus = textStatus; @@ -4030,7 +4036,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,txtAttr); if(ret!=KErrNone) { - LOGPARSERR("Text Attribute Buffer",ret,1,&KSendUssd); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_47, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE BUFFER returned %d (element no. %d) from tag %s.",ret,1,KSendUssd); continue; } TInt location = txtAttr.Locate('\n'); @@ -4058,7 +4064,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,frameId); if(ret!=KErrNone) { - LOGPARSERR("FrameId",ret,0,&KLaunchBrowser); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_48, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAMEID returned %d (element no. %d) from tag %s.",ret,0,KLaunchBrowser); continue; } tLnchBrwsr.iFrameId = frameId; @@ -4066,7 +4072,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,terRsp); if(ret!=KErrNone) { - LOGPARSERR("Terminal Response",ret,1,&KLaunchBrowser); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_49, "WARNING - CONFIGURATION FILE PARSING - Reading element TERMINAL RESPONSE returned %d (element no. %d) from tag %s.",ret,1,KLaunchBrowser); continue; } tLnchBrwsr.iTerRsp = terRsp; @@ -4091,7 +4097,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,src); if(ret!=KErrNone) { - LOGPARSERR("Source",ret,0,&KUssdDataDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_50, "WARNING - CONFIGURATION FILE PARSING - Reading element SOURCE returned %d (element no. %d) from tag %s.",ret,0,KUssdDataDownload); continue; } tUssdData.iSrc = src; @@ -4099,7 +4105,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,destn); if(ret!=KErrNone) { - LOGPARSERR("Destination",ret,1,&KUssdDataDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_51, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,1,KUssdDataDownload); continue; } tUssdData.iDestn = destn; @@ -4107,7 +4113,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,dcs); if(ret!=KErrNone) { - LOGPARSERR("Data Coding Scheme",ret,2,&KUssdDataDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_52, "WARNING - CONFIGURATION FILE PARSING - Reading element DATA CODING SCHEME returned %d (element no. %d) from tag %s.",ret,2,KUssdDataDownload); continue; } tUssdData.iDcs = dcs; @@ -4115,7 +4121,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,ussdStr); if(ret!=KErrNone) { - LOGPARSERR("USSD String",ret,3,&KUssdDataDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_53, "WARNING - CONFIGURATION FILE PARSING - Reading element USSD STRING returned %d (element no. %d) from tag %s.",ret,3,KUssdDataDownload); continue; } else @@ -4129,7 +4135,7 @@ } else { - LOGPARSERR("UssdDataDownload::USSD String",KErrArgument,0,&KUssdDataDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_54, "WARNING - CONFIGURATION FILE PARSING - Reading element USSDDATADOWNLOAD::USSD STRING returned %d (element no. %d) from tag %s.",KErrArgument,0,KUssdDataDownload); continue; } } @@ -4137,7 +4143,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,UICCRsp); if(ret!=KErrNone) { - LOGPARSERR("UICC Response",ret,4,&KUssdDataDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_55, "WARNING - CONFIGURATION FILE PARSING - Reading element UICC RESPONSE returned %d (element no. %d) from tag %s.",ret,4,KUssdDataDownload); continue; } tUssdData.iUICCRsp = UICCRsp; @@ -4162,7 +4168,7 @@ ret= CTestConfig::GetElement(item->Value(),KStdDelimiter,0,infoType); if(ret!=KErrNone) { - LOGPARSERR("Information Type",ret,0,&KEventDnld); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_56, "WARNING - CONFIGURATION FILE PARSING - Reading element INFORMATION TYPE returned %d (element no. %d) from tag %s.",ret,0,KEventDnld); continue; } tEventDnld.iVar = infoType; @@ -4170,7 +4176,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,framesList); if(ret!=KErrNone) { - LOGPARSERR("Frames List",ret,1,&KEventDnld); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_57, "WARNING - CONFIGURATION FILE PARSING - Reading element FRAMES LIST returned %d (element no. %d) from tag %s.",ret,1,KEventDnld); continue; } TInt location = framesList.Locate('\n'); @@ -4199,7 +4205,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,textStatus); if(ret!=KErrNone) { - LOGPARSERR("Text Attr Status",ret,0,&KSendSs); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_58, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTR STATUS returned %d (element no. %d) from tag %s.",ret,0,KSendSs); continue; } @@ -4208,7 +4214,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,txtAttr); if(ret!=KErrNone) { - LOGPARSERR("Text Attribute",ret,1,&KSendSs); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_59, "WARNING - CONFIGURATION FILE PARSING - Reading element TEXT ATTRIBUTE returned %d (element no. %d) from tag %s.",ret,1,KSendSs); continue; } @@ -4239,19 +4245,19 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KElemFiles); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_60, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KElemFiles); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,type); if(ret!=KErrNone) { - LOGPARSERR("Refresh Type",ret,1,&KElemFiles); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_61, "WARNING - CONFIGURATION FILE PARSING - Reading element REFRESH TYPE returned %d (element no. %d) from tag %s.",ret,1,KElemFiles); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,FileList); if(ret!=KErrNone) { - LOGPARSERR("Application Id",ret,2,&KElemFiles); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_62, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLICATION ID returned %d (element no. %d) from tag %s.",ret,2,KElemFiles); continue; } @@ -4284,7 +4290,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,src); if(ret!=KErrNone) { - LOGPARSERR("Source",ret,0,&KMmsNotificationDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_63, "WARNING - CONFIGURATION FILE PARSING - Reading element SOURCE returned %d (element no. %d) from tag %s.",ret,0,KMmsNotificationDownload); continue; } tMmsNotificationDownload.iSrc = src; @@ -4292,7 +4298,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,destn); if(ret!=KErrNone) { - LOGPARSERR("Destination",ret,1,&KMmsNotificationDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_64, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTINATION returned %d (element no. %d) from tag %s.",ret,1,KMmsNotificationDownload); continue; } tMmsNotificationDownload.iDestn = destn; @@ -4300,7 +4306,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,mmsNotfn); if(ret!=KErrNone) { - LOGPARSERR("MMS notification",ret,2,&KMmsNotificationDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_65, "WARNING - CONFIGURATION FILE PARSING - Reading element MMS NOTIFICATION returned %d (element no. %d) from tag %s.",ret,2,KMmsNotificationDownload); continue; } location = mmsNotfn.Locate('\n'); @@ -4313,7 +4319,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,lastEnv); if(ret!=KErrNone) { - LOGPARSERR("Last envelope",ret,3,&KMmsNotificationDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_66, "WARNING - CONFIGURATION FILE PARSING - Reading element LAST ENVELOPE returned %d (element no. %d) from tag %s.",ret,3,KMmsNotificationDownload); continue; } tMmsNotificationDownload.iLastEnv = lastEnv; @@ -4321,7 +4327,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,UICCRsp); if(ret!=KErrNone) { - LOGPARSERR("UICC Response",ret,4,&KMmsNotificationDownload); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_67, "WARNING - CONFIGURATION FILE PARSING - Reading element UICC RESPONSE returned %d (element no. %d) from tag %s.",ret,4,KMmsNotificationDownload); continue; } tMmsNotificationDownload.iUICCRsp = UICCRsp; @@ -4330,7 +4336,7 @@ } break; default: - LOGMISC1("Unknown command to process"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_68, "Unknown command to process"); return KErrNotSupported; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimSerComm.cpp --- a/telephonyserverplugins/simtsy/src/CSimSerComm.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimSerComm.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -19,9 +19,15 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimSerCommTraces.h" +#endif + #include "CSimSerComm.h" #include "CSimPhone.h" -#include "Simlog.h" MComm::MComm() /** @@ -112,7 +118,7 @@ * @return TInt Standard error value. */ { - LOGDATA1("Attempting to Open Serial Port"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, MCOMM_COMMOPEN1_1, "Attempting to Open Serial Port"); TInt err; if (err = iCommServer.Connect(), err!=KErrNone) return err; @@ -132,7 +138,7 @@ return err; } } - LOGDATA1("Sucessfully Opened Serial Port"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, MCOMM_COMMOPEN1_2, "Sucessfully Opened Serial Port"); return KErrNone; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimSignalStrength.cpp --- a/telephonyserverplugins/simtsy/src/CSimSignalStrength.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimSignalStrength.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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,10 +20,16 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimSignalStrengthTraces.h" +#endif + #include #include "CSimSignalStrength.h" #include "CSimPhone.h" -#include "Simlog.h" #include "simtsyglobalproperties.h" const TInt KSignalStrengthGranularity=5; // < Granularity for signal strength list array @@ -67,7 +73,7 @@ iTimer=CSimTimer::NewL(iPhone); iSignalStrengthInfo=new(ELeave) CArrayFixFlat(KSignalStrengthGranularity); - LOGSS1("Starting to parse Signal Strength config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_1, "Starting to parse Signal Strength config parameters..."); const CTestConfigItem* item=NULL; TInt ret=KErrNone; @@ -104,19 +110,19 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,duration); if(ret!=KErrNone) { - LOGPARSERR("duration",ret,0,&KSSLevel); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DURATION returned %d (element no. %d) from tag %s.",ret,0,KSSLevel); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,ss); if(ret!=KErrNone) { - LOGPARSERR("ss",ret,1,&KSSLevel); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SS returned %d (element no. %d) from tag %s.",ret,1,KSSLevel); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,ssb); if(ret!=KErrNone) { - LOGPARSERR("ssb",ret,2,&KSSLevel); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SSB returned %d (element no. %d) from tag %s.",ret,2,KSSLevel); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,err); @@ -126,7 +132,7 @@ } else { - LOGPARSERRANGE("ssb",ret,3,&KSSLevel,"0 or -1"); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_5, "Reading element SSB returned %d (element no. %d) from tag %s expected 0 or -1" ,ret,3,KSSLevel); } TSignalStrengthInfo ssInfo; @@ -137,7 +143,7 @@ iSignalStrengthInfo->AppendL(ssInfo); } - LOGSS1("...Finished parsing Signal Strength config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_CONSTRUCTL_6, "...Finished parsing Signal Strength config parameters..."); if(iSignalStrengthInfo->Count()!=0) { @@ -216,7 +222,7 @@ * @return TInt Standard error value. */ { - LOGSS1(">>CSimSignalStrength::GetSignalStrength"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_GETSIGNALSTRENGTH_1, ">>CSimSignalStrength::GetSignalStrength"); TPckg* ssPckg=(TPckg*)aPckg1; TInt32& ss=(*ssPckg)(); TPckg* ssbPckg=(TPckg*)aPckg2; @@ -230,7 +236,7 @@ ss=iCurrentLevel; ssb=iCurrentBar; - LOGSS3("<ReqCompleted(aReqHandle,iCurrentError); return KErrNone; } @@ -248,7 +254,7 @@ * @return TInt Standard error value. */ { - LOGSS1(">>CSimSignalStrength::NotifySignalStrengthChange"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGE_1, ">>CSimSignalStrength::NotifySignalStrengthChange"); TPckg* ssPckg=(TPckg*)aPckg1; TInt32& ss=(*ssPckg)(); TPckg* ssbPckg=(TPckg*)aPckg2; @@ -275,12 +281,12 @@ { if(iSSChangeNotificationPending) { - LOGSS1("CSimSignalStrength::NotifySignalStrengthChange has been cancelled"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGECANCEL_1, "CSimSignalStrength::NotifySignalStrengthChange has been cancelled"); iSSChangeNotificationPending=EFalse; iPhone->ReqCompleted(iSSChangeNotificationReqHandle,KErrCancel); } else - LOGSS1("CSimSignalStrength::NotifySignalStrengthChange was not outstanding and hasn't been cancelled"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGECANCEL_2, "CSimSignalStrength::NotifySignalStrengthChange was not outstanding and hasn't been cancelled"); } void CSimSignalStrength::TimerCallBack(TInt /*aId*/) @@ -308,7 +314,7 @@ iSSChangeNotificationPending=EFalse; *iSSChangeNotificationSSLevel=iCurrentLevel; *iSSChangeNotificationSSBarLevel=iCurrentBar; - LOGSS3("<ReqCompleted(iSSChangeNotificationReqHandle,iCurrentError); } iTimer->Start(iSignalStrengthInfo->At(iSSIndex).iDuration,this); @@ -331,7 +337,7 @@ */ void CSimSignalStrength::PubSubCallback(TInt aNewVal) { - LOGSS2("CSimSignalStrength::SignalStrengthChangeCallBack newVal=%d", aNewVal); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_PUBSUBCALLBACK_1, "CSimSignalStrength::SignalStrengthChangeCallBack newVal=%d", aNewVal); if (iCurrentBar == aNewVal) { return; @@ -342,7 +348,7 @@ iSSChangeNotificationPending=EFalse; *iSSChangeNotificationSSLevel=iCurrentLevel; *iSSChangeNotificationSSBarLevel=iCurrentBar; - LOGSS3("<ReqCompleted(iSSChangeNotificationReqHandle,iCurrentError); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimSmsStore.cpp --- a/telephonyserverplugins/simtsy/src/CSimSmsStore.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimSmsStore.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2003-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" @@ -19,12 +19,18 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimSmsStoreTraces.h" +#endif + #include #include #include #include "CSimSmsStore.h" #include "csimsmsmess.h" -#include "Simlog.h" #include "CSimTsyMode.h" const TInt KSmsStoreGranularity=2; @@ -126,7 +132,7 @@ iSmsMaxNumSlots=aMaxNumSlots; iSmsStoreName.Copy(aName); iSmsReadAll=new(ELeave) CArrayPtrFlat(KSmsStoreGranularity); - LOGSMS1("Starting to parse SMS Store config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_CONSTRUCTL_1, "Starting to parse SMS Store config parameters..."); iSmsIndividualPause=CfgFileSection()->ItemValue(KSmsStoreIndividualReqPause,KDefaultSmsStoreIndividualReqPause); iSmsBatchPause=CfgFileSection()->ItemValue(KSmsStoreBatchReqPause,KDefaultSmsStoreBatchReqPause); @@ -138,7 +144,7 @@ TInt ret0=CTestConfig::GetElement(item0->Value(),KStdDelimiter,0,value0); if(ret0!=KErrNone) { - LOGPARSERR("value0",ret0,0,&KSmsPhoneStoreCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element VALUE0 returned %d (element no. %d) from tag %s.",ret0,0,KSmsPhoneStoreCaps); iSmsStoreCaps=KDefaultSmsPhoneStoreCaps+KDefaultSmsOnlySmsCaps; } else @@ -155,7 +161,7 @@ iSmsStoreCaps=KDefaultSmsPhoneStoreCaps+KDefaultSmsOnlySmsCaps; - LOGSMS1("...Finished parsing SMS Store config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_CONSTRUCTL_3, "...Finished parsing SMS Store config parameters"); iTimer=CSimTimer::NewL(iSmsMessaging->iPhone); iIncomingTimer=CSimTimer::NewL(iSmsMessaging->iPhone); } @@ -170,7 +176,7 @@ * "SmsStoreEntry = , , , " */ { - LOGSMS1("Starting reading SMS Store entries..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_1, "Starting reading SMS Store entries..."); TInt count=CfgFileSection()->ItemCount(KSmsStoreEntry); const CTestConfigItem* item=NULL; TInt ret=KErrNone; @@ -185,7 +191,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,storeName); if(ret!=KErrNone) { - LOGPARSERR("storeName",ret,0,&KSmsStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_2, "WARNING - CONFIGURATION FILE PARSING - Reading element STORENAME returned %d (element no. %d) from tag %s.",ret,0,KSmsStoreEntry); continue; } if(storeName.MatchF(iSmsStoreName)!=0) @@ -196,21 +202,21 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,index); if((ret!=KErrNone)||(index>=iSmsMaxNumSlots)) { - LOGPARSERR("index",ret,1,&KSmsStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_3, "WARNING - CONFIGURATION FILE PARSING - Reading element INDEX returned %d (element no. %d) from tag %s.",ret,1,KSmsStoreEntry); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,stat); if(ret!=KErrNone) { - LOGPARSERR("stat",ret,2,&KSmsStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_4, "WARNING - CONFIGURATION FILE PARSING - Reading element STAT returned %d (element no. %d) from tag %s",ret,2,KSmsStoreEntry); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,pdu); if(ret!=KErrNone) { - LOGPARSERR("pdu",ret,3,&KSmsStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_5, "WARNING - CONFIGURATION FILE PARSING - Reading element PDU returned %d (element no. %d) from tag %s.",ret,3,KSmsStoreEntry); continue; } @@ -218,7 +224,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,sca); if(ret!=KErrNone) { - LOGPARSERR("sca",ret,4,&KSmsStoreEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_6, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,4,KSmsStoreEntry); continue; } iGsmSmsStoreEntries[index].iIndex=index; @@ -227,7 +233,7 @@ RecordSca(sca, index); } - LOGSMS1("...Finished reading SMS Store entries"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_7, "...Finished reading SMS Store entries"); } @@ -268,7 +274,7 @@ delete iIncomingTimer; } -#ifdef _DEBUG +#ifdef OST_TRACE_COMPILER_IN_USE void CSimSmsStore::LogRequest(TBool aEntering, TInt aIpc, TInt aError) #else void CSimSmsStore::LogRequest(TBool aEntering, TInt aIpc, TInt /*aError*/) @@ -324,11 +330,11 @@ if (aEntering!=EFalse) { - LOGSMS3(">>%d,CSimSmsStore::%S",aIpc, &ipcBuf ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_LOGREQUEST_1, ">>%d,CSimSmsStore::%s",aIpc, ipcBuf ); } else - { - LOGSMS4("<<%d,CSimSmsStore::%S with error %d",aIpc, &ipcBuf, aError); + { + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_LOGREQUEST_2, "<<%d,CSimSmsStore::%s with error %d",aIpc, ipcBuf, aError); } } @@ -1177,7 +1183,7 @@ * @return CTestConfigSection a pointer to the configuration file data section */ { - LOGSMS1(">>CSimSmsStore::CfgFileSection"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSSTORE_CFGFILESECTION_1, ">>CSimSmsStore::CfgFileSection"); return iSmsMessaging->CfgFileSection(); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimUsimR6.cpp --- a/telephonyserverplugins/simtsy/src/CSimUsimR6.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimUsimR6.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -19,12 +19,18 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimUsimR6Traces.h" +#endif + #include #include #include #include #include "CSimPhone.h" -#include "Simlog.h" #include "CSimPubSubChange.h" #include "CSimTsyMode.h" #include @@ -77,7 +83,7 @@ * */ { - LOGMISC1("CSimUsimR6: Entered ConstructL()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_1, "CSimUsimR6: Entered ConstructL()"); iVoiceMailIds=new(ELeave) CArrayFixFlat(KUsimGranularity); iMessageWaiting=new(ELeave) CArrayFixFlat(KUsimGranularity); @@ -127,31 +133,31 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,voice); if(ret!=KErrNone) { - LOGPARSERR("voice",ret,0,&KUsimMailBoxIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element VOICE returned %d (element no. %d) from tag %s.",ret,0,KUsimMailBoxIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,data); if(ret!=KErrNone) { - LOGPARSERR("data",ret,1,&KUsimMailBoxIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element DATA returned %d (element no. %d) from tag %s.",ret,1,KUsimMailBoxIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,fax); if(ret!=KErrNone) { - LOGPARSERR("fax",ret,2,&KUsimMailBoxIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element FAX returned %d (element no. %d) from tag %s.",ret,2,KUsimMailBoxIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,other); if(ret!=KErrNone) { - LOGPARSERR("other",ret,3,&KUsimMailBoxIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element OTHER returned %d (element no. %d) from tag %s.",ret,3,KUsimMailBoxIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,video); if(ret!=KErrNone) { - LOGPARSERR("video",ret,4,&KUsimMailBoxIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element VIDEO returned %d (element no. %d) from tag %s.",ret,4,KUsimMailBoxIdInfo); continue; } RMobilePhone::TMobilePhoneVoicemailIdsV8 mailboxIdInfo; @@ -175,49 +181,49 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,displayStatus); if(ret!=KErrNone) { - LOGPARSERR("displayStatus",ret,0,&KUsimMessageWaitingIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element DISPLAYSTATUS returned %d (element no. %d) from tag %s.",ret,0,KUsimMessageWaitingIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,voiceMsgs); if(ret!=KErrNone) { - LOGPARSERR("voiceMsgs",ret,1,&KUsimMessageWaitingIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element VOICEMSGS returned %d (element no. %d) from tag %s.",ret,1,KUsimMessageWaitingIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,auxVoiceMsgs); if(ret!=KErrNone) { - LOGPARSERR("auxVoiceMsgs",ret,2,&KUsimMessageWaitingIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element AUXVOICEMSGS returned %d (element no. %d) from tag %s.",ret,2,KUsimMessageWaitingIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,dataMsgs); if(ret!=KErrNone) { - LOGPARSERR("dataMsgs",ret,3,&KUsimMessageWaitingIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element DATAMSGS returned %d (element no. %d) from tag %s.",ret,3,KUsimMessageWaitingIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,faxMsgs); if(ret!=KErrNone) { - LOGPARSERR("faxMsgs",ret,4,&KUsimMessageWaitingIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element FAXMSGS returned %d (element no. %d) from tag %s.",ret,4,KUsimMessageWaitingIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,emailMsgs); if(ret!=KErrNone) { - LOGPARSERR("emailMsgs",ret,5,&KUsimMessageWaitingIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element EMAILMSGS returned %d (element no. %d) from tag %s.",ret,5,KUsimMessageWaitingIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,otherMsgs); if(ret!=KErrNone) { - LOGPARSERR("otherMsgs",ret,6,&KUsimMessageWaitingIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element OTHERMSGS returned %d (element no. %d) from tag %s.",ret,6,KUsimMessageWaitingIdInfo); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,videoMsgs); if(ret!=KErrNone) { - LOGPARSERR("longName",ret,7,&KUsimMessageWaitingIdInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element LONGNAME returned %d (element no. %d) from tag %s.",ret,7,KUsimMessageWaitingIdInfo); continue; } RMobilePhone::TMobilePhoneMessageWaitingV8 messageWaiting; @@ -246,7 +252,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,FieldsUsed); if(ret!=KErrNone) { - LOGPARSERR("Fields Used",ret,0,&KUsimWlanDataInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element FIELDS USED returned %d (element no. %d) from tag %s.",ret,0,KUsimWlanDataInfo); continue; } else @@ -259,7 +265,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,Pseudonym); if(ret!=KErrNone) { - LOGPARSERR("Pseudonym",ret,1,&KUsimWlanDataInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element PSEUDONYM returned %d (element no. %d) from tag %s.",ret,1,KUsimWlanDataInfo); continue; } else @@ -269,7 +275,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,ReauthenticationId); if(ret!=KErrNone) { - LOGPARSERR("ReauthenticationId",ret,2,&KUsimWlanDataInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_17, "WARNING - CONFIGURATION FILE PARSING - Reading element REAUTHENTICATIONID returned %d (element no. %d) from tag %s.",ret,2,KUsimWlanDataInfo); continue; } else @@ -279,7 +285,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,MasterKey); if(ret!=KErrNone) { - LOGPARSERR("MasterKey",ret,3,&KUsimWlanDataInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_18, "WARNING - CONFIGURATION FILE PARSING - Reading element MASTERKEY returned %d (element no. %d) from tag %s.",ret,3,KUsimWlanDataInfo); continue; } else @@ -289,7 +295,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,Counter); if(ret!=KErrNone) { - LOGPARSERR("Counter",ret,4,&KUsimWlanDataInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_19, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNTER returned %d (element no. %d) from tag %s.",ret,4,KUsimWlanDataInfo); continue; } else @@ -313,7 +319,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,wlanSidBuf); if(ret!=KErrNone) { - LOGPARSERR("Wlan Sid Buffer",ret,0,&KUsimWlanSidInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_20, "WARNING - CONFIGURATION FILE PARSING - Reading element WLAN SID BUFFER returned %d (element no. %d) from tag %s.",ret,0,KUsimWlanSidInfo); continue; } else @@ -323,7 +329,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,userDef); if(ret!=KErrNone) { - LOGPARSERR("User Defined",ret,1,&KUsimWlanSidInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_21, "WARNING - CONFIGURATION FILE PARSING - Reading element USER DEFINED returned %d (element no. %d) from tag %s.",ret,1,KUsimWlanSidInfo); continue; } else @@ -347,7 +353,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,accessId); if(ret!=KErrNone) { - LOGPARSERR("Access Id",ret,0,&KUsimPreferredNetworksInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_22, "WARNING - CONFIGURATION FILE PARSING - Reading element ACCESS ID returned %d (element no. %d) from tag %s.",ret,0,KUsimPreferredNetworksInfo); continue; } else @@ -360,7 +366,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,userDef); if(ret!=KErrNone) { - LOGPARSERR("User Defined",ret,1,&KUsimPreferredNetworksInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_23, "WARNING - CONFIGURATION FILE PARSING - Reading element USER DEFINED returned %d (element no. %d) from tag %s.",ret,1,KUsimPreferredNetworksInfo); continue; } else @@ -370,7 +376,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,countryCode); if(ret!=KErrNone) { - LOGPARSERR("Country Code",ret,1,&KUsimPreferredNetworksInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_24, "WARNING - CONFIGURATION FILE PARSING - Reading element COUNTRY CODE returned %d (element no. %d) from tag %s.",ret,1,KUsimPreferredNetworksInfo); continue; } else @@ -380,7 +386,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,networkId); if(ret!=KErrNone) { - LOGPARSERR("Network Id",ret,1,&KUsimPreferredNetworksInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_25, "WARNING - CONFIGURATION FILE PARSING - Reading element NETWORK ID returned %d (element no. %d) from tag %s.",ret,1,KUsimPreferredNetworksInfo); continue; } else @@ -390,7 +396,7 @@ iPreferredNetworks->AppendL(networkEntry); } - LOGPHONE1("Starting to Parse GBA Authentication Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_26, "Starting to Parse GBA Authentication Info"); count = CfgFile()->ItemCount(KGBAAuthInfo); TGBAAuthInfo authInfo; @@ -411,7 +417,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, AUTN); if(ret != KErrNone) { - LOGPARSERR("AUTN",ret,0,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_27, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTN returned %d (element no. %d) from tag %s.",ret,0,KGBAAuthInfo); continue; } else @@ -422,7 +428,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, RAND); if(ret != KErrNone) { - LOGPARSERR("RAND",ret,1,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_28, "WARNING - CONFIGURATION FILE PARSING - Reading element RAND returned %d (element no. %d) from tag %s.",ret,1,KGBAAuthInfo); continue; } else @@ -433,7 +439,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, appId); if(ret != KErrNone) { - LOGPARSERR("APPID",ret,2,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_29, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.",ret,2,KGBAAuthInfo); continue; } else @@ -444,7 +450,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, RES); if(ret != KErrNone) { - LOGPARSERR("RES",ret,3,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_30, "WARNING - CONFIGURATION FILE PARSING - Reading element RES returned %d (element no. %d) from tag %s.",ret,3,KGBAAuthInfo); continue; } else @@ -455,7 +461,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 4, AUTS); if(ret != KErrNone) { - LOGPARSERR("AUTS",ret,4,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_31, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTS returned %d (element no. %d) from tag %s.",ret,4,KGBAAuthInfo); continue; } else @@ -466,7 +472,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 5, NAFID); if(ret != KErrNone) { - LOGPARSERR("NAFID",ret,5,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_32, "WARNING - CONFIGURATION FILE PARSING - Reading element NAFID returned %d (element no. %d) from tag %s.",ret,5,KGBAAuthInfo); continue; } else @@ -477,7 +483,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 6, IMPI); if(ret != KErrNone) { - LOGPARSERR("IMPI",ret,6,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_33, "WARNING - CONFIGURATION FILE PARSING - Reading element IMPI returned %d (element no. %d) from tag %s.",ret,6,KGBAAuthInfo); continue; } else @@ -488,7 +494,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 7, KSExtNaf); if(ret != KErrNone) { - LOGPARSERR("KSExtNaf",ret,7,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_34, "WARNING - CONFIGURATION FILE PARSING - Reading element KSEXTNAF returned %d (element no. %d) from tag %s.",ret,7,KGBAAuthInfo); continue; } else @@ -499,7 +505,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 8, BtID); if(ret != KErrNone) { - LOGPARSERR("BtID",ret,8,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_35, "WARNING - CONFIGURATION FILE PARSING - Reading element BTID returned %d (element no. %d) from tag %s.",ret,8,KGBAAuthInfo); continue; } else @@ -510,7 +516,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 9, KeyLifeTime); if(ret != KErrNone) { - LOGPARSERR("KeyLifeTime",ret,9,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_36, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYLIFETIME returned %d (element no. %d) from tag %s.",ret,9,KGBAAuthInfo); continue; } else @@ -521,7 +527,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 10, OtherApplnBusy); if(ret != KErrNone) { - LOGPARSERR("OtherApplnBusy",ret,10,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_37, "WARNING - CONFIGURATION FILE PARSING - Reading element OTHERAPPLNBUSY returned %d (element no. %d) from tag %s.",ret,10,KGBAAuthInfo); continue; } else @@ -532,7 +538,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 11, applnActive); if(ret != KErrNone) { - LOGPARSERR("applnActive",ret,11,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_38, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLNACTIVE returned %d (element no. %d) from tag %s.",ret,11,KGBAAuthInfo); continue; } else @@ -543,7 +549,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 12, authErr); if(ret != KErrNone) { - LOGPARSERR("authErr",ret,12,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_39, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.",ret,12,KGBAAuthInfo); continue; } else @@ -553,7 +559,7 @@ iGBAAuthInfoList->AppendL(authInfo); CleanupStack::Pop(item); } // end FOR Loop - LOGPHONE1("Starting to Parse GBA 2 Phase Retrieval list information"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_40, "Starting to Parse GBA 2 Phase Retrieval list information"); count = CfgFile()->ItemCount(KGBAListInfo); RMobilePhone::TGbaNafEntryV8 entry; for(index = 0; index < count; index++) @@ -571,7 +577,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, NafId); if(ret != KErrNone) { - LOGPARSERR("NafID",ret,0,&KGBAListInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_41, "WARNING - CONFIGURATION FILE PARSING - Reading element NAFID returned %d (element no. %d) from tag %s.",ret,0,KGBAListInfo); continue; } else @@ -583,7 +589,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, Btid); if(ret != KErrNone) { - LOGPARSERR("BTID",ret,1,&KGBAListInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_42, "WARNING - CONFIGURATION FILE PARSING - Reading element BTID returned %d (element no. %d) from tag %s.",ret,1,KGBAListInfo); continue; } else @@ -594,7 +600,7 @@ iGbaNafList->AddEntryL(entry); CleanupStack::Pop(item); } - LOGPHONE1("Starting to Parse MBMS related config information"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_43, "Starting to Parse MBMS related config information"); count = CfgFile()->ItemCount(KMBMSInfo); TMBMSInfo tMbmsInfo; for(index = 0; index < count; index++) @@ -616,7 +622,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, iMikey); if(ret != KErrNone) { - LOGPARSERR("iMikey",ret,0,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_44, "WARNING - CONFIGURATION FILE PARSING - Reading element IMIKEY returned %d (element no. %d) from tag %s.",ret,0,KMBMSInfo); continue; } else @@ -628,7 +634,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, oMikey); if(ret != KErrNone) { - LOGPARSERR("oMikey",ret,1,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_45, "WARNING - CONFIGURATION FILE PARSING - Reading element OMIKEY returned %d (element no. %d) from tag %s.",ret,1,KMBMSInfo); continue; } else @@ -640,7 +646,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, mtk); if(ret != KErrNone) { - LOGPARSERR("MTK",ret,2,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_46, "WARNING - CONFIGURATION FILE PARSING - Reading element MTK returned %d (element no. %d) from tag %s.",ret,2,KMBMSInfo); continue; } else @@ -652,7 +658,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, saltKey); if(ret != KErrNone) { - LOGPARSERR("saltKey",ret,3,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_47, "WARNING - CONFIGURATION FILE PARSING - Reading element SALTKEY returned %d (element no. %d) from tag %s.",ret,3,KMBMSInfo); continue; } else @@ -664,7 +670,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 4, keyDmn ); if(ret != KErrNone) { - LOGPARSERR("keyDmn ",ret,4,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_48, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYDMN returned %d (element no. %d) from tag %s.",ret,4,KMBMSInfo); continue; } else @@ -676,7 +682,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 5, MskIdgrp); if(ret != KErrNone) { - LOGPARSERR("MskIdgrp",ret,5,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_49, "WARNING - CONFIGURATION FILE PARSING - Reading element MSKIDGRP returned %d (element no. %d) from tag %s.",ret,5,KMBMSInfo); continue; } else @@ -688,7 +694,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 6, MukId ); if(ret != KErrNone) { - LOGPARSERR("iMukIdTlv ",ret,6,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_50, "WARNING - CONFIGURATION FILE PARSING - Reading element IMUKIDTLV returned %d (element no. %d) from tag %s.",ret,6,KMBMSInfo); continue; } else @@ -700,7 +706,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 7, MukIdi); if(ret != KErrNone) { - LOGPARSERR("MukIdi",ret,7,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_51, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKIDI returned %d (element no. %d) from tag %s.",ret,7,KMBMSInfo); continue; } else @@ -712,7 +718,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 8, MukIdr ); if(ret != KErrNone) { - LOGPARSERR("MukIdr ",ret,8,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_52, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKIDR returned %d (element no. %d) from tag %s.",ret,8,KMBMSInfo); continue; } else @@ -724,7 +730,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 9, MukTimeStamp ); if(ret != KErrNone) { - LOGPARSERR("iMikey",ret,9,&KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_53, "WARNING - CONFIGURATION FILE PARSING - Reading element IMIKEY returned %d (element no. %d) from tag %s.",ret,9,KMBMSInfo); continue; } else @@ -736,7 +742,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 10, appId); if ( ret != KErrNone) { - LOGPARSERR ("APPID", ret, 10, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_54, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.", ret, 10, KMBMSInfo); continue; } else @@ -748,7 +754,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 11,KSIntNaf); if ( ret != KErrNone) { - LOGPARSERR ("KSIntNaf", ret, 11, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_55, "WARNING - CONFIGURATION FILE PARSING - Reading element KSINTNAF returned %d (element no. %d) from tag %s.", ret, 11, KMBMSInfo); continue; } else @@ -760,7 +766,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 12,applnActive); if ( ret != KErrNone) { - LOGPARSERR ("applnActive", ret, 12, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_56, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLNACTIVE returned %d (element no. %d) from tag %s.", ret, 12, KMBMSInfo); continue; } else @@ -772,7 +778,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 13,authErr); if ( ret != KErrNone) { - LOGPARSERR ("authErr", ret, 13, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_57, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.", ret, 13, KMBMSInfo); continue; } else @@ -784,7 +790,7 @@ CleanupStack::Pop(item); } - LOGPHONE1("Starting to Parse MBMS 2 Phase Retrieval list information"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_58, "Starting to Parse MBMS 2 Phase Retrieval list information"); count = CfgFile()->ItemCount(KMBMSListInfo); RMobilePhone::TMskEntryV8 mskEntry; for(index = 0; index < count; index++) @@ -802,7 +808,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, MskId); if(ret != KErrNone) { - LOGPARSERR("MskId",ret,0,&KMBMSListInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_59, "WARNING - CONFIGURATION FILE PARSING - Reading element MSKID returned %d (element no. %d) from tag %s.",ret,0,KMBMSListInfo); continue; } else @@ -814,7 +820,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, KeyDomain); if(ret != KErrNone) { - LOGPARSERR("KeyDomain",ret,1,&KMBMSListInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_60, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYDOMAIN returned %d (element no. %d) from tag %s.",ret,1,KMBMSListInfo); continue; } else @@ -827,7 +833,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, TimeStamp); if(ret != KErrNone) { - LOGPARSERR("TimeStampCounter",ret,2,&KMBMSListInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_CONSTRUCTL_61, "WARNING - CONFIGURATION FILE PARSING - Reading element TIMESTAMPCOUNTER returned %d (element no. %d) from tag %s.",ret,2,KMBMSListInfo); continue; } else @@ -854,7 +860,7 @@ * */ { - LOGMISC1("CSimUsimR6: Entered destructor"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_DTOR_1, "CSimUsimR6: Entered destructor"); if(iTimer) { delete iTimer; @@ -925,7 +931,7 @@ { delete iMbmsMskList; } - LOGMISC1("CSimUsimR6: Leaving destructor"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_DTOR_2, "CSimUsimR6: Leaving destructor"); } const CTestConfigSection* CSimUsimR6::CfgFile() @@ -1157,7 +1163,7 @@ iGetAuthParams.iNotifyPending = EFalse; } iTimer->Start (RandTime (), this); - LOGMISC1("<ReqCompleted(aTsyReqHandle,KErrNone); // Remove the read all attempt from iGetWlanSIDsData CListReadAllAttempt* read=NULL; @@ -1833,7 +1839,7 @@ } } iPhone->ReqCompleted(aTsyReqHandle,KErrCancel); - LOGCALL1("CSimPhone::GetPreferredWlanSIDsCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_GETPREFERREDWLANSIDSCANCEL_2, "CSimPhone::GetPreferredWlanSIDsCancel"); return KErrNone; } @@ -1958,7 +1964,7 @@ * @param aTsyReqHandle handle to the request */ { - LOGCALL1("CSimPhone::GetPreferredNetworksCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_GETPREFERREDNETWORKSCANCEL_1, "CSimPhone::GetPreferredNetworksCancel"); iPhone->ReqCompleted(aTsyReqHandle,KErrNone); CListReadAllAttempt* read=NULL; for (TInt i=0; iCount(); ++i) @@ -1972,7 +1978,7 @@ } } iPhone->ReqCompleted(aTsyReqHandle,KErrCancel); - LOGCALL1("CSimPhone::GetPreferredNetworksCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_GETPREFERREDNETWORKSCANCEL_2, "CSimPhone::GetPreferredNetworksCancel"); return KErrNone; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp --- a/telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -21,12 +21,18 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSimVoiceCallTraces.h" +#endif + #include #include "CSimVoiceCall.h" #include "CSimPhone.h" #include "CSimDtmf.h" -#include "Simlog.h" #include "CSimTsyMode.h" CSimVoiceCall* CSimVoiceCall::NewL(CSimLine* aLine,const TDesC& aName, CSimPhone* aPhone) @@ -63,7 +69,7 @@ * @param aName name of the voice call to be constructed */ { - LOGVOICE1("Starting to parse Voice Call config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_1, "Starting to parse Voice Call config parameters..."); iCaps=Caps(); iDiallingPause=iLine->CfgFile()->ItemValue(KDiallingPauseDuration,KDefaultDiallingPauseDuration); iConnectingPause=iLine->CfgFile()->ItemValue(KConnectingPauseDuration,KDefaultConnectingPauseDuration); @@ -85,17 +91,17 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,delay); if(ret!=KErrNone) { - LOGPARSERR("delay",ret,0,&KNotifyRemotePartyInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element DELAY returned %d (element no. %d) from tag %s.",ret,0,KNotifyRemotePartyInfo); } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,callingname); if(ret!=KErrNone) { - LOGPARSERR("callingname",ret,1,&KNotifyRemotePartyInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element CALLINGNAME returned %d (element no. %d) from tag %s.",ret,1,KNotifyRemotePartyInfo); } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,remotenumber); if(ret!=KErrNone) { - LOGPARSERR("remotenumber",ret,2,&KNotifyRemotePartyInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element REMOTENUMBER returned %d (element no. %d) from tag %s.",ret,2,KNotifyRemotePartyInfo); } iNotifyRemotePartyInfoTimer->iDelay = delay; @@ -111,7 +117,7 @@ iNotifyRemotePartyInfoTimer->iRemotePartyInfoV1.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown; } - LOGVOICE1("...Finished parsing Voice Call config parameters..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_CONSTRUCTL_5, "...Finished parsing Voice Call config parameters..."); } CSimVoiceCall::~CSimVoiceCall() @@ -280,7 +286,7 @@ * @return KErrNone */ { - LOGVOICE1(">>CSimVoiceCall::Dial"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_1, ">>CSimVoiceCall::Dial"); // Note: The telephone number and call parameters should be validated against config file // values here. @@ -292,14 +298,14 @@ if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1) { - LOGVOICE1("<>CSimVoiceCall::DialCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALCANCEL_1, ">>CSimVoiceCall::DialCancel"); switch(iState) { case RMobileCall::EStatusIdle: @@ -342,7 +348,7 @@ default: break; } - LOGVOICE1("<>CSimVoiceCall::DialISV"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_1, ">>CSimVoiceCall::DialISV"); // Note: The telephone number and call parameters should be validated against config file // values here. @@ -368,14 +374,14 @@ if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1) { - LOGVOICE1("<>CSimVoiceCall::DialISVCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISVCANCEL_1, ">>CSimVoiceCall::DialISVCancel"); switch(iState) { case RMobileCall::EStatusIdle: @@ -418,7 +424,7 @@ default: break; } - LOGVOICE1("<>CSimVoiceCall::AnswerIncomingCall 0x%08x, state %d entry ",this,iState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_1, ">>CSimVoiceCall::AnswerIncomingCall 0x%08x, state %d entry ",(TUint)this,iState); //see where the answer request has orignated from if(aCallParams) @@ -443,7 +449,7 @@ if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1) { - LOGVOICE1("<>CSimVoiceCall::AnswerIncomingCallCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_1, ">>CSimVoiceCall::AnswerIncomingCallCancel"); if(iAnswerIncomingCall.iNotifyPending) { iAnswerIncomingCall.iNotifyPending=EFalse; iLine->ResetAutoAnswerCallObject(this); ReqCompleted(iAnswerIncomingCall.iNotifyHandle,KErrCancel); } - LOGVOICE1("<>CSimVoiceCall::AnswerIncomingCallISV 0x%08x, state %d entry ",this,iState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_1, ">>CSimVoiceCall::AnswerIncomingCallISV 0x%08x, state %d entry ",(TUint)this,iState); //see where the answer request has orignated from if(aCallParams) @@ -514,7 +520,7 @@ if(callparams.ExtensionId() == RMobileCall::KETel3rdPartyCallParamsV1) { - LOGVOICE1("<>CSimVoiceCall::AnswerIncomingCallISVCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_1, ">>CSimVoiceCall::AnswerIncomingCallISVCancel"); if(iAnswerIncomingCall.iNotifyPending) { iAnswerIncomingCall.iNotifyPending=EFalse; iLine->ResetAutoAnswerCallObject(this); ReqCompleted(iAnswerIncomingCall.iNotifyHandle,KErrCancel); } - LOGVOICE1("<>CSimVoiceCall::HangUp"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUP_1, ">>CSimVoiceCall::HangUp"); iHangUpRequestHandle=aTsyReqHandle; TInt ret=ActionEvent(ECallEventHangUp,KErrNone); if(ret!=KErrNone) ReqCompleted(aTsyReqHandle,ret); - LOGVOICE1("<>CSimVoiceCall::HangUpCancel"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUPCANCEL_1, ">>CSimVoiceCall::HangUpCancel"); switch(iState) { case RMobileCall::EStatusIdle: @@ -629,7 +635,7 @@ default: break; } - LOGVOICE1("<>CSimVoiceCall::ActionEvent 0x%08x %d",this,iState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_1, ">>CSimVoiceCall::ActionEvent 0x%08x %d",(TUint)this,iState); switch(aEvent) { case ECallEventDial: - LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventDial]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_2, ">>CSimVoiceCall::ActionEvent = [ECallEventDial]"); if(iState==RMobileCall::EStatusIdle) { TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusDialling,EFalse,EFalse)); @@ -873,7 +879,7 @@ case ECallEventHangUp: { - LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventHangUp]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_3, ">>CSimVoiceCall::ActionEvent = [ECallEventHangUp]"); switch(iState) { case RMobileCall::EStatusDialling: @@ -898,7 +904,7 @@ break; case ECallEventIncomingCall: - LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventIncomingCall]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_4, ">>CSimVoiceCall::ActionEvent = [ECallEventIncomingCall]"); if(iState==RMobileCall::EStatusIdle) { if(iAnswerIncomingCall.iNotifyPending) @@ -917,7 +923,7 @@ break; case ECallEventAnswerIncoming: - LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventAnswerIncoming]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_5, ">>CSimVoiceCall::ActionEvent = [ECallEventAnswerIncoming]"); if(iState==RMobileCall::EStatusRinging) { TRAP(ret, ret=ProcessAnswerIncomingCallL()); @@ -931,7 +937,7 @@ break; case ECallEventRemoteHangup: - LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventRemoteHangup]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_6, ">>CSimVoiceCall::ActionEvent = [ECallEventRemoteHangup]"); if(iState==RMobileCall::EStatusConnected) { TRAP(ret, ret=ProcessRemoteHangupL()); @@ -946,31 +952,31 @@ case ECallEventTimeOut: { - LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_7, ">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]"); switch(iState) { case RMobileCall::EStatusDialling: - LOGVOICE1(">>CSimVoiceCall::State = [EStatusDialling]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_8, ">>CSimVoiceCall::State = [EStatusDialling]"); TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnecting,EFalse,EFalse)); if(ret==KErrNone) iTimer->Start(iConnectingPause,this); return ret; case RMobileCall::EStatusConnecting: - LOGVOICE1(">>CSimVoiceCall::State = [EStatusConnecting]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_9, ">>CSimVoiceCall::State = [EStatusConnecting]"); TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,EFalse,EFalse)); UpdateRemotePartyInfoDirection(RMobileCall::EStatusConnecting); ReqCompleted(iDialRequestHandle,ret); return ret; case RMobileCall::EStatusDisconnecting: - LOGVOICE1(">>CSimVoiceCall::State = [EStatusDisconnecting]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_10, ">>CSimVoiceCall::State = [EStatusDisconnecting]"); TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusIdle,EFalse,EFalse)); ReqCompleted(iHangUpRequestHandle,ret); return ret; case RMobileCall::EStatusAnswering: - LOGVOICE1(">>CSimVoiceCall::State = [EStatusAnswering]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_11, ">>CSimVoiceCall::State = [EStatusAnswering]"); TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,EFalse,EFalse)); UpdateRemotePartyInfoDirection(RMobileCall::EStatusAnswering); ReqCompleted(iAnswerIncomingCall.iNotifyHandle,ret); @@ -982,7 +988,7 @@ } break; case ECallEventHold: - LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventHold]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_12, ">>CSimVoiceCall::ActionEvent = [ECallEventHold]"); __ASSERT_ALWAYS(iState==RMobileCall::EStatusConnected,SimPanic(EIllegalStateInconsistancy)); TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusHold,aOtherArgument == ECallEventSwap,EFalse)); if (ret == KErrNone) @@ -990,7 +996,7 @@ break; case ECallEventResume: - LOGVOICE1(">>CSimVoiceCall::ActionEvent = [ECallEventResume]"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ACTIONEVENT_13, ">>CSimVoiceCall::ActionEvent = [ECallEventResume]"); __ASSERT_ALWAYS(iState==RMobileCall::EStatusHold,SimPanic(EIllegalStateInconsistancy)); TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,aOtherArgument == ECallEventSwap,EFalse)); if (ret == KErrNone) @@ -1015,10 +1021,10 @@ * function for further processing. */ { - LOGVOICE1(">>CSimVoiceCall::TimerCallBack"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_TIMERCALLBACK_1, ">>CSimVoiceCall::TimerCallBack"); TInt ret=ActionEvent(ECallEventTimeOut,KErrNone); __ASSERT_ALWAYS(ret==KErrNone,SimPanic(ETimeOutEventActionFailed)); - LOGVOICE1("<>CSimVoiceCall::ProcessAnswerIncomingCall %d",iState,this); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_1, ">>CSimVoiceCall::ProcessAnswerIncomingCall %d , 0x%08x",iState,(TUint)this); TInt ret=ChangeStateL(RMobileCall::EStatusAnswering,EFalse,EFalse); if(ret!=KErrNone) return ret; iTimer->Start(iAnswerIncomingPause,this); iAnswerIncomingCall.iNotifyPending=EFalse; iLine->ResetAutoAnswerCallObject(this); - LOGVOICE1("<>CSimVoiceCall::ProcessRemoteHangupL %d",iState,this); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSREMOTEHANGUPL_1, ">>CSimVoiceCall::ProcessRemoteHangupL %d, 0x%08x",iState,(TUint)this); TInt ret=ChangeStateL(RMobileCall::EStatusDisconnecting,EFalse,EFalse); if(ret!=KErrNone) return ret; iTimer->Start(iRemoteHangupPause,this); iLine->ResetRemoteHangupCallObject(this); - LOGVOICE1("<>CSimVoiceLine::OpenNewObjectByNameL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_1, ">>CSimVoiceLine::OpenNewObjectByNameL"); TInt i; TInt count=iCalls->Count(); for(i=0;i>CSimVoiceLine::OpenNewObjectByNameL %s",&(iCalls->At(i)->iName)); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_2, ">>CSimVoiceLine::OpenNewObjectByNameL %S", iCalls->At(i)->iName); if(iCalls->At(i)->iName.MatchF(aName)==0) { iCalls->At(i)->Open(); @@ -122,7 +128,7 @@ } } - LOGVOICE1("<>CSimVoiceLine::CreateNewCallL 0x%08x",newCall); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICELINE_CREATENEWCALLL_1, ">>CSimVoiceLine::CreateNewCallL 0x%08x",newCall); CleanupStack::Pop(newCall); return newCall; } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/csimsmartcardauth.cpp --- a/telephonyserverplugins/simtsy/src/csimsmartcardauth.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/csimsmartcardauth.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -17,9 +17,15 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csimsmartcardauthTraces.h" +#endif + #include #include "CSimPhone.h" -#include "Simlog.h" #include "csimsmartcardauth.h" #include "utils.h" @@ -44,7 +50,7 @@ ParseAuthInfoL(); ParseGBAAuthInfoL(); ParseMBMSAuthInfoL(); - LOGPHONE1("CSimSmartCardAuth created"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_CONSTRUCTL_1, "CSimSmartCardAuth created"); } CSimSmartCardAuth::~CSimSmartCardAuth() @@ -60,13 +66,13 @@ iMBMSInfoList->Delete(0,iMBMSInfoList->Count()); delete iMBMSInfoList; } - LOGPHONE1("CSimSmartCardAuth destroyed"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_DTOR_1, "CSimSmartCardAuth destroyed"); } TInt CSimSmartCardAuth::GetScAuthenticationData(const TTsyReqHandle aTsyReqHandle, TDes8* aPckg1, const RMobilePhone::TAID* aAID) { - LOGPHONE1("CSimSmartCardAuth::GetScAuthenticationData called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_GETSCAUTHENTICATIONDATA_1, "CSimSmartCardAuth::GetScAuthenticationData called"); RMobilePhone::TSmartCardAuthenticateDataV6Pckg * authenticateDataPckgd =reinterpret_cast(aPckg1); @@ -440,7 +446,7 @@ TInt CSimSmartCardAuth::GetScAuthenticationDataCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimSmartCardAuth::GetScAuthenticationDataCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_GETSCAUTHENTICATIONDATACANCEL_1, "CSimSmartCardAuth::GetScAuthenticationDataCancel called"); iPhone->ReqCompleted(aTsyReqHandle, KErrCancel); return KErrNone; } @@ -455,11 +461,11 @@ */ void CSimSmartCardAuth::ParseAuthInfoL() { - LOGPHONE1("CSimSmartCardAuth::ParseAuthInfoL called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_1, "CSimSmartCardAuth::ParseAuthInfoL called"); CTestConfigItem* item = NULL; - LOGPHONE1("Starting to Parse Smart Card Authentication Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_2, "Starting to Parse Smart Card Authentication Info"); TInt count = CfgFile()->ItemCount(KScAuthInfo); TInt index; @@ -481,7 +487,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 8, appId); if(ret != KErrNone) { - LOGPARSERR("appId",ret,8,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.",ret,8,KScAuthInfo); _LIT8(emptyAID, ""); appId.Set(emptyAID); } @@ -490,11 +496,11 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 9, dataFrmt); if(ret != KErrNone) { - LOGPARSERR("dataFrmt",ret,9,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DATAFRMT returned %d (element no. %d) from tag %s.",ret,9,KScAuthInfo); } else if (dataFrmt >= EMaxConfigDataFormat) { - LOGPHONE1("WARNING IN CONFIGURATION FILE PARSING - Invalid format for SC Authenticate tag"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_5, "WARNING IN CONFIGURATION FILE PARSING - Invalid format for SC Authenticate tag"); dataFrmt = EConfigDataFormatAscii; } @@ -514,7 +520,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, AUTN); if(ret != KErrNone) { - LOGPARSERR("AUTN",ret,0,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTN returned %d (element no. %d) from tag %s.",ret,0,KScAuthInfo); continue; } else @@ -535,7 +541,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, RAND); if(ret != KErrNone) { - LOGPARSERR("RAND",ret,1,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element RAND returned %d (element no. %d) from tag %s.",ret,1,KScAuthInfo); continue; } else @@ -556,7 +562,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, RES); if(ret != KErrNone) { - LOGPARSERR("RES",ret,2,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element RES returned %d (element no. %d) from tag %s.",ret,2,KScAuthInfo); continue; } else @@ -577,7 +583,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, IK); if(ret != KErrNone) { - LOGPARSERR("IK",ret,3,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element IK returned %d (element no. %d) from tag %s.",ret,3,KScAuthInfo); continue; } else @@ -598,7 +604,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 4, CK); if(ret != KErrNone) { - LOGPARSERR("CK",ret,4,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element CK returned %d (element no. %d) from tag %s.",ret,4,KScAuthInfo); continue; } else @@ -619,7 +625,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 5, Kc); if(ret != KErrNone) { - LOGPARSERR("Kc",ret,5,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element KC returned %d (element no. %d) from tag %s.",ret,5,KScAuthInfo); continue; } else @@ -640,7 +646,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 6, AUTS); if(ret != KErrNone) { - LOGPARSERR("AUTS",ret,6,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTS returned %d (element no. %d) from tag %s.",ret,6,KScAuthInfo); continue; } else @@ -661,7 +667,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 7, authErr); if(ret != KErrNone) { - LOGPARSERR("authErr",ret,7,&KScAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEAUTHINFOL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.",ret,7,KScAuthInfo); continue; } else @@ -679,11 +685,11 @@ */ void CSimSmartCardAuth::ParseGBAAuthInfoL() { - LOGPHONE1("CSimSmartCardAuth::ParseGBAAuthInfoL called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_1, "CSimSmartCardAuth::ParseGBAAuthInfoL called"); CTestConfigItem* item = NULL; - LOGPHONE1("Starting to Parse GBA Authentication Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_2, "Starting to Parse GBA Authentication Info"); TInt count = CfgFile()->ItemCount(KGBAAuthInfo); TInt index; @@ -706,7 +712,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, AUTN); if(ret != KErrNone) { - LOGPARSERR("AUTN",ret,0,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTN returned %d (element no. %d) from tag %s.",ret,0,KGBAAuthInfo); continue; } else @@ -718,7 +724,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, RAND); if(ret != KErrNone) { - LOGPARSERR("RAND",ret,1,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element RAND returned %d (element no. %d) from tag %s.",ret,1,KGBAAuthInfo); continue; } else @@ -730,7 +736,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, appId); if(ret != KErrNone) { - LOGPARSERR("APPID",ret,2,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.",ret,2,KGBAAuthInfo); continue; } else @@ -742,7 +748,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, RES); if(ret != KErrNone) { - LOGPARSERR("RES",ret,3,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element RES returned %d (element no. %d) from tag %s.",ret,3,KGBAAuthInfo); continue; } else @@ -754,7 +760,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 4, AUTS); if(ret != KErrNone) { - LOGPARSERR("AUTS",ret,4,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTS returned %d (element no. %d) from tag %s.",ret,4,KGBAAuthInfo); continue; } else @@ -766,7 +772,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 5, NAFID); if(ret != KErrNone) { - LOGPARSERR("NAFID",ret,5,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element NAFID returned %d (element no. %d) from tag %s.",ret,5,KGBAAuthInfo); continue; } else @@ -778,7 +784,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 6, IMPI); if(ret != KErrNone) { - LOGPARSERR("IMPI",ret,6,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element IMPI returned %d (element no. %d) from tag %s.",ret,6,KGBAAuthInfo); continue; } else @@ -790,7 +796,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 7, KSExtNaf); if(ret != KErrNone) { - LOGPARSERR("KSExtNaf",ret,7,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element KSEXTNAF returned %d (element no. %d) from tag %s.",ret,7,KGBAAuthInfo); continue; } else @@ -802,7 +808,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 8, BtID); if(ret != KErrNone) { - LOGPARSERR("BtID",ret,8,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element BTID returned %d (element no. %d) from tag %s.",ret,8,KGBAAuthInfo); continue; } else @@ -814,7 +820,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 9, KeyLifeTime); if(ret != KErrNone) { - LOGPARSERR("KeyLifeTime",ret,9,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYLIFETIME returned %d (element no. %d) from tag %s.",ret,9,KGBAAuthInfo); continue; } else @@ -826,7 +832,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 10, OtherApplnBusy); if(ret != KErrNone) { - LOGPARSERR("OtherApplnBusy",ret,10,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element OTHERAPPLNBUSY returned %d (element no. %d) from tag %s.",ret,10,KGBAAuthInfo); continue; } else @@ -838,7 +844,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 11, applnActive); if(ret != KErrNone) { - LOGPARSERR("applnActive",ret,11,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLNACTIVE returned %d (element no. %d) from tag %s.",ret,11,KGBAAuthInfo); continue; } else @@ -850,7 +856,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 12, authErr); if(ret != KErrNone) { - LOGPARSERR("authErr",ret,12,&KGBAAuthInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.",ret,12,KGBAAuthInfo); continue; } else @@ -868,11 +874,11 @@ */ void CSimSmartCardAuth::ParseMBMSAuthInfoL() { - LOGPHONE1 ("CSimSmartCardAuth::ParseMBMSAuthInfoL called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_1, "CSimSmartCardAuth::ParseMBMSAuthInfoL called"); CTestConfigItem* item = NULL; - LOGPHONE1 ("Starting to Parse MBMS Authentication Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_2, "Starting to Parse MBMS Authentication Info"); TInt count = CfgFile()->ItemCount (KMBMSInfo); TMBMSInfo tMbmsInfo; @@ -896,7 +902,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 0, iMikey); if ( ret != KErrNone) { - LOGPARSERR ("iMikey", ret, 0, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element IMIKEY returned %d (element no. %d) from tag %s.", ret, 0, KMBMSInfo); continue; } else @@ -908,7 +914,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 1, oMikey); if ( ret != KErrNone) { - LOGPARSERR ("oMikey", ret, 1, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element OMIKEY returned %d (element no. %d) from tag %s.", ret, 1, KMBMSInfo); continue; } else @@ -920,7 +926,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 2, mtk); if ( ret != KErrNone) { - LOGPARSERR ("MTK", ret, 2, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element MTK returned %d (element no. %d) from tag %s.", ret, 2, KMBMSInfo); continue; } else @@ -933,7 +939,7 @@ saltKey); if ( ret != KErrNone) { - LOGPARSERR ("saltKey", ret, 3, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element SALTKEY returned %d (element no. %d) from tag %s.", ret, 3, KMBMSInfo); continue; } else @@ -945,7 +951,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 4, keyDmn); if ( ret != KErrNone) { - LOGPARSERR ("keyDmn ", ret, 4, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element KEYDMN returned %d (element no. %d) from tag %s.", ret, 4, KMBMSInfo); continue; } else @@ -958,7 +964,7 @@ MskIdgrp); if ( ret != KErrNone) { - LOGPARSERR ("MskIdgrp", ret, 5, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_8, "WARNING - CONFIGURATION FILE PARSING - Reading element MSKIDGRP returned %d (element no. %d) from tag %s.", ret, 5, KMBMSInfo); continue; } else @@ -970,7 +976,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 6, MukId); if ( ret != KErrNone) { - LOGPARSERR ("MukId ", ret, 6, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_9, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKID returned %d (element no. %d) from tag %s.", ret, 6, KMBMSInfo); continue; } else @@ -982,7 +988,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 7, MukIdi); if ( ret != KErrNone) { - LOGPARSERR ("MukIdi", ret, 7, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_10, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKIDI returned %d (element no. %d) from tag %s.", ret, 7, KMBMSInfo); continue; } else @@ -994,7 +1000,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 8, MukIdr); if ( ret != KErrNone) { - LOGPARSERR ("MukIdr ", ret, 8, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_11, "WARNING - CONFIGURATION FILE PARSING - Reading element MUKIDR returned %d (element no. %d) from tag %s.", ret, 8, KMBMSInfo); continue; } else @@ -1006,7 +1012,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 9,MukTimeStamp); if ( ret != KErrNone) { - LOGPARSERR ("iMikey", ret, 9, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_12, "WARNING - CONFIGURATION FILE PARSING - Reading element IMIKEY returned %d (element no. %d) from tag %s.", ret, 9, KMBMSInfo); continue; } else @@ -1018,7 +1024,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 10, appId); if ( ret != KErrNone) { - LOGPARSERR ("APPID", ret, 10, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_13, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.", ret, 10, KMBMSInfo); continue; } else @@ -1030,7 +1036,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 11,KSIntNaf); if ( ret != KErrNone) { - LOGPARSERR ("KSIntNaf", ret, 11, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_14, "WARNING - CONFIGURATION FILE PARSING - Reading element KSINTNAF returned %d (element no. %d) from tag %s.", ret, 11, KMBMSInfo); continue; } else @@ -1042,7 +1048,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 12,applnActive); if ( ret != KErrNone) { - LOGPARSERR ("applnActive", ret, 12, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_15, "WARNING - CONFIGURATION FILE PARSING - Reading element APPLNACTIVE returned %d (element no. %d) from tag %s.", ret, 12, KMBMSInfo); continue; } else @@ -1054,7 +1060,7 @@ ret = CTestConfig::GetElement (item->Value (), KStdDelimiter, 13,authErr); if ( ret != KErrNone) { - LOGPARSERR ("authErr", ret, 13, &KMBMSInfo); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_16, "WARNING - CONFIGURATION FILE PARSING - Reading element AUTHERR returned %d (element no. %d) from tag %s.", ret, 13, KMBMSInfo); continue; } else diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/csimsmartcardeap.cpp --- a/telephonyserverplugins/simtsy/src/csimsmartcardeap.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/csimsmartcardeap.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2006-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" @@ -19,9 +19,15 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csimsmartcardeapTraces.h" +#endif + #include #include "csimsmartcardeap.h" -#include "Simlog.h" #include "etelext.h" // CSimSmartCardEapManager implementation; related to CSimSmartCardEap // @@ -68,11 +74,11 @@ */ void CSimSmartCardEapManager::ConstructL() { - LOGPHONE1("CSimSmartCardEapManager second phase construction created"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_CONSTRUCTL_1, "CSimSmartCardEapManager second phase construction created"); ParseEapInfoL(); - LOGPHONE1("CSimSmartCardEapManager second phase construction completed"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_CONSTRUCTL_2, "CSimSmartCardEapManager second phase construction completed"); } /** @@ -80,7 +86,7 @@ */ CSimSmartCardEapManager::~CSimSmartCardEapManager() { - LOGPHONE1("CSimSmartCardEapManager destructing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_DTOR_1, "CSimSmartCardEapManager destructing"); for (TInt jj = iSubSessionObjs.Count()-1; jj >= 0; jj--) { @@ -91,7 +97,7 @@ ClearParsedData(); - LOGPHONE1("CSimSmartCardEapManager destructed"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_DTOR_2, "CSimSmartCardEapManager destructed"); } void CSimSmartCardEapManager::ClearParsedData() @@ -136,11 +142,11 @@ */ void CSimSmartCardEapManager::ParseEapInfoL() { - LOGPHONE1("CSimSmartCardEapManager::ParseEapInfoL called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_1, "CSimSmartCardEapManager::ParseEapInfoL called"); CTestConfigItem* item = NULL; - LOGPHONE1("Starting to Parse Smart Card EAP Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_2, "Starting to Parse Smart Card EAP Info"); TInt count = CfgFile()->ItemCount(KScEapProcedures); // Used in parsing to keep track of the nested items @@ -163,7 +169,7 @@ item = const_cast(CfgFile()->Item(KScEapProcedures, index)); if(item == NULL) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: SC EAP PROC INFO tag not read [%d]", index); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_3, "WARNING CONFIGURATION FILE PARSING: SC EAP PROC INFO tag not read [%d]", index); continue; } @@ -179,7 +185,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, appId); if(ret != KErrNone) { - LOGPARSERR("appId", ret,0,&KScEapProcedures); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element APPID returned %d (element no. %d) from tag %s.", ret,0,KScEapProcedures); continue; } else @@ -194,7 +200,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, eapType); if(ret != KErrNone) { - LOGPARSERR("eapType", ret,1,&KScEapProcedures); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element EAPTYPE returned %d (element no. %d) from tag %s.", ret,1,KScEapProcedures); continue; } else @@ -207,17 +213,17 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, numChallenges); if(ret != KErrNone) { - LOGPARSERR("numChallenges", ret,2,&KScEapProcedures); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element NUMCHALLENGES returned %d (element no. %d) from tag %s.", ret,2,KScEapProcedures); continue; } else if (numChallenges > (countChl - nestedChlTag)) { - LOGPHONE2("ERROR CONFIGURATION FILE PARSING: error SC EAP PROC INFO specifies more challenges than available [%d]", index); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_7, "ERROR CONFIGURATION FILE PARSING: error SC EAP PROC INFO specifies more challenges than available [%d]", index); continue; } else if (numChallenges < 0) { - LOGPHONE2("ERROR CONFIGURATION FILE PARSING: error SC EAP PROC INFO specifies -ve challenge number [%d]", index); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_8, "ERROR CONFIGURATION FILE PARSING: error SC EAP PROC INFO specifies -ve challenge number [%d]", index); continue; } @@ -225,11 +231,11 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 3, dataFrmt); if(ret != KErrNone) { - LOGPHONE2("CONFIGURATION FILE PARSING: SC EAP PROC INFO tag with no data format [%d]", index); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_9, "CONFIGURATION FILE PARSING: SC EAP PROC INFO tag with no data format [%d]", index); } else if (dataFrmt >= EMaxConfigDataFormat) { - LOGPHONE2("WARNING IN CONFIGURATION FILE PARSING - error wrong data format value SC EAP PROC INFO tag [%d] (ASCII format will be used)", index); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_10, "WARNING IN CONFIGURATION FILE PARSING - error wrong data format value SC EAP PROC INFO tag [%d] (ASCII format will be used)", index); dataFrmt = EConfigDataFormatAscii; } @@ -245,21 +251,21 @@ // parse delay and key if (item == NULL) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Key tag [%d]", nestedKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_11, "WARNING CONFIGURATION FILE PARSING: could not read EAP Key tag [%d]", nestedKeyTag-1); } else { ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr); if (ret != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Key tag's data [%d]", nestedKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_12, "WARNING CONFIGURATION FILE PARSING: could not read EAP Key tag's data [%d]", nestedKeyTag-1); } else { TRAPD(kAllocErr, startData = ptr.AllocL()); if (kAllocErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Key data [%d]", nestedKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_13, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Key data [%d]", nestedKeyTag-1); } else { @@ -276,7 +282,7 @@ TRAP(kAllocErr, procInfo.iEapKey = tempPtr.AllocL()); if (kAllocErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Key data copy [%d]", nestedKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_14, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Key data copy [%d]", nestedKeyTag-1); } delete startData; startData = NULL; @@ -286,7 +292,7 @@ } else { - LOGPHONE1("ERROR CONFIGURATION FILE PARSING: NO SC EAP KEY INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_15, "ERROR CONFIGURATION FILE PARSING: NO SC EAP KEY INFO TAG"); } // Get EMSK @@ -297,21 +303,21 @@ // parse key if (item == NULL) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Ext Key tag [%d]", nestedExtKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_16, "WARNING CONFIGURATION FILE PARSING: could not read EAP Ext Key tag [%d]", nestedExtKeyTag-1); } else { ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr); if (ret != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Ext Key tag's data [%d]", nestedExtKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_17, "WARNING CONFIGURATION FILE PARSING: could not read EAP Ext Key tag's data [%d]", nestedExtKeyTag-1); } else { TRAPD(kAllocErr, startData = ptr.AllocL()); if (kAllocErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Ext Key data [%d]", nestedExtKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_18, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Ext Key data [%d]", nestedExtKeyTag-1); } else { @@ -328,7 +334,7 @@ TRAP(kAllocErr, procInfo.iEapExtKey = tempPtr.AllocL()); if (kAllocErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Ext Key data copy [%d]", nestedExtKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_19, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Ext Key data copy [%d]", nestedExtKeyTag-1); } delete startData; startData = NULL; @@ -338,7 +344,7 @@ } else { - LOGPHONE1("ERROR CONFIGURATION FILE PARSING: NO SC EAP EXT KEY INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_20, "ERROR CONFIGURATION FILE PARSING: NO SC EAP EXT KEY INFO TAG"); } // Get Permanent Identity @@ -349,21 +355,21 @@ // parse id if (item == NULL) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP id tag [%d]", nestedIdTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_21, "WARNING CONFIGURATION FILE PARSING: could not read EAP id tag [%d]", nestedIdTag-1); } else { ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr); if (ret != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Id tag's data [%d]", nestedIdTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_22, "WARNING CONFIGURATION FILE PARSING: could not read EAP Id tag's data [%d]", nestedIdTag-1); } else { TRAPD(idAllocErr, startData = ptr.AllocL()); if (idAllocErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Id data [%d]", nestedIdTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_23, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Id data [%d]", nestedIdTag-1); } else { @@ -381,7 +387,7 @@ TRAP(idAllocErr, procInfo.iEapId = tempPtr.AllocL()); if (idAllocErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Id data copy [%d]", nestedIdTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_24, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Id data copy [%d]", nestedIdTag-1); } delete startData; startData = NULL; @@ -391,7 +397,7 @@ } else { - LOGPHONE1("WARNING CONFIGURATION FILE PARSING: NO SC EAP ID INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_25, "WARNING CONFIGURATION FILE PARSING: NO SC EAP ID INFO TAG"); } // Get Pseudonym Identity @@ -402,21 +408,21 @@ // parse id if (item == NULL) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Pseudonym id tag [%d]", nestedPsIdTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_26, "WARNING CONFIGURATION FILE PARSING: could not read EAP Pseudonym id tag [%d]", nestedPsIdTag-1); } else { ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr); if (ret != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP Pseudonym Id tag's data [%d]", nestedPsIdTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_27, "WARNING CONFIGURATION FILE PARSING: could not read EAP Pseudonym Id tag's data [%d]", nestedPsIdTag-1); } else { TRAPD(idAllocErr, startData = ptr.AllocL()); if (idAllocErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Pseudonym Id data [%d]", nestedPsIdTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_28, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Pseudonym Id data [%d]", nestedPsIdTag-1); } else { @@ -434,7 +440,7 @@ TRAP(idAllocErr, procInfo.iEapPsId = tempPtr.AllocL()); if (idAllocErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Pseudonym Id data copy [%d]", nestedPsIdTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_29, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP Pseudonym Id data copy [%d]", nestedPsIdTag-1); } delete startData; startData = NULL; @@ -444,7 +450,7 @@ } else { - LOGPHONE1("WARNING CONFIGURATION FILE PARSING: NO SC EAP PS ID INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_30, "WARNING CONFIGURATION FILE PARSING: NO SC EAP PS ID INFO TAG"); } // Get challenges @@ -457,7 +463,7 @@ { if (nestedChlTag >= countChl) { - LOGPHONE1("WARNING CONFIGURATION FILE PARSING: NO MORE SC EAP Challenge INFO TAG"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_31, "WARNING CONFIGURATION FILE PARSING: NO MORE SC EAP Challenge INFO TAG"); break; } @@ -467,7 +473,7 @@ // parse delay and challenge/response and auth status if (item == NULL) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP challenge tag [%d]", nestedChlTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_32, "WARNING CONFIGURATION FILE PARSING: could not read EAP challenge tag [%d]", nestedChlTag-1); continue; } @@ -475,14 +481,14 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, ptr); if (ret != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP challenge data [%d]", nestedChlTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_33, "WARNING CONFIGURATION FILE PARSING: could not read EAP challenge data [%d]", nestedChlTag-1); continue; } TRAPD(leaveErr, startData = ptr.AllocL()); if (leaveErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge data [%d]", nestedChlTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_34, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge data [%d]", nestedChlTag-1); continue; } tempPtr.Set(startData->Des()); @@ -498,7 +504,7 @@ TRAP(leaveErr, newChRespData.iChallenge = tempPtr.AllocL()); if (leaveErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge data copy [%d]", nestedKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_35, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge data copy [%d]", nestedKeyTag-1); } delete startData; startData = NULL; @@ -507,14 +513,14 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 1, ptr); if (ret != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP response data [%d]", nestedChlTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_36, "WARNING CONFIGURATION FILE PARSING: could not read EAP response data [%d]", nestedChlTag-1); continue; } TRAP(leaveErr, startData = ptr.AllocL()); if (leaveErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP response data [%d]", nestedChlTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_37, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP response data [%d]", nestedChlTag-1); continue; } tempPtr.Set(startData->Des()); @@ -529,7 +535,7 @@ TRAP(leaveErr, newChRespData.iResp = tempPtr.AllocL()); if (leaveErr != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP response data copy [%d]", nestedKeyTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_38, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP response data copy [%d]", nestedKeyTag-1); } delete startData; startData = NULL; @@ -539,7 +545,7 @@ ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 2, stat); if (ret != KErrNone) { - LOGPHONE2("WARNING CONFIGURATION FILE PARSING: could not read EAP auth status [%d]", nestedChlTag-1); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_39, "WARNING CONFIGURATION FILE PARSING: could not read EAP auth status [%d]", nestedChlTag-1); continue; } @@ -548,14 +554,14 @@ leaveErr = procInfo.iChResp.Append(newChRespData); if (leaveErr != KErrNone) { - LOGPHONE3("WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge/resp data [%d] [err=%d]", nestedChlTag-1, leaveErr); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_40, "WARNING CONFIGURATION FILE PARSING: could not allocate mem for EAP challenge/resp data [%d] [err=%d]", nestedChlTag-1, leaveErr); } } // end while TInt errAppend = iEapProcData.Append(procInfo); if (errAppend != KErrNone) { - LOGPHONE2("ERROR CONFIGURATION FILE PARSING: Could not store parsed EAP procedure data [err=%d]", errAppend); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_41, "ERROR CONFIGURATION FILE PARSING: Could not store parsed EAP procedure data [err=%d]", errAppend); } else { @@ -563,7 +569,7 @@ } } // end for; parsing EAP procedures from config.txt - LOGPHONE1("CSimSmartCardEapManager::ParseEapInfoL completed"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_42, "CSimSmartCardEapManager::ParseEapInfoL completed"); } /** @@ -593,7 +599,7 @@ CTelObject* CSimSmartCardEapManager::CreateScEapSubSessionL(RMobilePhone::TAID& aAID, RMobileSmartCardEap::TEapType& aEapType) { - LOGPHONE1("CSimSmartCardEapManager::CreateScEapSubSessionL called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_CREATESCEAPSUBSESSIONL_1, "CSimSmartCardEapManager::CreateScEapSubSessionL called"); // If no config exists for this eapAID,eapType pair, then this will leave AID_EapType_ExistsInConfigL(aAID, aEapType); @@ -606,7 +612,7 @@ if (err != KErrNone) { - LOGPHONE2("ERROR could not create CSimSmartCardEap object [err=%d]", err); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAPMANAGER_CREATESCEAPSUBSESSIONL_2, "ERROR could not create CSimSmartCardEap object [err=%d]", err); User::Leave(err); } @@ -715,13 +721,13 @@ void CSimSmartCardEap::ConstructL(CSimSmartCardEapManager* aEapMan) { - LOGPHONE1("CSimSmartCardEap: starting second phase construction"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_CONSTRUCTL_1, "CSimSmartCardEap: starting second phase construction"); iSemaphr.CreateGlobal(KNullDesC, EOwnerThread); aEapMan->RegisterSubSessionL(this); iEapMan = aEapMan; - LOGPHONE1("CSimSmartCardEap created"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_CONSTRUCTL_2, "CSimSmartCardEap created"); } CSimSmartCardEap::~CSimSmartCardEap() @@ -741,7 +747,7 @@ } TInt err = iEapMan->DeRegisterSubSession(this); - LOGPHONE2("CSimSmartCardEap destroyed, deregistering returned %d", err); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_DTOR_1, "CSimSmartCardEap destroyed, deregistering returned %d", err); iEapMan = NULL; } @@ -947,7 +953,7 @@ TInt CSimSmartCardEap::SimInitialiseEapMethod(const TTsyReqHandle aTsyReqHandle, TThreadId* aThreadId) { - LOGPHONE1("CSimSmartCardEap::SimInitialiseEapMethod called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_1, "CSimSmartCardEap::SimInitialiseEapMethod called"); // This can only be called through RMobileSmartCardEap for one instance if (iSSInitialised) @@ -962,7 +968,7 @@ TRAPD(err, iCliTerminationListener = CThreadTerminationListener::NewL(this, *aThreadId)); if (err != KErrNone) { - LOGPHONE2("ERROR could not create a client termination listener [err=%d] (not initialised)", err); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_2, "ERROR could not create a client termination listener [err=%d] (not initialised)", err); ReqCompleted(aTsyReqHandle, err); } else @@ -970,7 +976,7 @@ iProcedureData = iEapMan->ProcData(iAID, iEapType); if (iProcedureData == NULL) { - LOGPHONE1("ERROR could not find sub-session's procedure"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_3, "ERROR could not find sub-session's procedure"); ReqCompleted(aTsyReqHandle, KErrNotFound); return KErrNone; } @@ -988,7 +994,7 @@ TInt CSimSmartCardEap::SimInitialiseEapMethodCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimSmartCardEap::SimInitialiseEapMethodCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHODCANCEL_1, "CSimSmartCardEap::SimInitialiseEapMethodCancel called"); iProcedureData = NULL; iSSInitialised = EFalse; iAccessStatus = RMobileSmartCardEap::EEapMethodAvailable; @@ -999,7 +1005,7 @@ TInt CSimSmartCardEap::SimGetUserIdentity(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapUserIdType* aEapIdType, TDes8* aUserId) { - LOGPHONE1("CSimSmartCardEap::SimGetUserIdentity called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_1, "CSimSmartCardEap::SimGetUserIdentity called"); RMobileSmartCardEap::TEapUserIdentityV6Pckg *userIdPckg = reinterpret_cast(aUserId); RMobileSmartCardEap::TEapUserIdentityV6 &userId = (*userIdPckg)(); @@ -1017,7 +1023,7 @@ if (iProcedureData->iEapId == NULL) { ReqCompleted(aTsyReqHandle, KErrNotFound); - LOGPHONE1("ERROR EAP sub-session does not contain EPermanentIdentity"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_2, "ERROR EAP sub-session does not contain EPermanentIdentity"); return KErrNone; } @@ -1028,7 +1034,7 @@ if (iProcedureData->iEapPsId == NULL) { ReqCompleted(aTsyReqHandle, KErrNotFound); - LOGPHONE1("ERROR EAP sub-session does not contain EPseudonymIdentity"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_3, "ERROR EAP sub-session does not contain EPseudonymIdentity"); return KErrNone; } @@ -1037,7 +1043,7 @@ else { ReqCompleted(aTsyReqHandle, KErrArgument); - LOGPHONE2("ERROR invalid EAP id type requested [tag=%d]", *aEapIdType); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_4, "ERROR invalid EAP id type requested [tag=%d]", *aEapIdType); return KErrNone; } @@ -1047,14 +1053,14 @@ TInt CSimSmartCardEap::SimGetUserIdentityCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimSmartCardEap::SimGetUserIdentityCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETUSERIDENTITYCANCEL_1, "CSimSmartCardEap::SimGetUserIdentityCancel called"); ReqCompleted(aTsyReqHandle, KErrCancel); return KErrNone; } TInt CSimSmartCardEap::SimGetAuthenticationStatus(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapAuthStatus* aAuthStatus) { - LOGPHONE1("CSimSmartCardEap::SimGetAuthenticationStatus called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETAUTHENTICATIONSTATUS_1, "CSimSmartCardEap::SimGetAuthenticationStatus called"); (*aAuthStatus) = iAuthStatus; @@ -1064,14 +1070,14 @@ TInt CSimSmartCardEap::SimGetAuthenticationStatusCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimSmartCardEap::SimGetAuthenticationStatusCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETAUTHENTICATIONSTATUSCANCEL_1, "CSimSmartCardEap::SimGetAuthenticationStatusCancel called"); ReqCompleted(aTsyReqHandle, KErrCancel); return KErrNone; } TInt CSimSmartCardEap::SimGetEapKey(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapKeyTag* aEapKeyTag, TDes8* aKey) { - LOGPHONE1("CSimSmartCardEap::SimGetEapKey called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEY_1, "CSimSmartCardEap::SimGetEapKey called"); RMobileSmartCardEap::TEapKeyV6Pckg *keyPckg = reinterpret_cast(aKey); RMobileSmartCardEap::TEapKeyV6 &key = (*keyPckg)(); @@ -1089,7 +1095,7 @@ if (iProcedureData->iEapKey == NULL) { ReqCompleted(aTsyReqHandle, KErrNotFound); - LOGPHONE1("ERROR EAP sub-session does not contain EEapKeyMSK"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEY_2, "ERROR EAP sub-session does not contain EEapKeyMSK"); return KErrNone; } @@ -1100,7 +1106,7 @@ if (iProcedureData->iEapExtKey == NULL) { ReqCompleted(aTsyReqHandle, KErrNotFound); - LOGPHONE1("ERROR EAP sub-session does not contain EEapKeyEMSK"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEY_3, "ERROR EAP sub-session does not contain EEapKeyEMSK"); return KErrNone; } @@ -1109,7 +1115,7 @@ else { ReqCompleted(aTsyReqHandle, KErrArgument); - LOGPHONE2("ERROR invalid EAP key tag requested [tag=%d]", *aEapKeyTag); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEY_4, "ERROR invalid EAP key tag requested [tag=%d]", *aEapKeyTag); return KErrNone; } @@ -1119,14 +1125,14 @@ TInt CSimSmartCardEap::SimGetEapKeyCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimSmartCardEap::SimGetEapKeyCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPKEYCANCEL_1, "CSimSmartCardEap::SimGetEapKeyCancel called"); ReqCompleted(aTsyReqHandle, KErrCancel); return KErrNone; } TInt CSimSmartCardEap::SimSetAuthenticateDataForPhase1(const TTsyReqHandle aTsyReqHandle, TDes8* aEapAuthData, TInt* aPhase1Size) { - LOGPHONE1("CSimSmartCardEap::SimSetAuthenticateDataForPhase1 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_1, "CSimSmartCardEap::SimSetAuthenticateDataForPhase1 called"); if (iCurrentChallenge >= iProcedureData->iChResp.Count()) { @@ -1138,7 +1144,7 @@ TRAPD(err, authReq = RMobileSmartCardEap::CEapAuthenticateRequestDataV6::NewL()); if (err != KErrNone) { - LOGPHONE2("ERR Could not allocate memory for challenge request object [err=%d]", err); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_2, "ERR Could not allocate memory for challenge request object [err=%d]", err); ReqCompleted(aTsyReqHandle, err); return KErrNone; } @@ -1146,7 +1152,7 @@ TRAP(err, authReq->InternalizeL(*aEapAuthData)); if (err != KErrNone) { - LOGPHONE2("ERR Could not allocate memory for challenge request [err=%d]", err); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_3, "ERR Could not allocate memory for challenge request [err=%d]", err); ReqCompleted(aTsyReqHandle, err); return KErrNone; } @@ -1158,7 +1164,7 @@ if (reqPacket != tempPtr) { - LOGPHONE2("ERR challenge request does not match config [currentChallenge=%d]", iCurrentChallenge); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_4, "ERR challenge request does not match config [currentChallenge=%d]", iCurrentChallenge); ReqCompleted(aTsyReqHandle, KErrCorrupt); return KErrNone; } @@ -1171,7 +1177,7 @@ TInt CSimSmartCardEap::SimGetAuthenticateDataForPhase2(const TTsyReqHandle aTsyReqHandle, TDes8* /*aEapAuthData*/, TDes8* aPhase2Resp) { - LOGPHONE1("CSimSmartCardEap::SimSetAuthenticateDataForPhase2 called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETAUTHENTICATEDATAFORPHASE2_1, "CSimSmartCardEap::SimSetAuthenticateDataForPhase2 called"); if (iCurrentChallenge >= iProcedureData->iChResp.Count()) { @@ -1192,14 +1198,14 @@ TInt CSimSmartCardEap::SimSmartCardEapAuthenticationCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimSmartCardEap::SimSmartCardEapAuthenticationCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMSMARTCARDEAPAUTHENTICATIONCANCEL_1, "CSimSmartCardEap::SimSmartCardEapAuthenticationCancel called"); ReqCompleted(aTsyReqHandle, KErrCancel); return KErrNone; } TInt CSimSmartCardEap::SimReleaseEapMethod(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimSmartCardEap::SimReleaseEapMethod called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMRELEASEEAPMETHOD_1, "CSimSmartCardEap::SimReleaseEapMethod called"); iSSInitialised = EFalse; iAccessStatus = RMobileSmartCardEap::EEapMethodAvailable; ReqCompleted(aTsyReqHandle, KErrNone); @@ -1215,7 +1221,7 @@ TInt CSimSmartCardEap::SimGetEapMethodAccessStatus(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapMethodAccessStatus* aEapState) { - LOGPHONE1("CSimSmartCardEap::SimGetEapMethodAccessStatus called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMGETEAPMETHODACCESSSTATUS_1, "CSimSmartCardEap::SimGetEapMethodAccessStatus called"); *aEapState = iAccessStatus; ReqCompleted(aTsyReqHandle, KErrNone); return KErrNone; @@ -1223,7 +1229,7 @@ TInt CSimSmartCardEap::SimNotifyEapMethodAccessStatusChange(const TTsyReqHandle aTsyReqHandle, RMobileSmartCardEap::TEapMethodAccessStatus* aEapState) { - LOGPHONE1("CSimSmartCardEap::SimNotifyEapMethodAccessStatusChange called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMNOTIFYEAPMETHODACCESSSTATUSCHANGE_1, "CSimSmartCardEap::SimNotifyEapMethodAccessStatusChange called"); __ASSERT_ALWAYS(!iEapAccessNotifyData.iNotifyPending, PanicClient(EEtelPanicRequestAsyncTwice)); iEapAccessNotifyData.iNotifyPending = ETrue; @@ -1235,7 +1241,7 @@ TInt CSimSmartCardEap::SimNotifyEapMethodAccessStatusChangeCancel(const TTsyReqHandle aTsyReqHandle) { - LOGPHONE1("CSimSmartCardEap::SimNotifyEapMethodAccessStatusChangeCancel called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMNOTIFYEAPMETHODACCESSSTATUSCHANGECANCEL_1, "CSimSmartCardEap::SimNotifyEapMethodAccessStatusChangeCancel called"); if(iEapAccessNotifyData.iNotifyPending) { iEapAccessNotifyData.iNotifyPending = EFalse; @@ -1249,7 +1255,7 @@ void CSimSmartCardEap::SimCompleteNotifyEapMethodAccessStatusChange() { - LOGPHONE1("CSimSmartCardEap::SimCompleteNotifyEapMethodAccessStatusChange called"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMARTCARDEAP_SIMCOMPLETENOTIFYEAPMETHODACCESSSTATUSCHANGE_1, "CSimSmartCardEap::SimCompleteNotifyEapMethodAccessStatusChange called"); if(iEapAccessNotifyData.iNotifyPending) { diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/csimsmsmess.cpp --- a/telephonyserverplugins/simtsy/src/csimsmsmess.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/src/csimsmsmess.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-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" @@ -17,9 +17,15 @@ @file */ + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csimsmsmessTraces.h" +#endif + #include "csimsmsmess.h" #include -#include "Simlog.h" #include #include "CSimTsyMode.h" @@ -74,7 +80,7 @@ void CSimSmsMessaging::InitializeL() { - LOGSMS1("Starting to Load and Parse Sms Messaging Config "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_INITIALIZEL_1, "Starting to Load and Parse Sms Messaging Config "); iRxTimer=CSimTimer::NewL(iPhone); iTxTimer=CSimTimer::NewL(iPhone); iSmspTimer=CSimTimer::NewL(iPhone); @@ -96,7 +102,7 @@ // NOTE - no need to start iRxTimer; this will be started once a EMobileSmsMessagingReceiveMessage // request is received and/or Send Sms contrainst satisfied (see CompleteTxPendingReq) - LOGSMS1("Finished parsing SMS Messaging config parameters"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_INITIALIZEL_2, "Finished parsing SMS Messaging config parameters"); } @@ -178,7 +184,7 @@ TInt i; TSmsRxParametersGsm smsRxParameterGsm; - LOGSMS2("CSimSmsMessaging::FindAndCreateRxAttributesL IN [count=%d]", count); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_1, "CSimSmsMessaging::FindAndCreateRxAttributesL IN [count=%d]", count); // Need to do this *before* entering the loop (so that we know // whether or not to read a delivery report pdu off the config file). @@ -194,7 +200,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,smsPdu); if(ret!=KErrNone) { - LOGPARSERR("smsPdu",ret,0,&KSmsRx); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SMSPDU returned %d (element no. %d) from tag %s.",ret,0,KSmsRx); continue; } else @@ -206,7 +212,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,sca); if(ret!=KErrNone) { - LOGPARSERR("sca",ret,1,&KSmsRx); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,1,KSmsRx); continue; } else @@ -222,7 +228,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,deliveryReportPdu); if( (ret!=KErrNone) && (ret!=KErrGeneral) ) { - LOGPARSERR("deliveryReportPdu",ret,2,&KSmsRx); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DELIVERYREPORTPDU returned %d (element no. %d) from tag %s.",ret,2,KSmsRx); } else { @@ -246,9 +252,9 @@ if (iSmsControlCaps & RMobileSmsMessaging::KCapsReceiveUnstoredClientAck) iSmsReceiveMode=RMobileSmsMessaging::EReceiveUnstoredClientAck; else iSmsReceiveMode=RMobileSmsMessaging::EReceiveModeUnspecified; - LOGSMS5("iSmsRxPeriod =%d, iAckNackCompletePause=%d, iResumeCompletePause=%d, iSmsControlCaps=%d",iSmsRxPeriod, iAckNackCompletePause, iResumeCompletePause, iSmsControlCaps); - LOGSMS4("iSmsModeCaps =%d, iSmsRxStartDelay = %d, iSmsReceiveMode = %d",iSmsModeCaps , iSmsRxStartDelay, iSmsReceiveMode); - LOGSMS2("CSimSmsMessaging::FindAndCreateRxAttributesL OUT [count=%d]", iSmsRxParameterListGsm->Count()); + OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_5, "iSmsRxPeriod =%d, iAckNackCompletePause=%d, iResumeCompletePause=%d, iSmsControlCaps=%d",iSmsRxPeriod, iAckNackCompletePause, iResumeCompletePause, iSmsControlCaps); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_6, "iSmsModeCaps =%d, iSmsRxStartDelay = %d, iSmsReceiveMode = %d",iSmsModeCaps , iSmsRxStartDelay, iSmsReceiveMode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_7, "CSimSmsMessaging::FindAndCreateRxAttributesL OUT [count=%d]", iSmsRxParameterListGsm->Count()); } void CSimSmsMessaging::FindAndCreateTxAttributesL() @@ -275,7 +281,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,smsTx); if(ret!=KErrNone) { - LOGPARSERR("smsTx",ret,0,&KSmsTx); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element SMSTX returned %d (element no. %d) from tag %s.",ret,0,KSmsTx); continue; } else @@ -289,7 +295,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,sca); if (ret!=KErrNone) { - LOGPARSERR("sca",ret,1,&KSmsTx); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,1,KSmsTx); continue; } else @@ -302,7 +308,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,reference); if(ret!=KErrNone) { - LOGPARSERR("reference",ret,2,&KSmsTx); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element REFERENCE returned %d (element no. %d) from tag %s.",ret,2,KSmsTx); smsTxParametersGsm.iRef=KNoMessageReferenceInCofigurationFile; } else @@ -315,7 +321,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,submitReportPdu); if(ret!=KErrNone) { - LOGPARSERR("submitReportPdu",ret,3,&KSmsTx); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element SUBMITREPORTPDU returned %d (element no. %d) from tag %s.",ret,3,KSmsTx); continue; } else @@ -329,7 +335,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,errorCode); if(ret!=KErrNone) { - LOGPARSERR("errorCode",ret,4,&KSmsTx); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element ERRORCODE returned %d (element no. %d) from tag %s.",ret,4,KSmsTx); continue; } else @@ -365,7 +371,7 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,ipc);//only :SendMessage() is supported if(ret!=KErrNone || ipc!=4207) { - LOGPARSERR("ipc",ret,0,&KSmsStartRxDelay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_1, "WARNING - CONFIGURATION FILE PARSING - Reading element IPC returned %d (element no. %d) from tag %s.",ret,0,KSmsStartRxDelay); continue; } @@ -374,7 +380,7 @@ constraint.iIpcCnt=noBefore; else { - LOGPARSERR("noBefore",ret,1,&KSmsStartRxDelay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_2, "WARNING - CONFIGURATION FILE PARSING - Reading element NOBEFORE returned %d (element no. %d) from tag %s.",ret,1,KSmsStartRxDelay); continue; } @@ -383,7 +389,7 @@ constraint.iRxCnt=noAfter; else { - LOGPARSERR("noAfter",ret,2,&KSmsStartRxDelay); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_3, "WARNING - CONFIGURATION FILE PARSING - Reading element NOAFTER returned %d (element no. %d) from tag %s.",ret,2,KSmsStartRxDelay); continue; } @@ -413,14 +419,14 @@ ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,storeName); if(ret!=KErrNone) { - LOGPARSERR("storeName",ret,0,&KSmsStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element STORENAME returned %d (element no. %d) from tag %s.",ret,0,KSmsStore); continue; } ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,maxNumSlots); if(ret!=KErrNone) { - LOGPARSERR("maxNumSlots",ret,1,&KSmsStore); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element MAXNUMSLOTS returned %d (element no. %d) from tag %s.",ret,1,KSmsStore); continue; } @@ -472,7 +478,7 @@ entry.iIndex=index; else { - LOGPARSERR("index",ret,0,&KSmsParamEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_1, "WARNING - CONFIGURATION FILE PARSING - Reading element INDEX returned %d (element no. %d) from tag %s.",ret,0,KSmsParamEntry); continue; } @@ -481,7 +487,7 @@ entry.iText.Copy(smspName); else { - LOGPARSERR("smspName",ret,1,&KSmsParamEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_2, "WARNING - CONFIGURATION FILE PARSING - Reading element SMSPNAME returned %d (element no. %d) from tag %s.",ret,1,KSmsParamEntry); continue; } @@ -493,7 +499,7 @@ } else { - LOGPARSERR("pid",ret,2,&KSmsParamEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_3, "WARNING - CONFIGURATION FILE PARSING - Reading element PID returned %d (element no. %d) from tag %s.",ret,2,KSmsParamEntry); continue; } @@ -505,7 +511,7 @@ } else { - LOGPARSERR("dcs",ret,3,&KSmsParamEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_4, "WARNING - CONFIGURATION FILE PARSING - Reading element DCS returned %d (element no. %d) from tag %s.",ret,3,KSmsParamEntry); continue; } @@ -517,7 +523,7 @@ } else { - LOGPARSERR("validityPeriod",ret,4,&KSmsParamEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_5, "WARNING - CONFIGURATION FILE PARSING - Reading element VALIDITYPERIOD returned %d (element no. %d) from tag %s.",ret,4,KSmsParamEntry); continue; } @@ -528,7 +534,7 @@ } else { - LOGPARSERR("destAddress",ret,5,&KSmsParamEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_6, "WARNING - CONFIGURATION FILE PARSING - Reading element DESTADDRESS returned %d (element no. %d) from tag %s.",ret,5,KSmsParamEntry); continue; } @@ -539,7 +545,7 @@ } else { - LOGPARSERR("sca",ret,6,&KSmsParamEntry); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_7, "WARNING - CONFIGURATION FILE PARSING - Reading element SCA returned %d (element no. %d) from tag %s.",ret,6,KSmsParamEntry); continue; } @@ -581,7 +587,7 @@ } } -#ifdef _DEBUG // to stop the UREL build warnings +#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to stop the UREL build warnings void CSimSmsMessaging::LogRequest(const TBool aEntering, TInt aIpc, TInt aError) #else void CSimSmsMessaging::LogRequest(const TBool aEntering, TInt aIpc, TInt /*aError*/) @@ -711,11 +717,13 @@ if (aEntering!=EFalse) { - LOGSMS3(">>%d,CSimSmsMessaging::%S",aIpc, &ipcBuf ); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGREQUEST1_1, ">>%d,CSimSmsMessaging::%s",aIpc, ipcBuf ); } else { - LOGSMS4("<<%d, CSimSmsMessaging::%S with error %d",aIpc, &ipcBuf, aError); +#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to stop the UREL build warnings + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGREQUEST1_2, "<<%d, CSimSmsMessaging::%s with error %d",aIpc, ipcBuf, aError); +#endif } } @@ -849,12 +857,12 @@ if(iSmsTxCnt==(iConstraints[i].iIpcCnt)) { iCurrentConstraint=i; - LOGSMS2("New Constraint : %d", iCurrentConstraint); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_IPCMATCH_1, "New Constraint : %d", iCurrentConstraint); if(i!=0) { if( !constraintEllapsed ) { - LOGSMS1("Panic The constraints are overlapping...Compare test code and config file"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_IPCMATCH_2, "Panic The constraints are overlapping...Compare test code and config file"); } __ASSERT_ALWAYS(constraintEllapsed!=EFalse,SimPanic(EConstraintsOverlapping)); } @@ -869,7 +877,7 @@ * */ { - LOGSMS1(">>CSimSmsMessaging::OpenNewObjectByNameL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_OPENNEWOBJECTBYNAMEL_1, ">>CSimSmsMessaging::OpenNewObjectByNameL"); TBuf8 name; name.Copy(aName); // Do simple 16 bit to 8 bit conversion for(TInt i=0;iCount();i++) @@ -1031,7 +1039,7 @@ * */ { - LOGSMS3(">>CSimSmsMessaging::ActionRxEventUnstoredClientAck [iRxState=%d aRxEvent=%d]", iRxState, aRxEvent); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_1, ">>CSimSmsMessaging::ActionRxEventUnstoredClientAck [iRxState=%d aRxEvent=%d]", iRxState, aRxEvent); switch(iRxState) { case ESmsRxStateIdle: @@ -1066,7 +1074,7 @@ iRxState=ESmsRxStateWaitingForNetworkAckNackResponse; if (!iRxTimer->IsActive() && !iRxTimer->Running()) { - LOGSMS1(">>CSimSmsMessaging::ActionRxEventUnstoredClientAck Starting Rx Timer"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_2, ">>CSimSmsMessaging::ActionRxEventUnstoredClientAck Starting Rx Timer"); iRxTimer->Start(iAckNackCompletePause,this, ETimerIdSmsMessRx); } @@ -1128,7 +1136,7 @@ * */ { - LOGSMS3(">> ActionRxEventUnstoredPhoneAck Enter function. Event=%d, State=%d",aRxEvent,iRxState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDPHONEACK_1, ">> ActionRxEventUnstoredPhoneAck Enter function. Event=%d, State=%d",aRxEvent,iRxState); TInt ret = KErrGeneral; @@ -1169,7 +1177,7 @@ * */ { - LOGSMS3(">> ActionRxEventStored Enter function. Event=%d, State=%d",aRxEvent,iRxState); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONRXEVENTSTORED_1, ">> ActionRxEventStored Enter function. Event=%d, State=%d",aRxEvent,iRxState); TInt ret = KErrGeneral; switch(iRxState) @@ -1238,7 +1246,7 @@ iSmsRxAttrib=&attrib; iSmsRxReqOutstanding=ETrue; - LOGSMS3(">>ReceiveMessageL. aSmsPdu&=%x, aParam2&=%x",aSmsPdu,iSmsRxAttrib); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_RECEIVEMESSAGEL_1, ">>ReceiveMessageL. aSmsPdu&=0x%x, aParam2&=0x%x",(TUint)aSmsPdu,(TUint)iSmsRxAttrib); // Print received PDU to simTSY log. __ASSERT_ALWAYS(iSmsReceiveMode!=RMobileSmsMessaging::EReceiveModeUnspecified,SimPanic(EMobileSmsMessagingPhoneNotSetToAReceiveMode)); @@ -1422,7 +1430,7 @@ * */ { - LOGSMS1(">>ActionTxEvent "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ACTIONTXEVENT_1, ">>ActionTxEvent "); switch(iTxState) { case ESmsTxStateIdle: @@ -1471,7 +1479,7 @@ } iSmsTxAttrib=&attrib; -#ifdef _DEBUG +#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) LogTMobileSmsAttributesV1(*iSmsTxAttrib); #endif // _DEBUG @@ -1540,7 +1548,7 @@ * update the constraint count */ { - LOGSMS1(">>AttemptSmsRxComplete "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_1, ">>AttemptSmsRxComplete "); if (CSimTsyMode::GetMode() != CSimTsyMode::ECdmaV1) { @@ -1552,7 +1560,7 @@ { if (iSmsReceiveMode==RMobileSmsMessaging::EReceiveStored) { - LOGSMS4(">>Populating SMS Structures. iSmsRxPdu&=%x, iSmsRxAttrib&=%x, iSmsRxCnt=%d.",iSmsRxPdu,iSmsRxAttrib,iSmsRxCnt); + OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_2, ">>Populating SMS Structures. iSmsRxPdu&=0x%x, iSmsRxAttrib&=0x%x, iSmsRxCnt=%d.",(TUint)iSmsRxPdu,(TUint)iSmsRxAttrib,iSmsRxCnt); RMobileSmsStore::TMobileGsmSmsEntryV1 sms; *iSmsRxPdu=iSmsRxParameterListGsm->At(iSmsRxCnt).iPdu; @@ -1593,7 +1601,7 @@ * */ { - LOGSMS1(">>CompleteTxPendingReq "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_1, ">>CompleteTxPendingReq "); iSmsTxCnt++; if(IpcMatch()) { @@ -1623,7 +1631,7 @@ { // No pending client receive request - need to wait for it before // simulating received SMS from network. - LOGSMS1(" - no pending receive req from client - do not start Rx timer"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_2, " - no pending receive req from client - do not start Rx timer"); } } ReqCompleted(iSmsTxReqHandle, aError); @@ -1631,7 +1639,7 @@ void CSimSmsMessaging::StartSmsMtTimer() { - LOGSMS1(">>StartSmsMtTimer "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_1, ">>StartSmsMtTimer "); TInt count = 0; count = iSmsRxCntCount(); @@ -1639,9 +1647,9 @@ { if((iConstraints.Count()==0) || (iConstraintRxCnt>StartSmsMtTimer Starting"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_2, ">>StartSmsMtTimer Starting"); iRxTimer->Start(iSmsRxPeriod,this, ETimerIdSmsMessRx); - LOGSMS1(">>StartSmsMtTimer Started"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STARTSMSMTTIMER_3, ">>StartSmsMtTimer Started"); } } } @@ -1654,7 +1662,7 @@ * accordingly. The address can then be copied into the iTelNumber structure. */ { - LOGSMS1(">>PopulateSmsRxAttrib, "); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_POPULATESMSRXATTRIB_1, ">>PopulateSmsRxAttrib, "); aAttrib->iOriginator.iTelNumber.SetLength(0); switch (iSmsReceiveMode) @@ -2025,11 +2033,11 @@ return leaveCode; iSmspReqHandle=aTsyReqHandle; iSmspTimer->Start(iSmspBatchPause,this, ETimerIdSmsMessSmsp); - LOGSMS1("<>CSimSmsMesaging::TimerCallBack IN [aId=%d iSmsReceiveMode=%d]", aId, iSmsReceiveMode); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_1, ">>CSimSmsMesaging::TimerCallBack IN [aId=%d iSmsReceiveMode=%d]", aId, iSmsReceiveMode); switch(aId) { case ETimerIdSmsMessTx: @@ -2097,7 +2105,7 @@ ret=ActionRxEventUnstoredPhoneAck(ESmsEventRxTimer); break; case RMobileSmsMessaging::EReceiveStored: - LOGSMS1("Recieve Stored SMS Rx Event."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_2, "Recieve Stored SMS Rx Event."); ret=ActionRxEventStored(ESmsEventRxTimer); break; default://other receive modes cannot be set @@ -2106,7 +2114,7 @@ if (ret != KErrNone) { - LOGSMS2("ERROR: Unexpected ret code %d", ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_3, "ERROR: Unexpected ret code %d", ret); __ASSERT_ALWAYS(ret==KErrNone,SimPanic(EIllegalSmsRxEvent, __LINE__)); // There should be no error from this action, but to check... } @@ -2131,7 +2139,7 @@ default: break; } - LOGSMS1(">>CSimSmsMesaging::TimerCallBack OUT"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_TIMERCALLBACK_4, ">>CSimSmsMesaging::TimerCallBack OUT"); } const CTestConfigSection* CSimSmsMessaging::CfgFileSection() @@ -2141,7 +2149,7 @@ * @return CTestConfigSection a pointer to the configuration file data section */ { - LOGSMS1(">>CSimSmsMessaging::CfgFileSection"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_CFGFILESECTION_1, ">>CSimSmsMessaging::CfgFileSection"); return iPhone->CfgFile(); } @@ -2196,7 +2204,7 @@ return hexBuf; } -#ifdef _DEBUG // to prevent UREL build warnings +#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to prevent UREL build warnings void CSimSmsMessaging::DumpPdu(const TDesC8& aText, TDesC8& aSmsPdu, HBufC8* aPduInAscii) #else void CSimSmsMessaging::DumpPdu(const TDesC8& /*aText*/, TDesC8& aSmsPdu, HBufC8* aPduInAscii) @@ -2208,7 +2216,9 @@ @param aPduInAscii - aSmsPdu in ASCII format (default NULL). */ { - LOGSMS3("%S pdu length=%d", &aText, aSmsPdu.Length()); +#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) // to stop the UREL build warnings + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_DUMPPDU1_1, "%s pdu length=%d", aText, aSmsPdu.Length()); +#endif if( !aSmsPdu.Length() ) return; @@ -2224,14 +2234,14 @@ { TInt len = Min(100, hexBuf->Mid(i).Length()); TPtrC8 pduChunk(hexBuf->Mid(i).Left(len).Ptr(), len); - LOGSMS2("PDU Chunk: %S:", &pduChunk); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_DUMPPDU1_2, "PDU Chunk: %s:", pduChunk); } if (0 == aPduInAscii) delete hexBuf; } -#ifdef _DEBUG +#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) /** Appends Type of number and Numbering plan identification to TBuf8 buffer. @@ -2357,30 +2367,30 @@ TBuf8 buffer; - LOGSMS1("Send Sms Attributes:"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_1, "Send Sms Attributes:"); buffer.Zero(); buffer.Copy(KFLAGS); buffer.Append(_L8("0x")); buffer.AppendFormat(_L8("%08X") , ((TInt)(aSmsAttributesV1.iFlags))); - LOGSMS2("Buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_2, "Buffer: %s", buffer); if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KGsmServiceCentre) { buffer.Zero(); buffer.Copy(KSCADDR); buffer.Append(aSmsAttributesV1.iGsmServiceCentre.iTelNumber); - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_3, "Buffer: %s", buffer); buffer.Zero(); buffer.Copy(KSCADDRTON); AppendTonToBuffer(buffer,(aSmsAttributesV1.iGsmServiceCentre.iTypeOfNumber)); - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_4, "Buffer: %s", buffer);; buffer.Zero(); buffer.Copy(KSCADDRNPI); AppendNpiToBuffer(buffer,(aSmsAttributesV1.iGsmServiceCentre.iNumberPlan)); - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_5, "Buffer: %s", buffer); } if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KSmsDataFormat) { @@ -2394,7 +2404,7 @@ { buffer.Append(_L("EFormatGsmTpdu")); } - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_6, "Buffer: %s", buffer); } if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KRemotePartyInfo) { @@ -2403,17 +2413,17 @@ buffer.Zero(); buffer.Copy(KDEADDR); buffer.Append(smsSendAttributesV1.iDestination.iTelNumber); - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_7, "Buffer: %s", buffer); buffer.Zero(); buffer.Copy(KDEADDRTON); AppendTonToBuffer(buffer,(smsSendAttributesV1.iDestination.iTypeOfNumber)); - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_8, "Buffer: %s", buffer); buffer.Zero(); buffer.Copy(KDEADDRNPI); AppendNpiToBuffer(buffer,(smsSendAttributesV1.iDestination.iNumberPlan)); - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_9, "Buffer: %s", buffer); } if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KMoreToSend) { @@ -2430,7 +2440,7 @@ { buffer.Append(_L8("EFalse")); } - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_10, "Buffer: %s", buffer); } if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KMessageReference) { @@ -2440,7 +2450,7 @@ buffer.Copy(KMSGREF); buffer.Append(_L("0x")); buffer.AppendFormat(_L8("%08X") , smsSendAttributesV1.iMsgRef); - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_11, "Buffer: %s", buffer); } if(aSmsAttributesV1.iFlags & RMobileSmsMessaging::KGsmSubmitReport) @@ -2466,7 +2476,7 @@ buffer.AppendFormat(_L8("%X") , smsSendAttributesV1.iSubmitReport[j]); j++; } - LOGSMS2("buffer: %S", &buffer); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_12, "Buffer: %s", buffer); buffer.Zero(); i=0; l+=KTextWidth; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/test/Te_Sim/Te_SimTestStepBase.h --- a/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimTestStepBase.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimTestStepBase.h Tue Jun 22 11:02:32 2010 +0100 @@ -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" @@ -36,7 +36,6 @@ #include "SimTsy.h" #include #include "Te_SimConstants.h" -#include "Simlog.h" class CTestConfig; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/test/Te_Sim/Te_SimUSimRel6Test.h --- a/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimUSimRel6Test.h Mon May 24 18:38:31 2010 +0100 +++ b/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimUSimRel6Test.h Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-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" @@ -19,7 +19,6 @@ #include "Te_SimTestStepBase.h" #include "Te_SimConstants.h" #include "SimTsy.h" -#include "Simlog.h" #include class CTestConfig; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/simtsy/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyserverplugins/simtsy/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,1487 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_BORDER=0x84 +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_BORDER[0x84]_SIMPANIC_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_1=0x5a4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_2=0x5a5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_3=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_4=0x5a6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_CONSTRUCTL_5=0x5a7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_GETBATTERYINFO_1=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_GETBATTERYINFO_2=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCANCEL_1=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCANCEL_2=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_NOTIFYBATTERYINFOCHANGE_1=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMBATTERYCHARGER_TIMERCALLBACK_1=0xa +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_CONSTRUCTL_1=0x29 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_CONSTRUCTL_2=0x2a +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_1=0x2b +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_2=0x2c +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_3=0x2d +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_4=0x2e +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_FINDANDCREATECBLISTL_5=0x2f +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_1=0x37 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSCANCEL_2=0x38 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_1=0x31 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE1_2=0x32 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_1=0x35 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_GETCALLBARRINGSTATUSPHASE2_2=0x36 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_NOTIFYCALLBARRINGSTATUSCHANGE_1=0x30 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_1=0x33 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLBARRING_PROCESSGETCALLBARRINGSTATUSPHASE1L_2=0x34 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_CONSTRUCTL_1=0x39 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_CONSTRUCTL_2=0x3a +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_CONSTRUCTL_3=0x3b +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_CONSTRUCTL_4=0x3c +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_1=0x3d +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_2=0x3e +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_3=0x3f +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_4=0x40 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_5=0x41 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_6=0x42 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_FINDANDCREATECFLISTL_7=0x43 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_1=0x4c +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSCANCEL_2=0x4d +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_1=0x46 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE1_2=0x47 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_1=0x4a +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_GETCALLFORWARDINGSTATUSPHASE2_2=0x4b +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_NOTIFYCALLFORWARDINGSTATUSCHANGE_1=0x44 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_1=0x48 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_PROCESSGETCALLFORWARDINGSTATUSPHASE1L_2=0x49 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLFORWARDING_SETCALLFORWARDINGSTATUS_1=0x45 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_CONSTRUCTL_1=0x4e +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_CONSTRUCTL_2=0x4f +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_FINDANDCREATECWLISTL_1=0x50 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_FINDANDCREATECWLISTL_2=0x51 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_FINDANDCREATECWLISTL_3=0x52 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_FINDANDCREATECWLISTL_4=0x53 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSCANCEL_1=0x5b +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSCANCEL_2=0x5c +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE1_1=0x55 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE1_2=0x56 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE2_1=0x59 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_GETCALLWAITINGSTATUSPHASE2_2=0x5a +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_NOTIFYCALLWAITINGSTATUSCHANGE_1=0x54 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_PROCESSGETCALLWAITINGSTATUSPHASE1L_1=0x57 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALLWAITING_PROCESSGETCALLWAITINGSTATUSPHASE1L_2=0x58 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_CHANGESTATEL_1=0x21 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_CHANGESTATEL_2=0x22 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETCALLDURATION_1=0x1f +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETCALLDURATION_2=0x20 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETMOBILECALLINFO_1=0x1a +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETMOBILECALLSTATUS_1=0x1d +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETMOBILECALLSTATUS_2=0x1e +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETSTATUS_1=0x1b +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_GETSTATUS_2=0x1c +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYHOOKCHANGECANCEL_1=0x10 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYHOOKCHANGECANCEL_2=0x11 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYHOOKCHANGE_1=0xe +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYHOOKCHANGE_2=0xf +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGECANCEL_1=0x14 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGECANCEL_2=0x15 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGE_1=0x12 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGE_2=0x13 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGECANCEL_1=0x27 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGECANCEL_2=0x28 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGE_1=0x25 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGE_2=0x26 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYSTATUSCHANGECANCEL_1=0x18 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYSTATUSCHANGECANCEL_2=0x19 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYSTATUSCHANGE_1=0x16 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NOTIFYSTATUSCHANGE_2=0x17 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NUMBEROFSLOTSL_1=0xc +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_NUMBEROFSLOTSL_2=0xd +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_REQMODEL_1=0xb +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_UPDATENOTIFIERS_1=0x23 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCALL_UPDATENOTIFIERS_2=0x24 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_1=0x5d +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_10=0x66 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_11=0x67 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_12=0x68 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_13=0x69 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_14=0x6a +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_15=0x6b +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_16=0x6c +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_17=0x6d +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_18=0x6e +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_19=0x6f +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_2=0x5e +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_20=0x70 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_21=0x71 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_22=0x72 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_23=0x73 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_24=0x74 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_3=0x5f +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_4=0x60 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_5=0x61 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_6=0x62 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_7=0x63 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_8=0x64 +[TRACE]TRACE_INTERNALS[0x88]_CSIMCONTEXTHELPER_GETCONTEXTCONFIGPARAMSETTINGSL_9=0x65 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_1=0xad +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_10=0xb6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_11=0xb7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_2=0xae +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_3=0xaf +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_4=0xb0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_5=0xb1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_6=0xb2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_7=0xb3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_8=0xb4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ACTIONEVENT_9=0xb5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_1=0xa6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_2=0xa7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ANSWERINCOMINGCALL_1=0xa4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_ANSWERINCOMINGCALL_2=0xa5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CANCELSERVICE_1=0x9e +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_1=0x5a8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_10=0x7e +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_11=0x7f +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_12=0x80 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_13=0x81 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_14=0x82 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_15=0x83 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_16=0x84 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_17=0x85 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_18=0x86 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_19=0x87 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_2=0x5a9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_20=0x88 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_21=0x89 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_22=0x8a +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_23=0x8b +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_24=0x8c +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_25=0x8d +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_26=0x8e +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_27=0x8f +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_28=0x90 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_29=0x91 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_3=0x77 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_30=0x92 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_31=0x93 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_32=0x94 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_33=0x95 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_34=0x96 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_35=0x97 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_36=0x98 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_37=0x99 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_38=0x9a +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_39=0x5aa +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_4=0x78 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_40=0x5ab +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_5=0x79 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_6=0x7a +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_7=0x7b +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_8=0x7c +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_CONSTRUCTL_9=0x7d +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIALCANCEL_1=0xa1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIALCANCEL_2=0xa2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIALCANCEL_3=0xa3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIAL_1=0x9f +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_DIAL_2=0xa0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_EXTFUNC_1=0x9c +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_EXTFUNC_2=0x9d +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUPCANCEL_1=0xaa +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUPCANCEL_2=0xab +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUPCANCEL_3=0xac +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUP_1=0xa8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_HANGUP_2=0xa9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_1=0xba +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_2=0xbb +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_PROCESSREMOTEHANGUPL_1=0xbc +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_PROCESSREMOTEHANGUPL_2=0xbd +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_TIMERCALLBACK_1=0xb8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATACALL_TIMERCALLBACK_2=0xb9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATALINE_CANCELSERVICE_1=0xc1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATALINE_CREATENEWCALLL_1=0xc0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATALINE_OPENNEWOBJECTBYNAMEL_1=0xbe +[TRACE]TRACE_INTERNALS[0x88]_CSIMDATALINE_OPENNEWOBJECTBYNAMEL_2=0xbf +[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_ACTIONEVENT1_1=0xc2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_ACTIONEVENT1_2=0xc3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_ACTIONEVENT1_3=0xc4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_PROCESSTONE_1=0xc5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_PROCESSTONE_2=0x5ac +[TRACE]TRACE_INTERNALS[0x88]_CSIMDTMF_PROCESSTONE_3=0xc6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_CANCEL_1=0xd5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_CONSTRUCTL_1=0xc7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_1=0xd6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_2=0xd7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_3=0xd8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_FORCEDINCOMING_4=0xd9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_1=0x5ad +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_2=0xc9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_3=0xca +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_4=0xcb +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_5=0x5ae +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_LOADINCOMINGCONTEXTSL_6=0x5af +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_1=0xcf +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_2=0xd0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_3=0xd1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_4=0xd2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_5=0xd3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_NEXTINCOMINGEVENT_6=0xd4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_STARTFIRSTINCOMINGEVENT_1=0xcd +[TRACE]TRACE_INTERNALS[0x88]_CSIMINCOMINGCONTEXTMANAGER_STARTFIRSTINCOMINGEVENT_2=0xce +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CHECKNOTIFICATION_1=0xe3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_1=0x5b0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_2=0x5b1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_3=0xdc +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_4=0xdd +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_5=0xde +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_6=0xdf +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_7=0x5b2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_CONSTRUCTL_8=0x5b3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_GETINDICATOR_1=0xe0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_NOTIFYINDICATORCHANGECANCEL_1=0xe2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMINDICATOR_NOTIFYINDICATORCHANGE_1=0xe1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CFGFILE_1=0x106 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_1=0x107 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_2=0x108 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_3=0x109 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_4=0x10a +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_5=0x10b +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_6=0x10c +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_7=0x10d +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CHANGESTATEL_8=0x10e +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CONSTRUCTL_1=0xe4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_CONSTRUCTL_2=0xe5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETHOOKSTATUS_1=0x104 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETHOOKSTATUS_2=0x105 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETINFO_1=0xfe +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETINFO_2=0xff +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETMOBILELINESTATUS_1=0x102 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETMOBILELINESTATUS_2=0x103 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETSTATUS_1=0x100 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_GETSTATUS_2=0x101 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_1=0xfc +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_2=0xfd +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYCALLADDEDCANCEL_1=0xfa +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYCALLADDEDCANCEL_2=0xfb +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYCALLADDED_1=0xf8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYCALLADDED_2=0xf9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYHOOKCHANGECANCEL_1=0xee +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYHOOKCHANGECANCEL_2=0xef +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYHOOKCHANGE_1=0xec +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYHOOKCHANGE_2=0xed +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYINCOMINGCALLCANCEL_1=0xea +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYINCOMINGCALLCANCEL_2=0xeb +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYINCOMINGCALL_1=0xe8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYINCOMINGCALL_2=0xe9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_1=0xf2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_2=0xf3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_1=0xf0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_2=0xf1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYSTATUSCHANGECANCEL_1=0xf6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYSTATUSCHANGECANCEL_2=0xf7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYSTATUSCHANGE_1=0xf4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NOTIFYSTATUSCHANGE_2=0xf5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NUMBEROFSLOTSL_1=0xe6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_NUMBEROFSLOTSL_2=0xe7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSINCOMINGCALLEVENT_1=0x114 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSINCOMINGCALLEVENT_2=0x115 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_1=0x11d +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_2=0x11e +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSREMOTEHANGUPEVENT_1=0x119 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSREMOTEHANGUPEVENT_2=0x11a +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSREMOTEHANGUPEVENT_3=0x11b +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_PROCESSREMOTEHANGUPEVENT_4=0x11c +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_RESETAUTOANSWERCALLOBJECT_1=0x113 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_RESETREMOTEHANGUPCALLOBJECT_1=0x118 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SETAUTOANSWERCALLOBJECT_1=0x111 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SETAUTOANSWERCALLOBJECT_2=0x112 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SETREMOTEHANGUPCALLOBJECT_1=0x116 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SETREMOTEHANGUPCALLOBJECT_2=0x117 +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SIMPSEVENT_1=0x10f +[TRACE]TRACE_INTERNALS[0x88]_CSIMLINE_SIMPSEVENT_2=0x110 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_1=0x163 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_2=0x164 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_3=0x165 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_4=0x166 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIONEVENT_5=0x167 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_ACTIVATECANCEL_1=0x14c +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CANCELSERVICE_1=0x137 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CANCELSERVICE_2=0x138 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CANCELSERVICE_3=0x139 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CFGFILE_1=0x147 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CHANGESTATE_1=0x161 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CHANGESTATE_2=0x162 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CONSTRUCTL_1=0x120 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CONTEXTNAME_1=0x146 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CONVERTTOPACKETSERVICESTATUS_1=0x168 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_CTOR_1=0x11f +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEACTIVATECANCEL_1=0x14e +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEACTIVATE_1=0x14d +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DELETECANCEL_1=0x150 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DELETE_1=0x14f +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_1=0x12b +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_2=0x12c +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_3=0x12d +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_4=0x12e +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_DTOR_1=0x121 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_EXTFUNC_1=0x133 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_EXTFUNC_2=0x134 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_EXTFUNC_3=0x135 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_EXTFUNC_4=0x136 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETCONFIGCANCEL_1=0x14a +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETCONFIG_1=0x149 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETLASTERRORCAUSE_1=0x151 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSCANCEL_1=0x160 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSPHASE1_1=0x15d +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETMBMSSESSIONSPHASE2_1=0x15f +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_GETSTATUS_1=0x14b +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGEDCANCEL_1=0x154 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGED_1=0x152 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYCONFIGCHANGED_2=0x153 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYSTATUSCHANGECANCEL_1=0x156 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NOTIFYSTATUSCHANGE_1=0x155 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_1=0x12f +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_2=0x130 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_3=0x131 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_4=0x132 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_OPENNEWOBJECTBYNAMEL_1=0x122 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_OPENNEWOBJECTL_1=0x123 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_PROCESSGETMBMSSESSIONSPHASE1L_1=0x15e +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_RANDTIME_1=0x169 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_1=0x127 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_2=0x128 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_3=0x129 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_4=0x12a +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REQMODEL_1=0x124 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REQMODEL_2=0x125 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_REQMODEL_3=0x126 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_SETCONFIG_1=0x148 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_1=0x13a +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_10=0x143 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_11=0x144 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_12=0x145 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_2=0x13b +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_3=0x13c +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_4=0x13d +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_5=0x13e +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_6=0x13f +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_7=0x140 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_8=0x141 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_9=0x142 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTCANCEL_1=0x15c +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_1=0x157 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_2=0x158 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_3=0x159 +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_4=0x15a +[TRACE]TRACE_INTERNALS[0x88]_CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLISTL_5=0x15b +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_1=0x5b4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_10=0x173 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_11=0x174 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_12=0x175 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_13=0x176 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_14=0x177 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_15=0x178 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_16=0x179 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_17=0x17a +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_18=0x17b +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_19=0x17c +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_2=0x5b5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_20=0x17d +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_21=0x17e +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_22=0x17f +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_23=0x180 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_24=0x181 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_25=0x182 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_26=0x189 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_27=0x18a +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_28=0x18b +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_29=0x5bb +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_3=0x5b6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_30=0x5bc +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_31=0x5bd +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_32=0x5be +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_33=0x5bf +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_34=0x5c0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_35=0x5c1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_4=0x5b7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_5=0x5b8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_6=0x5b9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_7=0x64d +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_8=0x171 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_CONSTRUCTL_9=0x172 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_FINDROAMSTATSETTINGS_1=0x18c +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_1=0x197 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_2=0x198 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_3=0x199 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_4=0x19a +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKRADIOMODEL_5=0x19b +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_1=0x18e +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_2=0x18f +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_3=0x190 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_4=0x191 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_5=0x192 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_6=0x193 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_7=0x194 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_8=0x195 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACKREGSTAT_9=0x196 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNETWORKSTATUS_TIMERCALLBACK_1=0x18d +[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_ATTEMPTCONNECT_1=0x19d +[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_COMMREADCOMPLETE_1=0x19e +[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_COMMREADCOMPLETE_2=0x19f +[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_COMMWRITECOMPLETE_1=0x1a0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_CONNECT_1=0x19c +[TRACE]TRACE_INTERNALS[0x88]_CSIMNTRAS_TIMERCALLBACK_1=0x1a1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_CFGFILE_1=0x1a6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_CONSTRUCTL_1=0x5c2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_CONSTRUCTL_2=0x1a3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_CONSTRUCTL_3=0x5c3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_1=0x643 +[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_2=0x1a5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMONSTORE_POPULATESTOREFROMCONFIGFILEL_3=0x644 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIONEVENT_1=0x1fa +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIONEVENT_2=0x1fb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIONEVENT_3=0x1fc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIONEVENT_4=0x1fd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_ACTIVATECANCEL_1=0x1e9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CANCELSERVICE_1=0x1e3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CHANGESTATE_1=0x1f8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CHANGESTATE_2=0x1f9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_1=0x5c4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_2=0x5c5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_3=0x5c6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_4=0x1ac +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_5=0x5c7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_6=0x5c8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTL_7=0x5c9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_1=0x5ca +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_10=0x1d7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_11=0x1d8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_12=0x1d9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_13=0x1db +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_14=0x5cb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_2=0x1cf +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_3=0x1d0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_4=0x1d1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_5=0x1d2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_6=0x1d3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_7=0x1d4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_8=0x1d5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_CONSTRUCTPACKETFILTERSL_9=0x1d6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DEACTIVATECANCEL_1=0x1e8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DEACTIVATE_1=0x1e7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DELETECANCEL_1=0x1eb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DELETE_1=0x1ea +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_1=0x1de +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DEREGISTERNOTIFICATION_2=0x1df +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_DTOR_1=0x1dc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_EXTFUNC_1=0x1e2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_1=0x1fe +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETADDMEDIAAUTHORIZATION_2=0x1ff +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_1=0x1ae +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_2=0x1af +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_3=0x1b0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_4=0x1b1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_5=0x1b2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCOMMSETUPSETTINGSL_6=0x1b3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONFIG_1=0x1e5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_1=0x1b8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGCHANGESETTINGSL_2=0x1b9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_1=0x1c4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_2=0x1c5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_3=0x1c6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_4=0x1c7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_5=0x1c8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_6=0x1c9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTCONFIGREL99SETTINGSL_7=0x1ca +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_1=0x1cb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_2=0x1cc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETCONTEXTSTATUSCHANGESETTINGSL_3=0x1cd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETDATAVOLUMETRANSFERRED_1=0x1f3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETLASTERRORCAUSE_1=0x1f5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_1=0x1ba +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_10=0x1c3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_2=0x64f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_3=0x1bc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_4=0x1bd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_5=0x1be +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_6=0x1bf +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_7=0x1c0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_8=0x1c1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETPACKETFILTERSETTINGS_9=0x1c2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_1=0x1b4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_2=0x1b5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_3=0x1b6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSETCONFIGSETTINGS_4=0x1b7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_GETSTATUS_1=0x1f0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_LOANCOMMPORTCANCEL_1=0x1ed +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_LOANCOMMPORT_1=0x1ec +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NOTIFYCONFIGCHANGEDCANCEL_1=0x1e6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NOTIFYDATATRANSFERREDCANCEL_1=0x1f4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGECANCEL_1=0x1f2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NOTIFYSTATUSCHANGE_1=0x1f1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NUMBEROFSLOTSL_1=0x1e0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_NUMBEROFSLOTSL_2=0x1e1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_RECOVERCOMMPORTCANCEL_1=0x1ef +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_RECOVERCOMMPORT_1=0x1ee +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_REGISTERNOTIFICATION_1=0x1dd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_SETCONFIG_1=0x1e4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_TIMERCALLBACK_1=0x5cc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_TIMERCALLBACK_2=0x1f7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETCONTEXT_TIMERCALLBACK_3=0x5cd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_CANCELSERVICE_1=0x2a3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_CONSTRUCTL_1=0x200 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_CONSTRUCTL_2=0x201 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_CONSTRUCTL_3=0x202 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_DEREGISTERNOTIFICATION_1=0x29e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_DEREGISTERNOTIFICATION_2=0x29f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_DTOR_1=0x29b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_EXTFUNC_1=0x2a2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_1=0x20d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_2=0x20e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_3=0x20f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_4=0x210 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSNEGPROFILESL_5=0x211 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_1=0x258 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_2=0x259 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_3=0x25a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_4=0x25b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSQOSPROFILECAPS_5=0x25c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_1=0x203 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_10=0x20c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_2=0x204 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_3=0x205 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_4=0x206 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_5=0x207 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_6=0x208 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_7=0x209 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_8=0x20a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETGPRSREQPROFILESL_9=0x20b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILECANCEL_1=0x2be +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILECAPSCANCEL_1=0x2c0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILECAPS_1=0x2bf +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILEFAILSETTINGS_1=0x256 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILEFAILSETTINGS_2=0x257 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETPROFILE_1=0x2bd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_1=0x278 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_10=0x281 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_11=0x282 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_12=0x283 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_13=0x284 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_14=0x285 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_15=0x286 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_16=0x287 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_17=0x288 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_2=0x279 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_3=0x27a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_4=0x27b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_5=0x27c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_6=0x27d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_7=0x27e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_8=0x27f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NEGPROFILESL_9=0x280 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_1=0x289 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_10=0x292 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_11=0x293 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_12=0x294 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_13=0x295 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_14=0x296 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_15=0x297 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_16=0x298 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_2=0x28a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_3=0x28b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_4=0x28c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_5=0x28d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_6=0x28e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_7=0x28f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_8=0x290 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5NETWORKNOTIFICATIONSL_9=0x291 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_1=0x24e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_2=0x24f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_3=0x250 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_4=0x251 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_5=0x252 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_6=0x253 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_7=0x254 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5QOSPROFILECAPS_8=0x255 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_1=0x25d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_10=0x266 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_11=0x267 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_12=0x268 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_13=0x269 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_14=0x26a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_15=0x26b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_16=0x26c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_17=0x26d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_18=0x26e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_19=0x26f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_2=0x25e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_20=0x270 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_21=0x271 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_22=0x272 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_23=0x273 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_24=0x274 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_25=0x275 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_26=0x276 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_27=0x277 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_3=0x25f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_4=0x260 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_5=0x261 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_6=0x262 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_7=0x263 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_8=0x264 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR5REQPROFILESL_9=0x265 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_1=0x22b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_10=0x234 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_11=0x235 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_12=0x236 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_13=0x237 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_14=0x238 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_15=0x239 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_2=0x22c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_3=0x22d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_4=0x22e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_5=0x22f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_6=0x230 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_7=0x231 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_8=0x232 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NEGPROFILESL_9=0x233 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_1=0x23a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_10=0x243 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_11=0x244 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_12=0x245 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_13=0x246 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_14=0x247 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_2=0x23b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_3=0x23c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_4=0x23d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_5=0x23e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_6=0x23f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_7=0x240 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_8=0x241 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99NETWORKNOTIFICATIONSL_9=0x242 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_1=0x248 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_2=0x249 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_3=0x24a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_4=0x24b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_5=0x24c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99QOSPROFILECAPS_6=0x24d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_1=0x212 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_10=0x21b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_11=0x21c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_12=0x21d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_13=0x21e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_14=0x21f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_15=0x220 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_16=0x221 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_17=0x222 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_18=0x223 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_19=0x224 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_2=0x213 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_20=0x225 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_21=0x226 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_22=0x227 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_23=0x228 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_24=0x229 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_25=0x22a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_3=0x214 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_4=0x215 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_5=0x216 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_6=0x217 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_7=0x218 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_8=0x219 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETR99REQPROFILESL_9=0x21a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETSETQOSSETTINGS_1=0x299 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_GETSETQOSSETTINGS_2=0x29a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_NOTIFYPROFILECHANGEDCANCEL_1=0x2c1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_NUMBEROFSLOTSL_1=0x2a0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_NUMBEROFSLOTSL_2=0x2a1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_REGISTERNOTIFICATION_1=0x29c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_REGISTERNOTIFICATION_2=0x29d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILECANCEL_1=0x2bc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_1=0x2a4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_10=0x2ad +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_11=0x2ae +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_12=0x2af +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_13=0x2b0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_14=0x2b1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_15=0x2b2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_16=0x2b3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_17=0x2b4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_18=0x2b5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_19=0x2b6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_2=0x2a5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_20=0x2b7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_21=0x2b8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_22=0x2b9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_23=0x2ba +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_24=0x2bb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_3=0x2a6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_4=0x2a7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_5=0x2a8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_6=0x2a9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_7=0x2aa +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_8=0x2ab +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETQOS_SETPROFILE_9=0x2ac +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ACTIONEVENT_1=0x2f6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ACTIONEVENT_2=0x2f7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ATTACHCANCEL_1=0x2db +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ATTACH_1=0x2da +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CANCELSERVICE_1=0x2d8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CHANGESTATE_1=0x2f4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CHANGESTATE_2=0x2f5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_1=0x5ce +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_10=0x2cb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_11=0x2cc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_12=0x2cd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_13=0x2ce +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_14=0x2cf +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_15=0x5cf +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_2=0x2c3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_3=0x2c4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_4=0x2c5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_5=0x2c6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_6=0x2c7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_7=0x2c8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_8=0x2c9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_CONSTRUCTL_9=0x2ca +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DEREGISTERNOTIFICATION_1=0x2d3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DEREGISTERNOTIFICATION_2=0x2d4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DETACHCANCEL_1=0x2dd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DETACH_1=0x2dc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_DTOR_1=0x2d0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ENUMERATECONTEXTSCANCEL_1=0x2e3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ENUMERATECONTEXTS_1=0x2e2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ENUMERATEMBMSACTIVESERVICELIST_1=0x30c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_ENUMERATEMBMSMONITORSERVICELIST_1=0x30b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETATTACHMODE_1=0x2ec +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETCONTEXTINFO_1=0x2e4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETCURRENTRELEASEMODE_1=0x2f8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETDEFAULTCONTEXTPARAMS_1=0x2f0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETDYNAMICCAPS_1=0x2e8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETGPRSDEFAULTCONTEXTPARAMS_1=0x2ef +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTCANCEL_1=0x30a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTPHASE1_1=0x306 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETMBMSMONITOREDSERVICESLISTPHASE2_1=0x309 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETMBMSNETWORKSERVICESTATUS_1=0x2fb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETNTWKREGSTATUS_1=0x2e5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETSTATICCAPS_1=0x2e7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_GETSTATUS_1=0x2de +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYATTACHMODECHANGECANCEL_1=0x2fa +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYATTACHMODECHANGE_1=0x2ed +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYCHANGEOFNTWKREGSTATUSCANCEL_1=0x2e6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYCONTEXTACTIVATIONREQUESTEDCANCEL_1=0x2e1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYCONTEXTACTIVATIONREQUESTED_1=0x2e0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYCONTEXTADDEDCANCEL_1=0x2d9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYDYNAMICCAPSCHANGECANCEL_1=0x2ea +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYDYNAMICCAPSCHANGE_1=0x2e9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYMBMSNETWORKSERVICESTATUSCHANGECANCEL_1=0x2fd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1=0x2fc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYMBMSSERVICEAVAILABILITYCHANGECANCEL_1=0x2ff +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYMBMSSERVICEAVAILABILITYCHANGE_1=0x2fe +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYRELEASEMODECHANGECANCEL_1=0x2f9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NOTIFYSTATUSCHANGECANCEL_1=0x2df +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NUMBEROFSLOTSL_1=0x2d5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NUMBEROFSLOTSL_2=0x2d6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_NUMBEROFSLOTSL_3=0x2d7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_PROCESSGETMBMSMONITOREDSERVICESLISTPHASE1L_1=0x307 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_PROCESSGETMBMSMONITOREDSERVICESLISTPHASE1L_2=0x308 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_REGISTERNOTIFICATION_1=0x2d1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_REGISTERNOTIFICATION_2=0x2d2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_SETATTACHMODE_1=0x2eb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_SETDEFAULTCONTEXTPARAMS_1=0x2ee +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_SIMPSEVENT_1=0x2f3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_TIMERCALLBACK_1=0x2f1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_TIMERCALLBACK_2=0x2f2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTCANCEL_1=0x305 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_1=0x300 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_2=0x301 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_3=0x302 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_4=0x303 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPACKETSERVICE_UPDATEMBMSMONITORSERVICELISTL_5=0x304 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CFGFILE_1=0x321 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_1=0x5d0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_2=0x64c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_3=0x30f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_4=0x310 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_5=0x5d2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_CONSTRUCTL_6=0x5d3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBDELETE_1=0x31a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBDELETE_2=0x31b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBDELETE_3=0x31c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBWRITE_1=0x318 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATEOOBWRITE_2=0x319 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_1=0x5d4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_2=0x5d5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_3=0x314 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_4=0x315 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_5=0x316 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_6=0x5d6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_POPULATESTOREFROMCONFIGFILEL_7=0x5d7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_WRITE_1=0x31d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_WRITE_2=0x31e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_WRITE_3=0x31f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKSTORE_WRITE_4=0x320 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CFGFILE_1=0x349 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_1=0x5d8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_2=0x5d9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_3=0x324 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_4=0x325 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_5=0x326 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_6=0x327 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_7=0x5da +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_CONSTRUCTL_8=0x5db +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_1=0x338 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_2=0x339 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_3=0x33a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBDELETE_4=0x33b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_1=0x333 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_2=0x334 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_3=0x335 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_4=0x336 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATEOOBWRITE_5=0x337 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_1=0x5dc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_10=0x5de +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_11=0x5df +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_2=0x5dd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_3=0x32b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_4=0x32c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_5=0x32d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_6=0x32e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_7=0x32f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_8=0x330 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_POPULATESTOREFROMCONFIGFILEL_9=0x331 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_TIMERCALLBACK_1=0x346 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_TIMERCALLBACK_2=0x347 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_TIMERCALLBACK_3=0x348 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_1=0x33c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_10=0x345 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_2=0x33d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_3=0x33e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_4=0x33f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_5=0x340 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_6=0x341 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_7=0x342 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_8=0x343 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHBKUSIMSTORE_WRITE_9=0x344 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_CFGFILE_1=0x380 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_CONSTRUCTL_1=0x37e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_CONSTRUCTL_2=0x37f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATACANCEL_1=0x398 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHENTICATIONDATA_1=0x397 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOCANCEL_1=0x394 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE1_1=0x391 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_GETAUTHORIZATIONINFOPHASE2_1=0x393 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGEDCANCEL_1=0x396 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_NOTIFYIMSAUTHORIZATIONINFOCHANGED_1=0x395 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_1=0x389 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_2=0x38a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_3=0x38b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_4=0x38c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_5=0x38d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_6=0x38e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_7=0x38f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHENTICATIONINFOL_8=0x390 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_1=0x381 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_2=0x382 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_3=0x383 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_4=0x384 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_5=0x385 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_6=0x386 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_7=0x387 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PARSEAUTHORIZATIONINFOL_8=0x388 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEIMSAUTH_PROCESSGETAUTHORIZATIONINFOPHASE1L_1=0x392 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CFGFILE_1=0x3b9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_1=0x5f2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_10=0x3a2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_11=0x5f6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_12=0x5f7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_13=0x5f8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_14=0x5f9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_15=0x646 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_16=0x3a9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_17=0x3aa +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_18=0x3ab +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_19=0x3ac +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_2=0x5f3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_20=0x3ad +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_21=0x650 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_22=0x3af +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_23=0x3b0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_24=0x3b1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_25=0x3b2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_26=0x3b3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_27=0x3b4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_28=0x3b5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_29=0x3b6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_3=0x5f4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_30=0x3b7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_31=0x5fa +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_32=0x5fb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_33=0x5fc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_34=0x5fd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_35=0x5fe +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_36=0x5ff +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_37=0x647 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_38=0x648 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_39=0x649 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_4=0x5f5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_5=0x39d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_6=0x39e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_7=0x39f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_8=0x3a0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_CONSTRUCTL_9=0x3a1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_NUMBEROFSLOTSL_1=0x3b8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESECURITY_SECURITYEVENT_1=0x3ba +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_1=0x3e7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_2=0x3e8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_ACTIVATESMARTCARDAPP_3=0x3e9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_CFGFILE_1=0x3be +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_CONSTRUCTL_1=0x3bb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_CONSTRUCTL_2=0x3bc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_GETSCFILEINFOCANCEL_1=0x3c7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_GETSCFILEINFO_1=0x3c6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_NUMBEROFSLOTSL_1=0x3bd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_1=0x3ca +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_10=0x3d3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_11=0x3d4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_12=0x3d5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_13=0x3d6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_2=0x3cb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_3=0x3cc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_4=0x3cd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_5=0x3ce +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_6=0x3cf +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_7=0x3d0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_8=0x3d1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDAPPLICATIONINFOL_9=0x3d2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_1=0x3d7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_10=0x3e0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_11=0x3e1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_12=0x3e2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_13=0x3e3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_14=0x3e4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_15=0x3e5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_16=0x3e6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_2=0x3d8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_3=0x3d9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_4=0x3da +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_5=0x3db +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_6=0x3dc +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_7=0x3dd +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_8=0x3de +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_PARSESMARTCARDFILEINFOL_9=0x3df +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_READSCFILECANCEL_1=0x3c8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TCYCLICSMARTCARDFILE_READFILE_1=0x659 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_1=0x3ea +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TERMINATESMARTCARDAPP_2=0x3eb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_READFILE_1=0x65a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TLINEARSMARTCARDFILE_UPDATEFILE_1=0x65b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_1=0x65c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_READFILE_2=0x65d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_1=0x65e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_TTRANSPARENTSMARTCARDFILE_UPDATEFILE_2=0x65f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONESMARTCARDAPP_UPDATESCFILECANCEL_1=0x3c9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CFGFILE_1=0x3f3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_1=0x600 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_2=0x601 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_3=0x602 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_4=0x3f1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_5=0x603 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_6=0x604 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_CONSTRUCTL_7=0x605 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONEUSIMAPP_NUMBEROFSLOTSL_1=0x3f2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CNETWORKMODETIMERCALLBACK_TIMERCALLBACK_1=0x654 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_1=0x5e0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_2=0x350 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_3=0x351 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_4=0x352 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CONSTRUCTL_5=0x5e1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_1=0x5ee +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_2=0x5ef +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_3=0x36a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_4=0x5f0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CREATEONSTOREL_5=0x5f1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CSIMTESTNUMBEROBSERVER_CONSTRUCTL_1=0x655 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CSIMTESTNUMBEROBSERVER_DOCANCEL_1=0x658 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CSIMTESTNUMBEROBSERVER_RUNL_1=0x657 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_CSIMTESTNUMBEROBSERVER_START_1=0x656 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_DTOR_1=0x356 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_1=0x5e2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_10=0x362 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_11=0x363 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_12=0x5e8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_13=0x5e9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_14=0x5ea +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_15=0x5eb +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_16=0x5ec +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_17=0x5ed +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_2=0x5e3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_3=0x5e4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_4=0x5e5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_5=0x5e6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_6=0x5e7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_7=0x35f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_8=0x360 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_FINDANDCREATEPHBKSTORESL_9=0x361 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETPHONEIDANDCAPS_1=0x373 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETPHONEIDANDCAPS_2=0x374 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETPHONEIDANDCAPS_3=0x375 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETPHONEIDANDCAPS_4=0x376 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETTESTNUMBER_1=0x353 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_GETTESTNUMBER_2=0x354 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_INITPHONESTATUS_1=0x357 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_NOTIFYMODECHANGECANCEL_1=0x379 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_NOTIFYMODECHANGE_1=0x378 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_OPENNEWOBJECTBYNAMEL_1=0x36c +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_OPENNEWOBJECTBYNAMEL_2=0x36d +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_OPENNEWOBJECTBYNAMEL_3=0x36e +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_OPENNEWOBJECTBYNAMEL_4=0x36f +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_POPULATESERVICETABLEL_1=0x34a +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_POPULATESERVICETABLEL_2=0x34b +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_POPULATESERVICETABLEV8L_1=0x651 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_POPULATESERVICETABLEV8L_2=0x652 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_SETTESTNUMBERANDREADCONFIGURATIONFILE_1=0x653 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_SETTESTNUMBERINUSE_1=0x355 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_VALIDATECHANGESTATE1_1=0x372 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_VALIDATECHANGESTATE_1=0x370 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPHONE_VALIDATECHANGESTATE_2=0x371 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPUBSUB_NEWL_1=0x3f4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMPUBSUB_NEWL_2=0x3f5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_ATTACHL_1=0x3f8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_DETACHL_1=0x3f9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_1=0x400 +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_2=0x401 +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_3=0x402 +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_4=0x403 +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY1_5=0x404 +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_1=0x3fa +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_2=0x3fb +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_3=0x3fc +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_4=0x3fd +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_5=0x3fe +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_NOTIFY_6=0x3ff +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_SIMPSEVENT_1=0x3f6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMREDUCETIMERS_SIMPSEVENT_2=0x3f7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CANCELSERVICE_1=0x412 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_1=0x60c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_10=0x420 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_11=0x421 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_12=0x422 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_13=0x423 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_14=0x424 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_15=0x425 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_16=0x426 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_17=0x427 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_18=0x428 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_19=0x429 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_2=0x60d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_20=0x42a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_21=0x42b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_22=0x42c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_23=0x42d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_24=0x42e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_25=0x42f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_26=0x430 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_27=0x431 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_28=0x432 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_29=0x433 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_3=0x419 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_30=0x434 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_31=0x435 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_32=0x436 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_33=0x437 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_34=0x438 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_35=0x439 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_36=0x43a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_37=0x43b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_38=0x43c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_39=0x43d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_4=0x41a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_40=0x43e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_41=0x43f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_42=0x440 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_43=0x441 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_44=0x442 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_45=0x443 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_46=0x444 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_47=0x445 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_48=0x446 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_49=0x447 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_5=0x41b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_50=0x448 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_51=0x449 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_52=0x44a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_53=0x44b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_54=0x44c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_55=0x44d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_56=0x44e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_57=0x44f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_58=0x450 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_59=0x451 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_6=0x41c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_60=0x452 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_61=0x453 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_62=0x454 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_63=0x455 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_64=0x456 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_65=0x457 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_66=0x458 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_67=0x60e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_68=0x60f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_7=0x41d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_8=0x41e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONFIGL_9=0x41f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_1=0x606 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_2=0x607 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_3=0x608 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_4=0x609 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_5=0x60a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_CONSTRUCTL_6=0x60b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_DEREGISTERNOTIFICATION_1=0x40e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_DEREGISTERNOTIFICATION_2=0x40f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_DTOR_1=0x40a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_NUMBEROFSLOTSL_1=0x410 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_NUMBEROFSLOTSL_2=0x411 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_REFRESHALLOWED_1=0x413 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_REGISTERNOTIFICATION_1=0x40c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_REGISTERNOTIFICATION_2=0x40d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_REQMODEL_1=0x40b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_TERMINALRSP_1=0x414 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_TIMERCALLBACK_1=0x415 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSAT_TIMERCALLBACK_2=0x416 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_1=0x610 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_2=0x611 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_3=0x45d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_4=0x612 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_5=0x613 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_CONSTRUCTL_6=0x64a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_GETSIGNALSTRENGTH_1=0x45f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_GETSIGNALSTRENGTH_2=0x64e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGECANCEL_1=0x462 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGECANCEL_2=0x463 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_NOTIFYSIGNALSTRENGTHCHANGE_1=0x461 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_PUBSUBCALLBACK_1=0x465 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_PUBSUBCALLBACK_2=0x466 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSIGNALSTRENGTH_TIMERCALLBACK_1=0x464 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_CONSTRUCTL_1=0x4e6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_DTOR_1=0x4e7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_GETSCAUTHENTICATIONDATACANCEL_1=0x4e9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_GETSCAUTHENTICATIONDATA_1=0x4e8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_1=0x629 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_10=0x4f5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_11=0x62c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_12=0x62d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_13=0x62e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_2=0x62a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_3=0x62b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_4=0x4ef +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_5=0x4f0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_6=0x4f1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_7=0x4f2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_8=0x4f3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEAUTHINFOL_9=0x4f4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_1=0x62f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_10=0x501 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_11=0x502 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_12=0x503 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_13=0x504 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_14=0x631 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_15=0x632 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_2=0x630 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_3=0x4fa +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_4=0x4fb +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_5=0x4fc +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_6=0x4fd +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_7=0x4fe +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_8=0x4ff +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEGBAAUTHINFOL_9=0x500 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_1=0x633 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_10=0x510 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_11=0x511 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_12=0x512 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_13=0x513 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_14=0x514 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_15=0x635 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_16=0x636 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_2=0x634 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_3=0x509 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_4=0x50a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_5=0x50b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_6=0x50c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_7=0x50d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_8=0x50e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDAUTH_PARSEMBMSAUTHINFOL_9=0x50f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_CONSTRUCTL_1=0x515 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_CONSTRUCTL_2=0x516 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_CREATESCEAPSUBSESSIONL_1=0x543 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_CREATESCEAPSUBSESSIONL_2=0x544 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_DTOR_1=0x517 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_DTOR_2=0x518 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_1=0x637 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_10=0x525 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_11=0x526 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_12=0x527 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_13=0x528 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_14=0x529 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_15=0x52a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_16=0x52b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_17=0x52c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_18=0x52d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_19=0x52e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_2=0x638 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_20=0x52f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_21=0x530 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_22=0x531 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_23=0x532 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_24=0x533 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_25=0x534 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_26=0x535 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_27=0x536 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_28=0x537 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_29=0x538 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_3=0x639 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_30=0x539 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_31=0x53a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_32=0x53b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_33=0x53c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_34=0x53d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_35=0x53e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_36=0x53f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_37=0x540 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_38=0x541 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_39=0x542 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_4=0x51f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_40=0x63a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_41=0x63b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_42=0x63c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_5=0x520 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_6=0x521 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_7=0x522 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_8=0x523 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAPMANAGER_PARSEEAPINFOL_9=0x524 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_CONSTRUCTL_1=0x545 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_CONSTRUCTL_2=0x546 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_DTOR_1=0x547 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMCOMPLETENOTIFYEAPMETHODACCESSSTATUSCHANGE_1=0x562 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETAUTHENTICATEDATAFORPHASE2_1=0x55c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETAUTHENTICATIONSTATUSCANCEL_1=0x552 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETAUTHENTICATIONSTATUS_1=0x551 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEYCANCEL_1=0x557 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEY_1=0x553 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEY_2=0x554 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEY_3=0x555 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPKEY_4=0x556 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETEAPMETHODACCESSSTATUS_1=0x55f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITYCANCEL_1=0x550 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_1=0x54c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_2=0x54d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_3=0x54e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMGETUSERIDENTITY_4=0x54f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHODCANCEL_1=0x54b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_1=0x548 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_2=0x549 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMINITIALISEEAPMETHOD_3=0x54a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMNOTIFYEAPMETHODACCESSSTATUSCHANGECANCEL_1=0x561 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMNOTIFYEAPMETHODACCESSSTATUSCHANGE_1=0x560 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMRELEASEEAPMETHOD_1=0x55e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_1=0x558 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_2=0x559 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_3=0x55a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSETAUTHENTICATEDATAFORPHASE1_4=0x55b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMARTCARDEAP_SIMSMARTCARDEAPAUTHENTICATIONCANCEL_1=0x55d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONRXEVENTSTORED_1=0x584 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_1=0x581 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDCLIENTACK_2=0x582 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONRXEVENTUNSTOREDPHONEACK_1=0x583 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ACTIONTXEVENT_1=0x586 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_1=0x587 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_ATTEMPTSMSRXCOMPLETE_2=0x588 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_CFGFILESECTION_1=0x595 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_1=0x589 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_COMPLETETXPENDINGREQ_2=0x58a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_DUMPPDU1_1=0x596 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_DUMPPDU1_2=0x597 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_1=0x570 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_2=0x571 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATECONSTRAINTS_3=0x572 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_1=0x63d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_2=0x63e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_3=0x63f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_4=0x56a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_5=0x640 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_6=0x641 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATERXATTRIBUTESL_7=0x642 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_1=0x575 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_2=0x576 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_3=0x577 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_4=0x578 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_5=0x579 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_6=0x57a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSPARAMSL_7=0x57b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_1=0x573 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATESMSSTORESL_2=0x574 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_1=0x56b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_2=0x64b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_3=0x56d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_4=0x56e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_FINDANDCREATETXATTRIBUTESL_5=0x56f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_INITIALIZEL_1=0x563 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_INITIALIZEL_2=0x564 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_IPCMATCH_1=0x57e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_IPCMATCH_2=0x57f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGREQUEST1_1=0x57c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGREQUEST1_2=0x57d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_1=0x598 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_10=0x5a1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_11=0x5a2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_12=0x5a3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_2=0x599 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_3=0x59a +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_4=0x59b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_5=0x59c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_6=0x59d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_7=0x59e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_8=0x59f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_LOGTMOBILESMSATTRIBUTESV1_9=0x5a0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_OPENNEWOBJECTBYNAMEL_1=0x580 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_POPULATESMSRXATTRIB_1=0x58e +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_RECEIVEMESSAGEL_1=0x585 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STARTSMSMTTIMER_1=0x58b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STARTSMSMTTIMER_2=0x58c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STARTSMSMTTIMER_3=0x58d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STORESMSPLIST_1=0x58f +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_STORESMSPLIST_2=0x590 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_TIMERCALLBACK_1=0x591 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_TIMERCALLBACK_2=0x592 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_TIMERCALLBACK_3=0x593 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSMESSAGING_TIMERCALLBACK_4=0x594 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_CFGFILESECTION_1=0x471 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_CONSTRUCTL_1=0x614 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_CONSTRUCTL_2=0x468 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_CONSTRUCTL_3=0x615 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_LOGREQUEST_1=0x660 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_LOGREQUEST_2=0x661 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_1=0x616 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_2=0x617 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_3=0x46b +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_4=0x46c +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_5=0x46d +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_6=0x618 +[TRACE]TRACE_INTERNALS[0x88]_CSIMSMSSTORE_POPULATESTOREFROMCONFIGFILE_7=0x619 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_1=0x61a +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_10=0x47b +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_11=0x47c +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_12=0x47d +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_13=0x47e +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_14=0x47f +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_15=0x480 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_16=0x481 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_17=0x482 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_18=0x483 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_19=0x484 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_2=0x61b +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_20=0x485 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_21=0x486 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_22=0x487 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_23=0x488 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_24=0x489 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_25=0x48b +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_26=0x48c +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_27=0x48d +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_28=0x48e +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_29=0x48f +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_3=0x61c +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_30=0x490 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_31=0x491 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_32=0x492 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_33=0x493 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_34=0x494 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_35=0x645 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_36=0x496 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_37=0x497 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_38=0x499 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_39=0x49a +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_4=0x61d +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_40=0x49c +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_41=0x49d +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_42=0x49e +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_43=0x49f +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_44=0x4a0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_45=0x4a1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_46=0x4a2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_47=0x4a3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_48=0x4a4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_49=0x4a5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_5=0x476 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_50=0x4a6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_51=0x4a7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_52=0x4a8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_53=0x4a9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_54=0x4ab +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_55=0x4ac +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_56=0x4ad +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_57=0x61e +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_58=0x61f +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_59=0x620 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_6=0x477 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_60=0x621 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_61=0x622 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_7=0x478 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_8=0x479 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_CONSTRUCTL_9=0x47a +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_DTOR_1=0x4ae +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_DTOR_2=0x4af +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_GETPREFERREDNETWORKSCANCEL_1=0x4b3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_GETPREFERREDNETWORKSCANCEL_2=0x4b4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_GETPREFERREDWLANSIDSCANCEL_1=0x4b1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_GETPREFERREDWLANSIDSCANCEL_2=0x4b2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMUSIMR6_TIMERCALLBACK_1=0x4b0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_1=0x4d1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_10=0x4da +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_11=0x4db +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_12=0x4dc +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_13=0x4dd +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_2=0x4d2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_3=0x4d3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_4=0x4d4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_5=0x4d5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_6=0x4d6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_7=0x4d7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_8=0x4d8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ACTIONEVENT_9=0x4d9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_1=0x4c6 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_2=0x4c7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_1=0x4cb +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_2=0x4cc +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVL_1=0x4c8 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVL_2=0x4c9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALLISVL_3=0x4ca +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALL_1=0x4c3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALL_2=0x4c4 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_ANSWERINCOMINGCALL_3=0x4c5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_1=0x623 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_2=0x624 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_3=0x4b7 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_4=0x625 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_CONSTRUCTL_5=0x626 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALCANCEL_1=0x4bc +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALCANCEL_2=0x4bd +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISVCANCEL_1=0x4c1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISVCANCEL_2=0x4c2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISV_1=0x4be +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISV_2=0x4bf +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIALISV_3=0x4c0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIAL_1=0x4b9 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIAL_2=0x4ba +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_DIAL_3=0x4bb +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_HANGUPCANCEL_1=0x4cf +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_HANGUPCANCEL_2=0x4d0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_HANGUP_1=0x4cd +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_HANGUP_2=0x4ce +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_1=0x627 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_2=0x4e0 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_PROCESSREMOTEHANGUPL_1=0x628 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_PROCESSREMOTEHANGUPL_2=0x4e1 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_TIMERCALLBACK_1=0x4de +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICECALL_TIMERCALLBACK_2=0x4df +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICELINE_CREATENEWCALLL_1=0x4e5 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_1=0x4e2 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_2=0x4e3 +[TRACE]TRACE_INTERNALS[0x88]_CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_3=0x4e4 +[TRACE]TRACE_INTERNALS[0x88]_MCOMM_COMMOPEN1_1=0x459 +[TRACE]TRACE_INTERNALS[0x88]_MCOMM_COMMOPEN1_2=0x45a diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/dial/group/BLD.INF --- a/telephonyutils/dial/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -// Copyright (c) 1999-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Phone number resolving utilities -// -// - -/** - @file - @deprecated This component has been deprecated from 9.1 and should no longer be used. -*/ - -PRJ_PLATFORMS - -DEFAULT - -PRJ_EXPORTS - -DIAL.IBY /epoc32/rom/include/dial.iby - -../inc/DIAL.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(dial.h) -../inc/DIAL.INL SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(dial.inl) -../inc/dial_consts.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(dial_consts.h) - -PRJ_MMPFILES - -../group/DIAL.MMP - -PRJ_TESTEXPORTS - -../Test/TE_Dial/TE_Dial.iby /epoc32/rom/include/te_dial.iby - -../Test/TE_Dial/TE_Dial.script z:/testdata/scripts/te_dial.script - -../Test/TE_Dial/TE_Dial_setup.script z:/testdata/scripts/te_dial_setup.script - -PRJ_TESTMMPFILES - -../Test/TE_Dial/TE_Dial.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/dial/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyutils/dial/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,49 @@ +// Copyright (c) 1999-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Phone number resolving utilities +// +// + +/** + @file + @deprecated This component has been deprecated from 9.1 and should no longer be used. +*/ + +PRJ_PLATFORMS + +DEFAULT + +PRJ_EXPORTS + +DIAL.IBY /epoc32/rom/include/dial.iby + +../inc/DIAL.H SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(dial.h) +../inc/DIAL.INL SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(dial.inl) +../inc/dial_consts.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(dial_consts.h) + +PRJ_MMPFILES + +../group/DIAL.MMP + +PRJ_TESTEXPORTS + +../Test/TE_Dial/TE_Dial.iby /epoc32/rom/include/te_dial.iby + +../Test/TE_Dial/TE_Dial.script z:/testdata/scripts/te_dial.script + +../Test/TE_Dial/TE_Dial_setup.script z:/testdata/scripts/te_dial_setup.script + +PRJ_TESTMMPFILES + +../Test/TE_Dial/TE_Dial.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/dial/group/telephony_dial.mrp --- a/telephonyutils/dial/group/telephony_dial.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/dial/group/telephony_dial.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_dial source \sf\os\cellularsrv\telephonyutils\dial diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/etel3rdpartyapi/ExampleApps/Group/Bld.inf --- a/telephonyutils/etel3rdpartyapi/ExampleApps/Group/Bld.inf Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -// 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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Telephony 3rd party Example Applications. -// -// - -/** - @file -*/ - -PRJ_TESTMMPFILES - -../AutoDTMFDialler/AutoDTMF.mmp -../OutgoingCalls/OutgoingCalls.mmp -../IncomingCalls/IncomingCalls.mmp -../NetworkInformation/NetworkInformation.mmp -../PhoneId/PhoneId.mmp -../PhoneMonitoring/PhoneMonitoring.mmp -../SuppleServices/SuppleServices.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/etel3rdpartyapi/ExampleApps/Group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyutils/etel3rdpartyapi/ExampleApps/Group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,30 @@ +// 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Telephony 3rd party Example Applications. +// +// + +/** + @file +*/ + +PRJ_TESTMMPFILES + +../AutoDTMFDialler/AutoDTMF.mmp +../OutgoingCalls/OutgoingCalls.mmp +../IncomingCalls/IncomingCalls.mmp +../NetworkInformation/NetworkInformation.mmp +../PhoneId/PhoneId.mmp +../PhoneMonitoring/PhoneMonitoring.mmp +../SuppleServices/SuppleServices.mmp diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/etel3rdpartyapi/Group/Bld.inf --- a/telephonyutils/etel3rdpartyapi/Group/Bld.inf Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* Copyright (c) 2009 Sony Ericsson Mobile Communications AB -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Sony Ericsson Mobile Communications AB - initial contribution. -* Nokia Corporation - additional changes. -* -* Contributors: -* -* Description: -* Component description file -* Telephony 3rd party API -* -*/ - - -/** - @file -*/ - -PRJ_MMPFILES - -Etel3rdParty.mmp - - -PRJ_TESTMMPFILES - -../Test/te_etelIsv/TE_EtelIsv.mmp -../Test/te_etelisvcaps/group/te_etelisvcaps.mmp -../Test/te_etelisvcaps/group/callrunner.mmp - -#include "../ExampleApps/Group/bld.inf" - -PRJ_EXPORTS - -../Group/etelisv.iby /epoc32/rom/include/etelisv.iby - -../inc/Etel3rdParty.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(etel3rdparty.h) -../inc/Telephony.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(telephony.inl) - -PRJ_TESTEXPORTS - -../Test/te_etelIsv/te_etelisv.iby /epoc32/rom/include/te_etelisv.iby - -../Test/te_etelIsv/TE_EtelIsv.script z:/testdata/scripts/te_etelisv.script -../Test/te_etelIsv/TE_EtelIsv_setup.script z:/testdata/scripts/te_etelisv_setup.script -../Test/te_etelIsv/te_etelisvnocaps.script z:/testdata/scripts/te_etelisvnocaps.script -../Test/te_etelIsv/TE_EtelIsv_config.txt z:/testdata/configs/te_etelisv_config.txt -../Test/te_etelIsv/TE_EtelIsv.cfg z:/testdata/configs/te_etelisv.cfg -../Test/te_etelIsv/TE_EtelIsv.ini z:/testdata/configs/te_etelisv.ini - -// Capability Test scripts -../Test/te_etelisvcaps/scripts/te_etelisvcaps.script z:/testdata/scripts/te_etelisvcaps.script -../Test/te_etelisvcaps/scripts/te_etelisvcaps_setup.script z:/testdata/scripts/te_etelisvcaps_setup.script -../Test/te_etelisvcaps/scripts/te_etelisvcaps_teststeps.script z:/testdata/scripts/te_etelisvcaps_teststeps.script - -// Capability Test Data -../Test/te_etelisvcaps/testdata/te_etelisvcaps.ini z:/testdata/configs/te_etelisvcaps.ini -../Test/te_etelisvcaps/testdata/te_etelisvcaps_simtsy.cfg z:/testdata/configs/te_etelisvcaps_simtsy.cfg -../Test/te_etelisvcaps/testdata/te_etelisvcaps_comms.cfg z:/testdata/configs/te_etelisvcaps_comms.cfg -../Test/te_etelisvcaps/group/te_etelisvcaps.iby /epoc32/rom/include/te_etelisvcaps.iby diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/etel3rdpartyapi/Group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyutils/etel3rdpartyapi/Group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,66 @@ +/* +* Copyright (c) 2009 Sony Ericsson Mobile Communications AB +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Sony Ericsson Mobile Communications AB - initial contribution. +* Nokia Corporation - additional changes. +* +* Contributors: +* +* Description: +* Component description file +* Telephony 3rd party API +* +*/ + + +/** + @file +*/ + +PRJ_MMPFILES + +Etel3rdParty.mmp + + +PRJ_TESTMMPFILES + +../Test/te_etelIsv/TE_EtelIsv.mmp +../Test/te_etelisvcaps/group/te_etelisvcaps.mmp +../Test/te_etelisvcaps/group/callrunner.mmp + +#include "../ExampleApps/Group/bld.inf" + +PRJ_EXPORTS + +../Group/etelisv.iby /epoc32/rom/include/etelisv.iby + +../inc/Etel3rdParty.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(etel3rdparty.h) +../inc/Telephony.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(telephony.inl) + +PRJ_TESTEXPORTS + +../Test/te_etelIsv/te_etelisv.iby /epoc32/rom/include/te_etelisv.iby + +../Test/te_etelIsv/TE_EtelIsv.script z:/testdata/scripts/te_etelisv.script +../Test/te_etelIsv/TE_EtelIsv_setup.script z:/testdata/scripts/te_etelisv_setup.script +../Test/te_etelIsv/te_etelisvnocaps.script z:/testdata/scripts/te_etelisvnocaps.script +../Test/te_etelIsv/TE_EtelIsv_config.txt z:/testdata/configs/te_etelisv_config.txt +../Test/te_etelIsv/TE_EtelIsv.cfg z:/testdata/configs/te_etelisv.cfg +../Test/te_etelIsv/TE_EtelIsv.ini z:/testdata/configs/te_etelisv.ini + +// Capability Test scripts +../Test/te_etelisvcaps/scripts/te_etelisvcaps.script z:/testdata/scripts/te_etelisvcaps.script +../Test/te_etelisvcaps/scripts/te_etelisvcaps_setup.script z:/testdata/scripts/te_etelisvcaps_setup.script +../Test/te_etelisvcaps/scripts/te_etelisvcaps_teststeps.script z:/testdata/scripts/te_etelisvcaps_teststeps.script + +// Capability Test Data +../Test/te_etelisvcaps/testdata/te_etelisvcaps.ini z:/testdata/configs/te_etelisvcaps.ini +../Test/te_etelisvcaps/testdata/te_etelisvcaps_simtsy.cfg z:/testdata/configs/te_etelisvcaps_simtsy.cfg +../Test/te_etelisvcaps/testdata/te_etelisvcaps_comms.cfg z:/testdata/configs/te_etelisvcaps_comms.cfg +../Test/te_etelisvcaps/group/te_etelisvcaps.iby /epoc32/rom/include/te_etelisvcaps.iby diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp --- a/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_etel3rdparty source \sf\os\cellularsrv\telephonyutils\etel3rdpartyapi binary \sf\os\cellularsrv\telephonyutils\etel3rdpartyapi\Group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchersUnit.mmp --- a/telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchersUnit.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchersUnit.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -39,6 +39,7 @@ USERINCLUDE ../../inc USERINCLUDE . USERINCLUDE .. +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN MW_LAYER_SYSTEMINCLUDE_SYMBIAN @@ -50,6 +51,6 @@ LIBRARY testexecutelogclient.lib LIBRARY testexecuteutils.lib LIBRARY commsdat.lib -DEBUGLIBRARY comsdbgutil.lib + SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/Test/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyutils/telephonywatchers/Test/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,47 @@ +// Copyright (c) 2000-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Telephony watcher plugins +// +// + +/** + @file +*/ + +PRJ_TESTMMPFILES +../TE_TelWatchers/TE_TelWatchersInt.mmp +../TE_TelWatchers/TE_TelWatchersUnit.mmp + +PRJ_TESTEXPORTS +../TE_TelWatchers/TE_TelWatchers.iby /epoc32/rom/include/te_telwatchers.iby + +../TE_TelWatchers/TE_TelWatchers.script /epoc32/release/wins/udeb/z/testdata/scripts/te_telwatchers.script +../TE_TelWatchers/TE_TelWatchers.script /epoc32/release/wins/urel/z/testdata/scripts/te_telwatchers.script +../TE_TelWatchers/TE_TelWatchers.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_telwatchers.script +../TE_TelWatchers/TE_TelWatchers.script /epoc32/release/winscw/urel/z/testdata/scripts/te_telwatchers.script + +../TE_TelWatchers/TE_TelWatchers_setup.script /epoc32/release/wins/udeb/z/testdata/scripts/te_telwatchers_setup.script +../TE_TelWatchers/TE_TelWatchers_setup.script /epoc32/release/wins/urel/z/testdata/scripts/te_telwatchers_setup.script +../TE_TelWatchers/TE_TelWatchers_setup.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_telwatchers_setup.script +../TE_TelWatchers/TE_TelWatchers_setup.script /epoc32/release/winscw/urel/z/testdata/scripts/te_telwatchers_setup.script + +../TE_TelWatchers/TE_TelWatchers_config.txt /epoc32/release/wins/udeb/z/testdata/configs/te_telwatchers_config.txt +../TE_TelWatchers/TE_TelWatchers_config.txt /epoc32/release/wins/urel/z/testdata/configs/te_telwatchers_config.txt +../TE_TelWatchers/TE_TelWatchers_config.txt /epoc32/release/winscw/udeb/z/testdata/configs/te_telwatchers_config.txt +../TE_TelWatchers/TE_TelWatchers_config.txt /epoc32/release/winscw/urel/z/testdata/configs/te_telwatchers_config.txt + +../TE_TelWatchers/TE_TelWatchers.cfg /epoc32/release/wins/udeb/z/testdata/configs/te_telwatchers.cfg +../TE_TelWatchers/TE_TelWatchers.cfg /epoc32/release/wins/urel/z/testdata/configs/te_telwatchers.cfg +../TE_TelWatchers/TE_TelWatchers.cfg /epoc32/release/winscw/udeb/z/testdata/configs/te_telwatchers.cfg +../TE_TelWatchers/TE_TelWatchers.cfg /epoc32/release/winscw/urel/z/testdata/configs/te_telwatchers.cfg diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/Test/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyutils/telephonywatchers/Test/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/Test/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyutils/telephonywatchers/Test/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,46 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_BORDER=0x84 +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_CONSTRUCTL_1=0x2 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_CTOR_1=0x1 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_REQUESTNEXTSTATE_1=0x6 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNERROR_1=0x10 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNERROR_2=0x11 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_1=0x9 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_2=0xa +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_3=0xb +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_4=0xc +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_5=0xd +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_6=0xe +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_7=0xf +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SETDISABLED_1=0x4 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SETDISABLED_2=0x5 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SUSPENDFOR_1=0x3 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_WAITFORPHONETOPOWERUPL_1=0x7 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_WAITFORPHONETOPOWERUPL_2=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_2=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_3=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_4=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEINDICATORUPDATEL_5=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CINDICATORWATCHER_HANDLEPHONESTATEEVENTL_1=0x1 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOETELSERVER_1=0xf +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_1=0x12 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_2=0x13 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_3=0x14 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_4=0x15 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_5=0x16 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_6=0x17 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_7=0x18 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_8=0x19 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_9=0x1a +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_LOADPHONEMODULE_1=0x10 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_LOADPHONEMODULE_2=0x11 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_RETRIEVETSYNAME_1=0xe +[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLEPHONESTATEEVENTL_1=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_1=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_2=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_3=0xa +[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_4=0xb +[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_5=0xc +[TRACE]TRACE_INTERNALS[0x88]_CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_6=0xd diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/group/BLD.INF --- a/telephonyutils/telephonywatchers/group/BLD.INF Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -// Copyright (c) 2000-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Telephony watcher plugins -// -// - -/** - @file -*/ - -PRJ_EXPORTS -SysAWatcher.iby /epoc32/rom/include/sysawatcher.iby -TelWatcher.iby /epoc32/rom/include/telwatcher.iby - -PRJ_MMPFILES -telwatcherbase.mmp -signalstrengthwatcher.mmp -indicatorwatcher.mmp - -PRJ_TESTMMPFILES -../Test/TE_TelWatchers/TE_TelWatchersInt.mmp -../Test/TE_TelWatchers/TE_TelWatchersUnit.mmp - -PRJ_TESTEXPORTS -../Test/TE_TelWatchers/TE_TelWatchers.iby /epoc32/rom/include/te_telwatchers.iby - -../Test/TE_TelWatchers/TE_TelWatchers.script /epoc32/release/wins/udeb/z/testdata/scripts/te_telwatchers.script -../Test/TE_TelWatchers/TE_TelWatchers.script /epoc32/release/wins/urel/z/testdata/scripts/te_telwatchers.script -../Test/TE_TelWatchers/TE_TelWatchers.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_telwatchers.script -../Test/TE_TelWatchers/TE_TelWatchers.script /epoc32/release/winscw/urel/z/testdata/scripts/te_telwatchers.script - -../Test/TE_TelWatchers/TE_TelWatchers_setup.script /epoc32/release/wins/udeb/z/testdata/scripts/te_telwatchers_setup.script -../Test/TE_TelWatchers/TE_TelWatchers_setup.script /epoc32/release/wins/urel/z/testdata/scripts/te_telwatchers_setup.script -../Test/TE_TelWatchers/TE_TelWatchers_setup.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_telwatchers_setup.script -../Test/TE_TelWatchers/TE_TelWatchers_setup.script /epoc32/release/winscw/urel/z/testdata/scripts/te_telwatchers_setup.script - -../Test/TE_TelWatchers/TE_TelWatchers_config.txt /epoc32/release/wins/udeb/z/testdata/configs/te_telwatchers_config.txt -../Test/TE_TelWatchers/TE_TelWatchers_config.txt /epoc32/release/wins/urel/z/testdata/configs/te_telwatchers_config.txt -../Test/TE_TelWatchers/TE_TelWatchers_config.txt /epoc32/release/winscw/udeb/z/testdata/configs/te_telwatchers_config.txt -../Test/TE_TelWatchers/TE_TelWatchers_config.txt /epoc32/release/winscw/urel/z/testdata/configs/te_telwatchers_config.txt - -../Test/TE_TelWatchers/TE_TelWatchers.cfg /epoc32/release/wins/udeb/z/testdata/configs/te_telwatchers.cfg -../Test/TE_TelWatchers/TE_TelWatchers.cfg /epoc32/release/wins/urel/z/testdata/configs/te_telwatchers.cfg -../Test/TE_TelWatchers/TE_TelWatchers.cfg /epoc32/release/winscw/udeb/z/testdata/configs/te_telwatchers.cfg -../Test/TE_TelWatchers/TE_TelWatchers.cfg /epoc32/release/winscw/urel/z/testdata/configs/te_telwatchers.cfg diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyutils/telephonywatchers/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,31 @@ +// Copyright (c) 2000-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Telephony watcher plugins +// +// + +/** + @file +*/ + +PRJ_EXPORTS +SysAWatcher.iby /epoc32/rom/include/sysawatcher.iby +TelWatcher.iby /epoc32/rom/include/telwatcher.iby + +PRJ_MMPFILES +telwatcherbase.mmp +signalstrengthwatcher.mmp +indicatorwatcher.mmp + +#include "../Test/group/bld.inf" \ No newline at end of file diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/group/indicatorwatcher.mmp --- a/telephonyutils/telephonywatchers/group/indicatorwatcher.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/telephonywatchers/group/indicatorwatcher.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2000-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" @@ -40,7 +40,7 @@ SOURCE ../src/indicatorwatcher.cpp SOURCE ../src/IndicatorWatcherImplementationTable.cpp USERINCLUDE ../inc +USERINCLUDE ../traces LIBRARY euser.lib etel.lib etelmm.lib telwatcherbase.lib -DEBUGLIBRARY comsdbgutil.lib SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp --- a/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2000-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" @@ -39,8 +39,7 @@ SOURCE ../src/signalstrengthwatcher.cpp SOURCE ../src/SignalstrengthWatcherImplementationTable.cpp USERINCLUDE ../inc +USERINCLUDE ../traces LIBRARY euser.lib etel.lib etelmm.lib telwatcherbase.lib -DEBUGLIBRARY comsdbgutil.lib - SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/group/telephony_watchers.mrp --- a/telephonyutils/telephonywatchers/group/telephony_watchers.mrp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/telephonywatchers/group/telephony_watchers.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -1,19 +1,3 @@ -# -# Copyright (c) 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" -# which accompanies this distribution, and is available -# at the URL "http://www.eclipse.org/legal/epl-v10.html". -# -# Initial Contributors: -# Nokia Corporation - initial contribution. -# -# Contributors: -# -# Description: -# - component telephony_watchers source \sf\os\cellularsrv\telephonyutils\telephonywatchers binary \sf\os\cellularsrv\telephonyutils\telephonywatchers\group all diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/group/telwatcherbase.mmp --- a/telephonyutils/telephonywatchers/group/telwatcherbase.mmp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/telephonywatchers/group/telwatcherbase.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2000-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" @@ -32,12 +32,11 @@ SOURCE ../src/ModemChangeObserver.cpp USERINCLUDE ../inc +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib etel.lib etelmm.lib LIBRARY commsdat.lib -DEBUGLIBRARY comsdbgutil.lib - SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/inc/watcherlog.h --- a/telephonyutils/telephonywatchers/inc/watcherlog.h Mon May 24 18:38:31 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,188 +0,0 @@ -// Copyright (c) 2008-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" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// - -#ifndef __WATCHERLOG_H__ -#define __WATCHERLOG_H__ - -/** - * @file - * - * Logging macros for the Telephony Watchers. These use the Comms Debug - * Utility framework (aka Flogger V2). - * - * To enable logging create a file called "comsdbg.ini" in the Symbian OS - * "C:\Logs\" directory which contains the following lines: - * - * MEDIA FILE - * LOG TelWatchers Common - * LOG TelWatchers Indicator - * LOG TelWatchers Signal - * - * Each line relates to a particular part of the Telephony Watchers, - * enabling you to log only the interesting bits. - * - * By default logging is only present on UDEB builds. To enable UREL logging - * on a device, you will need to rebuild your ROM with UDEB components. - * - * To enable logging on a device, place the "comsdbg.ini" file in the ROM - * under the "Z:\Logs\" directory. The log file will be written in the - * "C:\Logs\" directory on the device. - * - * To enable logging to the serial port change the "MEDIA FILE" line to - * "MEDIA SERIAL::1" or "MEDIA SERIAL::2". Note that this may no longer - * work due to a change of feature implementation in the Comms Debug - * Framework. - * - * If you wish to have individual logs for each component, then use the - * extractlog.pl utility found in the %EPOCROOT%\Epoc32\Tools\ directory. E.g. - * - * extractlog.pl \EPOC32\WINSCW\C\LOGS\LOG.TXT - * - * @internalComponent - */ - -#include - -#ifdef _DEBUG -#define _WATCHER_LOGGING_ENABLED -#endif - - -#ifdef _WATCHER_LOGGING_ENABLED - -_LIT8(KTelWatcherSubSystem, "TelWatchers"); - -#define WATCHERFLOG1(N,A) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC0(KTelWatcherSubSystem,(N),KLogString); \ - } -#define WATCHERFLOG2(N,A,B) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC1(KTelWatcherSubSystem,(N),KLogString,(B)); \ - } -#define WATCHERFLOG3(N,A,B,C) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC2(KTelWatcherSubSystem,(N),KLogString,(B),(C)); \ - } -#define WATCHERFLOG4(N,A,B,C,D) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC3(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D)); \ - } -#define WATCHERFLOG5(N,A,B,C,D,E) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC4(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D),(E)); \ - } -#define WATCHERFLOG6(N,A,B,C,D,E,F) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC5(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D),(E),(F)); \ - } -#define WATCHERFLOG7(N,A,B,C,D,E,F,G) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC6(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G)); \ - } -#define WATCHERFLOG8(N,A,B,C,D,E,F,G,H) { \ - _LIT8(KLogString, A); \ - __FLOG_STATIC7(KTelWatcherSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G),(H)); \ - } - -_LIT8(KTelWatcherCommon, "Common"); -_LIT8(KTelWatcherIndicator, "Indicator"); -_LIT8(KTelWatcherSignal, "Signal"); - - -#define LOGCOMMON1(A) WATCHERFLOG1(KTelWatcherCommon,A) -#define LOGCOMMON2(A,B) WATCHERFLOG2(KTelWatcherCommon,A,(B)) -#define LOGCOMMON3(A,B,C) WATCHERFLOG3(KTelWatcherCommon,A,(B),(C)) -#define LOGCOMMON4(A,B,C,D) WATCHERFLOG4(KTelWatcherCommon,A,(B),(C),(D)) -#define LOGCOMMON5(A,B,C,D,E) WATCHERFLOG5(KTelWatcherCommon,A,(B),(C),(D),(E)) -#define LOGCOMMON6(A,B,C,D,E,F) WATCHERFLOG6(KTelWatcherCommon,A,(B),(C),(D),(E),(F)) -#define LOGCOMMON7(A,B,C,D,E,F,G) WATCHERFLOG7(KTelWatcherCommon,A,(B),(C),(D),(E),(F),(G)) -#define LOGCOMMON8(A,B,C,D,E,F,G,H) WATCHERFLOG8(KTelWatcherCommon,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGCOMMONTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGCOMMON5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGINDICATOR1(A) WATCHERFLOG1(KTelWatcherIndicator,A) -#define LOGINDICATOR2(A,B) WATCHERFLOG2(KTelWatcherIndicator,A,(B)) -#define LOGINDICATOR3(A,B,C) WATCHERFLOG3(KTelWatcherIndicator,A,(B),(C)) -#define LOGINDICATOR4(A,B,C,D) WATCHERFLOG4(KTelWatcherIndicator,A,(B),(C),(D)) -#define LOGINDICATOR5(A,B,C,D,E) WATCHERFLOG5(KTelWatcherIndicator,A,(B),(C),(D),(E)) -#define LOGINDICATOR6(A,B,C,D,E,F) WATCHERFLOG6(KTelWatcherIndicator,A,(B),(C),(D),(E),(F)) -#define LOGINDICATOR7(A,B,C,D,E,F,G) WATCHERFLOG7(KTelWatcherIndicator,A,(B),(C),(D),(E),(F),(G)) -#define LOGINDICATOR8(A,B,C,D,E,F,G,H) WATCHERFLOG8(KTelWatcherIndicator,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGINDICATORTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGINDICATOR5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#define LOGSIGNAL1(A) WATCHERFLOG1(KTelWatcherSignal,A) -#define LOGSIGNAL2(A,B) WATCHERFLOG2(KTelWatcherSignal,A,(B)) -#define LOGSIGNAL3(A,B,C) WATCHERFLOG3(KTelWatcherSignal,A,(B),(C)) -#define LOGSIGNAL4(A,B,C,D) WATCHERFLOG4(KTelWatcherSignal,A,(B),(C),(D)) -#define LOGSIGNAL5(A,B,C,D,E) WATCHERFLOG5(KTelWatcherSignal,A,(B),(C),(D),(E)) -#define LOGSIGNAL6(A,B,C,D,E,F) WATCHERFLOG6(KTelWatcherSignal,A,(B),(C),(D),(E),(F)) -#define LOGSIGNAL7(A,B,C,D,E,F,G) WATCHERFLOG7(KTelWatcherSignal,A,(B),(C),(D),(E),(F),(G)) -#define LOGSIGNAL8(A,B,C,D,E,F,G,H) WATCHERFLOG8(KTelWatcherSignal,A,(B),(C),(D),(E),(F),(G),(H)) -#define LOGSIGNALTIMESTAMP() { \ - TTime now; \ - now.UniversalTime(); \ - TDateTime dateTime(now.DateTime()); \ - LOGSIGNAL5("TimeStamp=%02d:%02d:%02d.%06d", \ - dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \ - } - -#else // _WATCHER_LOGGING_ENABLED - -#define LOGCOMMON1(A) -#define LOGCOMMON2(A,B) -#define LOGCOMMON3(A,B,C) -#define LOGCOMMON4(A,B,C,D) -#define LOGCOMMON5(A,B,C,D,E) -#define LOGCOMMON6(A,B,C,D,E,F) -#define LOGCOMMON7(A,B,C,D,E,F,G) -#define LOGCOMMON8(A,B,C,D,E,F,G,H) -#define LOGCOMMONTIMESTAMP() - -#define LOGINDICATOR1(A) -#define LOGINDICATOR2(A,B) -#define LOGINDICATOR3(A,B,C) -#define LOGINDICATOR4(A,B,C,D) -#define LOGINDICATOR5(A,B,C,D,E) -#define LOGINDICATOR6(A,B,C,D,E,F) -#define LOGINDICATOR7(A,B,C,D,E,F,G) -#define LOGINDICATOR8(A,B,C,D,E,F,G,H) -#define LOGINDICATORTIMESTAMP() - -#define LOGSIGNAL1(A) -#define LOGSIGNAL2(A,B) -#define LOGSIGNAL3(A,B,C) -#define LOGSIGNAL4(A,B,C,D) -#define LOGSIGNAL5(A,B,C,D,E) -#define LOGSIGNAL6(A,B,C,D,E,F) -#define LOGSIGNAL7(A,B,C,D,E,F,G) -#define LOGSIGNAL8(A,B,C,D,E,F,G,H) -#define LOGSIGNALTIMESTAMP() - -#endif // _WATCHER_LOGGING_ENABLED - -#endif // __WATCHERLOG_H__ - diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/src/indicatorwatcher.cpp --- a/telephonyutils/telephonywatchers/src/indicatorwatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/telephonywatchers/src/indicatorwatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2000-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" @@ -14,7 +14,13 @@ // // User includes -#include "watcherlog.h" + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "indicatorwatcherTraces.h" +#endif + #include "indicatorwatcher.h" // System includes @@ -75,7 +81,7 @@ { case EIndicatorNotYetInitialised: case EIndicatorRequestInitialIndicator: - LOGINDICATOR1("IndicatorWatcher : Requesting initial indicator values"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEPHONESTATEEVENTL_1, "IndicatorWatcher : Requesting initial indicator values"); Phone().GetIndicator(iStatus, iIndicatorInfo); IndicatorState() = EIndicatorWaitingForInitialIndicator; SetActive(); @@ -130,8 +136,8 @@ void CIndicatorWatcher::HandleIndicatorUpdateL(TInt aCompletionCode) { -#ifdef _DEBUG - LOGINDICATOR2("IndicatorWatcher : Handling phone state change with request result (%d)", aCompletionCode); +#ifdef OST_TRACE_COMPILER_IN_USE + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_1, "IndicatorWatcher : Handling phone state change with request result (%d)", aCompletionCode); #else (void) aCompletionCode; #endif @@ -210,7 +216,7 @@ } else { - LOGINDICATOR1("IndicatorWatcher : Processing successful indicator event"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_2, "IndicatorWatcher : Processing successful indicator event"); // Update charger status if there has been a change { @@ -226,7 +232,7 @@ if (newChargerState!=chargerState) { - LOGINDICATOR2("IndicatorWatcher : New Charger State %d", newChargerState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_3, "IndicatorWatcher : New Charger State %d", newChargerState); User::LeaveIfError(iChargerStatusProperty.Set(newChargerState)); } } @@ -244,7 +250,7 @@ if (newNetworkState!=networkState) { - LOGINDICATOR2("IndicatorWatcher : New Network State %d", newNetworkState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_4, "IndicatorWatcher : New Network State %d", newNetworkState); User::LeaveIfError(iNetworkStatusProperty.Set(newNetworkState)); } } @@ -268,7 +274,7 @@ if (newCallState!=callState) { - LOGINDICATOR2("IndicatorWatcher : New Call State %d", newCallState); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINDICATORWATCHER_HANDLEINDICATORUPDATEL_5, "IndicatorWatcher : New Call State %d", newCallState); User::LeaveIfError(iCurrentCallProperty.Set(newCallState)); } } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/src/signalstrengthwatcher.cpp --- a/telephonyutils/telephonywatchers/src/signalstrengthwatcher.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/telephonywatchers/src/signalstrengthwatcher.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2000-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" @@ -16,7 +16,13 @@ // // User includes -#include "watcherlog.h" + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "signalstrengthwatcherTraces.h" +#endif + #include "signalstrengthwatcher.h" // System includes @@ -79,7 +85,7 @@ { case ESignalStrengthNotYetInitialised: case ESignalStrengthStateRequestInitialSignalStrength: - LOGSIGNAL1("SignalStrengthWatcher : Requesting initial signal strength"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLEPHONESTATEEVENTL_1, "SignalStrengthWatcher : Requesting initial signal strength"); Phone().GetSignalStrength(iStatus, iSignalStrength, iSignalBars); SignalStrengthState() = ESignalStrengthWaitingForInitialSignalStrength; SetActive(); @@ -130,10 +136,10 @@ void CSignalStrengthWatcher::HandleSignalStrengthUpdateL(TInt aCompletionCode) { - LOGSIGNAL1("SignalStrengthNotifier : Handling signal strength update"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_1, "SignalStrengthNotifier : Handling signal strength update"); if (aCompletionCode < KErrNone) { - LOGSIGNAL2("SignalStrengthNotifier : Handling request error (%d)", aCompletionCode); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_2, "SignalStrengthNotifier : Handling request error (%d)", aCompletionCode); // Indicate we don't know what the signal strength is TInt ret = iNetworkStrengthProperty.Set(ESANetworkStrengthUnknown); @@ -177,8 +183,8 @@ } else { - LOGSIGNAL2("SignalStrengthNotifier : Signal strength is: %d", (TInt) iSignalStrength); - LOGSIGNAL2("SignalStrengthNotifier : Signal bars is: %d", iSignalBars); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_3, "SignalStrengthNotifier : Signal strength is: %d", (TInt) iSignalStrength); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_4, "SignalStrengthNotifier : Signal bars is: %d", iSignalBars); // What is the signal strength now? TInt newState = ESANetworkStrengthUnknown; @@ -193,12 +199,12 @@ newState = ESANetworkStrengthHigh; // Update properties - LOGSIGNAL1("SignalStrengthNotifier : Informing properties of signal strength change"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_5, "SignalStrengthNotifier : Informing properties of signal strength change"); TInt ret = iNetworkStrengthProperty.Set(newState); if (!(ret == KErrNone || ret == KErrNotFound)) User::Leave(ret); - LOGSIGNAL1("SignalStrengthNotifier : Requesting signal strength change notification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIGNALSTRENGTHWATCHER_HANDLESIGNALSTRENGTHUPDATEL_6, "SignalStrengthNotifier : Requesting signal strength change notification"); Phone().NotifySignalStrengthChange(iStatus, iSignalStrength, iSignalBars); SetActive(); } diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/src/watcherbase.cpp --- a/telephonyutils/telephonywatchers/src/watcherbase.cpp Mon May 24 18:38:31 2010 +0100 +++ b/telephonyutils/telephonywatchers/src/watcherbase.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -13,8 +13,21 @@ // Description: // + + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "watcherbaseTraces.h" +#endif + +#undef TCOM_ARG +#ifdef OST_TRACE_COMPILER_IN_USE +#define TCOM_ARG(x) x +#else +#define TCOM_ARG(x) +#endif + #include "watcherbase.h" -#include "watcherlog.h" // System includes #include @@ -53,7 +66,7 @@ TheSeed = now.Int64(); //-- define properties for test purposes - LOGCOMMON1("CTelWatcherBase : defining properties for testing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_CTOR_1, "CTelWatcherBase : defining properties for testing"); //-- For debugging purposes only, used by TE_TelWatchers(Unit). @@ -83,7 +96,7 @@ EXPORT_C void CWatcherBase::ConstructL() { - LOGCOMMON1("WatcherBase : Creating timer"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_CONSTRUCTL_1, "WatcherBase : Creating timer"); User::LeaveIfError(iTimer.CreateLocal()); User::LeaveIfError(iPhonePowerProperty.Attach(KUidSystemCategory, KUidPhonePwr.iUid)); @@ -98,30 +111,23 @@ EXPORT_C void CWatcherBase::SuspendFor(TInt aTimeInSeconds) { - LOGCOMMON1("WatcherBase : Pausing after error"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_SUSPENDFOR_1, "WatcherBase : Pausing after error"); TTimeIntervalMicroSeconds32 timeToSuspendFor = aTimeInSeconds * KOneSecond; iTimer.After(iStatus, timeToSuspendFor); State() = EBaseStateSuspending; SetActive(); } -EXPORT_C void CWatcherBase::SetDisabled(const TDesC& aLogEntry, TInt aError) +EXPORT_C void CWatcherBase::SetDisabled(const TDesC& TCOM_ARG(aLogEntry), TInt TCOM_ARG(aError)) { -#ifdef _WATCHER_LOGGING_ENABLED - TBuf8<256> tmpBuf; - tmpBuf.Copy(aLogEntry); - LOGCOMMON3("Log Entry \"%S\" error %d", &tmpBuf, aError); -#else - (void) aLogEntry; - (void) aError; -#endif - LOGCOMMON1("WatcherBase : Watcher is now disabled"); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_SETDISABLED_1, "Log Entry \"%S\" error %d", aLogEntry, aError); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_SETDISABLED_2, "WatcherBase : Watcher is now disabled"); State() = EBaseStateDisabled; } EXPORT_C void CWatcherBase::RequestNextState() { - LOGCOMMON1("WatcherBase : Requesting State Change"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_REQUESTNEXTSTATE_1, "WatcherBase : Requesting State Change"); if (State() != EBaseStateDisabled) { @@ -139,7 +145,7 @@ { TInt val; - LOGCOMMON1("WatcherBase : Waiting for phone to be turned on"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_WAITFORPHONETOPOWERUPL_1, "WatcherBase : Waiting for phone to be turned on"); __ASSERT_DEBUG(!IsActive(), WatcherBasePanic(EUnexpectedActiveState)); Cancel(); @@ -157,7 +163,7 @@ if (val != ESAPhoneOff) {//-- phone is already ON, complete request so that we go to RunL without waiting iPhonePowerProperty.Cancel(); - LOGCOMMON1("CTelWatcherBase::WaitForPhoneToPowerUpL ??? phone is already turned ON"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_WAITFORPHONETOPOWERUPL_2, "CTelWatcherBase::WaitForPhoneToPowerUpL ??? phone is already turned ON"); } } @@ -167,12 +173,12 @@ EXPORT_C void CWatcherBase::RunL() { - LOGCOMMON2("WatcherBase : RunL(%d)", iStatus.Int()); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_1, "WatcherBase : RunL(%d)", iStatus.Int()); switch(State()) { case EBaseStateConnectingToPropertyNotifier: - LOGCOMMON1("WatcherBase : Attaching to Property"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_2, "WatcherBase : Attaching to Property"); // Virtual function call back, for any subclasses that need to implement // any special stuff. @@ -186,7 +192,7 @@ case EBaseStateWaitingForPhoneToPowerUp: // We were waiting for the phone to become available again. We now must restart // this watcher from scratch. - LOGCOMMON1("WatcherBase : Phone available again. Restarting watcher framework"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_3, "WatcherBase : Phone available again. Restarting watcher framework"); //-- phone power state has changed (it must be turned ON) //-- retrieve its state and check. @@ -196,19 +202,19 @@ if (val == ESAPhoneOn) { //-- everything OK, the phone has been turned ON, restart this watcher from scratch. - LOGCOMMON1("CTelWatcherBase : Phone has been turned ON. Restarting watcher framework"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_4, "CTelWatcherBase : Phone has been turned ON. Restarting watcher framework"); State() = EBaseStateConnectingToPropertyNotifier; RequestNextState(); } else { //-- strange situation, we were waiting for phone On and it now Off, try to wait again - LOGCOMMON1("CTelWatcherBase : ??? Phone has been turned OFF. Continue waiting..."); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_5, "CTelWatcherBase : ??? Phone has been turned OFF. Continue waiting..."); WaitForPhoneToPowerUpL(); } break; case EBaseStateSuspending: - LOGCOMMON1("WatcherBase : Completed suspension. Resuming passive state"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_6, "WatcherBase : Completed suspension. Resuming passive state"); State() = EBaseStatePassive; // Fall through @@ -218,7 +224,7 @@ default: case EBaseStateDisabled: - LOGCOMMON1("WatcherBase : RunL called in Disabled state. Ooops"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNL_7, "WatcherBase : RunL called in Disabled state. Ooops"); __ASSERT_DEBUG(0, WatcherBasePanic(EUnexpectedState)); } } @@ -247,17 +253,13 @@ // Let other sub classes cancel their requests HandleCancel(); } - -EXPORT_C TInt CWatcherBase::RunError(TInt aError) + +EXPORT_C TInt CWatcherBase::RunError(TInt TCOM_ARG(aError)) // // Called when RunL (or a sub-function there-of) leaves. // { -#ifdef _WATCHER_LOGGING_ENABLED - LOGCOMMON2("WatcherBase : RunError called with error of %d", aError); -#else - (void) aError; -#endif + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNERROR_1, "WatcherBase : RunError called with error of %d", aError); // Should never be called from outside the framework __ASSERT_DEBUG(!IsActive(), WatcherBasePanic(EUnexpectedActiveState)); @@ -284,7 +286,7 @@ else { // Put us in the start up state again - LOGCOMMON1("WatcherBase : Phone available again. Restarting watcher framework"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CWATCHERBASE_RUNERROR_2, "WatcherBase : Phone available again. Restarting watcher framework"); State() = EBaseStateConnectingToPropertyNotifier; RequestNextState(); } @@ -407,32 +409,28 @@ TInt CPhoneWatcher::RetrieveTSYName() { - LOGCOMMON1("PhoneWatcher : RetrieveTSYName()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_RETRIEVETSYNAME_1, "PhoneWatcher : RetrieveTSYName()"); TRAPD(error, DoRetrieveTSYNameL()); return error; } TInt CPhoneWatcher::ConnectToETelServer() { - LOGCOMMON1("PhoneWatcher : ConnectToETelServer()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOETELSERVER_1, "PhoneWatcher : ConnectToETelServer()"); return ETel().Connect(); } TInt CPhoneWatcher::LoadPhoneModule() { -#ifdef _WATCHER_LOGGING_ENABLED - TBuf8<256> tmpBuf; - tmpBuf.Copy(iTSYName); - LOGCOMMON1("PhoneWatcher : LoadPhoneModule()"); - LOGCOMMON2("TSY Name to load is %S",&tmpBuf); -#endif + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_LOADPHONEMODULE_1, "PhoneWatcher : LoadPhoneModule()"); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_LOADPHONEMODULE_2, "TSY Name to load is %S",iTSYName); return ETel().LoadPhoneModule(iTSYName); } TInt CPhoneWatcher::ConnectToPhone() { - LOGCOMMON1("PhoneWatcher : ConnectToPhone()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_1, "PhoneWatcher : ConnectToPhone()"); TInt error; RTelServer::TPhoneInfo phoneInfo; @@ -442,11 +440,11 @@ error = ETel().EnumeratePhones(phoneCount); if (error < KErrNone) { - LOGCOMMON2("PhoneWatcher : Failed to enumerate phones (%d)", error); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_2, "PhoneWatcher : Failed to enumerate phones (%d)", error); return error; } - LOGCOMMON2("PhoneWatcher : Counted %d 'phones'", phoneCount); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_3, "PhoneWatcher : Counted %d 'phones'", phoneCount); // Iterate through all the phones for(TInt i=0; i tmpMatchTsyName; - tmpMatchTsyName.Copy(matchTsyName); - LOGCOMMON3("PhoneWatcher : TSY for phone %d is '%S'", i, &tmpMatchTsyName); -#endif + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_5, "PhoneWatcher : TSY for phone %d is '%S'", i, matchTsyName); + // See if the phone belongs to the TSY if (matchTsyName.CompareF(iTSYName) == 0) { -#ifdef _WATCHER_LOGGING_ENABLED - TBuf8<256> tsyNameBuf; - tsyNameBuf.Copy(iTSYName); - LOGCOMMON3("PhoneWatcher : %S is a match for CommDb TSY: %S", &tmpMatchTsyName, &tsyNameBuf); -#endif + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_6, "PhoneWatcher : %S is a match for CommDb TSY: %S", matchTsyName, iTSYName); error = ETel().GetPhoneInfo(i, phoneInfo); if (error < KErrNone) { - LOGCOMMON2("PhoneWatcher : Getting phone info failed (%d)", error); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_7, "PhoneWatcher : Getting phone info failed (%d)", error); return error; } break; @@ -490,19 +481,11 @@ error = Phone().Open(ETel(), phoneInfo.iName); if (error < KErrNone) { -#ifdef _WATCHER_LOGGING_ENABLED - TBuf8<256> tmpBuf; - tmpBuf.Copy(phoneInfo.iName); - LOGCOMMON3("PhoneWatcher : Open phone %S failed (%d)", &tmpBuf, error); -#endif + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_8, "PhoneWatcher : Open phone %S failed (%d)", phoneInfo.iName, error); return error; } + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_9, "PhoneWatcher : Opened 'phone' %S", phoneInfo.iName); -#ifdef _WATCHER_LOGGING_ENABLED - TBuf8<256> tmpBuf; - tmpBuf.Copy(phoneInfo.iName); - LOGCOMMON2("PhoneWatcher : Opened 'phone' %S", &tmpBuf); -#endif // Indicate we're connected and to move to next state. return error; diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyutils/telephonywatchers/traces/OstTraceDefinitions.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r 2473f5e227f9 -r 8b72faa1200f telephonyutils/telephonywatchers/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/telephonyutils/telephonywatchers/traces/fixed_id.definitions Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,33 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_BORDER=0x84 +[GROUP]TRACE_INTERNALS=0x88 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_CONSTRUCTL_1=0x2 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_CTOR_1=0x1 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_REQUESTNEXTSTATE_1=0x6 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNERROR_1=0x10 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNERROR_2=0x11 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_1=0x9 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_2=0xa +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_3=0xb +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_4=0xc +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_5=0xd +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_6=0xe +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_RUNL_7=0xf +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SETDISABLED_1=0x4 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SETDISABLED_2=0x5 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_SUSPENDFOR_1=0x3 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_WAITFORPHONETOPOWERUPL_1=0x7 +[TRACE]TRACE_BORDER[0x84]_CWATCHERBASE_WAITFORPHONETOPOWERUPL_2=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOETELSERVER_1=0x2 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_1=0x5 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_2=0x6 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_3=0x7 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_4=0x8 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_5=0x9 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_6=0xa +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_7=0xb +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_8=0xc +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_CONNECTTOPHONE_9=0xd +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_LOADPHONEMODULE_1=0x3 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_LOADPHONEMODULE_2=0x4 +[TRACE]TRACE_INTERNALS[0x88]_CPHONEWATCHER_RETRIEVETSYNAME_1=0x1 diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/bmarm/WAPMSGCLIU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/bmarm/WAPMSGCLIU.DEF Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,33 @@ +EXPORTS + __28CWapFullySpecDatagramService @ 1 NONAME R3UNUSED ; CWapFullySpecDatagramService::CWapFullySpecDatagramService(void) + ConstructL__24CWapBoundDatagramService @ 2 NONAME R3UNUSED ; CWapBoundDatagramService::ConstructL(void) + ConstructL__26CWapFullySpecCLPushService @ 3 NONAME R3UNUSED ; CWapFullySpecCLPushService::ConstructL(void) + ConstructL__28CWapFullySpecDatagramService @ 4 NONAME R3UNUSED ; CWapFullySpecDatagramService::ConstructL(void) + GetLocalAddressesL__16CWapMessageUtilsRt6RArray1ZQ23Wap12TAddressInfo @ 5 NONAME R3UNUSED ; CWapMessageUtils::GetLocalAddressesL(RArray &) + NewL__22CWapBoundCLPushService @ 6 NONAME R3UNUSED ; CWapBoundCLPushService::NewL(void) + NewL__24CWapBoundDatagramService @ 7 NONAME R3UNUSED ; CWapBoundDatagramService::NewL(void) + NewL__26CWapFullySpecCLPushService @ 8 NONAME R3UNUSED ; CWapFullySpecCLPushService::NewL(void) + NewL__28CWapFullySpecDatagramService @ 9 NONAME R3UNUSED ; CWapFullySpecDatagramService::NewL(void) + "_._22CWapBoundCLPushService" @ 10 NONAME R3UNUSED ; CWapBoundCLPushService::~CWapBoundCLPushService(void) + "_._24CWapBoundDatagramService" @ 11 NONAME R3UNUSED ; CWapBoundDatagramService::~CWapBoundDatagramService(void) + "_._26CWapFullySpecCLPushService" @ 12 NONAME R3UNUSED ; CWapFullySpecCLPushService::~CWapFullySpecCLPushService(void) + "_._28CWapFullySpecDatagramService" @ 13 NONAME R3UNUSED ; CWapFullySpecDatagramService::~CWapFullySpecDatagramService(void) + __22CWapBoundCLPushService @ 14 NONAME R3UNUSED ; CWapBoundCLPushService::CWapBoundCLPushService(void) + __24CWapBoundDatagramService @ 15 NONAME R3UNUSED ; CWapBoundDatagramService::CWapBoundDatagramService(void) + __26CWapFullySpecCLPushService @ 16 NONAME R3UNUSED ; CWapFullySpecCLPushService::CWapFullySpecCLPushService(void) + ConstructL__22CWapBoundCLPushService @ 17 NONAME R3UNUSED ; CWapBoundCLPushService::ConstructL(void) + ConstructL__25CWapFullySpecCLWSPService @ 18 NONAME R3UNUSED ; CWapFullySpecCLWSPService::ConstructL(void) + NewL__21CWapBoundCLWSPService @ 19 NONAME R3UNUSED ; CWapBoundCLWSPService::NewL(void) + NewL__21CWapBoundCLWSPServiceRC4TUid @ 20 NONAME R3UNUSED ; CWapBoundCLWSPService::NewL(TUid const &) + NewL__22CWapBoundCLPushServiceRC4TUid @ 21 NONAME R3UNUSED ; CWapBoundCLPushService::NewL(TUid const &) + NewL__24CWapBoundDatagramServiceRC4TUid @ 22 NONAME R3UNUSED ; CWapBoundDatagramService::NewL(TUid const &) + NewL__25CWapFullySpecCLWSPService @ 23 NONAME R3UNUSED ; CWapFullySpecCLWSPService::NewL(void) + NewL__25CWapFullySpecCLWSPServiceRC4TUid @ 24 NONAME R3UNUSED ; CWapFullySpecCLWSPService::NewL(TUid const &) + NewL__26CWapFullySpecCLPushServiceRC4TUid @ 25 NONAME R3UNUSED ; CWapFullySpecCLPushService::NewL(TUid const &) + NewL__28CWapFullySpecDatagramServiceRC4TUid @ 26 NONAME R3UNUSED ; CWapFullySpecDatagramService::NewL(TUid const &) + "_._21CWapBoundCLWSPService" @ 27 NONAME R3UNUSED ; CWapBoundCLWSPService::~CWapBoundCLWSPService(void) + "_._25CWapFullySpecCLWSPService" @ 28 NONAME R3UNUSED ; CWapFullySpecCLWSPService::~CWapFullySpecCLWSPService(void) + __21CWapBoundCLWSPService @ 29 NONAME R3UNUSED ; CWapBoundCLWSPService::CWapBoundCLWSPService(void) + __25CWapFullySpecCLWSPService @ 30 NONAME R3UNUSED ; CWapFullySpecCLWSPService::CWapFullySpecCLWSPService(void) + ConstructL__21CWapBoundCLWSPService @ 31 NONAME R3UNUSED ; CWapBoundCLWSPService::ConstructL(void) + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/bwins/WAPMSGCLIU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/bwins/WAPMSGCLIU.DEF Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,33 @@ +EXPORTS + ??0CWapBoundCLPushService@@IAE@XZ @ 1 NONAME ; protected: __thiscall CWapBoundCLPushService::CWapBoundCLPushService(void) + ??0CWapBoundDatagramService@@IAE@XZ @ 2 NONAME ; protected: __thiscall CWapBoundDatagramService::CWapBoundDatagramService(void) + ??0CWapFullySpecCLPushService@@IAE@XZ @ 3 NONAME ; protected: __thiscall CWapFullySpecCLPushService::CWapFullySpecCLPushService(void) + ??0CWapFullySpecDatagramService@@IAE@XZ @ 4 NONAME ; protected: __thiscall CWapFullySpecDatagramService::CWapFullySpecDatagramService(void) + ??1CWapBoundCLPushService@@UAE@XZ @ 5 NONAME ; public: virtual __thiscall CWapBoundCLPushService::~CWapBoundCLPushService(void) + ??1CWapBoundDatagramService@@UAE@XZ @ 6 NONAME ; public: virtual __thiscall CWapBoundDatagramService::~CWapBoundDatagramService(void) + ??1CWapFullySpecCLPushService@@UAE@XZ @ 7 NONAME ; public: virtual __thiscall CWapFullySpecCLPushService::~CWapFullySpecCLPushService(void) + ??1CWapFullySpecDatagramService@@UAE@XZ @ 8 NONAME ; public: virtual __thiscall CWapFullySpecDatagramService::~CWapFullySpecDatagramService(void) + ?ConstructL@CWapBoundCLPushService@@IAEXXZ @ 9 NONAME ; protected: void __thiscall CWapBoundCLPushService::ConstructL(void) + ?ConstructL@CWapBoundDatagramService@@IAEXXZ @ 10 NONAME ; protected: void __thiscall CWapBoundDatagramService::ConstructL(void) + ?ConstructL@CWapFullySpecCLPushService@@IAEXXZ @ 11 NONAME ; protected: void __thiscall CWapFullySpecCLPushService::ConstructL(void) + ?ConstructL@CWapFullySpecDatagramService@@IAEXXZ @ 12 NONAME ; protected: void __thiscall CWapFullySpecDatagramService::ConstructL(void) + ?GetLocalAddressesL@CWapMessageUtils@@SAHAAV?$RArray@VTAddressInfo@Wap@@@@@Z @ 13 NONAME ; public: static int __cdecl CWapMessageUtils::GetLocalAddressesL(class RArray &) + ?NewL@CWapBoundCLPushService@@SAPAV1@XZ @ 14 NONAME ; public: static class CWapBoundCLPushService * __cdecl CWapBoundCLPushService::NewL(void) + ?NewL@CWapBoundDatagramService@@SAPAV1@XZ @ 15 NONAME ; public: static class CWapBoundDatagramService * __cdecl CWapBoundDatagramService::NewL(void) + ?NewL@CWapFullySpecCLPushService@@SAPAV1@XZ @ 16 NONAME ; public: static class CWapFullySpecCLPushService * __cdecl CWapFullySpecCLPushService::NewL(void) + ?NewL@CWapFullySpecDatagramService@@SAPAV1@XZ @ 17 NONAME ; public: static class CWapFullySpecDatagramService * __cdecl CWapFullySpecDatagramService::NewL(void) + ??0CWapBoundCLWSPService@@IAE@XZ @ 18 NONAME ; protected: __thiscall CWapBoundCLWSPService::CWapBoundCLWSPService(void) + ??0CWapFullySpecCLWSPService@@IAE@XZ @ 19 NONAME ; protected: __thiscall CWapFullySpecCLWSPService::CWapFullySpecCLWSPService(void) + ??1CWapBoundCLWSPService@@UAE@XZ @ 20 NONAME ; public: virtual __thiscall CWapBoundCLWSPService::~CWapBoundCLWSPService(void) + ??1CWapFullySpecCLWSPService@@UAE@XZ @ 21 NONAME ; public: virtual __thiscall CWapFullySpecCLWSPService::~CWapFullySpecCLWSPService(void) + ?ConstructL@CWapBoundCLWSPService@@IAEXXZ @ 22 NONAME ; protected: void __thiscall CWapBoundCLWSPService::ConstructL(void) + ?ConstructL@CWapFullySpecCLWSPService@@IAEXXZ @ 23 NONAME ; protected: void __thiscall CWapFullySpecCLWSPService::ConstructL(void) + ?NewL@CWapBoundCLPushService@@SAPAV1@ABVTUid@@@Z @ 24 NONAME ; public: static class CWapBoundCLPushService * __cdecl CWapBoundCLPushService::NewL(class TUid const &) + ?NewL@CWapBoundCLWSPService@@SAPAV1@ABVTUid@@@Z @ 25 NONAME ; public: static class CWapBoundCLWSPService * __cdecl CWapBoundCLWSPService::NewL(class TUid const &) + ?NewL@CWapBoundCLWSPService@@SAPAV1@XZ @ 26 NONAME ; public: static class CWapBoundCLWSPService * __cdecl CWapBoundCLWSPService::NewL(void) + ?NewL@CWapBoundDatagramService@@SAPAV1@ABVTUid@@@Z @ 27 NONAME ; public: static class CWapBoundDatagramService * __cdecl CWapBoundDatagramService::NewL(class TUid const &) + ?NewL@CWapFullySpecCLPushService@@SAPAV1@ABVTUid@@@Z @ 28 NONAME ; public: static class CWapFullySpecCLPushService * __cdecl CWapFullySpecCLPushService::NewL(class TUid const &) + ?NewL@CWapFullySpecCLWSPService@@SAPAV1@ABVTUid@@@Z @ 29 NONAME ; public: static class CWapFullySpecCLWSPService * __cdecl CWapFullySpecCLWSPService::NewL(class TUid const &) + ?NewL@CWapFullySpecCLWSPService@@SAPAV1@XZ @ 30 NONAME ; public: static class CWapFullySpecCLWSPService * __cdecl CWapFullySpecCLWSPService::NewL(void) + ?NewL@CWapFullySpecDatagramService@@SAPAV1@ABVTUid@@@Z @ 31 NONAME ; public: static class CWapFullySpecDatagramService * __cdecl CWapFullySpecDatagramService::NewL(class TUid const &) + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/client/wapmessage.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/client/wapmessage.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,508 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + + +#include +#include + +/** The WAP Messaging API. Four interfaces are defined that provide bound and fully-specified versions of WDP and Connectionless Push. + An instantiation of each may be obtained using the CreateImplementationL() function, and must be released using Release() when no + longer required. Release() causes the instantiation to be deleted. +*/ + +// Use SWS as default WAP stack +// If undefined th3em NWSS stack will be used as default +#define WAPUSE_SWS // since 8.0 + +#ifndef WAPUSE_SWS +// Symbian OS 7.0 +_LIT8(KDefBoundWdpCue, "wdp/bound"); +_LIT8(KDefFullSpecWdpCue, "wdp/fullyspec"); +_LIT8(KDefBoundCLPushCue, "clpush/bound"); +_LIT8(KDefFullSpecCLPushCue, "clpush/fullyspec"); + +_LIT8(KAltBoundWdpCue, "swswdp/bound"); +_LIT8(KAltFullSpecWdpCue, "swswdp/fullyspec"); +_LIT8(KAltBoundCLPushCue, "swsclpush/bound"); +_LIT8(KAltFullSpecCLPushCue, "swsclpush/fullyspec"); + +#else +// Symbian OS 8.0 +_LIT8(KAltBoundWdpCue, "wdp/bound"); +_LIT8(KAltFullSpecWdpCue, "wdp/fullyspec"); +_LIT8(KAltBoundCLPushCue, "clpush/bound"); +_LIT8(KAltFullSpecCLPushCue, "clpush/fullyspec"); + +_LIT8(KDefBoundWdpCue, "swswdp/bound"); +_LIT8(KDefFullSpecWdpCue, "swswdp/fullyspec"); +_LIT8(KDefBoundCLPushCue, "swsclpush/bound"); +_LIT8(KDefFullSpecCLPushCue, "swsclpush/fullyspec"); +#endif + +_LIT8(KBoundCLWSPCue, "swsclwsp/bound"); +_LIT8(KFullSpecCLWSPCue, "swsclwsp/fullyspec"); + +/** Bound WDP +*/ + +EXPORT_C +CWapBoundDatagramService* CWapBoundDatagramService::NewL() + /** Allocates and creates a new CWapBoundDatagramService object. + * + * @return A new CWapBoundDatagramService object. + * @leave System wide error codes + */ + { + // CWapBoundDatagramService ECOM Interface UID = 101F4471 + const TUid KUidBoundWDPInterface = {0x101F4471}; + + // Set resolving parameters + TEComResolverParams resolverParams; + resolverParams.SetDataType(KDefBoundWdpCue); + resolverParams.SetWildcardMatch(ETrue); + + // Get the instantiation + TInt trapValue(0); + TAny* ptr = NULL; + TRAP(trapValue, ptr = REComSession::CreateImplementationL(KUidBoundWDPInterface, + _FOFF(CWapBoundDatagramService, iDtor_ID_Key), + resolverParams)); + if(trapValue) + { + resolverParams.SetDataType(KAltBoundWdpCue); + // Trying to load old wapmessage plug-in + ptr = REComSession::CreateImplementationL(KUidBoundWDPInterface, + _FOFF(CWapBoundDatagramService, iDtor_ID_Key), + resolverParams); + } + + return REINTERPRET_CAST(CWapBoundDatagramService*, ptr); + } + +EXPORT_C +CWapBoundDatagramService* CWapBoundDatagramService::NewL(const TUid& aImplementation) + /** Allocates and creates a new CWapBoundDatagramService object. + * + * @param aImplementation + * @return A new CWapBoundDatagramService object. + * @leave System wide error codes + */ + { + TAny* ptr = REComSession::CreateImplementationL(aImplementation, + _FOFF(CWapBoundDatagramService, iDtor_ID_Key)); + + return REINTERPRET_CAST(CWapBoundDatagramService*, ptr); + } + +EXPORT_C +CWapBoundDatagramService::~CWapBoundDatagramService() + /** Destructor */ + { + REComSession::DestroyedImplementation(iDtor_ID_Key); + } + +EXPORT_C +CWapBoundDatagramService::CWapBoundDatagramService() + { + } + +EXPORT_C +void CWapBoundDatagramService::ConstructL() + { + } + +/** Fully-specified WDP +*/ + +EXPORT_C +CWapFullySpecDatagramService* CWapFullySpecDatagramService::NewL() + /** Allocates and creates a new CWapFullySpecDatagramService object. + * + * @return A new CWapFullySpecDatagramService object. + * @leave System wide error codes. + */ + { + // MWapFullySpecDatagramService ECOM Interface UID = 101F4473 + const TUid KUidFullySpecDatagramInterface = {0x101F4473}; + + // Set resolving parameters + TEComResolverParams resolverParams; + resolverParams.SetDataType(KDefFullSpecWdpCue); + resolverParams.SetWildcardMatch(ETrue); + + // Get the instantiation + TInt trapValue(0); + TAny* ptr = NULL; + TRAP(trapValue, ptr = REComSession::CreateImplementationL(KUidFullySpecDatagramInterface, + _FOFF(CWapFullySpecDatagramService, iDtor_ID_Key), + resolverParams)); + if(trapValue) + { + // Trying to load old wapmessage plug-in + resolverParams.SetDataType(KAltFullSpecWdpCue); + ptr = REComSession::CreateImplementationL(KUidFullySpecDatagramInterface, + _FOFF(CWapFullySpecDatagramService, iDtor_ID_Key), + resolverParams); + } + + return REINTERPRET_CAST(CWapFullySpecDatagramService*, ptr); + } + +EXPORT_C +CWapFullySpecDatagramService* CWapFullySpecDatagramService::NewL(const TUid& aImplementation) + /** Allocates and creates a new CWapFullySpecDatagramService object. + * + * @param aImplementation + * @return A new CWapFullySpecDatagramService object. + * @leave System wide error codes. + */ + { + TAny* ptr = REComSession::CreateImplementationL(aImplementation, + _FOFF(CWapFullySpecDatagramService, iDtor_ID_Key)); + + return REINTERPRET_CAST(CWapFullySpecDatagramService*, ptr); + } + +EXPORT_C +CWapFullySpecDatagramService::~CWapFullySpecDatagramService() + /** Destructor */ + { + REComSession::DestroyedImplementation(iDtor_ID_Key); + } + +EXPORT_C +CWapFullySpecDatagramService::CWapFullySpecDatagramService() + { + } + +EXPORT_C +void CWapFullySpecDatagramService::ConstructL() + { + } + +/** Bound Connection-less Push +*/ + +EXPORT_C +CWapBoundCLPushService* CWapBoundCLPushService::NewL() + /** Allocates and creates a new CWapBoundCLPushService object. + * + * @return A new CWapBoundCLPushService object. + * @leave System wide error codes. + */ + { + // MWapBoundCLPushService ECOM Interface UID = 101F4475 + const TUid KUidBoundCLPushInterface = {0x101F4475}; + + // Set resolving parameters + TEComResolverParams resolverParams; + resolverParams.SetDataType(KDefBoundCLPushCue); + resolverParams.SetWildcardMatch(ETrue); + + // Get the instantiation + TInt trapValue(0); + TAny* ptr = NULL; + TRAP(trapValue, ptr = REComSession::CreateImplementationL(KUidBoundCLPushInterface, + _FOFF(CWapBoundCLPushService, iDtor_ID_Key), + resolverParams)); + if(trapValue) + { + // Trying to load old wapmessage plug-in + resolverParams.SetDataType(KAltBoundCLPushCue); + ptr = REComSession::CreateImplementationL(KUidBoundCLPushInterface, + _FOFF(CWapBoundCLPushService, iDtor_ID_Key), + resolverParams); + } + return REINTERPRET_CAST(CWapBoundCLPushService*, ptr); + } + +EXPORT_C +CWapBoundCLPushService* CWapBoundCLPushService::NewL(const TUid& aImplementation) + /** Allocates and creates a new CWapBoundCLPushService object. + * + * @param aImplementation + * @return A new CWapBoundCLPushService object. + * @leave System wide error codes. + */ + { + TAny* ptr = REComSession::CreateImplementationL(aImplementation, + _FOFF(CWapBoundCLPushService, iDtor_ID_Key)); + + return REINTERPRET_CAST(CWapBoundCLPushService*, ptr); + } + +EXPORT_C +CWapBoundCLPushService::~CWapBoundCLPushService() + /** Destructor */ + { + REComSession::DestroyedImplementation(iDtor_ID_Key); + } + +EXPORT_C +CWapBoundCLPushService::CWapBoundCLPushService() + { + } + +EXPORT_C +void CWapBoundCLPushService::ConstructL() + { + } + +/** Fully-specified Connection-less Push +*/ + +EXPORT_C +CWapFullySpecCLPushService* CWapFullySpecCLPushService::NewL() + /** Allocates and creates a new CWapFullySpecCLPushService object. + * + * @return A new CWapFullySpecCLPushService object. + * @leave System wide error codes. + */ + { + // MWapFullySpecCLPushService ECOM Interface UID = 101F4477 + const TUid KUidFullySpecCLPushInterface = {0x101F4477}; + + // Set resolving parameters + TEComResolverParams resolverParams; + resolverParams.SetDataType(KDefFullSpecCLPushCue); + resolverParams.SetWildcardMatch(ETrue); + + // Get the instantiation + TInt trapValue(0); + TAny* ptr = NULL; + TRAP(trapValue, ptr = REComSession::CreateImplementationL(KUidFullySpecCLPushInterface, + _FOFF(CWapFullySpecCLPushService, iDtor_ID_Key), + resolverParams)); + if(trapValue) + { + // Trying to load old wapmessage plug-in + resolverParams.SetDataType(KAltFullSpecCLPushCue); + ptr = REComSession::CreateImplementationL(KUidFullySpecCLPushInterface, + _FOFF(CWapFullySpecCLPushService, iDtor_ID_Key), + resolverParams); + } + + return REINTERPRET_CAST(CWapFullySpecCLPushService*, ptr); + } + +EXPORT_C +CWapFullySpecCLPushService* CWapFullySpecCLPushService::NewL(const TUid& aImplementation) + /** Allocates and creates a new CWapFullySpecCLPushService object. + * + * @param aImplementation + * @return A new CWapFullySpecCLPushService object. + * @leave System wide error codes. + */ + { + TAny* ptr = REComSession::CreateImplementationL(aImplementation, + _FOFF(CWapFullySpecCLPushService, iDtor_ID_Key)); + + return REINTERPRET_CAST(CWapFullySpecCLPushService*, ptr); + } + +EXPORT_C +CWapFullySpecCLPushService::~CWapFullySpecCLPushService() + /** Destructor */ + { + REComSession::DestroyedImplementation(iDtor_ID_Key); + } + +EXPORT_C +CWapFullySpecCLPushService::CWapFullySpecCLPushService() + { + } + +EXPORT_C +void CWapFullySpecCLPushService::ConstructL() + { + } + +/** Bound WSP + New interface and implementation +*/ + +EXPORT_C +CWapBoundCLWSPService* CWapBoundCLWSPService::NewL() + /** Allocates and creates a new CWapBoundCLWSPService object. + * + * @return A new CWapBoundCLWSPService object. + * @leave System wide error codes. + */ + { + // CWapBoundWSPService ECOM Interface UID = 101FBB3B + const TUid KUidBoundCLWSPInterface = {0x101FBB3B}; + + // Set resolving parameters + TEComResolverParams resolverParams; + resolverParams.SetDataType(KBoundCLWSPCue); + resolverParams.SetWildcardMatch(ETrue); + + // Get the instantiation + TAny* ptr = REComSession::CreateImplementationL(KUidBoundCLWSPInterface, + _FOFF(CWapBoundCLWSPService, iDtor_ID_Key), + resolverParams); + + return REINTERPRET_CAST(CWapBoundCLWSPService*, ptr); + } + +EXPORT_C +CWapBoundCLWSPService* CWapBoundCLWSPService::NewL(const TUid& aImplementation) + /** Allocates and creates a new CWapBoundCLWSPService object. + * + * @param aImplementation + * @return A new CWapBoundCLWSPService object. + * @leave System wide error codes. + */ + { + TAny* ptr = REComSession::CreateImplementationL(aImplementation, + _FOFF(CWapBoundCLWSPService, iDtor_ID_Key)); + + return REINTERPRET_CAST(CWapBoundCLWSPService*, ptr); + } + +EXPORT_C +CWapBoundCLWSPService::~CWapBoundCLWSPService() + /** Destructor */ + { + REComSession::DestroyedImplementation(iDtor_ID_Key); + } + +EXPORT_C +CWapBoundCLWSPService::CWapBoundCLWSPService() + { + } + +EXPORT_C +void CWapBoundCLWSPService::ConstructL() + { + } + +/** Fully-specified Connection-less WSP + New interface and implementation +*/ + +EXPORT_C +CWapFullySpecCLWSPService* CWapFullySpecCLWSPService::NewL() + /** Allocates and creates a new CWapFullySpecCLWSPService object. + * + * @return A new CWapFullySpecCLWSPService object. + * @leave System wide error codes. + */ + { + // CWapFullySpecCLWSPService ECOM Interface UID = 101FBB3D + const TUid KUidFullySpecCLWSPInterface = {0x101FBB3D}; + + // Set resolving parameters + TEComResolverParams resolverParams; + resolverParams.SetDataType(KFullSpecCLWSPCue); + resolverParams.SetWildcardMatch(ETrue); + + // Get the instantiation + TAny* ptr = REComSession::CreateImplementationL(KUidFullySpecCLWSPInterface, + _FOFF(CWapFullySpecCLWSPService, iDtor_ID_Key), + resolverParams); + + return REINTERPRET_CAST(CWapFullySpecCLWSPService*, ptr); + } + +EXPORT_C +CWapFullySpecCLWSPService* CWapFullySpecCLWSPService::NewL(const TUid& aImplementation) + /** Allocates and creates a new CWapFullySpecCLWSPService object. + * + * @param aImplementation + * @return A new CWapFullySpecCLWSPService object. + * @leave System wide error codes. + */ + { + TAny* ptr = REComSession::CreateImplementationL(aImplementation, + _FOFF(CWapFullySpecCLWSPService, iDtor_ID_Key)); + + return REINTERPRET_CAST(CWapFullySpecCLWSPService*, ptr); + } + +EXPORT_C +CWapFullySpecCLWSPService::~CWapFullySpecCLWSPService() + /** Destructor */ + { + REComSession::DestroyedImplementation(iDtor_ID_Key); + } + +EXPORT_C +CWapFullySpecCLWSPService::CWapFullySpecCLWSPService() + { + } + +EXPORT_C +void CWapFullySpecCLWSPService::ConstructL() + { + } + + +EXPORT_C TInt CWapMessageUtils::GetLocalAddressesL(RArray& aAddressInfo) + /** Gets a list of all the available network interface addresses. + * + * @param aAddressInfo On return, an array of the available network interface addresses. + * @return KErrNone if successful, KErrNotFound if there are no addresses available. */ + { + Wap::TAddressInfo addrInfo; + + // Check if the esock ini file has been parsed +// User::LeaveIfError(Nifman::CheckIniConfig()); + + // The list of interfaces is available from a RSocket.GetOpt + TAutoClose sockServer; + User::LeaveIfError(sockServer.iObj.Connect()); + sockServer.PushL(); + + TAutoClose sock; + User::LeaveIfError(sock.iObj.Open(sockServer.iObj, _L("udp"))); + sock.PushL(); + + User::LeaveIfError(sock.iObj.SetOpt(KSoInetEnumInterfaces, KSolInetIfCtrl)); + + TPckgBuf info, next; + + TInt res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, info); + if(res!=KErrNone) + User::Leave(res); + + TInt validAddr = KErrNotFound; + + while(res==KErrNone) + { + res=sock.iObj.GetOpt(KSoInetNextInterface, KSolInetIfCtrl, next); + + // Only consider the address is its up, and is point to point. + // (TODO-would it be right to include pending state addresses too????) + if ( (info().iState == EIfUp) && + (info().iFeatures & KIfIsPointToPoint) ) + { + // Just want the interface name + // = info().iName; + // and the address + // = info().iAddress; + validAddr = KErrNone; + + addrInfo.iAddress = info().iAddress; + addrInfo.iName = info().iName; + aAddressInfo.Append(addrInfo); + } + } + + sock.Pop(); + sockServer.Pop(); + + return validAddr; + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/client/wapmsgclisource.mmpi --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/client/wapmsgclisource.mmpi Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,19 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +// Contains just source of wapmsg, not including file that defines the dll entry point + +SOURCE wapmessage.cpp diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/eabi/wapmsgcliU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/eabi/wapmsgcliU.DEF Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,56 @@ +EXPORTS + _ZN16CWapMessageUtils18GetLocalAddressesLER6RArrayIN3Wap12TAddressInfoEE @ 1 NONAME + _ZN21CWapBoundCLWSPService10ConstructLEv @ 2 NONAME + _ZN21CWapBoundCLWSPService4NewLERK4TUid @ 3 NONAME + _ZN21CWapBoundCLWSPService4NewLEv @ 4 NONAME + _ZTV28CWapFullySpecDatagramService @5 NONAME ; ## + _ZN21CWapBoundCLWSPServiceC2Ev @ 6 NONAME + _ZN21CWapBoundCLWSPServiceD0Ev @ 7 NONAME + _ZN21CWapBoundCLWSPServiceD1Ev @ 8 NONAME + _ZN21CWapBoundCLWSPServiceD2Ev @ 9 NONAME + _ZN22CWapBoundCLPushService10ConstructLEv @ 10 NONAME + _ZN22CWapBoundCLPushService4NewLERK4TUid @ 11 NONAME + _ZN22CWapBoundCLPushService4NewLEv @ 12 NONAME + _ZTV26CWapFullySpecCLPushService @13 NONAME ; ## + _ZN22CWapBoundCLPushServiceC2Ev @ 14 NONAME + _ZN22CWapBoundCLPushServiceD0Ev @ 15 NONAME + _ZN22CWapBoundCLPushServiceD1Ev @ 16 NONAME + _ZN22CWapBoundCLPushServiceD2Ev @ 17 NONAME + _ZN24CWapBoundDatagramService10ConstructLEv @ 18 NONAME + _ZN24CWapBoundDatagramService4NewLERK4TUid @ 19 NONAME + _ZN24CWapBoundDatagramService4NewLEv @ 20 NONAME + _ZTV25CWapFullySpecCLWSPService @21 NONAME ; ## + _ZN24CWapBoundDatagramServiceC2Ev @ 22 NONAME + _ZN24CWapBoundDatagramServiceD0Ev @ 23 NONAME + _ZN24CWapBoundDatagramServiceD1Ev @ 24 NONAME + _ZN24CWapBoundDatagramServiceD2Ev @ 25 NONAME + _ZN25CWapFullySpecCLWSPService10ConstructLEv @ 26 NONAME + _ZN25CWapFullySpecCLWSPService4NewLERK4TUid @ 27 NONAME + _ZN25CWapFullySpecCLWSPService4NewLEv @ 28 NONAME + _ZTV24CWapBoundDatagramService @29 NONAME ; ## + _ZN25CWapFullySpecCLWSPServiceC2Ev @ 30 NONAME + _ZN25CWapFullySpecCLWSPServiceD0Ev @ 31 NONAME + _ZN25CWapFullySpecCLWSPServiceD1Ev @ 32 NONAME + _ZN25CWapFullySpecCLWSPServiceD2Ev @ 33 NONAME + _ZN26CWapFullySpecCLPushService10ConstructLEv @ 34 NONAME + _ZN26CWapFullySpecCLPushService4NewLERK4TUid @ 35 NONAME + _ZN26CWapFullySpecCLPushService4NewLEv @ 36 NONAME + _ZTV22CWapBoundCLPushService @37 NONAME ; ## + _ZN26CWapFullySpecCLPushServiceC2Ev @ 38 NONAME + _ZN26CWapFullySpecCLPushServiceD0Ev @ 39 NONAME + _ZN26CWapFullySpecCLPushServiceD1Ev @ 40 NONAME + _ZN26CWapFullySpecCLPushServiceD2Ev @ 41 NONAME + _ZN28CWapFullySpecDatagramService10ConstructLEv @ 42 NONAME + _ZN28CWapFullySpecDatagramService4NewLERK4TUid @ 43 NONAME + _ZN28CWapFullySpecDatagramService4NewLEv @ 44 NONAME + _ZTV21CWapBoundCLWSPService @45 NONAME ; ## + _ZN28CWapFullySpecDatagramServiceC2Ev @ 46 NONAME + _ZN28CWapFullySpecDatagramServiceD0Ev @ 47 NONAME + _ZN28CWapFullySpecDatagramServiceD1Ev @ 48 NONAME + _ZN28CWapFullySpecDatagramServiceD2Ev @ 49 NONAME + _ZTI21CWapBoundCLWSPService @ 50 NONAME ; ## + _ZTI22CWapBoundCLPushService @ 51 NONAME ; ## + _ZTI24CWapBoundDatagramService @ 52 NONAME ; ## + _ZTI25CWapFullySpecCLWSPService @ 53 NONAME ; ## + _ZTI26CWapFullySpecCLPushService @ 54 NONAME ; ## + _ZTI28CWapFullySpecDatagramService @ 55 NONAME ; ## diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/group/bld.inf Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,122 @@ +/* +* Copyright (c) 2003-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +/** +@file + +@SYMPurpose WAP messaging +*/ + +PRJ_EXPORTS +// specify the source file followed by its destination here +// copy will be used to copy the source file to its destination +// If there's no destination then the source file will be copied +// to the same name in \epoc32\include + +../inc/wapmessage.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(wapmessage.h) +../inc/wapmsgerr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(wapmsgerr.h) + +wapmessage.iby /epoc32/rom/include/wapmessage.iby + +// Following file is identical to wapstacksuite_config.ini. The +// hw one is used by iby file to configure wap-stack to use CdmaWapProt +hwWapStackConfig.ini z:/system/data/hwwapstackconfig.ini + +PRJ_TESTEXPORTS +// Shortened WAP stack test IBY +../te_wapstack/group/WapStackSuite.iby /epoc32/rom/include/wapstacksuite.iby + + +// .script and .ini files for the test suite +../te_wapstack/scripts/Te_WapStackSuite.script /epoc32/release/wins/udeb/z/testdata/scripts/te_wapstacksuite.script +../te_wapstack/scripts/Te_WapStackSuite.script /epoc32/release/wins/urel/z/testdata/scripts/te_wapstacksuite.script +../te_wapstack/scripts/Te_WapStackSuite.script /epoc32/release/winscw/udeb/z/testdata/scripts/te_wapstacksuite.script +../te_wapstack/scripts/Te_WapStackSuite.script /epoc32/release/winscw/urel/z/testdata/scripts/te_wapstacksuite.script +../te_wapstack/scripts/WapBoundWDP.script /epoc32/release/wins/udeb/z/testdata/scripts/wapboundwdp.script +../te_wapstack/scripts/WapBoundWDP.script /epoc32/release/wins/urel/z/testdata/scripts/wapboundwdp.script +../te_wapstack/scripts/WapBoundWDP.script /epoc32/release/winscw/udeb/z/testdata/scripts/wapboundwdp.script +../te_wapstack/scripts/WapBoundWDP.script /epoc32/release/winscw/urel/z/testdata/scripts/wapboundwdp.script + +../te_wapstack/scripts/WapBoundPush.script /epoc32/release/wins/udeb/z/testdata/scripts/wapboundpush.script +../te_wapstack/scripts/WapBoundPush.script /epoc32/release/wins/urel/z/testdata/scripts/wapboundpush.script +../te_wapstack/scripts/WapBoundPush.script /epoc32/release/winscw/udeb/z/testdata/scripts/wapboundpush.script +../te_wapstack/scripts/WapBoundPush.script /epoc32/release/winscw/urel/z/testdata/scripts/wapboundpush.script + +../te_wapstack/scripts/WapBoundWSP.script /epoc32/release/wins/udeb/z/testdata/scripts/wapboundwsp.script +../te_wapstack/scripts/WapBoundWSP.script /epoc32/release/wins/urel/z/testdata/scripts/wapboundwsp.script +../te_wapstack/scripts/WapBoundWSP.script /epoc32/release/winscw/udeb/z/testdata/scripts/wapboundwsp.script +../te_wapstack/scripts/WapBoundWSP.script /epoc32/release/winscw/urel/z/testdata/scripts/wapboundwsp.script + +../te_wapstack/scripts/WapFullySpecWDP.script /epoc32/release/wins/udeb/z/testdata/scripts/wapfullyspecwdp.script +../te_wapstack/scripts/WapFullySpecWDP.script /epoc32/release/wins/urel/z/testdata/scripts/wapfullyspecwdp.script +../te_wapstack/scripts/WapFullySpecWDP.script /epoc32/release/winscw/udeb/z/testdata/scripts/wapfullyspecwdp.script +../te_wapstack/scripts/WapFullySpecWDP.script /epoc32/release/winscw/urel/z/testdata/scripts/wapfullyspecwdp.script + +../te_wapstack/scripts/WapFullySpecPush.script /epoc32/release/wins/udeb/z/testdata/scripts/wapfullyspecpush.script +../te_wapstack/scripts/WapFullySpecPush.script /epoc32/release/wins/urel/z/testdata/scripts/wapfullyspecpush.script +../te_wapstack/scripts/WapFullySpecPush.script /epoc32/release/winscw/udeb/z/testdata/scripts/wapfullyspecpush.script +../te_wapstack/scripts/WapFullySpecPush.script /epoc32/release/winscw/urel/z/testdata/scripts/wapfullyspecpush.script + +../te_wapstack/scripts/WapFullySpecWSP.script /epoc32/release/wins/udeb/z/testdata/scripts/wapfullyspecwsp.script +../te_wapstack/scripts/WapFullySpecWSP.script /epoc32/release/wins/urel/z/testdata/scripts/wapfullyspecwsp.script +../te_wapstack/scripts/WapFullySpecWSP.script /epoc32/release/winscw/udeb/z/testdata/scripts/wapfullyspecwsp.script +../te_wapstack/scripts/WapFullySpecWSP.script /epoc32/release/winscw/urel/z/testdata/scripts/wapfullyspecwsp.script + +../te_wapstack/scripts/UDPPush.script /epoc32/release/wins/udeb/z/testdata/scripts/udppush.script +../te_wapstack/scripts/UDPPush.script /epoc32/release/wins/urel/z/testdata/scripts/udppush.script +../te_wapstack/scripts/UDPPush.script /epoc32/release/winscw/udeb/z/testdata/scripts/udppush.script +../te_wapstack/scripts/UDPPush.script /epoc32/release/winscw/urel/z/testdata/scripts/udppush.script + +../te_wapstack/testdata/WapStackSuite.ini /epoc32/release/wins/udeb/z/testdata/configs/wapstacksuite.ini +../te_wapstack/testdata/WapStackSuite.ini /epoc32/release/wins/urel/z/testdata/configs/wapstacksuite.ini +../te_wapstack/testdata/WapStackSuite.ini /epoc32/release/winscw/udeb/z/testdata/configs/wapstacksuite.ini +../te_wapstack/testdata/WapStackSuite.ini /epoc32/release/winscw/urel/z/testdata/configs/wapstacksuite.ini + +../te_wapstack/testdata/UDPPush.ini /epoc32/release/wins/udeb/z/testdata/configs/udppush.ini +../te_wapstack/testdata/UDPPush.ini /epoc32/release/wins/urel/z/testdata/configs/udppush.ini +../te_wapstack/testdata/UDPPush.ini /epoc32/release/winscw/udeb/z/testdata/configs/udppush.ini +../te_wapstack/testdata/UDPPush.ini /epoc32/release/winscw/urel/z/testdata/configs/udppush.ini + +../te_wapstack/testdata/pushpdu.bin /epoc32/release/wins/udeb/z/testdata/configs/pushpdu.bin +../te_wapstack/testdata/pushpdu.bin /epoc32/release/wins/urel/z/testdata/configs/pushpdu.bin +../te_wapstack/testdata/pushpdu.bin /epoc32/release/winscw/udeb/z/testdata/configs/pushpdu.bin +../te_wapstack/testdata/pushpdu.bin /epoc32/release/winscw/urel/z/testdata/configs/pushpdu.bin + +../te_wapstack/testdata/WapStackSuite.xml /epoc32/release/wins/udeb/z/testdata/configs/wapstacksuite.xml +../te_wapstack/testdata/WapStackSuite.xml /epoc32/release/wins/urel/z/testdata/configs/wapstacksuite.xml +../te_wapstack/testdata/WapStackSuite.xml /epoc32/release/winscw/udeb/z/testdata/configs/wapstacksuite.xml +../te_wapstack/testdata/WapStackSuite.xml /epoc32/release/winscw/urel/z/testdata/configs/wapstacksuite.xml + +../te_wapstack/testdata/WapSIMTSY.txt /epoc32/release/wins/udeb/z/testdata/configs/wapsimtsy.txt +../te_wapstack/testdata/WapSIMTSY.txt /epoc32/release/wins/urel/z/testdata/configs/wapsimtsy.txt +../te_wapstack/testdata/WapSIMTSY.txt /epoc32/release/winscw/udeb/z/testdata/configs/wapsimtsy.txt +../te_wapstack/testdata/WapSIMTSY.txt /epoc32/release/winscw/urel/z/testdata/configs/wapsimtsy.txt + +../te_wapstack/testdata/WapStackSuite_Config.ini /epoc32/release/wins/udeb/z/testdata/configs/wapstacksuite_config.ini +../te_wapstack/testdata/WapStackSuite_Config.ini /epoc32/release/wins/urel/z/testdata/configs/wapstacksuite_config.ini +../te_wapstack/testdata/WapStackSuite_Config.ini /epoc32/release/winscw/udeb/z/testdata/configs/wapstacksuite_config.ini +../te_wapstack/testdata/WapStackSuite_Config.ini /epoc32/release/winscw/urel/z/testdata/configs/wapstacksuite_config.ini + +PRJ_MMPFILES +// Client API implementation +../group/wapmsgcli.mmp +// Shortened WAP stack +../group/swapmsg.mmp + +PRJ_TESTMMPFILES +// Shortened WAP stack tests +../te_wapstack/group/WapStackSuite.mmp diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/group/hwWapStackConfig.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/group/hwWapStackConfig.ini Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,1 @@ +RadioBearer= CDMA \ No newline at end of file diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/group/releasenote.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/group/releasenote.txt Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,46 @@ +TEXT OF RELEASE NOTE for Wap Messaging API: + +Release 4: +19/12/2001 +Pending Changelist number: 139990 + +Releasenote.txt created and backdated using changelist information. +Fixed defects: + BEU-55DJG3 "4 test harnesses panic with KWapMsgPanicDescriptor " + BEU-55DKCJ "Under mem leak testing: ALL the test harnesses commit an Access Violation" + BEU-55HNAZ "T_WDPFullySpec has got 3 resources leaked under OOM testing" + BEU-55HG9S "Bad Handle panic running T_WDPFullySpec OOM test " + +Release 3: +10/12/2001 +Changelist number: 137374 + +Changes made after code review of component. + +Placed error codes in Wap namespace, and made more unique. +Removed non relevant comments. +Replaced empty _LIT's with KNullDesC8 +Added a panic if non-null pointer is passed in to GetLocalAddress + + +Release 2: +28/11/2001 +Change list number: 133670 +Second release of Wap Messaging API. +All functions now implemented, and test code submitted as well. + + +Release 1: +09/11/2001 +Change list number: 128473 + +Early release of new Hurricane WAP Messaging API. +This is being released into the mainline now so clients can start to implement code changes against this incomplete, but frozen API, release. + +This is a new replacement API for part of the wapstack, but the existing APIs still remain at present, and so no clients will be effected by this components early release. + +The new component has been added to the gt.txt file to be build as part of the mainline. + + +END OF RELEASE NOTE TEXT + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/group/swapmsg.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/group/swapmsg.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,55 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP message API ECOM plug-in +// swswapmsg.dll Supports connectionless WDP, WSP, Push. +// +// + +/** + @file +*/ + +OPTION CW -w off +target swswapmsg.dll +targettype plugin + +UID 0x10009D8D 0x101fbb36 +VENDORID 0x70000001 + +#include + +OS_LAYER_SYSTEMINCLUDE_SYMBIAN + +USERINCLUDE ../. ../inc + +SOURCEPATH ../sws + +SOURCE swswapmsg.cpp +#include "../sws/swswapmsgsource.mmpi" + + +start resource 101fbb36.rss +target swswapmsg.rsc +end + +// Get GDB symbols included? +SRCDBG + +LIBRARY euser.lib wapmsgcli.lib insock.lib esock.lib efsrv.lib + + + +CAPABILITY ALL -Tcb + +SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/group/wap-stack_wapmessage.history.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/group/wap-stack_wapmessage.history.xml Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,11 @@ + + + + WAP Push, connectionless WSP, and WDP datagram APIs. + + + + + + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/group/wap-stack_wapmessage.mrp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,26 @@ +# +# Copyright (c) 2003-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" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + +component wap-stack_wapmessage +source \sf\os\cellularsrv\wapstack\wapmessageapi +binary \sf\os\cellularsrv\wapstack\wapmessageapi\group all +exports \sf\os\cellularsrv\wapstack\wapmessageapi\group +notes_source \component_defs\release.src + + +ipr E +ipr T \sf\os\cellularsrv\wapstack\wapmessageapi\te_wapstack + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/group/wapmessage.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/group/wapmessage.iby Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,28 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef __WAPMESSAGE_IBY__ +#define __WAPMESSAGE_IBY__ + +file=ABI_DIR\DEBUG_DIR\wapmsgcli.dll System\Libs\wapmsgcli.dll +ECOM_PLUGIN(swswapmsg.dll,101fbb36.rsc) + + #ifdef CDMA + data=ZSYSTEM\Data\hwWapstackConfig.ini System\Data\wapstackconfig.ini + #endif + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/group/wapmsgcli.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/group/wapmsgcli.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,47 @@ +/* +* Copyright (c) 2003-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +/** +@file + +@SYMPurpose wapmsgcli.dll Wap messaging Ecom plug-in +*/ + +OPTION CW -w off +TARGET wapmsgcli.dll +TARGETTYPE DLL + +UID 0x1000008D 0x101f447A +VENDORID 0x70000001 + + +OS_LAYER_SYSTEMINCLUDE_SYMBIAN + +USERINCLUDE ../. ../inc + +SOURCEPATH ../client + +#include "../client/wapmsgclisource.mmpi" + +// Get GDB symbols included? +//SRCDBG + +LIBRARY euser.lib ecom.lib esock.lib insock.lib + +CAPABILITY ALL -Tcb + +SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/inc/wapmessage.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/inc/wapmessage.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,902 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __WAPMESSAGE_H__ +#define __WAPMESSAGE_H__ + + +#include +#include +#include +#include +#include + +/** +* @file +* +* The WAP Messaging API. +* +* Four interfaces are defined that provide bound and fully-specified versions of WDP and Connectionless Push. +* An instantiation of each may be obtained using the CreateImplementationL() function, and must be released +* using Release() when no longer required. Release() causes the instantiation to be deleted. +* +* For error codes returned by methods in this API, see . Most methods can return a set of general +* errors, with some returning additional specific errors. +* +* @publishedAll +* @released since v7.0 +*/ + +/** +* Defines WAP-related types and error codes. +*/ +namespace Wap + { + // Bearer type definition + typedef enum + /** Type definition for an enum defining WAP bearer types. */ + { + /** All bearers. */ + EAll, + /** Internet Protocol. */ + EIP, + /** 7-bit SMS. */ + ESMS7, + /** 8-bit SMS. */ + ESMS, + /** 7-bit SMS. The bearers WAPSMS and WAPSMS7 are intended for WAP browsing where + delivery reports are not required and the validity period is much shorter (5 minutes). */ + EWAPSMS7, + /** 8-bit SMS. */ + EWAPSMS + } TBearer; + + // Port number definition + /** A port number. */ + typedef TUint16 TPort; + + class TAddressInfo + /** Encapsulates an interface name and address. */ + { + public: + /** Interface name. */ + TName iName; + /** Interface IP address. */ + TInetAddr iAddress; + }; + } + + +/** +* The WSP status type definition. +* @internalComponent +*/ +typedef TUint8 TWSPStatus; + +/** Bound WDP */ +class CWapBoundDatagramService : public CBase +/** +* Sends and receives datagrams over WDP using a specified local port. +* +* The class is an ECom plug-in interface. Clients use NewL() to request an implementation +* of the interface, and then call the interface's virtual functions to access +* the implementation's services. +* +* The use of the plug-in architecture allows different implementations to use +* different underlying WAP stacks. +* +* Functions can return system wide error codes, and also API-specific errors +* as defined in wapmsgerr.h. +* +*/ + { +public: // creation/deletion + IMPORT_C static CWapBoundDatagramService* NewL(); + IMPORT_C static CWapBoundDatagramService* NewL(const TUid& aImplementation); + IMPORT_C virtual ~CWapBoundDatagramService(); + +public: // API methods + + /** + * Connects to the WAP stack, opening an endpoint that can be used to listen for + * subsequent incoming datagrams. + * + * This overload of Connect() allows an IP address associated with a network + * interface to be specified. In multihomed systems, this can be used to specify + * the network interface to which the endpoint should be bound. + * + * All CWapBoundDatagramService implementations must automatically close this + * endpoint upon destruction. + * + * @param aBearer The bearer to listen on. Use EAll to specify all bearers. + * @param aPort The port to listen on. If set to 0, a local port will be chosen + * for the client's first SendTo() + * @param aInetAddr The IP address of the network interface that should be used + * in a multihomed system. + * @return KErrNone on successful completion, or one of the system error codes + * on failure. + */ + virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort,TInetAddr aInetAddr)=0; + + /** + * Connects to the WAP stack, opening an endpoint that can be used to listen for + * subsequent incoming datagrams. + * + * All CWapBoundDatagramService implementations must automatically close this + * endpoint upon destruction. + * + * @param aBearer The bearer to listen on. Use EAll to specify all bearers. + * @param aPort The port to listen on. If set to 0, a local port will be chosen + * for the client's first SendTo() + * @return KErrNone on successful completion, or one of the system error codes + * on failure. + */ + virtual TInt Connect(Wap::TBearer aBearer,Wap::TPort aPort)=0; + + /** Sends data to a remote endpoint. + * + * @param aRemoteHost The address of the remote host to which to send the data. + * The format of the address is bearer-specific. + * @param aRemotePort The port on the remote host to which the data will be sent + * @param aBuffer The data buffer to be sent + * @param aBearer The bearer to be used, if the bound connection was opened with EAll + * @return KErrNone on successful completion, or one of the system error codes + * on failure. + */ +virtual TInt SendTo(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, const TDesC8& aBuffer, Wap::TBearer aBearer)=0; + + /** + * Waits for a datagram to be received, and discovers the size of buffer required + * to retrieve it. + * + * This asynchronous method waits for a datagram to be received and will then + * complete allowing the client to discover how large a buffer is needed to retrieve + * the entire datagram that has been received. A later call to RecvFrom() with + * a buffer of sufficient size will then allow the client to retrieve the datagram + * fully. + * + * @param aDataSizePckg On completion, the size of data received, in bytes + * @param aReqStatus Asynchonrous status word, used to signal when a data size is known + * @return KErrNone on successful completion, or one of the system error codes + * on failure. + */ + virtual TInt AwaitRecvDataSize(TPckg& aDataSizePckg, TRequestStatus& aReqStatus)=0; + + /** + * Receives data on a bound port. + * + * An asynchronous notification is sent to the client when data arrives. + * + * @param aRemoteHost On completion, the bearer-dependent address of the remote + * host from which the data was received + * @param aRemotePort On completion, the port on the remote host from which the + * data was received + * @param aBuffer A client-allocated data buffer that on completion is filled + * with data received. Data that overflows the buffer is discarded. + * @param aTruncated On completion, indicates whether the received datagram was + * truncated to fit in the client's supplied buffer + * @param aReqStatus Asynchronous status word, used to notify the client that + * a datagram was received + * @param aTimeout An optional millisecond time-out which allows a timed read + * to be made. If no data is received within the timeout period, the request + * completes with KErrTimedOut. If a value of 0 is supplied, the timeout is infinite. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt RecvFrom(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer, TBool& aTruncated, + TRequestStatus& aReqStatus, TUint32 aTimeout)=0; + + /** + * Cancels a previously asynchronous RecvFrom() or AwaitRecvDataSize() request. + * + * If a datagram arrives at the local host, it will be discarded. + * + */ + virtual void CancelRecv()=0; + + /** + * Gets the local port of this endpoint. + * + * This is useful if the port was chosen automatically. + * + * @param aPort On return, the port number + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalPort(Wap::TPort& aPort)=0; + + /** + * Gets the local address of this endpoint. + * + * @param aLocalHost On return, the address of the local host. Clients must pass + * in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 + * buffer to hold the address, and passes ownership of the buffer to the client. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0; + + /** + * Gets the bearer on which a received datagram arrived. + * + * This is useful when EAll was specified as the bearer in Connect(). + * + * @param aBearer On return, the bearer + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetBearer(Wap::TBearer& aBearer)=0; + + /** + * Queries the WDP bearer for its maximum datagram size and its nominal datagram size. + * + * The nominal size is the size within which a datagram won't have to be split + * into smaller individual messages and then re-assembled at the other end. + * + * The function will fail for a stream connection. + * + * @param aMaxSize On return, the maximum datagram size + * @param aNominalSize On return, the nominal datagram size + * @return KErrNone on successful completion, or one of the system error codes + * on failure. + */ + virtual TInt GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize)=0; + +protected: // methods + IMPORT_C CWapBoundDatagramService(); + IMPORT_C void ConstructL(); + +private: // attributes + // D'tor Key identification required for ECOM + TUid iDtor_ID_Key; + }; + +/** Fully-Specified WDP +*/ +class CWapFullySpecDatagramService : public CBase +/** +* Sends and receives datagrams over WDP using a specified local port and a single, +* named remote host. +* +* The class is an ECom plug-in interface. Clients use NewL() to request an implementation +* of the interface, and then call the interface's virtual functions to access +* the implementation's services. +* +* The use of the plug-in architecture allows different implementations to use +* different underlying WAP stacks. +* +* Functions can return system wide error codes, and also API-specific errors +* as defined in wapmsgerr.h. +*/ + { +public: // creation/deletion + IMPORT_C static CWapFullySpecDatagramService* NewL(); + IMPORT_C static CWapFullySpecDatagramService* NewL(const TUid& aImplementation); + IMPORT_C virtual ~CWapFullySpecDatagramService(); + +public: // API methods + + // Connect to the wapstack, opening an endpoint which is to be used only with a single, named remote host. + /** + * Connects to the WAP stack, opening an endpoint that can be used to listen for + * subsequent incoming datagrams. + * + * This overload of Connect() allows an IP address associated with a network + * interface to be specified. In multihomed systems, this can be used to specify + * the network interface to which the endpoint should be bound. + * + * All CWapFullySpecDatagramService implementations must automatically close + * this endpoint upon destruction. + * + * @param aRemoteHost The bearer-dependent address of the remote host with which + * the data will be exchanged + * @param aRemotePort The port on the remote host to which data will be sent + * @param aBearer The bearer to use. EAll cannot be used. + * @param aInetAddr The IP address of the network interface that should be used + * in a multihomed system. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TInetAddr aInetAddr)=0; + + // Connect to the wapstack, opening an endpoint which is to be used only with a single, named remote host. + /** + * Connects to the WAP stack, opening an endpoint that can be used to listen for + * subsequent incoming datagrams. + * + * All CWapFullySpecDatagramService implementations must automatically close + * this endpoint upon destruction. + * + * @param aRemoteHost The bearer-dependent address of the remote host with which + * the data will be exchanged + * @param aRemotePort The port on the remote host to which data will be sent + * @param aBearer The bearer to use. EAll cannot be used. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer)=0; + + /** + * Sends data on a fully-specified connection. + * + * @param aBuffer The data buffer to be written over the connection + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Send(const TDesC8& aBuffer)=0; + + /** + * Waits for a datagram to be received, and discover how large a buffer is required + * to retrieve it. + * + * This asynchronous request waits for a datagram to be received and will then + * complete allowing the client to discover how large a buffer is needed to retrieve + * the entire datagram that has been received. A later call to Recv() with a + * buffer of sufficent size will then allow the client to retrieve the datagram + * fully. + * + * @param aDataSizePckg On completion, the size of data received, in bytes + * @param aReqStatus Asynchonrous status word, used to signal when a data size is known + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt AwaitRecvDataSize(TPckg& aDataSizePckg, TRequestStatus& aReqStatus)=0; + + /** + * Receives data on a bound port. + * + * An asynchronous notification is sent to the client when data arrives. + * + * @param aBuffer A client-allocated data buffer that, on completion, is filled + * with data received. Data that overflows the buffer is discarded. + * @param aTruncated On completion, indicates whether the received datagram was + * truncated to fit in the client's supplied buffer + * @param aReqStatus Asynchronous status word, used to notify the client that + * a datagram was received + * @param aTimeout An optional millisecond time-out which allows a timed read + * to be made. If no data is received within the timeout period, the request + * completes with KErrTimedOut. If a value of 0 is supplied, the timeout is infinite. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Recv(TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout)=0; + + /** + * Cancels a previously asynchronous Recv() or AwaitRecvDataSize() request. + * + * If a datagram arrives at the local host, it will be discarded. + * + */ + virtual void CancelRecv()=0; + + /** + * Gets the local port of this endpoint. + * + * This is useful if the port was chosen automatically. + * + * @param aPort On return, the port number + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalPort(Wap::TPort& aPort)=0; + + /** + * Gets the local address of this endpoint. + * + * @param aLocalHost On return, the address of the local host. Clients must pass + * in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 + * buffer to hold the address, and passes ownership of the buffer to the client. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0; + + /** + * Queries the WDP bearer for its maximum datagram size and its nominal datagram size. + * + * The nominal size is the size within which a datagram won't have to be split + * into smaller individual messages and then re-assembled at the other end. + * + * @param aMaxSize On return, the maximum datagram size + * @param aNominalSize On return, the nominal datagram size + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize)=0; + +protected: // methods + IMPORT_C CWapFullySpecDatagramService(); + IMPORT_C void ConstructL(); + +private: // ECOM + // D'tor Key identification required for ECOM + TUid iDtor_ID_Key; + }; + +/** Bound Connectionless Push +*/ +class CWapBoundCLPushService : public CBase +/** +* Listens for WAP Push messages from any sender. +* +* The class is an ECom plug-in interface. Clients use NewL() to request an implementation +* of the interface, and then call the interface's virtual functions to access +* the implementation's services. +* +* The use of the plug-in architecture allows different implementations to use +* different underlying WAP stacks. +* +* Functions can return system wide error codes, and also API-specific errors +* as defined in wapmsgerr.h. +* +*/ +{ +public: // creation/deletion + IMPORT_C static CWapBoundCLPushService* NewL(); + IMPORT_C static CWapBoundCLPushService* NewL(const TUid& aImplementation); + IMPORT_C virtual ~CWapBoundCLPushService(); + +public: // API methods + + + // Opens a socket which is to be used to listen for subsequent incoming Push messages from any sender; + // i.e. it has only been 'bound' to the local address + /** + * Connects to the WAP stack, opening an endpoint that can be used to listen for + * Push messages from any sender. + * + * This overload of Connect() allows an IP address associated with a network + * interface to be specified. In multihomed systems, this can be used to specify + * the network interface to which the endpoint should be bound. + * + * All CWapBoundCLPushService implementations must automatically close this endpoint + * upon destruction. + * + * @param aBearer The bearer to listen on. Use EAll to specify all bearers. + * @param aPort The port to listen on. If set to 0, a local port will be chosen + * for the client's first SendTo() + * @param aSecure Security flag to indicate whether WTLS should be used or not + * @param aInetAddr The address of the adapter to use + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure, TInetAddr aInetAddr)=0; + + + // Opens a socket which is to be used to listen for subsequent incoming Push messages from any sender; + // i.e. it has only been 'bound' to the local address + /** + * Connects to the WAP stack, opening an endpoint that can be used to listen for + * Push messages from any sender. + * + * All CWapBoundCLPushService implementations must automatically close this endpoint + * upon destruction. + * + * @param aBearer The bearer to listen on. Use EAll to specify all bearers. + * @param aPort The port to listen on. If set to 0, a local port will be chosen + * for the client's first SendTo() + * @param aSecure Security flag to indicate whether WTLS should be used or not + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure)=0; + + /** + * Requests an asynchronous notification upon arrival of the next push message + * on the listening connection. + * + * The request completes upon receipt of the message, filling the buffers with + * as much received data as possible. A return code indicates whether further + * data remains. The call must be re-issued for subsequent messages or to receive + * remaining data from a previous push message. + * + * @param aPushHeaders A client-allocated buffer that, on completion, is filled + * with the push message's header data + * @param aPushBody A client-allocated buffer that, on completion, is filled with + * the push message's body data + * @param aPushIdPckg On completion, an integer ID that uniquely specifies the + * push message + * @param aReqStatus Asynchonrous status word, used by the service provider to + * notify the client when a push message has arrived. + * EMoreData is returned if more pushed data is available. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt AwaitPush(TDes8& aPushHeaders, TDes8& aPushBody, TPckgBuf& aPushIdPckg, TRequestStatus& aReqStatus)=0; + + /** + * Cancels a previous push message request. + * + * If a push message arrives, the client will not be notified. + * + */ + virtual void CancelAwaitPush()=0; + + /** + * Gets the local port of this endpoint. + * + * This is useful if the port was chosen automatically. + * + * @param aPort On return, the port number + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalPort(Wap::TPort& aPort)=0; + + /** + * Gets the local address of this endpoint. + * + * @param aLocalHost On return, the address of the local host. Clients must pass + * in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 + * buffer to hold the address, and passes ownership of the buffer to the client. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0; + + /** + * Gets the bearer on which a received datagram arrived. + * + * This is useful when EAll was specified as the bearer in Connect(). + * + * @param aBearer On return, the bearer + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetBearer(Wap::TBearer& aBearer)=0; + + /** + * Gets the address of the remote server. + * + * This function cannot be called when there is an outstanding AwaitPush(). + * + * @param aRemoteHost On return, the address of the remote host. Clients must pass + * in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 + * buffer to hold the address, and passes ownership of the buffer to the client. + * @return KErrNone on successful completion, KErrNotSupported if not implemented, + * or one of the system error codes on failure. + */ + virtual TInt GetServerAddress(HBufC8*& aRemoteHost)=0; + +protected: // methods + IMPORT_C CWapBoundCLPushService(); + IMPORT_C void ConstructL(); + +private: // ECOM + // D'tor Key identification required for ECOM + TUid iDtor_ID_Key; +}; + +/** Fully-Specified Connectionless Push +*/ +class CWapFullySpecCLPushService : public CBase +/** +* Listens for WAP Push messages from a single, named remote host. +* +* The class is an ECom plug-in interface. Clients use NewL() to request an implementation +* of the interface, and then call the interface's virtual functions to access +* the implementation's services. +* +* The use of the plug-in architecture allows different implementations to use +* different underlying WAP stacks. +* +* Functions can return system wide error codes, and also API-specific errors +* as defined in wapmsgerr.h. +*/ +{ +public: // creation/deletion + IMPORT_C static CWapFullySpecCLPushService* NewL(); + IMPORT_C static CWapFullySpecCLPushService* NewL(const TUid& aImplementation); + IMPORT_C virtual ~CWapFullySpecCLPushService(); + +public: // API methods + + // Opens a socket which is to be used only with a single, named remote host. + /** + * Connects to the WAP stack, opening an endpoint that can be used to listen for + * Push messages from a specified remote host. + * + * This overload of Connect() allows an IP address associated with a network + * interface to be specified. In multihomed systems, this can be used to specify + * the network interface to which the endpoint should be bound. + * + * All CWapFullySpecCLPushService implementations must automatically close this + * endpoint upon destruction. + * + * @param aRemoteHost The bearer-dependent address of the remote host with which + * the data will be exchanged + * @param aRemotePort The port on the remote host to which data will be sent + * @param aBearer The bearer to listen on. You cannot use EAll. + * @param aSecure Security flag to indicate whether WTLS should be used or not + * @param aInetAddr The address of the adapter to use + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure, TInetAddr aInetAddr)=0; + + // Opens a socket which is to be used only with a single, named remote host. + /** + * Connects to the WAP stack, opening an endpoint that can be used to listen for + * Push messages from a specified remote host. + * + * All CWapFullySpecCLPushService implementations must automatically close this + * endpoint upon destruction. + * + * @param aRemoteHost The bearer-dependent address of the remote host with which + * the data will be exchanged + * @param aRemotePort The port on the remote host to which data will be sent + * @param aBearer The bearer to listen on. You cannot use EAll. + * @param aSecure Security flag to indicate whether WTLS should be used or not + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure)=0; + + /** + * Requests an asynchronous notification upon arrival of the next push message + * on the listening connection. + * + * The request completes upon receipt of the message, filling the buffers with + * as much received data as possible. A return code indicates whether further + * data remains. The call must be re-issued for subsequent messages or to receive + * remaining data from a previous push message. + * + * @param aPushHeaders A client-allocated buffer that, on completion, is filled + * with the push message's header data + * @param aPushBody A client-allocated buffer that, on completion, is filled with + * the push message's body data + * @param aPushIdPckg On completion, an integer ID that uniquely specifies the + * push message + * @param aReqStatus Asynchronous status word, used by the service provider to + * notify the client when a push message has arrived. + * EMoreData is returned if more pushed data is available. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt AwaitPush(TDes8& aPushHeaders, TDes8& aPushBody, TPckgBuf& aPushIdPckg, TRequestStatus& aReqStatus)=0; + + /** + * Cancels a previous push message request. + * + * If a push message arrives, the client will not be notified. + * + */ + virtual void CancelAwaitPush()=0; + + + /** + * Gets the local port of this endpoint. + * + * This is useful if the port was chosen automatically. + * + * @param aPort On return, the port number + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalPort(Wap::TPort& aPort)=0; // // (out) the port number + + + /** + * Gets the local address of this endpoint. + * + * @param aLocalHost On return, the address of the local host. Clients must pass + * in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 + * buffer to hold the address, and passes ownership of the buffer to the client. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0; // // (out) the address of the local host + +protected: // methods + IMPORT_C CWapFullySpecCLPushService(); + IMPORT_C void ConstructL(); + +private: // ECOM + // D'tor Key identification required for ECOM + TUid iDtor_ID_Key; +}; + +/** Bound Connectionless WSP +* @released since v8.0 +*/ +class CWapBoundCLWSPService : public CBase +{ +public: // creation/deletion + IMPORT_C static CWapBoundCLWSPService* NewL(); + IMPORT_C static CWapBoundCLWSPService* NewL(const TUid& aImplementation); + IMPORT_C virtual ~CWapBoundCLWSPService(); + +public: // API methods + + /** + * Connects to the WAP stack, opening an endpoint that can be used for S-Unit-MethodInvoke and + * S-Unit-MethodResult primitives. + * + * @param aBearer The bearer to listen on (use EAll for all bearers) + * @param aPort The port to listen on. If set to 0, a local port will be chosen for the + * client's first MethodInvoke() + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Connect(Wap::TBearer aBearer,Wap::TPort aPort, TBool aSecure)=0; + + /** + * Sends a request to a remote endpoint. + * + * @param aBearer The bearer to be used, if the bound connection was opened with EAll + * @param aRemoteHost The address of the remote host to which to send the request. + * The format of the address is bearer-specific. + * @param aRemotePort The port on the remote host to which the request will be sent + * @param aMethod + * @param aURI + * @param aReqHeaders + * @param aReqBody + * @param aTransactionId + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt MethodInvoke(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, const TUint8 aTransactionId)=0; + + /** + * Waits for a datagram to be received. + * + * @param aReqHeaders + * @param aReqBody + * @param aTransactionIdPckg + * @param aWspStatus + * @param aReqStatus Asynchonrous status word, used to signal when a data size is known + * @param aTimeout + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout)=0; + + /** + * Cancels a previously requested asynchronous MethodResult() notification. + * + * If a datagram arrives at the local host, it will be discarded. + * + */ + virtual void CancelReq()=0; + + + /** + * Gets the local port of this endpoint. + * + * This is useful if the port was chosen automatically. + * + * @param aPort On return, the port number + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalPort(Wap::TPort& aPort)=0; // // (out) the port number + + /** + * Gets the local address of this endpoint. + * + * @param aLocalHost On return, the address of the local host. Clients must pass + * in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 + * buffer to hold the address, and passes ownership of the buffer to the client. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0; // // (out) the address of the local host + + /** + * Gets the bearer on which a received datagram arrived. + * + * Useful when EAll was specified in Connect() + * + * @param aBearer On return, the bearer + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetBearer(Wap::TBearer& /*aBearer*/)=0; + + /** + * Gets the remote server address. + * + * @param aServerAddress On return, the address of the remote server. Clients must pass + * in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 + * buffer to hold the address, and passes ownership of the buffer to the client. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetServerAddress(HBufC8*& aServerAddress)=0; // // (out) the address of the remote server + +protected: // methods + IMPORT_C CWapBoundCLWSPService(); + IMPORT_C void ConstructL(); + +private: // ECOM + // D'tor Key identification required for ECOM + TUid iDtor_ID_Key; +}; + +/** +* Fully-Specified Connectionless WSP +* @released since v8.0 +*/ +class CWapFullySpecCLWSPService : public CBase +{ +public: // creation/deletion + IMPORT_C static CWapFullySpecCLWSPService* NewL(); + IMPORT_C static CWapFullySpecCLWSPService* NewL(const TUid& aImplementation); + IMPORT_C virtual ~CWapFullySpecCLWSPService(); + +public: // API methods + + // Opens a socket which is to be used only with a single, named remote host. + /** + * Connects to the WAP stack, opening an endpoint that can be used to listen for + * Push messages from a specified remote host. + * + * All CWapFullySpecCLWSPService implementations must automatically close this + * endpoint upon destruction. + * + * @param aRemoteHost The bearer-dependent address of the remote host with which + * the data will be exchanged + * @param aRemotePort The port on the remote host to which data will be sent + * @param aBearer The bearer to listen on. You cannot use EAll. + * @param aSecure Security flag to indicate whether WTLS should be used or not + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure)=0; + + /** + * Sends a request to a remote endpoint. + * + * @param aMethod + * @param aURI + * @param aReqHeaders + * @param aReqBody + * @param aTransactionId + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt MethodInvoke(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId)=0; + + /** + * Waits for a datagram to be received + * + * @param aReqHeaders + * @param aReqBody + * @param aTransactionIdPckg + * @param aWspStatus + * @param aReqStatus Asynchonrous status word, used to signal when a data size is known + * @param aTimeout + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout)=0; + + + /** + * Cancels a previously-requested MethodResult() notification. + * + * If a message arrives the client will not be notified. + * + */ + virtual void CancelReq()=0; + + /** + * Gets the local port of this endpoint. + * + * This is useful if the port was chosen automatically. + * + * @param aPort On return, the port number + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalPort(Wap::TPort& aPort)=0; // // (out) the port number + + /** + * Gets the local address of this endpoint. + * + * @param aLocalHost On return, the address of the local host. Clients must pass + * in a reference to a NULL HBufC8 pointer. The function allocates a new HBufC8 + * buffer to hold the address, and passes ownership of the buffer to the client. + * @return KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetLocalAddress(HBufC8*& aLocalHost)=0; // // (out) the address of the local host + +protected: // methods + IMPORT_C CWapFullySpecCLWSPService(); + IMPORT_C void ConstructL(); + +private: // ECOM + // D'tor Key identification required for ECOM + TUid iDtor_ID_Key; +}; + + +// Utility class for client/implementation use. +class CWapMessageUtils : public CBase +/** Utility functions for use with WAP Messaging. */ + { +public: + // // Return a list of all the addresses that are available + IMPORT_C static TInt GetLocalAddressesL(RArray& aAddressInfo); + }; + + +#endif // __WAPMESSAGE_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/inc/wapmsgerr.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/inc/wapmsgerr.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,249 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __WAPMSGERR_H__ +#define __WAPMSGERR_H__ + +#include + +namespace Wap +/** +* Defines WAP-related types and error codes. +*/ + { + _LIT(KWapMsgPanicDescriptor, "WAPMESSAGE"); + +/** Defines start values for categories of WAP-related error codes. */ +enum + { + /** Base value for all error codes. */ + ERetCodeBase = -5500, + /** Base value for connection-orientated WSP error codes. */ + EWSPCORetCodeBase = ERetCodeBase + 25, + /** Base value for connectionless WSP error codes. */ + EWSPCLRetCodeBase = ERetCodeBase + 50, + /** Base value for WTP error codes. */ + EWTPRetCodeBase = ERetCodeBase + 75, + /** Base value for WDP error codes. */ + EWDPRetCodeBase = ERetCodeBase + 100, + /** Base value for WTLS error codes. */ + EWTLSRetCodeBase = ERetCodeBase + 125, + /** Maximum value for WAP-related error codes. */ + ERetCodeTop = ERetCodeBase + 200 + }; + +/** General WAP error codes. */ +enum TGeneralReturnCodes + { + /** There is more data to be read. */ + EMoreData = ERetCodeBase + 0, + /** One of: no bearer set; unknown bearer; a connection exists with different bearer; + * unable to get a local host name from bearer. */ + EBearerError = ERetCodeBase + 1, + /** The port is already used in another bound connection. */ + EPortAlreadyBound = ERetCodeBase + 2, + /** Local port cannot be opened. */ + ECannotOpenPort = ERetCodeBase + 3, + /** There are too many existing connections. */ + ETooManyConnections = ERetCodeBase + 4, + /** Connection handle is invalid. */ + EBadConnection = ERetCodeBase + 5, + /** Passed buffer is too small. */ + EBufferTooSmall = ERetCodeBase + 6 + }; + +/** WTLS-related error codes. */ +enum TWtlsReturnCodes + { + /** Out of memory. */ + EWtlsOutOfMemory = EWTLSRetCodeBase + 0, + /** Socket error. */ + EWtlsSocketError = EWTLSRetCodeBase + 1, + /** Invalid parameter used. */ + EWtlsBadParameters = EWTLSRetCodeBase + 2, + /** Socket error. */ + EWtlsSocketError2 = EWTLSRetCodeBase + 3, + /** Resume ID not found. */ + EWtlsResumeIDNotFound = EWTLSRetCodeBase + 4, + /** Resume error. */ + EWtlsResumeError = EWTLSRetCodeBase + 5, + /** Renegotiation request error. */ + EWtlsRenegotiationRequest = EWTLSRetCodeBase + 6, + /** Illegal call. */ + EWtlsIllegalCall = EWTLSRetCodeBase + 7, + /** Connection close notify error. */ + EWtlsConnectionCloseNotify = EWTLSRetCodeBase + 8, + /** Close notify error. */ + EWtlsSessionCloseNotify = EWTLSRetCodeBase + 9, + /** No connection. */ + EWtlsNoConnection = EWTLSRetCodeBase + 10, + /** Unexpected message. */ + EWtlsUnexpectedMessage = EWTLSRetCodeBase + 11, + /** Bad MAC record. */ + EWtlsBadRecordMac = EWTLSRetCodeBase + 12, + /** Decryption failed. */ + EWtlsDecryptionFailed = EWTLSRetCodeBase + 13, + /** Record overflow. */ + EWtlsRecordOverflow = EWTLSRetCodeBase + 14, + /** Handshake failure. */ + EWtlsHandshakeFailure = EWTLSRetCodeBase + 15, + /** Decompression failure. */ + EWtlsDecompressionFailure = EWTLSRetCodeBase + 16, + /** Bad certificate. */ + EWtlsBadCertificate = EWTLSRetCodeBase + 17, + /** Unsupported certificate. */ + EWtlsUnsupportedCertificate = EWTLSRetCodeBase + 18, + /** Certificate revoked. */ + EWtlsCertificateRevoked = EWTLSRetCodeBase + 19, + /** Certificate expired. */ + EWtlsCertificateExpired = EWTLSRetCodeBase + 20, + /** Certificate unknown. */ + EWtlsCertificateUnknown = EWTLSRetCodeBase + 21, + /** Illegal parameter. */ + EWtlsIllegalParameter = EWTLSRetCodeBase + 22, + /** Unknown certificate authority. */ + EWtlsUnknownCA = EWTLSRetCodeBase + 23, + /** Access denied. */ + EWtlsAccessDenied = EWTLSRetCodeBase + 24, + /** Decoding error. */ + EWtlsDecodeError = EWTLSRetCodeBase + 25, + /** Decryption error. */ + EWtlsDecryptError = EWTLSRetCodeBase + 26, + /** Unknown key ID. */ + EWtlsUnknownKeyId = EWTLSRetCodeBase + 27, + /** Disabled key ID. */ + EWtlsDisableKeyId = EWTLSRetCodeBase + 28, + /** Key exchange disabled. */ + EWtlsKeyExchangeDisabled = EWTLSRetCodeBase + 29, + /** Session not ready. */ + EWtlsSessionNotReady = EWTLSRetCodeBase + 30, + /** Unknown parameter index. */ + EWtlsUnknownParameterIndex = EWTLSRetCodeBase + 31, + /** Duplicate finished Recv() call. */ + EWtlsDuplicateFinishedRecv = EWTLSRetCodeBase + 32, + /** Export restriction error. */ + EWtlsExportRestriction = EWTLSRetCodeBase + 33, + /** Protocol version error. */ + EWtlsProtocolVersion = EWTLSRetCodeBase + 34, + /** Insufficient security. */ + EWtlsInsufficientSecurity = EWTLSRetCodeBase + 35, + /** Internal error. */ + EWtlsInternalError = EWTLSRetCodeBase + 36, + /** User cancelled operation. */ + EWtlsUserCanceled = EWTLSRetCodeBase + 37, + /** No renegotiation. */ + EWtlsNoRenegotiation = EWTLSRetCodeBase + 38, + + /** General error. */ + EWtlsErrGeneral = EWTLSRetCodeBase + 39, + /** Bulk algorithm error. */ + EWtlsErrBulk = EWTLSRetCodeBase + 40, + /** MAC algorithm error. */ + EWtlsErrMac = EWTLSRetCodeBase + 41, + /** Sequence number mode error. */ + EWtlsErrSequenceNumberMode = EWTLSRetCodeBase + 42, + /** Key refresh rate error. */ + EWtlsErrKeyRefreshRate = EWTLSRetCodeBase + 43, + + }; + +/** Connection-orientated WSP error codes. */ +enum TWspCoReturnCodes + { + /** Given buffer is too small. */ + EWspCoBufferTooSmall = EWSPCORetCodeBase + 0, + /** Session handle is not valid. */ + EWspCoInvalidSession = EWSPCORetCodeBase + 1, + /** Invalid transaction. */ + EWspCoInvalidTransaction = EWSPCORetCodeBase + 2, + /** Given parameter is invalid. */ + EWspCoParameterError = EWSPCORetCodeBase + 3, + /** Session is not connected. */ + EWspCoSessionNotConnected = EWSPCORetCodeBase + 4, + /** Functionality is not supported in this session. */ + EWspCoNotSupported = EWSPCORetCodeBase + 5, + /** Function is not applicable in this state of an object. */ + EWspCoInvalidState = EWSPCORetCodeBase + 6, + /** Session has been closed. */ + EWspCoSessionClosed = EWSPCORetCodeBase + 7, + /** Server MRU exceeded. */ + EWspCoMRUExceeded = EWSPCORetCodeBase + 8, + /** Invalid buffer size. */ + EWspCoInvalidBufferSize = EWSPCORetCodeBase + 9, + /** Data not available. */ + EWspCoDataNotAvailable = EWSPCORetCodeBase + 10, + /** Timeout error. */ + EWspCoErrorTimeout = EWSPCORetCodeBase + 11 + }; + + +/** Connectionless WSP error codes. */ +enum TWspClReturnCodes + { + /** Given buffer is too small. */ + EWspClBufferTooSmall = EWSPCLRetCodeBase + 0, + /** Session handle is not valid. */ + EWspClInvalidSession = EWSPCLRetCodeBase + 1, + /** Given parameter is invalid. */ + EWspClParameterError = EWSPCLRetCodeBase + 2, + /** Session is not connected. */ + EWspClSessionNotConnected = EWSPCLRetCodeBase + 3, + /** Functionality is not supported in this session. */ + EWspClNotSupported = EWSPCLRetCodeBase + 4, + /** Function is not applicable in this state of an object. */ + EWspClInvalidState = EWSPCLRetCodeBase + 5, + /** Session has been closed. */ + EWspClSessionClosed = EWSPCLRetCodeBase + 6, + /** Server MRU exceeded. */ + EWspClMRUExceeded = EWSPCLRetCodeBase + 7, + /** Invalid buffer size. */ + EWspClInvalidBufferSize = EWSPCLRetCodeBase + 8, + /** Data not available. */ + EWspClDataNotAvailable = EWSPCLRetCodeBase + 9, + /** Timeout error. */ + EWspClErrorTimeout = EWSPCLRetCodeBase + 10 + }; + +/** WTP-related error codes. */ +enum TWtpReturnCodes + { + /** Out of memory. */ + EWtpNoMemory = EWTPRetCodeBase + 0, + /** Invalid argument. */ + EWtpBadArgument = EWTPRetCodeBase + 1, + /** Provider aborted. */ + EWtpProviderProtoErr = EWTPRetCodeBase + 2, + /** Provider aborted. */ + EWtpProviderAbortInvalidTID = EWTPRetCodeBase + 3, + /** Provider aborted. */ + EWtpProviderAbortNoClass2 = EWTPRetCodeBase + 4, + /** Provider aborted. */ + EWtpProviderAbortNoSAR = EWTPRetCodeBase + 5, + /** Provider aborted. */ + EWtpProviderAbortNoUACK = EWTPRetCodeBase + 6, + /** Provider aborted. */ + EWtpProviderAbortVers1 = EWTPRetCodeBase + 7, + /** Provider aborted. */ + EWtpProviderAbortNoResponse = EWTPRetCodeBase + 8, + /** Provider aborted. */ + EWtpProviderAbortMsgTooLarge = EWTPRetCodeBase + 9, + /** Provider aborted. */ + EWtpProviderAbortGeneral = EWTPRetCodeBase + 10, + /** Service has shutdown. */ + EWtpShutdownError = EWTPRetCodeBase + 11 + }; +} + +#endif // __WAPMSGERR_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/101fbb36.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/101fbb36.rss Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,133 @@ +// Copyright (c) 1997-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Registry file for WAP Messaging API, 8.0 WAP Stack bindings DLL +// Interfaces : MWapBoundDatagramService, MWapFullySpecDatagramService, +// MWapBoundCLPushService, MWapFullySpecCLPushService, +// MWapBoundCLWSPService, MWapFullySpecCLWSPService, +// +// + +#include + +RESOURCE REGISTRY_INFO theInfo + { + // KUidWapMsg + dll_uid = 0x101FBB36; + interfaces = + { + INTERFACE_INFO + { + // KUidBoundWDPInterface - MWapBoundDatagramService UID + interface_uid = 0x101F4471; + implementations = + { + IMPLEMENTATION_INFO + { + // KUidSWSBoundWDPService - CSWSWapBoundWDPService UID + implementation_uid = 0x101FBB37; + version_no = 1; + display_name = "CSSWapBoundWDPService"; + default_data = "swswdp/bound"; + opaque_data = ""; + } + }; + }, + INTERFACE_INFO + { + // KUidFullySpecWDPInterface - MWapFullySpecDatagramService UID + interface_uid = 0x101F4473; + implementations = + { + IMPLEMENTATION_INFO + { + // KUidSWSFullySpecWDPService - CSWSWapFullySpecWDPService UID + implementation_uid = 0x101FBB38; + version_no = 1; + display_name = "CSWSWapFullySpecWDPService"; + default_data = "swswdp/fullyspec"; + opaque_data = ""; + } + }; + }, + INTERFACE_INFO + { + // KUidBoundCLPushInterface - MWapBoundCLPushService UID + interface_uid = 0x101F4475; + implementations = + { + IMPLEMENTATION_INFO + { + // KUidSWSBoundCLPushService - CSWSWapBoundCLPushService UID + implementation_uid = 0x101FBB39; + version_no = 1; + display_name = "CSWSWapBoundCLPushService"; + default_data = "swsclpush/bound"; + opaque_data = ""; + } + }; + }, + INTERFACE_INFO + { + // KUidFullySpecCLPushInterface - MWapFullySpecCLPushService UID + interface_uid = 0x101F4477; + implementations = + { + IMPLEMENTATION_INFO + { + // KUidSWSFullySpecCLPushService - CSWSWapFullySpecCLPushService UID + implementation_uid = 0x101FBB3A; + version_no = 1; + display_name = "CSWSWapFullySpecCLPushService"; + default_data = "swsclpush/fullyspec"; + opaque_data = ""; + } + }; + }, + INTERFACE_INFO + { + // KUidBoundCLWSPInterface - MWapBoundCLWSPService UID + interface_uid = 0x101FBB3B; + implementations = + { + IMPLEMENTATION_INFO + { + // KUidSWSBoundCLWSPService - CSWSWapBoundCLService UID + implementation_uid = 0x101FBB3C; + version_no = 1; + display_name = "CSWSWapBoundCLWSPService"; + default_data = "swsclwsp/bound"; + opaque_data = ""; + } + }; + }, + INTERFACE_INFO + { + // KUidFullySpecCLWSPInterface - MWapFullySpecCLWSPService UID + interface_uid = 0x101FBB3D; + implementations = + { + IMPLEMENTATION_INFO + { + // KUidSWSFullySpecCLWSPService - CSWSWapFullySpecCLWSPService UID + implementation_uid = 0x101FBB3E; + version_no = 1; + display_name = "CSWSWapFullySpecCLWSPService"; + default_data = "swsclwsp/fullyspec"; + opaque_data = ""; + } + }; + } + }; + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/ActiveSocket.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/ActiveSocket.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,1126 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "ActiveSocket.h" +#include +#include "CLWSPPduHandler.h" +#include "wapmsgerr.h" +#include +#include "WapMessageApiAgent.h" +#include "WapSwsLog.h" +#include "WapMsgUtils.h" + +using namespace Wap; + +void CActiveSocket::NewL(RSocketServ& aSocketServ, RPointerArray& aActiveSockets, Wap::TBearer aBearer, TWapMessageType aType, MProgressNotify* aNotify, Wap::TPort aLocalPort, RConnection* aConnection) +/** +The static new function instanciates corresponding Bearers in terms of the input bearer type. +This function is used by Bound Wap APIs which listen the incoming packet to a specific port. +@internalComponent +@released +@since v8.0 +@param aSocketServ the shared RSocketServ instance used in the Wap messaging API which owns this bearer +@param aActiveSockets the bearer array used in the Wap messaging API which owns the bearer +@param aBearer the bearer to listen on (use EAll for all bearers) +@param aType the type of the wap message that will received +@param aNotify the instance to be notified when a wap message is received +@param aLocalPort the port to listen on +@param aConnection the shared connection from Wap messaging API client +*/ + { + //Instanciate the corresponding + switch(aBearer) + { + case Wap::ESMS7: + case Wap::ESMS: + case Wap::EWAPSMS7: + case Wap::EWAPSMS: + { + CActiveSocket* me = new(ELeave) CActiveSocketSMS(aSocketServ, aNotify, aBearer, aLocalPort); + CleanupStack::PushL(me); + me->ConstructL(aType); + aActiveSockets.AppendL(me); + CleanupStack::Pop(me); + break; + } + case Wap::EIP: + { + CActiveSocket* me = new(ELeave) CActiveSocketUDP(aSocketServ, aNotify, aBearer, aLocalPort, aConnection); + CleanupStack::PushL(me); + me->ConstructL(aType); + aActiveSockets.AppendL(me); + CleanupStack::Pop(me); + break; + } + case Wap::EAll: + { + CActiveSocket* me = new(ELeave) CActiveSocketUDP(aSocketServ, aNotify, Wap::EIP, aLocalPort, aConnection); + CleanupStack::PushL(me); + me->ConstructL(aType); + CActiveSocket* me1 = new(ELeave) CActiveSocketSMS(aSocketServ, aNotify, Wap::ESMS, aLocalPort); + CleanupStack::PushL(me1); + me1->ConstructL(aType); + aActiveSockets.ReserveL(2); // pre-allocate the memory + aActiveSockets.AppendL(me1); + CleanupStack::Pop(me1); + aActiveSockets.AppendL(me); + CleanupStack::Pop(me); + break; + } + default: + { + LOG(SwsLog::Printf(_L("CActiveSocket::NewL Unknown Bearer Type"));) + User::Leave(Wap::EBearerError); + } + } + } + +void CActiveSocket::NewL(RSocketServ& aSocketServ, RPointerArray& aActiveSockets, Wap::TBearer aBearer, TWapMessageType aType, MProgressNotify* aNotify, const TSockAddr& aRemoteAddr, RConnection* aConnection) +/** +The static new function instanciates corresponding Bearers in terms of the input bearer type. +This function is used by Fully specified Wap APIs which will open a socket with a single, named remote host. +@internalComponent +@released +@since v8.0 +@param aSocketServ the shared RSocketServ instance used in the Wap messaging API which owns this bearer +@param aActiveSockets the bearer array used in the Wap messaging API which owns the bearer +@param aBearer the bearer to listen on (use EAll for all bearers) +@param aType the type of the wap message that will received +@param aNotify the instance to be notified when a wap message is received +@param aRemoteAddr the remote host to be communicate with +@param aConnection the shared connection from Wap messaging API client +*/ + { + //Instanciate the corresponding + switch(aBearer) + { + case Wap::ESMS7: + case Wap::ESMS: + case Wap::EWAPSMS7: + case Wap::EWAPSMS: + { + CActiveSocket* me = new(ELeave) CActiveSocketSMS(aSocketServ, aNotify, aBearer, aRemoteAddr); + CleanupStack::PushL(me); + me->ConstructL(aType); + aActiveSockets.AppendL(me); + CleanupStack::Pop(me); + break; + } + case Wap::EIP: + { + CActiveSocket* me = new(ELeave) CActiveSocketUDP(aSocketServ, aNotify, aBearer, aRemoteAddr, aConnection); + CleanupStack::PushL(me); + me->ConstructL(aType); + aActiveSockets.AppendL(me); + CleanupStack::Pop(me); + break; + } + case Wap::EAll: + { + CActiveSocket* me = new(ELeave) CActiveSocketUDP(aSocketServ, aNotify, aBearer, aRemoteAddr, aConnection); + CleanupStack::PushL(me); + me->ConstructL(aType); + CActiveSocket* me1 = new(ELeave) CActiveSocketSMS(aSocketServ, aNotify, aBearer, aRemoteAddr); + CleanupStack::PushL(me1); + me1->ConstructL(aType); + aActiveSockets.ReserveL(2); // pre-allocate the memory + aActiveSockets.AppendL(me1); + CleanupStack::Pop(me1); + aActiveSockets.AppendL(me); + CleanupStack::Pop(me); + break; + } + default: + { + LOG(SwsLog::Printf(_L("CActiveSocket::NewL Unknown Bearer Type"));) + User::Leave(Wap::EBearerError); + } + } + } + +CActiveSocket::CActiveSocket(RSocketServ& aSocketServ, Wap::TBearer aBearerType, MProgressNotify* aNotify, Wap::TPort aLocalPort) +:CActive(EPriorityStandard), iLocalAddr(0), iSocketServ(aSocketServ), iBearerType(aBearerType), iLocalPort(aLocalPort), iSocketState(ESocketIdle),iNotify(aNotify), iBuf(0,0), iRxlength(0), iBufCon(0,0) +/** +Constructor of bearer base class for Bound Wap APIs +@internalComponent +@released +@since v8.0 +*/ + { + CActiveScheduler::Add(this); + } + +CActiveSocket::CActiveSocket(RSocketServ& aSocketServ, Wap::TBearer aBearerType, MProgressNotify* aNotify, const TSockAddr& aRemoteAddr, Wap::TPort aLocalPort): CActive(EPriorityStandard), +iRemoteAddr(aRemoteAddr), iLocalAddr(0), iSocketServ(aSocketServ), iBearerType(aBearerType), iLocalPort(aLocalPort), iSocketState(ESocketIdle), iNotify(aNotify), iBuf(0,0), iRxlength(0), iBufCon(0,0) +/** +Constructor of bearer base class for fully specified Wap APIs +@internalComponent +@released +@since v8.0 +*/ + { + CActiveScheduler::Add(this); + } + +CActiveSocket::~CActiveSocket() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + Cancel(); + iSocket.Close(); + if (iMessageRecord) + { + delete iMessageRecord; + } + } + +void CActiveSocket::ConstructL(TWapMessageType aType) +/** +Second Phase Constructor +@internalComponent +@released +@param aType the type of Wap message which is received. +@since v8.0 +*/ + { + iMessageRecord=CWapMessageRecord::NewL(aType); + } + +RSocket& CActiveSocket::Socket() +/** +To get the RSocket instance ownd by this bearer +@internalComponent +@released +@since v8.0 +@returns the reference of the RSocket instance. +*/ + { + return iSocket; + } + +Wap::TBearer CActiveSocket::GetBearerType() +/** +To get the bearer type of this bearer +@internalComponent +@released +@since v8.0 +@returns the bearer type +*/ + { + return iBearerType; + } + +TSockAddr& CActiveSocket::GetLocalAddress() +/** +To get the local address of this bearer +@internalComponent +@released +@since v8.0 +@returns the lcoal address instance +*/ + { + iSocket.LocalName(iLocalAddr); + return iLocalAddr; + } + +TSockAddr& CActiveSocket::GetRemoteAddress() +/** +To get the remote address of the last received packet +@internalComponent +@released +@since v8.0 +@returns the remote address instance +*/ + { + return iRemoteAddr; + } + +TInt CActiveSocket::GetRemoteAddress(HBufC8*& aAddr) +/** +To get the remote address of the last received packet +@internalComponent +@released +@since v8.0 +@param aAddr the remote host name +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TRAPD(err, aAddr=iRemoteAddr.AllocL()) + if (err==KErrNone) + { + Wap::TPort port; + TPtr8 des=aAddr->Des(); + TRAP(err, CSWSWapMsgUtils::AnalyseAddrL(iRemoteAddr, iBearerType, des, port)) + } + else + { + LOG(SwsLog::Printf(_L("CActiveSocketUDP::GetServerAddress: Alloc Memory Err=%d"), err);) + } + return err; + } + +TInt CActiveSocket::GetLocalPort(Wap::TPort& aLocalPort) +/** +To get the lcoal port of this bearer +@internalComponent +@released +@since v8.0 +@param aLocalPort the local port of this bearer +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + GetLocalAddress(); + aLocalPort=Wap::TPort(iLocalAddr.Port()); + return KErrNone; + } + +TUint32 CActiveSocket::GetPduSize() +/** +To get the received Wdp Pdu length +@internalComponent +@released +@since v8.0 +@returns the length of the received Wdp pdu. +*/ + { + return iMessageRecord->GetPduSize(); + } + +TWapMessageState CActiveSocket::GetDataState() +/** +To get the state of the data that is being received +@internalComponent +@released +@since v8.0 +@returns the state of the data that is being received +*/ + { + return iMessageRecord->GetDataState(); + } + +void CActiveSocket::SetDataState(TWapMessageState aState) +/** +To set the state of the data that is being received +@internalComponent +@released +@since v8.0 +@param aState the state of the data that is being received +*/ + { + iMessageRecord->SetDataState(aState); + } + +TInt CActiveSocket::GetPduData(TDes8& aBuffer, TBool& aTruncated) +/** +To get the received Wdp pdu. +@internalComponent +@released +@since v8.0 +@param aBuffer the buffer to read the received WDP pdu +@param aTruncated the flag to represent if the data has be truncated or not +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iMessageRecord->GetPduData(aBuffer, aTruncated); + } + +TInt CActiveSocket::GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aStatus) +/** +To get the received Wsp header, body, tranaction ID and Wsp status. +@internalComponent +@released +@since v8.0 +@param aWspHeader the buffer to read the received Wsp header +@param aWspBody the buffer to read the received Wsp body +@param aTransactionId the transaction ID of the received Wsp Message +@param aStatus the Wsp status of the received Wsp Message +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iMessageRecord->GetWspData(aWspHeader, aWspBody, aTransactionId, aStatus); + } +void CActiveSocket::UnpackPduToWspDataL() +/** +To extract the Wsp header, body, transaction ID and status from the received WDP pdu +@internalComponent +@released +@since v8.0 +*/ + { + iMessageRecord->UnpackPduToWspDataL(); + } + +void CActiveSocket::CleanUpData() + { + TPtr8 zero(0,0); + iBuf.Set(zero); + iBufCon.Set(zero); + iMessageRecord->CleanUpData(); + } + +/** SMS active socket +*/ +CActiveSocketSMS::CActiveSocketSMS(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, Wap::TPort aLocalPort) +:CActiveSocket(aSocketServ, aBearer, aNotify, aLocalPort) +/** +Constructor of SMS bearer for Bound Wap APIs +@internalComponent +@released +@since v8.0 +*/ + { + } + +CActiveSocketSMS::CActiveSocketSMS(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, const TSockAddr& aRemoteAddr) +:CActiveSocket(aSocketServ, aBearer, aNotify, aRemoteAddr, (Wap::TPort)EWapPortUnspecified) +/** +Constructor of SMS bearer for fully specified Wap APIs +@internalComponent +@released +@since v8.0 +*/ + { + } + +CActiveSocketSMS::~CActiveSocketSMS() +/** +Destructor of SMS bearer for fully specified Wap APIs +@internalComponent +@released +@since v8.0 +*/ + { + } + +void CActiveSocketSMS::ConstructL(TWapMessageType aType) +/** +Second Phase Constructor +@internalComponent +@released +@param aType the type of Wap message which is received. +@since v8.0 +*/ + { + CActiveSocket::ConstructL(aType); + User::LeaveIfError(iSocket.Open(iSocketServ, KWAPSMSAddrFamily, KSockDatagram, KWAPSMSDatagramProtocol)); + User::LeaveIfError(iSocket.SetOpt(KWapSmsOptionNewStyleClient,KWapSmsOptionLevel, 0)); + TWapAddr wapAddr; + wapAddr.SetWapPort(TWapPortNumber(iLocalPort)); + TInt err=iSocket.Bind(wapAddr); + if (err==KErrInUse) + { + User::Leave(Wap::EPortAlreadyBound); + } + } + +TInt CActiveSocketSMS::AwaitRecvDataSize() +/** +Read the received Wdp pdu length. +@internalComponent +@released +@since v8.0 +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TPckgBuf* length=iMessageRecord->GetPduSizeRef(); + iSocket.Ioctl(KSOGetLength, iStatus, length, KSolWapProv); + iMessageRecord->SetDataState(ERequestingLength); + iSocketState=ESocketWaitingForLength; + SetActive(); + return KErrNone; + } + +TInt CActiveSocketSMS::Receive() +/** +Read the received Wdp pdu. +@internalComponent +@released +@since v8.0 +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInt err=KErrNone; + TRAP(err, iMessageRecord->CreatePduBufferL(EFalse)) + if (err!=KErrNone) + { + return err; + } + HBufC8*& pdu=iMessageRecord->GetPduPtr(); + iBuf.Set(pdu->Des()); + iSocket.RecvFrom(iBuf, iRemoteAddr, 0, iStatus); + iMessageRecord->SetDataState(ERequestingData); + iSocketState=ESocketWaitingForData; + SetActive(); + return KErrNone; + } + +void CActiveSocketSMS::RunL() +/** +Overload the CActive virtual methods +@internalComponent +@released +@since v8.0 +*/ + { + switch (iSocketState) + { + case ESocketWaitingForLength: + { + LOG(SwsLog::Printf(_L("CActiveSocketSMS::RunL() ESocketWaitingForLength"));) + iMessageRecord->SetDataState(EPendingLength); + iSocketState=ESocketIdle; + TWapNotificationInfo info(iBearerType, iStatus.Int()); + TWapNotificationInfoBuf infoBuf(info); + iNotify->Notification(EPduLengthReceived, infoBuf); + break; + } + case ESocketWaitingForData: + { + LOG(SwsLog::Printf(_L("CActiveSocketSMS::RunL() ESocketWaitingForData"));) + iMessageRecord->SetDataState(EPendingData); + iSocketState=ESocketIdle; + TWapNotificationInfo info(iBearerType, iStatus.Int()); + TWapNotificationInfoBuf infoBuf(info); + iNotify->Notification(EPduReceived, infoBuf); + iSocket.SetOpt(KWapSmsOptionOKToDeleteMessage,KWapSmsOptionLevel, 0); + break; + } + default: + LOG(SwsLog::Printf(_L("CActiveSocketSMS::RunL() Unknown State"));); + } + } +void CActiveSocketSMS::DoCancel() +/** +Overload the CActive virtual methods +@internalComponent +@released +@since v8.0 +*/ + { + switch (iSocketState) + { + case ESocketWaitingForLength: + { + iSocket.CancelIoctl(); + break; + } + case ESocketWaitingForData: + { + iSocket.CancelRecv(); + break; + } + default: + LOG(SwsLog::Printf(_L("CActiveSocketSMS::DoCancel() Unknown State"));); + } + } + +// +// UDP active socket +// +CActiveSocketUDP::CActiveSocketUDP(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, Wap::TPort aLocalPort, RConnection* aConnection) +:CActiveSocket(aSocketServ, aBearer, aNotify, aLocalPort),iConnection(aConnection) +/** +Constructor for Bound Wap APIs +@internalComponent +@released +@since v8.0 +*/ + { + } + +CActiveSocketUDP::CActiveSocketUDP(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, const TSockAddr& aRemoteAddr, RConnection* aConnection) +:CActiveSocket(aSocketServ, aBearer, aNotify, aRemoteAddr,0), iConnection(aConnection) +/** +Constructor for FullySpec Wap APIs +@internalComponent +@released +@since v8.0 +*/ + { + } + +void CActiveSocketUDP::ConstructL(TWapMessageType aType) +/** +Second Phase constructor +@internalComponent +@released +@since v8.0 +*/ + { + CActiveSocket::ConstructL(aType); + if (!iConnection) + { + User::LeaveIfError(iSocket.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp)); + } + else + { + User::LeaveIfError(iSocket.Open(iSocketServ, KAfInet, KSockDatagram, KProtocolInetUdp, *iConnection)); + } + TInetAddr inetAddr(iLocalPort); + TInt err=iSocket.Bind(inetAddr); + if (err==KErrInUse) + { + User::Leave(Wap::EPortAlreadyBound); + } + } + +CActiveSocketUDP::~CActiveSocketUDP() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + } + +TInt CActiveSocketUDP::AwaitRecvDataSize() +/** +Wait for Pdu data size +@internalComponent +@released +@since v8.0 +*/ + { + iRxlength=0; + TRAPD(err, iMessageRecord->CreatePduBufferL(ETrue)) + if (err!=KErrNone) + { + return err; + } + HBufC8*& pdu=iMessageRecord->GetPduPtr(); + iBuf.Set(pdu->Des()); + iSocket.RecvFrom(iBuf, iRemoteAddr, 0, iStatus, iRxlength); + iMessageRecord->SetDataState(ERequestingLength); + iSocketState=ESocketWaitingForLength; + SetActive(); + return KErrNone; + } + +TInt CActiveSocketUDP::Receive() +/** +Receive the pdu +@internalComponent +@released +@since v8.0 +*/ + { + if(iMessageRecord->GetDataState()==EContinuous) + { + TRAPD(err, iMessageRecord->CreatePduBufferL(ETrue)) + if (err!=KErrNone) + { + return err; + } + HBufC8*& pdu=iMessageRecord->GetPduPtr(); + iBuf.Set(pdu->Des()); + iBuf.SetLength(iBuf.Length()+1); + iBufCon.Set(&iBuf[iBuf.Length()-1],0,iBuf.MaxLength()-iBuf.Length()); + iBuf.SetLength(iBuf.Length()+iRxlength()-1); + iSocket.RecvFrom(iBufCon, iRemoteAddr, KSockReadContinuation, iStatus,iRxlength); + iMessageRecord->SetDataState(ERequestingData); + iSocketState=ESocketWaitingForData; + SetActive(); + } + else + { + iMessageRecord->SetDataState(ERequestingData); + iSocketState=ESocketWaitingForData; + iStatus = KRequestPending; + SetActive(); + TRequestStatus* reqStatus=&iStatus; + User::RequestComplete(reqStatus, KErrNone); + } + return KErrNone; + } + +void CActiveSocketUDP::RunL() +/** +RunL() +@internalComponent +@released +@since v8.0 +*/ + { + switch (iSocketState) + { + case ESocketWaitingForLength: + { + LOG(SwsLog::Printf(_L("CActiveSocketUDP::RunL() ESocketWaitingForLength"));) + iMessageRecord->SetPduSize(iBuf.Length()+ iRxlength()); + if(iRxlength() > 0) + { + iMessageRecord->SetDataState(EContinuous); + } + else + { + iMessageRecord->SetDataState(EPendingLength); + } + iSocketState=ESocketIdle; + TWapNotificationInfo info(iBearerType, iStatus.Int()); + TWapNotificationInfoBuf infoBuf(info); + iNotify->Notification(EPduLengthReceived, infoBuf); + break; + } + case ESocketWaitingForData: + { + LOG(SwsLog::Printf(_L("CActiveSocketUDP::RunL() ESocketWaitingForData"));) + iMessageRecord->SetDataState(EPendingData); + iSocketState=ESocketIdle; + TWapNotificationInfo info(iBearerType, iStatus.Int()); + TWapNotificationInfoBuf infoBuf(info); + iNotify->Notification(EPduReceived, infoBuf); + break; + } + default: + LOG(SwsLog::Printf(_L("CActiveSocketUDP::RunL() Unknown State"));) + break; + } + } + +void CActiveSocketUDP::DoCancel() +/** +Cancel the outstanding request on UDP bearer +@internalComponent +@released +@since v8.0 +*/ + { + switch (iSocketState) + { + case ESocketWaitingForLength: + { + iSocket.CancelRecv(); + break; + } + case ESocketWaitingForData: + { + break; + } + default: + LOG(SwsLog::Printf(_L("CActiveSocketUDP::DoCancel() Unknown State"));); + } + } + +// +//CWapMessageRecord +// +CWapMessageRecord* CWapMessageRecord::NewL(TWapMessageType aType) +/** +The static funtion to instanciate the Pdu data record +@internalComponent +@released +@since v8.0 +@param aType the type of Wap message which is received. +@returns the data record instance. +*/ + { + CWapMessageRecord* me; + if (aType==EWapWsp) + { + me = new(ELeave) CWspMessageRecord(); + } + else + { + me = new(ELeave) CWdpMessageRecord(); + } + return me; + } + +CWapMessageRecord::CWapMessageRecord() +/** +Constructor +@internalComponent +@released +@since v8.0 +*/ + { + } + +CWapMessageRecord::~CWapMessageRecord() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + if (iPdu) + { + delete iPdu; + } + } + +TWapMessageState CWapMessageRecord::GetDataState() +/** +To get the state of the data that is being received +@internalComponent +@released +@since v8.0 +returns the state of the data that is being received +*/ + { + return iState; + } + +void CWapMessageRecord::SetDataState(TWapMessageState aState) +/** +To set the state of the data that is being received +@internalComponent +@released +@since v8.0 +@param the state of the data that is being received +*/ + { + iState=aState; + } + +TPckgBuf* CWapMessageRecord::GetPduSizeRef() +/** +To get the buffer which is used to contain the received data length +@internalComponent +@released +@since v8.0 +@returns the pointer to the buffer length +*/ + { + return &iDataLength; + } + +void CWapMessageRecord::SetPduSize(TUint32 aLength) + { + iDataLength=aLength; + } + +TUint32 CWapMessageRecord::GetPduSize() +/** +To get the received wdp pdu length +@internalComponent +@released +@since v8.0 +@returns the received wdp pdu length +*/ + { + iState=EGotLength; + return iDataLength(); + } + +HBufC8*& CWapMessageRecord::GetPduPtr() +/** +To get the received wdp pdu. +@internalComponent +@released +@since v8.0 +@returns the pointer the received wdp buffer +*/ + { + return iPdu; + } + +void CWapMessageRecord::CreatePduBufferL(TBool aFixLengthFlag) +/** +create the wdp pdu buffer according to the length +@internalComponent +@released +@since v8.0 +*/ + { + if (iState==EContinuous) + { + iPdu = iPdu->ReAllocL(iDataLength()); + } + else if (!aFixLengthFlag) + { + iPdu=HBufC8::NewL(iDataLength()); + } + else + { + iPdu=HBufC8::NewL(KMaxUdpBearerDataBufferLength); + } + } + +void CWapMessageRecord::CleanUpData() +/** +clean up the receive buffer. +@internalComponent +@released +@since v8.0 +*/ + { + if (iPdu) + { + delete iPdu; + iPdu=NULL; + } + iDataLength.FillZ(); + iState=EIdle; + } + +// +//CWspMessageRecord methods +// +CWspMessageRecord::CWspMessageRecord() +/** +Constructor +@internalComponent +@released +@since v8.0 +*/ + { + } + +CWspMessageRecord::~CWspMessageRecord() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + if (iWspHeader) + { + delete iWspHeader; + } + if (iWspBody) + { + delete iWspBody; + } + } + +void CWspMessageRecord::UnpackPduToWspDataL() +/** +To unpack the received wdp pdu to wsp message. +@internalComponent +@released +@since v8.0 +*/ + { + TWSPPduType type; + CCLWSPPduHandler::UnpackWSPPduL(iPdu, type, iWspHeader, iWspBody, iTransactionId, iWspStatus); + } + +TInt CWspMessageRecord::GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aWspStatus) +/** +To read the wsp message from the buffer +@internalComponent +@released +@since v8.0 +@param aWspHeader the buffer to contain the wsp header +@param aWspBody the buffer to contain the wsp body +@param iTransactionId the received transaction ID +@param aWspStatus the received wsp status +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (!iWspHeader && !iWspBody) + { + // if no data, should not be here at all + LOG(SwsLog::Printf(_L("CWspMessageRecord::GetWspData() No Data Available"));) + CleanUpData(); + return KErrBadDescriptor; + } + TInt ret=KErrNone; + //Copy the transaction ID + aTransactionId=iTransactionId; + aWspStatus=iWspStatus; + //Copy the header + TInt bufferLength; + if (iWspHeader) + { + bufferLength=aWspHeader.MaxLength(); + TPtrC8 remainHeader=iWspHeader->Mid(iHeaderOffset); + //Client Header buffer is not long enough + if (bufferLengthMid(iBodyOffset); + + //Client Header buffer is not long enough + if (bufferLengthMid(iPduOffset); + if (bufLength +#include +#include "WapSwsTimeOut.h" + + +class CActiveSocketSMS; +class CActiveSocketUDP; +class MProgressNotify; + +enum TWapMessageState + { + /** + The state that is no outstanding request. + */ + EIdle, + /** + The state that the messaging API client is requesting data length + */ + ERequestingLength, + /** + The state the the messaging API client is requesting data + */ + ERequestingData, + /** + The state that the data size is ready to be read + */ + EPendingLength, + /** + The state that the messaging API client got the data length + */ + EGotLength, + /** + The state that the received data is ready to be read + */ + EPendingData, + /** + The state the data is being reading, but not finished + */ + EReading, + /** + The state that there are more data to be received from ESock (PRT 1.5) + */ + EContinuous + }; +enum TWapMessageType + { + /** + Wsp message + */ + EWapWsp, + /** + Wdp message + */ + EWapWdp + }; +enum TWapActiveSocketState + { + /** + No outstanding request state + */ + ESocketIdle, + /** + Waiting for the PDU length state + */ + ESocketWaitingForLength, + /** + Waiting for the PDU data state + */ + ESocketWaitingForData + }; +enum TWapNotificationEvent + { + /** + The event that PDU length is ready. + */ + EPduLengthReceived, + /** + The event thst PDU us ready + */ + EPduReceived + }; + +class TWapNotificationInfo + { +public: + inline TWapNotificationInfo(Wap::TBearer aBearer, TInt aError); + Wap::TBearer iBearer; + TInt iError; + }; + +inline TWapNotificationInfo::TWapNotificationInfo(Wap::TBearer aBearer, TInt aError): +iBearer(aBearer), iError(aError) + { + } + +typedef TPckgBuf TWapNotificationInfoBuf; + +const TUint KMaxUdpBearerDataBufferLength=1024; + +class CWapMessageRecord: public CBase +/** +The Base class to represent the received WSP and WDP PDU +@internalComponent +@released +@since v8.0 +*/ + { +public: + static CWapMessageRecord* NewL(TWapMessageType aType); + virtual ~CWapMessageRecord(); + TWapMessageState GetDataState(); + void SetDataState(TWapMessageState aStatus); + void CreatePduBufferL(TBool aFixLengthFlag); + TPckgBuf* GetPduSizeRef(); + void SetPduSize(TUint32 aLength); + TUint32 GetPduSize(); + HBufC8*& GetPduPtr(); + /** + To read the received Wdp pdu + @internalComponent + @released + @since v8.0 + @param aBuffer(out) the buffer to contain the received wdp pdu + @param aTruncated(out) the flag to represent if the data is truncated or not + @returns KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetPduData(TDes8& aBuffer, TBool& aTruncated)=0; + /** + To unpack the received wdp pdu to wsp message. + @internalComponent + @released + @since v8.0 + */ + virtual void UnpackPduToWspDataL()=0; + /** + To read the wsp message from the buffer + @internalComponent + @released + @since v8.0 + @param aWspHeader(out) the buffer to contain the wsp header + @param aWspBody(out) the buffer to contain the wsp body + @param iTransactionId(out) the received transaction ID + @param aWspStatus(out) the received wsp status + @returns KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aWspStatus)=0; + virtual void CleanUpData(); +public: + /**The received WDP PDU Data buffer + */ + HBufC8* iPdu; + /**The received WDP PDU length buffer + */ + TPckgBuf iDataLength; + +protected: + CWapMessageRecord(); + /**The state of the received the WSP or WDP data + */ + TWapMessageState iState; + }; + +class CWspMessageRecord: public CWapMessageRecord +/** +The class to represent the received WSP PDU +@internalComponent +@released +@since v8.0 +*/ + { +public: + CWspMessageRecord(); + ~CWspMessageRecord(); + void UnpackPduToWspDataL(); + TInt GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aWspStatus); + TInt GetPduData(TDes8& aBuffer, TBool& aTruncated); + void CleanUpData(); +private: + /** + The buffer for received Wsp header. + */ + HBufC8* iWspHeader; + /** + The buffer for received Wsp body. + */ + HBufC8* iWspBody; + /** + The received the transaction Id. + */ + TUint8 iTransactionId; + /** + The received WSP layer status + */ + TWSPStatus iWspStatus; + /** + The offset of the header for next reading + */ + TInt iHeaderOffset; + /** + The offset of the body for next reading + */ + TInt iBodyOffset; + }; + +class CWdpMessageRecord: public CWapMessageRecord +/** +The class to represent the received WDP PDU +@internalComponent +@released +@since v8.0 +*/ + { +public: + CWdpMessageRecord(); + ~CWdpMessageRecord(); + void UnpackPduToWspDataL(); + TInt GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aWspStatus); + TInt GetPduData(TDes8& aBuffer, TBool& aTruncated); + void CleanUpData(); +private: + /** + The offset of the pdu for next reading + */ + TUint32 iPduOffset; + }; + +class CActiveSocket: public CActive +/** +The base class for the different bearer classes. +@internalComponent +@released +@since v8.0 +*/ + { +public: + static void NewL(RSocketServ& aSocketServ, RPointerArray& aActiveSockets, Wap::TBearer aBearer, TWapMessageType aType, MProgressNotify* aNotify, Wap::TPort aLocalPort, RConnection* aConnection=NULL); + static void NewL(RSocketServ& aSocketServ, RPointerArray& aActiveSockets, Wap::TBearer aBearer, TWapMessageType aType, MProgressNotify* aNotify, const TSockAddr& aRemoteAddr, RConnection* aConnection=NULL); + virtual ~CActiveSocket(); + virtual void ConstructL(TWapMessageType aType); + /** + Read the received Wdp pdu length. + @internalComponent + @released + @since v8.0 + @returns KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt AwaitRecvDataSize() = 0; + /** + Read the received Wdp pdu. + @internalComponent + @released + @since v8.0 + @returns KErrNone on successful completion, or one of the system error codes on failure. + */ + virtual TInt Receive() = 0; + TSockAddr& GetLocalAddress(); + TInt GetLocalPort(Wap::TPort& aLocalPort); + TInt GetRemoteAddress(HBufC8*& aAddr); + TSockAddr& GetRemoteAddress(); + + TWapMessageState GetDataState(); + void SetDataState(TWapMessageState aState); + TUint32 GetPduSize(); + TInt GetPduData(TDes8& aBuffer, TBool& aTruncated); + TInt GetWspData(TDes8& aWspHeader, TDes8& aWspBody, TUint8& aTransactionId, TWSPStatus& aStatus); + void UnpackPduToWspDataL(); + Wap::TBearer GetBearerType(); + RSocket& Socket(); + void CleanUpData(); + +public: + /**The RSocket instance to send and receive WDP PDU. + */ + RSocket iSocket; + /**The remote address for the last received message + */ + TSockAddr iRemoteAddr; + /**The local address for the last received message + */ + TSockAddr iLocalAddr; + +protected: + CActiveSocket(RSocketServ& aSocketServ, Wap::TBearer aBearerType, MProgressNotify* aNotify, Wap::TPort aLocalPort); + CActiveSocket(RSocketServ& aSocketServ, Wap::TBearer aBearerType, MProgressNotify* aNotify, const TSockAddr& aRemoteAddr, Wap::TPort aLocalPort); + +protected: + /**The data buffer to receive WDP or WSP message + */ + CWapMessageRecord* iMessageRecord; + /**The RSocketServ reference from WAP message API + */ + RSocketServ& iSocketServ; + /**The Bearer type + */ + Wap::TBearer iBearerType; + /**The port number for the last received message + */ + Wap::TPort iLocalPort; + /**The state of the bearer + */ + TWapActiveSocketState iSocketState; + /** + The instance that to be notified when data is received + */ + MProgressNotify* iNotify; + /** + Buffer for the first read from ESock + */ + TPtr8 iBuf; + /** + Reported remaining length for PRT 1.5 + */ + TSockXfrLength iRxlength; + /** + Buffer for continious read from ESock + */ + TPtr8 iBufCon; + }; + +class CActiveSocketSMS : public CActiveSocket +/** +The class represent the SMS bearer. It will open a RSocket over WapSMS protocol, send and +receive WDP PDU. +@internalComponent +@released +@since v8.0 +*/ +{ +public: + CActiveSocketSMS(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, Wap::TPort aLocalPort); + CActiveSocketSMS(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, const TSockAddr& aRemoteAddr); + virtual ~CActiveSocketSMS(); + TInt AwaitRecvDataSize(); + TInt Receive(); + void ConstructL(TWapMessageType aType); +private: + void RunL(); + void DoCancel(); +}; + +class CActiveSocketUDP : public CActiveSocket +/** +The class represent the UDP bearer. It will open a RSocket over UDP protocol, send and +receive WDP PDU. It is not supported in released v8.0. +@internalComponent +@released +@since v8.0 +*/ +{ +public: + CActiveSocketUDP(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, Wap::TPort aLocalPort, RConnection* aConnection); + CActiveSocketUDP(RSocketServ& aSocketServ, MProgressNotify* aNotify, Wap::TBearer aBearer, const TSockAddr& aRemoteAddr, RConnection* aConnection); + virtual ~CActiveSocketUDP(); + TInt AwaitRecvDataSize(); + TInt Receive(); + void ConstructL(TWapMessageType aType); +private: + void RunL(); + void DoCancel(); + /** + The RConnection shared with the WAP message API client. + */ + RConnection* iConnection; +}; + +#endif // __ACTIVESOCKET_H__ + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/CLWSPPduHandler.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/CLWSPPduHandler.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,346 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "CLWSPPduHandler.h" +#include "wapmsgerr.h" +#include "WapSwsLog.h" + +void CCLWSPPduHandler::UnpackWSPPduL(HBufC8* aWSPPdu, TWSPPduType& aType, HBufC8*& aWSPHeader, HBufC8*& aBody, TUint8& aId, TWSPStatus& aStatus) +/** +Unpack the received WSP PDU from remote peer to several data structure expected by the client. +@internalComponent +@released +@since v8.0 +@param aWSPPdu the received WSP PDU from the remote peer. +@param aType the type of the received WSP PDU. +@param aWSPHeader the WSP header of the received WSP PDU. +@param aBody the data body of the received WSP PDU. +@param aId the transaction ID or Push ID of the received WSP PDU. +@param aStatus the WSP status of the received WSP PDU. +@returns TInt KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TPtr8 des=aWSPPdu->Des(); + if(des.Length() < KPDUTransactionIDAndPDUTypeLength) + { + LOG(SwsLog::Printf(_L("CCLWSPPduHandler::UnpackWSPPduL() Corrupted InComing Wsp PDU"));) + User::Leave(KErrCorrupt); + } + aId=des[KPDUHeaderTransactionIDOffSet]; + aType=TWSPPduType(des[KPDUHeaderWSPPDUTypeOffSet]); + switch (aType) + { + case EReply: + UnpackReplyPduL(aWSPPdu, aWSPHeader, aBody, aStatus); + break; + case EPush: + UnpackPushPduL(aWSPPdu, aWSPHeader, aBody); + break; + default: + LOG(SwsLog::Printf(_L("CCLWSPPduHandler::UnpackWSPPduL() Unknown InComing Wsp PDU Type"));) + User::Leave(KErrCorrupt); + } + } + +void CCLWSPPduHandler::PackWSPPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TDesC8& aBody, const TUint8 aId) +/** +Pack the information to be sent into WSP PDU. +@internalComponent +@released +@since v8.0 +@param aWSPPdu the WSP PDU that is to sent +@param aType the WSP PDU type(the method is to be invoked) +@param aURI the URI where the WSP PDU goes +@param aWSPHeader the WSP header +@param aBody the data body +@param aId the transaction ID +@returns TInt KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + switch (aType) + { + case EGet: + case EGetOptions: + case EGetHead: + case EGetDelete: + case EGetTrace: + PackGetPduL(aWSPPdu, aType, aURI, aWSPHeader, aId); + break; + + case EPost: + case EPostPut: + PackPostPduL(aWSPPdu, aType, aURI, aWSPHeader, aBody, aId); + break; + + default: + LOG(SwsLog::Printf(_L("CCLWSPPduHandler::PackWSPPduL() Unknown Method Invoke Wsp PDU Type"));) + User::Leave(Wap::EWspClParameterError); + } + } + +void CCLWSPPduHandler::UnpackPushPduL(HBufC8* aWSPPdu, HBufC8*& aWSPHeader, HBufC8*& aBody) +/** +Unpack the WSP PUSH PDU. +@internalComponent +@released +@since v8.0 +@param aWSPPdu the received WSP PDU from the remote peer. +@param aWSPHeader the WSP header of the received WSP PDU. +@param aBody the data body of the received WSP PDU. +@returns TInt KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TPtrC8 pduBuffer(*aWSPPdu); + TUint32 pduLength=pduBuffer.Length(); + TUint32 headerLength(0); + TInt uintvarLength(0); + + // if uintvarLength less than KErrNone, then it is a error code. + if ((uintvarLength=UintVar(headerLength, pduBuffer, KPDUTransactionIDAndPDUTypeLength))Des(); + headerDes.Copy(pduBuffer.Mid(KPDUTransactionIDAndPDUTypeLength+uintvarLength, headerLength)); + // Extract the WSP data body. + aBody=HBufC8::NewL(bodyLength); + TPtr8 bodyDes=aBody->Des(); + bodyDes.Copy(pduBuffer.Mid(KPDUTransactionIDAndPDUTypeLength+uintvarLength+headerLength)); + } + +void CCLWSPPduHandler::UnpackReplyPduL(HBufC8* aWSPPdu, HBufC8*& aWSPHeader, HBufC8*& aBody, TWSPStatus& aStatus) +/** +Unpack the WSP Reply PDU. +@internalComponent +@released +@since v8.0 +@param aWSPPdu the received WSP PDU from the remote peer. +@param aWSPHeader the WSP header of the received WSP PDU. +@param aBody the data body of the received WSP PDU. +@param aStatus the WSP status of the received WSP PDU. +@returns TInt KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TPtrC8 pduBuffer(*aWSPPdu); + TUint32 pduLength=pduBuffer.Length(); + + //Extract the WSP status + aStatus=pduBuffer[KPDUTransactionIDAndPDUTypeLength]; + + TUint32 headerLength(0); + TInt uintvarLength(0); + // if uintvarLength less than KErrNone, then it is a error code. + if ((uintvarLength=UintVar(headerLength, pduBuffer, KPDUTransactionIDAndPDUTypeLength+KWSPStatusLength))Des(); + headerDes.Copy(pduBuffer.Mid(KPDUTransactionIDAndPDUTypeLength+KWSPStatusLength+uintvarLength, headerLength)); + + // Extract the WSP data body. + aBody=HBufC8::NewL(bodyLength); + TPtr8 bodyDes=aBody->Des(); + bodyDes.Copy(pduBuffer.Mid(KPDUTransactionIDAndPDUTypeLength+KWSPStatusLength+uintvarLength+headerLength)); + } + +void CCLWSPPduHandler::PackPostPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TDesC8& aBody, const TUint8 aId) +/** +Pack the WSP Post PDU. +@internalComponent +@released +@since v8.0 +@param aWSPPdu the WSP PDU that is to sent +@param aType the WSP PDU type(the method is to be invoked) +@param aURI the URI where the WSP PDU goes +@param aWSPHeader the WSP header +@param aBody the data body +@param aId the transaction ID +@returns TInt KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + //Convert the URI length to Varible length unsigned integer + TUint32 uriLength=aURI.Length(); + HBufC8* uriLengthDes=UintVarL(uriLength); + + //Convert the URI length to Varible length unsigned integer + TUint32 headerLength=aWSPHeader.Length(); + HBufC8* headerLengthDes=UintVarL(headerLength); + + // Calculate the pdu length + TUint32 pduLength = KPDUTransactionIDAndPDUTypeLength+ + uriLengthDes->Length()+ + headerLengthDes->Length()+ + uriLength+ + headerLength+ + aBody.Length(); + + //Build the PDU. + aWSPPdu = HBufC8::NewL(pduLength); + TPtr8 pduPtr(aWSPPdu->Des()); + pduPtr.Append(aId); + pduPtr.Append(aType); + pduPtr.Append(*uriLengthDes); + pduPtr.Append(*headerLengthDes); + pduPtr.Append(aURI); + pduPtr.Append(aWSPHeader); + pduPtr.Append(aBody); + + // delete the temporary buffers + delete uriLengthDes; + delete headerLengthDes; + } +void CCLWSPPduHandler::PackGetPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TUint8 aId) +/** +Pack the WSP Get PDU. +@internalComponent +@released +@since v8.0 +@param aWSPPdu the WSP PDU that is to sent +@param aType the WSP PDU type(the method is to be invoked) +@param aURI the URI where the WSP PDU goes +@param aWSPHeader the WSP header +@param aId the transaction ID +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + + //Convert the URI length to Varible length unsigned integer + TUint32 uriLength=aURI.Length(); + HBufC8* uriLengthDes=UintVarL(uriLength); + + // Calculate the pdu length + TUint32 pduLength = KPDUTransactionIDAndPDUTypeLength+ + uriLengthDes->Length()+ + uriLength+ + aWSPHeader.Length(); + + // Build the PDU. + aWSPPdu = HBufC8::NewL(pduLength); + TPtr8 pduPtr(aWSPPdu->Des()); + pduPtr.Append(aId); + pduPtr.Append(aType); + pduPtr.Append(*uriLengthDes); + pduPtr.Append(aURI); + pduPtr.Append(aWSPHeader); + + //Delete the temporary buffer + delete uriLengthDes; + } +TInt CCLWSPPduHandler::UintVar(TUint32& aVal, TPtrC8& aBuffer, TUint aOffset) +/** +Decode the variable length Unsigned integer to TUint32 +@internalComponent +@released +@since v8.0 +@param aVal the value of the variable length Unsigned integer +@param aBuffer the descriptor that contains the variable length Unsigned integer +@param aOffset the offset of the variable length Unsigned integer +@returns one of the system error codes on failure, or the size of variable length Unsigned integer. +*/ + { + // have we run out of buffer? + if (aOffset >= (TUint)aBuffer.Length()) + { + return KErrCorrupt; + } + + // maximum length for a uintvar is 5 + TInt lenLeft = Min(aBuffer.Mid(aOffset).Length(), KMaxUintVarLength); + + // get the first octet + TUint8 byte = aBuffer[aOffset++]; + TInt numBytes = 1; + --lenLeft; + + // Check if any of the top 3 bits, ignoring the very top 'continue' bit, are set. + // Later if we see that this is a 5 byte number - we'll know it is corrupt. + // Encoding uses 7 bits/number 7x5=35 and we only support a maxiumum number + // of 32 bits. + TBool topThreeBitsSet = byte & KTop3BitSet; + + // copy over data from the byte into our return value (the top bit is a carry bit) + aVal = byte & KWapQuote; + + // while the 'continue' bit is set and we have more data + while ((byte & KCarryBitMask) && (lenLeft > 0)) + { + // shift our last value up + aVal <<= KUIntVarOctetShift; + // get the next byte + byte = aBuffer[aOffset++]; + // copy it over to the lowest byte + aVal |= byte & KWapQuote; + --lenLeft; + ++numBytes; + } + + // last octet has continue bit set ... NOT allowed Or + // this was encoded wrong - can't have a number bigger than 32 bits + if ((byte & KCarryBitMask) || (numBytes == 5 && topThreeBitsSet)) + { + return KErrCorrupt; + } + // number of bytes read + return numBytes; + + } + +HBufC8* CCLWSPPduHandler::UintVarL(const TUint32 aInt) +/** +Encode the TUint32 to the variable length Unsigned integer +@internalComponent +@released +@since v8.0 +@param aInt the length of the data +@returns the descriptor that contains the variable length Unsigned integer +*/ + { + TUint8 size = 0; // maximum value is 5 with a 32bit integer + TUint32 value=aInt; + do { + ++size; + value >>=KUIntVarOctetShift; ; // shift by 7 bits. + } while (value>0); + + HBufC8* output = HBufC8::NewL(size); + TPtr8 outPtr(output->Des()); + + TInt ii = size; + while (--ii > 0) + { + outPtr.Append( (TUint8)(aInt>>(KUIntVarOctetShift*(ii)) & KWapQuote) | KCarryBitMask); + } + + // Finally the first 7 bits, last octet, do not set first bit. + outPtr.Append( (TUint8)(aInt & KWapQuote) ); // Add even if 0 value. + + return output; + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/CLWSPPduHandler.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/CLWSPPduHandler.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,141 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __CLWSPPDUHANDLER_H__ +#define __CLWSPPDUHANDLER_H__ +#include +#include + + +/** +The connectionless WSP PDU type definition. +@internalComponent +*/ +enum TWSPPduType + { + /** the Reply PDU type assignment + */ + EReply =0x04, + /** the Push PDU type assignment + */ + EPush =0x06, + /** the Get PDU type assignment + */ + EGet =0x40, + /** the GetOption PDU type assignment + */ + EGetOptions =0x41, + /** the Gethead PDU type assignment + */ + EGetHead =0x42, + /** the GetDelete PDU type assignment + */ + EGetDelete =0x43, + /** the GetTrace PDU type assignment + */ + EGetTrace =0x44, + /** the Post PDU type assignment + */ + EPost =0x60, + /** the PostPut PDU type assignment + */ + EPostPut =0x61 + }; + + + /** + The offset of the transactionID field in WSP PDU. + @internalComponent + */ + const TUint KPDUHeaderTransactionIDOffSet =0; + /** + The offset of the WSP PDU type field in WSP PDU. + @internalComponent + */ + const TUint KPDUHeaderWSPPDUTypeOffSet =1; + /** + The offset of WSP field. + @internalComponent + */ + const TUint KPDUFieldOffset =2; + + /** + The length of transactionID+PDUType + @internalComponent + */ + const TUint8 KPDUTransactionIDAndPDUTypeLength =2; + /** + The length of WSP status + @internalComponent + */ + const TUint8 KWSPStatusLength =1; + + /** + The mask of top 3 bits in varible length Unsigned integer + @internalComponent + */ + const TUint8 KTop3BitSet = 0x70; + + /** + The mask to valide each byte in varible length Unsigned integer + @internalComponent + */ + const TUint8 KWapQuote = 0x7F; + + /** + The mask of carry bit in each byte in varible length Unsigned integer + @internalComponent + */ + const TUint8 KCarryBitMask = 0x80; + + /** + Maximum length for varible length Unsigned integer + @internalComponent + */ + const TUint8 KMaxUintVarLength = 5; + + /** + shift 7 bits for each byte in Uint32 + @internalComponent + */ + const TUint8 KUIntVarOctetShift = 7; + + + +class CCLWSPPduHandler +/** +The Connectionless WSP PDU Handler. This class provides a set of static interfaces +for WAP message APIs to pack and unpack the WSP PDU. +For error codes returned by methods in this class, see . Most methods can +return a set of general errors, with some returning additional specific errors. +*/ + { +public: + + + +public: // Public Interfaces + static void UnpackWSPPduL(HBufC8* aWSPPdu, TWSPPduType& aType, HBufC8*& aWSPHeader, HBufC8*& aBody, TUint8& aId, TWSPStatus& aStatus); + static void PackWSPPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TDesC8& aBody, const TUint8 aId); + +private: // private methods + static void UnpackPushPduL(HBufC8* aWSPPdu, HBufC8*& aWSPHeader, HBufC8*& aBody); + static void UnpackReplyPduL(HBufC8* aWSPPdu, HBufC8*& aWSPHeader, HBufC8*& aBody, TWSPStatus& aStatus); + static void PackPostPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TDesC8& aBody, const TUint8 aId); + static void PackGetPduL(HBufC8*& aWSPPdu, TWSPPduType aType, const TDesC& aURI, const TDesC8& aWSPHeader, const TUint8 aId); + static TInt UintVar(TUint32& aVal, TPtrC8& aBuffer, TUint aOffset); + static HBufC8* UintVarL(const TUint32 aInt); + }; +#endif // __CLWSPPDUHANDLER_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapBoundCLPush.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapBoundCLPush.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,198 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "WapBoundCLPush.h" +#include "WapMsgUtils.h" +#include + +CSWSWapBoundCLPushService* CSWSWapBoundCLPushService::NewL() +/** +Static new function +@internalComponent +@released +@since v8.0 +*/ + { + CSWSWapBoundCLPushService* me = new(ELeave)CSWSWapBoundCLPushService(); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CSWSWapBoundCLPushService::~CSWSWapBoundCLPushService() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + delete iAgent; + } + +CSWSWapBoundCLPushService::CSWSWapBoundCLPushService() +/** +Constructor +@internalComponent +@released +@since v8.0 +*/ + { + } + +void CSWSWapBoundCLPushService::ConstructL() +/** +Second Phase Constructor +@internalComponent +@released +@since v8.0 +*/ + { + // Parent class construction + CWapBoundCLPushService::ConstructL(); + iAgent=CWspMessageApiAgent::NewL(); + } + +TInt CSWSWapBoundCLPushService::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure, TInetAddr /*aInetAddr*/) +/** +Opens a Wsp EndPoint which is to be used to listen for subsequent incoming Push messages from any sender; +@internalComponent +@released +@since v8.0 +@param aBearer (in) the bearer to listen on (use EAll for all bearers) +@param aPort (in) the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo +@param aSecure (in) security flag indicates whether WTLS will be used or not +@param aInetAddr (in) the address of the adapter to use +@returns TInt KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if(aSecure) + { + return KErrNotSupported; + } + return iAgent->Connect(aBearer, aPort, aSecure); + } + +TInt CSWSWapBoundCLPushService::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure) +/** +Opens a socket which is to be used to listen for subsequent incoming Push messages from any sender; +@internalComponent +@released +@since v8.0 +@param aBearer (in) the bearer to listen on (use EAll for all bearers) +@param aPort (in) the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo +@param aSecure (in) security flag indicates whether WTLS will be used or not +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInetAddr inetAddr( KInetAddrAny, 0); + return( Connect(aBearer, aPort, aSecure, inetAddr) ); + } + +TInt CSWSWapBoundCLPushService::AwaitPush(TDes8& aPushHeaders, TDes8& aPushBody, TPckgBuf& aPushIdPckg, TRequestStatus& aReqStatus) +/** +Request an asynchronous notification upon arrival of the next push messages on the listening connection. +The request completes upon receipt of the message, filling the buffers with as much received data as possible. +A return code will indicate whether further data remains. The call must be re-issued for subsequent messages +or to receive remaining data from a previous push message. +@internalComponent +@released +@since v8.0 +@param aPushHeaders (out) (client-allocated) - when a push message arrives the header data is written here +@param aPushBody (out) (client-allocated) - when a push message arrives the body data is written here +@param aPushIdPckg (out) when a push message arrives an integer ID that uniquely specifies the message is written here +@param aReqStatus (inout) used by the service provider to notify the client when a push has arrived. +EMoreData is returned if more pushed data is available +@retval KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInt err = iAgent->ReceiveWspMessage(aPushHeaders, aPushBody, aPushIdPckg, iWspStatus, aReqStatus, 0); + if(err == Wap::EMoreData) + { + return KErrNone; + } + return err; + } + +void CSWSWapBoundCLPushService::CancelAwaitPush() +/** +Cancel a previously-requested push message notification. If a push message arrives the client will not be notified. +@internalComponent +@released +@since v8.0 +*/ + { + iAgent->CancelRequest(); + } + +TInt CSWSWapBoundCLPushService::GetLocalPort(Wap::TPort& aPort) +/** +Get the local address of this endpoint. +@internalComponent +@released +@since v8.0 +@param aPort (out) the port of the local host +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalPort(aPort); + } + +TInt CSWSWapBoundCLPushService::GetLocalAddress(HBufC8*& aLocalHost) +/** +Get the local address of this endpoint. +@internalComponent +@released +@since v8.0 +@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should +be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership +of this buffer will be passed over to the client. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalAddress(aLocalHost); + } + +TInt CSWSWapBoundCLPushService::GetBearer(Wap::TBearer& aBearer) +/** +Get the bearer on which the push message arrived. +Useful when EAll was specified in Connect() +@internalComponent +@released +@since v8.0 +@param aBearer (out) the bearer +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetBearer(aBearer); + } + +TInt CSWSWapBoundCLPushService::GetServerAddress(HBufC8*& aRemoteHost) +/** +Get the address of the remote server +@internalComponent +@released +@since v8.0 +Cannot be called when there is an outstanding AwaitPush(). +@param aRemoteHost the address of the remote server. +A reference to a HBufC8 pointer should be passed in. An HBufC8 will be allocated +to hold the address ,ownership of this buffer will be passed over to the client. +@returns KErrNone on successful completion, KErrNotSupported if not implemented or one of the system error codes on failure. +*/ + { + return iAgent->GetServerAddress(aRemoteHost); + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapBoundCLPush.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapBoundCLPush.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,70 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __CSWSWAPBOUNDCLPUSHSERVICE_H__ +#define __CSWSWAPBOUNDCLPUSHSERVICE_H__ + +// Include definitions of ECOM interfaces for the WAP Messaging API +#include +#include "WapMessageApiAgent.h" + + + +class CSWSWapBoundCLPushService : public CWapBoundCLPushService +/** +The WAP Messaging API, SWS WAP Stack binding. Implementation of the bound CLPush API. +@internalComponent +@released +@since v8.0 +*/ +{ +public: + static CSWSWapBoundCLPushService* NewL(); + virtual ~CSWSWapBoundCLPushService(); + +public: + virtual TInt Connect(Wap::TBearer aBearer, + Wap::TPort aPort, + TBool aSecure, + TInetAddr aInetAddr); + virtual TInt Connect(Wap::TBearer aBearer, + Wap::TPort aPort, + TBool aSecure); + virtual TInt AwaitPush(TDes8& aPushHeaders, + TDes8& aPushBody, + TPckgBuf& aPushIdPckg, + TRequestStatus& aReqStatus); + virtual void CancelAwaitPush(); + virtual TInt GetLocalPort(Wap::TPort& aPort); + virtual TInt GetLocalAddress(HBufC8*& aLocalHost); + virtual TInt GetBearer(Wap::TBearer& aBearer); + virtual TInt GetServerAddress(HBufC8*& aRemoteHost); + +private: + CSWSWapBoundCLPushService(); + void ConstructL(); + +private: + /** + the agent instance which actually handles wsp PDU. + */ + CWspMessageApiAgent* iAgent; + /** + the wsp status in received wsp PDU. Not used in push. + */ + TWSPStatus iWspStatus; +}; + +#endif // __CSWSWAPBOUNDCLPUSHSERVICE_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapBoundCLWSP.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapBoundCLWSP.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,201 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "WapBoundCLWSP.h" +#include "WapMsgUtils.h" +#include "CLWSPPduHandler.h" + + + +CSWSWapBoundCLWSPService* CSWSWapBoundCLWSPService::NewL() +/** +Static new function +@internalComponent +@released +@since v8.0 +*/ + { + CSWSWapBoundCLWSPService* me = new(ELeave)CSWSWapBoundCLWSPService(); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CSWSWapBoundCLWSPService::CSWSWapBoundCLWSPService() + : CWapBoundCLWSPService() +/** +Constructor +@internalComponent +@released +@since v8.0 +*/ + { + } + +CSWSWapBoundCLWSPService::~CSWSWapBoundCLWSPService() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + delete iAgent; + } + +void CSWSWapBoundCLWSPService::ConstructL() +/** +Second phase constructor +@internalComponent +@released +@since v8.0 +*/ + { + // Parent class construction + CWapBoundCLWSPService::ConstructL(); + iAgent=CWspMessageApiAgent::NewL(); + } + +TInt CSWSWapBoundCLWSPService::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure) +/** +Opens a End-point which is to be used to listen for the incoming method result messages from any sender; +@internalComponent +@released +@since v8.0 +@param aBearer (in) the bearer to listen on (use EAll for all bearers) +@param aPort (in) the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo +@param aSecure (in) security flag indicates whether WTLS will be used or not +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if(aSecure) + { + return KErrNotSupported; + } + return iAgent->Connect(aBearer, aPort, aSecure); + } + +TInt CSWSWapBoundCLWSPService::MethodInvoke(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, const TUint8 aTransactionId) +/** +A synchronous call to send a method invoke method to the remote host. +@internalComponent +@released +@since v8.0 +@param aBearer (in) the bearer that will be used +@param aRemoteHost (in) the remotehost to be sent message to +@param aRemotePort (in) the remoteport to be sent message to +@param aMethod (in) the method that will be invoked on server +@param aURI (in) the uri to build wsp message +@param aReqHeaders (in) the wsp header to be used to build method invoke message +@param aReqBody (in) the wsp body to be used to build method invoke message +@param aTransactionId (in) the transaction Id of the method invoke message +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->SendWspMessage(aBearer, aRemoteHost, aRemotePort, TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId); + } + +TInt CSWSWapBoundCLWSPService::MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout) +/** +Request an asynchronous notification upon arrival of the method result messages on the listening connection. +The request completes upon receipt of the message, filling the buffers with as much received data as possible. +A return code will indicate whether further data remains. The call must be re-issued for subsequent messages +or to receive remaining data from a previous method result message. +@internalComponent +@released +@since v8.0 +@param aReqHeaders (out) (client-allocated) - when a method result message arrives the header data is written here +@param aReqBody (out) (client-allocated) - when a method result message arrives the body data is written here +@param aTransactionIdPckg (out) when a method result message arrives an integer ID that uniquely specifies the message is written here +@param aWspStatus (out) when a method result message arrives, the wsp status is written here. +@param aReqStatus (inout) used by the service provider to notify the client when a method result has arrived +@param aTimeout (in) an optional millisecond time-out which allows a timed read to be made. If no data is received +within the timeout period the request completes with KErrTimedOut. If a value of 0 is supplied the timeout is infinite. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->ReceiveWspMessage(aReqHeaders, aReqBody, aTransactionIdPckg, aWspStatus, aReqStatus, aTimeout); + } + +void CSWSWapBoundCLWSPService::CancelReq() +/** +Cancel a previously-requested method result notification. If a method result message arrives the client will not be notified. +@internalComponent +@released +@since v8.0 +*/ + { + iAgent->CancelRequest(); + } + +TInt CSWSWapBoundCLWSPService::GetLocalPort(Wap::TPort& aPort) +/** +Get the local address of this endpoint. +@internalComponent +@released +@since v8.0 +@param aPort (out) the port of the local host +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalPort(aPort); + } + +TInt CSWSWapBoundCLWSPService::GetLocalAddress(HBufC8*& aLocalHost) +/** +Get the local address of this endpoint. +@internalComponent +@released +@since v8.0 +@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should +be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership +of this buffer will be passed over to the client. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalAddress(aLocalHost); + } + +TInt CSWSWapBoundCLWSPService::GetBearer(Wap::TBearer& aBearer) +/** +Get the bearer on which the method result message arrived. +Useful when EAll was specified in Connect() +@internalComponent +@released +@since v8.0 +@param aBearer (out) the bearer +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetBearer(aBearer); + } + +TInt CSWSWapBoundCLWSPService::GetServerAddress(HBufC8*& aServerAddress) +/** +Get the remote address of the last wsp method result message +@internalComponent +@released +@since v8.0 +Cannot be called when there is an outstanding MethodResult(). +@param aServerAddress the address of the remote server. +A reference to a HBufC8 pointer should be passed in. An HBufC8 will be allocated +to hold the address ,ownership of this buffer will be passed over to the client. +@returns KErrNone on successful completion, KErrNotSupported if not implemented or one of the system error codes on failure. +*/ + { + return iAgent->GetServerAddress(aServerAddress); + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapBoundCLWSP.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapBoundCLWSP.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,59 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __CSWSWAPBOUNDCLWSPSERVICE_H__ +#define __CSWSWAPBOUNDCLWSPSERVICE_H__ + +// Include definitions of ECOM interfaces for the WAP Messaging API +#include +#include "ActiveSocket.h" +#include "WapMessageApiAgent.h" + +class CSWSWapBoundCLWSPService : public CWapBoundCLWSPService +/** +The WAP Messaging API, SWS WAP Stack binding. Implementation of the bound Connectionless WSP API. +@internalComponent +@released +@since v8.0 +*/ +{ +public: + static CSWSWapBoundCLWSPService* NewL(); + virtual ~CSWSWapBoundCLWSPService(); + +public: + + virtual TInt Connect(Wap::TBearer aBearer,Wap::TPort aPort, TBool aSecure); + virtual TInt MethodInvoke(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, const TUint8 aTransactionId); + virtual TInt MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout); + virtual void CancelReq(); + virtual TInt GetLocalPort(Wap::TPort& aPort); + virtual TInt GetLocalAddress(HBufC8*& aLocalHost); + virtual TInt GetBearer(Wap::TBearer& aBearer); + virtual TInt GetServerAddress(HBufC8*& aServerAddress); +private: + CSWSWapBoundCLWSPService(); + void ConstructL(); + + +private: + /** + the agent instance which actually handles wsp PDU. + */ + CWspMessageApiAgent* iAgent; + +}; + +#endif // __CSWSWAPBOUNDCLWSPSERVICE_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapBoundWDP.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapBoundWDP.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,227 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "WapBoundWDP.h" +#include "WapMsgUtils.h" + + +CSWSWapBoundWDPService* CSWSWapBoundWDPService::NewL() +/** +Static new function +@internalComponent +@released +@since v8.0 +*/ + { + CSWSWapBoundWDPService* me = new(ELeave)CSWSWapBoundWDPService(); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CSWSWapBoundWDPService::CSWSWapBoundWDPService() + : CWapBoundDatagramService() +/** +Constructor +@internalComponent +@released +@since v8.0 +*/ + { + } + +CSWSWapBoundWDPService::~CSWSWapBoundWDPService() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + delete iAgent; + } + +void CSWSWapBoundWDPService::ConstructL() +/** +Second Phase Constructor +@internalComponent +@released +@since v8.0 +*/ + { + // Parent class construction + CWapBoundDatagramService::ConstructL(); + iAgent=CWdpMessageApiAgent::NewL(); + } + +TInt CSWSWapBoundWDPService::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TInetAddr /*aInetAddr*/) +/** +Connect to the SWS, opening an endpoint that can be used to listen for subsequent incoming datagrams. +@internalComponent +@released +@since v8.0 +@param aBearer the bearer to listen on (use EAll for all bearers) +@param aPort the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo +@param aInetAddr the ip address of the network interface that should be used in a multihomed system. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->Connect(aBearer, aPort, EFalse); + } + +TInt CSWSWapBoundWDPService::Connect(Wap::TBearer aBearer, Wap::TPort aPort) +/** +Connect to the SWS, opening an endpoint that can be used to listen for subsequent incoming datagrams. +@internalComponent +@released +@since v8.0 +@param aBearer the bearer to listen on (use EAll for all bearers) +@param aPort the port to listen on. If set to 0, a local port will be chosen for the client's first SendTo +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInetAddr inetAddr( KInetAddrAny, 0); + return (Connect(aBearer, aPort, inetAddr)); + } + +TInt CSWSWapBoundWDPService::SendTo(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, + const TDesC8& aBuffer, Wap::TBearer aBearer) +/** +Send data to a remote endpoint. +@internalComponent +@released +@since v8.0 +@param aRemoteHost the bearer-dependent address of the remote host to which the data will be sent +@param aRemotePort the port on the remote host to which the data will be sent +@param aBuffer the data buffer to be written over the connection +@param aBearer the bearer to be used, if the bound connection was opened with 'all' +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->SendWdpMessage(aBuffer, aRemoteHost, aRemotePort, aBearer); + } + +TInt CSWSWapBoundWDPService::AwaitRecvDataSize(TPckg& aDataSizePckg, TRequestStatus& aReqStatus) +/** +Wait for a datagram to be received, and discover how large a buffer is required to retrieve it. +This asyncronous method waits for a datagram to be received and will then complete allowing the client to discover how large a buffer +is needed to retrieve the entire datagram that has been received. +A subsiquent call to RecvFrom with a buffer of sufficent size will then allow the client to retrieve the datagram fully. +@internalComponent +@released +@since v8.0 +@param aDataSizePckg the size of data subsequently received, in bytes +@param aReqStatus used to signal when a data size is known +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->AwaitRecvDataSize(aDataSizePckg, aReqStatus); + } + +TInt CSWSWapBoundWDPService::RecvFrom(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer, + TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout) +/** +receive data on a bound port. +An asynchronous notification is sent to the client when data arrives. +@internalComponent +@released +@since v8.0 +@param aRemoteHost the bearer-dependent address of the remote host from which the data was received +@param aRemotePort the port on the remote host from which the data was received +@param aBuffer a client-allocated data buffer to be filled with data received. Data that overflows the buffer is discarded. +@param aTruncated indicates whether the received datagram was truncated to fit in the client's supplied buffer +@param aReqStatus used to notify the client that a datagram was received +@param aTimeout an optional millisecond time-out which allows a timed read to be made. If no data is received +within the timeout period the request completes with KErrTimedOut. If a value of 0 is supplied the timeout is infinite. +@retval TInt KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->ReceiveWdpMessage(aRemoteHost, aRemotePort, aBuffer, aTruncated, aReqStatus, aTimeout); + } + +void CSWSWapBoundWDPService::CancelRecv() +/** +Cancel a previously requested asynchronous RecvFrom or AwaitRecvDataSize notification. +If a datagram arrives at the local host, it will be discarded. +@internalComponent +@released +@since v8.0 +*/ + { + iAgent->CancelRequest(); + } + +TInt CSWSWapBoundWDPService::GetLocalPort(Wap::TPort& aPort) +/** +Get the local port of this endpoint.Useful if one was chosen automatically. +@internalComponent +@released +@since v8.0 +@param aPort the port number +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalPort(aPort); + } + +TInt CSWSWapBoundWDPService::GetLocalAddress(HBufC8*& aLocalHost) +/** +Get the local address of this endpoint. +@internalComponent +@released +@since v8.0 +@param aLocalHost the address of the local host. A reference to a HBufC8 pointer should +be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership +of this buffer will be passed over to the client. +@returns TInt KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalAddress(aLocalHost); + } + +TInt CSWSWapBoundWDPService::GetBearer(Wap::TBearer& aBearer) +/** +Get the bearer on which a received datagram arrived. +Useful when EAll was specified in Connect() +@internalComponent +@released +@since v8.0 +@param aBearer the bearer +@returns TInt KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetBearer(aBearer); + } + +TInt CSWSWapBoundWDPService::GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize) +/** +Query the WDP bearer for its maximum datagram size and its nominal datagram size. +@internalComponent +@released +@since v8.0 +@param aMaxSize the maximum datagram size +@param aNominalSize the nominal datagram size (nominal = size within which a datagram won't +have to be split into smaller individual messages and then re-assembled at the other end). +This will fail for a stream connection +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + // Can only retrieve this info from the capcodec when its a connection, not datagram! + aMaxSize = KWapStackMaxDatagramSize; + aNominalSize = KWapStackNorminalDatagramSize; + return KErrNone; + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapBoundWDP.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapBoundWDP.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,59 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __CSWSWAPBOUNDWDPSERVICE_H__ +#define __CSWSWAPBOUNDWDPSERVICE_H__ + +// Include definitions of ECOM interfaces for the WAP Messaging API +#include +#include "WapMessageApiAgent.h" + +class CSWSWapBoundWDPService : public CWapBoundDatagramService +/** +The WAP Messaging API, SWS WAP Stack binding. Implementation of the bound WDP API. +@internalComponent +@released +@since v8.0 +*/ +{ +public: + static CSWSWapBoundWDPService* NewL(); + virtual ~CSWSWapBoundWDPService(); + +public: + virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TInetAddr aInetAddr); + virtual TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort); + virtual TInt SendTo(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, const TDesC8& aBuffer,Wap::TBearer aBearer); + virtual TInt AwaitRecvDataSize(TPckg& aDataSizePckg, TRequestStatus& aReqStatus); + virtual TInt RecvFrom(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout); + virtual void CancelRecv(); + virtual TInt GetLocalPort(Wap::TPort& aPort); + virtual TInt GetLocalAddress(HBufC8*& aLocalHost); + virtual TInt GetBearer(Wap::TBearer& aBearer); + virtual TInt GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize); + +private: + CSWSWapBoundWDPService(); + void ConstructL(); + +private: + /** + the agent instance which actually handles wdp PDU. + */ + CWdpMessageApiAgent* iAgent; +}; + + +#endif // __CSWSWAPBOUNDWDPSERVICE_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapFullySpecCLPush.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapFullySpecCLPush.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,169 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "WapFullySpecCLPush.h" +#include "WapMsgUtils.h" +#include + +CSWSWapFullySpecCLPushService* CSWSWapFullySpecCLPushService::NewL() +/** +Static new function +@internalComponent +@released +@since v8.0 +*/ + { + CSWSWapFullySpecCLPushService* me = new(ELeave)CSWSWapFullySpecCLPushService(); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CSWSWapFullySpecCLPushService::~CSWSWapFullySpecCLPushService() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + delete iAgent; + } + +CSWSWapFullySpecCLPushService::CSWSWapFullySpecCLPushService() +/** +Constructor +@internalComponent +@released +@since v8.0 +*/ + { + } + +void CSWSWapFullySpecCLPushService::ConstructL() +/** +Second Phase Constructor +@internalComponent +@released +@since v8.0 +*/ + { + // Parent class construction + CWapFullySpecCLPushService::ConstructL(); + iAgent=CWspMessageApiAgent::NewL(); + } + +TInt CSWSWapFullySpecCLPushService::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure, TInetAddr /*aInetAddr*/) +/** +Opens a socket which is to be used only with a single, named remote host. +@internalComponent +@released +@since v8.0 +@param aRemoteHost the bearer-dependent address of the remote host with which the data will be exchanged +@param aRemotePort the port on the remote host to which data will be sent +@param aBearer the bearer to use (not EAll) +@param aSecure security flag indicates whether WTLS will be used or not +@param aInetAddr the address of the adapter to use +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if(aSecure) + { + return KErrNotSupported; + } + return iAgent->Connect(aRemoteHost, aRemotePort, aBearer, aSecure); + } + +TInt CSWSWapFullySpecCLPushService::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure) +/** +Opens a socket which is to be used only with a single, named remote host. +@internalComponent +@released +@since v8.0 +@param aRemoteHost (in) the bearer-dependent address of the remote host with which the data will be exchanged +@param aRemotePort (in) the port on the remote host to which data will be sent +@param aBearer (in) the bearer to use (not EAll) +@param aSecure (in) security flag indicates whether WTLS will be used or not +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInetAddr inetAddr( KInetAddrAny, 0); + return( Connect(aRemoteHost, aRemotePort, aBearer, aSecure, inetAddr) ); + } + +TInt CSWSWapFullySpecCLPushService::AwaitPush(TDes8& aPushHeaders, TDes8& aPushBody, TPckgBuf& aPushIdPckg, TRequestStatus& aReqStatus) +/** +Request an asynchronous notification upon arrival of the next push messages on the listening connection. +The request completes upon receipt of the message, filling the buffers with as much received data as possible. +A return code will indicate whether further data remains. The call must be re-issued for subsequent messages +or to receive remaining data from a previous push message. +@internalComponent +@released +@since v8.0 +@param aPushHeaders (out) (client-allocated) - when a push message arrives the header data is written here +@param aPushBody (out) (client-allocated) - when a push message arrives the body data is written here +@param aPushIdPckg (out) when a push message arrives an integer ID that uniquely specifies the message is written here +@param aReqStatus (inout) used by the service provider to notify the client when a push has arrived +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInt err = iAgent->ReceiveWspMessage(aPushHeaders, aPushBody, aPushIdPckg, iWspStatus, aReqStatus, 0); + if(err == Wap::EMoreData) + { + return KErrNone; + } + return err; + } + +void CSWSWapFullySpecCLPushService::CancelAwaitPush() +/** +Cancel a previously-requested push message notification. If a push message arrives the client will not be notified. +@internalComponent +@released +@since v8.0 +*/ + { + iAgent->CancelRequest(); + } + +TInt CSWSWapFullySpecCLPushService::GetLocalPort(Wap::TPort& aPort) +/** +Get the local port of this endpoint.Useful if one was chosen automatically. +@internalComponent +@released +@since v8.0 +@param aPort (out) the port number +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalPort(aPort); + } + +TInt CSWSWapFullySpecCLPushService::GetLocalAddress(HBufC8*& aLocalHost) +/** +Get the local address of this endpoint. +@internalComponent +@released +@since v8.0 +@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should +be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership +of this buffer will be passed over to the client. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalAddress(aLocalHost); + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapFullySpecCLPush.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapFullySpecCLPush.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,69 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __CSWSWAPFULLYSPECCLPUSHSERVICE_H__ +#define __CSWSWAPFULLYSPECCLPUSHSERVICE_H__ + +// Include definitions of ECOM interfaces for the WAP Messaging API +#include +#include "WapMessageApiAgent.h" + +class CSWSWapFullySpecCLPushService : public CWapFullySpecCLPushService +/** +The WAP Messaging API, SWS WAP Stack binding. Implementation of the fully-specified connectionless push API. +@internalComponent +@released +@since v8.0 +*/ +{ +public: + static CSWSWapFullySpecCLPushService* NewL(); + virtual ~CSWSWapFullySpecCLPushService(); + +public: + virtual TInt Connect(const TDesC8& aRemoteHost, + Wap::TPort aRemotePort, + Wap::TBearer aBearer, + TBool aSecure, + TInetAddr aInetAddr); + virtual TInt Connect(const TDesC8& aRemoteHost, + Wap::TPort aRemotePort, + Wap::TBearer aBearer, + TBool aSecure); + virtual TInt AwaitPush(TDes8& aPushHeaders, + TDes8& aPushBody, + TPckgBuf& aPushIdPckg, + TRequestStatus& aReqStatus); + virtual void CancelAwaitPush(); + virtual TInt GetLocalPort(Wap::TPort& aPort); + virtual TInt GetLocalAddress(HBufC8*& aLocalHost); + +private: + CSWSWapFullySpecCLPushService(); + void ConstructL(); + +private: + /** + the agent instance which actually handles wsp PDU. + */ + CWspMessageApiAgent* iAgent; + /** + the wsp status in received wsp PDU. + */ + TWSPStatus iWspStatus; +}; + + +#endif // __CSWSWAPFULLYSPECCLPUSHSERVICE_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapFullySpecCLWSP.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapFullySpecCLWSP.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,166 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "WapFullySpecCLWSP.h" +#include "WapMsgUtils.h" +#include "CLWSPPduHandler.h" + +CSWSWapFullySpecCLWSPService* CSWSWapFullySpecCLWSPService::NewL() +/** +Static new function +@internalComponent +@released +@since v8.0 +*/ + { + CSWSWapFullySpecCLWSPService* me = new(ELeave)CSWSWapFullySpecCLWSPService(); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CSWSWapFullySpecCLWSPService::CSWSWapFullySpecCLWSPService() + : CWapFullySpecCLWSPService() +/** +Constructor +@internalComponent +@released +@since v8.0 +*/ + { + } + +CSWSWapFullySpecCLWSPService::~CSWSWapFullySpecCLWSPService() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + delete iAgent; + } + +void CSWSWapFullySpecCLWSPService::ConstructL() +/** +Second phase constructor +@internalComponent +@released +@since v8.0 +*/ + { + // Parent class construction + CWapFullySpecCLWSPService::ConstructL(); + iAgent=CWspMessageApiAgent::NewL(); + } + +TInt CSWSWapFullySpecCLWSPService::Connect(const TDesC8& aRemoteHost, Wap::TPort aPort, Wap::TBearer aBearer, TBool aSecure) +/** +Opens a end-point which is to be used only with a single, named remote host. +@internalComponent +@released +@since v8.0 +@param aRemoteHost the bearer-dependent address of the remote host with which the data will be exchanged +@param aPort the port on the remote host to which data will be sent +@param aBearer the bearer to use (not EAll) +@param aSecure security flag indicates whether WTLS will be used or not +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if(aSecure) + { + return KErrNotSupported; + } + return iAgent->Connect(aRemoteHost, aPort, aBearer, aSecure); + } + +TInt CSWSWapFullySpecCLWSPService::MethodInvoke(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, const TUint8 aTransactionId) +/** +A synchronous call to send a method invoke method to the remote host. +@internalComponent +@released +@since v8.0 +@param aMethod (in) the method that will be invoked on server +@param aURI (in) the uri to build wsp message +@param aReqHeaders (in) the wsp header to be used to build method invoke message +@param aReqBody (in) the wsp body to be used to build method invoke message +@param aTransactionId (in) the transaction Id of the method invoke message +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->SendWspMessage(TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId); + } + +TInt CSWSWapFullySpecCLWSPService::MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout) +/** +Request an asynchronous notification upon arrival of the method result messages on the listening connection. +The request completes upon receipt of the message, filling the buffers with as much received data as possible. +A return code will indicate whether further data remains. The call must be re-issued for subsequent messages +or to receive remaining data from a previous method result message. +@internalComponent +@released +@since v8.0 +@param aReqHeaders (out) (client-allocated) - when a method result message arrives the header data is written here +@param aReqBody (out) (client-allocated) - when a method result message arrives the body data is written here +@param aTransactionIdPckg (out) when a method result message arrives an integer ID that uniquely specifies the message is written here +@param aWspStatus (out) when a method result message arrives, the wsp status is written here. +@param aReqStatus (inout) used by the service provider to notify the client when a method result has arrived +@param aTimeout (in) an optional millisecond time-out which allows a timed read to be made. If no data is received +within the timeout period the request completes with KErrTimedOut. If a value of 0 is supplied the timeout is infinite. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->ReceiveWspMessage(aReqHeaders, aReqBody, aTransactionIdPckg, aWspStatus, aReqStatus, aTimeout); + } + +void CSWSWapFullySpecCLWSPService::CancelReq() +/** +Cancel a previously-requested method result notification. If a method result message arrives the client will not be notified. +@internalComponent +@released +@since v8.0 +*/ + { + iAgent->CancelRequest(); + } + +TInt CSWSWapFullySpecCLWSPService::GetLocalPort(Wap::TPort& aPort) +/** +Get the local port of this endpoint.Useful if one was chosen automatically. +@internalComponent +@released +@since v8.0 +@param aPort (out) the port number +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalPort(aPort); + } + +TInt CSWSWapFullySpecCLWSPService::GetLocalAddress(HBufC8*& aLocalHost) +/** +Get the local address of this endpoint. +@internalComponent +@released +@since v8.0 +@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should +be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership +of this buffer will be passed over to the client. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalAddress(aLocalHost); + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapFullySpecCLWSP.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapFullySpecCLWSP.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,51 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __CSWSWAPFULLYSPECCLWSPSERVICE_H__ +#define __CSWSWAPFULLYSPECCLWSPSERVICE_H__ + +// Include definitions of ECOM interfaces for the WAP Messaging API +#include +#include "WapMessageApiAgent.h" + +class CSWSWapFullySpecCLWSPService : public CWapFullySpecCLWSPService +/** +The WAP Messaging API, SWS WAP Stack binding. Implementation of Fully-Specified Connectionless WSP API +@internalComponent +@released +@since v8.0 +*/ +{ +public: + static CSWSWapFullySpecCLWSPService* NewL(); + virtual ~CSWSWapFullySpecCLWSPService(); +public: + virtual TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure); + virtual TInt MethodInvoke(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId); + virtual TInt MethodResult(TDes8& aReqHeaders, TDes8& aReqBody, TPckgBuf& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout); + virtual void CancelReq(); + virtual TInt GetLocalPort(Wap::TPort& aPort); + virtual TInt GetLocalAddress(HBufC8*& aLocalHost); +protected: + CSWSWapFullySpecCLWSPService(); + void ConstructL(); +private: + /** + the agent instance which actually handles wsp PDU. + */ + CWspMessageApiAgent* iAgent; +}; + +#endif //__CSWSWAPFULLYSPECCLWSPSERVICE_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapFullySpecWDP.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapFullySpecWDP.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,206 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "WapFullySpecWDP.h" +#include "WapMsgUtils.h" + +CSWSWapFullySpecWDPService* CSWSWapFullySpecWDPService::NewL() +/** +Static new function +@internalComponent +@released +@since v8.0 +*/ + { + CSWSWapFullySpecWDPService* me = new(ELeave)CSWSWapFullySpecWDPService(); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CSWSWapFullySpecWDPService::CSWSWapFullySpecWDPService() + : CWapFullySpecDatagramService() +/** +Constructor +@internalComponent +@released +@since v8.0 +*/ + { + } + +CSWSWapFullySpecWDPService::~CSWSWapFullySpecWDPService() +/** +Destructor +@internalComponent +@released +@since v8.0 +*/ + { + delete iAgent; + } + +void CSWSWapFullySpecWDPService::ConstructL() +/** +Second Phase Constructor +@internalComponent +@released +@since v8.0 +*/ + { + // Parent class construction + CWapFullySpecDatagramService::ConstructL(); + iAgent=CWdpMessageApiAgent::NewL(); + } + +TInt CSWSWapFullySpecWDPService::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TInetAddr /*aInetAddr*/) +/** +Connect to the SWS, opening an endpoint which is to be used only with a single, named remote host.All CWapFullySpecDatagramService implementaions must automatically close this endpoint upon destruction. +@internalComponent +@released +@since v8.0 +@param aRemoteHost (in) the bearer-dependent address of the remote host with which the data will be exchanged +@param aRemotePort (in) the port on the remote host to which data will be sent +@param aBearer (in) the bearer to use (not EAll) +@param aInetAddr (in) the ip address of the network interface that should be used in a multihomed system. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->Connect(aRemoteHost, aRemotePort, aBearer, EFalse); + } + +TInt CSWSWapFullySpecWDPService::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer) +/** +Connect to the wapstack, opening an endpoint which is to be used only with a single, named remote host. +@internalComponent +@released +@since v8.0 +@param aRemoteHost (in) the bearer-dependent address of the remote host with which the data will be exchange +@param aRemotePort (in) the port on the remote host to which data will be sent +@param aBearer (in) the bearer to use (not EAll) +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInetAddr inetAddr( KInetAddrAny, 0); + return(Connect(aRemoteHost, aRemotePort, aBearer, inetAddr)); + } + +TInt CSWSWapFullySpecWDPService::Send(const TDesC8& aBuffer) +/** +Send data on a fully-specified connection. +@internalComponent +@released +@since v8.0 +@param aBuffer (in) the data buffer to be written over the connection +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->SendWdpMessage(aBuffer); + } + +TInt CSWSWapFullySpecWDPService::AwaitRecvDataSize(TPckg& aDataSizePckg, TRequestStatus& aReqStatus) +/** +receive data on a bound port. +@internalComponent +@released +@since v8.0 +An asynchronous notification is sent to the client when data arrives. +@param aDataSizePckg size of data received +@param aReqStatus (inout) used to notify the client that a datagram was received +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->AwaitRecvDataSize(aDataSizePckg, aReqStatus); + } + +TInt CSWSWapFullySpecWDPService::Recv(TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout) +/** +receive data on a bound port. +An asynchronous notification is sent to the client when data arrives. +@internalComponent +@released +@since v8.0 +@param aBuffer (out) a client-allocated data buffer to be filled with data received. Data that overflows the buffer is discarded. +@param aTruncated (out) indicates whether the received datagram was truncated to fit in the client's supplied buffer +@param aReqStatus (inout) used to notify the client that a datagram was received +@param aTimeout (in) an optional millisecond time-out which allows a timed read to be made. If no data is received +within the timeout period the request completes with KErrTimedOut. If a value of 0 is supplied the timeout is infinite. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->ReceiveWdpMessage(iHostName, iPort, aBuffer, aTruncated, aReqStatus, aTimeout); + } + +void CSWSWapFullySpecWDPService::CancelRecv() +/** +Cancel a previously requested asynchronous Recv or AwaitRecvDataSize notification. +If a datagram arrives at the local host, it will be discarded. +@internalComponent +@released +@since v8.0 +*/ + { + iAgent->CancelRequest(); + } + +TInt CSWSWapFullySpecWDPService::GetLocalPort(Wap::TPort& aPort) +/** +Get the local port of this endpoint.Useful if one was chosen automatically. +@internalComponent +@released +@since v8.0 +@param aPort (out) the port number +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + + { + return iAgent->GetLocalPort(aPort); + } + +TInt CSWSWapFullySpecWDPService::GetLocalAddress(HBufC8*& aLocalHost) +/** +Get the local address of this endpoint. +@internalComponent +@released +@since v8.0 +@param aLocalHost (inout) the address of the local host. A reference to a HBufC8 pointer should +be passed in. This pointer MUST be null! A HBufC8 will be allocated to hold the address, ownership +of this buffer will be passed over to the client. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + return iAgent->GetLocalAddress(aLocalHost); + } + +TInt CSWSWapFullySpecWDPService::GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize) +/** +Query the WDP bearer for its maximum datagram size and its nominal datagram size. +@internalComponent +@released +@since v8.0 +@param aMaxSize (out) the maximum datagram size +@param aNominalSize (out) the nominal datagram size (nominal = size within which a datagram won't +have to be split into smaller individual messages and then re-assembled at the other end). +This will fail for a stream connection +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + // Can only retrieve this info from the capcodec when its a connection, not datagram! + aMaxSize = KWapStackMaxDatagramSize; + aNominalSize = KWapStackNorminalDatagramSize; + return KErrNone; + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapFullySpecWDP.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapFullySpecWDP.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,73 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __CSWSWAPFULLYSPECWDPSERVICE_H__ +#define __CSWSWAPFULLYSPECWDPSERVICE_H__ + +// Include definitions of ECOM interfaces for the WAP Messaging API +#include +#include "WapMessageApiAgent.h" + +class CSWSWapFullySpecWDPService : public CWapFullySpecDatagramService +/** +The WAP Messaging API, SWS WAP Stack binding. Implementation of the Fully-Specified WDP API. +@internalComponent +@released +@since v8.0 +*/ +{ +public: + static CSWSWapFullySpecWDPService* NewL(); + virtual ~CSWSWapFullySpecWDPService(); + +public: + virtual TInt Connect(const TDesC8& aRemoteHost, + Wap::TPort aRemotePort, + Wap::TBearer aBearer, + TInetAddr aInetAddr); + virtual TInt Connect(const TDesC8& aRemoteHost, + Wap::TPort aRemotePort, + Wap::TBearer aBearer); + virtual TInt Send(const TDesC8& aBuffer); + virtual TInt AwaitRecvDataSize(TPckg& aDataSizePckg, TRequestStatus& aReqStatus); + virtual TInt Recv(TDes8& aBuffer, + TBool& aTruncated, + TRequestStatus& aReqStatus, + TUint32 aTimeout); + virtual void CancelRecv(); + virtual TInt GetLocalPort(Wap::TPort& aPort); + virtual TInt GetLocalAddress(HBufC8*& aLocalHost); + virtual TInt GetDatagramSizes(TUint16& aMaxSize, TUint16& aNominalSize); + +private: + CSWSWapFullySpecWDPService(); + void ConstructL(); + +private: + /** + the agent instance which actually handles wdp PDU. + */ + CWdpMessageApiAgent* iAgent; + /** + the remote host name. + */ + TBuf8 iHostName; + /** + the remote port + */ + Wap::TPort iPort; +}; + +#endif // __CSWSWAPFULLYSPECWDPSERVICE_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapMessageApiAgent.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapMessageApiAgent.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,1184 @@ +// Copyright (c) 2008-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "WapMessageApiAgent.h" +#include "WapMsgUtils.h" +#include "CLWSPPduHandler.h" +#include +#include +#include "WapSwsLog.h" + +CWapAsyncCallBack::CWapAsyncCallBack( const TCallBack& aCallBack, TInt aPriority ) +: CActive( aPriority ), iCallBack( aCallBack ) + { + CActiveScheduler::Add( this ); + } + +CWapAsyncCallBack::~CWapAsyncCallBack() + { + Cancel(); + } + +void CWapAsyncCallBack::CallBack() + { + if ( !IsActive() ) + { + TRequestStatus* status = &iStatus; + User::RequestComplete( status, KErrNone ); + SetActive(); + } + } + +void CWapAsyncCallBack::RunL() + { + iCallBack.CallBack(); + } + +void CWapAsyncCallBack::DoCancel() + { + // Empty - request already completed in CallBack() + } + +// +//CWapMessageApiAgent class Method +// +CWapMessageApiAgent::CWapMessageApiAgent(TWapMessageType aMessageType):iMessageType(aMessageType) +/** +Constuctor. +@internalComponent +@released since v8.0 +@param aMessageType the message type that handled by this agent +*/ + { + } + +CWapMessageApiAgent::~CWapMessageApiAgent() +/** +Destrutor +@internalComponent. +@released since v8.0 +*/ + { + TInt count=iBearers.Count(); + for (TInt i=0; iCancel(); + iBearers[i]->CleanUpData(); + } + iBearers.ResetAndDestroy(); + iSocketServ.Close(); + if (iTimeoutTimer) + { + iTimeoutTimer->Cancel(); + delete iTimeoutTimer; + } + if (iAsyncReadCompletion) + { + delete iAsyncReadCompletion; + } + } + +TInt CWapMessageApiAgent::CompleteReading(TAny* aAgent) + { + CWapMessageApiAgent* agent = reinterpret_cast(aAgent); + return agent->DoCompleteReading(); + } + +TInt CWapMessageApiAgent::DoCompleteReading() + { + iRequestActive=EFalse; + User::RequestComplete(iRequestStatus, iLastReadingError); + return KErrNone; + } +void CWapMessageApiAgent::ConstructL() +/** +Second Phase Constructor +@internalComponent. +@released since v8.0 +*/ + { + iTimeoutTimer = CTimeOutTimer::NewL(*this); + TCallBack callback = TCallBack(CompleteReading, this); + iAsyncReadCompletion = new (ELeave) CWapAsyncCallBack(callback, CActive::EPriorityHigh); + User::LeaveIfError(iSocketServ.Connect()); + } + +CActiveSocket* CWapMessageApiAgent::GetActiveSocketByBearer(Wap::TBearer aBearer) +/** +To Get the CActiveSocket from the Array by Bearer type. +@internalComponent. +@released since v8.0 +@param aBearer (in)the bearer type of the CActiveSocket +@returns the pointer of CAtiveSocket +*/ + { + TInt count=iBearers.Count(); + for (TInt i=0; iGetBearerType(); + if (bearer==aBearer) + { + return iBearers[i]; + } + else + { + if ((aBearer>=Wap::ESMS7 && aBearer<=Wap::EWAPSMS) && (bearer>=Wap::ESMS7 && bearer<=Wap::EWAPSMS)) + { + return iBearers[i]; + } + } + } + return NULL; + } + +CActiveSocket* CWapMessageApiAgent::GetActiveSocketByStatus(TWapMessageState aState) +/** +To Get the CActiveSocket from the Array by Data State. +@internalComponent. +@released since v8.0 +@param aState (in)the Data state of the CActiveSocket +@returns the pointer of CAtiveSocket +*/ + { + TInt count=iBearers.Count(); + for (TInt i=0; iGetDataState()==aState) + { + return iBearers[i]; + } + } + return NULL; + } + +void CWapMessageApiAgent::TimerExpired() +/** +To handle the receive time out. +@internalComponent. +@released since v8.0 +*/ + { + TInt count=iBearers.Count(); + for (TInt i=0; iCancel(); + iBearers[i]->CleanUpData(); + } + iRequestActive=EFalse; + User::RequestComplete(iRequestStatus, KErrTimedOut); + } + +TInt CWapMessageApiAgent::GetLocalPort(Wap::TPort& aLocalPort) +/** +To Get local port of the last received packet +@internalComponent. +@released since v8.0 +@param aLocalPort (out)the reference of the localPort. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (!iIsOpen) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalPort: Trying to GetLocalPort on unconnected API."));) + return KErrNotReady; + } + CActiveSocket* sock=GetActiveSocketByBearer(iLastPduBearer); + if (!sock) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalPort: Can not find Last Bearer."));) + return Wap::EBearerError; + } + sock->GetLocalPort(aLocalPort); + return KErrNone; + } + +TInt CWapMessageApiAgent::GetLocalAddress(HBufC8*& aLocalHost) +/** +To Get local Address of the last received Packet +@internalComponent. +@released since v8.0 +@param aLocalHost (out)the reference of the localHost. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (!iIsOpen) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalAddress: Trying to GetLocalAddress on unconnected API."));) + return KErrNotReady; + } + CActiveSocket* sock=GetActiveSocketByBearer(iLastPduBearer); + if (!sock) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalAddress: Can not find Last Bearer"));) + return Wap::EBearerError; + } + TSockAddr& localHost=sock->GetLocalAddress(); + TInt err=KErrNone; + TRAP(err, aLocalHost=localHost.AllocL()) + if (err) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetLocalAddress: Alloc Memory Err=%d"), err);) + } + return err; + } + +TInt CWapMessageApiAgent::GetBearer(Wap::TBearer& aBearer) +/** +To Get Bearer of the last received packet +@internalComponent. +@released since v8.0 +@param aBearer (out)the reference of the Bearer. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (!iIsOpen) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetBearer: Trying to GetBearer on unconnected API."));) + return KErrNotReady; + } + aBearer=iLastPduBearer; + return KErrNone; + } + +TInt CWapMessageApiAgent::GetServerAddress(HBufC8*& aServerHost) +/** +To Get Server Host of the last received packet +@internalComponent. +@released since v8.0 +@param aServerHost (out)the reference of the Server Host. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (!iIsOpen) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetServerAddress: Trying to GetServerAddress on unconnected API."));) + return KErrNotReady; + } + CActiveSocket* sock=GetActiveSocketByBearer(iLastPduBearer); + if (!sock) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::GetServerAddress: Can not find last error."));) + return Wap::EBearerError; + } + return sock->GetRemoteAddress(aServerHost); + } + +void CWapMessageApiAgent::CancelRequest() +/** +To Cancel the client's request +@internalComponent. +@released since v8.0 +*/ + { + if (iIsOpen) + { + TInt count=iBearers.Count(); + for (TInt i=0; iCancel(); + iBearers[i]->CleanUpData(); + } + iTimeoutTimer->Cancel(); + if (iRequestActive) + { + iRequestActive=EFalse; + iAsyncReadCompletion->Cancel(); + User::RequestComplete(iRequestStatus, KErrCancel); + } + } + } + +TInt CWapMessageApiAgent::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure) +/** +Opening an endpoint that can be used to listen for subsequent incoming datagrams. +@internalComponent. +@released since v8.0 +@param aBearer (In) the bearer to listen on +@param aPort (In) the port to listen on. +@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported) +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInetAddr inetAddr( KInetAddrAny, 0); + return (Connect(aBearer, aPort, aSecure, inetAddr)); + } + +TInt CWapMessageApiAgent::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool /*aSecure*/, TInetAddr /*aInetAddr*/) +/** +Opening an endpoint that can be used to listen for subsequent incoming datagrams. +@internalComponent. +@released since v8.0 +@param aBearer (In) the bearer to listen on +@param aPort (In) the port to listen on. +@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported) +@param aInetAddr (In) Not In Use. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInt ret=KErrNone; + if (!iIsOpen) + { + TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, aPort)) + if (ret!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d."),ret);) + return ret; + } + iIsOpen=ETrue; + } + else + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Trying Connect twice to the API."));) + ret=KErrInUse; + } + return ret; + } + +TInt CWapMessageApiAgent::Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool /*aSecure*/, TInt aSocketServHandle, RConnection* aConnection) +/** +Opening an endpoint that can be used to listen for subsequent incoming datagrams. +@internalComponent. +@released since v8.0 +@param aBearer (In) the bearer to listen on +@param aPort (In) the port to listen on. +@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported) +@param aSocketServHandle (In) The Socket Server ID. +@param aConnection (In) The RConnection that shared with the client. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (aSocketServHandle==0 || !aConnection) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Parameter Error"));) + return KErrArgument; + } + TInt ret=KErrNone; + if (!iIsOpen) + { + iSocketServ.SetHandle(aSocketServHandle); + TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, aPort, aConnection)) + if (ret!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d."), ret);) + return ret; + } + iIsOpen=ETrue; + } + else + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Trying to Connect twice to the API."));) + ret=KErrInUse; + } + return ret; + } + +TInt CWapMessageApiAgent::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool /*aSecure*/, TInetAddr /*aInetAddr*/) +/** +Opens a socket which is to be used only with a single, named remote host. +@internalComponent. +@released since v8.0 +@param aRemoteHost (In) the name of the remote host to connect. +@param aRemotePort (In) the port of the remote host to connect. +@param aBearer (In) the bearer to be used +@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported) +@param aInetAddr (In) Not In Use +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (aBearer==Wap::EAll) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Connect to EAll Error"));) + return Wap::EBearerError; + } + TInt ret=KErrNone; + if (!iIsOpen) + { + TSockAddr remoteAddr; + TRAP(ret, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort)) + if (ret!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: BuildAddress err=%d."), ret);) + return ret; + } + TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, remoteAddr)) + if (ret!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d."), ret);) + return ret; + } + iIsOpen=ETrue; + } + else + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Trying to Connect twice to the API."));) + ret=KErrInUse; + } + return ret; + } + +TInt CWapMessageApiAgent::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure) +/** +Opens a socket which is to be used only with a single, named remote host. +@internalComponent. +@released since v8.0 +@param aRemoteHost (In) the name of the remote host to connect. +@param aRemotePort (In) the port of the remote host to connect. +@param aBearer (In) the bearer to be used +@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported) +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TInetAddr inetAddr( KInetAddrAny, 0); + return (Connect(aRemoteHost, aRemotePort, aBearer, aSecure, inetAddr)); + } + +TInt CWapMessageApiAgent::Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool /*aSecure*/, TInt aSocketServHandle, RConnection* aConnection) +/** +Opens a socket which is to be used only with a single, named remote host. +@internalComponent. +@released since v8.0 +@param aRemoteHost (In) the name of the remote host to connect. +@param aRemotePort (In) the port of the remote host to connect. +@param aBearer (In) the bearer to be used +@param aSecure (In) security flag indicates whether WTLS will be used or not (Not Supported) +@param aSocketServHandle (In) The Socket Server ID. +@param aConnection (In) The RConnection that shared with the client. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (aBearer==Wap::EAll) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Connect to EAll Error"));) + return Wap::EBearerError; + } + if (aSocketServHandle==0 || !aConnection) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Parameter Error"));) + return KErrArgument; + } + TInt ret=KErrNone; + if (!iIsOpen) + { + iSocketServ.SetHandle(aSocketServHandle); + TSockAddr remoteAddr; + TRAP(ret, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort)) + if (ret!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: BuildAddress err=%d."),ret);) + return ret; + } + TRAP(ret, CActiveSocket::NewL(iSocketServ, iBearers, aBearer, iMessageType, this, remoteAddr, aConnection)) + if (ret!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect: CActiveSocket Instantiate err=%d."),ret);) + return ret; + } + iIsOpen=ETrue; + } + else + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::Connect:Connect to a connected API."));) + ret=KErrInUse; + } + return ret; + } +// +//CWspMessageApiAgent class Methods +// +CWspMessageApiAgent* CWspMessageApiAgent::NewL() +/** +Static NEWL() +@internalComponent +@released since v8.0 +@returns CWspMessageApiAgent instance. +*/ + { + CWspMessageApiAgent* me = new(ELeave) CWspMessageApiAgent(); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CWspMessageApiAgent::CWspMessageApiAgent():CWapMessageApiAgent(EWapWsp) +/** +Constructor +@internalComponent +@released since v8.0 +*/ + { + } + +CWspMessageApiAgent::~CWspMessageApiAgent() +/** +Destructor +@internalComponent +@released since v8.0 +*/ + { + } + +void CWspMessageApiAgent::ConstructL() +/** +Second Phase Constructor +@internalComponent +@released since v8.0 +*/ + { + CWapMessageApiAgent::ConstructL(); + } + +TInt CWspMessageApiAgent::SendWspMessage(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId) +/** +Send Wsp Message to a remote host +@internalComponent +@released since v8.0 +@param aBearer (in) the bearer to be used +@param aRemoteHost (in) The remote host to be sent. +@param aRemotePort (in) The remote port to be sent. +@param aMethod (in) The method to be invoked. +@param aURI (in) The destination URI. +@param aReqHeaders (in) The Wsp header of WSP message. +@param aReqBody (in) The Wsp body of WSP message. +@param aTransactionId (in) The transaction ID of WSP message. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (!iIsOpen) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Tryig to send to unconnected API"));) + return KErrNotReady; + } + if (aBearer==Wap::EAll) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Send to EAll Error"));) + return Wap::EBearerError; + } + HBufC8* sendBuf=NULL; + TInt err=KErrNone; + TSockAddr remoteAddr; + TRAP(err, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort)) + if (err!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage: BuildAddress err=%d."),err);) + return err; + } + TRAP(err, CCLWSPPduHandler::PackWSPPduL(sendBuf, TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId)) + if (err!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Pack Wsp Packet Error=%d"),err);) + return err; + } + CActiveSocket* sendSock=GetActiveSocketByBearer(aBearer); + if (sendSock) + { + if (aBearer==Wap::ESMS||aBearer==Wap::EWAPSMS) + { + TWapSmsDataCodingScheme codingScheme = EWapSms8BitDCS; + sendSock->Socket().SetOpt(KWapSmsOptionNameDCS,KWapSmsOptionLevel,codingScheme); + } + TRequestStatus status; + sendSock->Socket().SendTo(*sendBuf, remoteAddr, 0, status); + User::WaitForRequest(status); + err=status.Int(); + } + else + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage: Can not find Bearer"));) + err=Wap::EBearerError; + } + delete sendBuf; + return err; + } + +TInt CWspMessageApiAgent::SendWspMessage(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId) +/** +Send Wsp Message to a remote host for fulluSpecified Interface +@internalComponent +@released since v8.0 +@param aMethod (in) The method to be invoked. +@param aURI (in) The destination URI. +@param aReqHeaders (in) The Wsp header of WSP message. +@param aReqBody (in) The Wsp body of WSP message. +@param aTransactionId (in) The transaction ID of WSP message. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (!iIsOpen) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Trying to send to unconnected API"));) + return KErrNotReady; + } + if (!iBearers[0]) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:No Bearer"));) + return Wap::EBearerError; + } + HBufC8* sendBuf=NULL; + TInt err=KErrNone; + TRAP(err, CCLWSPPduHandler::PackWSPPduL(sendBuf, TWSPPduType(aMethod), aURI, aReqHeaders, aReqBody, aTransactionId)) + if (err!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWapMessageApiAgent::SendWspMessage:Pack Wsp Packet Error=%d"),err);) + return err; + } + Wap::TBearer bearer=iBearers[0]->GetBearerType(); + if (bearer==Wap::ESMS||bearer==Wap::EWAPSMS) + { + TWapSmsDataCodingScheme codingScheme = EWapSms8BitDCS; + iBearers[0]->Socket().SetOpt(KWapSmsOptionNameDCS,KWapSmsOptionLevel,codingScheme); + } + TSockAddr& remoteAddr=iBearers[0]->GetRemoteAddress(); + TRequestStatus status; + iBearers[0]->Socket().SendTo(*sendBuf, remoteAddr, 0, status); + User::WaitForRequest(status); + delete sendBuf; + return status.Int(); + } + +TInt CWspMessageApiAgent::ReceiveWspMessage(TDes8& aWspHeaders, TDes8& aWspBody, TPckgBuf& aTransactionIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout) +/** +Receive the Wsp Message to a remote host for fulluSpecified Interface +@internalComponent +@released since v8.0 +@param aWspHeaders (out) The Wsp header to be received +@param aWspBody (out) The Wsp body to be received. +@param aTransactionIdPckg (out) The received transaction ID buffer +@param aWspStatus (out) The Wsp status for Method Result. +@param aReqStatus (out) The request status of the WAP message API +@param aTimeout (in) The timer out value. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TRequestStatus* reqStatus=NULL; + if (!iIsOpen) + { + reqStatus=&aReqStatus; + User::RequestComplete(reqStatus, KErrNotReady); + LOG(SwsLog::Printf(_L("CWspMessageApiAgent::ReceiveWspMessage: Trying to recvive from unconnected API"));) + return KErrNotReady; + } + if (iRequestActive) + { + reqStatus=&aReqStatus; + User::RequestComplete(reqStatus, KErrInUse); + LOG(SwsLog::Printf(_L("CWspMessageApiAgent::ReceiveWspMessage:Outstanding Receive exist"));) + return KErrInUse; + } + //Record the client buffer + iClientReqHeaders=&aWspHeaders; + iClientReqBody=&aWspBody; + iClientTransactionId=(TUint8*)aTransactionIdPckg.Ptr(); + iClientWspStatus=&aWspStatus; + //if there are data are being reading + CActiveSocket* readingSock=GetActiveSocketByStatus(EReading); + if (readingSock) + { + iRequestStatus=&aReqStatus; + *iRequestStatus = KRequestPending; + iRequestActive=ETrue; + iLastReadingError=readingSock->GetWspData(*iClientReqHeaders, *iClientReqBody, *iClientTransactionId, *iClientWspStatus); + if (iLastReadingError==KErrNone) + { + iLastPduBearer=readingSock->GetBearerType(); + } + iAsyncReadCompletion->CallBack(); + return iLastReadingError; + } + //if there are pending data. + CActiveSocket* pendingSock=GetActiveSocketByStatus(EPendingData); + if (pendingSock) + { + iRequestStatus=&aReqStatus; + *iRequestStatus = KRequestPending; + iRequestActive=ETrue; + iLastReadingError=pendingSock->GetWspData(*iClientReqHeaders, *iClientReqBody, *iClientTransactionId, *iClientWspStatus); + if (iLastReadingError==KErrNone) + { + iLastPduBearer=pendingSock->GetBearerType(); + } + iAsyncReadCompletion->CallBack(); + return iLastReadingError; + } + // Issue request in Idle socket + CActiveSocket* sock=GetActiveSocketByStatus(EIdle); + if (sock) + { + iRequestStatus=&aReqStatus; + *iRequestStatus = KRequestPending; + iRequestActive=ETrue; + for (TInt i=0; iGetDataState()==EIdle) + { + iBearers[i]->AwaitRecvDataSize(); + } + } + if (aTimeout>0) + { + iTimeoutTimer->After(aTimeout); + } + } + return KErrNone; + } + +void CWspMessageApiAgent::Notification(TInt aMessage, const TDesC8& aData) +/** +Notification of PDU size or PDU data +@internalComponent +@released since v8.0 +@param aMessage (in) The Event Type received by the ActiveSocket +@param aData (in)The Event received by the ActiveSocket. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification is called"));) + TWapNotificationInfo& info=*(reinterpret_cast(const_cast(aData.Ptr()))); + Wap::TBearer bearer=info.iBearer; + CActiveSocket* currentSocket=GetActiveSocketByBearer(bearer); + ASSERT(currentSocket!=NULL); + if (!currentSocket) + { + return; + } + TInt err=info.iError; + switch (TWapNotificationEvent(aMessage)) + { + case EPduLengthReceived: + { + if (err!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification PDU length err status:%d"), err);) + currentSocket->CleanUpData(); + if (iRequestActive) + { + iTimeoutTimer->Cancel(); + User::RequestComplete(iRequestStatus, err); + iRequestActive=EFalse; + } + } + else + { + LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification PDU length is received"));) + if ((err=currentSocket->Receive())!=KErrNone) + { + currentSocket->CleanUpData(); + if (iRequestActive) + { + iTimeoutTimer->Cancel(); + User::RequestComplete(iRequestStatus, err); + iRequestActive=EFalse; + } + } + } + break; + } + case EPduReceived: + { + CActiveSocket* sock=GetActiveSocketByStatus(EReading); + if (err!=KErrNone) + { + LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification PDU data is received with Err status:%d"), err);) + currentSocket->CleanUpData(); + if (iRequestActive && !sock) + { + iTimeoutTimer->Cancel(); + User::RequestComplete(iRequestStatus, err); + iRequestActive=EFalse; + } + } + else + { + LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification PDU data is received"));) + if (!sock && iRequestActive) + { + iTimeoutTimer->Cancel(); + iRequestActive=EFalse; + TRAP(err, currentSocket->UnpackPduToWspDataL()) + if (err) + { + currentSocket->CleanUpData(); + User::RequestComplete(iRequestStatus, err); + return; + } + err=currentSocket->GetWspData(*iClientReqHeaders, *iClientReqBody, *iClientTransactionId, *iClientWspStatus); + if (err==KErrNone) + iLastPduBearer=bearer; + User::RequestComplete(iRequestStatus, err); + } + } + break; + } + default: + LOG(SwsLog::Printf(_L("CWspMessageApiAgent::Notification() Unknown Event From Bearer"));) + ; + } + } + +// +//CWdpMessageApiAgent class Method +// +CWdpMessageApiAgent* CWdpMessageApiAgent::NewL() +/** +The static funtion to new a wdp message API agent +@internalComponent +@released since v8.0 +@returns the CWdpMessageApiAgent instance +*/ + { + CWdpMessageApiAgent* me = new(ELeave) CWdpMessageApiAgent(); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CWdpMessageApiAgent::CWdpMessageApiAgent():CWapMessageApiAgent(EWapWdp) +/** +Constructor +@internalComponent +@released since v8.0 +*/ + { + } + +CWdpMessageApiAgent::~CWdpMessageApiAgent() +/** +Destructor +@internalComponent +@released since v8.0 +*/ + { + } + +void CWdpMessageApiAgent::ConstructL() +/** +Second Phase Constructor +@internalComponent +@released since v8.0 +*/ + { + CWapMessageApiAgent::ConstructL(); + } + +TInt CWdpMessageApiAgent::ReceiveWdpMessage(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout) +/** +Receive WDP message from a remote host +@internalComponent +@released since v8.0 +@param aRemoteHost (out) the remote host from which the WDP is sent +@param aRemotePort (out) the remote port from which the WDP is sent +@param aBuffer (out) the buffer to contain the received the WDP pdu +@param aTruncated (out) the flag to show if the WDP PDU is trucated ot not +@param aReqStatus (out) the client request status. +@param aTimeOut (in) the time out value +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TRequestStatus* reqStatus=NULL; + TInt err=KErrNone; + if (!iIsOpen) + { + reqStatus=&aReqStatus; + User::RequestComplete(reqStatus, KErrNotReady); + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::ReceiveWdpMessage:Recv From unconnected API"));) + return KErrNotReady; + } + //if the length has been read + CActiveSocket* sock=GetActiveSocketByStatus(EGotLength); + CActiveSocket* sock1=GetActiveSocketByStatus(EReading); + if (iRequestActive || (!sock && !sock1)) + { + reqStatus=&aReqStatus; + User::RequestComplete(reqStatus, KErrInUse); + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::ReceiveWdpMessage:in wrong state"));) + return KErrInUse; + } + if (sock1) + { + Wap::TBearer bearer=sock1->GetBearerType(); + TSockAddr& remoteAddr=sock1->GetRemoteAddress(); + TRAP(err, CSWSWapMsgUtils::AnalyseAddrL(remoteAddr, bearer, *iClientRemoteHost, *iClientRemotePort)) + if (err) + { + reqStatus=&aReqStatus; + User::RequestComplete(reqStatus, err); + return err; + } + iRequestStatus=&aReqStatus; + *iRequestStatus = KRequestPending; + iRequestActive=ETrue; + iLastReadingError=sock1->GetPduData(*iClientPduBuffer, *iClientTruncated); + if (!iLastReadingError) + { + iLastPduBearer=bearer; + } + iAsyncReadCompletion->CallBack(); + return iLastReadingError; + } + if (sock) + { + if ((err=sock->Receive())==KErrNone) + { + iClientPduBuffer=&aBuffer; + iClientRemoteHost=&aRemoteHost; + iClientRemotePort=&aRemotePort; + iClientTruncated=&aTruncated; + iRequestStatus=&aReqStatus; + *iRequestStatus = KRequestPending; + iRequestActive=ETrue; + if (aTimeout) + { + iTimeoutTimer->After(aTimeout); + } + } + else + { + reqStatus=&aReqStatus; + User::RequestComplete(reqStatus, err); + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::ReceiveWdpMessage:err=%d"), err);) + return err; + } + } + return KErrNone; + } + +TInt CWdpMessageApiAgent::AwaitRecvDataSize(TPckg& aDataSizePckg, TRequestStatus& aReqStatus) +/** +Receive WDP message PDU length from a remote host +@internalComponent +@released since v8.0 +@param aDataSizePckg (out) the length of the PDU +@param aReqStatus (out) the client request status. +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TRequestStatus* reqStatus=NULL; + if (!iIsOpen) + { + reqStatus=&aReqStatus; + User::RequestComplete(reqStatus, KErrNotReady); + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::AwaitRecvDataSize:Wait For Data length From unconnected API"));) + return KErrNotReady; + } + //if the length has been read or there is some data pending, then error completion + CActiveSocket* sock=GetActiveSocketByStatus(EGotLength); + CActiveSocket* sock1=GetActiveSocketByStatus(ERequestingData); + CActiveSocket* sock2=GetActiveSocketByStatus(EReading); + if (iRequestActive||sock||sock1||sock2) + { + reqStatus=&aReqStatus; + User::RequestComplete(reqStatus, KErrInUse); + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::AwaitRecvDataSize:in wrong state"));) + return KErrInUse; + } + //if there is a pending length, then get it + sock=GetActiveSocketByStatus(EPendingLength); + if (sock) + { + iClientDataSize=&aDataSizePckg; + iRequestStatus=&aReqStatus; + *iRequestStatus = KRequestPending; + iRequestActive=ETrue; + TUint16 length=(TUint16)sock->GetPduSize(); + TPckg des(length); + iClientDataSize->Copy(des); + iLastReadingError=KErrNone; + iAsyncReadCompletion->CallBack(); + return KErrNone; + } + //if there is some idle socket, then wait for length + sock=GetActiveSocketByStatus(EIdle); + if (sock) + { + iRequestActive=ETrue; + iClientDataSize=&aDataSizePckg; + iRequestStatus=&aReqStatus; + *iRequestStatus = KRequestPending; + //Wait for length on the idle socket + for (TInt i=0; iGetDataState()==EIdle) + { + iBearers[i]->AwaitRecvDataSize(); + } + } + } + return KErrNone; + } + +TInt CWdpMessageApiAgent::SendWdpMessage(const TDesC8& aBuffer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer) +/** +Send WDP message to a remote host +@internalComponent +@released since v8.0 +@param aBuffer (in) the data to be sent +@param aRemoteHost (in) the remote host to be sent +@param aRemotePort (in) the remote port to be sent +@param aBearer (in) the Bearer to be used +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (!iIsOpen) + { + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:Send WDP to unconnected API"));) + return KErrNotReady; + } + if (aBearer==Wap::EAll) + { + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:Wrong Bearer"));) + return Wap::EBearerError; + } + TSockAddr remoteAddr; + TInt err=KErrNone; + TRAP(err, CSWSWapMsgUtils::BuildAddrL(remoteAddr, aBearer, aRemoteHost, aRemotePort)) + if (err) + { + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:BuildAddrL Err=%d"), err);) + return err; + } + CActiveSocket* sendSock=GetActiveSocketByBearer(aBearer); + if (sendSock) + { + if (aBearer==Wap::ESMS||aBearer==Wap::EWAPSMS) + { + TWapSmsDataCodingScheme codingScheme = EWapSms8BitDCS; + sendSock->Socket().SetOpt(KWapSmsOptionNameDCS,KWapSmsOptionLevel,codingScheme); + } + TRequestStatus status; + sendSock->Socket().SendTo(aBuffer, remoteAddr, 0, status); + User::WaitForRequest(status); + err=status.Int(); + } + else + { + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:No Bearer"));) + err=Wap::EBearerError; + } + return err; + } + +TInt CWdpMessageApiAgent::SendWdpMessage(const TDesC8& aBuffer) +/** +Send WDP message to a remote host +@internalComponent +@released since v8.0 +@param aBuffer (in) the data to be sent +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + if (!iIsOpen) + { + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:Send WDP to unconnected API"));) + return KErrNotReady; + } + if (!iBearers[0]) + { + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::SendWdpMessage:No Bearer"));) + return Wap::EBearerError; + } + Wap::TBearer bearer=iBearers[0]->GetBearerType(); + if (bearer==Wap::ESMS||bearer==Wap::EWAPSMS) + { + TWapSmsDataCodingScheme codingScheme = EWapSms8BitDCS; + iBearers[0]->Socket().SetOpt(KWapSmsOptionNameDCS,KWapSmsOptionLevel,codingScheme); + } + TSockAddr& remoteAddr=iBearers[0]->GetRemoteAddress(); + TRequestStatus status; + iBearers[0]->Socket().SendTo(aBuffer, remoteAddr, 0, status); + User::WaitForRequest(status); + return status.Int(); + } + +void CWdpMessageApiAgent::Notification(TInt aMessage, const TDesC8& aData) +/** +Notification from the ActiveSocket +@internalComponent +@released since v8.0 +@param aMessage (in) the Event Type +@param aData (in) the Event +@returns KErrNone on successful completion, or one of the system error codes on failure. +*/ + { + TWapNotificationInfo& info=*(reinterpret_cast(const_cast(aData.Ptr()))); + Wap::TBearer bearer=info.iBearer; + CActiveSocket* currentSocket=GetActiveSocketByBearer(bearer); + ASSERT(currentSocket!=NULL); + if (!currentSocket) + { + return; + } + TInt err=info.iError; + switch (TWapNotificationEvent(aMessage)) + { + case EPduLengthReceived: + { + CActiveSocket* sock1=GetActiveSocketByStatus(ERequestingData); + CActiveSocket* sock2=GetActiveSocketByStatus(EGotLength); + CActiveSocket* sock3=GetActiveSocketByStatus(EReading); + if (!sock1 && !sock2 && !sock3 && iRequestActive) + // Read pdu length from this socket + { + iRequestActive=EFalse; + if (err==KErrNone) + { + TUint16 length=(TUint16)currentSocket->GetPduSize(); + TPckg des(length); + iClientDataSize->Copy(des); + } + else + { + currentSocket->CleanUpData(); + } + User::RequestComplete(iRequestStatus, err); + } + break; + } + case EPduReceived: + { + ASSERT(iRequestActive); + if (iRequestActive) + { + // Read pdu from this socket + iRequestActive=EFalse; + iTimeoutTimer->Cancel(); + if (err==KErrNone) + { + TSockAddr& remoteAddr=currentSocket->GetRemoteAddress(); + TRAP(err, CSWSWapMsgUtils::AnalyseAddrL(remoteAddr, bearer, *iClientRemoteHost, *iClientRemotePort)) + if (!err) + { + err=currentSocket->GetPduData(*iClientPduBuffer, *iClientTruncated); + if (!err) + iLastPduBearer=bearer; + } + else + { + currentSocket->SetDataState(EReading); + } + } + else + { + currentSocket->CleanUpData(); + } + User::RequestComplete(iRequestStatus, err); + } + } + break; + default: + LOG(SwsLog::Printf(_L("CWdpMessageApiAgent::Notification() Unknown Event From Bearer"));) + ; + } + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapMessageApiAgent.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapMessageApiAgent.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,205 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __MSGAPIAGENT_H__ +#define __MSGAPIAGENT_H__ +#include "ActiveSocket.h" +#include "WapSwsTimeOut.h" + +class MProgressNotify +/** +Interface from the ActiveSocket to MessageApiAgent +@internalComponent +@released +@since v8.0 +*/ + { + public: + /** + The interface that will be called when WDP pdu length and data are received by CActiveSocket. + @internalComponent + @param aMessage the message type received from CActiveSocket + @param aData the data received from CActiveSocket + */ + virtual void Notification(TInt aMessage, const TDesC8& aData) = 0; + }; + +class CWapAsyncCallBack : public CActive + { +public: + CWapAsyncCallBack( const TCallBack& aCallBack, TInt aPriority ); + ~CWapAsyncCallBack(); + +public: // API + void CallBack(); + +private: + void RunL(); + void DoCancel(); + +private: + TCallBack iCallBack; + }; + +class CWapMessageApiAgent : public CBase, public MTimeOutNotify, public MProgressNotify +/** +The base class of CWspMessageApiAgent and CWdpMessageApiAgent, which handle Wsp and Wdp +for SWS message APIs +@internalComponent +@released +@since v8.0 +*/ +{ +public: + virtual ~CWapMessageApiAgent(); + void ConstructL(); + CActiveSocket* GetActiveSocketByBearer(Wap::TBearer aBearer); + CActiveSocket* GetActiveSocketByStatus(TWapMessageState aState); + TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure); + TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure, TInetAddr aInetAddr); + TInt Connect(Wap::TBearer aBearer, Wap::TPort aPort, TBool aSecure, TInt aSocketServHandle, RConnection* aConnection); + TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure, TInetAddr aInetAddr); + TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure); + TInt Connect(const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer, TBool aSecure, TInt aSocketServHandle, RConnection* aConnection); + TInt GetLocalPort(Wap::TPort& aPort); + TInt GetLocalAddress(HBufC8*& aLocalHost); + TInt GetBearer(Wap::TBearer& aBearer); + TInt GetServerAddress(HBufC8*& aRemoteHost); + virtual void TimerExpired(); + void CancelRequest(); + static TInt CompleteReading(TAny* aAgent); +protected: + CWapMessageApiAgent(TWapMessageType aMessageType); + /** + RSocketServ instance used by all the bearers. + */ + RSocketServ iSocketServ; + /** + The array to contain all the bearers + */ + RPointerArray iBearers; + /** + The Wdp and Wsp receiving timer. + */ + CTimeOutTimer* iTimeoutTimer; + /** + Flag the show if there is outstanding request. + */ + TBool iRequestActive; + /** + The pointer to Wap message client's request status + */ + TRequestStatus* iRequestStatus; + /** + The last error code of active socket in reading state + */ + TInt iLastReadingError; + /** + The asynchronous completion of reading + */ + CWapAsyncCallBack* iAsyncReadCompletion; + /** + The bearer that receives that last PDU + */ + Wap::TBearer iLastPduBearer; + /** + Flag to show if the API has been connected or not + */ + TBool iIsOpen; + /** + The type of the Wap message handled by this API agent. + */ + TWapMessageType iMessageType; +private: + TInt DoCompleteReading(); +}; + +class CWspMessageApiAgent : public CWapMessageApiAgent +/** +The class to handle Wsp PDU for SWS message APIs +@internalComponent +@released +@since v8.0 +*/ +{ +public: + static CWspMessageApiAgent* NewL(); + CWspMessageApiAgent(); + virtual ~CWspMessageApiAgent(); + void ConstructL(); + TInt SendWspMessage(Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId); + TInt SendWspMessage(TUint aMethod, const TDesC& aURI, const TDesC8& aReqHeaders, const TDesC8& aReqBody, TUint8 aTransactionId); + TInt ReceiveWspMessage(TDes8& aWspHeaders, TDes8& aWspBody, TPckgBuf& aPushIdPckg, TWSPStatus& aWspStatus, TRequestStatus& aReqStatus, TUint32 aTimeout); + virtual void Notification(TInt aMessage, const TDesC8& aData); +private: + /** + The pointer to the WSP message client's requested header buffer + */ + TDes8* iClientReqHeaders; + /** + The pointer to the WSP message client's requested body buffer + */ + TDes8* iClientReqBody; + /** + The pointer to the WSP message client's requested transaction ID. + */ + TUint8* iClientTransactionId; + /** + The pointer to the WSP message client's requested WSP status. + */ + TWSPStatus* iClientWspStatus; +}; + +class CWdpMessageApiAgent : public CWapMessageApiAgent +/** +The class to handle Wdp PDU for SWS message APIs +@internalComponent +@released +@since v8.0 +*/ +{ +public: + static CWdpMessageApiAgent* NewL(); + CWdpMessageApiAgent(); + virtual ~CWdpMessageApiAgent(); + void ConstructL(); + TInt ReceiveWdpMessage(TDes8& aRemoteHost, Wap::TPort& aRemotePort, TDes8& aBuffer, TBool& aTruncated, TRequestStatus& aReqStatus, TUint32 aTimeout); + TInt AwaitRecvDataSize(TPckg& aDataSizePckg, TRequestStatus& aReqStatus); + TInt SendWdpMessage(const TDesC8& aBuffer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort, Wap::TBearer aBearer); + TInt SendWdpMessage(const TDesC8& aBuffer); + virtual void Notification(TInt aMessage, const TDesC8& aData); +private: + /** + The pointer to Wdp message client's requested data buffer + */ + TDes8* iClientPduBuffer; + /** + The pointer to Wdp message client's request data size + */ + TPckg* iClientDataSize; + /** + The pointer to client's requested remote host buffer + */ + TDes8* iClientRemoteHost; + /** + The pointer to client's requested remote port buffer + */ + Wap::TPort* iClientRemotePort; + /** + The pointer to client's requested flag. + */ + TBool* iClientTruncated; +}; +#endif //__MSGAPIAGENT_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapMsgUtils.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapMsgUtils.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,129 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include "WapMsgUtils.h" +#include +#include +#include +#include + +TInt CSWSWapMsgUtils::GetLocalAddress(HBufC8*& aLocalHost) +/** +Not supported +@internalComponent +@released +@since v8.0 +*/ + { + // Panic client if the buffer isn't null + __ASSERT_ALWAYS(aLocalHost==NULL, User::Panic(Wap::KWapMsgPanicDescriptor, KErrArgument)); + + RArray myArray; + + TInt ret(0); + TRAPD(err, ret=CWapMessageUtils::GetLocalAddressesL(myArray)) + if (err) + { + return err; + } + // GetLocalAddressesL can return KErrNotFound if there is no network interface up + if (ret) + { + return ret; + } + + TBuf16<256>tempBuf16; + TBuf8<256>tempBuf8; + TInetAddr* info = &myArray[0].iAddress; + // Output the address to a descriptor + info->Output(tempBuf16); + // Need to convert the buffer to 8 bit; + tempBuf8.Copy(tempBuf16); + // Note: Ownership of the allocated buffer is passed to the client + aLocalHost = HBufC8::New( tempBuf16.Length() ); + if (!aLocalHost) + { + return KErrNoMemory; + } + // Now copy the 8 bit version of the address + *aLocalHost = tempBuf8; + + return KErrNone; + } + +void CSWSWapMsgUtils::BuildAddrL(TSockAddr& aAddr, Wap::TBearer aBearer, const TDesC8& aHost, Wap::TPort aPort) +/** +Build a socket address according to the given parameters. +@internalComponent +@released +@since v8.0 +@param aAddr the socket address which is built from given parameters +@param aBearer the underlie bearer type +@param aHost the host name +@param aHost the port number +*/ + { + if (aBearer==Wap::EIP) + { + TInetAddr addr(aPort); + HBufC16* addr16=HBufC16::NewL(aHost.Length()); + TPtr16 addr16Des=addr16->Des(); + addr16Des.Copy(aHost); + // coverity[check_return] + addr.Input(addr16Des); + aAddr=addr; + delete addr16; + } + else + { + TWapAddr addr; + addr.SetWapPort(TWapPortNumber(aPort)); + addr.SetWapAddress(aHost); + aAddr=addr; + } + } +void CSWSWapMsgUtils::AnalyseAddrL(TSockAddr& aAddr, Wap::TBearer aBearer, TDes8& aHost, Wap::TPort& aPort) +/** +Analyse a socket address, and generate host name and port +@internalComponent +@released +@since v8.0 +@param aAddr the socket address to be analysed +@param aBearer the underlie bearer type +@param aHost the host name +@param aHost the port number +*/ + { + aPort=static_cast(aAddr.Port()); + if (aBearer==Wap::EIP) + { + TInetAddr addr(aAddr); + // If the family is KAfInet6, the output buffer must be at least + // 39 characters. + // If less, the buffer is filled with '*' characters. + HBufC16* addr16=HBufC16::NewL(40); + TPtr16 addr16Des=addr16->Des(); + addr.Output(addr16Des); + aHost.Copy(addr16Des); + delete addr16; + } + else + { + TWapAddr& wapAddr = *(reinterpret_cast(&aAddr)); + TPtrC8 addr=wapAddr.WapAddress(); + aHost.Copy(addr); + } + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapMsgUtils.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapMsgUtils.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,50 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Utilities +// +// + +#ifndef __CSWSWAPMSGUTILS_H__ +#define __CSWSWAPMSGUTILS_H__ + +#include +#include +#include +#include + +const TInt KWapStackMaxDatagramSize = 4000; +const TInt KWapStackNorminalDatagramSize = 4000; + + + +class CSWSWapMsgUtils : public CBase +/** +Provide a set of static function which to be used by SWS. Contains the functions to build a +specific socket address from given parameters, analyse a specific socket address, and to +determine the SMS bearer type, GSM. +@internalComponent +@released +@since v8.0 +*/ + { +public: + // Returns the current local address, a null pointer must be passed in, buffer ownership is given to the client + static TInt GetLocalAddress(HBufC8*& aLocalHost); + static void BuildAddrL(TSockAddr& aAddr, Wap::TBearer aBearer, const TDesC8& aRemoteHost, Wap::TPort aRemotePort); + static void AnalyseAddrL(TSockAddr& aAddr, Wap::TBearer aBearer, TDes8& aRemoteHost, Wap::TPort& aRemotePort); + + }; + +#endif //__CSWSWAPMSGUTILS_H__ + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapSwsLog.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapSwsLog.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,42 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAPLOG.CPP +// +// + + +#ifdef _DEBUG + +#include "WapSwsLog.h" + +void SwsLog::Write(const TDesC& aDes) +/* + * Write aText to the log + */ + { + RFileLogger::Write(KSWSLogFolder(),KSWSLogFile(),EFileLoggingModeAppend,aDes); + } + +void SwsLog::Printf(TRefByValue aFmt,...) +/* + * Write a mulitple argument list to the log, trapping and ignoring any leave + */ + { + VA_LIST list; + VA_START(list,aFmt); + RFileLogger::WriteFormat(KSWSLogFolder(),KSWSLogFile(),EFileLoggingModeAppend,aFmt,list); + } + +#endif // _DEBUG + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapSwsLog.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapSwsLog.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,47 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __WAPLOG_H__ +#define __WAPLOG_H__ + +#ifdef _DEBUG + + #include + #define LOG(MSG) MSG + + #if defined (DETAILED_LOG) + #define LOG_DETAILED(MSG) MSG + #else + #define LOG_DETAILED(MSG) + #endif + + _LIT(KSWSLogFolder,"sws"); + _LIT(KSWSLogFile,"sws.txt"); + _LIT(KEndOfLine,"\r\n"); + + class SwsLog + { + public: + static void Write(const TDesC& aDes); + static void Printf(TRefByValue aFmt, ...); + }; +#else + + #define LOG(MSG) + #define LOG_DETAILED(MSG) + +#endif + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapSwsTimeOut.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapSwsTimeOut.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,46 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __TIMEOUT_H__ +#define __TIMEOUT_H__ + +// Class definitions to support the recive with timeout methods + +#include + +// MTimeOutNotify: used in conjunction with CTimeOutTimer class +class MTimeOutNotify + { +public: + virtual void TimerExpired() = 0; + }; + +// CTimeOutTimer: timer for comms time-outs +class CTimeOutTimer: public CTimer + { +public: + static CTimeOutTimer* NewL(MTimeOutNotify& aTimeOutNotify); + ~CTimeOutTimer(); + +protected: + CTimeOutTimer(MTimeOutNotify& aTimeOutNotify); + void ConstructL(); + virtual void RunL(); + +private: + MTimeOutNotify& iNotify; + }; + +#endif // __TIMEOUT_H__ diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/WapSwsTimeout.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/WapSwsTimeout.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,52 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Timeout.cpp +// +// + +#include "WapSwsTimeOut.h" + +// +// CTimeOutTimer: timer for comms time-outs +// +CTimeOutTimer::CTimeOutTimer(MTimeOutNotify& aTimeOutNotify) +: CTimer(EPriorityStandard), iNotify(aTimeOutNotify) + { + } + +CTimeOutTimer::~CTimeOutTimer() + { + Cancel(); + } + +CTimeOutTimer* CTimeOutTimer::NewL(MTimeOutNotify& aTimeOutNotify) + { + CTimeOutTimer *p = new (ELeave) CTimeOutTimer(aTimeOutNotify); + CleanupStack::PushL(p); + p->ConstructL(); + CleanupStack::Pop(p); + return p; + } + +void CTimeOutTimer::ConstructL() + { + CTimer::ConstructL(); + CActiveScheduler::Add(this); + } + +void CTimeOutTimer::RunL() + { + // Timer request has completed, so notify the timer's owner + iNotify.TimerExpired(); + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/swswapmsg.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/swswapmsg.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,42 @@ +// Copyright (c) 1997-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#include +#include +#include "WapBoundWDP.h" +#include "WapFullySpecWDP.h" +#include "WapBoundCLPush.h" +#include "WapFullySpecCLPush.h" +#include "WapBoundCLWSP.h" +#include "WapFullySpecCLWSP.h" + +// Exported proxy for instantiation method resolution +// Define the interface UIDs +const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_PROXY_ENTRY(0x101FBB37, CSWSWapBoundWDPService::NewL), + IMPLEMENTATION_PROXY_ENTRY(0x101FBB38, CSWSWapFullySpecWDPService::NewL), + IMPLEMENTATION_PROXY_ENTRY(0x101FBB39, CSWSWapBoundCLPushService::NewL), + IMPLEMENTATION_PROXY_ENTRY(0x101FBB3A, CSWSWapFullySpecCLPushService::NewL), + IMPLEMENTATION_PROXY_ENTRY(0x101FBB3C, CSWSWapBoundCLWSPService::NewL), + IMPLEMENTATION_PROXY_ENTRY(0x101FBB3E, CSWSWapFullySpecCLWSPService::NewL) + }; + +EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) + { + aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); + return ImplementationTable; + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/sws/swswapmsgsource.mmpi --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/sws/swswapmsgsource.mmpi Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,24 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ +// Contains just source of swswapmsg, not including file that defines the dll entry point + +SOURCE WapBoundWDP.cpp WapFullySpecWDP.cpp +SOURCE WapBoundCLPush.cpp WapFullySpecCLPush.cpp +SOURCE WapBoundCLWSP.cpp WapFullySpecCLWSP.cpp +SOURCE WapMsgUtils.cpp WapSwsTimeout.cpp ActiveSocket.cpp +SOURCE CLWSPPduHandler.cpp WapMessageApiAgent.cpp +SOURCE WapSwsLog.cpp \ No newline at end of file diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/bmarm/wapstacksuiteu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/bmarm/wapstacksuiteu.def Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,3 @@ +EXPORTS + NewServer__Fv @ 1 NONAME R3UNUSED ; NewServer(void) + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/bwins/wapstacksuiteu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/bwins/wapstacksuiteu.def Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,3 @@ +EXPORTS + ?NewServer@@YAHXZ @ 1 NONAME ; int __cdecl NewServer(void) + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/group/CdmaWapStackSuite.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/group/CdmaWapStackSuite.iby Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,47 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef __CDMAWAPSTACKTEST_SUITE_IBY__ +#define __CDMAWAPSTACKTEST_SUITE_IBY__ + +#include +#include +#include +#include +#include +#include + +file=ABI_DIR\DEBUG_DIR\WapStackSuite.exe System\libs\WapStackSuite.exe + +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapStackSuite.ini testdata\configs\WapStackSuite.ini +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\UDPPush.ini testdata\configs\UDPPush.ini +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\wapstacksuite_config.ini testdata\configs\wapstacksuite_config.ini +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapStackSuite.xml testdata\configs\WapStackSuite.xml +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\CdmaWapSIMTSY.txt testdata\configs\CdmaWapSIMTSY.txt +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\PushPDU.bin testdata\configs\PushPDU.bin +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\Te_CdmaWapStackSuite.script testdata\scripts\Te_CdmaWapStackSuite.Script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundWDP.script testdata\scripts\WapBoundWDP.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecWDP.script testdata\scripts\WapFullySpecWDP.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundPush.script testdata\scripts\WapBoundPush.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecPush.script testdata\scripts\WapFullySpecPush.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundWSP.script testdata\scripts\WapBoundWSP.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecWSP.script testdata\scripts\WapFullySpecWSP.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\UDPPush.script testdata\scripts\UDPPush.script + +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\Te_WapStackSuite.script testdata\scripts\Te_WapStackSuite.Script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapSIMTSY.txt testdata\configs\WapSIMTSY.txt +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/group/WapStackSuite.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/group/WapStackSuite.iby Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,39 @@ +/* +* Copyright (c) 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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +#ifndef __WAPSTACKTEST_SUITE_IBY__ +#define __WAPSTACKTEST_SUITE_IBY__ + +#include + +file=ABI_DIR\DEBUG_DIR\WapStackSuite.exe System\libs\WapStackSuite.exe + +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapStackSuite.ini testdata\configs\WapStackSuite.ini +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\UDPPush.ini testdata\configs\UDPPush.ini +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapStackSuite.xml testdata\configs\WapStackSuite.xml +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\WapSIMTSY.txt testdata\configs\WapSIMTSY.txt +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\configs\PushPDU.bin testdata\configs\PushPDU.bin +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\Te_WapStackSuite.script testdata\scripts\Te_WapStackSuite.Script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundWDP.script testdata\scripts\WapBoundWDP.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecWDP.script testdata\scripts\WapFullySpecWDP.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundPush.script testdata\scripts\WapBoundPush.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecPush.script testdata\scripts\WapFullySpecPush.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapBoundWSP.script testdata\scripts\WapBoundWSP.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\WapFullySpecWSP.script testdata\scripts\WapFullySpecWSP.script +data=EPOCROOT##Epoc32\release\winscw\udeb\z\testdata\scripts\UDPPush.script testdata\scripts\UDPPush.script + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/group/WapStackSuite.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/group/WapStackSuite.mmp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,52 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +TARGET wapstacksuite.exe +TARGETTYPE exe + UID 0x1000008d 0x10282B37 + + +SOURCEPATH ../src +SOURCE WapStackSuiteServer.cpp +SOURCE WapStackSuiteStepBase.cpp +SOURCE WapBoundWDPSteps.cpp +SOURCE WapBoundCLPushSteps.cpp +SOURCE WapBoundWSPSteps.cpp +SOURCE WapFullySpecWDPSteps.cpp +SOURCE WapFullySpecCLPushSteps.cpp +SOURCE WapFullySpecWSPSteps.cpp + +USERINCLUDE ../src + +OS_LAYER_SYSTEMINCLUDE_SYMBIAN + +LIBRARY euser.lib +LIBRARY etel.lib +LIBRARY testexecuteutils.lib +LIBRARY insock.lib +LIBRARY wapmsgcli.lib +LIBRARY testexecutelogclient.lib +LIBRARY c32root.lib +LIBRARY esock.lib +LIBRARY efsrv.lib +LIBRARY ecom.lib + +//CAPABILITY ALL -Tcb +// set capabilities the same as wapmsgcli.dll, which this test loads, to avoid capabilities conflict +CAPABILITY ReadDeviceData WriteDeviceData LocalServices NetworkServices ReadUserData WriteUserData NetworkControl + +VENDORID 0x70000001 + +SMPSAFE diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/scripts/Te_WapStackSuite.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/scripts/Te_WapStackSuite.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,64 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP stack test main script file +// +// + +PRINT GT167-WAP stack tests +run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script +ced -i z:\testdata\configs\WapStackSuite.xml WapStackSuite.log +run_script z:\TestData\scripts\te_esock_test_loadesock.script + +//delete any existing config.txt +RUN_UTILS MakeReadWrite c:\config.txt +RUN_UTILS copyfile c:\config.txt c:\config.old +RUN_UTILS DeleteFile c:\config.txt + +//copy our config file +run_utils copyfile z:\testdata\configs\WapSIMTSY.txt c:\Config.txt +RUN_UTILS MakeReadWrite c:\config.txt + +//Delete any previous wapstackconfig file +RUN_UTILS MakeReadWrite c:\system\data\wapstackconfig.old +RUN_UTILS copyfile c:\system\data\wapstackconfig.ini c:\system\data\wapstackconfig.old +RUN_UTILS MakeReadWrite c:\system\data\wapstackconfig.ini +RUN_UTILS DeleteFile c:\system\data\wapstackconfig.ini + +RUN_SCRIPT z:\testdata\scripts\WapBoundWDP.script +RUN_SCRIPT z:\testdata\scripts\WapFullySpecWDP.script +RUN_SCRIPT z:\testdata\scripts\WapBoundPush.script +RUN_SCRIPT z:\testdata\scripts\WapFullySpecPush.script +RUN_SCRIPT z:\testdata\scripts\WapBoundWSP.script +RUN_SCRIPT z:\testdata\scripts\WapFullySpecWSP.script +RUN_SCRIPT z:\testdata\scripts\UDPPush.script + +START_TESTCASE WAP-WAPMESSAGE-0110 +//! @SYMTestCaseID WAP-WAPMESSAGE-0110 +LOAD_SUITE WapStackSuite +RUN_TEST_STEP 100 WapStackSuite BoundWDP_OutOfMemory +END_TESTCASE WAP-WAPMESSAGE-0110 + +//Delete our config file +run_utils delete c:\Config.txt +//put back the old config.txt +RUN_UTILS copyfile c:\config.old c:\config.txt +run_script z:\TestData\scripts\te_esock_test_unloadesockForced.script + +//put back any previous wapstackconfig.ini file +RUN_UTILS MakeReadWrite c:\system\data\wapstackconfig.ini +RUN_UTILS copyfile c:\system\data\wapstackconfig.old c:\system\data\wapstackconfig.ini + +PRINT GT167-WAP stack tests finished + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/scripts/UDPPush.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/scripts/UDPPush.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,42 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP stack BoundPush test script file +// +// + +PRINT GT167-WAP stack BOUND-PUSH-UDP test + +//ced -i z:\testdata\configs\WapStackSuiteRAS.cfg + +LOAD_SUITE WapStackSuite + +START_TESTCASE WAP-WAPMESSAGE-0101 +//! @SYMTestCaseID WAP-WAPMESSAGE-0101 + +CONCURRENT + +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\UDPPush.ini Test_1 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_9 z:\testdata\configs\UDPPush.ini Test_2 + +CONSECUTIVE + +CONCURRENT + +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\UDPPush.ini Test_3 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_9 z:\testdata\configs\UDPPush.ini Test_4 + +END_TESTCASE WAP-WAPMESSAGE-0101 + + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/scripts/WSP.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/scripts/WSP.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,53 @@ +// +// Copyright (c) 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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// +// +PRINT Run all WAP stack Suite Tests + +ced -i z:\WapStackSuite\WapStackSuiteRAS.xml + +LOAD_SUITE WapStackSuite + +// -------------------------------------------------- +// TEST(4) +// +START_TESTCASE WAP-WAPMESSAGE-0801 +//! @SYMTestCaseID WAP-WAPMESSAGE-0801 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.1 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.2 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.3 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.4 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.5 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.6 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.7 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.8 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.9 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.10 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.11 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.12 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.13 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.14 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.14.2 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.14.1 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.15 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.16 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\WapStackSuite\WSP.ini Test_9.17 +END_TESTCASE WAP-WAPMESSAGE-0801 + + + + + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/scripts/WapBoundPush.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/scripts/WapBoundPush.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,119 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP stack BoundPush test script file +// +// + +PRINT GT167-WAP stack BOUND-PUSH test + +LOAD_SUITE WapStackSuite + +// --------------------------------------------------------------------------------- +// TEST(1) Load implementation +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0201 +//! @SYMTestCaseID WAP-WAPMESSAGE-0201 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_1 z:\testdata\configs\WapStackSuite.ini COMMON +END_TESTCASE WAP-WAPMESSAGE-0201 + +// --------------------------------------------------------------------------------- +// TEST(2) Connect using different bearers (tests 1.7, 1.8, 1.1.10 must fail) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0202 +//! @SYMTestCaseID WAP-WAPMESSAGE-0202 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.2 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.3 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.4 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.5 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.6 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.7 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.8 +// Reconnect +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.10 + +CONCURRENT +// Connect to the same port (second test should fail) +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.1 + +// Connect to the different ports at the same time +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.2 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.3 + +CONSECUTIVE +END_TESTCASE WAP-WAPMESSAGE-0202 + +// --------------------------------------------------------------------------------- +// TEST(3) Unconnected +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0203 +//! @SYMTestCaseID WAP-WAPMESSAGE-0203 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_3 z:\testdata\configs\WapStackSuite.ini Test_3 +END_TESTCASE WAP-WAPMESSAGE-0203 + +// --------------------------------------------------------------------------------- +// TEST(4) Normal condition/Multiple receive +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0204 +//! @SYMTestCaseID WAP-WAPMESSAGE-0204 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.3.1 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.3.2 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.3.3 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.3.4 +END_TESTCASE WAP-WAPMESSAGE-0204 + +// --------------------------------------------------------------------------------- +// TEST(5) Cancel +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0205 +//! @SYMTestCaseID WAP-WAPMESSAGE-0205 +//RUN_TEST_STEP 100 WapStackSuite BoundCLPush_5 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0205 + +// --------------------------------------------------------------------------------- +// TEST(6) Timeout +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0206 +//! @SYMTestCaseID WAP-WAPMESSAGE-0206 +//RUN_TEST_STEP 100 WapStackSuite BoundCLPush_6 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0206 + +// --------------------------------------------------------------------------------- +// TEST(7) Wrong sequence +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0207 +//! @SYMTestCaseID WAP-WAPMESSAGE-0207 +RUN_TEST_STEP 100 WapStackSuite BoundCLPush_7 z:\testdata\configs\WapStackSuite.ini Test_7.1 +END_TESTCASE WAP-WAPMESSAGE-0207 + +// --------------------------------------------------------------------------------- +// TEST(8) API low/high in parameter +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0208 +//! @SYMTestCaseID WAP-WAPMESSAGE-0208 +//RUN_TEST_STEP 100 WapStackSuite BoundCLPush_8 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0208 + +// --------------------------------------------------------------------------------- +// TEST(9) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0209 +//! @SYMTestCaseID WAP-WAPMESSAGE-0209 +//RUN_TEST_STEP 100 WapStackSuite BoundCLPush_9 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0209 + +PRINT GT167-WAP stack BOUND-PUSH test finished + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/scripts/WapBoundWDP.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/scripts/WapBoundWDP.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,129 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP stack WapBoundWDP test script file +// +// + +PRINT GT167-WAP stack BOUND-WDP tests + +LOAD_SUITE WapStackSuite + +// --------------------------------------------------------------------------------- +// TEST(1) Load implementation +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0301 +//! @SYMTestCaseID WAP-WAPMESSAGE-0301 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_1 z:\testdata\configs\WapStackSuite.ini COMMON +END_TESTCASE WAP-WAPMESSAGE-0301 + +// --------------------------------------------------------------------------------- +// TEST(2) Connect using different bearers (tests 1.7, 1.10 must fail) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0302 +//! @SYMTestCaseID WAP-WAPMESSAGE-0302 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.2 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.3 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.4 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.5 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.6 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.7 +// Reconnect +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.10 + +CONCURRENT + +// Connect to the same port (second test should fail) +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.1 +// Connect to the different ports at the same time +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.2 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.3 + +CONSECUTIVE +END_TESTCASE WAP-WAPMESSAGE-0302 + +// --------------------------------------------------------------------------------- +// TEST(3) Unconnected +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0303 +//! @SYMTestCaseID WAP-WAPMESSAGE-0303 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_3 z:\testdata\configs\WapStackSuite.ini Test_3 +END_TESTCASE WAP-WAPMESSAGE-0303 + +// --------------------------------------------------------------------------------- +// TEST(4) Normal condition/Multiple receive +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0304 +//! @SYMTestCaseID WAP-WAPMESSAGE-0304 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.1 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.2 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.3 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.4 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5.1 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5.2 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5.3 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.5.4 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.6 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.7 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.8 +RUN_TEST_STEP 100 WapStackSuite BoundWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.1.9 +END_TESTCASE WAP-WAPMESSAGE-0304 + +// --------------------------------------------------------------------------------- +// TEST(5) Cancel +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0305 +//! @SYMTestCaseID WAP-WAPMESSAGE-0305 +//RUN_TEST_STEP 100 WapStackSuite BoundWDP_5 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0305 + +// --------------------------------------------------------------------------------- +// TEST(6) Timeout +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0306 +//! @SYMTestCaseID WAP-WAPMESSAGE-0306 +//RUN_TEST_STEP 100 WapStackSuite BoundWDP_6 z:\testdata\configs\WapStackSuite.ini + +// --------------------------------------------------------------------------------- +// TEST(7) Wrong sequence +// --------------------------------------------------------------------------------- +RUN_TEST_STEP 100 WapStackSuite BoundWDP_7 z:\testdata\configs\WapStackSuite.ini Test_7.1 +END_TESTCASE WAP-WAPMESSAGE-0306 + + +// --------------------------------------------------------------------------------- +// TEST(8) API low/high in parameter +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0307 +//! @SYMTestCaseID WAP-WAPMESSAGE-0307 +//RUN_TEST_STEP 100 WapStackSuite BoundWDP_8 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0307 + + +// --------------------------------------------------------------------------------- +// TEST(9) Reserved +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0308 +//! @SYMTestCaseID WAP-WAPMESSAGE-0308 +//RUN_TEST_STEP 100 WapStackSuite BoundWDP_9 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0308 + + +PRINT GT167-WAP stack BOUND-WDP test finished + + + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/scripts/WapBoundWSP.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/scripts/WapBoundWSP.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,118 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP stack WapBoundWSP test script file +// +// + +PRINT GT167-WAP stack BOUND-WSP test + +LOAD_SUITE WapStackSuite + +// --------------------------------------------------------------------------------- +// TEST(1) Load implementation +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0401 +//! @SYMTestCaseID WAP-WAPMESSAGE-0401 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_1 z:\testdata\configs\WapStackSuite.ini COMMON +END_TESTCASE WAP-WAPMESSAGE-0401 + +// --------------------------------------------------------------------------------- +// TEST(2) Connect using different bearers (tests 1.7, 1.8, 1.10 must fail) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0402 +//! @SYMTestCaseID WAP-WAPMESSAGE-0402 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.2 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.3 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.4 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.5 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.6 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.7 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.8 +// Reconnect +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.10 + +CONCURRENT +// Connect to the same port (second test should fail) +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.1 + +// Connect to the different ports at the same time +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.2 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1.3 + +CONSECUTIVE +END_TESTCASE WAP-WAPMESSAGE-0402 + +// --------------------------------------------------------------------------------- +// TEST(3) Unconnected +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0403 +//! @SYMTestCaseID WAP-WAPMESSAGE-0403 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_3 z:\testdata\configs\WapStackSuite.ini Test_3 +END_TESTCASE WAP-WAPMESSAGE-0403 + +// --------------------------------------------------------------------------------- +// TEST(4) Normal condition/Multiple receive +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0404 +//! @SYMTestCaseID WAP-WAPMESSAGE-0404 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_4 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0404 + +// --------------------------------------------------------------------------------- +// TEST(5) Cancel +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0405 +//! @SYMTestCaseID WAP-WAPMESSAGE-0405 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_5 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0405 + +// --------------------------------------------------------------------------------- +// TEST(6) Timeout +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0406 +//! @SYMTestCaseID WAP-WAPMESSAGE-0406 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_6 z:\testdata\configs\WapStackSuite.ini Test_6.1 +END_TESTCASE WAP-WAPMESSAGE-0406 + +// --------------------------------------------------------------------------------- +// TEST(7) Wrong sequence +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0407 +//! @SYMTestCaseID WAP-WAPMESSAGE-0407 +RUN_TEST_STEP 100 WapStackSuite BoundWSP_7 z:\testdata\configs\WapStackSuite.ini Test_7.1 +END_TESTCASE WAP-WAPMESSAGE-0407 + +// --------------------------------------------------------------------------------- +// TEST(8) API low/high in parameter +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0408 +//! @SYMTestCaseID WAP-WAPMESSAGE-0408 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_8 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0408 + +// --------------------------------------------------------------------------------- +// TEST(9) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0409 +//! @SYMTestCaseID WAP-WAPMESSAGE-0409 +//RUN_TEST_STEP 100 WapStackSuite BoundWSP_9 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0409 + +PRINT GT167-WAP stack BOUN-WSP test finished + + + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/scripts/WapFullySpecPush.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/scripts/WapFullySpecPush.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,108 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP stack WapFullySpecPush test script file +// +// + +PRINT GT167-WAP stack FULLY_SPECIFIED-PUSH test + +LOAD_SUITE WapStackSuite + +// --------------------------------------------------------------------------------- +// TEST(1) Load implementation +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0501 +//! @SYMTestCaseID WAP-WAPMESSAGE-0501 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_1 z:\testdata\configs\WapStackSuite.ini COMMON +END_TESTCASE WAP-WAPMESSAGE-0501 + +// --------------------------------------------------------------------------------- +// TEST(2) Connect using different bearers (tests 1.7, 1.8, 1.9, 1.10 must fail) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0502 +//! @SYMTestCaseID WAP-WAPMESSAGE-0502 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.1 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.2 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.3 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.4 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.5 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.7 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.8 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.9 +// Reconnect +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_2 z:\testdata\configs\WapStackSuite.ini Test_2.10 +END_TESTCASE WAP-WAPMESSAGE-0502 + +// --------------------------------------------------------------------------------- +// TEST(3) Unconnected +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0503 +//! @SYMTestCaseID WAP-WAPMESSAGE-0503 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_3 z:\testdata\configs\WapStackSuite.ini Test_3 +END_TESTCASE WAP-WAPMESSAGE-0503 + +// --------------------------------------------------------------------------------- +// TEST(4) Normal condition/Multiple receive +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0504 +//! @SYMTestCaseID WAP-WAPMESSAGE-0504 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.4.1 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.4.2 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.4.3 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_4 z:\testdata\configs\WapStackSuite.ini Test_4.4.4 +END_TESTCASE WAP-WAPMESSAGE-0504 + +// --------------------------------------------------------------------------------- +// TEST(5) Cancel +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0505 +//! @SYMTestCaseID WAP-WAPMESSAGE-0505 +//RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_5 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0505 + +// --------------------------------------------------------------------------------- +// TEST(6) Timeout +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0506 +//! @SYMTestCaseID WAP-WAPMESSAGE-0506 +//RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_6 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0506 + +// --------------------------------------------------------------------------------- +// TEST(7) Wrong sequence +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0507 +//! @SYMTestCaseID WAP-WAPMESSAGE-0507 +RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_7 z:\testdata\configs\WapStackSuite.ini Test_7.1 +END_TESTCASE WAP-WAPMESSAGE-0507 + +// --------------------------------------------------------------------------------- +// TEST(8) API low/high in parameter +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0508 +//! @SYMTestCaseID WAP-WAPMESSAGE-0508 +//RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_8 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0508 + +// --------------------------------------------------------------------------------- +// TEST(9) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0509 +//! @SYMTestCaseID WAP-WAPMESSAGE-0509 +//RUN_TEST_STEP 100 WapStackSuite FullySpecCLPush_9 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0509 + +PRINT GT167-WAP stack FULLY_SPECIFIED-PUSH test finished + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/scripts/WapFullySpecWDP.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/scripts/WapFullySpecWDP.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,110 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP stack WapFullySpecWDP test script file +// +// + +PRINT GT167-WAP stack FULLY_SPECIFIED-WDP test + +LOAD_SUITE WapStackSuite + +// --------------------------------------------------------------------------------- +// TEST(1) Load implementation +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0601 +//! @SYMTestCaseID WAP-WAPMESSAGE-0601 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_1 z:\testdata\configs\WapStackSuite.ini COMMON +END_TESTCASE WAP-WAPMESSAGE-0601 + +// --------------------------------------------------------------------------------- +// TEST(2) Connect using different bearers (tests 1.7, 1.9, 1.10 must fail) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0602 +//! @SYMTestCaseID WAP-WAPMESSAGE-0602 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.2 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.3 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.4 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.5 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.7 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.9 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_2 z:\testdata\configs\WapStackSuite.ini Test_2.10 +END_TESTCASE WAP-WAPMESSAGE-0602 + +// --------------------------------------------------------------------------------- +// TEST(3) Unconnected +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0603 +//! @SYMTestCaseID WAP-WAPMESSAGE-0603 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_3 z:\testdata\configs\WapStackSuite.ini Test_3 +END_TESTCASE WAP-WAPMESSAGE-0603 + +// --------------------------------------------------------------------------------- +// TEST(4) Normal condition/Multiple receive +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0604 +//! @SYMTestCaseID WAP-WAPMESSAGE-0604 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.1 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.2 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.3 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.4 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.5 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.6 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.7 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_4 z:\testdata\configs\WapStackSuite.ini Test_4.2.8 +END_TESTCASE WAP-WAPMESSAGE-0604 + +// --------------------------------------------------------------------------------- +// TEST(5) Cancel +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0605 +//! @SYMTestCaseID WAP-WAPMESSAGE-0605 +//RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_5 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0605 + +// --------------------------------------------------------------------------------- +// TEST(6) Timeout +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0606 +//! @SYMTestCaseID WAP-WAPMESSAGE-0606 +//RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_6 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0606 + +// --------------------------------------------------------------------------------- +// TEST(7) Wrong sequence +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0607 +//! @SYMTestCaseID WAP-WAPMESSAGE-0607 +RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_7 z:\testdata\configs\WapStackSuite.ini Test_7.1 +END_TESTCASE WAP-WAPMESSAGE-0607 + +// --------------------------------------------------------------------------------- +// TEST(8) API low/high in parameter +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0608 +//! @SYMTestCaseID WAP-WAPMESSAGE-0608 +//RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_8 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0608 + +// --------------------------------------------------------------------------------- +// TEST(9) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0609 +//! @SYMTestCaseID WAP-WAPMESSAGE-0609 +//RUN_TEST_STEP 100 WapStackSuite FullySpecWDP_9 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0609 + +PRINT GT167-WAP stack FULLY_SPECIFIED-WDP test finished + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/scripts/WapFullySpecWSP.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/scripts/WapFullySpecWSP.script Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,105 @@ +// Copyright (c) 2001-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP stack FullySpecWSP test script file +// +// + +PRINT GT167-WAP stack FULLY-SPECIFIED-WSP test + +LOAD_SUITE WapStackSuite + +// --------------------------------------------------------------------------------- +// TEST(1) Load implementation +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0701 +//! @SYMTestCaseID WAP-WAPMESSAGE-0701 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_1 z:\testdata\configs\WapStackSuite.ini COMMON +END_TESTCASE WAP-WAPMESSAGE-0701 + +// --------------------------------------------------------------------------------- +// TEST(2) Connect using different bearers (tests 1.7, 1.8, 1.9, 1.10 must fail) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0702 +//! @SYMTestCaseID WAP-WAPMESSAGE-0702 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.1 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.2 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.3 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.4 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.5 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.7 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.8 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.9 +// Reconnect +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_2 z:\testdata\configs\WapStackSuite.ini Test_2.10 +END_TESTCASE WAP-WAPMESSAGE-0702 + +// --------------------------------------------------------------------------------- +// TEST(3) Unconnected +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0703 +//! @SYMTestCaseID WAP-WAPMESSAGE-0703 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_3 z:\testdata\configs\WapStackSuite.ini Test_3 +END_TESTCASE WAP-WAPMESSAGE-0703 + +// --------------------------------------------------------------------------------- +// TEST(4) Normal condition/Multiple receive +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0704 +//! @SYMTestCaseID WAP-WAPMESSAGE-0704 +//RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_4 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0704 + +// --------------------------------------------------------------------------------- +// TEST(5) Cancel +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0705 +//! @SYMTestCaseID WAP-WAPMESSAGE-0705 +//RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_5 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0705 + +// --------------------------------------------------------------------------------- +// TEST(6) Timeout +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0706 +//! @SYMTestCaseID WAP-WAPMESSAGE-0706 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_6 z:\testdata\configs\WapStackSuite.ini Test_6.1 +END_TESTCASE WAP-WAPMESSAGE-0706 + +// --------------------------------------------------------------------------------- +// TEST(7) Wrong sequence +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0707 +//! @SYMTestCaseID WAP-WAPMESSAGE-0707 +RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_7 z:\testdata\configs\WapStackSuite.ini Test_7.1 +END_TESTCASE WAP-WAPMESSAGE-0707 + +// --------------------------------------------------------------------------------- +// TEST(8) API low/high in parameter +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0708 +//! @SYMTestCaseID WAP-WAPMESSAGE-0708 +//RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_8 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0708 + +// --------------------------------------------------------------------------------- +// TEST(9) +// --------------------------------------------------------------------------------- +START_TESTCASE WAP-WAPMESSAGE-0709 +//! @SYMTestCaseID WAP-WAPMESSAGE-0709 +//RUN_TEST_STEP 100 WapStackSuite FullySpecWSP_9 z:\testdata\configs\WapStackSuite.ini +END_TESTCASE WAP-WAPMESSAGE-0709 + +PRINT GT167-WAP stack FULLY-SPECIFIED-WSP test finished + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapBoundCLPushSteps.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapBoundCLPushSteps.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,917 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// CBoundCLPushStep_xyz derived implementations +// +// + +/** + @file + @internalComponent +*/ + +#include "WapBoundCLPushSteps.h" +#include "WapStackSuiteDefs.h" +#include +#include +#include + + +CBoundCLPushStepBase::CBoundCLPushStepBase() +/** +* Constructor +*/ + { + } + +CBoundCLPushStepBase::~CBoundCLPushStepBase() +/** +* Destructor +*/ + { + if(iImp) + { + UnloadInterface(); + } + } + +// Load CWapBoundCLPushService Interface +CWapBoundCLPushService* CBoundCLPushStepBase::LoadInterface() + { + TInt trapValue; + CWapBoundCLPushService* implementation = NULL; + // UID {0x101FBB39} - SWS implementation + TUid KInterfaceUid = {0x101FBB39}; + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid); + TRAP(trapValue, implementation = CWapBoundCLPushService::NewL(KInterfaceUid)); + if(!trapValue) + { + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation); + return implementation; + } + else return NULL; + } + +void CBoundCLPushStepBase::UnloadInterface() + { + INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp); + delete iImp; + iImp = NULL; + REComSession::FinalClose(); + } + +CBoundCLPushStep_1::~CBoundCLPushStep_1() +/** +* Destructor +*/ + { + } + +CBoundCLPushStep_1::CBoundCLPushStep_1() +/** +* Constructor +*/ + { + } + +TVerdict CBoundCLPushStep_1::doTestStepL() +/** +* @return - TVerdict code +* Override of base class pure virtual +* Our implementation only gets called if the base class doTestStepPreambleL() did +* not leave. That being the case, the current test result value will be EPass. +*/ + { + // + // CWapBoundCLPushService + // + INFO_PRINTF1(_L("CreateImplementation - CWapBoundCLPushService")); + INFO_PRINTF1(_L("Calling old NewL() method")); + + TInt trapValue; + + SetTestStepResult(EFail); + TRAP(trapValue, iImp = CWapBoundCLPushService::NewL()); + if(!trapValue) + { + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp); + UnloadInterface(); + iImp = LoadInterface(); + if(iImp) + { + INFO_PRINTF1(_L("CreateImplementation - OK")); + SetTestStepResult(EPass); + UnloadInterface(); + } + } + return TestStepResult(); + } + +CBoundCLPushStep_2::CBoundCLPushStep_2() +/** +* Constructor +*/ + { + } + +CBoundCLPushStep_2::~CBoundCLPushStep_2() +/** +* Destructor +*/ + { + } + +TVerdict CBoundCLPushStep_2::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("BOUNDCL-PUSH: Testing Connect")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer, port; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect= EFalse; + SetLastError(KErrNone); + TBool delay = EFalse; + + if(GetIntFromConfig(ConfigSection(), KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(), KWapLocalPort, port)) iLocalPort = (Wap::TPort)port; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + if(GetBoolFromConfig(ConfigSection(),KWapDelayPortClosure, delay)) iDelayPortClosure = delay; + + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + } + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CBoundCLPushStep_2::CallStateMachine() + { + TInt err = KErrNone; + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iBearer, (Wap::TPort)iLocalPort, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + if(iReconnect) + { + INFO_PRINTF1(_L("Second connect")); + iControl->ReStart(); + break; + } + } + SetState(EFinish); + SetLastError(err); + iControl->ReStart(); + break; + + case EFinish: + // it's necessary to delay port closure, let the other concurrent test step + // can fail opening the same port with expected error EPortAlreadyBound (-5498) + if (iDelayPortClosure) + User::After(5000000); + + INFO_PRINTF1(_L("EFinish")); + if(GetLastError() == GetExpectedError()) + SetTestStepResult(EPass); + else + SetTestStepResult(EFail); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return (0); + } + +CBoundCLPushStep_3::CBoundCLPushStep_3() +/** +* Constructor +*/ + { + } + +CBoundCLPushStep_3::~CBoundCLPushStep_3() +/** +* Destructor +*/ + { + } + +TVerdict CBoundCLPushStep_3::doTestStepL() +/* +* Test the BoundCLPush APIs in unconnected state. +*/ + { + INFO_PRINTF1(_L("BoundCLPush. Requests without connection")); + // check preamble result + TVerdict verdict = TestStepResult(); + if (verdict==EPass) + { + TInt err, ret; + iImp = LoadInterface(); + if (!iImp) + { + ERR_PRINTF1(_L("Unable to load BoundCLPush Interface")); + verdict = EFail; + } + else + { + GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError); + ShowConnectionInfo(); + TRequestStatus reqStatus; + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, reqStatus); + TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("AwaitPush Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + Wap::TPort port; + err=iImp->GetLocalPort(port); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + HBufC8* localHost; + err=iImp->GetLocalAddress(localHost); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + err=iImp->GetBearer(iBearer); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetBearer Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + HBufC8* host; + err=iImp->GetServerAddress(host); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetServerAddress Fails not as expected"))) + if (ret) + verdict = EFail; + } + } + } + } + UnloadInterface(); + } + } + if (verdict==EPass) + { + INFO_PRINTF1(_L("BoundCLPush. Requests Fail as expected")); + } + SetTestStepResult(verdict); + return TestStepResult(); + } + +TInt CBoundCLPushStep_3::CallStateMachine() + { + return (0); + } + + +CBoundCLPushStep_4::CBoundCLPushStep_4() +/** +* Constructor +*/ + { + } + +CBoundCLPushStep_4::~CBoundCLPushStep_4() +/** +* Destructor +*/ + { + } + +TVerdict CBoundCLPushStep_4::doTestStepL() +/** +* Test receiving PDU data over UDP +* The test is run concurently with CBoundCLPushStep_9 test. CBoundCLPushStep_4 waits for push message whilst +* CBoundCLPushStep_9 sends a push message over UDP using loopback. +* The test pair is used to test two cases (dependent on configuration read for CBoundCLPushStep_9): +* - sending PDU data that is smaller than the allocated buffer on the receiving side (<=1024) +* - sending PDU data that is larger than the allocated buffer on the receiving side and needs reallocation (>1024) +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("BOUND-CLPUSH: Connect-AwaitPush")); + INFO_PRINTF1(_L("Receiving PDU over UDP from a concurrent test... ")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + + TInt bearer, port; + TInt error = KErrNone; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + GetBoolFromConfig(ConfigSection(), KMiddleCancel, iMiddleCancel); + GetBoolFromConfig(ConfigSection(), KMultiReadCancel, iMultiReadCancel); + TInt headerLength, bufLength; + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength)) + { + iHeaderRecvBufLength=static_cast(headerLength); + } + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength)) + { + iBodyRecvBufLength=static_cast(bufLength); + } + iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength); + iRecvBody = HBufC8::NewL(iBodyRecvBufLength); + + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + + + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(),KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + } + + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + + StartScheduler(); + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CBoundCLPushStep_4::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iBearer, iLocalPort, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + if(iBearer != Wap::EIP) + { + TRAP(err, WaitForInitializeL()); + } + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvBodyBuf.Set(iRecvBody->Des()); + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus); + INFO_PRINTF1(_L("Start AwaitingPush.....")); + activate = 1; + if (!iMiddleCancel) + { + SetState(EAwaitPush); + } + else + { + INFO_PRINTF1(_L("Cancel AwaitPush")); + iImp->CancelAwaitPush(); + SetState(EFinish); + } + } + else + { + SetState(EFinish); + iControl->ReStart(); + } + SetLastError(err); + break; + + case EAwaitPush: + + INFO_PRINTF1(_L("EAwaitPush")); + if(iStatus->Int() != KErrNone && iStatus->Int()!=Wap::EMoreData) + // AwaitPush failed + { + INFO_PRINTF1(_L("AwaitPush failed")); + SetLastError(iStatus->Int()); + SetState(EFinish); + iControl->ReStart(); + } + else + { + iMaxWspHeaderRecvBuffer.Append(iRecvHeadersBuf); + iMaxWspDataRecvBuffer.Append(iRecvBodyBuf); + if (iStatus->Int()==Wap::EMoreData) + { + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus); + activate = 1; + if (!iMultiReadCancel) + { + SetState(EAwaitPush); + } + else + { + INFO_PRINTF1(_L("Cancel Receive in EMutipleReceive state")); + iImp->CancelAwaitPush(); + SetState(EFinish); + } + } + else + { + SetLastError(iStatus->Int()); + iControl->ReStart(); + SetState(EFinish); + } + } + break; + + case EFinish: + + INFO_PRINTF1(_L("EFinish")); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + if (verdict==EPass && !iMiddleCancel && !iMultiReadCancel) + { + iImp->CancelAwaitPush(); + INFO_PRINTF1(_L("Headers:")); + DumpBuf(iMaxWspHeaderRecvBuffer); + INFO_PRINTF1(_L("Body")); + DumpBuf(iMaxWspDataRecvBuffer); + if (verdict==EPass) + { + HBufC8* buf; + iImp->GetServerAddress(buf); + verdict = (buf->Match(iRemoteHost)!=KErrNotFound)?EPass:EFail; + delete buf; + } + if (verdict==EPass) + { + Wap::TPort port; + iImp->GetLocalPort(port); + verdict = (port == iLocalPort)?EPass:EFail; + } + if (verdict==EPass) + { + Wap::TBearer bearer; + iImp->GetBearer(bearer); + verdict = (bearer == iBearer)?EPass:EFail; + } + if (verdict==EPass) + { + //This test can not perform. + HBufC8* buf; + iImp->GetLocalAddress(buf); + delete buf; + } + } + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + + break; + } + return (activate); +} + +CBoundCLPushStep_5::CBoundCLPushStep_5() +/** +* Constructor +*/ + { + } + +CBoundCLPushStep_5::~CBoundCLPushStep_5() +/** +* Destructor +*/ + { + } + +TVerdict CBoundCLPushStep_5::doTestStepL() +/** +* Test Cancel +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("BOUNDCL-PUSH: Testing Cancel")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer, port; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect= EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + + ShowConnectionInfo(); + error = iImp->Connect(iBearer, iLocalPort, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), error); + if( error == KErrNone) + { + TBuf8<100> header, body; + TPckgBuf pushIdPckg; + TRequestStatus reqStatus; + iImp->AwaitPush(header, body, pushIdPckg, reqStatus); + SetState(EAwaitPush); + StartScheduler(); + iControl->ReStart(); + if(reqStatus==KErrCancel) + { + SetTestStepResult(EPass); + } + } + + } + } + return TestStepResult(); + } + +TInt CBoundCLPushStep_5::CallStateMachine() + { + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EAwaitPush: + INFO_PRINTF1(_L("EAwaitPush")); + iImp->CancelAwaitPush(); + SetState(EFinish); + iControl->ReStart(); + break; + case EFinish: + INFO_PRINTF1(_L("EFinish")); + SetState(EIdle); + StopScheduler(); + break; + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return (0); + } + + +CBoundCLPushStep_6::CBoundCLPushStep_6() + { + } +CBoundCLPushStep_6::~CBoundCLPushStep_6() + { + } +TVerdict CBoundCLPushStep_6::doTestStepL() + { + return TestStepResult(); + } +TInt CBoundCLPushStep_6::CallStateMachine() + { + return (0); + } + +CBoundCLPushStep_7::CBoundCLPushStep_7() + { + } +CBoundCLPushStep_7::~CBoundCLPushStep_7() + { + } +TVerdict CBoundCLPushStep_7::doTestStepL() + { + INFO_PRINTF1(_L("BOUND-CLPUSH: Connect-AwaitPush-AwaitPush")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + + TInt bearer, port; + TInt error = KErrNone; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + TInt headerLength, bufLength; + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength)) + { + iHeaderRecvBufLength=static_cast(headerLength); + } + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength)) + { + iBodyRecvBufLength=static_cast(bufLength); + } + iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength); + iRecvBody = HBufC8::NewL(iBodyRecvBufLength); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + + StartScheduler(); + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + UnloadInterface(); + } + } + return TestStepResult(); + } +TInt CBoundCLPushStep_7::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iBearer, iLocalPort, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvBodyBuf.Set(iRecvBody->Des()); + TRequestStatus reqStatus; + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, reqStatus); + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus); + INFO_PRINTF1(_L("AwaitPush")); + activate = 1; + } + else + { + iControl->ReStart(); + } + SetLastError(err); + SetState(EFinish); + break; + + case EFinish: + + INFO_PRINTF1(_L("EFinish")); + iImp->CancelAwaitPush(); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state [%d]"), State()); + SetTestStepResult(verdict); + StopScheduler(); + break; + } + return (activate); + } + +CBoundCLPushStep_8::CBoundCLPushStep_8() + { + } +CBoundCLPushStep_8::~CBoundCLPushStep_8() + { + } +TVerdict CBoundCLPushStep_8::doTestStepL() +/** +* @return - TVerdict code +* Wrong parameter values for Bound CL Push API: +* - Wrong TUid on construction +* - Connect to wrong bearer (already implemented in test 2) +*/ + { + INFO_PRINTF1(_L("CreateImplementation with wrong Uid- CWapBoundCLPushService")); + if(TestStepResult() == EPass ) + { + TInt error; + if(GetIntFromConfig(ConfigSection(),KWapExError2, error)) + { + iExError2=error; + } + TInt trapValue; + + TUid invalidInterfaceUid = {0x00000000}; + + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid); + TRAP(trapValue, iImp = CWapBoundCLPushService::NewL(invalidInterfaceUid)); + TVerdict verdict = (trapValue == iExError2)?EPass:EFail; + if (verdict==EPass) + { + INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue); + } + SetTestStepResult(verdict); + } + return TestStepResult(); + } +TInt CBoundCLPushStep_8::CallStateMachine() + { + return (0); + } + +CBoundCLPushStep_9::CBoundCLPushStep_9() + { + } +CBoundCLPushStep_9::~CBoundCLPushStep_9() + { + } +TVerdict CBoundCLPushStep_9::doTestStepL() +/** +* Test sending PDU data over UDP +* Test should be run concurently with CBoundCLPushStep_4 test. CBoundCLPushStep_4 waits for push message whilst +* CBoundCLPushStep_9 sends a push message over UDP using loopback. +* The test pair is used to test two cases (dependent on configuration read for CBoundCLPushStep_9): +* - sending PDU data that is smaller than the allocated buffer on the receiving side (<=1024) +* - sending PDU data that is larger than the allocated buffer on the receiving side and needs reallocation (>1024) +* @return - TVerdict code +*/ + { + INFO_PRINTF1(_L("BOUND-CLPUSH: Sending Push Message")); + + if(TestStepResult() == EPass ) + { + User::After(20000000); + SetTestStepResult(EFail); + SetLastError(KErrNone); + TInt error = KErrNone; + /** + Getting information from config file + Local port + Remote port + Local address + Remote address + Size of data to be sent + */ + GetIntFromConfig(ConfigSection(),KLocalPort, iLclPort); + GetIntFromConfig(ConfigSection(),KRemotePort, iRmtPort); + TPtrC temp; + if(GetStringFromConfig(ConfigSection(),KWapLocalHost, temp)) + { + error = iLocalAddr.Input(temp); + if(error) + { + User::Leave(error); + } + } + if(GetStringFromConfig(ConfigSection(),KWapRemoteHost, temp )) + { + error = iRemoteAddr.Input(temp); + if(error) + { + User::Leave(error); + } + } +// error = GetStringFromConfig(ConfigSection(),KWapData, temp); + + RFs fS; + RFile file; + User::LeaveIfError(fS.Connect()); + _LIT(KPduFilename,"z:\\testdata\\configs\\pushpdu.bin"); + _LIT(KPDUDataSize,"Data_Size"); + + User::LeaveIfError(file.Open(fS, KPduFilename , EFileStream | EFileRead)); + /* Read PDU from the file */ + + TInt dataSize(1024); + GetIntFromConfig(ConfigSection(),KPDUDataSize, dataSize); + iSendBuffPtr = HBufC8::NewL(dataSize); + TPtr8 tmpbuf = iSendBuffPtr->Des(); + User::LeaveIfError(file.Read(tmpbuf)); + + file.Close(); + fS.Close(); + /** + Settings + */ + iLocalAddr.SetPort(iLclPort); + iRemoteAddr.SetPort(iRmtPort); +// iSendBuffPtr = HBufC8::NewL(temp.Length()); +// TPtr8 tmp = iSendBuffPtr->Des(); +// tmp.Copy(temp); + INFO_PRINTF2(_L("Sending PDU of size %d over UDP to a concurrent test... "), dataSize); + /** + socket server + */ + RSocketServ socketServer; + User::LeaveIfError(socketServer.Connect()); + CleanupClosePushL(socketServer); + RSocket sock; + User::LeaveIfError(sock.Open(socketServer, KAfInet, KSockDatagram, KProtocolInetUdp)); + CleanupClosePushL(sock); + TRequestStatus status; + sock.SendTo(iSendBuffPtr->Des(),iRemoteAddr , 0, status); + User::WaitForRequest(status); + INFO_PRINTF2(_L("Send Push Message - status = %d"), status.Int()); + User::LeaveIfError(status.Int()); + sock.Close(); + socketServer.Close(); + CleanupStack::PopAndDestroy(&sock); + CleanupStack::Pop(&socketServer); + TVerdict verdict = (status.Int() == KErrNone)?EPass:EFail; + SetTestStepResult(verdict); + } + return TestStepResult(); + } +TInt CBoundCLPushStep_9::CallStateMachine() + { + return (0); + } + + + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapBoundCLPushSteps.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapBoundCLPushSteps.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,143 @@ +/** +* Copyright (c) 2002-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/** + @file WapBoundCLPushSteps.h +*/ +#if (!defined __BOUNDCLPUSH_STEP_H__) +#define __BOUNDCLPUSH_STEP_H__ +#include +#include +#include +#include +#include "WapStackSuiteStepBase.h" + +_LIT(KBoundCLPushStep_1,"BoundCLPush_1"); +_LIT(KBoundCLPushStep_2,"BoundCLPush_2"); +_LIT(KBoundCLPushStep_3,"BoundCLPush_3"); +_LIT(KBoundCLPushStep_4,"BoundCLPush_4"); +_LIT(KBoundCLPushStep_5,"BoundCLPush_5"); +_LIT(KBoundCLPushStep_6,"BoundCLPush_6"); +_LIT(KBoundCLPushStep_7,"BoundCLPush_7"); +_LIT(KBoundCLPushStep_8,"BoundCLPush_8"); +_LIT(KBoundCLPushStep_9,"BoundCLPush_9"); + + +class CBoundCLPushStepBase : public CWapStackSuiteStepBase +{ +public: + CBoundCLPushStepBase(); + ~CBoundCLPushStepBase(); + CWapBoundCLPushService* LoadInterface(); + void UnloadInterface(); +protected: + CWapBoundCLPushService* iImp; +}; + +class CBoundCLPushStep_1 : public CBoundCLPushStepBase + { +public: + CBoundCLPushStep_1(); + ~CBoundCLPushStep_1(); + virtual TVerdict doTestStepL(); +private: + }; + +class CBoundCLPushStep_2 : public CBoundCLPushStepBase + { +public: + CBoundCLPushStep_2(); + ~CBoundCLPushStep_2(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundCLPushStep_3 : public CBoundCLPushStepBase + { +public: + CBoundCLPushStep_3(); + ~CBoundCLPushStep_3(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundCLPushStep_4 : public CBoundCLPushStepBase + { +public: + CBoundCLPushStep_4(); + ~CBoundCLPushStep_4(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundCLPushStep_5 : public CBoundCLPushStepBase + { +public: + CBoundCLPushStep_5(); + ~CBoundCLPushStep_5(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundCLPushStep_6 : public CBoundCLPushStepBase + { +public: + CBoundCLPushStep_6(); + ~CBoundCLPushStep_6(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundCLPushStep_7 : public CBoundCLPushStepBase + { +public: + CBoundCLPushStep_7(); + ~CBoundCLPushStep_7(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundCLPushStep_8 : public CBoundCLPushStepBase + { +public: + CBoundCLPushStep_8(); + ~CBoundCLPushStep_8(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundCLPushStep_9 : public CBoundCLPushStepBase + { +public: + CBoundCLPushStep_9(); + ~CBoundCLPushStep_9(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapBoundWDPSteps.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapBoundWDPSteps.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,1014 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// CStepOne derived implementation +// +// + +/** + @file + @internalComponent +*/ + +#include +#include + +#include "WapBoundWDPSteps.h" +#include "WapStackSuiteDefs.h" +#include +#include +#include +#include +#include + +CBoundWDPStepBase::CBoundWDPStepBase() +/** +* Constructor +*/ + { + } + +CBoundWDPStepBase::~CBoundWDPStepBase() +/** +* Destructor +*/ + { + if(iImp) + { + UnloadInterface(); + } + } + +// Load CWapBoundDatagramService Interface +CWapBoundDatagramService* CBoundWDPStepBase::LoadInterface() + { + TInt trapValue; + CWapBoundDatagramService* implementation = NULL; + // UID {0x101FBB37} - SWS implementation + TUid KInterfaceUid = {0x101FBB37}; + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid); + TRAP(trapValue, implementation = CWapBoundDatagramService::NewL(KInterfaceUid)); + if(!trapValue) + { + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation); + return implementation; + } + else return NULL; + } + +void CBoundWDPStepBase::UnloadInterface() + { + INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp); + delete iImp; + iImp = NULL; + REComSession::FinalClose(); + } + +CBoundWDPStep_1::CBoundWDPStep_1() +/** +* Constructor +*/ + { + } + +CBoundWDPStep_1::~CBoundWDPStep_1() +/** +* Destructor +*/ + { + } + +TVerdict CBoundWDPStep_1::doTestStepL() +/** +* Load and destroy BoundDatagtamService interface implementation +* Two different methods are used NewL() and NewL(TUid InterfaceUid) +* @return - TVerdict code +*/ + { + // CWapBoundDatagramService + INFO_PRINTF1(_L("CreateImplementation - CWapBoundDatagramService")); + INFO_PRINTF1(_L("Calling old NewL() method")); + + SetTestStepResult(EFail); + + TInt trapValue(0); + TRAP(trapValue, iImp = CWapBoundDatagramService::NewL()); + if(!trapValue) + { + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp); + UnloadInterface(); + iImp = LoadInterface(); + if(iImp) + { + INFO_PRINTF1(_L("CreateImplementation - OK")); + SetTestStepResult(EPass); + UnloadInterface(); + } + } + return TestStepResult(); + } + +CBoundWDPStep_2::CBoundWDPStep_2() +/** +* Constructor +*/ + { + } + +CBoundWDPStep_2::~CBoundWDPStep_2() +/** +* Destructor +*/ + { + } + +TVerdict CBoundWDPStep_2::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("BOUND-WDP: Connect")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer, port; + TInt error = KErrNone; + TBool reconnect = EFalse; + TBool delay = EFalse; + + SetLastError(KErrNone); + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port; + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(),KWapReconnect, reconnect)) iReconnect = reconnect; + if(GetBoolFromConfig(ConfigSection(),KWapDelayPortClosure, delay)) iDelayPortClosure = delay; + + TInt checkValue = 0; + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + // double check that base did set it since this is the first place we try setting it in the harness + RProperty::Get(KUidPSSimTsyCategory, KPSSimTsyTestNumber, checkValue); + __ASSERT_ALWAYS(checkValue == iSimTsyState,User::Panic(KWapStackSuitePanic, EDataCorrupt)); + } + + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + // double check + RProperty::Get(KUidSystemCategory, KUidPhonePwr.iUid, checkValue); + __ASSERT_ALWAYS(checkValue == ESAPhoneOn,User::Panic(KWapStackSuitePanic, EDataCorrupt)); + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + // Start state machine + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CBoundWDPStep_2::CallStateMachine() + { + TInt err = KErrNone; + INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iBearer, iLocalPort); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + if(iReconnect) + { + INFO_PRINTF1(_L("Second connect")); + iControl->ReStart(); + break; + } + } + SetState(EFinish); + SetLastError(err); + iControl->ReStart(); + break; + + case EFinish: + // it's necessary to delay port closure, let the other concurrent test step + // can fail opening the same port with expected error EPortAlreadyBound (-5498) + if (iDelayPortClosure) + User::After(5000000); + + INFO_PRINTF1(_L("EFinish")); + if(GetLastError() == GetExpectedError()) SetTestStepResult(EPass); + else SetTestStepResult(EFail); + SetState(EIdle); + // End of state machine + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: bad state EIdle or unknown [%d]"), State()); + SetTestStepResult(EFail); + // End of state machine + StopScheduler(); + break; + } + return (0); + } + + +CBoundWDPStep_3::CBoundWDPStep_3() +/** +* Constructor +*/ + { + } + +CBoundWDPStep_3::~CBoundWDPStep_3() +/** +* Destructor +*/ + { + } + +TVerdict CBoundWDPStep_3::doTestStepL() +/* +* Test the CBoundWDP APIs in unconnected state. +*/ + { + INFO_PRINTF1(_L("BoundWDP. Requests without connection")); + // check preamble result + TVerdict verdict = TestStepResult(); + if (verdict==EPass) + { + TInt err, ret; + iImp = LoadInterface(); + if (!iImp) + { + ERR_PRINTF1(_L("Unable to load BoundWDP Interface")); + verdict = EFail; + } + else + { + GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError); + ShowConnectionInfo(); + TBuf8<100> buf; + err = iImp->SendTo(iRemoteHost, iRemotePort, buf, iBearer); + TRAP(ret, TEST_CHECKL(err, iExError, _L("SendTo Fails not as expected"))) + if (ret) + { + verdict = EFail; + } + else + { + TPckg aDataSizePckg(0); + TRequestStatus reqStatus; + iImp->AwaitRecvDataSize(aDataSizePckg, reqStatus); + User::WaitForRequest(reqStatus); + TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("AwaitRecvDataSize Fails not as expected"))) + if (ret) + { + verdict = EFail; + } + else + { + TBuf8<100> buf; + TBool truncated; + TUint32 timeout=0; + iImp->RecvFrom(iRecvRemoteHost, iRecvRemotePort, buf, truncated, reqStatus, timeout); + User::WaitForRequest(reqStatus); + TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("RecvFrom Fails not as expected"))) + if (ret) + { + verdict = EFail; + } + else + { + Wap::TPort aPort; + err=iImp->GetLocalPort(aPort); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected"))) + if (ret) + { + verdict = EFail; + } + else + { + HBufC8* localHost; + err=iImp->GetLocalAddress(localHost); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected"))) + if (ret) + { + verdict = EFail; + } + else + { + TUint16 maxSize, nominalSize; + err=iImp->GetDatagramSizes(maxSize, nominalSize); + if (err) + { + verdict = EFail; + } + else + { + err=iImp->GetBearer(iBearer); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetBearer Fails not as expected"))) + if (ret) + { + verdict = EFail; + } + } + } + } + } + } + } + UnloadInterface(); + } + } + if (verdict==EPass) + { + INFO_PRINTF1(_L("BoundWDP. Requests Fail as expected")); + } + SetTestStepResult(verdict); + return TestStepResult(); + } + +TInt CBoundWDPStep_3::CallStateMachine() + { + return (0); + } + + +CBoundWDPStep_4::CBoundWDPStep_4() +/** +* Constructor +*/ + { + } + +CBoundWDPStep_4::~CBoundWDPStep_4() +/** +* Destructor +*/ + { + } + +TVerdict CBoundWDPStep_4::doTestStepL() +/** +*/ + { + INFO_PRINTF1(_L("BOUND-WDP: Connect-Send-Await-Receive")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + + TInt bearer, port, bufLen; + TInt error = KErrNone; + TPtrC data, remote_host; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetStringFromConfig(ConfigSection(), KWapRemoteHost, remote_host)) + { + iRemoteHost.Copy(remote_host); + } + if(GetIntFromConfig(ConfigSection(),KWapRemotePort, port)) + { + iRemotePort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + GetIntFromConfig(ConfigSection(), KWapExError2, iExError2); + GetBoolFromConfig(ConfigSection(), KAwaitLengthCancel, iAwaitLengthCancel); + GetBoolFromConfig(ConfigSection(), KMiddleCancel, iMiddleCancel); + GetBoolFromConfig(ConfigSection(), KMultiReadCancel, iMultiReadCancel); + GetBoolFromConfig(ConfigSection(), KAwaitLengthTwice, iAwaitLengthTwice); + if(GetIntFromConfig(ConfigSection(),KWapWdpBufLength, bufLen)) + { + iWdpRecvBufLength=static_cast(bufLen); + iRecvBuffPtr = HBufC8::NewL(iWdpRecvBufLength); + } + error = GetStringFromConfig(ConfigSection(),KWapData, data); + if(!error) + { + User::Leave(error); + } + iSendBuffPtr = HBufC8::NewL(data.Length()); + TPtr8 tmp = iSendBuffPtr->Des(); + tmp.Copy(data); + + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + } + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + // Start state machine + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CBoundWDPStep_4::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iBearer, iLocalPort); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + if(iBearer != Wap::EIP) + { + TRAP(err, WaitForInitializeL()); + } + if(iSendBuffPtr->Length()) + { + INFO_PRINTF1(_L("Data to send")); + DumpBuf(iSendBuffPtr->Des()); + } + err = iImp->SendTo(iRemoteHost, iRemotePort, iSendBuffPtr->Des(), iBearer); + INFO_PRINTF2(_L("SendTo completed with code = %d"), err); + if(err == KErrNone) + { + SetState(EAwaitSize); + } + else + { + SetState(EFinish); + } + } + else + { + SetState(EFinish); + } + SetLastError(err); + iControl->ReStart(); + break; + + case EAwaitSize: + INFO_PRINTF1(_L("EAwaitSize")); + iImp->AwaitRecvDataSize(iLength, *iStatus); + activate = 1; + if (!iAwaitLengthCancel) + { + SetState(EReceive); + } + else + { + INFO_PRINTF1(_L("Cancel Receive in AwaitSize state")); + iImp->CancelRecv(); + SetState(EFinish); + } + break; + + case EReceive: + INFO_PRINTF1(_L("EReceive")); + if(iStatus->Int()!=KErrNone) + // AwaitSize failed + { + INFO_PRINTF1(_L("AwaitSize failed")); + SetLastError(iStatus->Int()); + iControl->ReStart(); + SetState(EFinish); + } + else + { + INFO_PRINTF2(_L("AwaitSize returned - %d"),iLength()); + if (!iAwaitLengthTwice) + { + if (iRecvBuffPtr==NULL) + { + TInt len=iLength(); + TRAP(err, iRecvBuffPtr = HBufC8::NewL(len)) + if (err!=KErrNone) + { + SetLastError(err); + iControl->ReStart(); + SetState(EFinish); + break; + } + } + iRecvBuf.Set(iRecvBuffPtr->Des()); + iImp->RecvFrom(iRecvRemoteHost, iRecvRemotePort, iRecvBuf, iTruncated, *iStatus, 0); + activate = 1; + if (!iMiddleCancel) + { + SetState(EMutipleReceive); + } + else + { + INFO_PRINTF1(_L("Cancel Receive in Receive state")); + iImp->CancelRecv(); + SetState(EFinish); + } + } + else + { + iImp->AwaitRecvDataSize(iLength, *iStatus); + activate = 1; + SetState(EFinish); + } + } + break; + + case EMutipleReceive: + INFO_PRINTF1(_L("EMultipleReceive")); + if (iStatus->Int()!=KErrNone && iStatus->Int()!=Wap::EMoreData) + { + INFO_PRINTF1(_L("Receive failed")); + SetLastError(iStatus->Int()); + iControl->ReStart(); + SetState(EFinish); + } + else + { + iMaxWdpRecvBuffer.Append(iRecvBuf); + if (iTruncated) + { + iImp->RecvFrom(iRecvRemoteHost, iRecvRemotePort, iRecvBuf, iTruncated, *iStatus, 0); + activate = 1; + if (!iMultiReadCancel) + { + SetState(EMutipleReceive); + } + else + { + INFO_PRINTF1(_L("Cancel Receive in EMutipleReceive state")); + iImp->CancelRecv(); + SetState(EFinish); + } + } + else + { + SetLastError(iStatus->Int()); + iControl->ReStart(); + SetState(EFinish); + } + } + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + if(iMaxWdpRecvBuffer.Length()) + { + INFO_PRINTF1(_L("Data received:")); + DumpBuf(iMaxWdpRecvBuffer); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + if (verdict==EPass && !iMiddleCancel && !iMultiReadCancel && !iAwaitLengthCancel && !iAwaitLengthTwice) + { + iImp->CancelRecv(); + if (verdict==EPass) + { + verdict = (iSendBuffPtr->Match(iMaxWdpRecvBuffer)!=KErrNotFound)?EPass:EFail; + } + if (verdict==EPass) + { + verdict = (iRemoteHost.Match(iRecvRemoteHost)!=KErrNotFound)?EPass:EFail; + } + if (verdict==EPass) + { + Wap::TPort port; + iImp->GetLocalPort(port); + verdict = (port == iLocalPort)?EPass:EFail; + } + if (verdict==EPass) + { + Wap::TBearer bearer; + iImp->GetBearer(bearer); + verdict = (bearer == iBearer)?EPass:EFail; + } + if (verdict==EPass) + { + //This test can not perform in SIMTSY. + HBufC8* buf; + iImp->GetLocalAddress(buf); + delete buf; + } + } + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF1(_L("EIdle or unknown")); + INFO_PRINTF2(_L("Error: bad state %d, State = %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + + break; + } + return (activate); + } + +CBoundWDPStep_5::CBoundWDPStep_5() +/** +* Constructor +*/ + { + } + +CBoundWDPStep_5::~CBoundWDPStep_5() +/** +* Destructor +*/ + { + } + +TVerdict CBoundWDPStep_5::doTestStepL() +/** +* Test Cancel +*/ + { + INFO_PRINTF1(_L("BOUND-WDP: Testing Cancel")); + + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer, port; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect= EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + + error = iImp->Connect(iBearer, (Wap::TPort)iLocalPort, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), error); + if( error == KErrNone) + { + TPckg aDataSizePckg(0); + TRequestStatus reqStatus; + iImp->AwaitRecvDataSize(aDataSizePckg, reqStatus); + SetState(EAwaitSize); + ShowConnectionInfo(); + + StartScheduler(); + iControl->ReStart(); + if(reqStatus==KErrCancel) + { + SetTestStepResult(EPass); + } + } + } + } + return TestStepResult(); + } + +TInt CBoundWDPStep_5::CallStateMachine() + { + + INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State()); + switch(iState) + { + case EAwaitSize: + INFO_PRINTF1(_L("EAwaitSize")); + iImp->CancelRecv(); + SetState(EFinish); + iControl->ReStart(); + break; + case EFinish: + INFO_PRINTF1(_L("EFinish")); + SetState(EIdle); + StopScheduler(); + break; + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return 0; + } + +CBoundWDPStep_6::CBoundWDPStep_6() + { + } + +CBoundWDPStep_6::~CBoundWDPStep_6() + { + } + +TVerdict CBoundWDPStep_6::doTestStepL() +// +//Test the CBoundWDP APIs Time out. +// + { + //Not in use + return TestStepResult(); + } + +TInt CBoundWDPStep_6::CallStateMachine() + { + return (0); + } + +CBoundWDPStep_7::CBoundWDPStep_7() + { + } + +CBoundWDPStep_7::~CBoundWDPStep_7() + { + } + +TVerdict CBoundWDPStep_7::doTestStepL() +// +// Test wrong sequenece +// + { + INFO_PRINTF1(_L("BOUND-WDP: Connect-Receive-Await-Await")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + TInt bearer, port, bufLen; + TInt error = KErrNone; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + if(GetIntFromConfig(ConfigSection(),KWapWdpBufLength, bufLen)) + { + iWdpRecvBufLength=static_cast(bufLen); + } + iRecvBuffPtr = HBufC8::NewL(iWdpRecvBufLength); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + // Start state machine + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CBoundWDPStep_7::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iBearer, iLocalPort); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { +// WaitForInitializeL(); + if(iRecvBuffPtr == NULL) + { + err=KErrNoMemory; + } + else + { + iRecvBuf.Set(iRecvBuffPtr->Des()); + iImp->RecvFrom(iRecvRemoteHost, iRecvRemotePort, iRecvBuf, iTruncated, *iStatus, iTimeout); + SetState(EReceive); + activate = 1; + } + } + SetLastError(err); + if (err!=KErrNone) + { + SetState(EFinish); + iControl->ReStart(); + } + break; + + case EReceive: + INFO_PRINTF1(_L("EReceive")); + SetLastError(iStatus->Int()); + if(iStatus->Int() != KErrNone) + // Receiving fails as expect + { + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + if (verdict==EPass) + { + INFO_PRINTF1(_L("Receiving failed as expect")); + TRequestStatus reqStatus; + iImp->AwaitRecvDataSize(iLength, reqStatus); + iImp->AwaitRecvDataSize(iLength, *iStatus); + activate = 1; + SetState(EAwaitSize); + } + else + { + INFO_PRINTF1(_L("Receiving failed not as expect")); + iControl->ReStart(); + SetState(EFinish); + } + } + else + { + INFO_PRINTF1(_L("Receiving succeed not as expect")); + iControl->ReStart(); + SetState(EFinish); + } + break; + + case EAwaitSize: + INFO_PRINTF1(_L("EAwaitSize")); + SetLastError(iStatus->Int()); + iImp->CancelRecv(); + SetState(EFinish); + iControl->ReStart(); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF1(_L("EIdle or unknown")); + INFO_PRINTF2(_L("Error: bad state %d, State = %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + break; + } + return (activate); + } + +CBoundWDPStep_8::CBoundWDPStep_8() + { + } + +CBoundWDPStep_8::~CBoundWDPStep_8() + { + } + +TVerdict CBoundWDPStep_8::doTestStepL() +/* +* Using invalid values for API parameters: +* - Invalid TUid on construction +* - Setting invalid timeout for RecvFrom +* Note: wrong bearer value has already been implemented as part of test 2 +*/ + { + INFO_PRINTF1(_L("BOUND-WDP: Wrong parameter values")); + if(TestStepResult() == EPass ) + { + TInt error; + if(GetIntFromConfig(ConfigSection(),KWapExError2, error)) + { + iExError2=error; + } + TInt trapValue; + TUid invalidInterfaceUid = {0x00000000}; + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid); + TRAP(trapValue, iImp = CWapBoundDatagramService::NewL(invalidInterfaceUid)); + TVerdict verdict = (trapValue == iExError2)?EPass:EFail; + if (verdict==EPass) + { + INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue); + } + SetTestStepResult(verdict); + } + return TestStepResult(); + } + +TInt CBoundWDPStep_8::CallStateMachine() + { + return 0; + } + +CBoundWDPStep_9::CBoundWDPStep_9() + { + } + +CBoundWDPStep_9::~CBoundWDPStep_9() + { + } + +TVerdict CBoundWDPStep_9::doTestStepL() + { + return TestStepResult(); + } + +TInt CBoundWDPStep_9::CallStateMachine() + { + return 0; + } + +CBoundWDPStep_OutOfMemory::CBoundWDPStep_OutOfMemory() + { + } + +CBoundWDPStep_OutOfMemory::~CBoundWDPStep_OutOfMemory() + { + } + +TVerdict CBoundWDPStep_OutOfMemory::doTestStepL() + { + // to test fix for DEF117706: Memory leak in CWapBoundDatagramService::Connect under OOM + __UHEAP_MARK; + + for(TInt i=1;; i++) + { + __UHEAP_FAILNEXT(i); + + CWapBoundDatagramService* datServ = NULL; + TRAP_IGNORE(datServ = CWapBoundDatagramService::NewL()); + if(datServ) + { + datServ->Connect(Wap::EAll, 7576); + delete datServ; + } + REComSession::FinalClose(); + + TInt* marker = new TInt(0); + if (!marker) + { + break; + } + delete marker; + } + + __UHEAP_MARKEND; + return TestStepResult(); + } + +TInt CBoundWDPStep_OutOfMemory::CallStateMachine() + { + return 0; + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapBoundWDPSteps.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapBoundWDPSteps.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,150 @@ +/** +* Copyright (c) 2002-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/** + @file WapBoundWDPSteps.h +*/ +#if (!defined __BOUNDWDP_STEP_H__) +#define __BOUNDWDP_STEP_H__ +#include +#include +#include +#include +#include "WapStackSuiteStepBase.h" + +_LIT(KBoundWDPStep_1,"BoundWDP_1"); +_LIT(KBoundWDPStep_2,"BoundWDP_2"); +_LIT(KBoundWDPStep_3,"BoundWDP_3"); +_LIT(KBoundWDPStep_4,"BoundWDP_4"); +_LIT(KBoundWDPStep_5,"BoundWDP_5"); +_LIT(KBoundWDPStep_6,"BoundWDP_6"); +_LIT(KBoundWDPStep_7,"BoundWDP_7"); +_LIT(KBoundWDPStep_8,"BoundWDP_8"); +_LIT(KBoundWDPStep_9,"BoundWDP_9"); +_LIT(KBoundWDPStep_OutOfMemory,"BoundWDP_OutOfMemory"); + +class CBoundWDPStepBase : public CWapStackSuiteStepBase +{ +public: + CBoundWDPStepBase(); + ~CBoundWDPStepBase(); + CWapBoundDatagramService* LoadInterface(); + void UnloadInterface(); +protected: + CWapBoundDatagramService* iImp; +}; + + +class CBoundWDPStep_1 : public CBoundWDPStepBase + { +public: + CBoundWDPStep_1(); + ~CBoundWDPStep_1(); + virtual TVerdict doTestStepL(); +private: + }; + +class CBoundWDPStep_2 : public CBoundWDPStepBase + { +public: + CBoundWDPStep_2(); + ~CBoundWDPStep_2(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); + }; + +class CBoundWDPStep_3 : public CBoundWDPStepBase + { +public: + CBoundWDPStep_3(); + ~CBoundWDPStep_3(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +public: + }; + +class CBoundWDPStep_4 : public CBoundWDPStepBase + { +public: + CBoundWDPStep_4(); + ~CBoundWDPStep_4(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +protected: +private: + }; + +class CBoundWDPStep_5 : public CBoundWDPStepBase + { +public: + CBoundWDPStep_5(); + ~CBoundWDPStep_5(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundWDPStep_6 : public CBoundWDPStepBase + { +public: + CBoundWDPStep_6(); + ~CBoundWDPStep_6(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CBoundWDPStep_7 : public CBoundWDPStepBase + { +public: + CBoundWDPStep_7(); + ~CBoundWDPStep_7(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CBoundWDPStep_8 : public CBoundWDPStepBase + { +public: + CBoundWDPStep_8(); + ~CBoundWDPStep_8(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CBoundWDPStep_9 : public CBoundWDPStepBase + { +public: + CBoundWDPStep_9(); + ~CBoundWDPStep_9(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CBoundWDPStep_OutOfMemory : public CBoundWDPStepBase + { +public: + CBoundWDPStep_OutOfMemory(); + ~CBoundWDPStep_OutOfMemory(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapBoundWSPSteps.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapBoundWSPSteps.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,1005 @@ +// Copyright (c) 2003-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// CStepOne derived implementation +// +// + +/** + @file + @internalComponent +*/ + +#include "WapBoundWSPSteps.h" +#include "WapStackSuiteDefs.h" +#include +#include + +CBoundWSPStepBase::CBoundWSPStepBase() +/** +* Constructor +*/ + { + } + +CBoundWSPStepBase::~CBoundWSPStepBase() +/** +* Destructor +*/ + { + if(iImp) + { + UnloadInterface(); + } + } + +CWapBoundCLWSPService* CBoundWSPStepBase::LoadInterface() + { + TInt trapValue; + CWapBoundCLWSPService* implementation = NULL; + // UID {0x101FBB3C} - SWS implementation + TUid KInterfaceUid = {0x101FBB3C}; + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid); + TRAP(trapValue, implementation = CWapBoundCLWSPService::NewL(KInterfaceUid)); + if(!trapValue) + { + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation); + return implementation; + } + else return NULL; + } + +void CBoundWSPStepBase::UnloadInterface() + { + INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp); + delete iImp; + iImp = NULL; + REComSession::FinalClose(); + } + +CBoundWSPStep_1::~CBoundWSPStep_1() +/** +* Destructor +*/ + { + } + +CBoundWSPStep_1::CBoundWSPStep_1() +/** +* Constructor +*/ + { + } + +TVerdict CBoundWSPStep_1::doTestStepL() +/** +* @return - TVerdict code +* Override of base class pure virtual +* Our implementation only gets called if the base class doTestStepPreambleL() did +* not leave. That being the case, the current test result value will be EPass. +*/ + { + // + // CWapBoundCLWSPService + // + INFO_PRINTF1(_L("CreateImplementation - CWapBoundCLWSPService")); + INFO_PRINTF1(_L("Calling old NewL() method")); + + TInt trapValue; + + SetTestStepResult(EFail); + TRAP(trapValue, iImp = CWapBoundCLWSPService::NewL()); + if(!trapValue) + { + // interface is loaded + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp); + UnloadInterface(); + iImp = LoadInterface(); + if(iImp) + { + INFO_PRINTF1(_L("CreateImplementation - OK")); + SetTestStepResult(EPass); + UnloadInterface(); + } + } + return TestStepResult(); + } + +CBoundWSPStep_2::CBoundWSPStep_2() +/** +* Constructor +*/ + { + } + +CBoundWSPStep_2::~CBoundWSPStep_2() +/** +* Destructor +*/ + { + } + +TVerdict CBoundWSPStep_2::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("BOUND-WSP: Testing Connect")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer, port; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect= EFalse; + TBool delay = EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + if(GetBoolFromConfig(ConfigSection(),KWapDelayPortClosure, delay)) iDelayPortClosure = delay; + + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + } + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CBoundWSPStep_2::CallStateMachine() + { + TInt err = KErrNone; + INFO_PRINTF2(_L("CallStateMachine: state %d"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iBearer, iLocalPort, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + if(iReconnect) + { + INFO_PRINTF1(_L("Reconnection")); + iControl->ReStart(); + break; + } + } + SetState(EFinish); + SetLastError(err); + iControl->ReStart(); + break; + + case EFinish: + // it's necessary to delay port closure, let the other concurrent test step + // can fail opening the same port with expected error EPortAlreadyBound (-5498) + if (iDelayPortClosure) + User::After(5000000); + + INFO_PRINTF1(_L("EFinish")); + if(GetLastError() == GetExpectedError()) SetTestStepResult(EPass); + else SetTestStepResult(EFail); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return (0); + } + +CBoundWSPStep_3::CBoundWSPStep_3() +/** +* Constructor +*/ + { + } + +CBoundWSPStep_3::~CBoundWSPStep_3() +/** +* Destructor +*/ + { + } + +TVerdict CBoundWSPStep_3::doTestStepL() +/* +* Test the BoundWSP APIs in unconnected state. +*/ + { + INFO_PRINTF1(_L("BoundCLPush. Requests without connection")); + // check preamble result + TVerdict verdict = TestStepResult(); + if (verdict==EPass) + { + TInt err, ret; + iImp = LoadInterface(); + if (!iImp) + { + ERR_PRINTF1(_L("Unable to load BoundWSP Interface")); + verdict = EFail; + } + else + { + GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError); + ShowConnectionInfo(); + TBuf8<100> header, body; + TPckgBuf idPckg; + TWSPStatus wspStatus; + TRequestStatus reqStatus; + TUint32 timeout = 0; + iImp->MethodResult(header, body, idPckg, wspStatus, reqStatus, timeout); + TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("MethodResult Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + Wap::TPort port; + err=iImp->GetLocalPort(port); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + HBufC8* localHost; + err=iImp->GetLocalAddress(localHost); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + err=iImp->GetBearer(iBearer); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetBearer Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + HBufC8* host; + err=iImp->GetServerAddress(host); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetServerAddress Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + TBuf<100> uri; + TUint8 id = 0; + err=iImp->MethodInvoke(iBearer, iRemoteHost, iRemotePort, 0x40, uri, header, body, id); + TRAP(ret, TEST_CHECKL(err, iExError, _L("MethodInvoke Fails not as expected"))) + if (ret) + verdict = EFail; + } + } + } + } + } + UnloadInterface(); + } + } + if (verdict==EPass) + { + INFO_PRINTF1(_L("BoundWSP. Requests Fail as expected")); + } + SetTestStepResult(verdict); + return TestStepResult(); + } + +TInt CBoundWSPStep_3::CallStateMachine() + { + return (0); + } + + +CBoundWSPStep_4::CBoundWSPStep_4() +/** +* Constructor +*/ + { + } + +CBoundWSPStep_4::~CBoundWSPStep_4() +/** +* Destructor +*/ + { + } + +TVerdict CBoundWSPStep_4::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("BOUND-WSP: UnitInvoke-UnitResult")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + + TInt bearer, port, repeat, method; + TInt error = KErrNone; + TPtrC headers; + TPtrC body; + TPtrC uri; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port; + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) SetExpectedError(error); + if(GetIntFromConfig(ConfigSection(),KWapWSPMethod, method)) iMethod = method; + if(GetIntFromConfig(ConfigSection(), KWapRepeat, repeat)) iRepeat = repeat; + + if(!GetStringFromConfig(ConfigSection(),KWapURI, uri)) + { + User::Leave(KErrNoMemory); + } + + GetStringFromConfig(ConfigSection(),KWapWSPHeaders, headers); + GetStringFromConfig(ConfigSection(),KWapWSPBody, body); + + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + + if(UseSimTsy()) + { + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, 41)); + } + + + iURI = HBufC16::NewL(uri.Length()); + + iSendHeaders = HBufC8::NewL(headers.Length()); + + iSendBody = HBufC8::NewL(body.Length()); + + iRecvHeaders = HBufC8::NewL(KMaxWapWspHeaderBufferLength); + iRecvBody = HBufC8::NewL(KMaxWapWspDataBufferLength); + + TPtr16 tmp16 = iURI->Des(); + tmp16.Copy(uri); + TPtr8 tmp1 = iSendHeaders->Des(); + tmp1.Copy(headers); + TPtr8 tmp2 = iSendBody->Des(); + tmp2.Copy(body); + + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvHeadersBuf.Zero(); + iRecvBodyBuf.Set(iRecvBody->Des()); + iRecvBodyBuf.Zero(); + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + + StartScheduler(); + + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + + delete iSendBody; + iSendBody=NULL; + delete iSendHeaders; + iSendHeaders=NULL; + delete iURI; + iURI=NULL; + + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CBoundWSPStep_4::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + static TUint total_headers = 0; + static TUint total_body = 0; + static TUint repeat = 0; + + INFO_PRINTF2(_L("CallStateMachine [state %d]"), State()); + + switch(iState) + { + case EConnect: + total_headers = 0; + total_body = 0; + err = iImp->Connect(iBearer, iLocalPort, EFalse); + if( err == KErrNone) + { + SetState(EUnitInvoke); + } + else + { + SetState(EFinish); + } + SetLastError(err); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + iControl->ReStart(); + break; + + case EUnitInvoke: + INFO_PRINTF2(_L("EUnitInvoke: Method - 0x%02x"), iMethod); + if(iBearer != Wap::EIP) + { + TRAP(err, WaitForInitializeL()); + } + if(iSendHeaders->Length() !=0 ) + { + INFO_PRINTF1(_L("Headers to send:")); + DumpBuf(iSendHeaders->Des()); + } + if(iSendBody->Length() !=0 ) + { + INFO_PRINTF1(_L("Data to send:")); + DumpBuf(iSendBody->Des()); + } + err = iImp->MethodInvoke(iBearer, iRemoteHost, iRemotePort, iMethod, iURI->Des(), iSendHeaders->Des(), iSendBody->Des(), iTransactionId); + INFO_PRINTF3(_L("MethodInvoke() retcode: - dec: %d hex: 0x%08x"), err, err); + if(err == KErrNone) + { + SetState(EUnitResult); + } + else + { + SetState(EFinish); + } + SetLastError(err); + iControl->ReStart(); + break; + + case EUnitResult: + + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvHeadersBuf.Zero(); + iRecvBodyBuf.Set(iRecvBody->Des()); + iRecvBodyBuf.Zero(); + iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout); + INFO_PRINTF2(_L("EUnitResult: status 0x%08x"), iStatus->Int()); + activate = 1; + SetLastError(err); + SetState(EFinish); + break; + + case EFinish: + + INFO_PRINTF4(_L("EFinish: Status: %d, WSP status: %d (0x%02x)"), iStatus->Int(), iWspStatus, iWspStatus); + + if(iRecvHeadersBuf.Length() != 0) + { + INFO_PRINTF1(_L("Headers")); + total_headers += iRecvHeadersBuf.Length(); + DumpBuf(iRecvHeadersBuf); + } + + if(iRecvBodyBuf.Length() != 0) + { + INFO_PRINTF1(_L("Body")); + total_body += iRecvBodyBuf.Length(); + DumpBuf(iRecvBodyBuf); + } + + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + if(iStatus->Int() == Wap::EMoreData) + { + INFO_PRINTF1(_L("NOTE: More data... calling MethodResult()")); + SetState(EUnitResult); + iControl->ReStart(); + break; + } + } + + INFO_PRINTF3(_L("Data received: headers - %d bytes, body - %d bytes"), total_headers, total_body); + total_headers = 0; + total_body = 0; + if((--iRepeat != 0) && (iStatus->Int() == KErrNone)) + { + ++repeat; + INFO_PRINTF2(_L("REPEAT TEST - %d"), repeat); + if(err == KErrNone) + { + SetState(EUnitInvoke); + iControl->ReStart(); + break; + } + } + + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + break; + } + return (activate); + } + +CBoundWSPStep_5::CBoundWSPStep_5() +/** +* Constructor +*/ + { + } + +CBoundWSPStep_5::~CBoundWSPStep_5() +/** +* Destructor +*/ + { + } + +TVerdict CBoundWSPStep_5::doTestStepL() +/** +* Test Cancel Request +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("BoundCLPush. Testing Cancel Request")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer, port; + TInt err = KErrNone; + TBool secure= EFalse; + TBool reconnect= EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port; + if(GetIntFromConfig(ConfigSection(), KWapExError, err)) SetExpectedError(err); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + + ShowConnectionInfo(); + err = iImp->Connect(iBearer, iLocalPort, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + TBuf8<100> header, body; + TPckgBuf idPckg; + TWSPStatus wspStatus; + TRequestStatus reqStatus; + TUint32 timeout=0; + iImp->MethodResult(header, body, idPckg, wspStatus, reqStatus, timeout); + SetState(EUnitResult); + StartScheduler(); + iControl->ReStart(); + if(reqStatus==KErrCancel) + { + SetTestStepResult(EPass); + } + + } + } + } + return TestStepResult(); + } + +TInt CBoundWSPStep_5::CallStateMachine() + { + INFO_PRINTF2(_L("CallStateMachine: step %d"), State()); + switch(iState) + { + case EUnitResult: + INFO_PRINTF1(_L("EUnitResult")); + iImp->CancelReq(); + SetState(EFinish); + iControl->ReStart(); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return (0); + } + +CBoundWSPStep_6::CBoundWSPStep_6() + { + } +CBoundWSPStep_6::~CBoundWSPStep_6() + { + } + +TVerdict CBoundWSPStep_6::doTestStepL() +/* +* Test receive time out +*/ + { + INFO_PRINTF1(_L("BOUND-WSP: Connect-UnitResult-TimeOut")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + TInt bearer, port; + TInt error = KErrNone; + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + TInt headerLength, bufLength, timeOut; + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength)) + { + iHeaderRecvBufLength=static_cast(headerLength); + } + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength)) + { + iBodyRecvBufLength=static_cast(bufLength); + } + if(GetIntFromConfig(ConfigSection(),KWapTimeOut, timeOut)) + { + iTimeout=timeOut; + } + iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength); + iRecvBody = HBufC8::NewL(iBodyRecvBufLength); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + StartScheduler(); + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CBoundWSPStep_6::CallStateMachine() +/* +* Test receive time out +*/ + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iBearer, iLocalPort, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { +// WaitForInitializeL(); + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvBodyBuf.Set(iRecvBody->Des()); + iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout); + INFO_PRINTF1(_L("MethodResult")); + activate = 1; + } + else + { + iControl->ReStart(); + } + SetLastError(err); + SetState(EFinish); + break; + + case EFinish: + + INFO_PRINTF1(_L("EFinish")); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + + break; + } + return (activate); + } + +CBoundWSPStep_7::CBoundWSPStep_7() + { + } +CBoundWSPStep_7::~CBoundWSPStep_7() + { + } + +TVerdict CBoundWSPStep_7::doTestStepL() +// +//Wrong sequence +// + { + INFO_PRINTF1(_L("BOUND-WSP: Connect-UnitResult-UnitResult")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + TInt bearer, port; + TInt error = KErrNone; + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + TInt headerLength, bufLength; + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength)) + { + iHeaderRecvBufLength=static_cast(headerLength); + } + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength)) + { + iBodyRecvBufLength=static_cast(bufLength); + } + iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength); + iRecvBody = HBufC8::NewL(iBodyRecvBufLength); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + // Start state machine + StartScheduler(); + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CBoundWSPStep_7::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iBearer, iLocalPort, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { +// WaitForInitializeL(); + TRequestStatus reqStatus; + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvBodyBuf.Set(iRecvBody->Des()); + iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, reqStatus, iTimeout); + iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout); + INFO_PRINTF1(_L("MethodResult")); + activate = 1; + } + else + { + iControl->ReStart(); + } + SetLastError(err); + SetState(EFinish); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + iImp->CancelReq(); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d, State = %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + + break; + } + return (activate); + } + +CBoundWSPStep_8::CBoundWSPStep_8() + { + } +CBoundWSPStep_8::~CBoundWSPStep_8() + { + } +TVerdict CBoundWSPStep_8::doTestStepL() +/* +* Using invalid values for API parameters: +* - Invalid TUid on construction +* - Invalid method for MethodInvoke +* - Invalid timeout for MethodResult +* Note: wrong bearer value has already been implemented as part of test 2 +*/ + { + INFO_PRINTF1(_L("BOUND-WSP: Wrong parameters testing")); + if(TestStepResult() == EPass ) + { + TInt error; + if(GetIntFromConfig(ConfigSection(),KWapExError2, error)) + { + iExError2=error; + } + TInt trapValue; + TUid invalidInterfaceUid = {0x00000000}; /*{0x101FBB3C};*/ + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid); + TRAP(trapValue, iImp = CWapBoundCLWSPService::NewL(invalidInterfaceUid)); + TVerdict verdict = (trapValue == iExError2)?EPass:EFail; + if (verdict==EFail) + { + SetTestStepResult(EFail); + return TestStepResult(); + } + else + { + INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue); + // Now use the correct Uid + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + TInt method; + TInt error = KErrNone; + TPtrC headers; + TPtrC body; + TPtrC uri; + + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) + { + SetExpectedError(error); + } + if (GetIntFromConfig(ConfigSection(),KWapWSPMethod, method)) + { + iMethod=method; + } + + if(!GetStringFromConfig(ConfigSection(),KWapURI, uri) || \ + !GetStringFromConfig(ConfigSection(),KWapWSPHeaders, headers) || \ + !GetStringFromConfig(ConfigSection(),KWapWSPBody, body)) + { + User::Leave(KErrNoMemory); + } + + iURI = HBufC16::NewL(uri.Length()); + + iSendHeaders = HBufC8::NewL(headers.Length()); + + iSendBody = HBufC8::NewL(body.Length()); + + TPtr16 tmp16 = iURI->Des(); + tmp16.Copy(uri); + TPtr8 tmp = iSendHeaders->Des(); + tmp.Copy(headers); + TPtr8 tmp1 = iSendBody->Des(); + tmp1.Copy(body); + + ShowConnectionInfo(); + error = iImp->Connect(iBearer, iLocalPort, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), error); + if( error == KErrNone) + { + error = iImp->MethodInvoke(iBearer, iRemoteHost, iRemotePort, iMethod, iURI->Des(), iSendHeaders->Des(), iSendBody->Des(), iTransactionId); + } + TVerdict verdict = (error == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + + delete iSendBody; + iSendBody=NULL; + delete iSendHeaders; + iSendHeaders=NULL; + delete iURI; + iURI=NULL; + UnloadInterface(); + } + } + } + return TestStepResult(); + } +TInt CBoundWSPStep_8::CallStateMachine() + { + return (0); + } + +CBoundWSPStep_9::CBoundWSPStep_9() {} +CBoundWSPStep_9::~CBoundWSPStep_9() {} + +TVerdict CBoundWSPStep_9::doTestStepL() + { + return TestStepResult(); + } + +TInt CBoundWSPStep_9::CallStateMachine() + { + return (0); + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapBoundWSPSteps.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapBoundWSPSteps.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,139 @@ +/** +* Copyright (c) 2002-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/** + @file WapBoundWSPSteps.h +*/ +#if (!defined __BOUNDWSP_STEP_H__) +#define __BOUNDWSP_STEP_H__ +#include +#include +#include +#include +#include "WapStackSuiteStepBase.h" + +// steps names +_LIT(KBoundWSPStep_1,"BoundWSP_1"); +_LIT(KBoundWSPStep_2,"BoundWSP_2"); +_LIT(KBoundWSPStep_3,"BoundWSP_3"); +_LIT(KBoundWSPStep_4,"BoundWSP_4"); +_LIT(KBoundWSPStep_5,"BoundWSP_5"); +_LIT(KBoundWSPStep_6,"BoundWSP_6"); +_LIT(KBoundWSPStep_7,"BoundWSP_7"); +_LIT(KBoundWSPStep_8,"BoundWSP_8"); +_LIT(KBoundWSPStep_9,"BoundWSP_9"); + +class CBoundWSPStepBase : public CWapStackSuiteStepBase +{ +public: + CBoundWSPStepBase(); + ~CBoundWSPStepBase(); + CWapBoundCLWSPService* LoadInterface(); + void UnloadInterface(); +protected: + CWapBoundCLWSPService* iImp; +}; + +class CBoundWSPStep_1 : public CBoundWSPStepBase + { +public: + CBoundWSPStep_1(); + ~CBoundWSPStep_1(); + virtual TVerdict doTestStepL(); +private: + }; + +class CBoundWSPStep_2 : public CBoundWSPStepBase + { +public: + CBoundWSPStep_2(); + ~CBoundWSPStep_2(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundWSPStep_3 : public CBoundWSPStepBase + { +public: + CBoundWSPStep_3(); + ~CBoundWSPStep_3(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundWSPStep_4 : public CBoundWSPStepBase + { +public: + CBoundWSPStep_4(); + ~CBoundWSPStep_4(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundWSPStep_5 : public CBoundWSPStepBase + { +public: + CBoundWSPStep_5(); + ~CBoundWSPStep_5(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CBoundWSPStep_6 : public CBoundWSPStepBase + { +public: + CBoundWSPStep_6(); + ~CBoundWSPStep_6(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CBoundWSPStep_7 : public CBoundWSPStepBase + { +public: + CBoundWSPStep_7(); + ~CBoundWSPStep_7(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CBoundWSPStep_8 : public CBoundWSPStepBase + { +public: + CBoundWSPStep_8(); + ~CBoundWSPStep_8(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CBoundWSPStep_9 : public CBoundWSPStepBase + { +public: + CBoundWSPStep_9(); + ~CBoundWSPStep_9(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapFullySpecCLPushSteps.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecCLPushSteps.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,776 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +/** + @file + @internalComponent +*/ + +#include "WapFullySpecCLPushSteps.h" +#include "WapStackSuiteDefs.h" +#include +#include +#include + + +CFullySpecCLPushBase::CFullySpecCLPushBase() +/** +* Constructor +*/ + { + } + +CFullySpecCLPushBase::~CFullySpecCLPushBase() +/** +* Destructor +*/ + { + if(iImp) + { + UnloadInterface(); + } + } + +CWapFullySpecCLPushService* CFullySpecCLPushBase::LoadInterface() + { + TInt trapValue; + CWapFullySpecCLPushService* implementation = NULL; + // UID {0x101FBB3A} - SWS implementation + TUid KInterfaceUid = {0x101FBB3A}; + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid); + TRAP(trapValue, implementation = CWapFullySpecCLPushService::NewL(KInterfaceUid)); + if(!trapValue) + { + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation); + return implementation; + } + else return NULL; + } + +void CFullySpecCLPushBase::UnloadInterface() + { + INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp); + delete iImp; + iImp = NULL; + REComSession::FinalClose(); + } + +CFullySpecCLPushStep_1::CFullySpecCLPushStep_1() +/** +* Constructor +*/ + { + } + +CFullySpecCLPushStep_1::~CFullySpecCLPushStep_1() +/** +* Destructor +*/ + { + } + + +TVerdict CFullySpecCLPushStep_1::doTestStepL() +/** +* @return - TVerdict code +* Override of base class pure virtual +* Our implementation only gets called if the base class doTestStepPreambleL() did +* not leave. That being the case, the current test result value will be EPass. +*/ + { + // + // CWapFullySpecCLPushService + // + INFO_PRINTF1(_L("CreateImplementation - CWapFullySpecCLPushService")); + INFO_PRINTF1(_L("Calling old NewL() method")); + + TInt trapValue; + + SetTestStepResult(EFail); + TRAP(trapValue, iImp = CWapFullySpecCLPushService::NewL()); + if(!trapValue) + { + // interface is loaded + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp); + UnloadInterface(); + iImp = LoadInterface(); + if(iImp) + { + INFO_PRINTF1(_L("CreateImplementation - OK")); + SetTestStepResult(EPass); + UnloadInterface(); + } + } + return TestStepResult(); + } + +CFullySpecCLPushStep_2::CFullySpecCLPushStep_2() +/** +* Constructor +*/ + { + } + +CFullySpecCLPushStep_2::~CFullySpecCLPushStep_2() +/** +* Destructor +*/ + { + } + +TVerdict CFullySpecCLPushStep_2::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("FULLYSPEC-PUSH: Testing Connect")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect = EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + } + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CFullySpecCLPushStep_2::CallStateMachine() + { + TInt err = KErrNone; + INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + if(iReconnect) + { + INFO_PRINTF1(_L("Reconnection")); + iControl->ReStart(); + break; + } + } + SetState(EFinish); + SetLastError(err); + iControl->ReStart(); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(GetLastError() == GetExpectedError()) SetTestStepResult(EPass); + else SetTestStepResult(EFail); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return (0); + } + +CFullySpecCLPushStep_3::CFullySpecCLPushStep_3() +/** +* Constructor +*/ + { + } + +CFullySpecCLPushStep_3::~CFullySpecCLPushStep_3() +/** +* Destructor +*/ + { + } + +TVerdict CFullySpecCLPushStep_3::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("FullySpecWSPPush. Requests without connection")); + // check preamble result + TVerdict verdict = TestStepResult(); + if (verdict==EPass) + { + TInt err, ret; + iImp = LoadInterface(); + if (!iImp) + { + ERR_PRINTF1(_L("Unable to load FullySpecWSPPush Interface")); + verdict = EFail; + } + else + { + GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError); + ShowConnectionInfo(); + TRequestStatus reqStatus; + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, reqStatus); + TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("AwaitPush Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + Wap::TPort port; + err=iImp->GetLocalPort(port); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + HBufC8* localHost; + err=iImp->GetLocalAddress(localHost); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected"))) + if (ret) + verdict = EFail; + } + } + UnloadInterface(); + } + } + if (verdict==EPass) + { + INFO_PRINTF1(_L("FullySpecCLPush. Requests Fail as expected")); + } + SetTestStepResult(verdict); + return TestStepResult(); + } + +TInt CFullySpecCLPushStep_3::CallStateMachine() + { + return (0); + } + +CFullySpecCLPushStep_4::CFullySpecCLPushStep_4() +/** +* Constructor +*/ + { + } + +CFullySpecCLPushStep_4::~CFullySpecCLPushStep_4() +/** +* Destructor +*/ + { + } + +TVerdict CFullySpecCLPushStep_4::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("FULLYSPEC-CLPUSH: Connect-AwaitPush")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + + TInt bearer, port; + TInt error = KErrNone; + TPtrC16 remote_host; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetStringFromConfig(ConfigSection(), KWapRemoteHost, remote_host)) + { + iRemoteHost.Copy(remote_host); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapRemotePort, port)) + { + iRemotePort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + GetBoolFromConfig(ConfigSection(), KMiddleCancel, iMiddleCancel); + GetBoolFromConfig(ConfigSection(), KMultiReadCancel, iMultiReadCancel); + TInt headerLength, bufLength; + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength)) + { + iHeaderRecvBufLength=static_cast(headerLength); + } + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength)) + { + iBodyRecvBufLength=static_cast(bufLength); + } + + iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength); + iRecvBody = HBufC8::NewL(iBodyRecvBufLength); + + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + } + + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + // Start state machine + StartScheduler(); + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + UnloadInterface(); + } + + } + return TestStepResult(); + } + +TInt CFullySpecCLPushStep_4::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + TRAP(err, WaitForInitializeL()); + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvBodyBuf.Set(iRecvBody->Des()); + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus); + INFO_PRINTF1(_L("Start AwaitingPush.....")); + activate = 1; + if (!iMiddleCancel) + { + SetState(EAwaitPush); + } + else + { + INFO_PRINTF1(_L("Cancel AwaitPush")); + iImp->CancelAwaitPush(); + SetState(EFinish); + } + } + else + { + SetState(EFinish); + iControl->ReStart(); + } + SetLastError(err); + break; + + case EAwaitPush: + INFO_PRINTF1(_L("EAwaitPush")); + if(iStatus->Int() != KErrNone && iStatus->Int()!=Wap::EMoreData) + // AwaitPush failed + { + INFO_PRINTF1(_L("AwaitPush failed")); + SetLastError(iStatus->Int()); + SetState(EFinish); + iControl->ReStart(); + } + else + { + iMaxWspHeaderRecvBuffer.Append(iRecvHeadersBuf); + iMaxWspDataRecvBuffer.Append(iRecvBodyBuf); + if (iStatus->Int()==Wap::EMoreData) + { + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus); + activate = 1; + if (!iMultiReadCancel) + { + SetState(EAwaitPush); + } + else + { + INFO_PRINTF1(_L("Cancel Receive in EMutipleReceive state")); + iImp->CancelAwaitPush(); + SetState(EFinish); + } + + } + else + { + SetLastError(iStatus->Int()); + iControl->ReStart(); + SetState(EFinish); + } + } + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + if (verdict==EPass && !iMiddleCancel && !iMultiReadCancel) + { + iImp->CancelAwaitPush(); + INFO_PRINTF1(_L("Headers")); + DumpBuf(iMaxWspHeaderRecvBuffer); + INFO_PRINTF1(_L("Body")); + DumpBuf(iMaxWspDataRecvBuffer); + if (verdict==EPass) + { + Wap::TPort port; + iImp->GetLocalPort(port); + verdict = (port == iLocalPort)?EPass:EFail; + } + if (verdict==EPass) + { + //This test can not perform. + HBufC8* buf; + iImp->GetLocalAddress(buf); + delete buf; + } + } + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + break; + } + return (activate); +} + +CFullySpecCLPushStep_5::CFullySpecCLPushStep_5() +/** +* Constructor +*/ + { + } + +CFullySpecCLPushStep_5::~CFullySpecCLPushStep_5() +/** +* Destructor +*/ + { + } + +TVerdict CFullySpecCLPushStep_5::doTestStepL() +/** +* Test Cancel await push +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("FullySpecified-PUSH: Testing Cancel")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect = EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + + ShowConnectionInfo(); + error = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), error); + if( error == KErrNone) + { + TBuf8<100> header, body; + TPckgBuf pushIdPckg; + TRequestStatus reqStatus; + iImp->AwaitPush(header, body, pushIdPckg, reqStatus); + SetState(EAwaitPush); + StartScheduler(); + iControl->ReStart(); + if(reqStatus==KErrCancel) + { + SetTestStepResult(EPass); + } + } + + } + } + return TestStepResult(); + } + +TInt CFullySpecCLPushStep_5::CallStateMachine() + { + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EAwaitPush: + INFO_PRINTF1(_L("EAwaitPush")); + iImp->CancelAwaitPush(); + SetState(EFinish); + iControl->ReStart(); + break; + case EFinish: + INFO_PRINTF1(_L("EFinish")); + SetState(EIdle); + StopScheduler(); + break; + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return (0); + } + +CFullySpecCLPushStep_6::CFullySpecCLPushStep_6() + { + } +CFullySpecCLPushStep_6::~CFullySpecCLPushStep_6() + { + } +TVerdict CFullySpecCLPushStep_6::doTestStepL() + { + //Not in use + return TestStepResult(); + } + +TInt CFullySpecCLPushStep_6::CallStateMachine() + { + return (0); + } + +CFullySpecCLPushStep_7::CFullySpecCLPushStep_7() + { + } +CFullySpecCLPushStep_7::~CFullySpecCLPushStep_7() + { + } +TVerdict CFullySpecCLPushStep_7::doTestStepL() + { + INFO_PRINTF1(_L("FULLYSPEC-CLPUSH: Connect-AwaitPush-AwaitPush")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + + TInt bearer; + TInt error = KErrNone; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + TInt headerLength, bufLength; + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength)) + { + iHeaderRecvBufLength=static_cast(headerLength); + } + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength)) + { + iBodyRecvBufLength=static_cast(bufLength); + } + iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength); + iRecvBody = HBufC8::NewL(iBodyRecvBufLength); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + // Start state machine + StartScheduler(); + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CFullySpecCLPushStep_7::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { +// WaitForInitializeL(); + TRequestStatus reqStatus; + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvBodyBuf.Set(iRecvBody->Des()); + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, reqStatus); + iImp->AwaitPush(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, *iStatus); + INFO_PRINTF1(_L("AwaitPush")); + activate = 1; + } + else + { + iControl->ReStart(); + } + SetLastError(err); + SetState(EFinish); + break; + + case EFinish: + + INFO_PRINTF1(_L("EFinish")); + iImp->CancelAwaitPush(); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + + break; + } + return (activate); + } + +CFullySpecCLPushStep_8::CFullySpecCLPushStep_8() + { + } +CFullySpecCLPushStep_8::~CFullySpecCLPushStep_8() + { + } +TVerdict CFullySpecCLPushStep_8::doTestStepL() +/** +* @return - TVerdict code +* Wrong parameter values for FullySpecified CL Push API: +* - Wrong TUid on construction +* - Connect to wrong bearer (already implemented in test 2) +*/ + { + INFO_PRINTF1(_L("CreateImplementation with wrong Uid- CWapFullySpecCLPushService")); + if(TestStepResult() == EPass ) + { + TInt error; + if(GetIntFromConfig(ConfigSection(),KWapExError2, error)) + { + iExError2=error; + } + TInt trapValue; + TUid invalidInterfaceUid = {0x00000000}; + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid); + TRAP(trapValue, iImp = CWapFullySpecCLPushService::NewL(invalidInterfaceUid)); + TVerdict verdict = (trapValue == iExError2)?EPass:EFail; + if (verdict==EPass) + { + INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue); + } + SetTestStepResult(verdict); + } + return TestStepResult(); + } + +TInt CFullySpecCLPushStep_8::CallStateMachine() + { + return (0); + } + +CFullySpecCLPushStep_9::CFullySpecCLPushStep_9() {} +CFullySpecCLPushStep_9::~CFullySpecCLPushStep_9() {} +TVerdict CFullySpecCLPushStep_9::doTestStepL() + { + return TestStepResult(); + } + +TInt CFullySpecCLPushStep_9::CallStateMachine() + { + return (0); + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapFullySpecCLPushSteps.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecCLPushSteps.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,138 @@ +/** +* Copyright (c) 2002-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/** + @file WapFullySpecCLPush.h +*/ +#if (!defined __FULLYSPECCLPUSH_STEP_H__) +#define __FULLYSPECCLPUSH_STEP_H__ +#include +#include +#include +#include +#include "WapStackSuiteStepBase.h" + +_LIT(KFullySpecCLPushStep_1,"FullySpecCLPush_1"); +_LIT(KFullySpecCLPushStep_2,"FullySpecCLPush_2"); +_LIT(KFullySpecCLPushStep_3,"FullySpecCLPush_3"); +_LIT(KFullySpecCLPushStep_4,"FullySpecCLPush_4"); +_LIT(KFullySpecCLPushStep_5,"FullySpecCLPush_5"); +_LIT(KFullySpecCLPushStep_6,"FullySpecCLPush_6"); +_LIT(KFullySpecCLPushStep_7,"FullySpecCLPush_7"); +_LIT(KFullySpecCLPushStep_8,"FullySpecCLPush_8"); +_LIT(KFullySpecCLPushStep_9,"FullySpecCLPush_9"); + +class CFullySpecCLPushBase : public CWapStackSuiteStepBase +{ +public: + CFullySpecCLPushBase(); + ~CFullySpecCLPushBase(); + CWapFullySpecCLPushService* LoadInterface(); + void UnloadInterface(); +protected: + CWapFullySpecCLPushService* iImp; +}; + +class CFullySpecCLPushStep_1 : public CFullySpecCLPushBase + { +public: + CFullySpecCLPushStep_1(); + ~CFullySpecCLPushStep_1(); + virtual TVerdict doTestStepL(); +private: + }; + +class CFullySpecCLPushStep_2 : public CFullySpecCLPushBase + { +public: + CFullySpecCLPushStep_2(); + ~CFullySpecCLPushStep_2(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecCLPushStep_3 : public CFullySpecCLPushBase + { +public: + CFullySpecCLPushStep_3(); + ~CFullySpecCLPushStep_3(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecCLPushStep_4 : public CFullySpecCLPushBase + { +public: + CFullySpecCLPushStep_4(); + ~CFullySpecCLPushStep_4(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecCLPushStep_5 : public CFullySpecCLPushBase + { +public: + CFullySpecCLPushStep_5(); + ~CFullySpecCLPushStep_5(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecCLPushStep_6 : public CFullySpecCLPushBase + { +public: + CFullySpecCLPushStep_6(); + ~CFullySpecCLPushStep_6(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CFullySpecCLPushStep_7 : public CFullySpecCLPushBase + { +public: + CFullySpecCLPushStep_7(); + ~CFullySpecCLPushStep_7(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CFullySpecCLPushStep_8 : public CFullySpecCLPushBase + { +public: + CFullySpecCLPushStep_8(); + ~CFullySpecCLPushStep_8(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CFullySpecCLPushStep_9 : public CFullySpecCLPushBase + { +public: + CFullySpecCLPushStep_9(); + ~CFullySpecCLPushStep_9(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWDPSteps.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWDPSteps.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,885 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +/** + @file + @internalComponent +*/ + +#include "WapFullySpecWDPSteps.h" +#include "WapStackSuiteDefs.h" +#include +#include +#include + +CFullySpecWDPStepBase::CFullySpecWDPStepBase() +/* +* Constructor +*/ + { + } +CFullySpecWDPStepBase::~CFullySpecWDPStepBase() +/* +* Destructor +*/ + { + if(iImp) + { + UnloadInterface(); + } + } + +CWapFullySpecDatagramService* CFullySpecWDPStepBase::LoadInterface() +/* +* Load CWapFullySpecifiedDatagramService Interface with Interface ID +*/ + { + CWapFullySpecDatagramService* implementation = NULL; + TUid KInterfaceUid = {0x101FBB38}; + INFO_PRINTF2(_L("Calling new NewL(%08X) method"), KInterfaceUid); + TRAPD(trapValue, implementation = CWapFullySpecDatagramService::NewL(KInterfaceUid)); + if(!trapValue) + { + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation); + return implementation; + } + else + return NULL; + } + +void CFullySpecWDPStepBase::UnloadInterface() + { + INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp); + delete iImp; + iImp = NULL; + REComSession::FinalClose(); + } + +CFullySpecWDPStep_1::CFullySpecWDPStep_1() +/** +* Constructor +*/ + { + } + +CFullySpecWDPStep_1::~CFullySpecWDPStep_1() +/** +* Destructor +*/ + { + } +TVerdict CFullySpecWDPStep_1::doTestStepL() +/** +* Load and destroy FullySpecifiedDatagtamService interface implementation +* Two different methods are used NewL() and NewL(TUid InterfaceUid) +* @return - TVerdict code +*/ + { + // CWapFullySpecDatagramService + INFO_PRINTF1(_L("CreateImplementation - CWapFullySpecDatagramService")); + INFO_PRINTF1(_L("Calling old NewL() method")); + + TInt trapValue; + + SetTestStepResult(EFail); + TRAP(trapValue, iImp = CWapFullySpecDatagramService::NewL()); + if(!trapValue) + { + // interface is loaded + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp); + UnloadInterface(); + iImp = LoadInterface(); + if(iImp) + { + INFO_PRINTF1(_L("CreateImplementation - OK")); + SetTestStepResult(EPass); + UnloadInterface(); + } + } + return TestStepResult(); + } + +CFullySpecWDPStep_2::CFullySpecWDPStep_2() +/** +* Constructor +*/ + { + } + +CFullySpecWDPStep_2::~CFullySpecWDPStep_2() +/** +* Destructor +*/ + { + } + +TVerdict CFullySpecWDPStep_2::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("FULLYSPEC-WDP: Testing Connect")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer = 0; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect = EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + } + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CFullySpecWDPStep_2::CallStateMachine() + { + TInt err = KErrNone; + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + if(iReconnect) + { + INFO_PRINTF1(_L("Reconnection")); + iControl->ReStart(); + break; + } + } + SetState(EFinish); + SetLastError(err); + iControl->ReStart(); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(GetLastError() == GetExpectedError()) SetTestStepResult(EPass); + else SetTestStepResult(EFail); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return (0); + } + +CFullySpecWDPStep_3::CFullySpecWDPStep_3() +/** +* Constructor +*/ + { + SetTestStepName(KWapWDPStackSuiteLogFile); + } +CFullySpecWDPStep_3::~CFullySpecWDPStep_3() +/** +* Destructor +*/ + { + } +TVerdict CFullySpecWDPStep_3::doTestStepL() +/* +* Test the FullySpecWDP APIs in unconnected state. +*/ + { + INFO_PRINTF1(_L("FULLYSPECIFIEDWDP. Requests without connection")); + // check preamble result + TVerdict verdict = TestStepResult(); + if (verdict==EPass) + { + TInt err, ret; + iImp = LoadInterface(); + if (!iImp) + verdict = EFail; + else + { + GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError); + ShowConnectionInfo(); + TBuf8<100> buf; + err = iImp->Send(buf); + TRAP(ret, TEST_CHECKL(err, iExError, _L("Connect Fails as expected"))) + if (ret) + verdict = EFail; + else + { + TPckg aDataSizePckg(0); + TRequestStatus reqStatus; + iImp->AwaitRecvDataSize(aDataSizePckg, reqStatus); + User::WaitForRequest(reqStatus); + TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("Connect Fails as expected"))) + if (ret) + verdict = EFail; + else + { + TBuf8<100> buf; + TBool truncated; + TUint32 timeout=0; + iImp->Recv(buf, truncated,reqStatus,timeout); + User::WaitForRequest(reqStatus); + TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("Connect Fails as expected"))) + if (ret) + verdict = EFail; + else + { + Wap::TPort aPort; + err=iImp->GetLocalPort(aPort); + TRAP(ret, TEST_CHECKL(err, iExError, _L("Connect Fails as expected"))) + if (ret) + verdict = EFail; + else + { + HBufC8* localHost; + err=iImp->GetLocalAddress(localHost); + TRAP(ret, TEST_CHECKL(err, iExError, _L("Connect Fails as expected"))) + if (ret) + verdict = EFail; + else + { + TUint16 maxSize, nominalSize; + err=iImp->GetDatagramSizes(maxSize, nominalSize); + if (err) + verdict = EFail; + } + } + } + } + } + UnloadInterface(); + } + } + if (verdict==EPass) + { + INFO_PRINTF1(_L("FullySpecWDP. Requests Fail as expected")); + } + SetTestStepResult(verdict); + return TestStepResult(); + } + +TInt CFullySpecWDPStep_3::CallStateMachine() + { + return KErrNone; + } + +CFullySpecWDPStep_4::~CFullySpecWDPStep_4() +/** +* Destructor +*/ + { + } + +CFullySpecWDPStep_4::CFullySpecWDPStep_4() +/** +* Constructor +*/ + { + } + +TVerdict CFullySpecWDPStep_4::doTestStepL() + { + INFO_PRINTF1(_L("FULLYSPEC-WDP: Connect-Send-Await-Receive")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + + TInt bearer, port, bufLen; + TInt error = KErrNone; + TPtrC data; + TPtrC16 remote_host; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetStringFromConfig(ConfigSection(), KWapRemoteHost, remote_host)) + { + iRemoteHost.Copy(remote_host); + } + if(GetIntFromConfig(ConfigSection(),KWapRemotePort, port)) + { + iRemotePort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + GetIntFromConfig(ConfigSection(), KWapExError2, iExError2); + GetBoolFromConfig(ConfigSection(), KAwaitLengthTwice, iAwaitLengthTwice); + GetBoolFromConfig(ConfigSection(), KAwaitLengthCancel, iAwaitLengthCancel); + GetBoolFromConfig(ConfigSection(), KMiddleCancel, iMiddleCancel); + GetBoolFromConfig(ConfigSection(), KMultiReadCancel, iMultiReadCancel); + if(GetIntFromConfig(ConfigSection(),KWapWdpBufLength, bufLen)) + { + iWdpRecvBufLength=static_cast(bufLen); + iRecvBuffPtr = HBufC8::NewL(iWdpRecvBufLength); + } + error = GetStringFromConfig(ConfigSection(),KWapData, data); + if(!error) + { + User::Leave(error); + } + iSendBuffPtr = HBufC8::NewL(data.Length()); + TPtr8 tmp = iSendBuffPtr->Des(); + tmp.Copy(data); + + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + } + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + // Start state machine + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CFullySpecWDPStep_4::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + TInt leaveError = KErrNone; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + TRAP(leaveError, WaitForInitializeL()); + err = iImp->Send(iSendBuffPtr->Des()); + if(err == KErrNone && leaveError == KErrNone) + { + INFO_PRINTF2(_L("Send completetd with code = %d"), err); + SetState(EAwaitSize); + } + else + { + SetState(EFinish); + } + } + else + { + SetState(EFinish); + } + SetLastError(err); + iControl->ReStart(); + break; + + case EAwaitSize: + INFO_PRINTF1(_L("EAwaitSize")); + iImp->AwaitRecvDataSize(iLength, *iStatus); + activate = 1; + if (!iAwaitLengthCancel) + { + SetState(EReceive); + } + else + { + INFO_PRINTF1(_L("Cancel Receive in AwaitSize state")); + iImp->CancelRecv(); + SetState(EFinish); + } + + break; + + case EReceive: + INFO_PRINTF1(_L("EReceive")); + if(iStatus->Int()!=KErrNone) + // AwaitSize failed + { + INFO_PRINTF1(_L("AwaitSize failed")); + SetLastError(iStatus->Int()); + iControl->ReStart(); + SetState(EFinish); + } + else + { + INFO_PRINTF2(_L("AwaitSize returned - %d"),iLength()); + if (!iAwaitLengthTwice) + { + if (iRecvBuffPtr==NULL) + { + TInt len=iLength(); + TRAP(err, iRecvBuffPtr = HBufC8::NewL(len)) + if (err!=KErrNone) + { + SetLastError(err); + iControl->ReStart(); + SetState(EFinish); + break; + } + } + iRecvBuf.Set(iRecvBuffPtr->Des()); + iImp->Recv(iRecvBuf, iTruncated, *iStatus, 0); + activate = 1; + if (!iMiddleCancel) + { + SetState(EMutipleReceive); + } + else + { + INFO_PRINTF1(_L("Cancel Receive in Receive state")); + iImp->CancelRecv(); + SetState(EFinish); + } + } + else + { + iImp->AwaitRecvDataSize(iLength, *iStatus); + activate = 1; + SetState(EFinish); + } + } + break; + + case EMutipleReceive: + INFO_PRINTF1(_L("EMultipleReceive")); + if (iStatus->Int()!=KErrNone && iStatus->Int()!=Wap::EMoreData) + { + INFO_PRINTF1(_L("Receive failed")); + SetLastError(iStatus->Int()); + iControl->ReStart(); + SetState(EFinish); + } + else + { + iMaxWdpRecvBuffer.Append(iRecvBuf); + if (iTruncated) + { + iImp->Recv(iRecvBuf, iTruncated, *iStatus, 0); + activate = 1; + if (!iMultiReadCancel) + { + SetState(EMutipleReceive); + } + else + { + INFO_PRINTF1(_L("Cancel Receive in EMutipleReceive state")); + iImp->CancelRecv(); + SetState(EFinish); + } + } + else + { + SetLastError(iStatus->Int()); + iControl->ReStart(); + SetState(EFinish); + } + } + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + if (verdict==EPass && !iAwaitLengthTwice && !iMiddleCancel && !iMultiReadCancel && !iAwaitLengthCancel) + { + iImp->CancelRecv(); + INFO_PRINTF1(_L("Data received")); + DumpBuf(iMaxWdpRecvBuffer); + if (verdict==EPass) + { + verdict = (iSendBuffPtr->Match(iMaxWdpRecvBuffer)!=KErrNotFound)?EPass:EFail; + } + if (verdict==EPass) + { + Wap::TPort port; + iImp->GetLocalPort(port); + verdict = (port == iLocalPort)?EPass:EFail; + } + if (verdict==EPass) + { + //This test can not perform to get own telnumber + HBufC8* buf; + iImp->GetLocalAddress(buf); + delete buf; + } + } + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + + break; + } + return (activate); + } + + CFullySpecWDPStep_5::~CFullySpecWDPStep_5() + /** + * Destructor + */ + { + } + + CFullySpecWDPStep_5::CFullySpecWDPStep_5() + /** + * Constructor + */ + { + } + + TVerdict CFullySpecWDPStep_5::doTestStepL() + /** + * Test Cancel + */ + { + INFO_PRINTF1(_L("Fully Specified-WDP: Testing Cancel")); + + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer = 0; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect = EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + + ShowConnectionInfo(); + + error = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), error); + if( error == KErrNone) + { + TPckg aDataSizePckg(0); + TRequestStatus reqStatus; + iImp->AwaitRecvDataSize(aDataSizePckg, reqStatus); + SetState(EAwaitSize); + StartScheduler(); + iControl->ReStart(); + if(reqStatus==KErrCancel) + { + SetTestStepResult(EPass); + } + } + } + } + return TestStepResult(); + } + +TInt CFullySpecWDPStep_5::CallStateMachine() + { + INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State()); + switch(iState) + { + case EAwaitSize: + INFO_PRINTF1(_L("EAwaitSize")); + iImp->CancelRecv(); + SetState(EFinish); + iControl->ReStart(); + break; + case EFinish: + INFO_PRINTF1(_L("EFinish")); + SetState(EIdle); + StopScheduler(); + break; + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknow state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return 0; + } + +CFullySpecWDPStep_6::~CFullySpecWDPStep_6() + { + } + +CFullySpecWDPStep_6::CFullySpecWDPStep_6() + { + } + +TVerdict CFullySpecWDPStep_6::doTestStepL() + { + //Test timeout (Not in use) + return TestStepResult(); + } + +TInt CFullySpecWDPStep_6::CallStateMachine() + { + return KErrNone; + } + +CFullySpecWDPStep_7::~CFullySpecWDPStep_7() + { + } + +CFullySpecWDPStep_7::CFullySpecWDPStep_7() + { + } + +TVerdict CFullySpecWDPStep_7::doTestStepL() + // + //Test wrong sequenece + // + { + INFO_PRINTF1(_L("FULLYSPEC-WDP: Connect-Receive-Await-Await")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + + TInt bearer, port, bufLen; + TInt error = KErrNone; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + if(GetIntFromConfig(ConfigSection(),KWapWdpBufLength, bufLen)) + { + iWdpRecvBufLength=static_cast(bufLen); + } + iRecvBuffPtr = HBufC8::NewL(iWdpRecvBufLength); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CFullySpecWDPStep_7::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { +// WaitForInitializeL(); + if(iRecvBuffPtr == NULL) + { + err=KErrNoMemory; + } + else + { + iRecvBuf.Set(iRecvBuffPtr->Des()); + iImp->Recv(iRecvBuf, iTruncated, *iStatus, iTimeout); + SetState(EReceive); + activate = 1; + } + } + SetLastError(err); + if (err!=KErrNone) + { + SetState(EFinish); + iControl->ReStart(); + } + break; + + case EReceive: + INFO_PRINTF1(_L("EReceive")); + SetLastError(iStatus->Int()); + if(iStatus->Int() != KErrNone) + // Receiving fails as expect + { + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + if (verdict==EPass) + { + INFO_PRINTF1(_L("Receiving failed as expect")); + TRequestStatus reqStatus; + iImp->AwaitRecvDataSize(iLength, reqStatus); + iImp->AwaitRecvDataSize(iLength, *iStatus); + activate = 1; + SetState(EAwaitSize); + } + else + { + INFO_PRINTF1(_L("Receiving failed not as expect")); + iControl->ReStart(); + SetState(EFinish); + } + } + else + { + INFO_PRINTF1(_L("Receiving succeed not as expect")); + iControl->ReStart(); + SetState(EFinish); + } + break; + + case EAwaitSize: + INFO_PRINTF1(_L("EAwaitSize")); + SetLastError(iStatus->Int()); + iImp->CancelRecv(); + SetState(EFinish); + iControl->ReStart(); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + break; + } + return (activate); +} + +CFullySpecWDPStep_8::~CFullySpecWDPStep_8() + { + } +CFullySpecWDPStep_8::CFullySpecWDPStep_8() + { + } + +TVerdict CFullySpecWDPStep_8::doTestStepL() +/* +* Using invalid values for API parameters: +* - Invalid TUid on construction +* - Setting invalid timeout for Recv +* Note: wrong bearer value has already been implemented as part of test 2 +*/ + { + INFO_PRINTF1(_L("FullySpec-WDP: Wrong parameter values")); + if(TestStepResult() == EPass ) + { + TInt error; + if(GetIntFromConfig(ConfigSection(),KWapExError2, error)) + { + iExError2=error; + } + TInt trapValue; + TUid invalidInterfaceUid = {0x00000000}; + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid); + TRAP(trapValue, iImp = CWapFullySpecDatagramService::NewL(invalidInterfaceUid)); + TVerdict verdict = (trapValue == iExError2)?EPass:EFail; + if (verdict==EPass) + { + INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue); + } + SetTestStepResult(verdict); + } + return TestStepResult(); + } + +TInt CFullySpecWDPStep_8::CallStateMachine() + { + return KErrNone; + } + +CFullySpecWDPStep_9::~CFullySpecWDPStep_9() {} +CFullySpecWDPStep_9::CFullySpecWDPStep_9() {} +TVerdict CFullySpecWDPStep_9::doTestStepL() + { + return TestStepResult(); + } +TInt CFullySpecWDPStep_9::CallStateMachine() + { + return KErrNone; + } + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWDPSteps.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWDPSteps.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,142 @@ +/** +* Copyright (c) 2002-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/** + @file WapFullySpecWDPSteps.h +*/ +#if (!defined __FULLYSPECWDP_STEP_H__) +#define __FULLYSPECWDP_STEP_H__ +#include +#include +#include +#include + +#include "WapStackSuiteStepBase.h" + +_LIT(KFullySpecWDPStep_1,"FullySpecWDP_1"); +_LIT(KFullySpecWDPStep_2,"FullySpecWDP_2"); +_LIT(KFullySpecWDPStep_3,"FullySpecWDP_3"); +_LIT(KFullySpecWDPStep_4,"FullySpecWDP_4"); +_LIT(KFullySpecWDPStep_5,"FullySpecWDP_5"); +_LIT(KFullySpecWDPStep_6,"FullySpecWDP_6"); +_LIT(KFullySpecWDPStep_7,"FullySpecWDP_7"); +_LIT(KFullySpecWDPStep_8,"FullySpecWDP_8"); +_LIT(KFullySpecWDPStep_9,"FullySpecWDP_9"); + +class CFullySpecWDPStepBase : public CWapStackSuiteStepBase +{ +public: + ~CFullySpecWDPStepBase(); + void UnloadInterface(); +protected: + CFullySpecWDPStepBase(); + CWapFullySpecDatagramService* LoadInterface(); + CWapFullySpecDatagramService* iImp; +}; + +class CFullySpecWDPStep_1 : public CFullySpecWDPStepBase + { +public: + CFullySpecWDPStep_1(); + ~CFullySpecWDPStep_1(); + virtual TVerdict doTestStepL(); +private: + }; + +class CFullySpecWDPStep_2 : public CFullySpecWDPStepBase + { +public: + CFullySpecWDPStep_2(); + ~CFullySpecWDPStep_2(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWDPStep_3 : public CFullySpecWDPStepBase + { +public: + CFullySpecWDPStep_3(); + ~CFullySpecWDPStep_3(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWDPStep_4 : public CFullySpecWDPStepBase + { +public: + CFullySpecWDPStep_4(); + ~CFullySpecWDPStep_4(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWDPStep_5: public CFullySpecWDPStepBase + { +public: + CFullySpecWDPStep_5(); + ~CFullySpecWDPStep_5(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWDPStep_6: public CFullySpecWDPStepBase + { +public: + CFullySpecWDPStep_6(); + ~CFullySpecWDPStep_6(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWDPStep_7: public CFullySpecWDPStepBase + { +public: + CFullySpecWDPStep_7(); + ~CFullySpecWDPStep_7(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWDPStep_8: public CFullySpecWDPStepBase + { +public: + CFullySpecWDPStep_8(); + ~CFullySpecWDPStep_8(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWDPStep_9: public CFullySpecWDPStepBase + { +public: + CFullySpecWDPStep_9(); + ~CFullySpecWDPStep_9(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWSPSteps.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWSPSteps.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,983 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +/** + @file + @internalComponent +*/ + +#include "WapFullySpecWSPSteps.h" +#include "WapStackSuiteDefs.h" +#include +#include + +CFullySpecWSPStepBase::CFullySpecWSPStepBase() +/** +* Constructor +*/ + { + } + +CFullySpecWSPStepBase::~CFullySpecWSPStepBase() +/** +* Destructor +*/ + { + if(iImp) + { + UnloadInterface(); + } + } + +// Load CWapBoundDatagramService Interface +CWapFullySpecCLWSPService* CFullySpecWSPStepBase::LoadInterface() + { + TInt trapValue; + CWapFullySpecCLWSPService* implementation = NULL; + // UID {0x101FBB3E} - SWS implementation + TUid KInterfaceUid = {0x101FBB3E}; + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), KInterfaceUid); + TRAP(trapValue, implementation = CWapFullySpecCLWSPService::NewL(KInterfaceUid)); + if(!trapValue) + { + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), implementation); + return implementation; + } + else return NULL; + } + +void CFullySpecWSPStepBase::UnloadInterface() + { + INFO_PRINTF2(_L("Interface at implementation.addr = 0x%08x is deleted"), iImp); + delete iImp; + iImp = NULL; + REComSession::FinalClose(); + } + +CFullySpecWSPStep_1::~CFullySpecWSPStep_1() +/** +* Destructor +*/ + { + } + +CFullySpecWSPStep_1::CFullySpecWSPStep_1() +/** +* Constructor +*/ + { + } + +TVerdict CFullySpecWSPStep_1::doTestStepL() +/** +* @return - TVerdict code +* Override of base class pure virtual +* Our implementation only gets called if the base class doTestStepPreambleL() did +* not leave. That being the case, the current test result value will be EPass. +*/ + { + // + // CWapFullySpecCLWSPService + // + INFO_PRINTF1(_L("CreateImplementation - CWapFullySpecCLWSPService")); + INFO_PRINTF1(_L("Calling old NewL() method")); + + TInt trapValue; + + SetTestStepResult(EFail); + TRAP(trapValue, iImp = CWapFullySpecCLWSPService::NewL()); + if(!trapValue) + { + // interface is loaded + INFO_PRINTF2(_L("Interface is loaded: implementation.addr = 0x%08x"), iImp); + UnloadInterface(); + iImp = LoadInterface(); + if(iImp) + { + INFO_PRINTF1(_L("CreateImplementation - OK")); + SetTestStepResult(EPass); + UnloadInterface(); + } + } + return TestStepResult(); + } + +CFullySpecWSPStep_2::CFullySpecWSPStep_2() +/** +* Constructor +*/ + { + } + +CFullySpecWSPStep_2::~CFullySpecWSPStep_2() +/** +* Destructor +*/ + { + } + +TVerdict CFullySpecWSPStep_2::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("FULLYSPEC-WSP: Testing Connect")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer = 0; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect= EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + + if(UseSimTsy()) + { + GetIntFromConfig(ConfigSection(), KWapSIMTSYState, iSimTsyState); + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, iSimTsyState)); + } + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + // Start state machine + StartScheduler(); + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CFullySpecWSPStep_2::CallStateMachine() + { + TInt err = KErrNone; + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(State()) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + if(iReconnect) + { + INFO_PRINTF1(_L("Reconnection")); + iControl->ReStart(); + break; + } + } + SetState(EFinish); + SetLastError(err); + iControl->ReStart(); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(GetLastError() == GetExpectedError()) + { + SetTestStepResult(EPass); + } + else + { + SetTestStepResult(EFail); + } + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return (0); + } + +CFullySpecWSPStep_3::CFullySpecWSPStep_3() +/** +* Constructor +*/ + { + } + +CFullySpecWSPStep_3::~CFullySpecWSPStep_3() +/** +* Destructor +*/ + { + } + +TVerdict CFullySpecWSPStep_3::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("FullySpecWSP. Requests without connection")); + // check preamble result + TVerdict verdict = TestStepResult(); + if (verdict==EPass) + { + TInt err, ret; + iImp = LoadInterface(); + if (!iImp) + { + ERR_PRINTF1(_L("Unable to load FullySpecWSP Interface")); + verdict = EFail; + } + else + { + GetIntFromConfig(ConfigSection(),KWapExError,(TInt&)iExError); + ShowConnectionInfo(); + TBuf8<100> header, body; + TPckgBuf idPckg; + TWSPStatus wspStatus; + TRequestStatus reqStatus; + TUint32 timeout = 0; + ShowConnectionInfo(); + iImp->MethodResult(header, body, idPckg, wspStatus, reqStatus, timeout); + TRAP(ret, TEST_CHECKL(reqStatus.Int(), iExError, _L("MethodResult Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + Wap::TPort port; + err=iImp->GetLocalPort(port); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalPort Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + HBufC8* localHost; + err=iImp->GetLocalAddress(localHost); + TRAP(ret, TEST_CHECKL(err, iExError, _L("GetLocalAddress Fails not as expected"))) + if (ret) + verdict = EFail; + else + { + TBuf<100> uri; + TUint8 id = 0; + err=iImp->MethodInvoke(0x40, uri, header, body, id); + TRAP(ret, TEST_CHECKL(err, iExError, _L("MethodInvoke Fails not as expected"))) + if (ret) + verdict = EFail; + } + } + } + UnloadInterface(); + } + } + if (verdict==EPass) + { + INFO_PRINTF1(_L("FullySpecWSP. Requests Fail as expected")); + } + SetTestStepResult(verdict); + return TestStepResult(); + } + +TInt CFullySpecWSPStep_3::CallStateMachine() + { + return (0); + } + +CFullySpecWSPStep_4::CFullySpecWSPStep_4() +/** +* Constructor +*/ + { + } + +CFullySpecWSPStep_4::~CFullySpecWSPStep_4() +/** +* Destructor +*/ + { + } + +TVerdict CFullySpecWSPStep_4::doTestStepL() +/** +* Test Connect methoths +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("FULLYSPEC-WSP: UnitInvoke-UnitResult")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + + TInt bearer, port, repeat, method; + TInt error = KErrNone; + TPtrC headers; + TPtrC body; + TPtrC uri; + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) iLocalPort = (Wap::TPort)port; + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) SetExpectedError(error); + if(GetIntFromConfig(ConfigSection(),KWapWSPMethod, method)) iMethod = method; + if(GetIntFromConfig(ConfigSection(), KWapRepeat, repeat)) iRepeat = repeat; + + if(!GetStringFromConfig(ConfigSection(),KWapURI, uri)) + { + User::Leave(KErrNoMemory); + } + GetStringFromConfig(ConfigSection(),KWapWSPHeaders, headers); + GetStringFromConfig(ConfigSection(),KWapWSPBody, body); + + User::LeaveIfError(RProperty::Set(KUidSystemCategory, KUidPhonePwr.iUid, ESAPhoneOn)); + + if(UseSimTsy()) + { + User::LeaveIfError(RProperty::Set(KUidPSSimTsyCategory, KPSSimTsyTestNumber, 41)); + } + + + iURI = HBufC16::NewL(uri.Length()); + + iSendHeaders = HBufC8::NewL(headers.Length()); + + iSendBody = HBufC8::NewL(body.Length()); + + iRecvHeaders = HBufC8::NewL(KMaxWapWspHeaderBufferLength); + iRecvBody = HBufC8::NewL(KMaxWapWspDataBufferLength); + + TPtr16 tmp16 = iURI->Des(); + tmp16.Copy(uri); + TPtr8 tmp1 = iSendHeaders->Des(); + tmp1.Copy(headers); + TPtr8 tmp2 = iSendBody->Des(); + tmp2.Copy(body); + + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvHeadersBuf.Zero(); + iRecvBodyBuf.Set(iRecvBody->Des()); + iRecvBodyBuf.Zero(); + + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + + StartScheduler(); + + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + + delete iSendBody; + iSendBody=NULL; + delete iSendHeaders; + iSendHeaders=NULL; + delete iURI; + iURI=NULL; + + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CFullySpecWSPStep_4::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + TPtr8 tmp = iSendBody->Des(); + + static TUint total_headers = 0; + static TUint total_body = 0; + static TUint repeat = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + total_headers = 0; + total_body = 0; + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + SetState(EUnitInvoke); + } + else + { + SetState(EFinish); + } + SetLastError(err); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + iControl->ReStart(); + break; + + case EUnitInvoke: + INFO_PRINTF2(_L("EUnitInvoke: Method - 0x%02x"), iMethod); + if(iBearer != Wap::EIP) + { + TRAP(err, WaitForInitializeL()); + } + if(tmp.Length() != 0) + { + INFO_PRINTF1(_L("Data to send:")); + DumpBuf(tmp); + } + err = iImp->MethodInvoke(iMethod, iURI->Des(), iSendHeaders->Des(), iSendBody->Des(), iTransactionId); + INFO_PRINTF3(_L("MethodInvoke() retcode: - dec: %d hex: 0x%08x"), err, err); + if(err == KErrNone) + { + SetState(EUnitResult); + } + else + { + SetState(EFinish); + } + SetLastError(err); + iControl->ReStart(); + break; + + case EUnitResult: + + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvHeadersBuf.Zero(); + iRecvBodyBuf.Set(iRecvBody->Des()); + iRecvBodyBuf.Zero(); + iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout); + INFO_PRINTF2(_L("EUnitResult: status 0x%08x"), iStatus->Int()); + activate = 1; + SetLastError(err); + SetState(EFinish); + break; + + case EFinish: + + INFO_PRINTF4(_L("EFinish: Status: %d, WSP status: %d (0x%02x)"), iStatus->Int(), iWspStatus, iWspStatus); + + if(iRecvHeadersBuf.Length() != 0) + { + INFO_PRINTF1(_L("Headers")); + total_headers += iRecvHeadersBuf.Length(); + DumpBuf(iRecvHeadersBuf); + } + + if(iRecvBodyBuf.Length() != 0) + { + INFO_PRINTF1(_L("Body")); + total_body += iRecvBodyBuf.Length(); + DumpBuf(iRecvBodyBuf); + } + + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + if(iStatus->Int() == Wap::EMoreData) + { + INFO_PRINTF1(_L("NOTE: More data... calling MethodResult()")); + SetState(EUnitResult); + iControl->ReStart(); + break; + } + } + + INFO_PRINTF3(_L("Data received: headers - %d bytes, body - %d bytes"), total_headers, total_body); + total_headers = 0; + total_body = 0; + if((--iRepeat != 0) && (iStatus->Int() == KErrNone)) + { + ++repeat; + INFO_PRINTF2(_L("REPEAT TEST - %d"), repeat); + if(err == KErrNone) + { + SetState(EUnitInvoke); + iControl->ReStart(); + break; + } + } + + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + break; + } + return (activate); + } + + +CFullySpecWSPStep_5::CFullySpecWSPStep_5() +/** +* Constructor +*/ + { + } + +CFullySpecWSPStep_5::~CFullySpecWSPStep_5() +/** +* Destructor +*/ + { + } + +TVerdict CFullySpecWSPStep_5::doTestStepL() +/** +* Test Cancel Request +* @return - TVerdict code +* +*/ + { + INFO_PRINTF1(_L("BoundCLPush. Testing Cancel Request")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + TInt bearer = 0; + TInt error = KErrNone; + TBool secure= EFalse; + TBool reconnect= EFalse; + SetLastError(KErrNone); + + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) iBearer = (Wap::TBearer)bearer; + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) SetExpectedError(error); + if(GetBoolFromConfig(ConfigSection(), KWapSecure, secure)) iSecure = secure; + if(GetBoolFromConfig(ConfigSection(),_L("Reconnect"), reconnect)) iReconnect = reconnect; + + ShowConnectionInfo(); + + error = iImp->Connect(iRemoteHost, iRemotePort, iBearer, iSecure); + INFO_PRINTF2(_L("Connection completed with code = %d"), error); + if( error == KErrNone) + { + TBuf8<100> header, body; + TPckgBuf idPckg; + TWSPStatus wspStatus; + TRequestStatus reqStatus; + TUint32 timeout=0; + iImp->MethodResult(header, body, idPckg, wspStatus, reqStatus, timeout); + SetState(EUnitResult); + StartScheduler(); + iControl->ReStart(); + if(reqStatus==KErrCancel) + { + SetTestStepResult(EPass); + } + + } + } + } + return TestStepResult(); + } + +TInt CFullySpecWSPStep_5::CallStateMachine() + { + INFO_PRINTF2(_L("CallStateMachine: step [%d]"), State()); + switch(iState) + { + case EUnitResult: + INFO_PRINTF1(_L("EUnitResult")); + iImp->CancelReq(); + SetState(EFinish); + iControl->ReStart(); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(EFail); + StopScheduler(); + break; + } + return (0); + } + + +CFullySpecWSPStep_6::CFullySpecWSPStep_6() + { + } + +CFullySpecWSPStep_6::~CFullySpecWSPStep_6() + { + } + +TVerdict CFullySpecWSPStep_6::doTestStepL() +/* +* Test receive time out +*/ + { + INFO_PRINTF1(_L("BOUND-WSP: Connect-UnitResult-TimeOut")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + TInt bearer, port; + TInt error = KErrNone; + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + TInt headerLength, bufLength, timeOut; + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength)) + { + iHeaderRecvBufLength=static_cast(headerLength); + } + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength)) + { + iBodyRecvBufLength=static_cast(bufLength); + } + if(GetIntFromConfig(ConfigSection(),KWapTimeOut, timeOut)) + { + iTimeout=timeOut; + } + iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength); + iRecvBody = HBufC8::NewL(iBodyRecvBufLength); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + // Start state machine + StartScheduler(); + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CFullySpecWSPStep_6::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { + // WaitForInitializeL(); + iRecvHeadersBuf.Set(iRecvHeaders->Des()); + iRecvBodyBuf.Set(iRecvBody->Des()); + iImp->MethodResult(iRecvHeadersBuf, iRecvBodyBuf, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout); + INFO_PRINTF1(_L("MethodResult")); + activate = 1; + } + else + { + iControl->ReStart(); + } + SetLastError(err); + SetState(EFinish); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + break; + } + return (activate); + } + +CFullySpecWSPStep_7::CFullySpecWSPStep_7() + { + } +CFullySpecWSPStep_7::~CFullySpecWSPStep_7() + { + } +TVerdict CFullySpecWSPStep_7::doTestStepL() + { + INFO_PRINTF1(_L("FULLYSPEC-WSP: Connect-UnitResult-TimeOut")); + if(TestStepResult() == EPass ) + { + SetTestStepResult(EFail); + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + TInt bearer, port; + TInt error = KErrNone; + if(GetIntFromConfig(ConfigSection(),KWapBearer, bearer)) + { + iBearer = static_cast(bearer); + } + if(GetIntFromConfig(ConfigSection(),KWapLocalPort, port)) + { + iLocalPort = static_cast(port); + } + if(GetIntFromConfig(ConfigSection(),KWapExError, error)) + { + SetExpectedError(error); + } + TInt headerLength, bufLength; + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvHeaderLength, headerLength)) + { + iHeaderRecvBufLength=static_cast(headerLength); + } + if(GetIntFromConfig(ConfigSection(),KWapWSPRecvBodyLength, bufLength)) + { + iBodyRecvBufLength=static_cast(bufLength); + } + iRecvHeaders = HBufC8::NewL(iHeaderRecvBufLength); + iRecvBody = HBufC8::NewL(iBodyRecvBufLength); + SetState(EConnect); + iControl->ReStart(); + ShowConnectionInfo(); + + StartScheduler(); + delete iRecvBody; + iRecvBody=NULL; + delete iRecvHeaders; + iRecvHeaders=NULL; + UnloadInterface(); + } + } + return TestStepResult(); + } + +TInt CFullySpecWSPStep_7::CallStateMachine() + { + TVerdict verdict = EFail; + TInt err = KErrNone; + TInt activate = 0; + TDes8 headers = iRecvHeaders->Des(); + TDes8 body = iRecvBody->Des(); + + INFO_PRINTF2(_L("CallStateMachine: state [%d]"), State()); + switch(iState) + { + case EConnect: + INFO_PRINTF1(_L("EConnect")); + err = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), err); + if( err == KErrNone) + { +// WaitForInitializeL(); + TRequestStatus reqStatus; + iImp->MethodResult(headers, body, iTransactionIdPckg, iWspStatus, reqStatus, iTimeout); + iImp->MethodResult(headers, body, iTransactionIdPckg, iWspStatus, *iStatus, iTimeout); + INFO_PRINTF1(_L("MethodResult")); + activate = 1; + } + else + { + iControl->ReStart(); + } + SetLastError(err); + SetState(EFinish); + break; + + case EFinish: + INFO_PRINTF1(_L("EFinish")); + if(iStatus->Int() != KErrNone) + { + SetLastError(iStatus->Int()); + } + verdict = (GetLastError() == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + SetState(EIdle); + StopScheduler(); + break; + + case EIdle: + default: + INFO_PRINTF2(_L("Error: EIdle or unknown state %d"), State()); + SetTestStepResult(verdict); + StopScheduler(); + + break; + } + return (activate); + } + +CFullySpecWSPStep_8::CFullySpecWSPStep_8() + { + } +CFullySpecWSPStep_8::~CFullySpecWSPStep_8() + { + } +TVerdict CFullySpecWSPStep_8::doTestStepL() +/* +* Using invalid values for API parameters: +* - Invalid TUid on construction +* - Invalid method for MethodInvoke +* - Invalid timeout for MethodResult +* Note: wrong bearer value has already been implemented as part of test 2 +*/ + { + INFO_PRINTF1(_L("FullySpec-WSP: Wrong parameters testing")); + if(TestStepResult() == EPass ) + { + TInt error; + if(GetIntFromConfig(ConfigSection(),KWapExError2, error)) + { + iExError2=error; + } + TInt trapValue; + TUid invalidInterfaceUid = {0x00000000}; + INFO_PRINTF2(_L("Calling new NewL(0x%08X) method"), invalidInterfaceUid); + TRAP(trapValue, iImp = CWapFullySpecCLWSPService::NewL(invalidInterfaceUid)); + TVerdict verdict = (trapValue == iExError2)?EPass:EFail; + if (verdict==EFail) + { + SetTestStepResult(EFail); + return TestStepResult(); + } + else + { + INFO_PRINTF2(_L("CreateImplementation with wrong Uid- Failed as expected with error %d"),trapValue); + + // Now use the correct Uid + iImp = LoadInterface(); + if(iImp) + { + SetLastError(KErrNone); + TInt error = KErrNone; + TInt method; + TPtrC headers; + TPtrC body; + TPtrC uri; + + if (GetIntFromConfig(ConfigSection(),KWapWSPMethod, method)) + { + iMethod=method; + } + + if(GetIntFromConfig(ConfigSection(), KWapExError, error)) + { + SetExpectedError(error); + } + + if(!GetStringFromConfig(ConfigSection(),KWapURI, uri) || \ + !GetStringFromConfig(ConfigSection(),KWapWSPHeaders, headers) || \ + !GetStringFromConfig(ConfigSection(),KWapWSPBody, body)) + { + User::Leave(KErrNoMemory); + } + + iURI = HBufC16::NewL(uri.Length()); + + iSendHeaders = HBufC8::NewL(headers.Length()); + + iSendBody = HBufC8::NewL(body.Length()); + + TPtr16 tmp16 = iURI->Des(); + tmp16.Copy(uri); + TPtr8 tmp = iSendHeaders->Des(); + tmp.Copy(headers); + TPtr8 tmp1 = iSendBody->Des(); + tmp1.Copy(body); + + ShowConnectionInfo(); + error = iImp->Connect(iRemoteHost, iRemotePort, iBearer, EFalse); + INFO_PRINTF2(_L("Connection completed with code = %d"), error); + if( error == KErrNone) + { + error =iImp->MethodInvoke(iMethod, iURI->Des(), iSendHeaders->Des(), iSendBody->Des(), iTransactionId); + } + TVerdict verdict = (error == GetExpectedError())?EPass:EFail; + SetTestStepResult(verdict); + delete iSendBody; + iSendBody=NULL; + delete iSendHeaders; + iSendHeaders=NULL; + delete iURI; + iURI=NULL; + UnloadInterface(); + } + } + } + return TestStepResult(); + } + +TInt CFullySpecWSPStep_8::CallStateMachine() + { + return (0); + } + +CFullySpecWSPStep_9::CFullySpecWSPStep_9() {} +CFullySpecWSPStep_9::~CFullySpecWSPStep_9() {} +TVerdict CFullySpecWSPStep_9::doTestStepL() + { + return TestStepResult(); + } + +TInt CFullySpecWSPStep_9::CallStateMachine() + { + return (0); + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWSPSteps.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapFullySpecWSPSteps.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,139 @@ +/** +* Copyright (c) 2002-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/** + @file WapFullySpecWSPSteps.h +*/ +#if (!defined __FULLYSPECWSP_STEP_H__) +#define __FULLYSPECWSP_STEP_H__ +#include +#include +#include +#include +#include "WapStackSuiteStepBase.h" + +_LIT(KFullySpecWSPStep_1,"FullySpecWSP_1"); +_LIT(KFullySpecWSPStep_2,"FullySpecWSP_2"); +_LIT(KFullySpecWSPStep_3,"FullySpecWSP_3"); +_LIT(KFullySpecWSPStep_4,"FullySpecWSP_4"); +_LIT(KFullySpecWSPStep_5,"FullySpecWSP_5"); +_LIT(KFullySpecWSPStep_6,"FullySpecWSP_6"); +_LIT(KFullySpecWSPStep_7,"FullySpecWSP_7"); +_LIT(KFullySpecWSPStep_8,"FullySpecWSP_8"); +_LIT(KFullySpecWSPStep_9,"FullySpecWSP_9"); + +class CFullySpecWSPStepBase : public CWapStackSuiteStepBase +{ +public: + CFullySpecWSPStepBase(); + ~CFullySpecWSPStepBase(); + CWapFullySpecCLWSPService* LoadInterface(); + void UnloadInterface(); +protected: + CWapFullySpecCLWSPService* iImp; +}; + + +class CFullySpecWSPStep_1 : public CFullySpecWSPStepBase + { +public: + CFullySpecWSPStep_1(); + ~CFullySpecWSPStep_1(); + virtual TVerdict doTestStepL(); +private: + }; + +class CFullySpecWSPStep_2 : public CFullySpecWSPStepBase + { +public: + CFullySpecWSPStep_2(); + ~CFullySpecWSPStep_2(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWSPStep_3: public CFullySpecWSPStepBase + { +public: + CFullySpecWSPStep_3(); + ~CFullySpecWSPStep_3(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWSPStep_4: public CFullySpecWSPStepBase + { +public: + CFullySpecWSPStep_4(); + ~CFullySpecWSPStep_4(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWSPStep_5: public CFullySpecWSPStepBase + { +public: + CFullySpecWSPStep_5(); + ~CFullySpecWSPStep_5(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +class CFullySpecWSPStep_6: public CFullySpecWSPStepBase + { +public: + CFullySpecWSPStep_6(); + ~CFullySpecWSPStep_6(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CFullySpecWSPStep_7: public CFullySpecWSPStepBase + { +public: + CFullySpecWSPStep_7(); + ~CFullySpecWSPStep_7(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CFullySpecWSPStep_8: public CFullySpecWSPStepBase + { +public: + CFullySpecWSPStep_8(); + ~CFullySpecWSPStep_8(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; +class CFullySpecWSPStep_9: public CFullySpecWSPStepBase + { +public: + CFullySpecWSPStep_9(); + ~CFullySpecWSPStep_9(); + virtual TVerdict doTestStepL(); + virtual TInt CallStateMachine(); +private: + }; + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteDefs.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteDefs.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,96 @@ +/** +* Copyright (c) 2002-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/** + @file WapStackSuiteDefs.h +*/ + +#include +#include + +// Although Publish and Subscribe replaces System Agent, +// the UIDs we need are still defined by System Agent +#include + +_LIT(KWapCommonSec, "COMMON"); + +_LIT(KWapBearer,"Bearer"); +_LIT(KWapRemoteHost,"Remote_Host"); +_LIT(KWapRemotePort,"Remote_Port"); +_LIT(KWapLocalHost,"Local_Host"); +_LIT(KWapLocalPort,"Local_Port"); +_LIT(KLocalPort,"LocalPort"); +_LIT(KRemotePort,"RemotePort"); +_LIT(KWapExError, "ExError"); +_LIT(KWapExError2, "ExError2"); +_LIT(KWapReconnect, "Reconnect"); +_LIT(KWapSecure, "Secure"); +_LIT(KWapRepeat, "Repeat"); +_LIT(KWapData, "Data"); +_LIT(KWapDataType, "Type"); +_LIT(KWapUseSIMTSY, "SimTsy"); +_LIT(KWapDetailedLogging, "DetailedLogging"); +_LIT(KWapDelayPortClosure, "DelayPortClosure"); +_LIT(KWapSIMTSYState, "TsyState"); +_LIT(KWapTimeOut, "TimeOut"); +_LIT(KWapWdpBufLength, "WDPBufLength"); +_LIT(KAwaitLengthCancel, "AwaitLengthCancel"); +_LIT(KMiddleCancel, "MiddleCancel"); +_LIT(KMultiReadCancel, "MultiReadCancel"); +_LIT(KAwaitLengthTwice, "AwaitLengthTwice"); +// WSP +_LIT(KWapWSPMethod, "WSPMethod"); +_LIT(KWapWSPHeaders, "WSPHeaders"); +_LIT(KWapWSPBody, "WSPBody"); +_LIT(KWapURI, "WSPURI"); +_LIT(KWapWSPRecvHeaderLength, "WSPHeaderLength"); +_LIT(KWapWSPRecvBodyLength, "WSPBodyLength"); + +_LIT(KWapWDPStackSuiteLogFile,"WapWDPLog"); +_LIT(KWapPushStackSuiteLogFile,"WapPushLog"); +_LIT(KWapWSPStackSuiteLogFile,"WapWSPLog"); + + +_LIT(KWapStartC32,"StartC32"); + +// For test step panics +_LIT(KWapStackSuitePanic,"WapStackSuite"); +enum TWapSuitePanicCodes{EDataCorrupt = 1}; + +// Port for the echo server +// Could be read from the ini file +const TInt KEchoPort = 7; + +////////////////////////////////////////////////////////////////////////////// +// Wap Address / Port Settings +////////////////////////////////////////////////////////////////////////////// +/* + EWapPortUnspecified = -1, // Unspecified + EWapPortWsp = 9200, // Connectionless session protocol + EWapPortWspWtp = 9201, // Connection oriented session protocol + EWapPortWspWtls = 9202, // Secure connectionless session protocol + EWapPortWspWtpWtls = 9203, // Secure connection oriented session protocol + EWapPortVCard = 9204, // vCard + EWapPortVCardWtls = 9206, // Secure vCard + EWapPortVCal = 9205, // vCal + EWapPortVCalWtls = 9207 // Secure vCal + }; +*/ + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteServer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteServer.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,236 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// WAP stack test suite server +// +// + +/** + @file + @internalComponent +*/ + +// Include your own server header file and step header file(s) here +#include "WapStackSuiteServer.h" + +#include "WapBoundWDPSteps.h" +#include "WapBoundCLPushSteps.h" +#include "WapBoundWSPSteps.h" +#include "WapFullySpecCLPushSteps.h" +#include "WapFullySpecWDPSteps.h" +#include "WapFullySpecWSPSteps.h" +#include + +_LIT(KServerName,"WapStackSuite"); +CWapStackSuite* CWapStackSuite::NewL() +/** + * @return - Instance of the test server + * Same code for Secure and non-secure variants + * Called inside the MainL() function to create and start the + * CTestServer derived server. + */ + { + CWapStackSuite * server = new (ELeave) CWapStackSuite(); + CleanupStack::PushL(server); + // CServer base class call + server->StartL(KServerName); + CleanupStack::Pop(server); + return server; + } + + + +LOCAL_C void MainL() + { +#if (defined __DATA_CAGING__) + RProcess().DataCaging(RProcess::EDataCagingOn); + RProcess().SecureApi(RProcess::ESecureApiOn); +#endif + CActiveScheduler* sched=NULL; + sched=new(ELeave) CActiveScheduler; + CActiveScheduler::Install(sched); + CWapStackSuite* server = NULL; + // Create the CTestServer derived server + TRAPD(err,server = CWapStackSuite::NewL()); + if(!err) + { + // Sync with the client and enter the active scheduler + RProcess::Rendezvous(KErrNone); + sched->Start(); + } + delete server; + delete sched; + } + + + +GLDEF_C TInt E32Main() +/** + * @return - Standard Epoc error code on process exit + * Secure variant only + * Process entry point. Called by client using RProcess API + */ + { + __UHEAP_MARK; + CTrapCleanup* cleanup = CTrapCleanup::New(); + if(cleanup == NULL) + { + return KErrNoMemory; + } + TRAPD(err,MainL()); + delete cleanup; + __UHEAP_MARKEND; + return err; + } + +CTestStep* CWapStackSuite::CreateTestStep(const TDesC& aStepName) +/** + * @return - A CTestStep derived instance + * Secure and non-secure variants + * Implementation of CTestServer pure virtual + */ + { + CTestStep* testStep = NULL; + // Creating your own test steps here + //************************************* + // BOUND connection tests + //************************************* + + // Bound WDP steps [1 - 9] + if(aStepName == KBoundWDPStep_1) + testStep = new CBoundWDPStep_1(); + else if(aStepName == KBoundWDPStep_2) + testStep = new CBoundWDPStep_2(); + else if(aStepName == KBoundWDPStep_3) + testStep = new CBoundWDPStep_3(); + else if(aStepName == KBoundWDPStep_4) + testStep = new CBoundWDPStep_4(); + else if(aStepName == KBoundWDPStep_5) + testStep = new CBoundWDPStep_5(); + else if(aStepName == KBoundWDPStep_6) + testStep = new CBoundWDPStep_6(); + else if(aStepName == KBoundWDPStep_7) + testStep = new CBoundWDPStep_7(); + else if(aStepName == KBoundWDPStep_8) + testStep = new CBoundWDPStep_8(); + else if(aStepName == KBoundWDPStep_9) + testStep = new CBoundWDPStep_9(); + else if(aStepName == KBoundWDPStep_OutOfMemory) + testStep = new CBoundWDPStep_OutOfMemory(); + + // Bound Push tests [1 - 9] + else if(aStepName == KBoundCLPushStep_1) + testStep = new CBoundCLPushStep_1(); + else if(aStepName == KBoundCLPushStep_2) + testStep = new CBoundCLPushStep_2(); + else if(aStepName == KBoundCLPushStep_3) + testStep = new CBoundCLPushStep_3(); + else if(aStepName == KBoundCLPushStep_4) + testStep = new CBoundCLPushStep_4(); + else if(aStepName == KBoundCLPushStep_5) + testStep = new CBoundCLPushStep_5(); + else if(aStepName == KBoundCLPushStep_6) + testStep = new CBoundCLPushStep_6(); + else if(aStepName == KBoundCLPushStep_7) + testStep = new CBoundCLPushStep_7(); + else if(aStepName == KBoundCLPushStep_8) + testStep = new CBoundCLPushStep_8(); + else if(aStepName == KBoundCLPushStep_9) + testStep = new CBoundCLPushStep_9(); + + // Bound WSP tests [1 - 9] + else if(aStepName == KBoundWSPStep_1) + testStep = new CBoundWSPStep_1(); + else if(aStepName == KBoundWSPStep_2) + testStep = new CBoundWSPStep_2(); + else if(aStepName == KBoundWSPStep_3) + testStep = new CBoundWSPStep_3(); + else if(aStepName == KBoundWSPStep_4) + testStep = new CBoundWSPStep_4(); + else if(aStepName == KBoundWSPStep_5) + testStep = new CBoundWSPStep_5(); + else if(aStepName == KBoundWSPStep_6) + testStep = new CBoundWSPStep_6(); + else if(aStepName == KBoundWSPStep_7) + testStep = new CBoundWSPStep_7(); + else if(aStepName == KBoundWSPStep_8) + testStep = new CBoundWSPStep_8(); + else if(aStepName == KBoundWSPStep_9) + testStep = new CBoundWSPStep_9(); + + //************************************* + // FULLY SPECIFIED connection tests + //************************************* + + // Fully spec. WDP [1 - 9 + else if(aStepName == KFullySpecWDPStep_1) + testStep = new CFullySpecWDPStep_1(); + else if(aStepName == KFullySpecWDPStep_2) + testStep = new CFullySpecWDPStep_2(); + else if(aStepName == KFullySpecWDPStep_3) + testStep = new CFullySpecWDPStep_3(); + else if(aStepName == KFullySpecWDPStep_4) + testStep = new CFullySpecWDPStep_4(); + else if(aStepName == KFullySpecWDPStep_5) + testStep = new CFullySpecWDPStep_5(); + else if(aStepName == KFullySpecWDPStep_6) + testStep = new CFullySpecWDPStep_6(); + else if(aStepName == KFullySpecWDPStep_7) + testStep = new CFullySpecWDPStep_7(); + else if(aStepName == KFullySpecWDPStep_8) + testStep = new CFullySpecWDPStep_8(); + else if(aStepName == KFullySpecWDPStep_9) + testStep = new CFullySpecWDPStep_9(); + + // Fully spec. Push [1 - 9] + else if(aStepName == KFullySpecCLPushStep_1) + testStep = new CFullySpecCLPushStep_1(); + else if(aStepName == KFullySpecCLPushStep_2) + testStep = new CFullySpecCLPushStep_2(); + else if(aStepName == KFullySpecCLPushStep_3) + testStep = new CFullySpecCLPushStep_3(); + else if(aStepName == KFullySpecCLPushStep_4) + testStep = new CFullySpecCLPushStep_4(); + else if(aStepName == KFullySpecCLPushStep_5) + testStep = new CFullySpecCLPushStep_5(); + else if(aStepName == KFullySpecCLPushStep_6) + testStep = new CFullySpecCLPushStep_6(); + else if(aStepName == KFullySpecCLPushStep_7) + testStep = new CFullySpecCLPushStep_7(); + else if(aStepName == KFullySpecCLPushStep_8) + testStep = new CFullySpecCLPushStep_8(); + else if(aStepName == KFullySpecCLPushStep_9) + testStep = new CFullySpecCLPushStep_9(); + + // Fully spec. WSP [1 - 9] + else if(aStepName == KFullySpecWSPStep_1) + testStep = new CFullySpecWSPStep_1(); + else if(aStepName == KFullySpecWSPStep_2) + testStep = new CFullySpecWSPStep_2(); + else if(aStepName == KFullySpecWSPStep_3) + testStep = new CFullySpecWSPStep_3(); + else if(aStepName == KFullySpecWSPStep_4) + testStep = new CFullySpecWSPStep_4(); + else if(aStepName == KFullySpecWSPStep_5) + testStep = new CFullySpecWSPStep_5(); + else if(aStepName == KFullySpecWSPStep_6) + testStep = new CFullySpecWSPStep_6(); + else if(aStepName == KFullySpecWSPStep_7) + testStep = new CFullySpecWSPStep_7(); + else if(aStepName == KFullySpecWSPStep_8) + testStep = new CFullySpecWSPStep_8(); + else if(aStepName == KFullySpecWSPStep_9) + testStep = new CFullySpecWSPStep_9(); + + return testStep; + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteServer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteServer.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,38 @@ +/** +* Copyright (c) 2002-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/** + @file WapStackSuiteServer.h +*/ + +#if (!defined __WAPSTACK_SUITE_SERVER_H__) +#define __WAPSTACK_SUITE_SERVER_H__ +#include + +class CWapStackSuite : public CTestServer + { +public: + IMPORT_C TInt NewServer(); + static CWapStackSuite* NewL(); + // Base class pure virtual override + virtual CTestStep* CreateTestStep(const TDesC& aStepName); +private: + }; + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteStepBase.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteStepBase.cpp Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,410 @@ +// Copyright (c) 2002-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" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +/** + @file + @internalComponent +*/ + +#include +#include +#include +#include +#include "WapStackSuiteDefs.h" +#include "WapStackSuiteStepBase.h" + +CWapStackSuiteStepBase::CWapStackSuiteStepBase() : iLenBuffer(0), iLength(iLenBuffer), iRecvBuf(0,0), iRecvHeadersBuf(0,0), iRecvBodyBuf(0,0) + { + SetTestStepName(KWapWDPStackSuiteLogFile); + iSendBuffPtr = NULL; + iRecvBuffPtr = NULL; + iRecvHeaders = NULL; + iRecvBody = NULL; + iURI = NULL; + iSendHeaders = NULL; + iSendBody = NULL; + } + +CWapStackSuiteStepBase::~CWapStackSuiteStepBase() + { + if(iSendBuffPtr) delete iSendBuffPtr; + if(iRecvBuffPtr) delete iRecvBuffPtr; + if(iRecvHeaders) delete iRecvHeaders; + if(iRecvBody) delete iRecvBody; + if(iURI) delete iURI; + if(iSendHeaders) delete iSendHeaders; + if(iSendBody) delete iSendBody; + } + +TVerdict CWapStackSuiteStepBase::doTestStepPreambleL() +/** +* @return - TVerdict +* Implementation of CTestStep base class virtual +* Load serial drivers +* Do all initialisation common to derived classes in here. +*/ + { + __UHEAP_MARK; + TInt err = KErrNone; + CActiveScheduler* sheduler; + sheduler = new(ELeave) CActiveScheduler; + CActiveScheduler::Install(sheduler); + SetScheduler(sheduler); + + iControl = CActiveControl::NewL(this); + sheduler->Add(iControl); + iStatus = iControl->Status(); + + + err=User::LoadPhysicalDevice(PDD_NAME); + if (err!=KErrNone && err!=KErrAlreadyExists) User::Leave(err); + + err=User::LoadLogicalDevice(LDD_NAME ); + if (err!=KErrNone && err!=KErrAlreadyExists) User::Leave(err); + + TBool startC32 = ETrue; + GetBoolFromConfig(ConfigSection(),KWapStartC32, startC32); + if(startC32) + { + _LIT(KPhbkSyncCMI, "phbsync.cmi"); + err = StartC32WithCMISuppressions(KPhbkSyncCMI); + ERR_PRINTF2(TRefByValue(_L("Start Comms Process Status = %d\n")), err); + if(err!=KErrNone && err!=KErrAlreadyExists) + { + User::Leave(err); + } + } + + LoadConfig(); + + SetTestStepResult(EPass); + return TestStepResult(); + } + +TVerdict CWapStackSuiteStepBase::doTestStepPostambleL() + { + + delete iControl; + iControl = NULL; + delete Scheduler(); + if(iSendBuffPtr) delete iSendBuffPtr; + iSendBuffPtr = NULL; + if(iRecvBuffPtr) delete iRecvBuffPtr; + iRecvBuffPtr = NULL; + __UHEAP_MARKEND; + return TestStepResult(); + } + +void CWapStackSuiteStepBase::LoadConfig() + { + TPtrC16 remote_host, local_host; + + GetIntFromConfig(KWapCommonSec, KWapBearer, (TInt&)iBearer); + if(GetStringFromConfig(KWapCommonSec, KWapRemoteHost, remote_host)) + { + iRemoteHost.Copy(remote_host); + } + if(GetStringFromConfig(KWapCommonSec, KWapLocalHost, local_host)) + { + iLocalHost.Copy(local_host); + } + TInt remote, local, timeOut; + if(GetIntFromConfig(KWapCommonSec, KWapRemotePort, remote)) + { + iRemotePort = static_cast(remote); + } + if(GetIntFromConfig(KWapCommonSec, KWapLocalPort, local)) + { + iLocalPort = static_cast(local); + } + if(GetIntFromConfig(KWapCommonSec,KWapTimeOut, timeOut)) + { + iTimeout=timeOut; + } + TInt headerLength, bufLength, bufLen, method; + if(GetIntFromConfig(KWapCommonSec,KWapWSPRecvHeaderLength, headerLength)) + { + iHeaderRecvBufLength=static_cast(headerLength); + } + if(GetIntFromConfig(KWapCommonSec,KWapWSPRecvBodyLength, bufLength)) + { + iBodyRecvBufLength=static_cast(bufLength); + } + if(GetIntFromConfig(KWapCommonSec,KWapWdpBufLength, bufLen)) + { + iWdpRecvBufLength=static_cast(bufLen); + } + if(GetIntFromConfig(KWapCommonSec,KWapWSPMethod, method)) + { + iMethod = static_cast(method); + } + else + { + iMethod = 64; // default method GET + } + GetIntFromConfig(KWapCommonSec, KWapExError, iExError); + if(!GetIntFromConfig(KWapCommonSec, KWapRepeat, iRepeat)) + { + iRepeat = 1; + }; + + GetIntFromConfig(KWapCommonSec, KWapExError2, iExError2); + GetBoolFromConfig(KWapCommonSec, KWapUseSIMTSY, iUseSIMTSY); + GetBoolFromConfig(KWapCommonSec, KWapDetailedLogging, iDetailedLogging); + GetBoolFromConfig(KWapCommonSec, KAwaitLengthCancel, iAwaitLengthCancel); + GetBoolFromConfig(KWapCommonSec, KMiddleCancel, iMiddleCancel); + GetBoolFromConfig(KWapCommonSec, KMultiReadCancel, iMultiReadCancel); + GetBoolFromConfig(KWapCommonSec, KAwaitLengthTwice, iAwaitLengthTwice); + GetBoolFromConfig(KWapCommonSec, KWapDelayPortClosure, iDelayPortClosure); + GetIntFromConfig(KWapCommonSec,KWapSIMTSYState, iSimTsyState); + + TInt result; + // if using SIMTSY, we need to define the test number property + // since we set the test number before loading SIMTSY + if (iUseSIMTSY) + { + result = RProperty::Define(KUidPSSimTsyCategory, KPSSimTsyTestNumber, RProperty::EInt); + __ASSERT_ALWAYS(result == KErrNone || result == KErrAlreadyExists,User::Panic(KWapStackSuitePanic, EDataCorrupt)); + } + + // Phone power property, normally defined by UIKON, is not defined by any + // startup code in console builds - we're on our own with this one. + result = RProperty::Define(KUidSystemCategory, KUidPhonePwr.iUid, RProperty::EInt); + __ASSERT_ALWAYS(result == KErrNone || result == KErrAlreadyExists,User::Panic(KWapStackSuitePanic, EDataCorrupt)); + + } + +TInt CWapStackSuiteStepBase::CallStateMachine() + { + return (0); + } + +void CWapStackSuiteStepBase::StartScheduler() + { + INFO_PRINTF1(_L("Star Scheduler")); + CActiveScheduler::Start(); + } + +void CWapStackSuiteStepBase::StopScheduler() + { + INFO_PRINTF1(_L("Stop Scheduler")); + CActiveScheduler::Stop(); + } + +void CWapStackSuiteStepBase::WaitForInitializeL() + { + _LIT(KMMTSY,"MM"); + _LIT(KSIMTSY,"SIM"); + + TName tsy; + + if(UseSimTsy()) + { + tsy=KSIMTSY; + } + else + { + tsy = KMMTSY; + } + + RTelServer serverT; + User::LeaveIfError(serverT.Connect()); + CleanupClosePushL(serverT); + User::LeaveIfError(serverT.LoadPhoneModule(tsy)); + INFO_PRINTF2(_L("%S TSY loaded"), &tsy); + + // Find the phone corresponding to this TSY and open a number of handles on it + TInt numPhones; + User::LeaveIfError(serverT.EnumeratePhones(numPhones)); + RPhone phone; + while (numPhones--) + { + TName phoneTsy; + User::LeaveIfError(serverT.GetTsyName(numPhones,phoneTsy)); + if (phoneTsy.CompareF(tsy)==KErrNone) + { + RTelServer::TPhoneInfo info; + User::LeaveIfError(serverT.GetPhoneInfo(numPhones,info)); + User::LeaveIfError(phone.Open(serverT,info.iName)); + CleanupClosePushL(phone); + const TInt err = phone.Initialise(); + User::LeaveIfError(err); + CleanupStack::PopAndDestroy(&phone); + break; + } + } + CleanupStack::PopAndDestroy(&serverT); + } + +void CWapStackSuiteStepBase::DumpBuf(const TDesC8& aBuf) + { + if(!DetailedLogging()) return; + TBuf16<100> dumpbuf; + TInt totLen = aBuf.Length(); + + INFO_PRINTF1(_L("-------------------------------------------------------------------------")); + INFO_PRINTF2(_L("Buffer: %d bytes"), totLen); + INFO_PRINTF1(_L("-------------------------------------------------------------------------")); + + for (TInt i = 0; i < totLen; i += 16) + { + dumpbuf.FillZ(100); + dumpbuf.Zero(); + dumpbuf.AppendFormat(_L("%04x "),i); + TInt j = 0; + TInt thisRow = Min(16,totLen - j - i); + for (j = 0; j < 16; j++) + { + if (j < thisRow) + { + TText8 chr = aBuf[i + j]; + dumpbuf.AppendFormat(_L("%02x "),chr); + } + else + dumpbuf.AppendFormat(_L(" ")); + } + dumpbuf.AppendFormat(_L(" ")); + for (j = 0; j < thisRow; j++) + { + TText8 chr = aBuf[i + j]; + TChar c(chr); + if (!c.IsPrint()) + { + chr='.'; + } + // NOTE: "<" & ">" are HTML tags (change to "[" & "]") + if((chr == '<') || (chr == '>')) + { + chr+=31; + } + dumpbuf.AppendFormat(_L("%c"),chr); + } + INFO_PRINTF2(_L("%s"), dumpbuf.Ptr()); + } + INFO_PRINTF1(_L("-------------------------------------------------------------------------")); + } + +void CWapStackSuiteStepBase::ShowConnectionInfo() +{ + if(!DetailedLogging()) return; + + TBuf16 host; + TBuf16<100> infostr; + + INFO_PRINTF1(_L("-------------------------------------------------------------------------")); + INFO_PRINTF1(_L("Connection Info:")); + INFO_PRINTF1(_L("-------------------------------------------------------------------------")); + + infostr.FillZ(100); + switch(iBearer) + { + case Wap::EAll: infostr.Copy(_L("EAll")); + break; + case Wap::EIP: infostr.Copy(_L("EIP")); + break; + case Wap::ESMS7: infostr.Copy(_L("ESMS7")); + break; + case Wap::ESMS: infostr.Copy(_L("ESMS")); + break; + case Wap::EWAPSMS7: infostr.Copy(_L("EWAPSMS7")); + break; + case Wap::EWAPSMS: infostr.Copy(_L("EWAPSMS")); + break; + default: + break; + } + + INFO_PRINTF2(_L("Bearer : %s"), infostr.Ptr()); + host.FillZ(WAP_MAX_HOST_NAME); + host.Copy(iRemoteHost); + INFO_PRINTF2(_L("Remote Host : %s"), host.Ptr()); + INFO_PRINTF2(_L("Remote Port : %d"),iRemotePort); + host.FillZ(100); + host.Copy(iLocalHost); + INFO_PRINTF2(_L("Local Host : %s"), host.Ptr()); + INFO_PRINTF2(_L("Local Port : %d"), iLocalPort); + infostr.FillZ(100); + switch(iSecure) + { + case ETrue: infostr.Copy(_L("TRUE")); + break; + case EFalse: infostr.Copy(_L("FALSE")); + break; + default: + break; + } + INFO_PRINTF2(_L("Secure : %s"), infostr.Ptr()); + infostr.FillZ(100); + switch(iReconnect) + { + case ETrue: infostr.Copy(_L("TRUE")); + break; + case EFalse: infostr.Copy(_L("FALSE")); + break; + default: + break; + } + INFO_PRINTF2(_L("Timeout : %d"), iTimeout); + INFO_PRINTF2(_L("Reconnect : %s"), infostr.Ptr()); + INFO_PRINTF2(_L("ExitCode : %d"), iExError); + INFO_PRINTF2(_L("Repeat : %d"), iRepeat); + + INFO_PRINTF1(_L("-------------------------------------------------------------------------")); +} + +/** + Active controller +*/ +CActiveControl* CActiveControl::NewL(MControlNotify* aControl) + { + CActiveControl* self = new(ELeave) CActiveControl(aControl); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(); + return self; + } + +void CActiveControl::ConstructL() + { + } + +CActiveControl::CActiveControl(MControlNotify* aControl) +: CActive(EPriorityStandard) + { + iControl = aControl; + } + +CActiveControl::~CActiveControl() + { + } + +void CActiveControl::ReStart() + { + TRequestStatus* status = &iStatus; + SetActive(); + User::RequestComplete(status, KErrNone); + } + +void CActiveControl::RunL() + { + if(iControl->CallStateMachine()) + { + SetActive(); + } + } + +void CActiveControl::DoCancel() + { + } diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteStepBase.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/src/WapStackSuiteStepBase.h Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,167 @@ +/** +* Copyright (c) 2002-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" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + + + +/** + @file WapStackSuiteStepBase.h +*/ + +#if (!defined __WAPSTACK_SUITE_STEP_BASE__) +#define __WAPSTACK_SUITE_STEP_BASE__ +#include +#include + +#define WAP_MAX_HOST_NAME 128 + +#if defined (__WINS__) +#define PDD_NAME _L("ECDRV") +#define PDD_NAME2 _L("ECDRV") +#define LDD_NAME _L("ECOMM") +#else +#define PDD_NAME _L("EUART1") +#define LDD_NAME _L("ECOMM") +#endif + +typedef enum + { + EIdle, + EConnect, + ESend, + EAwaitSize, + EReceive, + EMutipleReceive, + EAwaitPush, + EUnitInvoke, + EUnitResult, + EFinish, + EAbortTest + } TWapStep; +const TUint KMaxWapWdpPduBufferLength=1080; +const TUint KMaxWapWspHeaderBufferLength=256; +const TUint KMaxWapWspDataBufferLength=1080; +class MControlNotify +{ +public: + virtual TInt CallStateMachine() = 0; +}; + +class CActiveControl : public CActive +{ +public: + static CActiveControl* NewL(MControlNotify* aControl); + CActiveControl(MControlNotify* aControl); + ~CActiveControl(); + void ConstructL(); + virtual void RunL(); + virtual void DoCancel(); + virtual void ReStart(); + inline TRequestStatus* Status() {return &iStatus;} +public: + MControlNotify* iControl; +}; + +class CWapStackSuiteStepBase : public CTestStep, public MControlNotify + { +public: + CWapStackSuiteStepBase(); + virtual ~CWapStackSuiteStepBase(); + virtual TVerdict doTestStepPreambleL(); + virtual TVerdict doTestStepPostambleL(); + virtual TInt CallStateMachine(); + void StartScheduler(); + void StopScheduler(); + void WaitForInitializeL(); + inline void SetScheduler(CActiveScheduler* aScheduler) {iScheduler = aScheduler;} + inline CActiveScheduler* Scheduler() {return iScheduler;} + inline void SetState(TWapStep aState) { iState = aState; } + inline TWapStep State() { return iState; } + inline void SetLastError(TInt aError) { iLastError = aError; } + inline TInt GetLastError() { return iLastError; } + inline void SetExpectedError(TInt aError) {iExError = aError; } + inline TInt GetExpectedError() { return iExError; } + inline TBool UseSimTsy() { return iUseSIMTSY; } + inline TBool DetailedLogging() { return iDetailedLogging; } + void LoadConfig(); + void DumpBuf(const TDesC8& aBuf); + void ShowConnectionInfo(); +protected: + CActiveControl* iControl; + TWapStep iState; + TRequestStatus* iStatus; + + //Predefined value in .ini file + TInt iExError; + TInt iExError2; + TInt iRepeat; + TUint32 iTimeout; + TBool iSecure; + TBool iReconnect; + TBool iUseSIMTSY; + TBool iAwaitLengthCancel; + TBool iMiddleCancel; + TBool iMultiReadCancel; + TBool iAwaitLengthTwice; + TBool iDetailedLogging; + TBool iDelayPortClosure; + TInt iSimTsyState; + TUint16 iWdpRecvBufLength; + TUint16 iHeaderRecvBufLength; + TUint16 iBodyRecvBufLength; + Wap::TBearer iBearer; + Wap::TPort iLocalPort; + Wap::TPort iRemotePort; + TBuf8 iRemoteHost; + TBuf8 iLocalHost; + TInetAddr iRemoteAddr; + TInetAddr iLocalAddr; + TInt iRmtPort; + TInt iLclPort; + //For WDP sending and receiving + HBufC8* iSendBuffPtr; + HBufC8* iRecvBuffPtr; + TUint16 iLenBuffer; + TPckg iLength; + TPtr8 iRecvBuf; + TBool iTruncated; + Wap::TPort iRecvRemotePort; + TBuf8 iRecvRemoteHost; + TBuf8 iMaxWdpRecvBuffer; + + + //For both WSP Sending; + TUint8 iTransactionId; + TUint iMethod; + HBufC16* iURI; + HBufC8* iSendHeaders; + HBufC8* iSendBody; + + //For WSP Receiving and Push + TPckgBuf iTransactionIdPckg; + TWSPStatus iWspStatus; + HBufC8* iRecvHeaders; + HBufC8* iRecvBody; + TPtr8 iRecvHeadersBuf; + TPtr8 iRecvBodyBuf; + TBuf8 iMaxWspHeaderRecvBuffer; + TBuf8 iMaxWspDataRecvBuffer; +private: + CActiveScheduler* iScheduler; + TInt iLastError; + }; + +#endif diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/testdata/UDPPush.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/testdata/UDPPush.ini Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,69 @@ +[COMMON] +Bearer=3 +Remote_Host=127.0.0.1 +Local_Host= 127.0.0.1 +Remote_Port=2948 +Local_Port=2948 +TimeOut=0 +ExError=0 +ExError2=0 +SimTsy=false +TsyState=411 +WSPHeaderLength=50 +WSPBodyLength=50 +WDPBufLength=30 +AwaitLengthCancel=false +MiddleCancel=false +MultiReadCancel=false +AwaitLengthTwice=false +DetailedLogging=true +Secure=0 +WSPMethod=1 +WSPHeaders=GET: +WSPBody=EMPTY-001-002-003-004-005-006-007-END +WSPURI=http://wap.wapgateway.com + + +[Test_1] +Bearer=1 +Remote_Port=2949 +Local_Port=2948 +Remote_Host=127.0.0.1 +Local_Host= 127.0.0.1 +StartC32=true + +[Test_2] +Bearer=2 +RemotePort=2948 +LocalPort=2949 +Remote_Host=127.0.0.1 +Local_Host= 127.0.0.1 +StartC32=false +//a size of PDU to be sent that fits into the allocated buffer on the receiving end +Data_Size=80 + + +[Test_3] +Bearer=1 +Remote_Port=2949 +Local_Port=2948 +Remote_Host=127.0.0.1 +Local_Host= 127.0.0.1 +StartC32=true + +[Test_4] +Bearer=2 +RemotePort=2948 +LocalPort=2949 +Remote_Host=127.0.0.1 +Local_Host= 127.0.0.1 +StartC32=false +//a size of PDU to be sent that doesn't fit into the allocated buffer on the receiving end - needs reallocation +Data_Size=1080 + +//Remote_Host=10.32.194.36 +//Local_Host=10.32.194.36 +//Remote_Host=127.0.0.1 +//Local_Host= 127.0.0.1 +//Remote_Host=10.32.194.75 +//Local_Host=10.32.194.75 diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/testdata/WSP.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/testdata/WSP.ini Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,116 @@ +[COMMON] +Bearer=1 +Remote_Host=10.32.194.45 +//Remote_Host=10.32.194.45 +//Remote_Host=192.168.20.11 +Local_Host=10.32.194.45 +Remote_Port=9200 +Local_Port=9200 +Secure=0 +Repeat=1 +TimeOut=0 +ExError=0 +ExError2=0 +SimTsy=false +TsyState=411 +AwaitLengthCancel=false +MiddleCancel=false +MultiReadCancel=false +AwaitLengthTwice=false +WSPHeaderLength=50 +WSPBodyLength=50 +WDPBufLength=30 +WSPMethod=64 + +[Test_9.1] +Repeat=2 +WSPURI=http://10.35.2.4/wap/wstiot/welcome.wml +//WSPHeaders=Accept-Language: English + +[Test_9.2] +WSPURI=http://10.35.2.4/wap/wstiot/welcome.wml +WSPHeaders=my1:125, my2:abcdefghijklmnopqrstuvxuz, m:y + +[Test_9.3] +WSPURI=http://10.35.2.4:80/wap/wstiot/size1k.txt +WSPHeaders=125:125 + +[Test_9.4] +WSPURI=http://10.35.2.4:80/wap/wstiot/small.wml +WSPHeaders=Cat sat on the mat:125 + +[Test_9.5] +WSPURI=http://10.35.2.4/wap/wstiot/large.wml +WSPHeaders=A=10:125 + +[Test_9.6] +WSPURI=http://10.35.2.4:80/wap/wstiot/large.wml +WSPHeaders=Accept-Language: + +[Test_9.7] +WSPURI=http://10.35.2.4:80/wap/wstiot/large.wml +WSPHeaders=WAP:125 + +[Test_9.8] +WSPURI=http://10.35.2.4/wap/wstiot/large.wml +WSPHeaders=::; + +[Test_9.9] +WSPURI=http://10.35.2.4/wap/wstiot/welcome.wml +WSPHeaders=Test-Case:CLIENT + +[Test_9.10] +WSPURI=http://10.35.2.4/wap/wstiot/welcome.wml +WSPHeaders=http://10.35.2.4/wap/wstiot/welcome.wml + +[Test_9.11] +WSPMethod=66 +WSPURI=http://10.35.2.4/wap/wstiot/ +WSPHeaders=Accept-Language: English + +[Test_9.12] +WSPURI=http://10.35.2.4:80/wap/wstiot/large.wml +WSPHeaders=User-Agent:symbianAgentNameLongStringOne1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNMLongStringTwo1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNMLongStringThree1234567890qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM + +[Test_9.13] +WSPMethod=96 +WSPURI=http://10.35.2.4/perl/dumpform.pl +WSPHeaders=Accept-Language: English +WSPBody=WSPTESTWSPTEST + +[Test_9.14] +WSPMethod=97 +WSPURI=http://10.35.2.4/upload/tao.txt +WSPHeaders=Accept-Language: English +WSPBody=Tao Te Ching: An English-Language Interpolation 1. The Way The Way that can be experienced is not true; The world that can be constructed is not real. The Way manifests all that happens and may happen; The world represents all that exists and may exist. To experience without abstraction is to sense the world; To experience with abstraction is to know the world. These two experiences are indistinguishable; Their construction differs but their effect is the same. Beyond the gate of experience flows the Way, Which is ever greater and more subtle than the world. 2. Abstraction When beauty is abstracted Then ugliness has been implied; When good is abstracted Then evil has been implied. So alive and dead are abstracted from nature, Difficult and easy abstracted from progress, Long and short abstracted from contrast, High and low abstracted from depth, Song and speech abstracted from melody, After and before abstracted from sequence. The sage experiences without abstraction, And accomplishes without action; He accepts the ebb and flow of things, Nurtures them, but does not own them, And lives, but does not dwell. 3. Without Action Not praising the worthy prevents contention, Not esteeming the valuable prevents theft, Not displaying the beautiful prevents desire. In this manner the sage governs people: Emptying their minds, Filling their bellies, Weakening their ambitions, And strengthening their bones. If people lack knowledge and desire Then they can not act; If no action is taken Harmony remains. 4. Limitless The Way is a limitless vessel; Used by the self, it is not filled by the world; It cannot be cut, knotted, dimmed or stilled; Its depths are hidden, ubiquitous and eternal; I don't know where it comes from; It comes before nature. 5. Nature Nature is not kind; It treats all things impartially. The Sage is not kind, And treats all people impartially. Nature is like a bellows, Empty, yet never ceasing its supply. The more it moves, the more it yields; So the sage draws upon experience And cannot be exhausted. 6. Experience Experience is a riverbed, Its source hidden, forever flowing: Its entrance, the root of the world, The Way moves within it: Draw upon it; it will not run dry. 7. Complete Nature is complete because it does not serve itself. The sage places himself after and finds himself before, Ignores his desire and finds himself content. He is complete because he does not serve himself. 8. Water The best of man is like water, Which benefits all things, and does not contend with them, Which flows in places that others disdain, Where it is in harmony with the Way. So the sage: Lives within nature, Thinks within the deep, Gives within impartiality, Speaks within trust, Governs within order, Crafts within ability, Acts within opportunity. He does not contend, and none contend against him. 9. Retire Fill a cup to its brim and it is easily spilled; Temper a sword to its hardest and it is easily broken; Amass the greatest treasure and it is easily stolen; Claim credit and honour and you easily fall; Retire once your purpose is achieved - this is natural. 10. Harmony Embracing the Way, you become embraced; Breathing gently, you become newborn; Clearing your mind, you become clear; Nurturing your children, you become impartial; Opening your heart, you become accepted; Accepting the world, you embrace the Way. Bearing and nurturing, Creating but not owning, Giving without demanding, This is harmony. 11. Tools Thirty spokes meet at a nave; because of the hole we may use the wheel. Clay is moulded into a vessel; Because of the hollow we may use the cup. Walls are built around a hearth; Because of the doors we may use the house. Thus tools come from what exists, But use from what does not. 12. Substance Too much colour blinds the eye, Too much music deafens the ear, Too much taste dulls the palate, Too much play maddens the mind, Too much desire tears the heart. In this manner the sage cares for people: He provides for the belly, not for the senses; He ignores abstraction and holds fast to substance. 13. Self Both praise and blame cause concern, For they bring people hope and fear. The object of hope and fear is the self - For, without self, to whom may fortune and disaster occur? Therefore, Who distinguishes himself from the world may be given the world, But who regards himself as the world may accept the world. 14. Mystery Looked at but cannot be seen - it is beneath form; Listened to but cannot be heard - it is beneath sound; Held but cannot be touched - it is beneath feeling; These depthless things evade definition, And blend into a single mystery. In its rising there is no light, In its falling there is no darkness, A continuous thread beyond description, Lining what does not exist; Its form formless, Its image nothing, Its name silence; Follow it, it has no back, et it, it has no face. Attend the present to deal with the past; Thus you grasp the continuity of the Way, Which is its essence. 15. Enlightenment The enlightened possess understanding So profound they can not be understood. Because they cannot be understood I can only describe their appearance: Cautious as one crossing thin ice, Undecided as one surrounded by danger, Modest as one who is a guest, Unbounded as melting ice, Genuine as unshaped wood, Broad as a valley, Seamless as muddy water. Who stills the water that the mud may settle, Who seeks to stop that he may travel on, Who desires less than what may transpire, Decays, but will not renew. 16. Decay and Renewal Empty the self completely; Embrace perfect peace. The world will rise and move; Watch it return to rest. All the flourishing things Will return to their source. This return is peaceful; It is the flow of nature, An eternal decay and renewal. Accepting this brings enlightenment, Ignoring this brings misery. Who accepts nature's flow becomes all-cherishing; Being all-cherishing he becomes impartial; Being impartial he becomes magnanimous; Being magnanimous he becomes natural; Being natural he becomes one with the Way; Being one with the Way he becomes immortal: Though his body will decay, the Way will not. 17. Rulers The best rulers are scarcely known by their subjects; The next best are loved and praised; The next are feared; The next despised: They have no faith in their people, And their people become unfaithful to them. When the best rulers achieve their purpose Their subjects claim the achievement as their own. 18. Hypocrisy When the Way is forgotten Duty and justice appear; Then knowledge and wisdom are born Along with hypocrisy. When harmonious relationships dissolve Then respect and devotion arise; When a nation falls to chaos Then loyalty and patriotism are born. 19. Simplify If we could discard knowledge and wisdom Then people would profit a hundredfold; If we could discard duty and justice Then harmonious relationships would form; If we could discard artifice and profit Then waste and theft would disappear. Yet such remedies treat only symptoms And so they are inadequate. People need personal remedies: Reveal your naked self and embrace your original nature; Bind your self-interest and control your ambition; Forget your habits and simplify your affairs. 20. Wandering What is the difference between assent and denial? What is the difference between beautiful and ugly? What is the difference between fearsome and afraid? The people are merry as if at a magnificent party Or playing in the park at springtime, But I am tranquil and wandering, Like a newborn before it learns to smile, Alone, with no true home. The people have enough and to spare, Where I have nothing, And my heart is foolish, Muddled and cloudy. The people are bright and certain, Where I am dim and confused; The people are clever and wise, Where I am dull and ignorant; Aimless as a wave drifting over the sea, Attached to nothing. The people are busy with purpose, Where I am ipractical and rough; I do not share the peoples' cares But I am fed at nature's breast. 21. Accept Harmony is only in following the Way. The Way is without form or quality, But expresses all forms and qualities; The Way is hidden and implicate, But expresses all of nature; The Way is unchanging, But expresses all motion. Beneath sensation and memory The Way is the source of all the world. How can I understand the source of the world? By accepting. 22. Home Accept and you become whole, Bend and you straighten, Empty and you fill, Decay and you renew, Want and you acquire, Fulfill and you become confused. The sage accepts the world As the world accepts the Way; He does not display himself, so is clearly seen, Does not justify himself, so is recognized, Does not boast, so is credited, Does not pride himself, so endures, Does not contend, so none contend against him. The ancients said, "Accept and you become whole", Once whole, the world is as your home. 23. Words Nature says only a few words: High wind does not last long, Nor does heavy rain. If nature's words do not last Why should those of man? Who accepts harmony, becomes harmonious. Who accepts loss, becomes lost. For who accepts harmony, the Way harmonizes with him, And who accepts loss, the Way cannot find. 24. Indulgence Straighten yourself and you will not stand steady; Display yourself and you will not be clearly seen; Justify yourself and you will not be respected; Promote yourself and you will not be believed; Pride yourself and you will not endure. These behaviours are wasteful, indulgent, And so they attract disfavour; Harmony avoids them. 25. Beneath Abstraction There is a mystery, Beneath abstraction, Silent, depthless, Alone, unchanging, Ubiquitous and liquid, The mother of nature. It has no name, but I call it "the Way"; It has no limit, but I call it "limitless". Being limitless, it flows away forever; Flowing away forever, it returns to my self: The Way is limitless, So nature is limitless, So the world is limitless, And so I am limitless. For I am abstracted from the world, The world from nature, Nature from the Way, And the Way from what is beneath abstraction. 26. Calm Gravity is the source of lightness, Calm, the master of haste. A lone traveller will journey all day, watching over his belongings; Only safe in his own bed may he lose them in sleep. So the captain of a great vessel should not act lightly or hastily. Acting lightly, he loses sight of the world, Acting hastily, he loses control of himself. The captain can not treat his great ship as a small boat; Rather than glitter like jade He must stand like stone. 27. Perfection The perfect traveller leaves no trail to be followed; The perfect speaker leaves no question to be answered; The perfect accountant leaves no working to be completed; The perfect container leaves no lock to be closed; The perfect knot leaves no end to be ravelled. So the sage nurtures all men And abandons no one. He accepts everything And rejects nothing. He attends to the smallest details. For the strong must guide the weak; The weak are raw material to the strong. If the guide is not respected, Or the material is not cared for, Confusion will result, no matter how clever one is. This is the secret of perfection: When raw wood is carved, it becomes a tool; When a man is employed, he becomes a tool; The perfect carpenter leaves no wood to be carved. 28. Becoming Using the male, being female, Being the entrance of the world, You embrace harmony And become as a newborn. Using strength, being weak, Being the root of the world, You complete harmony And become as unshaped wood. Using the light, being dark, Being the world, You perfect harmony And return to the Way. 29. Ambition Those who wish to change the world According with their desire Cannot succeed. The world is shaped by the Way; It cannot be shaped by the self. Trying to change it, you damage it; Trying to possess it, you lose it. So some will lead, while others follow. Some will be warm, others cold Some will be strong, others weak. Some will get where they are going While others fall by the side of the road. So the sage will be neither extravagant nor violent. 30. Violence Powerful men are well advised not to use violence, For violence has a habit of returning; Thorns and weeds grow wherever an army goes, And lean years follow a great war. A general is well advised To achieve nothing more than his orders: Not to take advantage of his victory. Nor to glory, boast or pride himself; To do what is dictated by necessity, Not by choice. For even the strongest force will weaken with time, And then its violence will return, and kill it. 31. Armies Armies are tools of violence; They cause men to hate and fear. The sage will not join them. His purpose is creation; Their purpose is destruction. Weapons are tools of violence, Not of the sage; He uses them only when there is no choice, And then calmly, and with tact, For he finds no beauty in them. Whoever finds beauty in weapons Delights in the slaughter of men; And who delights in slaughter Cannot content himself with peace. So slaughters must be mourned And conquest celebrated with a funeral. 32. Shapes The Way has no true shape, And therefore none can control it. If a ruler could control the Way All things would follow In harmony with his desire, And sweet rain would fall, Effortlessly slaking every thirst. The Way is shaped by use, But then the shape is lost. Do not hold fast to shapes But let sensation flow into the world As a river courses down to the sea. 33. Virtues Who understands the world is learned; Who understands the self is enlightened. Who conquers the world has strength; Who conquers the self has harmony; Who is determined has purpose. Who is contented has wealth; Who defends his home may long endure; Who surrenders his home may long survive it. 34. Control The Way flows and ebbs, creating and destroying, Implementing all the world, attending to the tiniest details, Claiming nothing in return. It nurtures all things, Though it does not control them; It has no intention, So it seems inconsequential. It is the substance of all things; Though it does not control them; It has no exception, So it seems all-important. The sage would not control the world; He is in harmony with the world. 35. Peace If you offer music and food Strangers may stop with you; But if you accord with the Way All the people of the world will keep you In safety, health, community, and peace. The Way lacks art and flavour; It can neither be seen or heard, But its benefit cannot be exhausted. 36. Opposition To reduce someone's influence, first expand it; To reduce someone's force, first increase it; To overthrow someone, first exalt them; To take from someone, first give to them. This is the subtlety by which the weak overcome the strong: Fish should not leave their depths, And swords should not leave their scabbards. 37. Tranquillity The Way takes no action, but leaves nothing undone. When you accept this The world will flourish, In harmony with nature. Nature does not possess desire; Without desire, the heart becomes quiet; In this manner the whole world is made tranquil. Tao Te Ching: An English-Language Interpolation 1. The Way The Way that can be experienced is not true; The world that can be constructed is not real. The Way manifests all that happens and may happen; The world represents all that exists and may exist. To experience without abstraction is to sense the world; To experience with abstraction is to know the world. These two experiences are indistinguishable; Their construction differs but their effect is the same. Beyond the gate of experience flows the Way, Which is ever greater and more subtle than the world. 2. Abstraction When beauty is abstracted Then ugliness has been implied; When good is abstracted Then evil has been implied. So alive and dead are abstracted from nature, Difficult and easy abstracted from progress, Long and short abstracted from contrast, High and low abstracted from depth, Song and speech abstracted from melody, After and before abstracted from sequence. The sage experiences without abstraction, And accomplishes without action; He accepts the ebb and flow of things, Nurtures them, but does not own them, And lives, but does not dwell. 3. Without Action Not praising the worthy prevents contention, Not esteeming the valuable prevents theft, Not displaying the beautiful prevents desire. In this manner the sage governs people: Emptying their minds, Filling their bellies, Weakening their ambitions, And strengthening their bones. If people lack knowledge and desire Then they can not act; If no action is taken Harmony remains. 4. Limitless The Way is a limitless vessel; Used by the self, it is not filled by the world; It cannot be cut, knotted, dimmed or stilled; Its depths are hidden, ubiquitous and eternal; I don't know where it comes from; It comes before nature. 5. Nature Nature is not kind; It treats all things impartially. The Sage is not kind, And treats all people impartially. Nature is like a bellows, Empty, yet never ceasing its supply. The more it moves, the more it yields; So the sage draws upon experience And cannot be exhausted. 6. Experience Experience is a riverbed, Its source hidden, forever flowing: Its entrance, the root of the world, The Way moves within it: Draw upon it; it will not run dry. 7. Complete Nature is complete because it does not serve itself. The sage places himself after and finds himself before, Ignores his desire and finds himself content. He is complete because he does not serve himself. 8. Water The best of man is like water, Which benefits all things, and does not contend with them, Which flows in places that others disdain, Where it is in harmony with the Way. So the sage: Lives within nature, Thinks within the deep, Gives within impartiality, Speaks within trust, Governs within order, Crafts within ability, Acts within opportunity. He does not contend, and none contend against him. 9. Retire Fill a cup to its brim and it is easily spilled; Temper a sword to its hardest and it is easily broken; Amass the greatest treasure and it is easily stolen; Claim credit and honour and you easily fall; Retire once your purpose is achieved - this is natural. 10. Harmony Embracing the Way, you become embraced; Breathing gently, you become newborn; Clearing your mind, you become clear; Nurturing your children, you become impartial; Opening your heart, you become accepted; Accepting the world, you embrace the Way. Bearing and nurturing, Creating but not owning, Giving without demanding, This is harmony. 11. Tools Thirty spokes meet at a nave; because of the hole we may use the wheel. Clay is moulded into a vessel; Because of the hollow we may use the cup. Walls are built around a hearth; Because of the doors we may use the house. Thus tools come from what exists, But use from what does not. 12. Substance Too much colour blinds the eye, Too much music deafens the ear, Too much taste dulls the palate, Too much play maddens the mind, Too much desire tears the heart. In this manner the sage cares for people: He provides for the belly, not for the senses; He ignores abstraction and holds fast to substance. 13. Self Both praise and blame cause concern, For they bring people hope and fear. The object of hope and fear is the self - For, without self, to whom may fortune and disaster occur? Therefore, Who distinguishes himself from the world may be given the world, But who regards himself as the world may accept the world. 14. Mystery Looked at but cannot be seen - it is beneath form; Listened to but cannot be heard - it is beneath sound; Held but cannot be touched - it is beneath feeling; These depthless things evade definition, And blend into a single mystery. In its rising there is no light, In its falling there is no darkness, A continuous thread beyond description, Lining what does not exist; Its form formless, Its image nothing, Its name silence; Follow it, it has no back, et it, it has no face. Attend the present to deal with the past; Thus you grasp the continuity of the Way, Which is its essence. 15. Enlightenment The enlightened possess understanding So profound they can not be understood. Because they cannot be understood I can only describe their appearance: Cautious as one crossing thin ice, Undecided as one surrounded by danger, Modest as one who is a guest, Unbounded as melting ice, Genuine as unshaped wood, Broad as a valley, Seamless as muddy water. Who stills the water that the mud may settle, Who seeks to stop that he may travel on, Who desires less than what may transpire, Decays, but will not renew. 16. Decay and Renewal Empty the self completely; Embrace perfect peace. The world will rise and move; Watch it return to rest. All the flourishing things Will return to their source. This return is peaceful; It is the flow of nature, An eternal decay and renewal. Accepting this brings enlightenment, Ignoring this brings misery. Who accepts nature's flow becomes all-cherishing; Being all-cherishing he becomes impartial; Being impartial he becomes magnanimous; Being magnanimous he becomes natural; Being natural he becomes one with the Way; Being one with the Way he becomes immortal: Though his body will decay, the Way will not. 17. Rulers The best rulers are scarcely known by their subjects; The next best are loved and praised; The next are feared; The next despised: They have no faith in their people, And their people become unfaithful to them. When the best rulers achieve their purpose Their subjects claim the achievement as their own. 18. Hypocrisy When the Way is forgotten Duty and justice appear; Then knowledge and wisdom are born Along with hypocrisy. When harmonious relationships dissolve Then respect and devotion arise; When a nation falls to chaos Then loyalty and patriotism are born. 19. Simplify If we could discard knowledge and wisdom Then people would profit a hundredfold; If we could discard duty and justice Then harmonious relationships would form; If we could discard artifice and profit Then waste and theft would disappear. Yet such remedies treat only symptoms And so they are inadequate. People need personal remedies: Reveal your naked self and embrace your original nature; Bind your self-interest and control your ambition; Forget your habits and simplify your affairs. 20. Wandering What is the difference between assent and denial? What is the difference between beautiful and ugly? What is the difference between fearsome and afraid? The people are merry as if at a magnificent party Or playing in the park at springtime, But I am tranquil and wandering, Like a newborn before it learns to smile, Alone, with no true home. The people have enough and to spare, Where I have nothing, And my heart is foolish, Muddled and cloudy. The people are bright and certain, Where I am dim and confused; The people are clever and wise, Where I am dull and ignorant; Aimless as a wave drifting over the sea, Attached to nothing. The people are busy with purpose, Where I am ipractical and rough; I do not share the peoples' cares But I am fed at nature's breast. 21. Accept Harmony is only in following the Way. The Way is without form or quality, But expresses all forms and qualities; The Way is hidden and implicate, But expresses all of nature; The Way is unchanging, But expresses all motion. Beneath sensation and memory The Way is the source of all the world. How can I understand the source of the world? By accepting. 22. Home Accept and you become whole, Bend and you straighten, Empty and you fill, Decay and you renew, Want and you acquire, Fulfill and you become confused. The sage accepts the world As the world accepts the Way; He does not display himself, so is clearly seen, Does not justify himself, so is recognized, Does not boast, so is credited, Does not pride himself, so endures, Does not contend, so none contend against him. The ancients said, "Accept and you become whole", Once whole, the world is as your home. 23. Words Nature says only a few words: High wind does not last long, Nor does heavy rain. If nature's words do not last Why should those of man? Who accepts harmony, becomes harmonious. Who accepts loss, becomes lost. For who accepts harmony, the Way harmonizes with him, And who accepts loss, the Way cannot find. 24. Indulgence Straighten yourself and you will not stand steady; Display yourself and you will not be clearly seen; Justify yourself and you will not be respected; Promote yourself and you will not be believed; Pride yourself and you will not endure. These behaviours are wasteful, indulgent, And so they attract disfavour; Harmony avoids them. 25. Beneath Abstraction There is a mystery, Beneath abstraction, Silent, depthless, Alone, unchanging, Ubiquitous and liquid, The mother of nature. It has no name, but I call it "the Way"; It has no limit, but I call it "limitless". Being limitless, it flows away forever; Flowing away forever, it returns to my self: The Way is limitless, So nature is limitless, So the world is limitless, And so I am limitless. For I am abstracted from the world, The world from nature, Nature from the Way, And the Way from what is beneath abstraction. 26. Calm Gravity is the source of lightness, Calm, the master of haste. A lone traveller will journey all day, watching over his belongings; Only safe in his own bed may he lose them in sleep. So the captain of a great vessel should not act lightly or hastily. Acting lightly, he loses sight of the world, Acting hastily, he loses control of himself. The captain can not treat his great ship as a small boat; Rather than glitter like jade He must stand like stone. 27. Perfection The perfect traveller leaves no trail to be followed; The perfect speaker leaves no question to be answered; The perfect accountant leaves no working to be completed; The perfect container leaves no lock to be closed; The perfect knot leaves no end to be ravelled. So the sage nurtures all men And abandons no one. He accepts everything And rejects nothing. He attends to the smallest details. For the strong must guide the weak; The weak are raw material to the strong. If the guide is not respected, Or the material is not cared for, Confusion will result, no matter how clever one is. This is the secret of perfection: When raw wood is carved, it becomes a tool; When a man is employed, he becomes a tool; The perfect carpenter leaves no wood to be carved. 28. Becoming Using the male, being female, Being the entrance of the world, You embrace harmony And become as a newborn. Using strength, being weak, Being the root of the world, You complete harmony And become as unshaped wood. Using the light, being dark, Being the world, You perfect harmony And return to the Way. 29. Ambition Those who wish to change the world According with their desire Cannot succeed. The world is shaped by the Way; It cannot be shaped by the self. Trying to change it, you damage it; Trying to possess it, you lose it. So some will lead, while others follow. Some will be warm, others cold Some will be strong, others weak. Some will get where they are going While others fall by the side of the road. So the sage will be neither extravagant nor violent. 30. Violence Powerful men are well advised not to use violence, For violence has a habit of returning; Thorns and weeds grow wherever an army goes, And lean years follow a great war. A general is well advised To achieve nothing more than his orders: Not to take advantage of his victory. Nor to glory, boast or pride himself; To do what is dictated by necessity, Not by choice. For even the strongest force will weaken with time, And then its violence will return, and kill it. 31. Armies Armies are tools of violence; They cause men to hate and fear. The sage will not join them. His purpose is creation; Their purpose is destruction. Weapons are tools of violence, Not of the sage; He uses them only when there is no choice, And then calmly, and with tact, For he finds no beauty in them. Whoever finds beauty in weapons Delights in the slaughter of men; And who delights in slaughter Cannot content himself with peace. So slaughters must be mourned And conquest celebrated with a funeral. 32. Shapes The Way has no true shape, And therefore none can control it. If a ruler could control the Way All things would follow In harmony with his desire, And sweet rain would fall, Effortlessly slaking every thirst. The Way is shaped by use, But then the shape is lost. Do not hold fast to shapes But let sensation flow into the world As a river courses down to the sea. 33. Virtues Who understands the world is learned; Who understands the self is enlightened. Who conquers the world has strength; Who conquers the self has harmony; Who is determined has purpose. Who is contented has wealth; Who defends his home may long endure; Who surrenders his home may long survive it. 34. Control The Way flows and ebbs, creating and destroying, Implementing all the world, attending to the tiniest details, Claiming nothing in return. It nurtures all things, Though it does not control them; It has no intention, So it seems inconsequential. It is the substance of all things; Though it does not control them; It has no exception, So it seems all-important. The sage would not control the world; He is in harmony with the world. 35. Peace If you offer music and food Strangers may stop with you; But if you accord with the Way All the people of the world will keep you In safety, health, community, and peace. The Way lacks art and flavour; It can neither be seen or heard, But its benefit cannot be exhausted. 36. Opposition To reduce someone's influence, first expand it; To reduce someone's force, first increase it; To overthrow someone, first exalt them; To take from someone, first give to them. This is the subtlety by which the weak overcome the strong: Fish should not leave their depths, And swords should not leave their scabbards. + +[Test_9.14.1] +//Repeat=2 +WSPURI=http://192.168.20.11/upload/tao.txt +//WSPURI=http://10.32.194.45/upload/tao.txt +//WSPURI=http://10.35.2.4/upload/tao.txt + +[Test_9.14.2] +WSPMethod=97 +WSPURI=http://192.168.20.11/upload/tao.txt +//WSPURI=http://10.32.194.45/upload/tao.txt +//WSPURI=http://10.35.2.4/upload/tao.txt +WSPHeaders=Accept-Language: English +WSPBody=Tao Te Ching: An English-Language Interpolation 1. The Way The Way that can be experienced is not true; The world that can be constructed is not real. The Way manifests all that happens and may happen; The world represents all that exists and may exist. To experience without abstraction is to sense the world; To experience with abstraction is to know the world. These two experiences are indistinguishable; Their construction differs but their effect is the same. Beyond the gate of experience flows the Way, Which is ever greater and more subtle than the world. 2. Abstraction When beauty is abstracted Then ugliness has been implied; When good is abstracted Then evil has been implied. So alive and dead are abstracted from nature, Difficult and easy abstracted from progress, Long and short abstracted from contrast, High and low abstracted from depth, Song and speech abstracted from melody, After and before abstracted from sequence. The sage experiences without abstraction, And accomplishes without action; He accepts the ebb and flow of things, Nurtures them, but does not own them, And lives, but does not dwell. 3. Without Action Not praising the worthy prevents contention, Not esteeming the valuable prevents theft, Not displaying the beautiful prevents desire. In this manner the sage governs people: Emptying their minds, Filling their bellies, Weakening their ambitions, And strengthening their bones. If people lack knowledge and desire Then they can not act; If no action is taken Harmony remains. 4. Limitless The Way is a limitless vessel; Used by the self, it is not filled by the world; It cannot be cut, knotted, dimmed or stilled; Its depths are hidden, ubiquitous and eternal; I don't know where it comes from; It comes before nature. 5. Nature Nature is not kind; It treats all things impartially. The Sage is not kind, And treats all people impartially. Nature is like a bellows, Empty, yet never ceasing its supply. The more it moves, the more it yields; So the sage draws upon experience And cannot be exhausted. 6. Experience Experience is a riverbed, Its source hidden, forever flowing: Its entrance, the root of the world, The Way moves within it: Draw upon it; it will not run dry. 7. Complete Nature is complete because it does not serve itself. The sage places himself after and finds himself before, Ignores his desire and finds himself content. He is complete because he does not serve himself. 8. Water The best of man is like water, Which benefits all things, and does not contend with them, Which flows in places that others disdain, Where it is in harmony with the Way. So the sage: Lives within nature, Thinks within the deep, Gives within impartiality, Speaks within trust, Governs within order, Crafts within ability, Acts within opportunity. He does not contend, and none contend against him. 9. Retire Fill a cup to its brim and it is easily spilled; Temper a sword to its hardest and it is easily broken; Amass the greatest treasure and it is easily stolen; Claim credit and honour and you easily fall; Retire once your purpose is achieved - this is natural. 10. Harmony Embracing the Way, you become embraced; Breathing gently, you become newborn; Clearing your mind, you become clear; Nurturing your children, you become impartial; Opening your heart, you become accepted; Accepting the world, you embrace the Way. Bearing and nurturing, Creating but not owning, Giving without demanding, This is harmony. 11. Tools Thirty spokes meet at a nave; because of the hole we may use the wheel. Clay is moulded into a vessel; Because of the hollow we may use the cup. Walls are built around a hearth; Because of the doors we may use the house. Thus tools come from what exists, But use from what does not. 12. Substance Too much colour blinds the eye, Too much music deafens the ear, Too much taste dulls the palate, Too much play maddens the mind, Too much desire tears the heart. In this manner the sage cares for people: He provides for the belly, not for the senses; He ignores abstraction and holds fast to substance. 13. Self Both praise and blame cause concern, For they bring people hope and fear. The object of hope and fear is the self - For, without self, to whom may fortune and disaster occur? Therefore, Who distinguishes himself from the world may be given the world, But who regards himself as the world may accept the world. 14. Mystery Looked at but cannot be seen - it is beneath form; Listened to but cannot be heard - it is beneath sound; Held but cannot be touched - it is beneath feeling; These depthless things evade definition, And blend into a single mystery. In its rising there is no light, In its falling there is no darkness, A continuous thread beyond description, Lining what does not exist; Its form formless, Its image nothing, Its name silence; Follow it, it has no back, et it, it has no face. Attend the present to deal with the past; Thus you grasp the continuity of the Way, Which is its essence. 15. Enlightenment The enlightened possess understanding So profound they can not be understood. Because they cannot be understood I can only describe their appearance: Cautious as one crossing thin ice, Undecided as one surrounded by danger, Modest as one who is a guest, Unbounded as melting ice, Genuine as unshaped wood, Broad as a valley, Seamless as muddy water. Who stills the water that the mud may settle, Who seeks to stop that he may travel on, Who desires less than what may transpire, Decays, but will not renew. 16. Decay and Renewal Empty the self completely; Embrace perfect peace. The world will rise and move; Watch it return to rest. All the flourishing things Will return to their source. This return is peaceful; It is the flow of nature, An eternal decay and renewal. Accepting this brings enlightenment, Ignoring this brings misery. Who accepts nature's flow becomes all-cherishing; Being all-cherishing he becomes impartial; Being impartial he becomes magnanimous; Being magnanimous he becomes natural; Being natural he becomes one with the Way; Being one with the Way he becomes immortal: Though his body will decay, the Way will not. 17. Rulers The best rulers are scarcely known by their subjects; The next best are loved and praised; The next are feared; The next despised: They have no faith in their people, And their people become unfaithful to them. When the best rulers achieve their purpose Their subjects claim the achievement as their own. 18. Hypocrisy When the Way is forgotten Duty and justice appear; Then knowledge and wisdom are born Along with hypocrisy. When harmonious relationships dissolve Then respect and devotion arise; When a nation falls to chaos Then loyalty and patriotism are born. 19. Simplify If we could discard knowledge and wisdom Then people would profit a hundredfold; If we could discard duty and justice Then harmonious relationships would form; If we could discard artifice and profit Then waste and theft would disappear. Yet such remedies treat only symptoms And so they are inadequate. People need personal remedies: Reveal your naked self and embrace your original nature; Bind your self-interest and control your ambition; Forget your habits and simplify your affairs. 20. Wandering What is the difference between assent and denial? What is the difference between beautiful and ugly? What is the difference between fearsome and afraid? The people are merry as if at a magnificent party Or playing in the park at springtime, But I am tranquil and wandering, Like a newborn before it learns to smile, Alone, with no true home. The people have enough and to spare, Where I have nothing, And my heart is foolish, Muddled and cloudy. The people are bright and certain, Where I am dim and confused; The people are clever and wise, Where I am dull and ignorant; Aimless as a wave drifting over the sea, Attached to nothing. The people are busy with purpose, Where I am ipractical and rough; I do not share the peoples' cares But I am fed at nature's breast. 21. Accept Harmony is only in following the Way. The Way is without form or quality, But expresses all forms and qualities; The Way is hidden and implicate, But expresses all of nature; The Way is unchanging, But expresses all motion. Beneath sensation and memory The Way is the source of all the world. How can I understand the source of the world? By accepting. 22. Home Accept and you become whole, Bend and you straighten, Empty and you fill, Decay and you renew, Want and you acquire, Fulfill and you become confused. The sage accepts the world As the world accepts the Way; He does not display himself, so is clearly seen, Does not justify himself, so is recognized, Does not boast, so is credited, Does not pride himself, so endures, Does not contend, so none contend against him. The ancients said, "Accept and you become whole", Once whole, the world is as your home. 23. Words Nature says only a few words: High wind does not last long, Nor does heavy rain. If nature's words do not last Why should those of man? Who accepts harmony, becomes harmonious. Who accepts loss, becomes lost. For who accepts harmony, the Way harmonizes with him, And who accepts loss, the Way cannot find. 24. Indulgence Straighten yourself and you will not stand steady; Display yourself and you will not be clearly seen; Justify yourself and you will not be respected; Promote yourself and you will not be believed; Pride yourself and you will not endure. These behaviours are wasteful, indulgent, And so they attract disfavour; Harmony avoids them. 25. Beneath Abstraction There is a mystery, Beneath abstraction, Silent, depthless, Alone, unchanging, Ubiquitous and liquid, The mother of nature. It has no name, but I call it "the Way"; It has no limit, but I call it "limitless". Being limitless, it flows away forever; Flowing away forever, it returns to my self: The Way is limitless, So nature is limitless, So the world is limitless, And so I am limitless. For I am abstracted from the world, The world from nature, Nature from the Way, And the Way from what is beneath abstraction. 26. Calm Gravity is the source of lightness, Calm, the master of haste. A lone traveller will journey all day, watching over his belongings; Only safe in his own bed may he lose them in sleep. So the captain of a great vessel should not act lightly or hastily. Acting lightly, he loses sight of the world, Acting hastily, he loses control of himself. The captain can not treat his great ship as a small boat; Rather than glitter like jade He must stand like stone. 27. Perfection The perfect traveller leaves no trail to be followed; The perfect speaker leaves no question to be answered; The perfect accountant leaves no working to be completed; The perfect container leaves no lock to be closed; The perfect knot leaves no end to be ravelled. So the sage nurtures all men And abandons no one. He accepts everything And rejects nothing. He attends to the smallest details. For the strong must guide the weak; The weak are raw material to the strong. If the guide is not respected, Or the material is not cared for, Confusion will result, no matter how clever one is. This is the secret of perfection: When raw wood is carved, it becomes a tool; When a man is employed, he becomes a tool; The perfect carpenter leaves no wood to be carved. 28. Becoming Using the male, being female, Being the entrance of the world, You embrace harmony And become as a newborn. Using strength, being weak, Being the root of the world, You complete harmony And become as unshaped wood. Using the light, being dark, Being the world, You perfect harmony And return to the Way. 29. Ambition Those who wish to change the world According with their desire Cannot succeed. The world is shaped by the Way; It cannot be shaped by the self. Trying to change it, you damage it; Trying to possess it, you lose it. So some will lead, while others follow. Some will be warm, others cold Some will be strong, others weak. Some will get where they are going While others fall by the side of the road. So the sage will be neither extravagant nor violent. 30. Violence Powerful men are well advised not to use violence, For violence has a habit of returning; Thorns and weeds grow wherever an army goes, And lean years follow a great war. A general is well advised To achieve nothing more than his orders: Not to take advantage of his victory. Nor to glory, boast or pride himself; To do what is dictated by necessity, Not by choice. For even the strongest force will weaken with time, And then its violence will return, and kill it. 31. Armies Armies are tools of violence; They cause men to hate and fear. The sage will not join them. His purpose is creation; Their purpose is destruction. Weapons are tools of violence, Not of the sage; He uses them only when there is no choice, And then calmly, and with tact, For he finds no beauty in them. Whoever finds beauty in weapons Delights in the slaughter of men; And who delights in slaughter Cannot content himself with peace. So slaughters must be mourned And conquest celebrated with a funeral. 32. Shapes The Way has no true shape, And therefore none can control it. If a ruler could control the Way All things would follow In harmony with his desire, And sweet rain would fall, Effortlessly slaking every thirst. The Way is shaped by use, But then the shape is lost. Do not hold fast to shapes But let sensation flow into the world As a river courses down to the sea. 33. Virtues Who understands the world is learned; Who understands the self is enlightened. Who conquers the world has strength; Who conquers the self has harmony; Who is determined has purpose. Who is contented has wealth; Who defends his home may long endure; Who surrenders his home may long survive it. 34. Control The Way flows and ebbs, creating and destroying, Implementing all the world, attending to the tiniest details, Claiming nothing in return. It nurtures all things, Though it does not control them; It has no intention, So it seems inconsequential. It is the substance of all things; Though it does not control them; It has no exception, So it seems all-important. The sage would not control the world; He is in harmony with the world. 35. Peace If you offer music and food Strangers may stop with you; But if you accord with the Way All the people of the world will keep you In safety, health, community, and peace. The Way lacks art and flavour; It can neither be seen or heard, But its benefit cannot be exhausted. 36. Opposition To reduce someone's influence, first expand it; To reduce someone's force, first increase it; To overthrow someone, first exalt them; To take from someone, first give to them. This is the subtlety by which the weak overcome the strong: Fish should not leave their depths, And swords should not leave their scabbards. 37. Tranquillity The Way takes no action, but leaves nothing undone. When you accept this The world will flourish, In harmony with nature. Nature does not possess desire; Without desire, the heart becomes quiet; In this manner the whole world is made tranquil. Tao Te Ching: An English-Language Interpolation 1. The Way The Way that can be experienced is not true; The world that can be constructed is not real. The Way manifests all that happens and may happen; The world represents all that exists and may exist. To experience without abstraction is to sense the world; To experience with abstraction is to know the world. These two experiences are indistinguishable; Their construction differs but their effect is the same. Beyond the gate of experience flows the Way, Which is ever greater and more subtle than the world. 2. Abstraction When beauty is abstracted Then ugliness has been implied; When good is abstracted Then evil has been implied. So alive and dead are abstracted from nature, Difficult and easy abstracted from progress, Long and short abstracted from contrast, High and low abstracted from depth, Song and speech abstracted from melody, After and before abstracted from sequence. The sage experiences without abstraction, And accomplishes without action; He accepts the ebb and flow of things, Nurtures them, but does not own them, And lives, but does not dwell. 3. Without Action Not praising the worthy prevents contention, Not esteeming the valuable prevents theft, Not displaying the beautiful prevents desire. In this manner the sage governs people: Emptying their minds, Filling their bellies, Weakening their ambitions, And strengthening their bones. If people lack knowledge and desire Then they can not act; If no action is taken Harmony remains. 4. Limitless The Way is a limitless vessel; Used by the self, it is not filled by the world; It cannot be cut, knotted, dimmed or stilled; Its depths are hidden, ubiquitous and eternal; I don't know where it comes from; It comes before nature. 5. Nature Nature is not kind; It treats all things impartially. The Sage is not kind, And treats all people impartially. Nature is like a bellows, Empty, yet never ceasing its supply. The more it moves, the more it yields; So the sage draws upon experience And cannot be exhausted. 6. Experience Experience is a riverbed, Its source hidden, forever flowing: Its entrance, the root of the world, The Way moves within it: Draw upon it; it will not run dry. 7. Complete Nature is complete because it does not serve itself. The sage places himself after and finds himself before, Ignores his desire and finds himself content. He is complete because he does not serve himself. 8. Water The best of man is like water, Which benefits all things, and does not contend with them, Which flows in places that others disdain, Where it is in harmony with the Way. So the sage: Lives within nature, Thinks within the deep, Gives within impartiality, Speaks within trust, Governs within order, Crafts within ability, Acts within opportunity. He does not contend, and none contend against him. 9. Retire Fill a cup to its brim and it is easily spilled; Temper a sword to its hardest and it is easily broken; Amass the greatest treasure and it is easily stolen; Claim credit and honour and you easily fall; Retire once your purpose is achieved - this is natural. 10. Harmony Embracing the Way, you become embraced; Breathing gently, you become newborn; Clearing your mind, you become clear; Nurturing your children, you become impartial; Opening your heart, you become accepted; Accepting the world, you embrace the Way. Bearing and nurturing, Creating but not owning, Giving without demanding, This is harmony. 11. Tools Thirty spokes meet at a nave; because of the hole we may use the wheel. Clay is moulded into a vessel; Because of the hollow we may use the cup. Walls are built around a hearth; Because of the doors we may use the house. Thus tools come from what exists, But use from what does not. 12. Substance Too much colour blinds the eye, Too much music deafens the ear, Too much taste dulls the palate, Too much play maddens the mind, Too much desire tears the heart. In this manner the sage cares for people: He provides for the belly, not for the senses; He ignores abstraction and holds fast to substance. 13. Self Both praise and blame cause concern, For they bring people hope and fear. The object of hope and fear is the self - For, without self, to whom may fortune and disaster occur? Therefore, Who distinguishes himself from the world may be given the world, But who regards himself as the world may accept the world. 14. Mystery Looked at but cannot be seen - it is beneath form; Listened to but cannot be heard - it is beneath sound; Held but cannot be touched - it is beneath feeling; These depthless things evade definition, And blend into a single mystery. In its rising there is no light, In its falling there is no darkness, A continuous thread beyond description, Lining what does not exist; Its form formless, Its image nothing, Its name silence; Follow it, it has no back, et it, it has no face. Attend the present to deal with the past; Thus you grasp the continuity of the Way, Which is its essence. 15. Enlightenment The enlightened possess understanding So profound they can not be understood. Because they cannot be understood I can only describe their appearance: Cautious as one crossing thin ice, Undecided as one surrounded by danger, Modest as one who is a guest, Unbounded as melting ice, Genuine as unshaped wood, Broad as a valley, Seamless as muddy water. Who stills the water that the mud may settle, Who seeks to stop that he may travel on, Who desires less than what may transpire, Decays, but will not renew. 16. Decay and Renewal Empty the self completely; Embrace perfect peace. The world will rise and move; Watch it return to rest. All the flourishing things Will return to their source. This return is peaceful; It is the flow of nature, An eternal decay and renewal. Accepting this brings enlightenment, Ignoring this brings misery. Who accepts nature's flow becomes all-cherishing; Being all-cherishing he becomes impartial; Being impartial he becomes magnanimous; Being magnanimous he becomes natural; Being natural he becomes one with the Way; Being one with the Way he becomes immortal: Though his body will decay, the Way will not. 17. Rulers The best rulers are scarcely known by their subjects; The next best are loved and praised; The next are feared; The next despised: They have no faith in their people, And their people become unfaithful to them. When the best rulers achieve their purpose Their subjects claim the achievement as their own. 18. Hypocrisy When the Way is forgotten Duty and justice appear; Then knowledge and wisdom are born Along with hypocrisy. When harmonious relationships dissolve Then respect and devotion arise; When a nation falls to chaos Then loyalty and patriotism are born. 19. Simplify If we could discard knowledge and wisdom Then people would profit a hundredfold; If we could discard duty and justice Then harmonious relationships would form; If we could discard artifice and profit Then waste and theft would disappear. Yet such remedies treat only symptoms And so they are inadequate. People need personal remedies: Reveal your naked self and embrace your original nature; Bind your self-interest and control your ambition; Forget your habits and simplify your affairs. 20. Wandering What is the difference between assent and denial? What is the difference between beautiful and ugly? What is the difference between fearsome and afraid? The people are merry as if at a magnificent party Or playing in the park at springtime, But I am tranquil and wandering, Like a newborn before it learns to smile, Alone, with no true home. The people have enough and to spare, Where I have nothing, And my heart is foolish, Muddled and cloudy. The people are bright and certain, Where I am dim and confused; The people are clever and wise, Where I am dull and ignorant; Aimless as a wave drifting over the sea, Attached to nothing. The people are busy with purpose, Where I am ipractical and rough; I do not share the peoples' cares But I am fed at nature's breast. 21. Accept Harmony is only in following the Way. The Way is without form or quality, But expresses all forms and qualities; The Way is hidden and implicate, But expresses all of nature; The Way is unchanging, But expresses all motion. Beneath sensation and memory The Way is the source of all the world. How can I understand the source of the world? By accepting. 22. Home Accept and you become whole, Bend and you straighten, Empty and you fill, Decay and you renew, Want and you acquire, Fulfill and you become confused. The sage accepts the world As the world accepts the Way; He does not display himself, so is clearly seen, Does not justify himself, so is recognized, Does not boast, so is credited, Does not pride himself, so endures, Does not contend, so none contend against him. The ancients said, "Accept and you become whole", Once whole, the world is as your home. 23. Words Nature says only a few words: High wind does not last long, Nor does heavy rain. If nature's words do not last Why should those of man? Who accepts harmony, becomes harmonious. Who accepts loss, becomes lost. For who accepts harmony, the Way harmonizes with him, And who accepts loss, the Way cannot find. 24. Indulgence Straighten yourself and you will not stand steady; Display yourself and you will not be clearly seen; Justify yourself and you will not be respected; Promote yourself and you will not be believed; Pride yourself and you will not endure. These behaviours are wasteful, indulgent, And so they attract disfavour; Harmony avoids them. 25. Beneath Abstraction There is a mystery, Beneath abstraction, Silent, depthless, Alone, unchanging, Ubiquitous and liquid, The mother of nature. It has no name, but I call it "the Way"; It has no limit, but I call it "limitless". Being limitless, it flows away forever; Flowing away forever, it returns to my self: The Way is limitless, So nature is limitless, So the world is limitless, And so I am limitless. For I am abstracted from the world, The world from nature, Nature from the Way, And the Way from what is beneath abstraction. 26. Calm Gravity is the source of lightness, Calm, the master of haste. A lone traveller will journey all day, watching over his belongings; Only safe in his own bed may he lose them in sleep. So the captain of a great vessel should not act lightly or hastily. Acting lightly, he loses sight of the world, Acting hastily, he loses control of himself. The captain can not treat his great ship as a small boat; Rather than glitter like jade He must stand like stone. 27. Perfection The perfect traveller leaves no trail to be followed; The perfect speaker leaves no question to be answered; The perfect accountant leaves no working to be completed; The perfect container leaves no lock to be closed; The perfect knot leaves no end to be ravelled. So the sage nurtures all men And abandons no one. He accepts everything And rejects nothing. He attends to the smallest details. For the strong must guide the weak; The weak are raw material to the strong. If the guide is not respected, Or the material is not cared for, Confusion will result, no matter how clever one is. This is the secret of perfection: When raw wood is carved, it becomes a tool; When a man is employed, he becomes a tool; The perfect carpenter leaves no wood to be carved. 28. Becoming Using the male, being female, Being the entrance of the world, You embrace harmony And become as a newborn. Using strength, being weak, Being the root of the world, You complete harmony And become as unshaped wood. Using the light, being dark, Being the world, You perfect harmony And return to the Way. 29. Ambition Those who wish to change the world According with their desire Cannot succeed. The world is shaped by the Way; It cannot be shaped by the self. Trying to change it, you damage it; Trying to possess it, you lose it. So some will lead, while others follow. Some will be warm, others cold Some will be strong, others weak. Some will get where they are going While others fall by the side of the road. So the sage will be neither extravagant nor violent. 30. Violence Powerful men are well advised not to use violence, For violence has a habit of returning; Thorns and weeds grow wherever an army goes, And lean years follow a great war. A general is well advised To achieve nothing more than his orders: Not to take advantage of his victory. Nor to glory, boast or pride himself; To do what is dictated by necessity, Not by choice. For even the strongest force will weaken with time, And then its violence will return, and kill it. 31. Armies Armies are tools of violence; They cause men to hate and fear. The sage will not join them. His purpose is creation; Their purpose is destruction. Weapons are tools of violence, Not of the sage; He uses them only when there is no choice, And then calmly, and with tact, For he finds no beauty in them. Whoever finds beauty in weapons Delights in the slaughter of men; And who delights in slaughter Cannot content himself with peace. So slaughters must be mourned And conquest celebrated with a funeral. 32. Shapes The Way has no true shape, And therefore none can control it. If a ruler could control the Way All things would follow In harmony with his desire, And sweet rain would fall, Effortlessly slaking every thirst. The Way is shaped by use, But then the shape is lost. Do not hold fast to shapes But let sensation flow into the world As a river courses down to the sea. 33. Virtues Who understands the world is learned; Who understands the self is enlightened. Who conquers the world has strength; Who conquers the self has harmony; Who is determined has purpose. Who is contented has wealth; Who defends his home may long endure; Who surrenders his home may long survive it. 34. Control The Way flows and ebbs, creating and destroying, Implementing all the world, attending to the tiniest details, Claiming nothing in return. It nurtures all things, Though it does not control them; It has no intention, So it seems inconsequential. It is the substance of all things; Though it does not control them; It has no exception, So it seems all-important. The sage would not control the world; He is in harmony with the world. 35. Peace If you offer music and food Strangers may stop with you; But if you accord with the Way All the people of the world will keep you In safety, health, community, and peace. The Way lacks art and flavour; It can neither be seen or heard, But its benefit cannot be exhausted. 36. Opposition To reduce someone's influence, first expand it; To reduce someone's force, first increase it; To overthrow someone, first exalt them; To take from someone, first give to them. This is the subtlety by which the weak overcome the strong: Fish should not leave their depths, And swords should not leave their scabbards. + +[Test_9.15] +WSPMethod=67 +WSPURI=http://10.32.194.45/upload/tao.txt +//WSPURI=http://10.35.2.4/upload/tao.txt +//WSPHeaders=Accept-Language: English + +[Test_9.16] +WSPMethod=68 +WSPURI=http://10.35.2.4/wap/wstiot/ +WSPHeaders=Accept-Language: English + +[Test_9.17] +WSPMethod=65 +WSPURI=http://10.35.2.4/* +WSPHeaders=Accept-Language: English + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/testdata/WapSIMTSY.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/testdata/WapSIMTSY.txt Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,271 @@ +[test411] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=55000C9144775622322100F5A77B040402E2E2424547494E3A56434152445C725C6E56455253494F4E3A322E315C725C6E464E3A4A616C5C725C6E4E3A4A616C5C725C6E4F52473A50616E536F6674776172655C725C6E5449544C453A4469726563746F725C725C6E4C4142454C3A49736C696E67746F6E5C725C6E454E443A56434152445C725C6E,447765222312,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx=440C9144775622322100F5308010118590407B040402E2E2424547494E3A56434152445C725C6E56455253494F4E3A322E315C725C6E464E3A4A616C5C725C6E4E3A4A616C5C725C6E4F52473A50616E536F6674776172655C725C6E5449544C453A4469726563746F725C725C6E4C4142454C3A49736C696E67746F6E5C725C6E454E443A56434152445C725C6E, 447765222312 +SmsStartRxDelay= 4207, 1, 1 + +[test413] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C914477562232210000307003615225409F0500030402015EAFE97059A4156930184C068B8184C563D2A9B30E83CCA29318946E5E6E6B513A4D3E9DBA980BB679B985C563D2A9B316AD452775F3720F83D4E2F1294D16A7BA66B1484D3A8F9B977B4A0D52AB531DB5E8A406A9496B71F37213A9536A504AD5C960B0188C068B5161B3190C06D36E5E6E22B5E824EA6430580C4683C5A830DA0C06836901, 447765222312 +SmsRx=440C9144775622322100003070036152754016050003040202362FF7B4DA6C06A5595DB33C9F03, 447765222312 +SmsRx=040C9144775622322100003070036162504094AFD774B82CD28A34180C2683C940E173DA7D0635CB657ADA7DDEBCDCC4E274284D42A9C9A7532794A7E9EE721E14769341CAFA9C9E7683E86F90BC6C4F97EF2077F95E9ED34170F91BFE9E87D9A076985E96A7C3ECCDCB3D6406A7531D549AB406A9C5CDCB5D741275D6A2B5E8A46E5EEEA293A8B30E83CCA29318946E5EF2CDCB0D, 447765222312 +SmsStartRxDelay= 4207, 1, 3 + +[test415] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=15000C914477562232210000A78EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203,447765222312,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 040C914477562232210000308010219024408EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222312 +SmsStartRxDelay= 4207, 1, 1 + +[test421] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=55000C9144775622322100F5A77B0404020101424547494E3A56434152445C725C6E56455253494F4E3A322E315C725C6E464E3A4A616C5C725C6E4E3A4A616C5C725C6E4F52473A50616E536F6674776172655C725C6E5449544C453A4469726563746F725C725C6E4C4142454C3A49736C696E67746F6E5C725C6E454E443A56434152445C725C6E,447765222315,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C9144775622322100F5307003513340407B0404020101424547494E3A56434152445C725C6E56455253494F4E3A322E315C725C6E464E3A4A616C5C725C6E4E3A4A616C5C725C6E4F52473A50616E536F6674776172655C725C6E5449544C453A4469726563746F725C725C6E4C4142454C3A49736C696E67746F6E5C725C6E454E443A56434152445C725C6E, 447765222315 +SmsStartRxDelay= 4207, 1, 1 + +[test423] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C914477562232210000307013017510409F0500030002015EAFE970098BC16230184C068B8184C563D2A9B30E83CCA29318946E5E6E6B513A4D3E9DBA980BB679B985C563D2A9B316AD452775F3720F83D4E2F1294D16A7BA66B1484D3A8F9B977B4A0D52AB531DB5E8A406A9496B71F37213A9536A504AD5C960B0188C068B5161B3190C06D36E5E6E22B5E824EA6430580C4683C5A830DA0C06836901, 447765222312 +SmsRx=440C9144775622322100003070130175114016050003000202362FF7B4DA6C06A5595DB33C9F03, 447765222312 +SmsRx=040C9144775622322100003070130175024094AFD774B884C56031180C2683C940E173DA7D0635CB657ADA7DDEBCDCC4E274284D42A9C9A7532794A7E9EE721E14769341CAFA9C9E7683E86F90BC6C4F97EF2077F95E9ED34170F91BFE9E87D9A076985E96A7C3ECCDCB3D6406A7531D549AB406A9C5CDCB5D741275D6A2B5E8A46E5EEEA293A8B30E83CCA29318946E5EF2CDCB0D, 447765222312 +SmsStartRxDelay= 4207, 1, 3 + +[test425] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C9144775622322100F5307013514502408C09040201010003050301424547494E3A5643414C454E4441525C6E56455253494F4E3A312E305C6E424547494E3A564556454E545C6E43415445474F524945533A4D454554494E475C6E5354415455533A54454E5441544956455C6E445453544152543A3230303130343031543033333030305A5C6E4454454E443A3230303130343031543034333030305A, 447765222312 +SmsRx=440C9144775622322100F5307013514562408C090402010100030503025C6E53554D4D4152593A4D6573736167696E67204D656574696E675C6E4445534352495054494F4E3A427269746E657920616E64204A757374696E20746F20726576696577206E65776573742070726F706F73616C206D6174657269616C5C6E434C4153533A505249564154455C6E454E443A564556454E545C6E454E443A564341, 447765222312 +SmsRx=440C9144775622322100F53070135145134014090402010100030503034C454E4441525C725C6E, 447765222312 +SmsStartRxDelay= 4207, 1, 3 + +[test426] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=55000C9144775622322100F5A77D0605041581158130323441334135393331424442444239393545343034303034344438463531313431363631353631333631313632344432353434353835393835353834443835313835353235353835353834353834443834353835353834353834443839333443353131363234433330444230443330423338303030,447765222312,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx=440C9144775622322100F5309030710491407D0605041581158130323441334135393331424442444239393545343034303034344438463531313431363631353631333631313632344432353434353835393835353834443835313835353235353835353834353834443834353835353834353834443839333443353131363234433330444230443330423338303030, 447765222312 +SmsStartRxDelay= 4207, 1, 1 + +[test427] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C9144775622322100F5309030810000408C0B050415881588000303030131206E657720656D61696C206D6573736167655C6E2046726F6D3A204B616D72616E204E6F62617269203C4B616D72616E2E4E6F626172694053796D6269616E2E636F6D3E5C6E205375626A6563743A2074657374206F6E6C792C20706C656173652069676E6F72655C6E2073697A653A2034324B425C6E206174743A315C6E, 447765222312 +SmsRx= 440C9144775622322100F5309030810060408C0B050415881588000303030220546F3A20536F6D656F6E65203C736F6D656F6E65406E6F77686572652E636F6D3E5C6E20446174653A20332053657074656D6265722032303033202B303030305C6E2073656E6465723A4B616D72616E2E4E6F626172694073796D6269616E2E636F6D5C6E207265706C792D746F3A20736F6D656F6E652E656C7365405379, 447765222312 +SmsRx= 440C9144775622322100F530903081002140490B05041588158800030303036D6269616E2E636F6D5C6E20666C64723A20757365722E736D6172746D652E746869732E666F6C6465722E69732E666F722E6A756E6B2E6D61696C5C6E, 447765222312 +SmsStartRxDelay= 4207, 1, 3 + +[test428] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C9144775622322100F5309030815001408C0B0504157F157F000304020157656C636F6D65215C6E20496E616D653A2044656D6F6E5C6E20497569643A207073696F6E385C6E20497077643A207365637265745C6E204974656C3A202B3132333435363738393031323334355C6E204969703A203132332E3132332E3132332E3132335C6E2049646E73313A203132332E3132332E3132332E3132335C6E, 447765222312 +SmsRx= 440C9144775622322100F530903081505140230B0504157F157F00030402022049646E73323A203132332E3132332E3132332E313234, 447765222312 +SmsStartRxDelay= 4207, 1, 2 + +[test429] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsTx=00, 447765222312,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C9144775622322100F5309050014521408C0B050415821582000305020133303432463435303A30413030343830453A30313030303030303A30303030303030303A30303030303030303A30303030303030303A30303030303031453A30303030303030303A30323030303030303A32313030303030313A30303032303030303A30303231303030303A30313030303230303A30303030323133433A3733, 447765222312 +SmsRx= 440C9144775622322100F5309050014571403F0B05041582158200030502023339394343323A30373145373032313A32323841303532323A38323038413238383A32313232464133443A3232383230384132, 447765222312 +SmsStartRxDelay= 4207, 1, 2 + +[test431] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= +440C9144775622322100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315 +SmsStartRxDelay= 0, 0, 1 + +[test441] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= +440C9144775622322100F53080103112444056040402010159060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315 +SmsStartRxDelay= 0, 0, 1 + + +[test2] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=55000C914477562232510000A79F0500030002015EAFE97059A4156930184C068B8184C563D2A9B30E83CCA29318946E5E6E6B513A4D3E9DBA980BB679B985C563D2A9B316AD452775F3720F83D4E2F1294D16A7BA66B1484D3A8F9B977B4A0D52AB531DB5E8A406A9496B71F37213A9536A504AD5C960B0188C068B5161B3190C06D36E5E6E22B5E824EA6430580C4683C5A830DA0C06836901, 447765222315,12, 01A0, 0 +SmsTx=55000C914477562232510000A716050003000202362FF7B4DA6C06A5595DB33C9F03, 447765222315,12, 01A0, 0 +SmsTx=15000C914477562232510000A794AFD774B82CD28A34180C2683C940E173DA7D0635CB657ADA7DDEBCDCC4E274284D42A9C9A7532794A7E9EE721E14769341CAFA9C9E7683E86F90BC6C4F97EF2077F95E9ED34170F91BFE9E87D9A076985E96A7C3ECCDCB3D6406A7531D549AB406A9C5CDCB5D741275D6A2B5E8A46E5EEEA293A8B30E83CCA29318946E5EF2CDCB0D, 447765222315,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C914477562232510000306062516261409F0500030F02015EAFE97059A4156930184C068B8184C563D2A9B30E83CCA29318946E5E6E6B513A4D3E9DBA980BB679B985C563D2A9B316AD452775F3720F83D4E2F1294D16A7BA66B1484D3A8F9B977B4A0D52AB531DB5E8A406A9496B71F37213A9536A504AD5C960B0188C068B5161B3190C06D36E5E6E22B5E824EA6430580C4683C5A830DA0C06836901, 447765222315 +SmsRx=440C91447756223251000030606251620240160500030F0202362FF7B4DA6C06A5595DB33C9F03, 447765222315 +SmsRx=040C9144775622325100003060626191124094AFD774B82CD28A34180C2683C940E173DA7D0635CB657ADA7DDEBCDCC4E274284D42A9C9A7532794A7E9EE721E14769341CAFA9C9E7683E86F90BC6C4F97EF2077F95E9ED34170F91BFE9E87D9A076985E96A7C3ECCDCB3D6406A7531D549AB406A9C5CDCB5D741275D6A2B5E8A46E5EEEA293A8B30E83CCA29318946E5EF2CDCB0D, 447765222315 +SmsStartRxDelay= 4207, 1, 3 + +[test3] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx=15000C914477562232510000A795AFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95B86DBF2B07BF3926F5E6EA76E196E8BDFE474D8BD79C9372FF7537AD42DC36D79D83D7D9BE9F7B0BCBC79C9372F373549651675C3E273F3926F5E6E66505864EA927376DA7DA6BFDD9B977CF372179D449D75189412372FF9E6E506, 447765222315,12, 01A0, 0 +SmsTx=15000C914477562232510000A78EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx=040C9144775622325100003060724135804095AFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95B86DBF2B07BF3926F5E6EA76E196E8BDFE474D8BD79C9372FF7537AD42DC36D79D83D7D9BE9F7B0BCBC79C9372F373549651675C3E273F3926F5E6E66505864EA927376DA7DA6BFDD9B977CF372179D449D75189412372FF9E6E506, 447765222315 +SmsRx=040C914477562232510000306062113084408EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315 +SmsStartRxDelay= 4207, 1, 2 + +[test123] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx= 15000C914477562232510000A78EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 040C914477562232510000306062113084408EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315 +SmsStartRxDelay= 4207, 1, 1 + +[test5] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315 +SmsStartRxDelay= 0, 0, 3 + +[test6] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx= 15000C914477562232510000A78EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315,12, 01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 040C914477562232510000306062113084408EAFD774B82CCA40C2E231E9D45987412971F3926F5E6E6B513A4D3E9D3A992BB679C9372FB7D1A95386D99B977CF3723B75CA307BF3926F5EEEA7F4A88386DDD3B7997E0FCBCB9B977CF3725393546651474CCBCB63FA5BBE79C9372F3733282C3275C9393BED3ED3DFEECD4BBE79B98B4EA2CE3A0C4A899B977CF37203, 447765222315 +SmsStartRxDelay= 4207, 1, 1 + +[test7] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= +440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315 +SmsStartRxDelay= 0, 0, 1 + +[test8] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315 +SmsRx= 440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315 +SmsStartRxDelay= 0, 0, 2 + +[test9] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= +440C9144775622325100F530600351120340580605040B840B8459060A03AE81EAAF828DC4B48401056A0045C60D0373796D6269616E2E636F6D00110353492F34393534372F323738000AC3072003061613205310C3072003063013205807010320414C45525420000101, 447765222315 +SmsStartRxDelay= 0, 0, 1 + +[test10] +DiallingPauseDuration= 3 +ConnectingPauseDuration= 1 +DisconnectingPauseDuration= 5 +AnswerIncomingPauseDuration= 5 +SmsTxPause= 2 +SmsTx= 15000C914477562232510000A791AFD774B864C284381A48583C269D3AEB3028256E5EF2CDCB6D2D4AA7C9A7532773C5362FF9E6E5363A75CA307BF3926F5E6EA74E19666F5EF2CDCBFD941E75D0B07BFA36D3EF617979F3926F5E6E6A92CA2CEA886979794C7FCB372FF9E6E566068545A62E3967A7DD67FADBBD79C9372F77D149D45987412971F3926F5E6E, 447765222315,12,01A0, 0 +SmsAckNackPause= 1 +SmsRxPeriod= 2 +SmsRx= 040C9144775622325100003070700103634091AFD774B864C284381A48583C269D3AEB3028256E5EF2CDCB6D2D4AA7C9A7532773C5362FF9E6E5363A75CA307BF3926F5E6EA74E19666F5EF2CDCBFD941E75D0B07BFA36D3EF617979F3926F5E6E6A92CA2CEA886979794C7FCB372FF9E6E566068545A62E3967A7DD67FADBBD79C9372F77D149D45987412971F3926F5E6E,447765222315 +SmsStartRxDelay= 4207, 1, 1 diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/testdata/WapStackSuite.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/testdata/WapStackSuite.ini Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,404 @@ +[COMMON] +Bearer=3 +Remote_Host=+447765222312 +Local_Host=+447765222312 +Remote_Port=226 +Local_Port=226 +TimeOut=0 +ExError=0 +ExError2=0 +SimTsy=true +TsyState=411 +WSPHeaderLength=50 +WSPBodyLength=50 +WDPBufLength=30 +AwaitLengthCancel=false +MiddleCancel=false +MultiReadCancel=false +AwaitLengthTwice=false +DetailedLogging=true +Secure=0 +WSPMethod=1 +WSPHeaders=GET: +WSPBody=EMPTY-001-002-003-004-005-006-007-END +WSPURI=http://wap.wapgateway.com + + +[Test_2.1] +Bearer=2 +DelayPortClosure=true + +[Test_2.1.1] +Bearer=2 +ExError=-5498 + +[Test_2.1.2] +Bearer=2 +Local_Port=5501 + +[Test_2.1.3] +Bearer=2 +Local_Port=5502 + +[Test_2.2] +Bearer=3 + +[Test_2.3] +Bearer=4 + +[Test_2.4] +Bearer=5 + +[Test_2.5] +Bearer=1 + +[Test_2.6] +Bearer=0 + +[Test_2.7] +Bearer=-1 +ExError=-5499 + +[Test_2.8] +Bearer=3 +Secure=true +ExError=-5 + +[Test_2.9] +Bearer=0 +ExError=-5499 + +[Test_2.10] +Bearer=3 +Reconnect=true +ExError=-14 + +// API Request without connect +[Test_3] +ExError=-18 + +// Send and receive VCARD For Bound WDP (single read) +[Test_4.1.1] +Bearer=3 +Local_Port=226 +Remote_Port=226 +Type=VCARD +TsyState=411 +WDPBufLength=118 +Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n + +// Send and receive VCARD For Bound WDP(Multi read) +[Test_4.1.2] +Bearer=3 +Local_Port=226 +Remote_Port=226 +Type=VCARD +TsyState=411 +WDPBufLength=30 +Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n + +// Send and receive VCALENDAR For Bound WDP(single read) +[Test_4.1.3] +Bearer=2 +Local_Port=228 +Remote_Port=228 +TsyState=413 +Type=VCALENDAR +WDPBufLength=512 +Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n + +// Send and receive VCALENDAR For Bound WDP(single read) +[Test_4.1.4] +Bearer=2 +Local_Port=228 +Remote_Port=228 +TsyState=413 +Type=VCALENDAR +WDPBufLength=80 +Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n + +// Send and receive VCARD For Bound WDP (single read) +[Test_4.1.5] +Bearer=2 +Local_Port=226 +Remote_Port=226 +Type=VCARD +TsyState=415 +WDPBufLength=118 +Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n + +// Send and receive Ring Tone for Bound WDP +[Test_4.1.5.1] +Bearer=3 +Local_Port=5505 +Remote_Port= 5505 +Type= RINGTONE +TsyState=426 +Data=024A3A5931BDBDB995E4040044D8F511416615613611624D2544585985584D85185525585584584D84585584584D8934C511624C30DB0D30B38000 + +// Send and receive Email notification for Bound WDP +[Test_4.1.5.2] +Bearer=3 +Local_Port=5512 +Remote_Port= 5512 +Type= EMAILNOTIFICATION +TsyState=427 +Data=1 new email message\n From: Kamran Nobari \n Subject: test only, please ignore\n size: 42KB\n att:1\n To: Someone \n Date: 3 September 2003 +0000\n sender:Kamran.Nobari@symbian.com\n reply-to: someone.else@Symbian.com\n fldr: user.smartme.this.folder.is.for.junk.mail\n + +// Send and receive Internet Access configuration for Bound WDP +[Test_4.1.5.3] +Bearer=3 +Local_Port=5503 +Remote_Port= 5503 +Type= IACONFIG +TsyState=428 +Data= Welcome!\n Iname: Demon\n Iuid: psion8\n Ipwd: secret\n Itel: +123456789012345\n Iip: 123.123.123.123\n Idns1: 123.123.123.123\n Idns2: 123.123.123.124 + +// Send and receive operator logo for Bound WDP +[Test_4.1.5.4] +Bearer=3 +Local_Port=5506 +Remote_Port= 5506 +Type=OprtrLogo +TsyState=429 +Data=3042F450:0A00480E:01000000:00000000:00000000:00000000:0000001E:00000000:02000000:21000001:00020000:00210000:01000200:0000213C:73399CC2:071E7021:228A0522:8208A288:2122FA3D:228208A2 + +// Cancel For Bound WDP +[Test_4.1.6] +Bearer=3 +Local_Port=226 +Remote_Port=226 +Type=VCARD +TsyState=411 +WDPBufLength=30 +AwaitLengthCancel=true +ExError=-3 +Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n + +// Cancel For Bound WDP +[Test_4.1.7] +Bearer=3 +Local_Port=226 +Remote_Port=226 +Type=VCARD +TsyState=411 +WDPBufLength=30 +MiddleCancel=true +ExError=-3 +Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n + +// Cancel For Bound WDP +[Test_4.1.8] +Bearer=3 +Local_Port=226 +Remote_Port=226 +Type=VCARD +TsyState=411 +WDPBufLength=30 +MultiReadCancel=true +ExError=-3 +Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n + +// AwaitDataSize twice +[Test_4.1.9] +Bearer=3 +Local_Port=226 +Remote_Port=226 +Type=VCARD +TsyState=411 +WDPBufLength=30 +AwaitLengthTwice=true +ExError=-14 +Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n + +// Send and receive VCALENDAR For FullySpec WDP(single read) +[Test_4.2.1] +Bearer=3 +Local_Port=1 +Remote_Port=1 +Type=VCALENDAR +TsyState=421 +WDPBufLength=118 +Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n + +// Send and receive VCALENDAR For FullySpec WDP(multi read) +[Test_4.2.2] +Bearer=3 +Local_Port=1 +Remote_Port=1 +Type=VCALENDAR +TsyState=421 +WDPBufLength=30 +Data=BEGIN:VCARD\r\nVERSION:2.1\r\nFN:Jal\r\nN:Jal\r\nORG:PanSoftware\r\nTITLE:Director\r\nLABEL:Islington\r\nEND:VCARD\r\n + +// Send and receive VCALENDAR For FullySpec WDP(single read) +[Test_4.2.3] +Bearer=2 +Local_Port=1 +Remote_Port=1 +Type=VCALENDAR +TsyState=423 +WDPBufLength=512 +Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n + +// Send and receive VCALENDAR For FullySpec WDP(Multi read) +[Test_4.2.4] +Bearer=2 +Local_Port=1 +Remote_Port=1 +Type=VCALENDAR +TsyState=423 +WDPBufLength=30 +Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n + +// Send and receive VCALENDAR For FullySpec WDP(Multi read) +[Test_4.2.5] +Bearer=3 +Local_Port=1 +Remote_Port=1 +Type=VCALENDAR +TsyState=425 +WDPBufLength=30 +Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n + +// Cancell receiving VCALENDAR For FullySpec WDP +[Test_4.2.6] +Bearer=3 +Local_Port=1 +Remote_Port=1 +Type=VCALENDAR +TsyState=425 +WDPBufLength=30 +AwaitLengthCancel=true +ExError=-3 +Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n + +// Cancell receiving VCALENDAR For FullySpec WDP +[Test_4.2.7] +Bearer=3 +Local_Port=1 +Remote_Port=1 +Type=VCALENDAR +TsyState=425 +WDPBufLength=30 +MiddleCancel=true +ExError=-3 +Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n + +// Cancell receiving VCALENDAR For FullySpec WDP +[Test_4.2.8] +Bearer=3 +Local_Port=1 +Remote_Port=1 +Type=VCALENDAR +TsyState=425 +ExError=-3 +WDPBufLength=30 +MultiReadCancel=true +Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n + +[Test_4.2.9] +Bearer=3 +Local_Port=1 +Remote_Port=1 +Type=VCALENDAR +TsyState=425 +WDPBufLength=30 +AwaitLengthTwice=true +ExError=-14 +Data=BEGIN:VCALENDAR\nVERSION:1.0\nBEGIN:VEVENT\nCATEGORIES:MEETING\nSTATUS:TENTATIVE\nDTSTART:20010401T033000Z\nDTEND:20010401T043000Z\nSUMMARY:Messaging Meeting\nDESCRIPTION:Britney and Justin to review newest proposal material\nCLASS:PRIVATE\nEND:VEVENT\nEND:VCALENDAR\r\n + + +//AwaitPush For Bound API +[Test_4.3.1] +Bearer=3 +Local_Port=2948 +Remote_Port=2948 +TsyState=431 + +//AwaitPush For Bound API +[Test_4.3.2] +Bearer=3 +Local_Port=2948 +Remote_Port=2948 +TsyState=431 +WSPHeaderLength=512 +WSPBodyLength=512 + +[Test_4.3.3] +Bearer=3 +Local_Port=2948 +Remote_Port=2948 +TsyState=431 +MiddleCancel=true +ExError=-3 + +[Test_4.3.4] +Bearer=3 +Local_Port=2948 +Remote_Port=2948 +TsyState=431 +MultiReadCancel=true +ExError=-3 + +//AwaitPush For FullySpec API +[Test_4.4.1] +Bearer=3 +Local_Port=1 +Remote_Port=1 +TsyState=441 + +//AwaitPush For FullySpec API +[Test_4.4.2] +Bearer=3 +Local_Port=1 +Remote_Port=1 +TsyState=441 +WSPHeaderLength=512 +WSPBodyLength=512 + +//AwaitPush For FullySpec API +[Test_4.4.3] +Bearer=3 +Local_Port=1 +Remote_Port=1 +TsyState=441 +MiddleCancel=true +ExError=-3 + +//AwaitPush For FullySpec API +[Test_4.4.4] +Bearer=3 +Local_Port=1 +Remote_Port=1 +TsyState=441 +MultiReadCancel=true +ExError=-3 + + +//TimeOut +[Test_6.1] +Local_Port=2948 +Remote_Port=2948 +WSPHeaderLength=10 +WSPBodyLength=10 +TimeOut=100000 +ExError=-33 + +//Wrong Sequence +[Test_7.1] +WDPBufLength=10 +WSPHeaderLength=10 +WSPBodyLength=10 +TsyState=411 +ExError=-14 + +//Invalid parameter +[Test_8] +WSPMethod=0x30 +WSPHeaders=GET: +WSPBody=EMPTY-001-002-003-004-005-006-007-END +WSPURI=http://wap.wapgateway.com +ExError=-5448 +ExError2=-6 + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/testdata/WapStackSuite.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/testdata/WapStackSuite.xml Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,859 @@ + + + + + + + + + + + + + Intranet + + + + + + Pipex CSD IR + DialOutISP.TEST Network + ModemBearer.GSM Mobile Phone via Serial + Network.Intranet + 0 + Location.Office Direct Dial + + + + + + Default Modem + CSD.agt + PPP + COMM::0 + SIM + ECUART + 8 + 1 + NONE + 115200 + 0 + 0 + 0 + 0 + AUTO + NEVER + QUIET + AT + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +44123456789 + 1440 + FALSE + 9905 + 30 + 180 + 30 + + + GSM Mobile Phone via Serial 01 + CSD.agt + PPP + COMM::0 + SIM + ECUART + 8 + 1 + NONE + 115200 + 196 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +447785016005 + 1440 + FALSE + 9905 + 30 + 180 + 30 + + + GSM Mobile Phone via Serial + CSD.agt + PPP + COMM::0 + SIM + ECUART + 8 + 1 + NONE + 115200 + 196 + 0 + 17 + 19 + AUTO + NEVER + QUIET + ATZ + AT + AT + S8= + L0 + L1 + L2 + M0 + M1 + M2 + M3 + W + X1 + X2 + X3 + X4 + E0 + V1 + Q0 + Q1 + ; + O + Z + &F + &C1 + &D2 + &S0 + &K3 + &K4 + + + S12 + NO DIAL TONE + BUSY + NO ANSWER + CARRIER + CONNECT + COMPRESSION:CLASS 5 + COMPRESSION:V.42 bis + COMPRESSION:NONE + PROTOCOL:LAPD + PROTOCOL:ALT + PROTOCOL:ALT-CELLULAR + PROTOCOL:NONE + +447785016005 + 1440 + FALSE + 9905 + 30 + 180 + 30 + + + + + + Assabet on-board Ethernet + nullagent.agt + ethint + not used + not used + -1 + -1 + -1 + + + + + + Ethernet + ip,ip6 + 255.255.255.0 + 194.72.6.1 + 192.168.0.100 + TRUE + FALSE + 194.72.6.51 + 194.72.6.52 + + + + + + Default Dial In ISP + FALSE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + + + Dial In ISP01 + FALSE + TRUE + TRUE + FALSE + FALSE + FALSE + FALSE + FALSE + + + + + + Default Dial Out ISP + TRUE + FALSE + TRUE + TRUE + TRUE + TRUE + FALSE + FALSE + 0 + FALSE + FALSE + FALSE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + TEST0 Network + TRUE + FALSE + FALSE + FALSE + TRUE + FALSE + dial in test network + INTERNETANDWAP + 02075632200 + wapusr + train + FALSE + ip + wapusr + train + 0 + FALSE + 0 + 158.43.128.1 + 158.43.192.1 + FALSE + FALSE + FALSE + FALSE + 0 + ASYNCHRONOUS + UNSPECIFIED + UNSPECIFIED + CSD + UNSPECIFIED + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + TEST Network + TRUE + FALSE + FALSE + FALSE + TRUE + FALSE + dial in test network + INTERNETANDWAP + 02075632200 + wapusr + train + FALSE + ip + wapusr + train + 0 + FALSE + 0 + 158.43.128.1 + 158.43.192.1 + FALSE + FALSE + FALSE + FALSE + 0 + ASYNCHRONOUS + UNSPECIFIED + UNSPECIFIED + CSD + UNSPECIFIED + UNSPECIFIED + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + + + + + + + + + test name cdma2000 + Test2000 + HIGHSPEEDCDMA2000DATA + IPV4 + PRIORITY04 + PRIORITY04 + 32KBPS + 32KBPS + LOSS1 + LOSS1 + 40MS + 40MS + 32KBPS + 32KBPS + LOSS2 + LOSS2 + 120MS + 120MS + FALSE + FALSE + FALSE + ip + RasUser + pass + FALSE + 1 + 0.255.255.255 + 10.0.0.1 + TRUE + TRUE + TRUE + TRUE + 2 + 1000000 + TRANSPARENT + FALSE + 10000000 + + + + + + + + + Dummy BT Chargecard + 144,12345678 + 0000 + HG + HFG + HEFG + + + Dummy Mercury Chargecard + 0500800800,,12345678 + **** + HG + J,K,0FG + HEFG + + + + + + ConnectionPreferencesTable1 + 1 + OUTGOING + DONOTPROMPT + CSD + IAP.Pipex CSD IR + + + ConnectionPreferencesTable2 + 2 + OUTGOING + DONOTPROMPT + CSD + IAP.Pipex CSD IR + + + + + + GlobalSettingsTable1 + WAPAccessPoint.Default Dial In ISP + 3 + WAPSMSBearer.WAPSMSBearerTable1 + 2 + 1 + 1 + 2 + 2 + 2 + Location.Office + Location.Office + GSM + Network.Intranet + mm + + + + + + Incoming GPRS Settings PlaceHolder + Test + IPV4 + 0.0.0.0 + FALSE + TRUE + TRUE + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + FALSE + FALSE + FALSE + ip + RasUser + pass + 1 + 0.0.0.0 + 0.0.0.0 + FALSE + FALSE + FALSE + + + + + + GPRS01 + gprs01APNPlaceHolder + IPV4 + FALSE + TRUE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + FALSE + ip + 1 + FALSE + FALSE + FALSE + 0 + 0 + + + GPRS02 + gprs02APNPlaceHolder + IPV4 + FALSE + TRUE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + FALSE + ip + 1 + FALSE + FALSE + FALSE + 0 + 0 + + + GPRS03 + gprs03APNPlaceHolder + IPV4 + FALSE + TRUE + FALSE + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + FALSE + FALSE + FALSE + ip + 1 + FALSE + FALSE + FALSE + 0 + 0 + + + + + + Dummy Default GPRS Settings + Access point name + IPV6 + www.wid.com + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + TRUE + TRUE + FALSE + TRUE + + + + + + ProxyTable1 + DialOutISP.TEST Network + TRUE + http + www.dummyproxy.com + 80 + www.dummyproxy.com/exception + + + + + + Default Location + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + + + Office + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + 9, + + + Office temp + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + + + Office Direct Dial + FALSE + FALSE + FALSE + 0 + 00 + 0 + 44 + 171 + + + Mobile + TRUE + FALSE + FALSE + 0 + + + 0 + 44 + + + Home + FALSE + TRUE + TRUE + 0 + 00 + 0 + 44 + 181 + + + + + + SecureSocketTable1 + ssl3.0 + ssladaptor.dll + + + SecureSocketTable2 + tls1.0 + ssladaptor.dll + + + + + + + + + + + + + + + + + + Default Dial In ISP + WAPIPBearer + + + Dummy1 WAP Settings + WAPIPBearer + www.wapstart.com + + + Dummy WAP Settings + WAPIPBearer + www.wapstart.com + + + + + + WAPIPBearerTable1 + WAPAccessPoint.-1 + CONNECTIONLESS + FALSE + IAP.-1 + 0 + + + WAPIPBearerTable2 + WAPAccessPoint.Dummy WAP Settings + www.wapgateway.com + CONNECTIONORIENTED + FALSE + IAP.Pipex CSD IR + 1 + + + + + + WAPSMSBearerTable1 + WAPAccessPoint.-1 + CONNECTIONLESS + FALSE + + + WAPSMSBearerTable2 + WAPAccessPoint.Dummy WAP Settings + +447785016005 + CONNECTIONORIENTED + FALSE + +442071234567 + + + + + + + + + + + diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/testdata/WapStackSuite_Config.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wapstack/wapmessageapi/te_wapstack/testdata/WapStackSuite_Config.ini Tue Jun 22 11:02:32 2010 +0100 @@ -0,0 +1,1 @@ +RadioBearer= CDMA \ No newline at end of file diff -r 2473f5e227f9 -r 8b72faa1200f wapstack/wapmessageapi/te_wapstack/testdata/pushpdu.bin Binary file wapstack/wapmessageapi/te_wapstack/testdata/pushpdu.bin has changed