--- a/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp Thu May 27 14:05:07 2010 +0300
+++ b/basebandabstraction/basebandchanneladaptor/group/networking_bca.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/bwins/c32bca2u.def Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
- NewBcaFactoryL @ 1 NONAME
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/bwins/c32bca2u.def Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,3 @@
+EXPORTS
+ NewBcaFactoryL @ 1 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/eabi/c32bca2u.def Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,7 @@
+EXPORTS
+ NewBcaFactoryL @ 1 NONAME
+ _ZTIN26BasebandChannelAdaptation210C32BcaShim7CSenderE @ 2 NONAME
+ _ZTIN26BasebandChannelAdaptation210C32BcaShim9CReceiverE @ 3 NONAME
+ _ZTVN26BasebandChannelAdaptation210C32BcaShim7CSenderE @ 4 NONAME
+ _ZTVN26BasebandChannelAdaptation210C32BcaShim9CReceiverE @ 5 NONAME
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/group/C32Bca2.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/inc/C32Bca.h Thu May 27 14:05:07 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/inc/C32Bca.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
#include <commsdattypesv1_1.h>
using namespace CommsDat;
-#include <comms-infras/commsdebugutility.h>
/** 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.
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/src/C32Bca.cpp Thu May 27 14:05:07 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/src/C32Bca.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <cdbcols.h>
#include <commsdat_partner.h>
@@ -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<const TUint32*>(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<TCommConfig> 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<const TCommConfig*>(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<const TName*>(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<const TCommRole*>(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<const TInt*>(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<const TSerialSetControlLines*>(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())
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/c32bca2/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca.mmp Thu May 27 14:05:07 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/commsdebugutility.mmh>
-
// Do not add the non-callable exports to the DEF files
// Remove this line temporarily if we need to add new exports
//NOEXPORTLIBRARY
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/C32Bca2.mmp Thu May 27 14:05:07 2010 +0300
+++ /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 <comms-infras/commsdebugutility.mmh>
-
-// 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
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/bld.inf Thu May 27 14:05:07 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp Thu May 27 14:05:07 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/inc/C32Bca.h Thu May 27 14:05:07 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/inc/C32Bca.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
#include <commsdattypesv1_1.h>
using namespace CommsDat;
-#include <comms-infras/commsdebugutility.h>
/** 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.
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/src/C32Bca.cpp Thu May 27 14:05:07 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/src/C32Bca.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <cdbcols.h>
#include <commsdat_partner.h>
@@ -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<const TUint32*>(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<TCommConfig> 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<const TCommConfig*>(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<const TName*>(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<const TCommRole*>(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<const TInt*>(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<const TSerialSetControlLines*>(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())
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/configs/te_c32BcaUnit.xml Thu May 27 14:05:07 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/configs/te_c32BcaUnit.xml Fri Jun 11 14:49:29 2010 +0300
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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"
@@ -83,9 +83,9 @@
</IAP>
<IAP operation="add">
- <Name>ECUART_Csy_Invalid_Port</Name>
+ <Name>PKTLB_Csy_Invalid_Port</Name>
<IAPService>OutgoingGPRS.Dummy</IAPService>
- <IAPBearer>ModemBearer.ECUART_Csy_Invalid_Port</IAPBearer>
+ <IAPBearer>ModemBearer.PKTLB_Csy_Invalid_Port</IAPBearer>
<IAPNetwork>Network.Intranet</IAPNetwork>
<IAPNetworkWeighting>0</IAPNetworkWeighting>
<LocationRef>Location.Mobile</LocationRef>
@@ -223,9 +223,10 @@
</ModemBearer>
<ModemBearer operation="add">
- <Name>ECUART_Csy_Invalid_Port</Name>
- <CSYName>ECUART</CSYName>
+ <Name>PKTLB_Csy_Invalid_Port</Name>
+ <CSYName>PKTLOOPBACK</CSYName>
<PortName>INVALID_PORT_NAME</PortName>
+ <CommRole>1</CommRole>
</ModemBearer>
--- a/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/src/te_C32BcaUnitSteps.cpp Thu May 27 14:05:07 2010 +0300
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/te_c32bca/src/te_C32BcaUnitSteps.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -1301,13 +1301,17 @@
}
/**
-Tests C32Bca can read hidden records from the Comms database.
+Tests C32Bca can read hidden records from the Comms database.
+The test creates an entry in CommsDat for a valid CSY using an invalid (unknown) Port Id.
+The C32Bca reads this entry and tries to connect to the Comms Server, load the packet loopback csy and open channel UNKNOWN:0.
+The Comms Server returns -46, which indicates that it managed to load the packetloop bca csy but returns -46 indicating that
+port is invalid.
*/
TVerdict CHiddenIAPRecord::RunTestStepL()
{
- _LIT(KCsyName, "ECUART");
- _LIT(KCsyPortName, "ECUART::0");
+ _LIT(KCsyName, "PKTLOOPBACK");
+ _LIT(KCsyPortName, "UNKNOWN::0");
_LIT(KCsyRecordName, "DummyRecordName");
_LIT(KIAPRecordName, "DummyHiddenIAP");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/basebandadaptationplugins/basebandchanneladaptorforc32/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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_CANCELIOCTL_1=0x36
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELREAD_1=0x13
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CANCELWRITE_1=0x14
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CLOSECOMMPORT_1=0x37
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CLOSE_1=0x12
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_COMMLINKDOWN_1=0x39
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_1=0x32
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_2=0x33
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_3=0x34
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CONNECTTOCOMMDBBEARERRECORDL_4=0x35
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_CTOR_1=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_DTOR_1=0x6
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_DTOR_2=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_1=0x15
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_10=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_11=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_12=0x20
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_13=0x21
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_14=0x22
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_15=0x23
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_16=0x24
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_17=0x25
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_18=0x26
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_19=0x27
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_2=0x16
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_3=0x17
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_4=0x18
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_5=0x19
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_6=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_7=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_8=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_IOCTL_9=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL_1=0x28
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL_2=0x29
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL_3=0x2a
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_MONITORCONTROLLINESL_4=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_1=0x9
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_2=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_3=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_4=0xc
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_5=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_6=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_7=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_OPEN_8=0x10
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_PANIC_1=0x38
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMPORTFROMCOMMDBL_1=0x2c
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMPORTFROMCOMMDBL_2=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMROLEFROMCOMMDBL_1=0x30
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCOMMROLEFROMCOMMDBL_2=0x31
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCSYNAMEFROMCOMMDBL_1=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_READCSYNAMEFROMCOMMDBL_2=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_RELEASE_1=0x8
+[TRACE]TRACE_INTERNALS[0x88]_CC32BCA_SHUTDOWN_1=0x11
+[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_DOCANCEL_1=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_NOTIFYLINKDOWN_1=0x2
+[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_RUNL_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CCOMMLINKMONITOR_SETUP_1=0x1
--- a/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp Thu May 27 14:05:07 2010 +0300
+++ b/cellularsrv_info/cellularsrv_metadata/cellularsrv_metadata.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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 cellularsrv_metadata
source \sf\os\cellularsrv\cellularsrv_info\cellularsrv_metadata
source \sf\os\cellularsrv\package_definition.xml
--- a/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp Thu May 27 14:05:07 2010 +0300
+++ b/hwpluginsimulation/mocksy/group/telephony_tools_mocksy.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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_tools_mocksy
source \sf\os\cellularsrv\hwpluginsimulation\mocksy\
binary \sf\os\cellularsrv\hwpluginsimulation\mocksy\group all
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/layers.sysdef.xml Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+ <!ENTITY layer_real_source_path "sf/os/cellularsrv" >
+]>
+
+<SystemDefinition name="cellularsrv" schema="1.4.0">
+ <systemModel>
+ <layer name="os_layer">
+ <module name="cellularsrv">
+ <unit unitID="cbsdo.cellularsrv" mrp="" bldFile="&layer_real_source_path;/group" name="cellularsrv" />
+ </module>
+ </layer>
+ <layer name="api_test_layer">
+ <module name="cellularsrv_test">
+ <unit unitID="cbsdo.cellularsrv.test" mrp="" bldFile="&layer_real_source_path;/group" name="cellularsrv" />
+ </module>
+ </layer>
+ </systemModel>
+</SystemDefinition>
--- a/smsprotocols/smsstack/common/inc/smsstacklog.h Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/common/inc/smsstacklog.h Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -16,284 +16,36 @@
#ifndef _SMSSTACKLOG_H_
#define _SMSSTACKLOG_H_
-/**
- * @file
- *
- * Logging macros for SMSStack. 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 SMSStack Common
- * LOG SMSStack GSMU
- * LOG SMSStack SMSPROT
- * LOG SMSStack SMSU
- * LOG SMSStack SMSIF
- * LOG SMSStack WAPPROT
- *
- * Each line relates to a particular part of the SMS Stack, 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 SMS 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 <comms-infras/commsdebugutility.h>
#include <etelmm.h>
-#ifdef _DEBUG
-#define _SMS_LOGGING_ENABLED
-#endif
-
-
-#ifdef _SMS_LOGGING_ENABLED
-
-_LIT8(KSMSStackSubSystem, "SMSStack");
-
-#define SMSFLOG1(N,A) { \
- _LIT8(KLogString, A); \
- __FLOG_STATIC0(KSMSStackSubSystem,(N),KLogString); \
- }
-#define SMSFLOG2(N,A,B) { \
- _LIT8(KLogString, A); \
- __FLOG_STATIC1(KSMSStackSubSystem,(N),KLogString,(B)); \
- }
-#define SMSFLOG3(N,A,B,C) { \
- _LIT8(KLogString, A); \
- __FLOG_STATIC2(KSMSStackSubSystem,(N),KLogString,(B),(C)); \
- }
-#define SMSFLOG4(N,A,B,C,D) { \
- _LIT8(KLogString, A); \
- __FLOG_STATIC3(KSMSStackSubSystem,(N),KLogString,(B),(C),(D)); \
- }
-#define SMSFLOG5(N,A,B,C,D,E) { \
- _LIT8(KLogString, A); \
- __FLOG_STATIC4(KSMSStackSubSystem,(N),KLogString,(B),(C),(D),(E)); \
- }
-#define SMSFLOG6(N,A,B,C,D,E,F) { \
- _LIT8(KLogString, A); \
- __FLOG_STATIC5(KSMSStackSubSystem,(N),KLogString,(B),(C),(D),(E),(F)); \
- }
-#define SMSFLOG7(N,A,B,C,D,E,F,G) { \
- _LIT8(KLogString, A); \
- __FLOG_STATIC6(KSMSStackSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G)); \
- }
-#define SMSFLOG8(N,A,B,C,D,E,F,G,H) { \
- _LIT8(KLogString, A); \
- __FLOG_STATIC7(KSMSStackSubSystem,(N),KLogString,(B),(C),(D),(E),(F),(G),(H)); \
- }
-
-_LIT8(KSMSStackCommon, "Common");
-_LIT8(KSMSStackGSMU, "GSMU");
-_LIT8(KSMSStackSMSPROT, "SMSPROT");
-_LIT8(KSMSStackSMSU, "SMSU");
-_LIT8(KSMSStackSMSIF, "SMSIF");
-_LIT8(KSMSStackWAPPROT, "WAPPROT");
-
-
-#define LOGCOMMON1(A) SMSFLOG1(KSMSStackCommon,A)
-#define LOGCOMMON2(A,B) SMSFLOG2(KSMSStackCommon,A,(B))
-#define LOGCOMMON3(A,B,C) SMSFLOG3(KSMSStackCommon,A,(B),(C))
-#define LOGCOMMON4(A,B,C,D) SMSFLOG4(KSMSStackCommon,A,(B),(C),(D))
-#define LOGCOMMON5(A,B,C,D,E) SMSFLOG5(KSMSStackCommon,A,(B),(C),(D),(E))
-#define LOGCOMMON6(A,B,C,D,E,F) SMSFLOG6(KSMSStackCommon,A,(B),(C),(D),(E),(F))
-#define LOGCOMMON7(A,B,C,D,E,F,G) SMSFLOG7(KSMSStackCommon,A,(B),(C),(D),(E),(F),(G))
-#define LOGCOMMON8(A,B,C,D,E,F,G,H) SMSFLOG8(KSMSStackCommon,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 LOGGSMU1(A) SMSFLOG1(KSMSStackGSMU,A)
-#define LOGGSMU2(A,B) SMSFLOG2(KSMSStackGSMU,A,(B))
-#define LOGGSMU3(A,B,C) SMSFLOG3(KSMSStackGSMU,A,(B),(C))
-#define LOGGSMU4(A,B,C,D) SMSFLOG4(KSMSStackGSMU,A,(B),(C),(D))
-#define LOGGSMU5(A,B,C,D,E) SMSFLOG5(KSMSStackGSMU,A,(B),(C),(D),(E))
-#define LOGGSMU6(A,B,C,D,E,F) SMSFLOG6(KSMSStackGSMU,A,(B),(C),(D),(E),(F))
-#define LOGGSMU7(A,B,C,D,E,F,G) SMSFLOG7(KSMSStackGSMU,A,(B),(C),(D),(E),(F),(G))
-#define LOGGSMU8(A,B,C,D,E,F,G,H) SMSFLOG8(KSMSStackGSMU,A,(B),(C),(D),(E),(F),(G),(H))
-#define LOGGSMUTIMESTAMP() { \
- TTime now; \
- now.UniversalTime(); \
- TDateTime dateTime(now.DateTime()); \
- LOGGSMU5("TimeStamp=%02d:%02d:%02d.%06d", \
- dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
- }
-
-#define LOGSMSPROT1(A) SMSFLOG1(KSMSStackSMSPROT,A)
-#define LOGSMSPROT2(A,B) SMSFLOG2(KSMSStackSMSPROT,A,(B))
-#define LOGSMSPROT3(A,B,C) SMSFLOG3(KSMSStackSMSPROT,A,(B),(C))
-#define LOGSMSPROT4(A,B,C,D) SMSFLOG4(KSMSStackSMSPROT,A,(B),(C),(D))
-#define LOGSMSPROT5(A,B,C,D,E) SMSFLOG5(KSMSStackSMSPROT,A,(B),(C),(D),(E))
-#define LOGSMSPROT6(A,B,C,D,E,F) SMSFLOG6(KSMSStackSMSPROT,A,(B),(C),(D),(E),(F))
-#define LOGSMSPROT7(A,B,C,D,E,F,G) SMSFLOG7(KSMSStackSMSPROT,A,(B),(C),(D),(E),(F),(G))
-#define LOGSMSPROT8(A,B,C,D,E,F,G,H) SMSFLOG8(KSMSStackSMSPROT,A,(B),(C),(D),(E),(F),(G),(H))
-#define LOGSMSPROTTIMESTAMP() { \
- TTime now; \
- now.UniversalTime(); \
- TDateTime dateTime(now.DateTime()); \
- LOGSMSPROT5("TimeStamp=%02d:%02d:%02d.%06d", \
- dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
- }
-
-#define LOGSMSU1(A) SMSFLOG1(KSMSStackSMSU,A)
-#define LOGSMSU2(A,B) SMSFLOG2(KSMSStackSMSU,A,(B))
-#define LOGSMSU3(A,B,C) SMSFLOG3(KSMSStackSMSU,A,(B),(C))
-#define LOGSMSU4(A,B,C,D) SMSFLOG4(KSMSStackSMSU,A,(B),(C),(D))
-#define LOGSMSU5(A,B,C,D,E) SMSFLOG5(KSMSStackSMSU,A,(B),(C),(D),(E))
-#define LOGSMSU6(A,B,C,D,E,F) SMSFLOG6(KSMSStackSMSU,A,(B),(C),(D),(E),(F))
-#define LOGSMSU7(A,B,C,D,E,F,G) SMSFLOG7(KSMSStackSMSU,A,(B),(C),(D),(E),(F),(G))
-#define LOGSMSU8(A,B,C,D,E,F,G,H) SMSFLOG8(KSMSStackSMSU,A,(B),(C),(D),(E),(F),(G),(H))
-#define LOGSMSUTIMESTAMP() { \
- TTime now; \
- now.UniversalTime(); \
- TDateTime dateTime(now.DateTime()); \
- LOGSMSU5("TimeStamp=%02d:%02d:%02d.%06d", \
- dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
- }
-
-#define LOGSMSIF1(A) SMSFLOG1(KSMSStackSMSIF,A)
-#define LOGSMSIF2(A,B) SMSFLOG2(KSMSStackSMSIF,A,(B))
-#define LOGSMSIF3(A,B,C) SMSFLOG3(KSMSStackSMSIF,A,(B),(C))
-#define LOGSMSIF4(A,B,C,D) SMSFLOG4(KSMSStackSMSIF,A,(B),(C),(D))
-#define LOGSMSIF5(A,B,C,D,E) SMSFLOG5(KSMSStackSMSIF,A,(B),(C),(D),(E))
-#define LOGSMSIF6(A,B,C,D,E,F) SMSFLOG6(KSMSStackSMSIF,A,(B),(C),(D),(E),(F))
-#define LOGSMSIF7(A,B,C,D,E,F,G) SMSFLOG7(KSMSStackSMSIF,A,(B),(C),(D),(E),(F),(G))
-#define LOGSMSIF8(A,B,C,D,E,F,G,H) SMSFLOG8(KSMSStackSMSIF,A,(B),(C),(D),(E),(F),(G),(H))
-#define LOGSMSIFTIMESTAMP() { \
- TTime now; \
- now.UniversalTime(); \
- TDateTime dateTime(now.DateTime()); \
- LOGSMSIF5("TimeStamp=%02d:%02d:%02d.%06d", \
- dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
- }
-#define LOGSMSIFPDU(A,B,C) LogSmsIfPDU((A),(B),(C))
-#define LOGSMSIFHEXBUF(A,B) LogSmsIfHexBuf((A),(B))
-#define LOGSMSIFTYPEOFNUMBER(A,B) LogSmsIfTypeOfNumber((A),(B))
-#define LOGSMSIFNUMBERINGPLAN(A,B) LogSmsIfNumberingPlan((A),(B))
-#define LOGSMSIFSMSENTRY(A,B) LogSmsIfSmsEntry((A),(B))
-#define LOGSMSIFSENDATTRIBUTES(A,B) LogSmsIfSendAttributes((A),(B))
-
-#define LOGWAPPROT1(A) SMSFLOG1(KSMSStackWAPPROT,A)
-#define LOGWAPPROT2(A,B) SMSFLOG2(KSMSStackWAPPROT,A,(B))
-#define LOGWAPPROT3(A,B,C) SMSFLOG3(KSMSStackWAPPROT,A,(B),(C))
-#define LOGWAPPROT4(A,B,C,D) SMSFLOG4(KSMSStackWAPPROT,A,(B),(C),(D))
-#define LOGWAPPROT5(A,B,C,D,E) SMSFLOG5(KSMSStackWAPPROT,A,(B),(C),(D),(E))
-#define LOGWAPPROT6(A,B,C,D,E,F) SMSFLOG6(KSMSStackWAPPROT,A,(B),(C),(D),(E),(F))
-#define LOGWAPPROT7(A,B,C,D,E,F,G) SMSFLOG7(KSMSStackWAPPROT,A,(B),(C),(D),(E),(F),(G))
-#define LOGWAPPROT8(A,B,C,D,E,F,G,H) SMSFLOG8(KSMSStackWAPPROT,A,(B),(C),(D),(E),(F),(G),(H))
-#define LOGWAPPROTTIMESTAMP() { \
- TTime now; \
- now.UniversalTime(); \
- TDateTime dateTime(now.DateTime()); \
- LOGWAPPROT5("TimeStamp=%02d:%02d:%02d.%06d", \
- dateTime.Hour(), dateTime.Minute(), dateTime.Second(), dateTime.MicroSecond()); \
- }
-
-#else // _SMS_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 LOGGSMU1(A)
-#define LOGGSMU2(A,B)
-#define LOGGSMU3(A,B,C)
-#define LOGGSMU4(A,B,C,D)
-#define LOGGSMU5(A,B,C,D,E)
-#define LOGGSMU6(A,B,C,D,E,F)
-#define LOGGSMU7(A,B,C,D,E,F,G)
-#define LOGGSMU8(A,B,C,D,E,F,G,H)
-#define LOGGSMUTIMESTAMP()
-
-#define LOGSMSPROT1(A)
-#define LOGSMSPROT2(A,B)
-#define LOGSMSPROT3(A,B,C)
-#define LOGSMSPROT4(A,B,C,D)
-#define LOGSMSPROT5(A,B,C,D,E)
-#define LOGSMSPROT6(A,B,C,D,E,F)
-#define LOGSMSPROT7(A,B,C,D,E,F,G)
-#define LOGSMSPROT8(A,B,C,D,E,F,G,H)
-#define LOGSMSPROTTIMESTAMP()
-
-#define LOGSMSU1(A)
-#define LOGSMSU2(A,B)
-#define LOGSMSU3(A,B,C)
-#define LOGSMSU4(A,B,C,D)
-#define LOGSMSU5(A,B,C,D,E)
-#define LOGSMSU6(A,B,C,D,E,F)
-#define LOGSMSU7(A,B,C,D,E,F,G)
-#define LOGSMSU8(A,B,C,D,E,F,G,H)
-#define LOGSMSUTIMESTAMP()
-
-#define LOGSMSIF1(A)
-#define LOGSMSIF2(A,B)
-#define LOGSMSIF3(A,B,C)
-#define LOGSMSIF4(A,B,C,D)
-#define LOGSMSIF5(A,B,C,D,E)
-#define LOGSMSIF6(A,B,C,D,E,F)
-#define LOGSMSIF7(A,B,C,D,E,F,G)
-#define LOGSMSIF8(A,B,C,D,E,F,G,H)
-#define LOGSMSIFTIMESTAMP()
-#define LOGSMSIFPDU(A,B,C)
-#define LOGSMSIFHEXBUF(A,B)
-#define LOGSMSIFTYPEOFNUMBER(A,B)
-#define LOGSMSIFNUMBERINGPLAN(A,B)
-#define LOGSMSIFSMSENTRY(A,B)
-#define LOGSMSIFSENDATTRIBUTES(A,B)
-
-#define LOGWAPPROT1(A)
-#define LOGWAPPROT2(A,B)
-#define LOGWAPPROT3(A,B,C)
-#define LOGWAPPROT4(A,B,C,D)
-#define LOGWAPPROT5(A,B,C,D,E)
-#define LOGWAPPROT6(A,B,C,D,E,F)
-#define LOGWAPPROT7(A,B,C,D,E,F,G)
-#define LOGWAPPROT8(A,B,C,D,E,F,G,H)
-#define LOGWAPPROTTIMESTAMP()
-
-#endif // _SMS_LOGGING_ENABLED
-
//
// Functions to perform specific logging where necessary.
//
-#ifdef _SMS_LOGGING_ENABLED
+
void LogSmsIfPDU(const TDesC8& aText, const TDesC8& aPDU, TBool aCommandPdu);
void LogSmsIfHexBuf(const TDesC8& aText, const TDesC8& aHexBuf);
void LogSmsIfTypeOfNumber(const TDesC8& aText, RMobilePhone::TMobileTON aTON);
void LogSmsIfNumberingPlan(const TDesC8& aText, RMobilePhone::TMobileNPI aNPI);
void LogSmsIfSmsEntry(const TDesC8& aText,
- const RMobileSmsStore::TMobileGsmSmsEntryV1& aSmsGsmEntryV1);
+ const RMobileSmsStore::TMobileGsmSmsEntryV1& aSmsGsmEntryV1);
void LogSmsIfSendAttributes(const TDesC8& aText,
- const RMobileSmsMessaging::TMobileSmsSendAttributesV1& aAttrib);
-#endif
+ const RMobileSmsMessaging::TMobileSmsSendAttributesV1& aAttrib);
+ /**
+ * Generates a string with the current time
+ *
+ * @param alogStatement TDes& of at least size 40
+ */
+inline void SmsTimeStampL(TDes& aLogStatement)
+ {
+ TTime now;
+ now.UniversalTime();
+ TDateTime dateTime(now.DateTime());
+ _LIT(KOwnTimeFormat,"TimeStamp=%:0%H%:1%T%:2%S.%*C6%:3");
+ now.FormatL(aLogStatement,KOwnTimeFormat);
+ //aLogStatement
+ };
+
// Define macros to disable and restore Code Coverage
--- a/smsprotocols/smsstack/common/src/smsstacklog.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/common/src/smsstacklog.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -20,14 +20,20 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsstacklogTraces.h"
+#endif
+
#include "gsmupdu.h"
#include "smsstacklog.h"
-
+#include <S32MEM.H>
//
// All functions in this file are available only if logging is enabled.
//
-#ifdef _SMS_LOGGING_ENABLED
+#ifdef OST_TRACE_COMPILER_IN_USE
/**
@@ -52,7 +58,7 @@
tmpBuf.Copy(aText);
tmpBuf.Append(_L8("RAW: "));
- LOGSMSIFHEXBUF(tmpBuf, aPDU);
+ LogSmsIfHexBuf(tmpBuf, aPDU);
//
// Log the first octet...
@@ -197,8 +203,8 @@
tmpBuf.Append(_L8(" - -"));
}
- LOGSMSIF2("%S HEX MTI RP UDHI SRX MMS RD VP", &aText);
- LOGSMSIF4("%SFO: 0x%02X %S", &aText, firstOctet, &tmpBuf);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_1, "%s HEX MTI RP UDHI SRX MMS RD VP", aText);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_2, "%sFO: 0x%02X %s", aText, (TUint)firstOctet, tmpBuf);
if (pduType == -1)
{
@@ -214,7 +220,7 @@
pduType == CSmsPDU::ESmsStatusReport ||
pduType == CSmsPDU::ESmsCommand)
{
- LOGSMSIF3("%SMR: 0x%02X", &aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_3, "%sMR: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
}
@@ -223,13 +229,13 @@
//
if (pduType == CSmsPDU::ESmsCommand)
{
- LOGSMSIF3("%SPID: 0x%02X", &aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_4, "%sPID: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
- LOGSMSIF3("%SCT: 0x%02X", &aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_5, "%sCT: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
- LOGSMSIF3("%SMN: 0x%02X", &aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_6, "%sMN: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
}
@@ -255,11 +261,11 @@
tmpBuf.SetLength(telLength);
- LOGSMSIF4("%STEL: 0x%02X %S", &aText, typeOfNumber, &tmpBuf);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_7, "%sTEL: 0x%02X %s", aText, (TUint)typeOfNumber, tmpBuf);
}
else
{
- LOGSMSIF3("%STEL: Illegal length value (%d)!", &aText, telLength);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_8, "%sTEL: Illegal length value (%d)!", aText, telLength);
return;
}
@@ -268,7 +274,7 @@
//
if (pduType == CSmsPDU::ESmsSubmit || pduType == CSmsPDU::ESmsDeliver)
{
- LOGSMSIF3("%SPID: 0x%02X", &aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_9, "%sPID: 0x%02X", aText, aPDU[octetOffset]);
octetOffset++;
tmpBuf.Zero();
@@ -403,8 +409,8 @@
tmpBuf.Append(_L8("-"));
}
- LOGSMSIF2("%SDCS: HEX CLASS DCS INDICATION TYPE", &aText);
- LOGSMSIF4("%S 0x%02X %S", &aText, dcs, &tmpBuf);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_10, "%sDCS: HEX CLASS DCS INDICATION TYPE", aText);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_11, "%s 0x%02X %s", aText, (TUint) dcs, tmpBuf);
}
//
@@ -414,7 +420,7 @@
{
if (vpf == EVpRel)
{
- LOGSMSIF3("%SVP: %d (Relative)", &aText, aPDU[octetOffset++]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_12, "%sVP: %d (Relative)", aText, aPDU[octetOffset++]);
}
else if (vpf == EVpAbs)
{
@@ -426,7 +432,7 @@
tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
}
- LOGSMSIF3("%SVP: %S (Absolute)", &aText, &tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_13, "%sVP: %s (Absolute)", aText, tmpBuf);
octetOffset += 7;
}
else if (vpf == EVpEnh)
@@ -439,7 +445,7 @@
tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
}
- LOGSMSIF3("%SVP: %S (Enhanced)", &aText, &tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_14, "%sVP: %s (Enhanced)", aText, tmpBuf);
octetOffset += 7;
}
}
@@ -456,7 +462,7 @@
tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
}
- LOGSMSIF3("%SSCTS: %S", &aText, &tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_15, "%sSCTS: %s", aText, tmpBuf);
octetOffset += 7;
}
@@ -474,10 +480,10 @@
tmpBuf.AppendFormat(_L8("%02X"), aPDU[octetOffset + index]);
}
- LOGSMSIF3("%SDT: %S", &aText, &tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_16, "%sDT: %s", aText, tmpBuf);
octetOffset += 7;
- LOGSMSIF3("%SST: %02X", &aText, aPDU[octetOffset]);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_17, "%sST: %02X", aText, aPDU[octetOffset]);
octetOffset++;
}
@@ -521,39 +527,56 @@
}
else
{
- LOGSMSIF3("%SUDL: Problems with the ieidl_a %d being less that UDHL",
- &aText, ieidl_a);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_18, "%sUDL: Problems with the ieidl_a %d being less that UDHL",aText, ieidl_a);
}
if ((ieidl_a + 1) > udhl)
{
- LOGSMSIF2("%SUDL: Corrupted or implement decoding for second iei_b, iei_n!",
- &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_19, "%sUDL: Corrupted or implement decoding for second iei_b, iei_n!",aText);
}
- LOGSMSIF2("%SUDL: HEX UDHL IEI_A IEIDL_A ", &aText);
- LOGSMSIF7("%S 0x%02X 0x%02X 0x%02X 0x%02X %S", &aText,
- udl, udhl, iei_a, ieidl_a, &tmpBuf);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_20, "%sUDL: HEX UDHL IEI_A IEIDL_A ", aText);
+
+ TBuf8<200> data;
+ RDesWriteStream dataStream(data);
+
+ dataStream.WriteInt32L(aText.Length());
+ dataStream.WriteL(aText);
+
+ dataStream.WriteInt32L(udl);
+ dataStream.WriteInt32L(udhl);
+ dataStream.WriteInt32L(iei_a);
+ dataStream.WriteInt32L(ieidl_a);
+
+ dataStream.WriteInt32L(tmpBuf.Length());
+ dataStream.WriteL(tmpBuf);
+
+ dataStream.Close();
+ OstTraceDefData( OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_21, "%s 0x%02X 0x%02X 0x%02X 0x%02X %s", data.Ptr(), data.Size() );
}
else
{
- LOGSMSIF2("%SUDL: Corrupted because TP-UDHP is TRUE and TP-UDHL is less than 1!", &aText);
- LOGSMSIF2("%SUDL: HEX UDHL IEI_A", &aText);
- LOGSMSIF4("%S 0x%02X 0x%02X", &aText, udl, udhl);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_22, "%sUDL: Corrupted because TP-UDHP is TRUE and TP-UDHL is less than 1!", aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_23, "%sUDL: HEX UDHL IEI_A", aText);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_24, "%s 0x%02X 0x%02X", aText, udl, udhl);
}
}
else
{
TInt udl = aPDU[octetOffset++];
- LOGSMSIF2("%SUDL: HEX UDHL", &aText);
- LOGSMSIF3("%S 0x%02X -", &aText, udl);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_25, "%sUDL: HEX UDHL", aText);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFPDU_26, "%s 0x%02X -", aText, udl);
}
}
} // LogSmsIfPDU
+#ifdef OST_TRACE_COMPILER_IN_USE
void LogSmsIfHexBuf(const TDesC8& aText, const TDesC8& aHexBuf)
+#else
+void LogSmsIfHexBuf(const TDesC8& /*aText*/, const TDesC8& aHexBuf)
+#endif
{
//
// Print the PDU in hex in rows of upto KHexDumpCharsPerLine bytes...
@@ -579,7 +602,7 @@
hexLine.AppendFormat(_L8("%02X"), aHexBuf[position + byteIndex]);
}
- LOGSMSIF3("%S%S", &aText, &hexLine);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFHEXBUF_1, "%s%s", aText, hexLine);
}
} // LogSmsIfHexBuf
@@ -589,55 +612,59 @@
*
* @param aTON Enum to log.
*/
+#ifdef OST_TRACE_COMPILER_IN_USE
void LogSmsIfTypeOfNumber(const TDesC8& aText, RMobilePhone::TMobileTON aTON)
+#else
+void LogSmsIfTypeOfNumber(const TDesC8& /*aText*/, RMobilePhone::TMobileTON aTON)
+#endif
{
switch (aTON)
{
case RMobilePhone::EUnknownNumber:
{
- LOGSMSIF2("%SEUnknownNumber", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_1, "%sEUnknownNumber", aText);
}
break;
case RMobilePhone::EInternationalNumber:
{
- LOGSMSIF2("%SEInternationalNumber", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_2, "%sEInternationalNumber", aText);
}
break;
case RMobilePhone::ENationalNumber:
{
- LOGSMSIF2("%SENationalNumber", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_3, "%sENationalNumber", aText);
}
break;
case RMobilePhone::ENetworkSpecificNumber:
{
- LOGSMSIF2("%SENetworkSpecificNumber", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_4, "%sENetworkSpecificNumber", aText);
}
break;
case RMobilePhone::ESubscriberNumber:
{
- LOGSMSIF2("%SESubscriberNumber", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_5, "%sESubscriberNumber", aText);
}
break;
case RMobilePhone::EAlphanumericNumber:
{
- LOGSMSIF2("%SEAlphanumericNumber", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_6, "%sEAlphanumericNumber", aText);
}
break;
case RMobilePhone::EAbbreviatedNumber:
{
- LOGSMSIF2("%SEAbbreviatedNumber", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_7, "%sEAbbreviatedNumber", aText);
}
break;
default:
{
- LOGSMSIF3("%S<unknown enum %d>", &aText, aTON);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFTYPEOFNUMBER_8, "%s<unknown enum %d>", aText, aTON);
}
break;
}
@@ -649,67 +676,71 @@
*
* @param aNPI Enum to log.
*/
+#ifdef OST_TRACE_COMPILER_IN_USE
void LogSmsIfNumberingPlan(const TDesC8& aText, RMobilePhone::TMobileNPI aNPI)
+#else
+void LogSmsIfNumberingPlan(const TDesC8& /*aText*/, RMobilePhone::TMobileNPI aNPI)
+#endif
{
switch (aNPI)
{
case RMobilePhone::EUnknownNumberingPlan:
{
- LOGSMSIF2("%SEUnknownNumberingPlan", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_1, "%sEUnknownNumberingPlan", aText);
}
break;
case RMobilePhone::EIsdnNumberPlan:
{
- LOGSMSIF2("%SEIsdnNumberPlan", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_2, "%sEIsdnNumberPlan", aText);
}
break;
case RMobilePhone::EDataNumberPlan:
{
- LOGSMSIF2("%SEDataNumberPlan", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_3, "%sEDataNumberPlan", aText);
}
break;
case RMobilePhone::ETelexNumberPlan:
{
- LOGSMSIF2("%SETelexNumberPlan", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_4, "%sETelexNumberPlan", aText);
}
break;
case RMobilePhone::EServiceCentreSpecificPlan1:
{
- LOGSMSIF2("%SEServiceCentreSpecificPlan1", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_5, "%sEServiceCentreSpecificPlan1", aText);
}
break;
case RMobilePhone::EServiceCentreSpecificPlan2:
{
- LOGSMSIF2("%SEServiceCentreSpecificPlan2", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_6, "%sEServiceCentreSpecificPlan2", aText);
}
break;
case RMobilePhone::ENationalNumberPlan:
{
- LOGSMSIF2("%SENationalNumberPlan", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_7, "%sENationalNumberPlan", aText);
}
break;
case RMobilePhone::EPrivateNumberPlan:
{
- LOGSMSIF2("%SEPrivateNumberPlan", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_8, "%sEPrivateNumberPlan", aText);
}
break;
case RMobilePhone::EERMESNumberPlan:
{
- LOGSMSIF2("%SEERMESNumberPlan", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_9, "%sEERMESNumberPlan", aText);
}
break;
default:
{
- LOGSMSIF3("%S<unknown enum %d>", &aText, aNPI);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFNUMBERINGPLAN_10, "%s<unknown enum %d>", aText, aNPI);
}
break;
}
@@ -727,9 +758,8 @@
//
// Header and index...
//
- LOGSMSIF2("%SRMobileSmsStore::TMobileGsmSmsEntryV1:", &aText);
- LOGSMSIF4("%S iIndex=%d (0x%08x)", &aText, aSmsGsmEntryV1.iIndex,
- aSmsGsmEntryV1.iIndex);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_1, "%sRMobileSmsStore::TMobileGsmSmsEntryV1:", aText);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_2, "%s iIndex=%d (0x%08x)", aText, aSmsGsmEntryV1.iIndex,aSmsGsmEntryV1.iIndex);
//
// Message status...
@@ -738,44 +768,43 @@
{
case RMobileSmsStore::EStoredMessageUnknownStatus:
{
- LOGSMSIF2("%S iStoreStats=EStoredMessageUnknownStatus", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_3, "%s iStoreStats=EStoredMessageUnknownStatus", aText);
}
break;
case RMobileSmsStore::EStoredMessageUnread:
{
- LOGSMSIF2("%S iStoreStats=EStoredMessageUnread", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_4, "%s iStoreStats=EStoredMessageUnread", aText);
}
break;
case RMobileSmsStore::EStoredMessageRead:
{
- LOGSMSIF2("%S iStoreStats=EStoredMessageRead", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_5, "%s iStoreStats=EStoredMessageRead", aText);
}
break;
case RMobileSmsStore::EStoredMessageUnsent:
{
- LOGSMSIF2("%S iStoreStats=EStoredMessageUnsent", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_6, "%s iStoreStats=EStoredMessageUnsent", aText);
}
break;
case RMobileSmsStore::EStoredMessageSent:
{
- LOGSMSIF2("%S iStoreStats=EStoredMessageSent", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_7, "%s iStoreStats=EStoredMessageSent", aText);
}
break;
case RMobileSmsStore::EStoredMessageDelivered:
{
- LOGSMSIF2("%S iStoreStats=EStoredMessageDelivered", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_8, "%s iStoreStats=EStoredMessageDelivered", aText);
}
break;
default:
{
- LOGSMSIF3("%S iStoreStats=<unknown enum %d>", &aText,
- aSmsGsmEntryV1.iMsgStatus);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_9, "%s iStoreStats=<unknown enum %d>", aText,aSmsGsmEntryV1.iMsgStatus);
}
break;
}
@@ -786,7 +815,7 @@
TBuf8<RMobilePhone::KMaxMobileTelNumberSize> numberIn8bit;
numberIn8bit.Copy(aSmsGsmEntryV1.iServiceCentre.iTelNumber);
- LOGSMSIF3("%S SRC Address=\"%S\"", &aText, &numberIn8bit);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSMSENTRY_10, "%s SRC Address=\"%s\"", aText, numberIn8bit);
//
// Service Centre Type Of Number...
@@ -796,7 +825,7 @@
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" SRC AddrTON="));
- LOGSMSIFTYPEOFNUMBER(tmpBuf, aSmsGsmEntryV1.iServiceCentre.iTypeOfNumber);
+ LogSmsIfTypeOfNumber(tmpBuf, aSmsGsmEntryV1.iServiceCentre.iTypeOfNumber);
//
// Number Plan...
@@ -804,7 +833,7 @@
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" SRC AddrNPI="));
- LOGSMSIFNUMBERINGPLAN(tmpBuf, aSmsGsmEntryV1.iServiceCentre.iNumberPlan);
+ LogSmsIfNumberingPlan(tmpBuf, aSmsGsmEntryV1.iServiceCentre.iNumberPlan);
//
// PDU...
@@ -812,7 +841,7 @@
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" PDU: "));
- LOGSMSIFPDU(tmpBuf, aSmsGsmEntryV1.iMsgData, EFalse);
+ LogSmsIfPDU(tmpBuf, aSmsGsmEntryV1.iMsgData, EFalse);
} // LogSmsIfSmsEntry
@@ -824,25 +853,25 @@
void LogSmsIfSendAttributes(const TDesC8& aText,
const RMobileSmsMessaging::TMobileSmsSendAttributesV1& aAttrib)
{
- LOGSMSIF2("%SRMobileSmsMessaging::TMobileSmsSendAttributesV1:", &aText);
- LOGSMSIF3("%S iFlags=0x%08x", &aText, (TInt)(aAttrib.iFlags));
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_1, "%sRMobileSmsMessaging::TMobileSmsSendAttributesV1:", aText);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_2, "%s iFlags=0x%08x", aText, (TInt)(aAttrib.iFlags));
if (aAttrib.iFlags & RMobileSmsMessaging::KGsmServiceCentre)
{
TBuf8<128 + RMobilePhone::KMaxMobileTelNumberSize> tmpBuf;
tmpBuf.Copy(aAttrib.iGsmServiceCentre.iTelNumber);
- LOGSMSIF3("%S SRC Address=%S", &aText, &tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_3, "%s SRC Address=%s", aText, tmpBuf);
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" SRC AddrTON="));
- LOGSMSIFTYPEOFNUMBER(tmpBuf, aAttrib.iGsmServiceCentre.iTypeOfNumber);
+ LogSmsIfTypeOfNumber(tmpBuf, aAttrib.iGsmServiceCentre.iTypeOfNumber);
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" SRC AddrNPI="));
- LOGSMSIFNUMBERINGPLAN(tmpBuf, aAttrib.iGsmServiceCentre.iNumberPlan);
+ LogSmsIfNumberingPlan(tmpBuf, aAttrib.iGsmServiceCentre.iNumberPlan);
}
if (aAttrib.iFlags & RMobileSmsMessaging::KSmsDataFormat)
@@ -851,26 +880,25 @@
{
case RMobileSmsMessaging::EFormatUnspecified:
{
- LOGSMSIF2("%S iDataFormat=EFormatUnspecified", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_4, "%s iDataFormat=EFormatUnspecified", aText);
}
break;
case RMobileSmsMessaging::EFormatGsmTpdu:
{
- LOGSMSIF2("%S iDataFormat=EFormatGsmTpdu", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_5, "%s iDataFormat=EFormatGsmTpdu", aText);
}
break;
case RMobileSmsMessaging::EFormatCdmaTpdu:
{
- LOGSMSIF2("%S iDataFormat=EFormatCdmaTpdu", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_6, "%s iDataFormat=EFormatCdmaTpdu", aText);
}
break;
default:
{
- LOGSMSIF3("%S iDataFormat=<unknown enum %d>", &aText,
- aAttrib.iDataFormat);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_7, "%s iDataFormat=<unknown enum %d>", aText,aAttrib.iDataFormat);
}
break;
}
@@ -878,12 +906,12 @@
if (aAttrib.iFlags & RMobileSmsMessaging::KCdmaTeleservice)
{
- LOGSMSIF3("%S iCdmaTeles=0x08X", &aText, aAttrib.iCdmaTeleservice);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_8, "%s iCdmaTeles=0x%08X", aText, (TUint)aAttrib.iCdmaTeleservice);
}
if (aAttrib.iFlags & RMobileSmsMessaging::KCdmaServiceCategory)
{
- LOGSMSIF3("%S iCdmaServ=0x08X", &aText, aAttrib.iCdmaServiceCategory);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_9, "%s iCdmaServ=0x%08X", aText, (TUint)aAttrib.iCdmaServiceCategory);
}
if (aAttrib.iFlags & RMobileSmsMessaging::KRemotePartyInfo)
@@ -891,34 +919,34 @@
TBuf8<RMobilePhone::KMaxMobileTelNumberSize> tmpBuf;
tmpBuf.Copy(aAttrib.iDestination.iTelNumber);
- LOGSMSIF3("%S DST Address=%S", &aText, &tmpBuf);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_10, "%s DST Address=%s", aText, tmpBuf);
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" DST AddrTON="));
- LOGSMSIFTYPEOFNUMBER(tmpBuf, aAttrib.iDestination.iTypeOfNumber);
+ LogSmsIfTypeOfNumber(tmpBuf, aAttrib.iDestination.iTypeOfNumber);
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" DST AddrNPI="));
- LOGSMSIFNUMBERINGPLAN(tmpBuf, aAttrib.iDestination.iNumberPlan);
+ LogSmsIfNumberingPlan(tmpBuf, aAttrib.iDestination.iNumberPlan);
}
if (aAttrib.iFlags & RMobileSmsMessaging::KMoreToSend)
{
if (aAttrib.iMore)
{
- LOGSMSIF2("%S iMore=ETrue", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_11, "%s iMore=ETrue", aText);
}
else
{
- LOGSMSIF2("%S iMore=EFalse", &aText);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_12, "%s iMore=EFalse", aText);
}
}
if (aAttrib.iFlags & RMobileSmsMessaging::KMessageReference)
{
- LOGSMSIF3("%S iMsgRef=0x08X", &aText, aAttrib.iMsgRef);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, LOGSMSIFSENDATTRIBUTES_13, "%s iMsgRef=0x%08X", aText, (TUint)aAttrib.iMsgRef);
}
if(aAttrib.iFlags & RMobileSmsMessaging::KGsmSubmitReport)
@@ -928,8 +956,8 @@
tmpBuf.Copy(aText);
tmpBuf.Append(_L8(" iSubmitReport PDU: "));
- LOGSMSIFPDU(tmpBuf, aAttrib.iSubmitReport, EFalse);
+ LogSmsIfPDU(tmpBuf, aAttrib.iSubmitReport, EFalse);
}
} // LogSmsIfSendAttributes
-#endif // _SMS_LOGGING_ENABLED
+#endif // OST_TRACE_COMPILER_IN_USE
--- a/smsprotocols/smsstack/group/bld.inf Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -31,4 +31,4 @@
#include "../smsu/group/bld.inf"
#include "../smsprot/Group/bld.inf"
#include "../wapprot/Group/bld.inf"
-#include "../test/bld.inf"
+#include "../test/group/bld.inf"
--- a/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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 nbprotocols_smsstackv2
source \sf\os\cellularsrv\smsprotocols\smsstack
source \sf\os\cellularsrv\smsprotocols\documentation
--- a/smsprotocols/smsstack/gsmu/group/bld.inf Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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"
--- a/smsprotocols/smsstack/gsmu/group/gsmu.mmp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/group/gsmu.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -55,11 +55,11 @@
USERINCLUDE ../../gsmu/inc
USERINCLUDE ../../common/inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib etelmm.lib efsrv.lib estor.lib charconv.lib
LIBRARY fbscli.lib bitgdi.lib
-DEBUGLIBRARY comsdbgutil.lib
START WINS
BASEADDRESS 0x7d060000
--- a/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "GsmuelemTraces.h"
+#endif
+
#include <gsmuelem.h>
#include <gsmumsg.h>
#include "Gsmumain.h"
@@ -182,7 +188,7 @@
CSmsCommandData* CSmsCommandData::NewL(TSmsFirstOctet& aFirstOctet)
{
- LOGGSMU1("CSmsCommandData::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_NEWL_1, "CSmsCommandData::NewL()");
CSmsCommandData* commanddata=new(ELeave) CSmsCommandData(aFirstOctet);
CleanupStack::PushL(commanddata);
@@ -207,7 +213,7 @@
*/
CSmsCommandData* CSmsCommandData::DuplicateL() const
{
- LOGGSMU1("CSmsCommandData::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_DUPLICATEL_1, "CSmsCommandData::DuplicateL()");
CSmsCommandData* smsCommandData = CSmsCommandData::NewL(iFirstOctet);
CleanupStack::PushL(smsCommandData);
@@ -228,7 +234,7 @@
CSmsInformationElement& CSmsCommandData::InformationElement(TInt aIndex) const
{
- LOGGSMU1("CSmsCommandData::InformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_INFORMATIONELEMENT_1, "CSmsCommandData::InformationElement()");
CSmsInformationElement* ie=iInformationElementArray[aIndex];
return *ie;
@@ -240,7 +246,7 @@
// Ignore in code coverage - not used in SMS stack and not exported
// but cannot be removed as impacts public header.
BULLSEYE_OFF
- LOGGSMU1("CSmsCommandData::InformationElementPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_INFORMATIONELEMENTPTR_1, "CSmsCommandData::InformationElementPtr()");
return iInformationElementArray[aIndex];
BULLSEYE_RESTORE
}
@@ -248,7 +254,7 @@
TBool CSmsCommandData::InformationElementIndex(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier,
TInt& aIndex) const
{
- LOGGSMU1("CSmsCommandData::InformationElementIndex()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_INFORMATIONELEMENTINDEX_1, "CSmsCommandData::InformationElementIndex()");
TBool found=EFalse;
TInt count=NumInformationElements();
@@ -264,7 +270,7 @@
void CSmsCommandData::AddInformationElementL(const TSmsId aIdentifier,const TDesC8& aData)
{
- LOGGSMU1("CSmsCommandData::AddInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_ADDINFORMATIONELEMENTL_1, "CSmsCommandData::AddInformationElementL()");
//
// Currently there is no restriction on how many instances of an information element can be
@@ -284,7 +290,7 @@
void CSmsCommandData::RemoveInformationElement(TInt aIndex)
{
- LOGGSMU1("CSmsCommandData::RemoveInformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_REMOVEINFORMATIONELEMENT_1, "CSmsCommandData::RemoveInformationElement()");
// Since iInformationElementArray[aIndex] is removed from iInformationElementArray, no double free issue.
// coverity[double_free]
delete iInformationElementArray[aIndex];
@@ -300,7 +306,7 @@
TPtrC8 CSmsCommandData::Data() const
{
- LOGGSMU1("CSmsCommandData::Data()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_DATA_1, "CSmsCommandData::Data()");
TPtrC8 ptr;
ptr.Set(iBuffer->Des());
@@ -310,7 +316,7 @@
void CSmsCommandData::SetDataL(const TDesC8& aData)
{
- LOGGSMU1("CSmsCommandData::SetDataL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_SETDATAL_1, "CSmsCommandData::SetDataL()");
TInt length=aData.Length();
__ASSERT_DEBUG(length<=KSmsMaxDataSize,Panic(KGsmuPanicCommandDataLengthTooLong));
@@ -324,7 +330,7 @@
TUint8* CSmsCommandData::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("CSmsCommandData::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_ENCODEL_1, "CSmsCommandData::EncodeL()");
__ASSERT_DEBUG(iBuffer->Length()<=MaxDataLength(),Panic(KGsmuPanicCommandDataBufferTooLong));
TSmsOctet datalength=iBuffer->Length()+TSmsOctet(TotalHeaderLengthInUDLUnits());
@@ -349,7 +355,7 @@
void CSmsCommandData::DecodeL(TGsmuLex8& aPdu)
{
- LOGGSMU1("CSmsCommandData::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_DECODEL_1, "CSmsCommandData::DecodeL()");
iInformationElementArray.ResetAndDestroy();
const TBool headerPresent=HeaderPresent();
@@ -417,7 +423,7 @@
TInt CSmsCommandData::HeaderLength() const
{
- LOGGSMU1("CSmsCommandData::HeaderLength()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_HEADERLENGTH_1, "CSmsCommandData::HeaderLength()");
TInt headerLength=0;
for (TInt i=0; i<NumInformationElements(); i++)
@@ -428,7 +434,7 @@
TInt CSmsCommandData::TotalHeaderLengthInUDLUnits() const
{
- LOGGSMU1("CSmsCommandData::TotalHeaderLengthInUDLUnits()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_TOTALHEADERLENGTHINUDLUNITS_1, "CSmsCommandData::TotalHeaderLengthInUDLUnits()");
if (iInformationElementArray.Count()==0)
return 0;
@@ -439,7 +445,7 @@
TBool CSmsCommandData::HeaderPresent() const
{
- LOGGSMU1("CSmsCommandData::HeaderPresent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_HEADERPRESENT_1, "CSmsCommandData::HeaderPresent()");
return (iFirstOctet&TSmsFirstOctet::ESmsUDHIMask)==TSmsFirstOctet::ESmsUDHIHeaderPresent;
} // CSmsCommandData::HeaderPresent
@@ -447,7 +453,7 @@
void CSmsCommandData::SetHeaderPresent(TBool aHeaderPresent)
{
- LOGGSMU1("CSmsCommandData::SetHeaderPresent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMANDDATA_SETHEADERPRESENT_1, "CSmsCommandData::SetHeaderPresent()");
iFirstOctet=aHeaderPresent? (iFirstOctet&(~TSmsFirstOctet::ESmsUDHIMask))|TSmsFirstOctet::ESmsUDHIHeaderPresent: (iFirstOctet&(~TSmsFirstOctet::ESmsUDHIMask))|TSmsFirstOctet::ESmsUDHIHeaderNotPresent;
} // CSmsCommandData::SetHeaderPresent
@@ -480,7 +486,7 @@
void TSmsProtocolIdentifier::SetTelematicDeviceIndicator(TSmsTelematicDeviceIndicator aIndicator)
{
- LOGGSMU1("TSmsProtocolIdentifier::SetTelematicDeviceIndicator()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICEINDICATOR_1, "TSmsProtocolIdentifier::SetTelematicDeviceIndicator()");
__ASSERT_DEBUG(PIDType()==ESmsPIDTelematicInterworking,Panic(KGsmuPanicNoTelematicInterworking));
@@ -498,7 +504,7 @@
void TSmsProtocolIdentifier::SetTelematicDeviceType(TSmsTelematicDeviceType aDeviceType)
{
- LOGGSMU1("TSmsProtocolIdentifier::SetTelematicDeviceType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICETYPE_1, "TSmsProtocolIdentifier::SetTelematicDeviceType()");
__ASSERT_DEBUG(TelematicDeviceIndicator()==ESmsTelematicDevice,Panic(KGsmuPanicNoTelematicDevice));
iValue=(TUint8) ((iValue&(~ESmsTelematicDeviceTypeMask))|aDeviceType);
@@ -510,7 +516,7 @@
// Ignore in code coverage - not used in SMS stack and not exported
// but cannot be removed as impacts public header.
BULLSEYE_OFF
- LOGGSMU1("TSmsProtocolIdentifier::ShortMessageALProtocol()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SHORTMESSAGEALPROTOCOL_1, "TSmsProtocolIdentifier::ShortMessageALProtocol()");
__ASSERT_DEBUG(TelematicDeviceIndicator()==ESmsNoTelematicDevice,Panic(KGsmuPanicNoTelematicDevice));
return (TSmsShortMessageALProtocol) (iValue&ESmsShortMessageALProtocolMask);
@@ -522,7 +528,7 @@
// Ignore in code coverage - not used in SMS stack and not exported
// but cannot be removed as impacts public header.
BULLSEYE_OFF
- LOGGSMU1("TSmsProtocolIdentifier::SetShortMessageALProtocol()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGEALPROTOCOL_1, "TSmsProtocolIdentifier::SetShortMessageALProtocol()");
__ASSERT_DEBUG(TelematicDeviceIndicator()==ESmsNoTelematicDevice,Panic(KGsmuPanicNoTelematicDevice));
iValue=(TUint8) ((iValue&(~ESmsShortMessageALProtocolMask))|aProtocol);
@@ -531,7 +537,7 @@
TInt TSmsProtocolIdentifier::ShortMessageType() const
{
- LOGGSMU1("TSmsProtocolIdentifier::ShortMessageType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SHORTMESSAGETYPE_1, "TSmsProtocolIdentifier::ShortMessageType()");
__ASSERT_DEBUG(PIDType()==ESmsPIDShortMessageType,Panic(KGsmuPanicNoShortMessageType));
return (TSmsShortMessageType) (iValue&ESmsShortMessageTypeMask);
@@ -540,7 +546,7 @@
void TSmsProtocolIdentifier::SetShortMessageType(TSmsShortMessageType aShortMessageType)
{
- LOGGSMU1("TSmsProtocolIdentifier::SetShortMessageType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGETYPE_1, "TSmsProtocolIdentifier::SetShortMessageType()");
__ASSERT_DEBUG(PIDType()==ESmsPIDShortMessageType,Panic(KGsmuPanicNoShortMessageType));
//iValue=(TUint8) ((iValue&(~ESmsPIDTypeMask))|aShortMessageType);
@@ -559,7 +565,7 @@
TBool TSmsDataCodingScheme::TextCompressed() const
{
- LOGGSMU1("TSmsDataCodingScheme::TextCompressed()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_TEXTCOMPRESSED_1, "TSmsDataCodingScheme::TextCompressed()");
TInt bits7to4=Bits7To4();
return (bits7to4==ESmsDCSTextCompressedWithNoClassInfo) || (bits7to4==ESmsDCSTextCompressedWithClassInfo) ||
@@ -569,7 +575,7 @@
void TSmsDataCodingScheme::SetTextCompressed(TBool aCompressed)
{
- LOGGSMU1("TSmsDataCodingScheme::SetTextCompressed()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETTEXTCOMPRESSED_1, "TSmsDataCodingScheme::SetTextCompressed()");
TInt bits7to4=Bits7To4();
if (aCompressed)
@@ -647,7 +653,7 @@
TSmsDataCodingScheme::TSmsAlphabet TSmsDataCodingScheme::Alphabet() const
{
- LOGGSMU1("TSmsDataCodingScheme::TSmsAlphabet()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_ALPHABET_1, "TSmsDataCodingScheme::TSmsAlphabet()");
TInt bits7to4=Bits7To4();
TInt alphabet=ESmsAlphabet7Bit;
@@ -682,7 +688,7 @@
break;
}
default:
- LOGGSMU1("TSmsDataCodingScheme::Alphabet() WARNING! default case has been reached");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_ALPHABET_2, "TSmsDataCodingScheme::Alphabet() WARNING! default case has been reached");
break;
}
return (TSmsAlphabet) alphabet;
@@ -690,7 +696,7 @@
void TSmsDataCodingScheme::SetAlphabet(TSmsAlphabet aAlphabet)
{
- LOGGSMU1("TSmsDataCodingScheme::SetAlphabet()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_1, "TSmsDataCodingScheme::SetAlphabet()");
TInt bits7to4=Bits7To4();
switch (bits7to4)
@@ -719,7 +725,7 @@
{
if (aAlphabet!=ESmsAlphabet7Bit)
{
- LOGGSMU3("TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_2, "TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
}
break;
}
@@ -731,7 +737,7 @@
}
else
{
- LOGGSMU3("TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_3, "TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
}
break;
}
@@ -743,12 +749,12 @@
}
else
{
- LOGGSMU3("TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_4, "TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
}
break;
}
default:
- LOGGSMU1("TSmsDataCodingScheme::SetAlphabet() WARNING! default case has been reached");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETALPHABET_5, "TSmsDataCodingScheme::SetAlphabet() WARNING! default case has been reached");
break;
}
} // TSmsDataCodingScheme::SetAlphabet
@@ -756,7 +762,7 @@
TBool TSmsDataCodingScheme::Class(TSmsClass& aClass) const
{
- LOGGSMU1("TSmsDataCodingScheme::Class()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_CLASS_1, "TSmsDataCodingScheme::Class()");
switch (Bits7To4())
{
@@ -775,7 +781,7 @@
void TSmsDataCodingScheme::SetClass(TBool aClassDefined,TSmsDataCodingScheme::TSmsClass aClass)
{
- LOGGSMU1("TSmsDataCodingScheme::SetClass()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETCLASS_1, "TSmsDataCodingScheme::SetClass()");
TInt bits7to4=Bits7To4();
if (aClassDefined)
@@ -813,7 +819,7 @@
break;
}
default:
- LOGGSMU1("WARNING! default case has been reached");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETCLASS_2, "WARNING! default case has been reached");
break;
}
}
@@ -863,7 +869,7 @@
TSmsDataCodingScheme::TSmsIndicationState TSmsDataCodingScheme::IndicationState() const
{
- LOGGSMU1("TSmsDataCodingScheme::IndicationState()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_INDICATIONSTATE_1, "TSmsDataCodingScheme::IndicationState()");
TInt bits7to4=Bits7To4();
TSmsIndicationState state=ESmsIndicationInactive;
@@ -877,7 +883,7 @@
break;
}
default:
- LOGGSMU1("WARNING! default case has been reached");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_INDICATIONSTATE_2, "WARNING! default case has been reached");
break;
}
return state;
@@ -886,7 +892,7 @@
void TSmsDataCodingScheme::SetIndicationState(TSmsIndicationState aState)
{
- LOGGSMU1("TSmsDataCodingScheme::SetIndicationState()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETINDICATIONSTATE_1, "TSmsDataCodingScheme::SetIndicationState()");
TInt bits7to4=Bits7To4();
switch (bits7to4)
@@ -899,7 +905,7 @@
break;
}
default:
- LOGGSMU1("TSmsDataCodingScheme::SetIndicationState() WARNING! default case has been reached");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETINDICATIONSTATE_2, "TSmsDataCodingScheme::SetIndicationState() WARNING! default case has been reached");
break;
}
} // TSmsDataCodingScheme::SetIndicationState
@@ -907,7 +913,7 @@
TSmsDataCodingScheme::TSmsIndicationType TSmsDataCodingScheme::IndicationType() const
{
- LOGGSMU1("TSmsDataCodingScheme::IndicationType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_INDICATIONTYPE_1, "TSmsDataCodingScheme::IndicationType()");
TInt bits7to4=Bits7To4();
TSmsIndicationType type=ESmsVoicemailMessageWaiting;
@@ -921,7 +927,7 @@
break;
}
default:
- LOGGSMU1("TSmsDataCodingScheme::IndicationType() WARNING default case has been reached");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_INDICATIONTYPE_2, "TSmsDataCodingScheme::IndicationType() WARNING default case has been reached");
break;
}
return type;
@@ -930,7 +936,7 @@
void TSmsDataCodingScheme::SetIndicationType(TSmsIndicationType aType)
{
- LOGGSMU1("TSmsDataCodingScheme::SetIndicationType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETINDICATIONTYPE_1, "TSmsDataCodingScheme::SetIndicationType()");
TInt bits7to4=Bits7To4();
switch (bits7to4)
@@ -943,7 +949,7 @@
break;
}
default:
- LOGGSMU1("TSmsDataCodingScheme::SetIndicationType() WARNING! default case has been reached");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSDATACODINGSCHEME_SETINDICATIONTYPE_2, "TSmsDataCodingScheme::SetIndicationType() WARNING! default case has been reached");
break;
}
} // TSmsDataCodingScheme::SetIndicationType
@@ -962,7 +968,7 @@
*/
EXPORT_C CSmsAlphabetConverter* CSmsAlphabetConverter::NewLC(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TSmsDataCodingScheme::TSmsAlphabet aSmsAlphabet,TBool aIsBinary)
{
- LOGGSMU1("CSmsAlphabetConverter::NewLC()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_NEWLC_1, "CSmsAlphabetConverter::NewLC()");
CSmsAlphabetConverter* converter=new (ELeave)CSmsAlphabetConverter(aCharacterSetConverter,aFs,aSmsAlphabet,aIsBinary);
CleanupStack::PushL(converter);
@@ -1003,7 +1009,7 @@
//
void CSmsAlphabetConverter::ConstructL()
{
- LOGGSMU1("CSmsAlphabetConverter::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONSTRUCTL_1, "CSmsAlphabetConverter::ConstructL()");
if (!iIsBinary)
@@ -1035,7 +1041,7 @@
//
void CSmsAlphabetConverter::ConversionPropertiesL(TSmsAlphabetConversionProperties& aConversionProperties) const
{
- LOGGSMU1("CSmsAlphabetConverter::ConversionPropertiesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1, "CSmsAlphabetConverter::ConversionPropertiesL()");
// Set defaults
@@ -1077,7 +1083,7 @@
*/
EXPORT_C TPtrC8 CSmsAlphabetConverter::ConvertFromNativeL(const TDesC& aNativeCharacters)
{
- LOGGSMU1("CSmsAlphabetConverter::ConvertFromNativeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL_1, "CSmsAlphabetConverter::ConvertFromNativeL()");
TInt numberOfUnconvertibleCharacters, numberOfDowngradedCharacters;
@@ -1107,7 +1113,7 @@
TInt& aNumberOfUnconvertibleCharacters,
TInt& aNumberOfDowngradedCharacters)
{
- LOGGSMU2("CSmsAlphabetConverter::ConvertFromNativeL(): aEncoding=%d", aEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL1_1, "CSmsAlphabetConverter::ConvertFromNativeL(): aEncoding=%d", aEncoding);
aNumberOfUnconvertibleCharacters = 0;
aNumberOfDowngradedCharacters = 0;
@@ -1300,7 +1306,7 @@
*/
EXPORT_C TPtrC CSmsAlphabetConverter::ConvertToNativeL(const TDesC8& aUDElements)
{
- LOGGSMU1("CSmsAlphabetConverter::ConvertToNativeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_CONVERTTONATIVEL_1, "CSmsAlphabetConverter::ConvertToNativeL()");
return ConvertToNativeL(aUDElements, ESmsEncodingNone);
} // CSmsAlphabetConverter::ConvertToNativeL
@@ -1320,7 +1326,7 @@
EXPORT_C TPtrC CSmsAlphabetConverter::ConvertToNativeL(const TDesC8& aUDElements,
TSmsEncoding aEncoding)
{
- LOGGSMU2("CSmsAlphabetConverter::ConvertToNativeL(): aEncoding=%d", aEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSALPHABETCONVERTER_CONVERTTONATIVEL1_1, "CSmsAlphabetConverter::ConvertToNativeL(): aEncoding=%d", aEncoding);
// Check for some shortcuts
if (iIsBinary || iSmsAlphabet == TSmsDataCodingScheme::ESmsAlphabet8Bit)
@@ -1406,14 +1412,14 @@
*/
TBool CSmsAlphabetConverter::IsSupportedL(TChar aChar)
{
- LOGGSMU2("[1] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_1, "[1] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
TBool isDowngrade, isRequiresAlternativeEncoding;
TBool supported = IsSupportedL(aChar, ESmsEncodingNone,
isDowngrade, isRequiresAlternativeEncoding);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL_2, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
return supported;
} // CSmsAlphabetConverter::IsSupportedL
@@ -1434,7 +1440,7 @@
TBool CSmsAlphabetConverter::IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
TInt& aIndexOfFirstUnconvertibleCharacter)
{
- LOGGSMU2("[2] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", &aDes);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1, "[2] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
TInt desLength = aDes.Length();
//
@@ -1505,9 +1511,9 @@
//
TBool supported = (aNumberOfUnconvertibleCharacters == 0);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
return supported;
} // CSmsAlphabetConverter::IsSupportedL
@@ -1531,7 +1537,7 @@
TBool& aIsDowngrade,
TBool& aRequiresAlternativeEncoding)
{
- LOGGSMU2("[3] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1, "[3] CSmsAlphabetConverter::IsSupportedL(aChar=0x%04x)", (TUint) aChar);
//
// Convert the character...
@@ -1558,9 +1564,9 @@
//
// Useful logging...
//
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aIsDowngrade=%d.", aIsDowngrade);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aRequiresAlternativeEncoding=%d.", aRequiresAlternativeEncoding);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2, "CSmsAlphabetConverter::IsSupportedL(): aIsDowngrade=%d.", aIsDowngrade);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3, "CSmsAlphabetConverter::IsSupportedL(): aRequiresAlternativeEncoding=%d.", aRequiresAlternativeEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
return supported;
} // CSmsAlphabetConverter::IsSupportedL
@@ -1590,7 +1596,7 @@
TInt& aNumberRequiringAlternativeEncoding,
TInt& aIndexOfFirstUnconvertibleCharacter)
{
- LOGGSMU2("[4] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", &aDes);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1, "[4] CSmsAlphabetConverter::IsSupportedL(aDes=\"%S\")", aDes);
TInt desLength = aDes.Length();
//
@@ -1786,11 +1792,11 @@
//
TBool supported = (aNumberOfUnconvertibleCharacters == 0);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
- LOGGSMU2("CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfUnconvertibleCharacters=%d.", aNumberOfUnconvertibleCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3, "CSmsAlphabetConverter::IsSupportedL(): aNumberOfDowngradedCharacters=%d.", aNumberOfDowngradedCharacters);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4, "CSmsAlphabetConverter::IsSupportedL(): aNumberRequiringAlternativeEncoding=%d.", aNumberRequiringAlternativeEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5, "CSmsAlphabetConverter::IsSupportedL(): aIndexOfFirstUnconvertibleCharacter=%d.", aIndexOfFirstUnconvertibleCharacter);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6, "CSmsAlphabetConverter::IsSupportedL(): supported=%d.", supported);
return supported;
} // CSmsAlphabetConverter::IsSupportedL
@@ -1808,8 +1814,7 @@
TSmsEncoding CSmsAlphabetConverter::FindBestAlternativeEncodingL(const TDesC& aNativeCharacters,
TSmsEncoding aSuggestedEncoding)
{
- LOGGSMU2("CSmsAlphabetConverter::FindBestAlternativeEncodingL(): aSuggestedEncoding=%d",
- aSuggestedEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1, "CSmsAlphabetConverter::FindBestAlternativeEncodingL(): aSuggestedEncoding=%d",aSuggestedEncoding);
TSmsEncoding encodingToUse = ESmsEncodingNone;
@@ -1873,7 +1878,7 @@
}
}
- LOGGSMU2("CSmsAlphabetConverter::FindBestAlternativeEncodingL(): encodingToUse=%d", encodingToUse);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2, "CSmsAlphabetConverter::FindBestAlternativeEncodingL(): encodingToUse=%d", encodingToUse);
return encodingToUse;
} // CSmsAlphabetConverter::FindBestAlternativeEncoding
@@ -1917,8 +1922,7 @@
*/
void CSmsAlphabetConverter::PrepareForConversionFromNativeL(TSmsEncoding aEncoding)
{
- LOGGSMU2("CSmsAlphabetConverter::PrepareForConversionFromNativeL(): aEncoding=%d",
- aEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1, "CSmsAlphabetConverter::PrepareForConversionFromNativeL(): aEncoding=%d",aEncoding);
__ASSERT_DEBUG(iIsBinary==EFalse,Panic(KGsmuPanicUnsupportedAlphabet));
switch (iSmsAlphabet)
@@ -1938,8 +1942,7 @@
{
CCnvCharacterSetConverter::TAvailability availability;
- LOGGSMU2("CSmsAlphabetConverter::PrepareForConversionFromNativeL(): Converter 0x%08x",
- alternativeEncoderID);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2, "CSmsAlphabetConverter::PrepareForConversionFromNativeL(): Converter 0x%08x",alternativeEncoderID);
availability = iCharacterSetConverter.PrepareToConvertToOrFromL(alternativeEncoderID, iFs);
if (availability == CCnvCharacterSetConverter::EAvailable)
@@ -2008,8 +2011,7 @@
*/
void CSmsAlphabetConverter::PrepareForConversionToNativeL(TSmsEncoding aEncoding)
{
- LOGGSMU2("CSmsAlphabetConverter::PrepareForConversionToNativeL(): aEncoding=%d",
- aEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1, "CSmsAlphabetConverter::PrepareForConversionToNativeL(): aEncoding=%d",aEncoding);
switch (iSmsAlphabet)
{
@@ -2028,8 +2030,7 @@
{
CCnvCharacterSetConverter::TAvailability availability;
- LOGGSMU2("CSmsAlphabetConverter::PrepareForConversionFromNativeL(): Converter 0x%08x",
- alternativeEncoderID);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_2, "CSmsAlphabetConverter::PrepareForConversionFromNativeL(): Converter 0x%08x",alternativeEncoderID);
availability = iCharacterSetConverter.PrepareToConvertToOrFromL(alternativeEncoderID, iFs);
if (availability == CCnvCharacterSetConverter::EAvailable)
@@ -2084,7 +2085,7 @@
*/
void CSmsAlphabetConverter::GetAlternativeEncoderIDL(TSmsEncoding aEncoding, TUint& aEncoderID) const
{
- LOGGSMU2("CSmsAlphabetConverter::GetAlternativeEncoderIDL(%d)", aEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1, "CSmsAlphabetConverter::GetAlternativeEncoderIDL(%d)", aEncoding);
aEncoderID = 0;
@@ -2157,7 +2158,7 @@
//
TPtr16 CSmsAlphabetConverter::CheckAllocBufferL(HBufC16** aBuffer,TInt aMaxLength,TInt aUsedLength)
{
- LOGGSMU1("CSmsAlphabetConverter::CheckAllocBufferL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1, "CSmsAlphabetConverter::CheckAllocBufferL()");
if (*aBuffer!=NULL)
{
@@ -2180,7 +2181,7 @@
//
TPtr8 CSmsAlphabetConverter::CheckAllocBufferL(HBufC8** aBuffer,TInt aMaxLength,TInt aUsedLength)
{
- LOGGSMU1("CSmsAlphabetConverter::CheckAllocBufferL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL1_1, "CSmsAlphabetConverter::CheckAllocBufferL()");
if (*aBuffer!=NULL)
{
@@ -2208,7 +2209,7 @@
*/
EXPORT_C TBool TGsmSmsTelNumber::IsInstanceOf(TTypeOfIndicator aType)
{
- LOGGSMU1("TGsmSmsTelNumber::IsInstanceOf()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TGSMSMSTELNUMBER_ISINSTANCEOF_1, "TGsmSmsTelNumber::IsInstanceOf()");
TBool rc = EFalse;
@@ -2231,7 +2232,7 @@
CSmsAddress* CSmsAddress::NewL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- LOGGSMU1("CSmsAddress::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_NEWL_1, "CSmsAddress::NewL()");
CSmsAddress* address=new(ELeave) CSmsAddress(aCharacterSetConverter,aFs);
CleanupStack::PushL(address);
@@ -2255,7 +2256,7 @@
*/
CSmsAddress* CSmsAddress::DuplicateL() const
{
- LOGGSMU1("CSmsAddress::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_DUPLICATEL_1, "CSmsAddress::DuplicateL()");
CSmsAddress* address = CSmsAddress::NewL(iCharacterSetConverter, iFs);
CleanupStack::PushL(address);
@@ -2270,7 +2271,7 @@
TPtrC CSmsAddress::Address() const
{
- LOGGSMU1("CSmsAddress::Address()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_ADDRESS_1, "CSmsAddress::Address()");
TPtrC ptr;
if (iBuffer)
@@ -2281,7 +2282,7 @@
void CSmsAddress::SetRawAddressL(TGsmSmsTypeOfAddress aTypeOfAddress, TPtrC aBufferPtr)
{
- LOGGSMU1("CSmsAddress::SetRawAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_SETRAWADDRESSL_1, "CSmsAddress::SetRawAddressL()");
iTypeOfAddress = aTypeOfAddress;
@@ -2293,7 +2294,7 @@
TGsmSmsTypeOfAddress& CSmsAddress::TypeOfAddress()
{
- LOGGSMU1("CSmsAddress::TypeOfAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_TYPEOFADDRESS_1, "CSmsAddress::TypeOfAddress()");
return iTypeOfAddress;
} // CSmsAddress::TypeOfAddress
@@ -2301,7 +2302,7 @@
void CSmsAddress::SetAddressL(const TDesC& aAddress)
{
- LOGGSMU1("CSmsAddress::SetAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_SETADDRESSL_1, "CSmsAddress::SetAddressL()");
TInt length=aAddress.Length();
NewBufferL(length);
@@ -2361,7 +2362,7 @@
void CSmsAddress::SetParsedAddressL(const TGsmSmsTelNumber& aParsedAddress)
{
- LOGGSMU1("CSmsAddress::SetParsedAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_SETPARSEDADDRESSL_1, "CSmsAddress::SetParsedAddressL()");
iTypeOfAddress=aParsedAddress.iTypeOfAddress;
DoSetParsedAddressL(aParsedAddress.iTelNumber);
@@ -2370,7 +2371,7 @@
TUint8 CSmsAddress::SizeL()
{
- LOGGSMU1("CSmsAddress::SizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_SIZEL_1, "CSmsAddress::SizeL()");
TUint8 size = 0;
@@ -2730,7 +2731,7 @@
void CSmsAddress::NewBufferL(TInt aLength)
{
- LOGGSMU1("CSmsAddress::NewBufferL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_NEWBUFFERL_1, "CSmsAddress::NewBufferL()");
HBufC* buffer=HBufC::NewL(aLength);
delete iBuffer;
@@ -2742,7 +2743,7 @@
void CSmsAddress::DoSetParsedAddressL(const TDesC& aAddress)
{
- LOGGSMU2("CSmsAddress::DoSetParsedAddressL() the length of the Address [Length = %d", aAddress.Length());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSADDRESS_DOSETPARSEDADDRESSL_1, "CSmsAddress::DoSetParsedAddressL() the length of the Address [Length = %d", aAddress.Length());
TInt length=aAddress.Length();
if ((iTypeOfAddress.TON()==EGsmSmsTONInternationalNumber) &&
@@ -2776,7 +2777,7 @@
TUint8* TSmsServiceCenterTimeStamp::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("TSmsServiceCenterTimeStamp::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSSERVICECENTERTIMESTAMP_ENCODEL_1, "TSmsServiceCenterTimeStamp::EncodeL()");
TInt numquarterhours=iTimeZoneNumQuarterHours;
@@ -2818,7 +2819,7 @@
void TSmsServiceCenterTimeStamp::DecodeL(TGsmuLex8& aPdu, TInt& aTimeError)
{
- LOGGSMU1("TSmsServiceCenterTimeStamp::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSSERVICECENTERTIMESTAMP_DECODEL_1, "TSmsServiceCenterTimeStamp::DecodeL()");
TSmsOctet octet;
octet.DecodeL(aPdu);
@@ -2905,7 +2906,7 @@
TTime TSmsValidityPeriod::Time() const
{
- LOGGSMU1("TSmsValidityPeriod::Time()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSVALIDITYPERIOD_TIME_1, "TSmsValidityPeriod::Time()");
TTime time;
time.UniversalTime();
@@ -2916,7 +2917,7 @@
TUint8* TSmsValidityPeriod::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("TSmsValidityPeriod::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSVALIDITYPERIOD_ENCODEL_1, "TSmsValidityPeriod::EncodeL()");
TInt validityperiodformat=ValidityPeriodFormat();
switch (validityperiodformat)
@@ -2962,7 +2963,7 @@
TUint8* TSmsValidityPeriod::EncodeL(TUint8* aPtr, const TEncodeParams* aEncodeParams) const
{
- LOGGSMU1("TSmsValidityPeriod::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSVALIDITYPERIOD_ENCODEL1_1, "TSmsValidityPeriod::EncodeL()");
TInt validityperiodformat=ValidityPeriodFormat();
switch (validityperiodformat)
@@ -3014,7 +3015,7 @@
void TSmsValidityPeriod::DecodeL(TGsmuLex8& aPdu)
{
- LOGGSMU1("TSmsValidityPeriod::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSVALIDITYPERIOD_DECODEL_1, "TSmsValidityPeriod::DecodeL()");
TInt validityperiodformat=ValidityPeriodFormat();
switch (validityperiodformat)
@@ -3069,7 +3070,7 @@
CSmsInformationElement* CSmsInformationElement::NewL(TSmsInformationElementIdentifier aIdentifier,const TDesC8& aData)
{
- LOGGSMU1("CSmsInformationElement::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_NEWL_1, "CSmsInformationElement::NewL()");
CSmsInformationElement* informationelement=new(ELeave) CSmsInformationElement(aIdentifier);
CleanupStack::PushL(informationelement);
@@ -3081,7 +3082,7 @@
CSmsInformationElement* CSmsInformationElement::NewL()
{
- LOGGSMU1("CSmsInformationElement::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_NEWL1_1, "CSmsInformationElement::NewL()");
CSmsInformationElement* informationelement=new(ELeave) CSmsInformationElement(ESmsIEIConcatenatedShortMessages8BitReference);
CleanupStack::PushL(informationelement);
@@ -3109,7 +3110,7 @@
*/
EXPORT_C TPtr8 CSmsInformationElement::Data()
{
- LOGGSMU1("CSmsInformationElement::Data()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSINFORMATIONELEMENT_DATA_1, "CSmsInformationElement::Data()");
return iData->Des();
} // CSmsInformationElement::Data
@@ -3123,7 +3124,7 @@
*/
EXPORT_C const TDesC8& CSmsInformationElement::Data() const
{
- LOGGSMU1("CSmsInformationElement::Data()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSINFORMATIONELEMENT_DATA1_1, "CSmsInformationElement::Data()");
return *iData;
} // CSmsInformationElement::Data
@@ -3143,7 +3144,7 @@
TUint8* CSmsInformationElement::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("CSmsInformationElement::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_ENCODEL_1, "CSmsInformationElement::EncodeL()");
TSmsOctet id=iIdentifier;
aPtr=id.EncodeL(aPtr);
@@ -3157,7 +3158,7 @@
void CSmsInformationElement::DecodeL(TGsmuLex8& aPdu)
{
- LOGGSMU1("CSmsInformationElement::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_DECODEL_1, "CSmsInformationElement::DecodeL()");
TSmsOctet id;
id.DecodeL(aPdu);
@@ -3264,7 +3265,7 @@
void CSmsInformationElement::ConstructL(const TDesC8& aData)
{
- LOGGSMU1("CSmsInformationElement::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_CONSTRUCTL_1, "CSmsInformationElement::ConstructL()");
NewDataL(aData.Length());
iData->Des().Copy(aData);
@@ -3273,7 +3274,7 @@
void CSmsInformationElement::NewDataL(TInt aLength)
{
- LOGGSMU1("CSmsInformationElement::NewDataL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_NEWDATAL_1, "CSmsInformationElement::NewDataL()");
HBufC8* data=HBufC8::NewL(aLength);
delete iData;
@@ -3284,7 +3285,7 @@
TUint CSmsInformationElement::Length()const
{
- LOGGSMU1("CSmsInformationElement::Length()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSINFORMATIONELEMENT_LENGTH_1, "CSmsInformationElement::Length()");
return 2+iData->Length(); // 2 stands for IEID and IEDL
} // CSmsInformationElement::Length
@@ -3305,7 +3306,7 @@
*/
TBool TSmsInformationElementCategories::TranslateCategoryToIndex(TInformationElementId aId, TInt& aIndex)
{
- LOGGSMU1("CSmsMessage::TranslateCategoryToIndex");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_1, "CSmsMessage::TranslateCategoryToIndex");
TBool rc = ETrue;
@@ -3384,7 +3385,7 @@
else
{
rc = EFalse;
- LOGGSMU3("CSmsMessage::TranslateCategoryToIndex id = %d, found = %d", aId, rc);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_2, "CSmsMessage::TranslateCategoryToIndex id = %d, found = %d", aId, rc);
}
return rc;
} // TSmsInformationElementCategories::TranslateCategoryToIndex
@@ -3405,7 +3406,7 @@
*/
TBool TSmsInformationElementCategories::GetCategoryDefinition(TInformationElementId aId, TInformationElementCategory& aCategory)
{
- LOGGSMU1("TSmsInformationElementCategories::GetCategoryDefinition");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_1, "TSmsInformationElementCategories::GetCategoryDefinition");
TInt index;
if (TranslateCategoryToIndex(aId,index))
@@ -3414,7 +3415,7 @@
}
else
{
- LOGGSMU2("TSmsInformationElementCategories::GetCategoryDefinition, Failure, aId = %d", aId);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_2, "TSmsInformationElementCategories::GetCategoryDefinition, Failure, aId = %d", aId);
return EFalse;
}
@@ -3436,7 +3437,7 @@
CSmsUserData* CSmsUserData::NewL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TSmsFirstOctet& aFirstOctet,const TSmsDataCodingScheme& aDataCodingScheme)
{
- LOGGSMU1("CSmsUserData::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_NEWL_1, "CSmsUserData::NewL()");
CSmsUserData* userdata=new(ELeave) CSmsUserData(aCharacterSetConverter,aFs,aFirstOctet,aDataCodingScheme);
CleanupStack::PushL(userdata);
@@ -3465,7 +3466,7 @@
*/
EXPORT_C CSmsInformationElement& CSmsUserData::InformationElement(TInt aIndex) const
{
- LOGGSMU1("CSmsUserData::InformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_INFORMATIONELEMENT_1, "CSmsUserData::InformationElement()");
return *iInformationElementArray[aIndex];
} // CSmsUserData::InformationElement
@@ -3473,7 +3474,7 @@
CSmsInformationElement*& CSmsUserData::InformationElementPtr(TInt aIndex)
{
- LOGGSMU1("CSmsUserData::InformationElementPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_INFORMATIONELEMENTPTR_1, "CSmsUserData::InformationElementPtr()");
return iInformationElementArray[aIndex];
} // CSmsUserData::InformationElementPtr
@@ -3493,7 +3494,7 @@
*/
EXPORT_C TBool CSmsUserData::InformationElementIndex(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier,TInt& aIndex) const
{
- LOGGSMU1("CSmsUserData::InformationElementIndex()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_INFORMATIONELEMENTINDEX_1, "CSmsUserData::InformationElementIndex()");
TBool found=EFalse;
TInt count=NumInformationElements();
@@ -3521,7 +3522,7 @@
*/
EXPORT_C TBool CSmsUserData::InformationElementLastIndex(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier,TInt& aIndex) const
{
- LOGGSMU1("CSmsUserData::InformationElementLastIndex()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_INFORMATIONELEMENTLASTINDEX_1, "CSmsUserData::InformationElementLastIndex()");
TBool found=EFalse;
TInt count=NumInformationElements();
@@ -3548,7 +3549,7 @@
*/
void CSmsUserData::InformationElementIndicesL(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier, CArrayFixFlat<TInt>& aIndices) const
{
- LOGGSMU1("CSmsUserData::InformationElementIndicesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_INFORMATIONELEMENTINDICESL_1, "CSmsUserData::InformationElementIndicesL()");
aIndices.Reset();
@@ -3571,7 +3572,7 @@
*/
TBool CSmsUserData::EmsInformationElementWillFitL(CEmsInformationElement* aIe,CSmsEMSBufferSegmenter& aSeg,TUint& aCharsAddedToCurrentPDU)
{
- LOGGSMU1("CSmsUserData::EmsInformationElementWillFitL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_EMSINFORMATIONELEMENTWILLFITL_1, "CSmsUserData::EmsInformationElementWillFitL()");
// Before using an EmsInformationElement polymorphically as an SmsIE,
// we need to make sure that the IE has been encoded
@@ -3604,7 +3605,7 @@
*/
TBool CSmsUserData::ControlInformationElementWillFitL(CSmsInformationElement* aIe)
{
- LOGGSMU1("CSmsUserData::ControlInformationElementWillFitL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_CONTROLINFORMATIONELEMENTWILLFITL_1, "CSmsUserData::ControlInformationElementWillFitL()");
if (aIe == NULL)
{
@@ -3667,7 +3668,7 @@
*/
EXPORT_C void CSmsUserData::AddInformationElementL(TSmsId aIdentifier,const TDesC8& aData)
{
- LOGGSMU1("CSmsUserData::AddInformationElementL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ADDINFORMATIONELEMENTL_1, "CSmsUserData::AddInformationElementL");
if ((aIdentifier >= 0x21) && (aIdentifier <= 0x23) ||
(aIdentifier >= 0x26) && (aIdentifier <= 0x6F) ||
@@ -3692,7 +3693,7 @@
*/
void CSmsUserData::UpdateInformationElementArrayL(TSmsId aIdentifier,const TDesC8& aData)
{
- LOGGSMU1("CSmsUserData::UpdateInformationElementsL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_1, "CSmsUserData::UpdateInformationElementsL");
TInt count=NumInformationElements();
if(!CEmsFactory::Supported(aIdentifier))
@@ -3714,7 +3715,7 @@
{
if (InformationElement(i).Identifier() == CSmsInformationElement::ESmsIEISpecialSMSMessageIndication)
{
- LOGGSMU3("CSmsUserData::AddInformationElementL1 category = %d, identifier = %d",category,aIdentifier);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_2, "CSmsUserData::AddInformationElementL1 category = %d, identifier = %d",category,aIdentifier);
//if Msg type is the same, swap with the most recent value
if ((InformationElement(i).Data()[0] & ((TUint8) EGsmSmsSpecialMessageIndicationTypeMask)) ==
@@ -3725,7 +3726,7 @@
}
else
{
- LOGGSMU4("CSmsUserData::AddInformationElementL3 category = %d, identifier = %d, data = %S",category,aIdentifier, &aData);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_3, "CSmsUserData::AddInformationElementL3 category = %d, identifier = %d, data = %s",category,aIdentifier, aData);
User::Leave(KErrArgument);
}
break;
@@ -3734,18 +3735,18 @@
case TSmsInformationElementCategories::ECtrlMandatoryIn1stPDUOnly:
case TSmsInformationElementCategories::ECtrlSingleInstanceOnly:
{
- LOGGSMU3("CSmsUserData::AddInformationElementL4 category = %d, identifier = %d",category,aIdentifier);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_4, "CSmsUserData::AddInformationElementL4 category = %d, identifier = %d",category,aIdentifier);
User::Leave(KErrAlreadyExists);
break;
}
case TSmsInformationElementCategories::ECtrlMultipleInstancesAllowed:
{
- LOGGSMU3("CSmsUserData::AddInformationElementL5 category = %d, identifier = %d",category,aIdentifier);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_5, "CSmsUserData::AddInformationElementL5 category = %d, identifier = %d",category,aIdentifier);
break;
}
case TSmsInformationElementCategories::ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU:
{
- LOGGSMU3("CSmsUserData::AddInformationElementL6 category = %d, identifier = %d",category,aIdentifier);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_6, "CSmsUserData::AddInformationElementL6 category = %d, identifier = %d",category,aIdentifier);
User::Leave(KErrAlreadyExists);
// currently the email header is updated in:
// void CSmsMessage::DecodeBufferL(CArrayPtr<CSmsPDU>& aSmsPDUArray,CSmsBufferBase& aBuffer)
@@ -3753,7 +3754,7 @@
}
default:
{
- LOGGSMU3("CSmsUserData::AddInformationElementL8 category = %d, identifier = %d",category,aIdentifier);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_7, "CSmsUserData::AddInformationElementL8 category = %d, identifier = %d",category,aIdentifier);
User::Leave(KErrNotSupported);
break;
}
@@ -3772,7 +3773,7 @@
void CSmsUserData::AddEmsInformationElementL(CEmsInformationElement* aIe)
{
- LOGGSMU1("CSmsUserData::AddEmsInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_ADDEMSINFORMATIONELEMENTL_1, "CSmsUserData::AddEmsInformationElementL()");
// Before using an EmsInformationElement polymorphically as an SmsIE,
// we need to make sure that the IE has been encoded
@@ -3790,7 +3791,7 @@
*/
EXPORT_C void CSmsUserData::RemoveInformationElement(TInt aIndex)
{
- LOGGSMU1("CSmsUserData::RemoveInformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_REMOVEINFORMATIONELEMENT_1, "CSmsUserData::RemoveInformationElement()");
// Since iInformationElementArray[aIndex] pointer is removed from iInformationElementArray, there is no double free issue.
// coverity[double_free]
delete iInformationElementArray[aIndex];
@@ -3806,7 +3807,7 @@
TInt CSmsUserData::MaxPackedUDUnitsInBodyRemaining() const
{
- LOGGSMU1("CSmsUserData::MaxPackedUDUnitsInBodyRemaining()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING_1, "CSmsUserData::MaxPackedUDUnitsInBodyRemaining()");
TInt totalHeaderLengthInUDLUnits=TotalHeaderLengthInUDLUnits();
TInt maxPackedUDUnitsInBody=0;
@@ -3832,7 +3833,7 @@
TInt CSmsUserData::MaxPackedUDUnitsInBodyRemaining(TUint aIELen) const
{
- LOGGSMU1("CSmsUserData::MaxPackedUDUnitsInBodyRemaining()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING1_1, "CSmsUserData::MaxPackedUDUnitsInBodyRemaining()");
TInt totalHeaderLengthInUDLUnits=TotalHeaderLengthInUDLUnits(aIELen);
TInt maxPackedUDUnitsInBody=0;
@@ -3861,7 +3862,7 @@
*/
EXPORT_C TInt CSmsUserData::MaxBodyLengthInChars() const
{
- LOGGSMU1("CSmsUserData::MaxBodyLengthInChars()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_MAXBODYLENGTHINCHARS_1, "CSmsUserData::MaxBodyLengthInChars()");
TInt totalheaderlengthinudlunits=TotalHeaderLengthInUDLUnits();
TInt maxbodylengthinchars=0;
@@ -3889,7 +3890,7 @@
break;
}
default:
- LOGGSMU1("CSmsUserData::MaxBodyLengthInChars() WARNING! default case has been reached");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_MAXBODYLENGTHINCHARS_2, "CSmsUserData::MaxBodyLengthInChars() WARNING! default case has been reached");
break;
}
}
@@ -3905,7 +3906,7 @@
*/
EXPORT_C TPtrC8 CSmsUserData::Body() const
{
- LOGGSMU1("CSmsUserData::Body()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_BODY_1, "CSmsUserData::Body()");
return iBody->Des();
} // CSmsUserData::Body
@@ -3919,7 +3920,7 @@
*/
EXPORT_C void CSmsUserData::SetBodyL(const TDesC8& aBody)
{
- LOGGSMU1("CSmsUserData::SetBodyL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_SETBODYL_1, "CSmsUserData::SetBodyL()");
//Some tests fail with this line in, despite it being a valid condition!
//__ASSERT_DEBUG(aBody.Length() <= MaxBodyLengthInChars(), User::Leave(KErrTooBig));
@@ -3931,7 +3932,7 @@
void CSmsUserData::AppendBodyL(const TDesC8& aBody)
{
- LOGGSMU1("CSmsUserData::AppendBodyL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_APPENDBODYL_1, "CSmsUserData::AppendBodyL()");
if (iBody)
{
@@ -3964,7 +3965,7 @@
*/
EXPORT_C TBool CSmsUserData::IsSupportedL(TChar aChar)
{
- LOGGSMU1("CSmsUserData::IsSupportedL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ISSUPPORTEDL_1, "CSmsUserData::IsSupportedL()");
CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(iCharacterSetConverter,iFs,iDataCodingScheme.Alphabet(),IsBinaryData());
TBool result=converter->IsSupportedL(aChar);
@@ -3991,7 +3992,7 @@
EXPORT_C TBool CSmsUserData::IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
TInt& aIndexOfFirstUnconvertibleCharacter) const
{
- LOGGSMU1("[1] CSmsUserData::IsSupportedL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ISSUPPORTEDL1_1, "[1] CSmsUserData::IsSupportedL()");
CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(iCharacterSetConverter,iFs,iDataCodingScheme.Alphabet(),IsBinaryData());
TBool result=converter->IsSupportedL(aDes, aNumberOfUnconvertibleCharacters,
@@ -4028,7 +4029,7 @@
TInt& aNumberRequiringAlternativeEncoding,
TInt& aIndexOfFirstUnconvertibleCharacter) const
{
- LOGGSMU1("[2] CSmsUserData::IsSupportedL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUSERDATA_ISSUPPORTEDL2_1, "[2] CSmsUserData::IsSupportedL()");
CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(iCharacterSetConverter,iFs,iDataCodingScheme.Alphabet(),IsBinaryData());
TBool result=converter->IsSupportedL(aDes, aEncoding,
@@ -4044,7 +4045,7 @@
TUint8* CSmsUserData::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("CSmsUserData::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_ENCODEL_1, "CSmsUserData::EncodeL()");
__ASSERT_DEBUG(0<=MaxPackedUDUnitsInBodyRemaining(),Panic(KGsmuPanicUserDataBodyTooLong));
// Encode the user data length
@@ -4078,7 +4079,7 @@
void CSmsUserData::DecodeL(TGsmuLex8& aPdu, TBool aAcceptTruncation)
{
- LOGGSMU1("CSmsUserData::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_DECODEL1_1, "CSmsUserData::DecodeL()");
// Reset current data
iInformationElementArray.ResetAndDestroy();
@@ -4182,7 +4183,7 @@
void CSmsUserData::ConstructL()
{
- LOGGSMU1("CSmsUserData::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_CONSTRUCTL_1, "CSmsUserData::ConstructL()");
NewBodyL(0);
} // CSmsUserData::ConstructL
@@ -4196,7 +4197,7 @@
CSmsUserData* CSmsUserData::DuplicateL(TSmsFirstOctet& aFirstOctet,
const TSmsDataCodingScheme& aDataCodingScheme) const
{
- LOGGSMU1("CSmsUserData::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_DUPLICATEL_1, "CSmsUserData::DuplicateL()");
CSmsUserData* userdata = CSmsUserData::NewL(iCharacterSetConverter, iFs,
aFirstOctet, aDataCodingScheme);
@@ -4230,7 +4231,7 @@
TInt CSmsUserData::HeaderLength() const
{
- LOGGSMU1("CSmsUserData::HeaderLength()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_HEADERLENGTH_1, "CSmsUserData::HeaderLength()");
TInt numinformationelements=NumInformationElements();
TInt headerlength=0;
@@ -4242,7 +4243,7 @@
TInt CSmsUserData::TotalHeaderLengthInUDLUnits() const
{
- LOGGSMU1("CSmsUserData::TotalHeaderLengthInUDLUnits()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_1, "CSmsUserData::TotalHeaderLengthInUDLUnits()");
TInt totalheaderlengthinudlunits=0;
if (iInformationElementArray.Count()>0)
@@ -4268,7 +4269,7 @@
break;
}
default:
- LOGGSMU1("CSmsUserData::TotalHeaderLengthInUDLUnits() WARNING default case has been reached");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_2, "CSmsUserData::TotalHeaderLengthInUDLUnits() WARNING default case has been reached");
break;
}
}
@@ -4279,7 +4280,7 @@
TInt CSmsUserData::TotalHeaderLengthInUDLUnits(TInt aIElen) const
{
- LOGGSMU1("CSmsUserData::TotalHeaderLengthInUDLUnits()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS1_1, "CSmsUserData::TotalHeaderLengthInUDLUnits()");
TInt totalheaderlengthinudlunits=0;
TInt totalheaderlength=aIElen;
@@ -4318,7 +4319,7 @@
TInt CSmsUserData::BodyLengthInUDLUnits() const
{
- LOGGSMU1("CSmsUserData::BodyLengthInUDLUnits()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_BODYLENGTHINUDLUNITS_1, "CSmsUserData::BodyLengthInUDLUnits()");
return iBody->Des().Length();
} // CSmsUserData::BodyLengthInUDLUnits
@@ -4326,7 +4327,7 @@
void CSmsUserData::NewBodyL(TInt aLength)
{
- LOGGSMU1("CSmsUserData::NewBodyL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_NEWBODYL_1, "CSmsUserData::NewBodyL()");
HBufC8* body=HBufC8::NewL(aLength);
@@ -4339,7 +4340,7 @@
TBool CSmsUserData::HeaderPresent() const
{
- LOGGSMU1("CSmsUserData::HeaderPresent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_HEADERPRESENT_1, "CSmsUserData::HeaderPresent()");
return (iFirstOctet&TSmsFirstOctet::ESmsUDHIMask)==TSmsFirstOctet::ESmsUDHIHeaderPresent;
} // CSmsUserData::HeaderPresent
@@ -4347,7 +4348,7 @@
void CSmsUserData::SetHeaderPresent(TBool aHeaderPresent)
{
- LOGGSMU1("CSmsUserData::SetHeaderPresent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_SETHEADERPRESENT_1, "CSmsUserData::SetHeaderPresent()");
iFirstOctet=aHeaderPresent? (iFirstOctet&(~TSmsFirstOctet::ESmsUDHIMask))|TSmsFirstOctet::ESmsUDHIHeaderPresent: (iFirstOctet&(~TSmsFirstOctet::ESmsUDHIMask))|TSmsFirstOctet::ESmsUDHIHeaderNotPresent;
} // CSmsUserData::SetHeaderPresent
@@ -4355,7 +4356,7 @@
TBool CSmsUserData::IsBinaryData() const
{
- LOGGSMU1("CSmsUserData::IsBinaryData()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUSERDATA_ISBINARYDATA_1, "CSmsUserData::IsBinaryData()");
TInt index=0;
return (iDataCodingScheme.TextCompressed()) ||
@@ -4377,7 +4378,7 @@
*/
EXPORT_C void TGsmSmsTypeOfAddress::ConvertToETelMM(NMobilePhone::TMobileTON& aTon,NMobilePhone::TMobileNPI& aNpi) const
{
- LOGGSMU1("TGsmSmsTypeOfAddress::ConvertToETelMM()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TGSMSMSTYPEOFADDRESS_CONVERTTOETELMM_1, "TGsmSmsTypeOfAddress::ConvertToETelMM()");
switch (TON())
{
@@ -4473,7 +4474,7 @@
*/
EXPORT_C void TGsmSmsTypeOfAddress::SetFromETelMM(NMobilePhone::TMobileTON aTon,NMobilePhone::TMobileNPI aNpi)
{
- LOGGSMU1("TGsmSmsTypeOfAddress::SetFromETelMM()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TGSMSMSTYPEOFADDRESS_SETFROMETELMM_1, "TGsmSmsTypeOfAddress::SetFromETelMM()");
switch (aTon)
{
@@ -4571,7 +4572,7 @@
*/
EXPORT_C TVoiceMailInfoType CEnhancedVoiceMailBoxInformation::Type() const
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::Type()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_TYPE_1, "CEnhancedVoiceMailBoxInformation::Type()");
return iType;
} // CEnhancedVoiceMailBoxInformation::Type
@@ -4589,7 +4590,7 @@
*/
EXPORT_C void CEnhancedVoiceMailBoxInformation::SetProfile(TSmsMessageProfileType aProfile)
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetProfile()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETPROFILE_1, "CEnhancedVoiceMailBoxInformation::SetProfile()");
iProfile = aProfile;
} // CEnhancedVoiceMailBoxInformation::SetProfile
@@ -4607,7 +4608,7 @@
*/
EXPORT_C TSmsMessageProfileType CEnhancedVoiceMailBoxInformation::Profile() const
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::Profile()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_PROFILE_1, "CEnhancedVoiceMailBoxInformation::Profile()");
return iProfile;
} // CEnhancedVoiceMailBoxInformation::Profile
@@ -4626,7 +4627,7 @@
*/
EXPORT_C void CEnhancedVoiceMailBoxInformation::SetStorage(TBool aIsStored)
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetStorage()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETSTORAGE_1, "CEnhancedVoiceMailBoxInformation::SetStorage()");
iStorage = aIsStored;
} // CEnhancedVoiceMailBoxInformation::SetStorage
@@ -4645,7 +4646,7 @@
*/
EXPORT_C TBool CEnhancedVoiceMailBoxInformation::Store() const
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::Store()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_STORE_1, "CEnhancedVoiceMailBoxInformation::Store()");
return iStorage;
} // CEnhancedVoiceMailBoxInformation::Store
@@ -4664,7 +4665,7 @@
*/
EXPORT_C void CEnhancedVoiceMailBoxInformation::SetAlmostMaximumCapacity(TBool aIsAlmostFull)
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetAlmostMaximumCapacity()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETALMOSTMAXIMUMCAPACITY_1, "CEnhancedVoiceMailBoxInformation::SetAlmostMaximumCapacity()");
iAlmostFull = aIsAlmostFull;
} // CEnhancedVoiceMailBoxInformation::SetAlmostMaximumCapacity
@@ -4683,7 +4684,7 @@
*/
EXPORT_C TBool CEnhancedVoiceMailBoxInformation::AlmostMaximumCapacity() const
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::AlmostMaximumCapacity()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_ALMOSTMAXIMUMCAPACITY_1, "CEnhancedVoiceMailBoxInformation::AlmostMaximumCapacity()");
return iAlmostFull;
} // CEnhancedVoiceMailBoxInformation::AlmostMaximumCapacity
@@ -4702,7 +4703,7 @@
*/
EXPORT_C void CEnhancedVoiceMailBoxInformation::SetMaximumCapacity(TBool aIsFull)
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetMaximumCapacity()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETMAXIMUMCAPACITY_1, "CEnhancedVoiceMailBoxInformation::SetMaximumCapacity()");
iFull = aIsFull;
} // CEnhancedVoiceMailBoxInformation::SetMaximumCapacity
@@ -4721,7 +4722,7 @@
*/
EXPORT_C TBool CEnhancedVoiceMailBoxInformation::MaximumCapacity() const
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::MaximumCapacity()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_MAXIMUMCAPACITY_1, "CEnhancedVoiceMailBoxInformation::MaximumCapacity()");
return iFull;
} // CEnhancedVoiceMailBoxInformation::MaximumCapacity
@@ -4740,7 +4741,7 @@
*/
EXPORT_C TBool CEnhancedVoiceMailBoxInformation::ExtensionIndicator() const
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::ExtensionIndicator()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_EXTENSIONINDICATOR_1, "CEnhancedVoiceMailBoxInformation::ExtensionIndicator()");
return iExtensionIndicator;
} // CEnhancedVoiceMailBoxInformation::ExtensionIndicator
@@ -4748,7 +4749,7 @@
void CEnhancedVoiceMailBoxInformation::NewBufferL(TInt aLength)
{
- LOGGSMU2("CEnhancedVoiceMailBoxInformation::NewBufferL, length = %d",aLength);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_NEWBUFFERL_1, "CEnhancedVoiceMailBoxInformation::NewBufferL, length = %d",aLength);
HBufC* buffer=HBufC::NewL(aLength);
delete iAccessAddress;
@@ -4770,7 +4771,7 @@
*/
EXPORT_C void CEnhancedVoiceMailBoxInformation::SetAccessAddressL(const TDesC& aAddress)
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetAccessAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETACCESSADDRESSL_1, "CEnhancedVoiceMailBoxInformation::SetAccessAddressL()");
TInt length=aAddress.Length();
NewBufferL(length);
@@ -4793,7 +4794,7 @@
*/
EXPORT_C TPtrC CEnhancedVoiceMailBoxInformation::AccessAddress() const
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::AccessAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_ACCESSADDRESS_1, "CEnhancedVoiceMailBoxInformation::AccessAddress()");
TPtrC ptr;
if (iAccessAddress)
@@ -4814,7 +4815,7 @@
*/
EXPORT_C void CEnhancedVoiceMailBoxInformation::SetParsedAccessAddressL(const TGsmSmsTelNumber& aParsedAddress)
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetParsedAccessAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETPARSEDACCESSADDRESSL_1, "CEnhancedVoiceMailBoxInformation::SetParsedAccessAddressL()");
iTypeOfAddress=aParsedAddress.iTypeOfAddress;
DoSetParsedAddressL(aParsedAddress.iTelNumber);
@@ -4833,7 +4834,7 @@
*/
EXPORT_C void CEnhancedVoiceMailBoxInformation::ParsedAccessAddress(TGsmSmsTelNumber& aParsedAddress) const
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::ParsedAccessAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_PARSEDACCESSADDRESS_1, "CEnhancedVoiceMailBoxInformation::ParsedAccessAddress()");
aParsedAddress.iTypeOfAddress = iTypeOfAddress;
@@ -4869,7 +4870,7 @@
void CEnhancedVoiceMailBoxInformation::DoSetParsedAddressL(const TDesC& aAddress)
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::DoSetParsedAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_DOSETPARSEDADDRESSL_1, "CEnhancedVoiceMailBoxInformation::DoSetParsedAddressL()");
TInt length=aAddress.Length();
if ((iTypeOfAddress.TON()==EGsmSmsTONInternationalNumber) &&
@@ -4900,7 +4901,7 @@
*/
EXPORT_C void CEnhancedVoiceMailBoxInformation::SetNumberOfVoiceMessages(TUint8 aNumber)
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::SetNumberOfVoiceMessages()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_SETNUMBEROFVOICEMESSAGES_1, "CEnhancedVoiceMailBoxInformation::SetNumberOfVoiceMessages()");
iNumberOfVoiceMessages=aNumber;
} // CEnhancedVoiceMailBoxInformation::SetNumberOfVoiceMessages
@@ -4918,7 +4919,7 @@
*/
EXPORT_C TUint8 CEnhancedVoiceMailBoxInformation::NumberOfVoiceMessages() const
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::NumberOfVoiceMessages()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILBOXINFORMATION_NUMBEROFVOICEMESSAGES_1, "CEnhancedVoiceMailBoxInformation::NumberOfVoiceMessages()");
return iNumberOfVoiceMessages;
} // CEnhancedVoiceMailBoxInformation::NumberOfVoiceMessages
@@ -4933,7 +4934,7 @@
((((TUint8) iFull) & EMask1Bit ) << 6) +
(((TUint8) iExtensionIndicator ) << 7);
- LOGGSMU2("CEnhancedVoiceMailBoxInformation::EncodeL 1st byte = %d",*aPtr);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_ENCODEL_1, "CEnhancedVoiceMailBoxInformation::EncodeL 1st byte = %d",*aPtr);
aPtr++;
// Create an address object to encode the mail box access address into the
@@ -4967,7 +4968,7 @@
iFull = (TBool) ((Byte1 >> 6) & EMask1Bit);
iExtensionIndicator = (TBool) ((Byte1 >> 7) & EMask1Bit);
- LOGGSMU2("CEnhancedVoiceMailBoxInformation::DecodeL 1st byte = %d", Byte1);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_1, "CEnhancedVoiceMailBoxInformation::DecodeL 1st byte = %d", Byte1);
// Create an address object to deccode the mail box access address from the
// format required by 23.040 v6.5.0 section 9.1.2.5.
@@ -5012,13 +5013,13 @@
CleanupStack::PopAndDestroy(decodedAddress);
iNumberOfVoiceMessages = aVoiceMailInfo.GetL();
- LOGGSMU2("CEnhancedVoiceMailBoxInformation::DecodeL iNumberOfVoiceMessages = %d", iNumberOfVoiceMessages);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_2, "CEnhancedVoiceMailBoxInformation::DecodeL iNumberOfVoiceMessages = %d", iNumberOfVoiceMessages);
} // CEnhancedVoiceMailBoxInformation::DecodeL
CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_CTOR_1, "CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()");
// Consider changing this over to a Panic.
iType = EGsmSmsVoiceMailNotification;
@@ -5034,7 +5035,7 @@
CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation(TVoiceMailInfoType aTVoiceMailInfoType)
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_CTOR1_1, "CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation()");
iType = aTVoiceMailInfoType;
iOctet1Bit1 = EFalse;
@@ -5059,7 +5060,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_CTOR2_1, "CEnhancedVoiceMailBoxInformation::CEnhancedVoiceMailBoxInformation");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
@@ -5076,7 +5077,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR_1, "CEnhancedVoiceMailBoxInformation::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented);
return EFalse;
BULLSEYE_RESTORE
@@ -5094,14 +5095,14 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR1_1, "CEnhancedVoiceMailBoxInformation::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
void CEnhancedVoiceMailBoxInformation::ConstructL()
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_CONSTRUCTL_1, "CEnhancedVoiceMailBoxInformation::ConstructL()");
NewBufferL(0);
} // CEnhancedVoiceMailBoxInformation::ConstructL
@@ -5109,14 +5110,14 @@
CEnhancedVoiceMailBoxInformation::~CEnhancedVoiceMailBoxInformation()
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::~CEnhancedVoiceMailBoxInformation");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_DTOR_1, "CEnhancedVoiceMailBoxInformation::~CEnhancedVoiceMailBoxInformation");
delete iAccessAddress;
} // CEnhancedVoiceMailBoxInformation::ConstructL
CEnhancedVoiceMailBoxInformation* CEnhancedVoiceMailBoxInformation::NewL()
{
- LOGGSMU1("CEnhancedVoiceMailBoxInformation::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILBOXINFORMATION_NEWL_1, "CEnhancedVoiceMailBoxInformation::NewL()");
CEnhancedVoiceMailBoxInformation* aCEnhancedVoiceMailBoxInformation=new(ELeave) CEnhancedVoiceMailBoxInformation();
CleanupStack::PushL(aCEnhancedVoiceMailBoxInformation);
@@ -5138,7 +5139,7 @@
*/
EXPORT_C void CVoiceMailNotification::SetMessageId(TUint16 aMessageId)
{
- LOGGSMU1("CVoiceMailNotification::SetMessageId()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETMESSAGEID_1, "CVoiceMailNotification::SetMessageId()");
iMessageId = aMessageId;
} // CVoiceMailNotification::SetMessageId
@@ -5156,7 +5157,7 @@
*/
EXPORT_C TUint16 CVoiceMailNotification::MessageId() const
{
- LOGGSMU1("CVoiceMailNotification::MessageId()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_MESSAGEID_1, "CVoiceMailNotification::MessageId()");
return iMessageId;
} // CVoiceMailNotification::MessageId
@@ -5174,7 +5175,7 @@
*/
EXPORT_C void CVoiceMailNotification::SetMessageLength(TUint8 aLength)
{
- LOGGSMU1("CVoiceMailNotification::SetMessageLength()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETMESSAGELENGTH_1, "CVoiceMailNotification::SetMessageLength()");
iMessageLength=aLength;
} // CVoiceMailNotification::SetMessageLength
@@ -5192,7 +5193,7 @@
*/
EXPORT_C TUint8 CVoiceMailNotification::MessageLength() const
{
- LOGGSMU1("CVoiceMailNotification::MessageLength()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_MESSAGELENGTH_1, "CVoiceMailNotification::MessageLength()");
return iMessageLength;
} // CVoiceMailNotification::MessageLength
@@ -5212,7 +5213,7 @@
*/
EXPORT_C void CVoiceMailNotification::SetRetentionDays(TUint8 aDays)
{
- LOGGSMU1("CVoiceMailNotification::SetRetentionDays()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETRETENTIONDAYS_1, "CVoiceMailNotification::SetRetentionDays()");
if (aDays > 31)
{
@@ -5237,7 +5238,7 @@
*/
EXPORT_C TUint8 CVoiceMailNotification::RetentionDays() const
{
- LOGGSMU1("CVoiceMailNotification::RetentionDays()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_RETENTIONDAYS_1, "CVoiceMailNotification::RetentionDays()");
return iRetentionDays;
} // CVoiceMailNotification::RetentionDays
@@ -5256,7 +5257,7 @@
*/
EXPORT_C void CVoiceMailNotification::SetPriorityIndication(TBool aPriority)
{
- LOGGSMU1("CVoiceMailNotification::SetPriorityIndication()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETPRIORITYINDICATION_1, "CVoiceMailNotification::SetPriorityIndication()");
iPriorityIndication=aPriority;
} // CVoiceMailNotification::SetPriorityIndication
@@ -5275,7 +5276,7 @@
*/
EXPORT_C TBool CVoiceMailNotification::PriorityIndication() const
{
- LOGGSMU1("CVoiceMailNotification::PriorityIndication()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_PRIORITYINDICATION_1, "CVoiceMailNotification::PriorityIndication()");
return iPriorityIndication;
} // CVoiceMailNotification::PriorityIndication
@@ -5294,7 +5295,7 @@
*/
EXPORT_C TBool CVoiceMailNotification::MessageExtensionIndication() const
{
- LOGGSMU1("CVoiceMailNotification::MessageExtensionIndication()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_MESSAGEEXTENSIONINDICATION_1, "CVoiceMailNotification::MessageExtensionIndication()");
return iMessageExtensionIndicator;
} // CVoiceMailNotification::MessageExtensionIndication
@@ -5302,7 +5303,7 @@
void CVoiceMailNotification::NewBufferL(TInt aLength)
{
- LOGGSMU1("CVoiceMailNotification::NewBufferL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_NEWBUFFERL_1, "CVoiceMailNotification::NewBufferL()");
HBufC* buffer=HBufC::NewL(aLength);
delete iCallingLineIdentity;
@@ -5323,7 +5324,7 @@
*/
EXPORT_C void CVoiceMailNotification::SetCallingLineIdentityL(TDesC& aLineIdentity)
{
- LOGGSMU1("CVoiceMailNotification::SetCallingLineIdentityL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETCALLINGLINEIDENTITYL_1, "CVoiceMailNotification::SetCallingLineIdentityL()");
TInt length=aLineIdentity.Length();
NewBufferL(length);
@@ -5346,7 +5347,7 @@
*/
EXPORT_C TPtrC CVoiceMailNotification::CallingLineIdentity() const
{
- LOGGSMU1("CVoiceMailNotification::CallingLineIdentity()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_CALLINGLINEIDENTITY_1, "CVoiceMailNotification::CallingLineIdentity()");
TPtrC ptr;
if (iCallingLineIdentity)
@@ -5367,7 +5368,7 @@
*/
EXPORT_C void CVoiceMailNotification::SetParsedCallingLineIdentityL(TGsmSmsTelNumber& aParsedAddress)
{
- LOGGSMU1("CVoiceMailNotification::SetParsedCallingLineIdentityL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_SETPARSEDCALLINGLINEIDENTITYL_1, "CVoiceMailNotification::SetParsedCallingLineIdentityL()");
iTypeOfAddress=aParsedAddress.iTypeOfAddress;
DoSetParsedAddressL(aParsedAddress.iTelNumber);
@@ -5386,7 +5387,7 @@
*/
EXPORT_C void CVoiceMailNotification::ParsedCallingLineIdentity(TGsmSmsTelNumber& aParsedAddress) const
{
- LOGGSMU1("CVoiceMailNotification::ParsedCallingLineIdentity()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_PARSEDCALLINGLINEIDENTITY_1, "CVoiceMailNotification::ParsedCallingLineIdentity()");
aParsedAddress.iTypeOfAddress = iTypeOfAddress;
@@ -5422,7 +5423,7 @@
void CVoiceMailNotification::NewExtensionL(TInt aLength)
{
- LOGGSMU1("CVoiceMailNotification::NewExtensionL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_NEWEXTENSIONL_1, "CVoiceMailNotification::NewExtensionL()");
HBufC* buffer=HBufC::NewL(aLength);
delete iExtension;
@@ -5431,27 +5432,6 @@
iExtension->Des().FillZ();
} // CVoiceMailNotification::NewExtensionL
-
-/*void CVoiceMailNotification::SetExtension(TDesC& aExtension)
- {
- LOGGSMU1("CVoiceMailNotification::SetExtension()");
-
- TInt length=aExtension.Length();
- NewExtensionL(length);
- iExtension->Des().Copy(aExtension);
- } // CVoiceMailNotification::SetExtension
-
-TPtrC CVoiceMailNotification::Extension() const
- {
- LOGGSMU1("CVoiceMailNotification::Extension()");
-
- TPtrC ptr;
- if (iExtension)
- ptr.Set(iExtension->Des());
- return ptr;
- }*/
-
-
/**
* @internalComponent
*
@@ -5465,7 +5445,7 @@
*/
TUint8 CVoiceMailNotification::SizeL(CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
{
- LOGGSMU1("CVoiceMailNotification::SizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_SIZEL_1, "CVoiceMailNotification::SizeL()");
const TUint8 KTotalSizeOfFixedLengthAttributes = 4;
TUint8 size = KTotalSizeOfFixedLengthAttributes;
@@ -5494,7 +5474,7 @@
// When changes are made to this function that affect the
// number of bytes that are encoded, this should be reflected in
// CVoiceMailNotification::SizeL()
- LOGGSMU1("CVoiceMailNotification::EncodeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_ENCODEL_1, "CVoiceMailNotification::EncodeL");
*aPtr = (TUint8) (iMessageId >> 8); // Message Id MSB
@@ -5528,7 +5508,7 @@
void CVoiceMailNotification::DecodeL(TGsmuLex8& aVoiceMailInfo, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
{
- LOGGSMU1("CVoiceMailNotification::DecodeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_DECODEL_1, "CVoiceMailNotification::DecodeL");
iMessageId = (((TUint16) aVoiceMailInfo.GetL()) << 8);
iMessageId += ((TUint16) aVoiceMailInfo.GetL());
@@ -5599,7 +5579,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CVoiceMailNotification::CVoiceMailNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_CTOR_1, "CVoiceMailNotification::CVoiceMailNotification");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
@@ -5616,7 +5596,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CVoiceMailNotification::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_OPERATOR_1, "CVoiceMailNotification::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented);
return EFalse;
BULLSEYE_RESTORE
@@ -5634,14 +5614,14 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CVoiceMailNotification::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_OPERATOR1_1, "CVoiceMailNotification::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
CVoiceMailNotification::CVoiceMailNotification()
{
- LOGGSMU1("CVoiceMailNotification::CVoiceMailNotification()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_CTOR1_1, "CVoiceMailNotification::CVoiceMailNotification()");
iMessageId = 0;
iMessageLength = 0;
@@ -5662,7 +5642,7 @@
*/
EXPORT_C CVoiceMailNotification::~CVoiceMailNotification()
{
- LOGGSMU1("CVoiceMailNotification::~CVoiceMailNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_DTOR_1, "CVoiceMailNotification::~CVoiceMailNotification");
delete iCallingLineIdentity;
delete iExtension;
} // CVoiceMailNotification::CVoiceMailNotification
@@ -5670,7 +5650,7 @@
void CVoiceMailNotification::ConstructL()
{
- LOGGSMU1("CVoiceMailNotification::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_CONSTRUCTL_1, "CVoiceMailNotification::ConstructL()");
NewBufferL(0);
NewExtensionL(0);
@@ -5686,7 +5666,7 @@
*/
EXPORT_C CVoiceMailNotification* CVoiceMailNotification::NewL()
{
- LOGGSMU1("CVoiceMailNotification::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILNOTIFICATION_NEWL_1, "CVoiceMailNotification::NewL()");
CVoiceMailNotification* aCVoiceMailNotification=new(ELeave) CVoiceMailNotification();
CleanupStack::PushL(aCVoiceMailNotification);
@@ -5698,7 +5678,7 @@
void CVoiceMailNotification::DoSetParsedAddressL(const TDesC& aAddress)
{
- LOGGSMU1("CVoiceMailNotification::DoSetParsedAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILNOTIFICATION_DOSETPARSEDADDRESSL_1, "CVoiceMailNotification::DoSetParsedAddressL()");
TInt length=aAddress.Length();
if ((iTypeOfAddress.TON()==EGsmSmsTONInternationalNumber) &&
@@ -5730,32 +5710,12 @@
*/
EXPORT_C TUint8 CEnhancedVoiceMailNotification::NumberOfVoiceMails()
{
- LOGGSMU1("CEnhancedVoiceMailNotification::NumberOfVoiceMails()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILNOTIFICATION_NUMBEROFVOICEMAILS_1, "CEnhancedVoiceMailNotification::NumberOfVoiceMails()");
return (TUint8) iNotifications->Count();
} // CEnhancedVoiceMailNotification::NumberOfVoiceMails
-/*void CEnhancedVoiceMailNotification::SetExtension(TDesC& aExtension)
- {
- LOGGSMU1("CEnhancedVoiceMailNotification::SetExtension()");
-
- TInt length=aExtension.Length();
- NewExtensionL(length);
- iExtension->Des().Copy(aExtension);
- } // CEnhancedVoiceMailNotification::SetExtension
-
-TPtrC CEnhancedVoiceMailNotification::Extension() const
- {
- LOGGSMU1("CEnhancedVoiceMailNotification::Extension()");
-
- TPtrC ptr;
- if (iExtension)
- ptr.Set(iExtension->Des());
- return ptr;
- }*/
-
-
/**
* @publishedAll
*
@@ -5771,7 +5731,7 @@
*/
EXPORT_C RPointerArray<CVoiceMailNotification>& CEnhancedVoiceMailNotification::GetVoiceMailNotifications()
{
- LOGGSMU1("CEnhancedVoiceMailNotification::GetVoiceMailNotifications()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILNOTIFICATION_GETVOICEMAILNOTIFICATIONS_1, "CEnhancedVoiceMailNotification::GetVoiceMailNotifications()");
return *iNotifications;
} // CEnhancedVoiceMailNotification::GetVoiceMailNotifications
@@ -5779,7 +5739,7 @@
void CEnhancedVoiceMailNotification::NewExtensionL(TInt aLength)
{
- LOGGSMU1("CEnhancedVoiceMailNotification::NewExtensionL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_NEWEXTENSIONL_1, "CEnhancedVoiceMailNotification::NewExtensionL()");
HBufC* buffer=HBufC::NewL(aLength);
delete iExtension;
@@ -5798,7 +5758,7 @@
*/
EXPORT_C CEnhancedVoiceMailNotification* CEnhancedVoiceMailNotification::NewL()
{
- LOGGSMU1("CEnhancedVoiceMailNotification::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILNOTIFICATION_NEWL_1, "CEnhancedVoiceMailNotification::NewL()");
CEnhancedVoiceMailNotification* aCEnhancedVoiceMailNotification=new(ELeave) CEnhancedVoiceMailNotification();
CleanupStack::PushL(aCEnhancedVoiceMailNotification);
@@ -5826,7 +5786,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CEnhancedVoiceMailNotification::CEnhancedVoiceMailNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_CTOR1_1, "CEnhancedVoiceMailNotification::CEnhancedVoiceMailNotification");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
@@ -5843,7 +5803,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CEnhancedVoiceMailNotification::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_OPERATOR_1, "CEnhancedVoiceMailNotification::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented);
return EFalse;
BULLSEYE_RESTORE
@@ -5861,7 +5821,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CEnhancedVoiceMailNotification::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_OPERATOR1_1, "CEnhancedVoiceMailNotification::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
@@ -5875,7 +5835,7 @@
*/
EXPORT_C CEnhancedVoiceMailNotification::~CEnhancedVoiceMailNotification()
{
- LOGGSMU1("CEnhancedVoiceMailNotification::~CEnhancedVoiceMailNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILNOTIFICATION_DTOR_1, "CEnhancedVoiceMailNotification::~CEnhancedVoiceMailNotification");
delete iExtension;
iNotifications->ResetAndDestroy();
iNotifications->Close();
@@ -5885,7 +5845,7 @@
void CEnhancedVoiceMailNotification::ConstructL()
{
- LOGGSMU1("CEnhancedVoiceMailNotification::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_CONSTRUCTL_1, "CEnhancedVoiceMailNotification::ConstructL()");
NewExtensionL(0);
iNotifications = new (ELeave) RPointerArray<CVoiceMailNotification>(KMaxNumberOfNotifications);
@@ -5894,7 +5854,7 @@
TUint8* CEnhancedVoiceMailNotification::EncodeL(TUint8* aCurrentPtr, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs) const
{
- LOGGSMU1("CEnhancedVoiceMailNotification::EncodeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_ENCODEL_1, "CEnhancedVoiceMailNotification::EncodeL");
TUint8* startPtr = aCurrentPtr;
@@ -5930,7 +5890,7 @@
void CEnhancedVoiceMailNotification::DecodeL(TGsmuLex8& aVoiceMailInfo, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
{
- LOGGSMU1("CEnhancedVoiceMailNotification::DecodeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILNOTIFICATION_DECODEL_1, "CEnhancedVoiceMailNotification::DecodeL");
CEnhancedVoiceMailBoxInformation::DecodeL(aVoiceMailInfo, aCharacterSetConverter, aFs);
@@ -5967,7 +5927,7 @@
*/
EXPORT_C void CVoiceMailDeletion::SetMessageId(TUint16 aMessageId)
{
- LOGGSMU1("CVoiceMailDeletion::SetMessageId()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_SETMESSAGEID_1, "CVoiceMailDeletion::SetMessageId()");
iMessageId=aMessageId;
} // CVoiceMailDeletion::SetMessageId
@@ -5987,7 +5947,7 @@
*/
EXPORT_C TUint16 CVoiceMailDeletion::MessageId() const
{
- LOGGSMU1("CVoiceMailDeletion::MessageId()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_MESSAGEID_1, "CVoiceMailDeletion::MessageId()");
return iMessageId;
} // CVoiceMailDeletion::MessageId
@@ -6006,7 +5966,7 @@
*/
EXPORT_C TBool CVoiceMailDeletion::MessageExtensionIndication() const
{
- LOGGSMU1("CVoiceMailDeletion::MessageExtensionIndication()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_MESSAGEEXTENSIONINDICATION_1, "CVoiceMailDeletion::MessageExtensionIndication()");
return iExtensionIndicator;
} // CVoiceMailDeletion::MessageExtensionIndication
@@ -6014,7 +5974,7 @@
TUint8 CVoiceMailDeletion::SizeL()
{
- LOGGSMU1("CVoiceMailDeletion::SizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_SIZEL_1, "CVoiceMailDeletion::SizeL()");
const TUint8 KSizeOfVoiceMailDeletion = 3;
return KSizeOfVoiceMailDeletion;
@@ -6026,7 +5986,7 @@
// When changes are made which affect the
// number of bytes encoded, this should be
// reflected in VoiceMailDeletion::SizeL()
- LOGGSMU1("CVoiceMailDeletion::EncodeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_ENCODEL_1, "CVoiceMailDeletion::EncodeL");
*aPtr = (TUint8) (iMessageId >> 8);
aPtr++;
@@ -6040,7 +6000,7 @@
void CVoiceMailDeletion::DecodeL(TGsmuLex8& aVoiceMailInfo)
{
- LOGGSMU1("CVoiceMailDeletion::DecodeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_DECODEL_1, "CVoiceMailDeletion::DecodeL");
iMessageId = (((TUint16) aVoiceMailInfo.GetL()) << 8) +
((TUint16) aVoiceMailInfo.GetL());
@@ -6073,7 +6033,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CVoiceMailDeletion::CVoiceMailDeletion");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_CTOR1_1, "CVoiceMailDeletion::CVoiceMailDeletion");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
@@ -6090,7 +6050,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CVoiceMailDeletion::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_OPERATOR_1, "CVoiceMailDeletion::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented);
return EFalse;
BULLSEYE_RESTORE
@@ -6108,7 +6068,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CVoiceMailDeletion::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_OPERATOR1_1, "CVoiceMailDeletion::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
@@ -6122,7 +6082,7 @@
*/
EXPORT_C CVoiceMailDeletion::~CVoiceMailDeletion()
{
- LOGGSMU1("CVoiceMailDeletion::~CVoiceMailDeletion");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_DTOR_1, "CVoiceMailDeletion::~CVoiceMailDeletion");
delete iExtension;
} // CVoiceMailDeletion::operator
@@ -6130,7 +6090,7 @@
void CVoiceMailDeletion::ConstructL()
{
- LOGGSMU1("CVoiceMailDeletion::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_CONSTRUCTL_1, "CVoiceMailDeletion::ConstructL()");
NewBufferL(0);
} // CVoiceMailDeletion::ConstructL
@@ -6138,7 +6098,7 @@
void CVoiceMailDeletion::NewBufferL(TInt aLength)
{
- LOGGSMU1("CVoiceMailDeletion::NewBufferL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CVOICEMAILDELETION_NEWBUFFERL_1, "CVoiceMailDeletion::NewBufferL()");
HBufC* buffer=HBufC::NewL(aLength);
delete iExtension;
@@ -6157,7 +6117,7 @@
*/
EXPORT_C CVoiceMailDeletion* CVoiceMailDeletion::NewL()
{
- LOGGSMU1("CVoiceMailDeletion::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CVOICEMAILDELETION_NEWL_1, "CVoiceMailDeletion::NewL()");
CVoiceMailDeletion* voiceMailDeletion=new(ELeave) CVoiceMailDeletion();
CleanupStack::PushL(voiceMailDeletion);
@@ -6167,31 +6127,9 @@
} // CVoiceMailDeletion::NewL
-/*
-void CVoiceMailDeletion::SetExtension(TDesC& aExtension)
- {
- LOGGSMU1("CVoiceMailDeletion::SetExtension()");
-
- TInt length=aExtension.Length();
- NewBufferL(length);
- iExtension->Des().Copy(aExtension);
- } // CVoiceMailDeletion::SetExtension
-
-
-TPtrC CVoiceMailDeletion::Extension() const
- {
- LOGGSMU1("CVoiceMailDeletion::Extension()");
-
- TPtrC ptr;
- if (iExtension)
- ptr.Set(iExtension->Des());
- return ptr;
- }*/
-
-
void CEnhancedVoiceMailDeleteConfirmations::NewExtensionL(TInt aLength)
{
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::NewExtensionL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWEXTENSIONL_1, "CEnhancedVoiceMailDeleteConfirmations::NewExtensionL()");
HBufC* buffer=HBufC::NewL(aLength);
delete iExtension;
@@ -6216,7 +6154,7 @@
*/
EXPORT_C CEnhancedVoiceMailDeleteConfirmations::~CEnhancedVoiceMailDeleteConfirmations()
{
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::~CEnhancedVoiceMailDeleteConfirmations");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILDELETECONFIRMATIONS_DTOR_1, "CEnhancedVoiceMailDeleteConfirmations::~CEnhancedVoiceMailDeleteConfirmations");
delete iExtension;
iVoiceMailDeletions->ResetAndDestroy();
@@ -6237,7 +6175,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::CEnhancedVoiceMailDeleteConfirmations");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_CTOR1_1, "CEnhancedVoiceMailDeleteConfirmations::CEnhancedVoiceMailDeleteConfirmations");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
@@ -6254,7 +6192,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR_1, "CEnhancedVoiceMailDeleteConfirmations::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented);
return EFalse;
BULLSEYE_RESTORE
@@ -6272,14 +6210,14 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR1_1, "CEnhancedVoiceMailDeleteConfirmations::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented);
BULLSEYE_RESTORE
}
void CEnhancedVoiceMailDeleteConfirmations::ConstructL()
{
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_CONSTRUCTL_1, "CEnhancedVoiceMailDeleteConfirmations::ConstructL()");
NewExtensionL(0);
@@ -6296,7 +6234,7 @@
*/
EXPORT_C CEnhancedVoiceMailDeleteConfirmations* CEnhancedVoiceMailDeleteConfirmations::NewL()
{
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWL_1, "CEnhancedVoiceMailDeleteConfirmations::NewL()");
CEnhancedVoiceMailDeleteConfirmations* aCEnhancedVoiceMailDeleteConfirmations=new(ELeave) CEnhancedVoiceMailDeleteConfirmations();
CleanupStack::PushL(aCEnhancedVoiceMailDeleteConfirmations);
@@ -6319,7 +6257,7 @@
*/
EXPORT_C TUint8 CEnhancedVoiceMailDeleteConfirmations::NumberOfDeletes()
{
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::NumberOfDeletes()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILDELETECONFIRMATIONS_NUMBEROFDELETES_1, "CEnhancedVoiceMailDeleteConfirmations::NumberOfDeletes()");
return iVoiceMailDeletions->Count();
} // CEnhancedVoiceMailDeleteConfirmations::NumberOfDeletes
@@ -6341,39 +6279,15 @@
*/
EXPORT_C RPointerArray<CVoiceMailDeletion>& CEnhancedVoiceMailDeleteConfirmations::GetVoiceMailDeletions()
{
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::GetVoiceMailDeletions()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CENHANCEDVOICEMAILDELETECONFIRMATIONS_GETVOICEMAILDELETIONS_1, "CEnhancedVoiceMailDeleteConfirmations::GetVoiceMailDeletions()");
return *iVoiceMailDeletions;
} // CEnhancedVoiceMailDeleteConfirmations::GetVoiceMailDeletions
-/*
-void CEnhancedVoiceMailDeleteConfirmations::SetExtension(TDesC& aExtension)
- {
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::SetExtension()");
-
- TInt length=aExtension.Length();
- NewBufferL(length);
- iExtension->Des().Copy(aExtension);
- } // CEnhancedVoiceMailDeleteConfirmations::SetExtension
-
-
-TPtrC CEnhancedVoiceMailDeleteConfirmations::Extension() const
- {
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::Extension()");
-
- TPtrC ptr;
- if (iExtension)
- {
- ptr.Set(iExtension->Des());
- }
- return ptr;
- }*/
-
-
TUint8* CEnhancedVoiceMailDeleteConfirmations::EncodeL(TUint8* aCurrentPtr, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs) const
{
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::EncodeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_ENCODEL_1, "CEnhancedVoiceMailDeleteConfirmations::EncodeL");
TUint8* startPtr = aCurrentPtr;
@@ -6412,7 +6326,7 @@
void CEnhancedVoiceMailDeleteConfirmations::DecodeL(TGsmuLex8& aVoiceMailInfo, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
{
- LOGGSMU1("CEnhancedVoiceMailDeleteConfirmations::DecodeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CENHANCEDVOICEMAILDELETECONFIRMATIONS_DECODEL_1, "CEnhancedVoiceMailDeleteConfirmations::DecodeL");
CEnhancedVoiceMailBoxInformation::DecodeL(aVoiceMailInfo, aCharacterSetConverter, aFs);
--- a/smsprotocols/smsstack/gsmu/src/Gsmumain.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/Gsmumain.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "GsmumainTraces.h"
+#endif
+
#include <e32std.h>
#include "Gsmumain.h"
#include "Gsmuelem.h"
@@ -31,7 +37,7 @@
{
// Ignore in code coverage - panic method
BULLSEYE_OFF
- LOGGSMU2("GSMUPANIC %d", aPanic);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, GSMUMAIN_PANIC_1, "GSMUPANIC %d", aPanic);
_LIT(KGsmuPanic, "GSMU");
User::Panic(KGsmuPanic, aPanic);
--- a/smsprotocols/smsstack/gsmu/src/Gsmumsg.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/Gsmumsg.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "GsmumsgTraces.h"
+#endif
+
#include <gsmumsg.h>
#include "Gsmumain.h"
#include <gsmubuf.h>
@@ -28,10 +34,9 @@
#include <gsmuieoperations.h>
#include <gsmunonieoperations.h>
-#include <logwrap.h> // Used for KLogNullId only
+#include <logwraplimits.h>
#include <e32uid.h>
#include <etelmm.h>
-#include <logwraplimits.h>
#include <emsinformationelement.h>
#include <emsformatie.h>
@@ -58,7 +63,7 @@
*/
EXPORT_C CSmsMessage* CSmsMessage::NewL(RFs& aFs, const TGsmSms& aGsmSms,CSmsBufferBase* aBuffer, TBool aIsRPError,TBool aIsMobileTerminated)
{
- LOGGSMU1("CSmsMessage::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_NEWL_1, "CSmsMessage::NewL()");
CleanupStack::PushL(aBuffer);
CSmsMessage* smsmessage=new(ELeave) CSmsMessage(aFs, aBuffer);
@@ -85,7 +90,7 @@
*/
EXPORT_C CSmsMessage* CSmsMessage::NewL(RFs& aFs, CSmsPDU::TSmsPDUType aType,CSmsBufferBase* aBuffer,TBool aIsRPError)
{
- LOGGSMU1("CSmsMessage::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_NEWL1_1, "CSmsMessage::NewL()");
CleanupStack::PushL(aBuffer);
CSmsMessage* smsmessage=new(ELeave) CSmsMessage(aFs, aBuffer);
@@ -103,7 +108,7 @@
*/
EXPORT_C CSmsMessage::~CSmsMessage()
{
- LOGGSMU1("CSmsMessage::~CSmsMessage()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_DTOR_1, "CSmsMessage::~CSmsMessage()");
delete iSmsPDU;
delete iBuffer;
@@ -129,7 +134,7 @@
*/
EXPORT_C void CSmsMessage::InternalizeWithoutBufferL(RReadStream& aStream)
{
- LOGGSMU1("CSmsMessage::InternalizeWithoutBufferL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1, "CSmsMessage::InternalizeWithoutBufferL()");
InternalizeWithoutBufferAndVersionL(aStream);
InternalizeVersionL(aStream);
@@ -153,7 +158,7 @@
*/
EXPORT_C void CSmsMessage::ExternalizeWithoutBufferL(RWriteStream& aStream) const
{
- LOGGSMU1("CSmsMessage::ExternalizeWithoutBufferL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1, "CSmsMessage::ExternalizeWithoutBufferL()");
ExternalizeWithoutBufferAndVersionL(aStream);
ExternalizeVersionL(aStream);
@@ -173,7 +178,7 @@
*/
EXPORT_C void CSmsMessage::InternalizeL(RReadStream& aStream)
{
- LOGGSMU1("CSmsMessage::InternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_INTERNALIZEL_1, "CSmsMessage::InternalizeL()");
InternalizeWithoutBufferAndVersionL(aStream);
InternalizeBufferL(aStream);
@@ -195,7 +200,7 @@
*/
EXPORT_C void CSmsMessage::ExternalizeL(RWriteStream& aStream) const
{
- LOGGSMU1("CSmsMessage::ExternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_EXTERNALIZEL_1, "CSmsMessage::ExternalizeL()");
ExternalizeWithoutBufferAndVersionL(aStream);
ExternalizeBufferL(aStream);
@@ -216,7 +221,7 @@
*/
EXPORT_C TBool CSmsMessage::TextPresent() const
{
- LOGGSMU1("CSmsMessage::TextPresent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_TEXTPRESENT_1, "CSmsMessage::TextPresent()");
CSmsPDU::TSmsPDUType pdutype=SmsPDU().Type();
return (pdutype==CSmsPDU::ESmsSubmit) ||
@@ -237,7 +242,7 @@
*/
EXPORT_C TInt CSmsMessage::NumMessagePDUsL()
{
- LOGGSMU1("CSmsMessage::NumMessagePDUsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_NUMMESSAGEPDUSL_1, "CSmsMessage::NumMessagePDUsL()");
TInt nummessagepdus=1;
if (IsDecoded())
@@ -258,7 +263,7 @@
nummessagepdus=SmsPDU().NumConcatenatedMessagePDUs();
}
- LOGGSMU2("CSmsMessage::NumMessagePDUsL() returns %d", nummessagepdus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_NUMMESSAGEPDUSL_2, "CSmsMessage::NumMessagePDUsL() returns %d", nummessagepdus);
return nummessagepdus;
} // CSmsMessage::NumMessagePDUsL
@@ -282,7 +287,7 @@
maxmessagelength=maxmessagelength*0xFF;
}
- LOGGSMU2("CSmsMessage::MaxMessageLength() returns %d", maxmessagelength);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_MAXMESSAGELENGTH_1, "CSmsMessage::MaxMessageLength() returns %d", maxmessagelength);
return maxmessagelength;
} // CSmsMessage::MaxMessageLength
@@ -298,7 +303,7 @@
// Ignore in code coverage - not used in SMS stack and not exported
// but cannot be removed as impacts public header.
BULLSEYE_OFF
- LOGGSMU1("CSmsMessage::ConvertedBufferLengthL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1, "CSmsMessage::ConvertedBufferLengthL()");
TInt convertedBufferLength=0;
CSmsAlphabetConverter* converter=CSmsAlphabetConverter::NewLC(*iCharacterSetConverter,iFs,SmsPDU().Alphabet(),BinaryData());
@@ -306,7 +311,7 @@
convertedBufferLength=segmenter->TotalConvertedLengthL(iAdditionalInfo->Alternative7bitEncoding());
CleanupStack::PopAndDestroy(2, converter);
- LOGGSMU2("CSmsMessage::ConvertedBufferLengthL() returns %d", convertedBufferLength);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2, "CSmsMessage::ConvertedBufferLengthL() returns %d", convertedBufferLength);
return convertedBufferLength;
BULLSEYE_RESTORE
@@ -326,7 +331,7 @@
*/
EXPORT_C TInt CSmsMessage::MessageLengthL()
{
- LOGGSMU1("CSmsMessage::MessageLengthL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_MESSAGELENGTHL_1, "CSmsMessage::MessageLengthL()");
TInt messagelength=0;
if (!SmsPDU().TextCompressed())
@@ -345,7 +350,7 @@
EXPORT_C void CSmsMessage::GetEncodingInfoL(TInt& aPdus, TInt& aUnconvertedChars,
TInt& aDowngradedChars, TInt& aFreeUDUnitsInLastPDU)
{
- LOGGSMU1("CSmsMessage::GetEncodingInfoL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_1, "CSmsMessage::GetEncodingInfoL()");
aPdus = 1;
aUnconvertedChars = 0;
@@ -395,10 +400,10 @@
}
}
- LOGGSMU2("CSmsMessage::GetEncodingInfoL(): aPdus=%d", aPdus);
- LOGGSMU2("CSmsMessage::GetEncodingInfoL(): aUnconvertedChars=%d", aUnconvertedChars);
- LOGGSMU2("CSmsMessage::GetEncodingInfoL(): aDowngradedChars=%d", aDowngradedChars);
- LOGGSMU2("CSmsMessage::GetEncodingInfoL(): aFreeUDUnitsInLastPDU=%d", aFreeUDUnitsInLastPDU);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_2, "CSmsMessage::GetEncodingInfoL(): aPdus=%d", aPdus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_3, "CSmsMessage::GetEncodingInfoL(): aUnconvertedChars=%d", aUnconvertedChars);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_4, "CSmsMessage::GetEncodingInfoL(): aDowngradedChars=%d", aDowngradedChars);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETENCODINGINFOL_5, "CSmsMessage::GetEncodingInfoL(): aFreeUDUnitsInLastPDU=%d", aFreeUDUnitsInLastPDU);
} // CSmsMessage::GetEncodingInfoL
@@ -410,7 +415,7 @@
*/
EXPORT_C void CSmsMessage::UserDataSettings(TSmsUserDataSettings& aSettings) const
{
- LOGGSMU1("CSmsMessage::UserDataSettings()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_USERDATASETTINGS_1, "CSmsMessage::UserDataSettings()");
__ASSERT_DEBUG(TextPresent(),Panic(KGsmuPanicTextNotPresent));
aSettings.SetAlphabet(SmsPDU().Alphabet());
@@ -429,7 +434,7 @@
*/
EXPORT_C void CSmsMessage::SetUserDataSettingsL(const TSmsUserDataSettings& aSettings)
{
- LOGGSMU1("CSmsMessage::SetUserDataSettingsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETUSERDATASETTINGSL_1, "CSmsMessage::SetUserDataSettingsL()");
__ASSERT_DEBUG(TextPresent(),Panic(KGsmuPanicTextNotPresent));
SmsPDU().SetAlphabet(aSettings.Alphabet());
@@ -465,7 +470,7 @@
*/
EXPORT_C void CSmsMessage::OptimizeSettingsL(TInt aOptions)
{
- LOGGSMU1("CSmsMessage::OptimizeSettingsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_OPTIMIZESETTINGSL_1, "CSmsMessage::OptimizeSettingsL()");
__ASSERT_DEBUG(TextPresent(),Panic(KGsmuPanicTextNotPresent));
__ASSERT_DEBUG(IsDecoded(),Panic(KGsmuPanicNotDecoded));
@@ -522,7 +527,7 @@
*/
EXPORT_C TSmsEncoding CSmsMessage::Alternative7bitEncoding() const
{
- LOGGSMU1("CSmsMessage::Alternative7bitEncoding()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ALTERNATIVE7BITENCODING_1, "CSmsMessage::Alternative7bitEncoding()");
return iAdditionalInfo->Alternative7bitEncoding();
} // CSmsMessage::Alternative7bitEncoding
@@ -543,7 +548,7 @@
*/
EXPORT_C TInt CSmsMessage::SetAlternative7bitEncoding(TSmsEncoding aEncoding)
{
- LOGGSMU2("CSmsMessage::SetAlternative7bitEncoding(%d)", aEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1, "CSmsMessage::SetAlternative7bitEncoding(%d)", aEncoding);
//
// Get the encoders that would be used for this encoding method.
@@ -578,8 +583,7 @@
*/
void CSmsMessage::MergeAlternative7bitEncoding(TSmsEncoding aEncoding) const
{
- LOGGSMU3("CSmsMessage::MergeAlternative7bitEncoding(): aEncoding=%d (currently %d)",
- aEncoding, iAdditionalInfo->Alternative7bitEncoding());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1, "CSmsMessage::MergeAlternative7bitEncoding(): aEncoding=%d (currently %d)",aEncoding, iAdditionalInfo->Alternative7bitEncoding());
switch (iAdditionalInfo->Alternative7bitEncoding())
{
@@ -639,8 +643,7 @@
}
};
- LOGGSMU2("CSmsMessage::MergeAlternative7bitEncoding(): New encoding=%d",
- iAdditionalInfo->Alternative7bitEncoding());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2, "CSmsMessage::MergeAlternative7bitEncoding(): New encoding=%d",iAdditionalInfo->Alternative7bitEncoding());
} // CSmsMessage::MergeAlternative7bitEncoding
@@ -660,7 +663,7 @@
EXPORT_C TBool CSmsMessage::IsSupportedL(const TDesC& aDes, TInt& aNumberOfUnconvertibleCharacters,
TInt& aIndexOfFirstUnconvertibleCharacter)
{
- LOGGSMU1("[1] CSmsMessage::IsSupportedL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ISSUPPORTEDL_1, "[1] CSmsMessage::IsSupportedL()");
__ASSERT_DEBUG(TextPresent(), Panic(KGsmuPanicTextNotPresent));
@@ -700,7 +703,7 @@
TInt& aNumberRequiringAlternativeEncoding,
TInt& aIndexOfFirstUnconvertibleCharacter) const
{
- LOGGSMU1("[2] CSmsMessage::IsSupportedL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ISSUPPORTEDL1_1, "[2] CSmsMessage::IsSupportedL()");
__ASSERT_DEBUG(TextPresent(), Panic(KGsmuPanicTextNotPresent));
@@ -734,7 +737,7 @@
*/
EXPORT_C void CSmsMessage::EncodeMessagePDUsL(CArrayFix<TGsmSms>& aSmsArray, TInt aReference)
{
- LOGGSMU2("CSmsMessage::EncodeMessagePDUsL(): aReference=%d", aReference);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ENCODEMESSAGEPDUSL_1, "CSmsMessage::EncodeMessagePDUsL(): aReference=%d", aReference);
__ASSERT_DEBUG((aSmsArray.Count()==0),Panic(KGsmuPanicSmsArrayNotEmpty));
@@ -791,7 +794,7 @@
*/
void CSmsMessage::PrepareCommandMessageL()
{
- LOGGSMU1("CSmsMessage::PrepareCommandMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1, "CSmsMessage::PrepareCommandMessageL()");
if (SmsPDU().Type()==CSmsPDU::ESmsCommand)
{
@@ -814,7 +817,7 @@
break;
}
default:
- LOGGSMU2("CSmsMessage::PrepareCommandMessageL,default switch category = %d, id = %d", category);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2, "CSmsMessage::PrepareCommandMessageL,default switch category = %d", category);
break;
}
}
@@ -833,7 +836,7 @@
*/
EXPORT_C void CSmsMessage::DecodeMessagePDUsL(const CArrayFix<TGsmSms>& aSmsArray)
{
- LOGGSMU2("CSmsMessage::DecodeMessagePDUsL(): PDUs=%d", aSmsArray.Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_DECODEMESSAGEPDUSL_1, "CSmsMessage::DecodeMessagePDUsL(): PDUs=%d", aSmsArray.Count());
TInt count=aSmsArray.Count();
SetIsComplete(ETrue);
@@ -891,7 +894,7 @@
*/
EXPORT_C void CSmsMessage::DecodePartialCompleteMessagePDUsL(const CArrayFix<TGsmSms>& aSmsArray, TBool aLastPartialCompleteMsg)
{
- LOGGSMU2("CSmsMessage::DecodePartialCompleteMessagePDUsL(): PDUs=%d", aSmsArray.Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1, "CSmsMessage::DecodePartialCompleteMessagePDUsL(): PDUs=%d", aSmsArray.Count());
TInt count=aSmsArray.Count();
SetIsComplete(EFalse);
@@ -978,7 +981,7 @@
void CSmsMessage::ConstructL(const TGsmSms& aGsmSms, TBool aIsRPError,TBool aIsMobileTerminated)
{
- LOGGSMU1("CSmsMessage::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CONSTRUCTL_1, "CSmsMessage::ConstructL()");
iCharacterSetConverter=CCnvCharacterSetConverter::NewL();
iInformationElementArray = new (ELeave) RPointerArray<CEmsInformationElement>(8);
@@ -1037,8 +1040,7 @@
void CSmsMessage::ConstructL(CSmsPDU::TSmsPDUType aType,TBool aIsRPError)
{
- LOGGSMU3("CSmsMessage::ConstructL(): aType=%d, aIsRPError=%d", (TInt) aType,
- aIsRPError);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CONSTRUCTL1_1, "CSmsMessage::ConstructL(): aType=%d, aIsRPError=%d", (TInt) aType,aIsRPError);
iCharacterSetConverter=CCnvCharacterSetConverter::NewL();
iInformationElementArray = new (ELeave) RPointerArray<CEmsInformationElement>(2);
@@ -1063,7 +1065,7 @@
*/
TInt CSmsMessage::NumMessageEmsPDUsL()
{
- LOGGSMU1("CSmsMessage::NumMessageEmsPDUsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1, "CSmsMessage::NumMessageEmsPDUsL()");
//
// Clear the concatenated flag, EncodeBufferL() will add it if needed.
@@ -1090,7 +1092,7 @@
CleanupStack::PopAndDestroy(tmpArray);
- LOGGSMU2("CSmsMessage::NumMessageEmsPDUsL() returns %d", numMsgs);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2, "CSmsMessage::NumMessageEmsPDUsL() returns %d", numMsgs);
return numMsgs;
} // CSmsMessage::NumMessageEmsPDUsL
@@ -1108,7 +1110,7 @@
*/
void CSmsMessage::ResetWorkingPDUL()
{
- LOGGSMU1("CSmsMessage::ResetWorkingPDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_RESETWORKINGPDUL_1, "CSmsMessage::ResetWorkingPDUL()");
CSmsUserData& uData = SmsPDU().UserData();
//remove non-mandatory EMS information elements
@@ -1135,8 +1137,7 @@
RPointerArray<CEmsInformationElement>& aCorrectedFormattingIEArray,
TUint aCharsAlreadyAdded)
{
- LOGGSMU3("CSmsMessage::CorrectFormattingL(): aCharsAddedToCurrentPDU=%d, aCharsAlreadyAdded=%d",
- aCharsAddedToCurrentPDU, aCharsAlreadyAdded);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CORRECTFORMATTINGL_1, "CSmsMessage::CorrectFormattingL(): aCharsAddedToCurrentPDU=%u, aCharsAlreadyAdded=%u",aCharsAddedToCurrentPDU, aCharsAlreadyAdded);
CSmsUserData& uData = SmsPDU().UserData();
for (TInt a= 0; a < uData.NumInformationElements(); a++)
@@ -1163,7 +1164,7 @@
CleanupStack::PushL(newie);
newie->SetFormatLength(oldFormatLen - newFormatLen);
newie->SetStartPosition(aCharsAlreadyAdded+aCharsAddedToCurrentPDU);
- LOGGSMU2("CSmsMessage::CorrectFormattingL",aCorrectedFormattingIEArray.Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CORRECTFORMATTINGL_2, "CSmsMessage::CorrectFormattingL Count=%d",aCorrectedFormattingIEArray.Count());
aCorrectedFormattingIEArray.Append(newie);
CleanupStack::Pop(newie);
}
@@ -1175,7 +1176,7 @@
void CSmsMessage::CorrectFormattingInSinglePDUL()
{
- LOGGSMU1("CSmsMessage::CorrectFormattingInSinglePDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1, "CSmsMessage::CorrectFormattingInSinglePDUL()");
CSmsUserData& uData = SmsPDU().UserData();
for (TInt a= 0; a < uData.NumInformationElements(); a++)
@@ -1209,8 +1210,7 @@
*/
void CSmsMessage::AddCurrentPDUToPDUArrayL(TBool aDoEncode)
{
- LOGGSMU2("CSmsMessage::AddCurrentPDUToPDUArrayL(): Adding PDU number %d",
- iAdditionalInfo->SmsPDUArray().Count() + 1);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1, "CSmsMessage::AddCurrentPDUToPDUArrayL(): Adding PDU number %d",iAdditionalInfo->SmsPDUArray().Count() + 1);
//
// Maximum number of PDU is 255, so if we have that already then we cannot
@@ -1261,7 +1261,7 @@
TBool CSmsMessage::AddIEToUserDataL(CEmsInformationElement* aIE, TInt aCharsAlreadyAdded,TUint& aCharsAddedToCurrentPDU,CSmsEMSBufferSegmenter& aSeg)
{
- LOGGSMU1("CSmsMessage::AddIEToUserDataL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDIETOUSERDATAL_1, "CSmsMessage::AddIEToUserDataL()");
TBool ieAdded=EFalse;
if (SmsPDU().UserData().EmsInformationElementWillFitL(aIE,aSeg,aCharsAddedToCurrentPDU))
@@ -1288,7 +1288,7 @@
*/
TInt CSmsMessage::FillPduL(CSmsEMSBufferSegmenter& aSeg, TInt aNumChars, TSmsEncoding aEncoding)
{
- LOGGSMU1("CSmsMessage::FillPduL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_FILLPDUL_1, "CSmsMessage::FillPduL()");
TUint maxUDUnitsREmaining=SmsPDU().UserData().MaxPackedUDUnitsInBodyRemaining();
@@ -1333,7 +1333,7 @@
void CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL(TSmsInformationElementCategories::TInformationElementCategory aCategory,
TBool aMandatoryInPDU, TBool aDoEncode)
{
- LOGGSMU1("CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1, "CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL()");
TUint numberOfInformationElements = iAdditionalInfo->NumberOfControlInformationElements(aCategory);
@@ -1365,7 +1365,7 @@
TBool canFit = SmsPDU().UserData().ControlInformationElementWillFitL(cloneInformationElement);
if (canFit == EFalse)
{
- LOGGSMU1("CSmsMessage::AddControlInformationElementsToMultiSegmentMessage, IE too bit to fit in any PDUL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2, "CSmsMessage::AddControlInformationElementsToMultiSegmentMessage, IE too bit to fit in any PDUL");
User::Leave(KErrArgument);
}
i--;
@@ -1389,7 +1389,7 @@
*/
void CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL(TBool aDoEncode)
{
- LOGGSMU1("CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL() 1");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1, "CSmsMessage::AddControlInformationElementsToMultiSegmentMessageL() 1");
TBool mandatoryInEachPDU = ETrue;
AddControlInformationElementsToMultiSegmentMessageL(TSmsInformationElementCategories::ECtrlMandatoryIn1stPDUOnly,
@@ -1425,13 +1425,13 @@
TUint& aCurrEMSIEno,
TUint& aCharsAlreadyAdded)
{
- LOGGSMU1("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL()");
TUint startPosition=0;
// number of chars added to the current PDU
TUint no=iInformationElementArray->Count();
- LOGGSMU2("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL no of IE %d",no);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL no of IE %d",no);
CEmsInformationElement* ie = NULL;
TUint msgLen=iBuffer->Length();
TUint filledChars=0;
@@ -1472,7 +1472,7 @@
aCharsAddedToCurrentPDU+=filledChars;
}
- LOGGSMU2("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: filled %d chars", filledChars);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: filled %d chars", filledChars);
if (aCharsAddedToCurrentPDU==startPosition)
{
@@ -1492,7 +1492,7 @@
else
{
// Information Element will not fit send PDU
- LOGGSMU1("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: ie will not fit send Message");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: ie will not fit send Message");
CorrectFormattingL(aCharsAddedToCurrentPDU,aCorrectedFormatingIEArray,aCharsAlreadyAdded);
aCharsAlreadyAdded += aCharsAddedToCurrentPDU;
@@ -1513,7 +1513,7 @@
else
{
// native chars upto start position will not fit send PDu.
- LOGGSMU1("CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: PDU is filled with chars sending");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5, "CSmsMessage::AddEMSInformationElementsToMultiSegmentMessageL: PDU is filled with chars sending");
CorrectFormattingL(aCharsAddedToCurrentPDU,aCorrectedFormatingIEArray,aCharsAlreadyAdded);
@@ -1551,7 +1551,7 @@
TBool CSmsMessage::AddEMSInformationElementsToSingleSegmentMessageL(CSmsEMSBufferSegmenter& aSegmenter,
TSmsEncoding aEncoding)
{
- LOGGSMU1("CSmsMessage::AddEMSInformationElementsToSingleSegmentMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1, "CSmsMessage::AddEMSInformationElementsToSingleSegmentMessageL()");
TUint charsAddedToCurrentPDU=0;
TUint numOfEmsIE=iInformationElementArray->Count();
@@ -1608,7 +1608,7 @@
TInt& aUnconvertedChars, TInt& aDowngradedChars,
TInt& aFreeUDUnitsInLastPDU, TBool aDoEncode)
{
- LOGGSMU1("CSmsMessage::EncodeBufferL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_1, "CSmsMessage::EncodeBufferL()");
aUnconvertedChars = 0;
aDowngradedChars = 0;
@@ -1712,13 +1712,13 @@
//
while (segmenter->MoreL())
{
- LOGGSMU1("CSmsMessage::EncodeBufferL - there is MoreL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_2, "CSmsMessage::EncodeBufferL - there is MoreL");
//
// Calculate the space left to use in this PDU...
//
TInt size = SmsPDU().UserData().MaxPackedUDUnitsInBodyRemaining();
- LOGGSMU2("CSmsMessage::EncodeBufferL - remaining size in PDU is %d",size);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_3, "CSmsMessage::EncodeBufferL - remaining size in PDU is %d",size);
//
// While there is no space, correct the formatting (which may
@@ -1755,7 +1755,7 @@
// Add any elements that can be placed now (from previous
// PDUs and above)...
//
- LOGGSMU3("CSmsMessage::EncodeBufferL: IE count %d corrected count %d",iInformationElementArray->Count(),correctedFormatingIEArray.Count() );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_4, "CSmsMessage::EncodeBufferL: IE count %d corrected count %d",iInformationElementArray->Count(),correctedFormatingIEArray.Count() );
if ((TUint)iInformationElementArray->Count() > currEMSIEno ||
correctedFormatingIEArray.Count() > 0)
{
@@ -1769,7 +1769,7 @@
// Calculate the space left remaining in this new PDU...
//
size = SmsPDU().UserData().MaxPackedUDUnitsInBodyRemaining();
- LOGGSMU2("CSmsMessage::EncodeBufferL - remaining size in PDU is %d",size);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_5, "CSmsMessage::EncodeBufferL - remaining size in PDU is %d",size);
}
//
@@ -1780,7 +1780,7 @@
SmsPDU().UserData().AppendBodyL(ptr);
TUint charsInSegment= isUnicode ? ptr.Length()/2 : ptr.Length();
- LOGGSMU2("CSmsMessage::EncodeBufferL: segmenting added %d chars", charsInSegment);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_6, "CSmsMessage::EncodeBufferL: segmenting added %d chars", charsInSegment);
//
// At this point the working PDU is either full (e.g. we filled the
@@ -1793,7 +1793,7 @@
charsAdded2CurrentPDU+=charsInSegment;
CorrectFormattingL(charsAdded2CurrentPDU, correctedFormatingIEArray, charsAlreadyAdded);
charsAlreadyAdded+=charsAdded2CurrentPDU;
- LOGGSMU2("CSmsMessage::EncodeBufferL(): charsAlreadyAdded=%d", charsAlreadyAdded);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_7, "CSmsMessage::EncodeBufferL(): charsAlreadyAdded=%d", charsAlreadyAdded);
//
// Now store this PDU and reset the working PDU...
@@ -1816,8 +1816,7 @@
// Add any elements that can be placed now given we have a new
// empty PDU...
//
- LOGGSMU3("CSmsMessage::EncodeBufferL: IE count %d corrected count %d",
- iInformationElementArray->Count(), correctedFormatingIEArray.Count() );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_8, "CSmsMessage::EncodeBufferL: IE count %d corrected count %d",iInformationElementArray->Count(), correctedFormatingIEArray.Count() );
if ((TUint)iInformationElementArray->Count() > currEMSIEno ||
correctedFormatingIEArray.Count() > 0)
{
@@ -1826,11 +1825,11 @@
correctedFormatingIEArray,
currEMSIEno, charsAlreadyAdded);
}
- LOGGSMU1("CSmsMessage::EncodeBufferL end Moreloop");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_9, "CSmsMessage::EncodeBufferL end Moreloop");
}
CleanupStack::PopAndDestroy(buf);
- LOGGSMU1("CSmsMessage::EncodeBufferL - last PDU");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_10, "CSmsMessage::EncodeBufferL - last PDU");
//
// This is the last PDU. We need to check if there is a partial PDU left over
@@ -1865,7 +1864,7 @@
//
TInt numPDUs = iAdditionalInfo->SmsPDUArray().Count();
- LOGGSMU2("CSmsMessage::EncodeBufferL number of PDUs: %d", iAdditionalInfo->SmsPDUArray().Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEBUFFERL_11, "CSmsMessage::EncodeBufferL number of PDUs: %d", iAdditionalInfo->SmsPDUArray().Count());
if (aDoEncode)
{
@@ -1956,7 +1955,7 @@
TBool CSmsMessage::EncodeIntoSinglePDUL(CArrayFix<TGsmSms>& aSmsArray, TInt& aUnconvertedChars,
TInt& aDowngradedChars, TInt& aFreeUDUnitsInLastPDU)
{
- LOGGSMU1("CSmsMessage::EncodeIntoSinglePDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1, "CSmsMessage::EncodeIntoSinglePDUL()");
__ASSERT_DEBUG((aSmsArray.Count()==0),Panic(KGsmuPanicSmsArrayNotEmpty));
@@ -2003,7 +2002,7 @@
break;
}
}
- LOGGSMU2("CSmsMessage::EncodeIntoSinglePDUL, ctrl elem len = %d", ieLength);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2, "CSmsMessage::EncodeIntoSinglePDUL, ctrl elem len = %d", ieLength);
CEmsInformationElement* emsIE =NULL;
for (TInt num=0; num<iInformationElementArray->Count();num++)
@@ -2018,7 +2017,7 @@
if( msgLength > remainInBody) return EFalse;
- LOGGSMU4("CSmsMessage::EncodeIntoSinglePDUL, ie len = %d, remainInBody = %d, msgLength = %d", ieLength, msgLength, remainInBody);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3, "CSmsMessage::EncodeIntoSinglePDUL, ie len = %d, remainInBody = %d, msgLength = %d", ieLength, msgLength, remainInBody);
// add all control information elements into working PDU.
//
for (TUint8 category = 0; category < TSmsInformationElementCategories::ENumberOfCategories; category++)
@@ -2136,7 +2135,7 @@
*/
EXPORT_C TBool CSmsMessage::EncodeIntoSinglePDUL(CArrayFix<TGsmSms>& aSmsArray)
{
- LOGGSMU1("CSmsMessage::EncodeIntoSinglePDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1, "CSmsMessage::EncodeIntoSinglePDUL()");
TInt unconvertedChars, downgradedChars, freeUDUnitsInLastPDU;
@@ -2219,7 +2218,7 @@
void CSmsMessage::DecodeBufferL(CArrayPtr<CSmsPDU>& aSmsPDUArray,
CSmsBufferBase& aBuffer)
{
- LOGGSMU1("CSmsMessage::DecodeBufferL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_DECODEBUFFERL_1, "CSmsMessage::DecodeBufferL()");
iInformationElementArray->ResetAndDestroy();
@@ -2281,7 +2280,7 @@
void CSmsMessage::DecodeOnlyTextL(CArrayPtr<CSmsPDU>& aSmsPDUArray,
CSmsBufferBase& aBuffer)
{
- LOGGSMU1("CSmsMessage::DecodeOnlyTextL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_DECODEONLYTEXTL_1, "CSmsMessage::DecodeOnlyTextL()");
for (TInt i=0; i<aSmsPDUArray.Count(); i++)
{
@@ -2308,7 +2307,7 @@
*/
void CSmsMessage::AddIncompleteMessageInfoL(TInt aStartPDU, TInt aEndPDU, TBool aLastPartialCompleteMsg)
{
- LOGGSMU1("CSmsMessage::AddIncompleteMessageInfoL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1, "CSmsMessage::AddIncompleteMessageInfoL()");
CIncompleteClass0MessageInfo& incompleteClass0MsgInfo = (CIncompleteClass0MessageInfo&) iAdditionalInfo->GetNonIEOperationL(ESmsIncompleteClass0MessageParameter);
incompleteClass0MsgInfo.SetVersion(CIncompleteClass0MessageInfo::ESmsIncompleteClass0MessageV0);
@@ -2332,7 +2331,7 @@
void CSmsMessage::InstallControlInformationElementsL(CSmsUserData& aUserData, TInt aSegmentSequenceNum)
{
// Installs all the information elements within the subsequent PDUs.
- LOGGSMU1("CSmsMessage::InstallControlInformationElements()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1, "CSmsMessage::InstallControlInformationElements()");
CSmsMessageAdditionalAttributes::CSmsStatusReportScheme& scheme = iAdditionalInfo->GetStatusReportScheme();
@@ -2347,8 +2346,7 @@
switch (category)
{
case TSmsInformationElementCategories::ECtrlMandatoryInEveryPDUMultipleInstancesPerPDU: // e.g. Special SMS Message Indication
- LOGGSMU2("CSmsMessage::InstallControlInformationElements \
- ECtrlMandatoryInEveryPDUMultipleInstancesPerPDU id = %d", ie.Identifier());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2, "CSmsMessage::InstallControlInformationElements \ECtrlMandatoryInEveryPDUMultipleInstancesPerPDU id = %d", ie.Identifier());
if (ie.Identifier()== CSmsInformationElement::ESmsIEISpecialSMSMessageIndication)
{
@@ -2380,15 +2378,14 @@
else
{
// Unknown category.
- LOGGSMU3("CSmsMessage::InstallControlInformationElementsL category = %d, id = %d", category, ie.Identifier());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3, "CSmsMessage::InstallControlInformationElementsL category = %d, id = %d", category, ie.Identifier());
User::Leave(KErrArgument);
}
break;
case TSmsInformationElementCategories::ECtrlMandatoryIn1stPDUOnly:
case TSmsInformationElementCategories::ECtrlSingleInstanceOnly:
{
- LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryIn1stPDUOnly "
- "ECtrlSingleInstanceOnly, id = %d", ie.Identifier());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryIn1stPDUOnly ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier());
TUint index = 0;
if (iAdditionalInfo->Find1stInstanceOfControlInformationElement(ie.Identifier(), index))
@@ -2413,8 +2410,7 @@
}
case TSmsInformationElementCategories::ECtrlMandatoryInEveryPDUAndWithIdenticalValues:
{
- LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUAndWithIdenticalValues "
- "ECtrlSingleInstanceOnly, id = %d", ie.Identifier());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUAndWithIdenticalValues ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier());
TInt index = 0;
if (SmsPDU().UserData().InformationElementIndex(ie.Identifier(),index))
{
@@ -2438,8 +2434,7 @@
case TSmsInformationElementCategories::ECtrlMultipleInstancesAllowed:
{
- LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUAndWithIdenticalValues "
- "ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUAndWithIdenticalValues ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
CSmsInformationElement* cloneInformationElement = CSmsInformationElement::NewL( ie.Identifier(),ie.Data() );
CleanupStack::PushL(cloneInformationElement);
@@ -2448,8 +2443,7 @@
break;
}
case TSmsInformationElementCategories::ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU:
- LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU "
- "ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
if (ie.Identifier() == CSmsInformationElement::ESmsIEISMSCControlParameters)
{
@@ -2476,12 +2470,11 @@
// or left as is.
break;
case TSmsInformationElementCategories::EEmsInformationElement:
- LOGGSMU2("CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU "
- "ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8, "CSmsMessage::InstallControlInformationElements ECtrlMandatoryInEveryPDUButWithValueSpecificToPDU ""ECtrlSingleInstanceOnly, id = %d", ie.Identifier() );
// Will be handled in the method InstallEmsInformationElements, nothing to do here
break;
default:
- LOGGSMU3("CSmsMessage::InstallControlInformationElementsToMultiSegmentMessageL, default switch, category = %d, id= %d", category, ie.Identifier() );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9, "CSmsMessage::InstallControlInformationElementsToMultiSegmentMessageL, default switch, category = %d, id= %d", category, ie.Identifier() );
break;
}
}
@@ -2499,7 +2492,7 @@
void CSmsMessage::InstallEmsInformationElementsL(CSmsUserData& aUserData, TInt aCharsAlreadyAdded)
{
// Installs all the information elements within the subsequent PDUs.
- LOGGSMU1("CSmsMessage::InstallEmsInformationElements()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1, "CSmsMessage::InstallEmsInformationElements()");
CSmsInformationElement::TSmsInformationElementIdentifier id;
CEmsInformationElement* newIE =NULL;
@@ -2547,7 +2540,7 @@
// but cannot be removed as impacts public header.
BULLSEYE_OFF
// Installs all the information elements within the subsequent PDUs.
- LOGGSMU1("CSmsMessage::InstallEmsInformationElements()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1, "CSmsMessage::InstallEmsInformationElements()");
CSmsInformationElement::TSmsInformationElementIdentifier id;
CEmsInformationElement* newIE=NULL;
@@ -2673,7 +2666,7 @@
*/
EXPORT_C void CSmsMessage::AddEMSInformationElementL(const CEmsInformationElement& aEmsIE)
{
- LOGGSMU1("CSmsMessage::AddEMSInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1, "CSmsMessage::AddEMSInformationElementL()");
if(aEmsIE.StartPosition() > (TUint)iBuffer->Length())
{
@@ -2715,7 +2708,7 @@
TBool CSmsMessage::CanBeRemoved(const CEmsInformationElement& aIE, const TUint aIEIndex)
{
- LOGGSMU1("CSmsMessage::CanBeRemoved()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CANBEREMOVED_1, "CSmsMessage::CanBeRemoved()");
TBool ret=ETrue;
if(CSmsInformationElement::ESmsEnhancedODI == aIE.Identifier())
@@ -2740,7 +2733,7 @@
}
}
- LOGGSMU2("CSmsMessage::CanBeRemoved() returns %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CANBEREMOVED_2, "CSmsMessage::CanBeRemoved() returns %d", ret);
return ret;
} // CSmsMessage::CanBeRemoved
@@ -2753,7 +2746,7 @@
*/
void CSmsMessage::AddEmsUserPromptL(const CEmsUserPrompt& aUserPromptIE)
{
- LOGGSMU1("CSmsMessage::AddEmsUserPromptL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSUSERPROMPTL_1, "CSmsMessage::AddEmsUserPromptL()");
if(aUserPromptIE.ObjectCount() == 0 )User::Leave(KErrArgument);
@@ -2830,7 +2823,7 @@
*/
void CSmsMessage::AddEmsObjectDistributionL(const CEmsObjectDistribution& aObjectDistributionIE)
{
- LOGGSMU1("CSmsMessage::AddEmsObjectDistributionL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1, "CSmsMessage::AddEmsObjectDistributionL()");
TUint count=iInformationElementArray->Count();
TUint objectDistributionStartPosition=aObjectDistributionIE.StartPosition();
@@ -2882,7 +2875,7 @@
*/
EXPORT_C CEmsInformationElement* CSmsMessage::RemoveEMSInformationElementL(const TUint aStartPosition,const TSmsId aEmsId)
{
- LOGGSMU1("CSmsMessage::RemoveEMSInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1, "CSmsMessage::RemoveEMSInformationElementL()");
CEmsInformationElement* emsIE=NULL;
CEmsInformationElement* ie=NULL;
@@ -2920,7 +2913,7 @@
*/
EXPORT_C RPointerArray<CEmsInformationElement>* CSmsMessage::RemoveEMSInformationElementsL(const TUint aStartPosition,const TSmsId aEmsId)
{
- LOGGSMU1("CSmsMessage::RemoveEMSInformationElementsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1, "CSmsMessage::RemoveEMSInformationElementsL()");
CEmsInformationElement* ie=NULL;
RPointerArray<CEmsInformationElement>* selectedIEs = NULL;
@@ -2951,7 +2944,7 @@
*/
EXPORT_C void CSmsMessage::ResetEMSL()
{
- LOGGSMU1("CSmsMessage::ResetEMSL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_RESETEMSL_1, "CSmsMessage::ResetEMSL()");
iInformationElementArray->ResetAndDestroy();
} // CSmsMessage::ResetEMSL
@@ -2965,7 +2958,7 @@
*/
EXPORT_C const RPointerArray<const CEmsInformationElement>& CSmsMessage::GetEMSInformationElementsL()const
{
- LOGGSMU1("CSmsMessage::GetEMSInformationElementsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1, "CSmsMessage::GetEMSInformationElementsL()");
return (const RPointerArray<const CEmsInformationElement>&)(*iInformationElementArray);
} // CSmsMessage::GetEMSInformationElementsL
@@ -2973,7 +2966,7 @@
void CSmsMessage::UpdateUserPromptAndODIElementsStartPosition()
{
- LOGGSMU1("CSmsMessage::UpdateUserPromptAndODIElementsStartPosition()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1, "CSmsMessage::UpdateUserPromptAndODIElementsStartPosition()");
TUint num=iInformationElementArray->Count();
TInt startPosition=-1;
@@ -3001,7 +2994,7 @@
TInt CSmsMessage::AddReceivedEmsInformationElement(CEmsInformationElement* aEmsIE)
{
- LOGGSMU1("CSmsMessage::AddReceivedEmsInformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1, "CSmsMessage::AddReceivedEmsInformationElement()");
TInt ret=KErrNone;
if(CSmsInformationElement::ESmsEnhancedUserPromptIndicator == aEmsIE->Identifier() || CSmsInformationElement::ESmsEnhancedODI == aEmsIE->Identifier())
@@ -3034,7 +3027,7 @@
*/
EXPORT_C void CSmsMessage::UpdateSlotsL(TDesC8& aDesc)
{
- LOGGSMU1("CSmsMessage::UpdateSlotsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_UPDATESLOTSL_1, "CSmsMessage::UpdateSlotsL()");
TGsmSmsSlotEntry newSlot;
@@ -3077,7 +3070,7 @@
*/
EXPORT_C void CSmsMessage::CopyEmsElementsL(CSmsMessage& aToMessage) const
{
- LOGGSMU1("CSmsMessage::CopyEmsElementsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_COPYEMSELEMENTSL_1, "CSmsMessage::CopyEmsElementsL()");
// CSmsMessage extended EMS API method creates array of references to EMS elements in
// the source message
@@ -3099,7 +3092,7 @@
*/
EXPORT_C void CSmsMessage::AddSlotL(const TGsmSmsSlotEntry& aSlot)
{
- LOGGSMU1("CSmsMessage::AddSlotL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDSLOTL_1, "CSmsMessage::AddSlotL()");
TInt count = iSlotArray.Count();
TInt i(0);
@@ -3109,8 +3102,8 @@
if(aSlot.iIndex == iSlotArray[i].iIndex)found=ETrue;
else ++i;
}
- LOGGSMU3("CSmsMessage::AddSlotL current no in: %d, adds index %d", count,aSlot.iIndex );
- LOGGSMU3("found %d at position %d",found,i);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDSLOTL_2, "CSmsMessage::AddSlotL current no in: %d, adds index %d", count,aSlot.iIndex );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDSLOTL_3, "found %d at position %d",found,i);
iSlotArray.AppendL(aSlot);
} // CSmsMessage::AddSlotL
@@ -3119,7 +3112,7 @@
*/
EXPORT_C TBool CSmsMessage::MatchSlots(const CArrayFixFlat<TGsmSmsSlotEntry>& aSlotArray)
{
- LOGGSMU1("CSmsMessage::MatchSlots()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_MATCHSLOTS_1, "CSmsMessage::MatchSlots()");
TBool match = EFalse;
TInt count = aSlotArray.Count();
@@ -3180,7 +3173,7 @@
void CSmsMessage::InstallEmailHeaderInformationElementL(CSmsUserData& aUserData,TInt& aHeaderLength)
{
// Installs all the information elements within the subsequent PDUs.
- LOGGSMU1("CSmsMessage::InstallEmailHeaderInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1, "CSmsMessage::InstallEmailHeaderInformationElementL()");
CSmsInformationElement::TSmsInformationElementIdentifier id;
@@ -3209,7 +3202,7 @@
// but cannot be removed as impacts public header.
BULLSEYE_OFF
// Installs all the information elements within the subsequent PDUs.
- LOGGSMU1("CSmsMessage::InstallEmailHeaderInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1, "CSmsMessage::InstallEmailHeaderInformationElementL()");
CSmsInformationElement::TSmsInformationElementIdentifier id;
@@ -3240,7 +3233,7 @@
*/
EXPORT_C void CSmsMessage::AddEmailHeaderL(const TDesC& aEmailHeader, const TDesC& aEmailBody)
{
- LOGGSMU1("CSmsMessage::AddEmailHeaderL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ADDEMAILHEADERL_1, "CSmsMessage::AddEmailHeaderL()");
if(IsEmailHeader())
User::Leave(KErrAlreadyExists);
@@ -3288,7 +3281,7 @@
*/
EXPORT_C TBool CSmsMessage::IsEmailHeader() const
{
- LOGGSMU1("CSmsMessage::IsEmailHeader()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_ISEMAILHEADER_1, "CSmsMessage::IsEmailHeader()");
TInt emailIndex;
return SmsPDU().UserData().InformationElementIndex(CSmsInformationElement::ESmsIEIRFC822EmailHeader,emailIndex);
@@ -3307,7 +3300,7 @@
*/
EXPORT_C TBool CSmsMessage::GetEmailHeaderL(HBufC** aEmailHeader,HBufC** aEmailBody)
{
- LOGGSMU1("CSmsMessage::GetEmailHeaderL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETEMAILHEADERL_1, "CSmsMessage::GetEmailHeaderL()");
if(IsEmailHeader())
{
@@ -3354,7 +3347,7 @@
*/
EXPORT_C TTimeIntervalSeconds CSmsMessage::UTCOffset() const
{
- LOGGSMU1("CSmsMessage::UTCOffset()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_UTCOFFSET_1, "CSmsMessage::UTCOffset()");
TUint timeZoneOffset = ((iFlags & ESmsUTCOffsetSecondGranularityMask) >> ESecondBitOffset);
@@ -3380,7 +3373,7 @@
*/
EXPORT_C TBool CSmsMessage::SetUTCOffset(const TTimeIntervalSeconds& aTimeOffset)
{
- LOGGSMU1("CSmsMessage::SetUTCOffset()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETUTCOFFSET_1, "CSmsMessage::SetUTCOffset()");
TBool rc = ETrue;
@@ -3403,7 +3396,7 @@
}
else
{
- LOGGSMU2("CSmsMessage::SetUTCOffset offset [out of range] = %d",timeOffset);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETUTCOFFSET_2, "CSmsMessage::SetUTCOffset offset [out of range] = %d",timeOffset);
rc = EFalse;
}
@@ -3417,7 +3410,7 @@
*/
EXPORT_C TInt CSmsMessage::Version()
{
- LOGGSMU1("CSmsMessage::Version()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_VERSION_1, "CSmsMessage::Version()");
return iVersion;
} // CSmsMessage::Version
@@ -3433,7 +3426,7 @@
*/
EXPORT_C TInt CSmsMessage::SetVersion(TInt aVersion)
{
- LOGGSMU2("CSmsMessage::SetVersion()", aVersion);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETVERSION_1, "CSmsMessage::SetVersion(), version = %d", aVersion);
if((aVersion>=ESmsMessageV0) && (aVersion<=ESmsMessageV4))
{
@@ -3456,7 +3449,7 @@
*/
EXPORT_C void CSmsMessage::InternalizeWithoutBufferAndVersionL(RReadStream& aStream)
{
- LOGGSMU1("CSmsMessage::InternalizeWithoutBufferAndVersionL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1, "CSmsMessage::InternalizeWithoutBufferAndVersionL()");
iFlags=aStream.ReadInt32L();
iStatus=(NMobileSmsStore::TMobileSmsStoreStatus) aStream.ReadInt32L();
@@ -3496,7 +3489,7 @@
*/
EXPORT_C void CSmsMessage::ExternalizeWithoutBufferAndVersionL(RWriteStream& aStream) const
{
- LOGGSMU1("CSmsMessage::ExternalizeWithoutBufferAndVersionL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1, "CSmsMessage::ExternalizeWithoutBufferAndVersionL()");
aStream.WriteInt32L(iFlags);
aStream.WriteInt32L(iStatus);
@@ -3592,11 +3585,11 @@
*/
EXPORT_C CSmsIEOperation& CSmsMessage::GetOperationsForIEL(CSmsInformationElement::TSmsInformationElementIdentifier aId) const
{
- LOGGSMU1("CSmsMessage::GetOperationsForIEL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETOPERATIONSFORIEL_1, "CSmsMessage::GetOperationsForIEL()");
if (iVersion < CSmsMessage::ESmsMessageV1)
{
- LOGGSMU2("CSmsMessage::GetOperationsForIEL, Operation not supported, Msg Version %d", iVersion);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETOPERATIONSFORIEL_2, "CSmsMessage::GetOperationsForIEL, Operation not supported, Msg Version %d", iVersion);
User::Leave(KErrNotSupported);
}
@@ -3605,11 +3598,11 @@
EXPORT_C CSmsNonIEOperation& CSmsMessage::GetOperationsForNonIEL(TSmsNonIEIdentifier aId) const
{
- LOGGSMU1("CSmsMessage::GetOperationsForNonIEL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETOPERATIONSFORNONIEL_1, "CSmsMessage::GetOperationsForNonIEL");
if (iVersion < CSmsMessage::ESmsMessageV2)
{
- LOGGSMU2("GetOperationsForNonIEL not supported, Msg Version %d", iVersion);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_GETOPERATIONSFORNONIEL_2, "GetOperationsForNonIEL not supported, Msg Version %d", iVersion);
User::Leave(KErrNotSupported);
}
@@ -3619,7 +3612,7 @@
void CSmsMessage::CreateControlIEOperationsClassesL()
{
- LOGGSMU1("CSmsMessage::CreateControlIEOperationsClassesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1, "CSmsMessage::CreateControlIEOperationsClassesL()");
CSmsIEOperation* iEOperation = NULL;
@@ -3676,7 +3669,7 @@
*/
EXPORT_C void CSmsMessage::SetDecodedOnSIM(TBool aOnSim)
{
- LOGGSMU2("CSmsMessage::SetDecodedOnSIM(): %d", aOnSim);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETDECODEDONSIM_1, "CSmsMessage::SetDecodedOnSIM(): %d", aOnSim);
if (aOnSim)
{
@@ -3704,7 +3697,7 @@
*/
EXPORT_C TBool CSmsMessage::DecodedOnSim()
{
- LOGGSMU1("CSmsMessage::DecodedOnSim()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_DECODEDONSIM_1, "CSmsMessage::DecodedOnSim()");
if (iFlags & EDecodedOnSimBit)
{
@@ -3730,7 +3723,7 @@
*/
EXPORT_C void CSmsMessage::SetForwardToClient(TBool aForward)
{
- LOGGSMU2("CSmsMessage::SetForwardToClient(): %d", aForward);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_SETFORWARDTOCLIENT_1, "CSmsMessage::SetForwardToClient(): %d", aForward);
if (aForward)
{
@@ -3757,7 +3750,7 @@
*/
EXPORT_C TBool CSmsMessage::ForwardToClient()
{
- LOGGSMU1("CSmsMessage::ForwardToClient()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSMESSAGE_FORWARDTOCLIENT_1, "CSmsMessage::ForwardToClient()");
if (iFlags & EForwardToClientBit)
{
--- a/smsprotocols/smsstack/gsmu/src/gsmuieoperations.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmuieoperations.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -13,6 +13,12 @@
// Description:
//
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "gsmuieoperationsTraces.h"
+#endif
+
#include "Gsmumain.h"
#include "gsmuieoperations.h"
#include "Gsmumsg.h"
@@ -40,7 +46,7 @@
*/
CSmsIEOperation* CSmsIEOperation::NewL(CSmsInformationElement::TSmsInformationElementIdentifier aId, CSmsMessage& aMessage, CCnvCharacterSetConverter& aCharacterSetConverter, RFs& aFs)
{
- LOGGSMU1("CSmsIEOperation::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_NEWL_1, "CSmsIEOperation::NewL()");
CSmsIEOperation* iEOperation = NULL;
@@ -82,7 +88,7 @@
*/
EXPORT_C CSmsInformationElement::TSmsInformationElementIdentifier CSmsIEOperation::Id() const
{
- LOGGSMU1("CSmsIEOperation::Id()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSIEOPERATION_ID_1, "CSmsIEOperation::Id()");
return iId;
} // CSmsInformationElement::TSmsInformationElementIdentifier
@@ -97,7 +103,7 @@
*/
TBool CSmsIEOperation::MessageTypeSupported() const
{
- LOGGSMU1("CSmsIEOperation::MessageTypeSupported()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_MESSAGETYPESUPPORTED_1, "CSmsIEOperation::MessageTypeSupported()");
CSmsPDU::TSmsPDUType type = iMessage.Type();
@@ -124,7 +130,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsIEOperation::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_OPERATOR_1, "CSmsIEOperation::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -141,7 +147,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsIEOperation::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_OPERATOR1_1, "CSmsIEOperation::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -159,7 +165,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsCtrlOperation::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLOPERATION_OPERATOR_1, "CSmsCtrlOperation::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -176,7 +182,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsCtrlOperation::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLOPERATION_OPERATOR1_1, "CSmsCtrlOperation::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -196,7 +202,7 @@
void CSmsIEOperation::ConstructL()
{
- LOGGSMU1("CSmsIEOperation::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSIEOPERATION_CONSTRUCTL_1, "CSmsIEOperation::ConstructL()");
} // CSmsIEOperation::ConstructL
@@ -212,7 +218,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsHyperLinkOperations::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_OPERATOR_1, "CSmsHyperLinkOperations::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -229,7 +235,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsHyperLinkOperations::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_OPERATOR1_1, "CSmsHyperLinkOperations::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -245,17 +251,17 @@
*/
void CSmsHyperLinkOperations::ValidateOperationL() const
{
- LOGGSMU1("CSmsHyperLinkOperations::ValidateOperationL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1, "CSmsHyperLinkOperations::ValidateOperationL()");
if (iMessage.Version() < CSmsMessage::ESmsMessageV1)
{
- LOGGSMU2("CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported, Msg Version %d", iMessage.Version());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2, "CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported, Msg Version %d", iMessage.Version());
User::Leave(KErrNotSupported);
}
if (!MessageTypeSupported())
{
- LOGGSMU2("CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported by this PDU type, type = %d", iMessage.Type());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3, "CSmsHyperLinkOperations::AddHyperLinkL, Operation not supported by this PDU type, type = %d", iMessage.Type());
User::Leave(KErrNotSupported);
}
} // CSmsHyperLinkOperations::ValidateOperationL
@@ -278,7 +284,7 @@
*/
EXPORT_C void CSmsHyperLinkOperations::AddHyperLinkL(TUint aPosition, TUint8 aTitleLength, TUint8 aURLLength) const
{
- LOGGSMU1("CSmsHyperLinkOperations::AddHyperLinkL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1, "CSmsHyperLinkOperations::AddHyperLinkL()");
ValidateOperationL();
@@ -310,7 +316,7 @@
*/
EXPORT_C TUint CSmsHyperLinkOperations::NumberOfHyperLinksL() const
{
- LOGGSMU1("CSmsHyperLinkOperations::NumberOfHyperLinks");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1, "CSmsHyperLinkOperations::NumberOfHyperLinks");
ValidateOperationL();
@@ -367,7 +373,7 @@
*/
EXPORT_C void CSmsHyperLinkOperations::CopyHyperLinkAtIndexL(TUint aIndex, TUint& aPosition, TUint8& aTitleLength, TUint8& aURLLength) const
{
- LOGGSMU2("CSmsHyperLinkOperations::CopyHyperLinkAtIndexL(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1, "CSmsHyperLinkOperations::CopyHyperLinkAtIndexL(): aIndex=%d", aIndex);
ValidateOperationL();
@@ -419,7 +425,7 @@
*/
EXPORT_C void CSmsHyperLinkOperations::RemoveAllHyperLinksL() const
{
- LOGGSMU1("CSmsHyperLinkOperations::RemoveAllHyperLinks");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1, "CSmsHyperLinkOperations::RemoveAllHyperLinks");
ValidateOperationL();
@@ -464,7 +470,7 @@
*/
EXPORT_C void CSmsHyperLinkOperations::RemoveHyperLinkL(TUint aIndex) const
{
- LOGGSMU1("CSmsHyperLinkOperations::RemoveHyperLink");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1, "CSmsHyperLinkOperations::RemoveHyperLink");
ValidateOperationL();
@@ -514,7 +520,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsReplyAddressOperations::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_OPERATOR_1, "CSmsReplyAddressOperations::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -531,7 +537,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsReplyAddressOperations::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1, "CSmsReplyAddressOperations::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -547,17 +553,17 @@
*/
void CSmsReplyAddressOperations::ValidateOperationL() const
{
- LOGGSMU1("CSmsReplyAddressOperations::ValidateOperationL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1, "CSmsReplyAddressOperations::ValidateOperationL()");
if (iMessage.Version() < CSmsMessage::ESmsMessageV1)
{
- LOGGSMU2("CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported, Msg Version %d", iMessage.Version());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2, "CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported, Msg Version %d", iMessage.Version());
User::Leave(KErrNotSupported);
}
if (!MessageTypeSupported())
{
- LOGGSMU2("CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported by this PDU type, type = %d", iMessage.Type());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3, "CSmsReplyAddressOperations::AddReplyAddressL, Operation not supported by this PDU type, type = %d", iMessage.Type());
User::Leave(KErrNotSupported);
}
} // CSmsReplyAddressOperations::ValidateOperationL
@@ -578,13 +584,13 @@
*/
EXPORT_C void CSmsReplyAddressOperations::AddReplyAddressL(const TDesC& aAddress) const
{
- LOGGSMU1("CSmsReplyAddressOperations::AddReplyAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1, "CSmsReplyAddressOperations::AddReplyAddressL()");
ValidateOperationL();
if (ContainsReplyAddressIEL())
{
- LOGGSMU1("CSmsReplyAddressOperations::AddReplyAddressL, Already Exists");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2, "CSmsReplyAddressOperations::AddReplyAddressL, Already Exists");
User::Leave(KErrAlreadyExists);
}
@@ -624,13 +630,13 @@
*/
EXPORT_C void CSmsReplyAddressOperations::AddParsedReplyAddressL(const TGsmSmsTelNumber& aParsedAddress) const
{
- LOGGSMU1("CSmsReplyAddressOperations::AddParsedReplyAddressL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1, "CSmsReplyAddressOperations::AddParsedReplyAddressL");
ValidateOperationL();
if (ContainsReplyAddressIEL())
{
- LOGGSMU1("CSmsReplyAddressOperations::AddParsedReplyAddressL, Already Exists");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2, "CSmsReplyAddressOperations::AddParsedReplyAddressL, Already Exists");
User::Leave(KErrAlreadyExists);
}
@@ -669,7 +675,7 @@
*/
EXPORT_C TBool CSmsReplyAddressOperations::ContainsReplyAddressIEL() const
{
- LOGGSMU1("CSmsReplyAddressOperations::ContainsReplyAddressIEL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1, "CSmsReplyAddressOperations::ContainsReplyAddressIEL()");
TBool rc = EFalse;
@@ -720,7 +726,7 @@
*/
EXPORT_C HBufC* CSmsReplyAddressOperations::GetReplyAddressL() const
{
- LOGGSMU1("CSmsReplyAddressOperations::GetReplyAddressL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1, "CSmsReplyAddressOperations::GetReplyAddressL");
ValidateOperationL();
@@ -796,7 +802,7 @@
*/
EXPORT_C TInt CSmsReplyAddressOperations::GetParsedReplyAddressL(TGsmSmsTelNumber& aParsedAddress) const
{
- LOGGSMU1("CSmsReplyAddressOperations::GetParsedReplyAddressL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1, "CSmsReplyAddressOperations::GetParsedReplyAddressL");
ValidateOperationL();
@@ -870,7 +876,7 @@
*/
EXPORT_C void CSmsReplyAddressOperations::RemoveReplyAddressL() const
{
- LOGGSMU1("CSmsReplyAddressOperations::RemoveReplyAddress");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1, "CSmsReplyAddressOperations::RemoveReplyAddress");
ValidateOperationL();
@@ -918,17 +924,17 @@
*/
void CSmsSpecialSMSMessageOperations::ValidateOperationL() const
{
- LOGGSMU1("CSmsSpecialSMSMessageOperations::ValidateOperationL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1, "CSmsSpecialSMSMessageOperations::ValidateOperationL()");
if (iMessage.Version() < CSmsMessage::ESmsMessageV1)
{
- LOGGSMU2("CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported, version %d", iMessage.Version());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2, "CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported, version %d", iMessage.Version());
User::Leave(KErrNotSupported);
}
if (!MessageTypeSupported())
{
- LOGGSMU2("CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported by this PDU type, type = %d", iMessage.Type());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3, "CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL, Operation not supported by this PDU type, type = %d", iMessage.Type());
User::Leave(KErrNotSupported);
}
} // CSmsSpecialSMSMessageOperations::ValidateOperationL
@@ -946,7 +952,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsSpecialSMSMessageOperations::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1, "CSmsSpecialSMSMessageOperations::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -961,7 +967,7 @@
*/
TBool CSmsSpecialSMSMessageOperations::operator==(const CSmsSpecialSMSMessageOperations&)
{
- LOGGSMU1("CSmsSpecialSMSMessageOperations::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1, "CSmsSpecialSMSMessageOperations::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
} // CSmsSpecialSMSMessageOperations::operator
@@ -992,7 +998,7 @@
TSmsMessageProfileType aProfile,
TUint8 aMessageCount) const
{
- LOGGSMU1("CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1, "CSmsSpecialSMSMessageOperations::AddSpecialMessageIndicationL");
ValidateOperationL();
@@ -1049,7 +1055,7 @@
*/
EXPORT_C TUint CSmsSpecialSMSMessageOperations::GetCountOfSpecialMessageIndicationsL() const
{
- LOGGSMU1("CSmsSpecialSMSMessageOperations::GetCountOfSpecialMessageIndicationsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1, "CSmsSpecialSMSMessageOperations::GetCountOfSpecialMessageIndicationsL()");
ValidateOperationL();
@@ -1095,7 +1101,7 @@
TSmsMessageProfileType& aProfile,
TUint8& aMessageCount) const
{
- LOGGSMU1("CSmsSpecialSMSMessageOperations::GetMessageIndicationIEL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1, "CSmsSpecialSMSMessageOperations::GetMessageIndicationIEL()");
ValidateOperationL();
@@ -1139,7 +1145,7 @@
*/
EXPORT_C void CSmsSpecialSMSMessageOperations::RemoveSpecialMessageIndicationL(TSmsMessageIndicationType aMessageIndicationType, TExtendedSmsIndicationType aExtendedType) const
{
- LOGGSMU1("CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndications");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1, "CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndications");
ValidateOperationL();
@@ -1181,7 +1187,7 @@
*/
EXPORT_C void CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndicationsL() const
{
- LOGGSMU1("CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndicationsL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1, "CSmsSpecialSMSMessageOperations::RemoveAllSpecialMessageIndicationsL");
ValidateOperationL();
@@ -1220,7 +1226,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsEnhancedVoiceMailOperations::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1, "CSmsEnhancedVoiceMailOperations::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -1237,7 +1243,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsEnhancedVoiceMailOperations::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1, "CSmsEnhancedVoiceMailOperations::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -1253,17 +1259,17 @@
*/
void CSmsEnhancedVoiceMailOperations::ValidateOperationL() const
{
- LOGGSMU1("CSmsEnhancedVoiceMailOperations::ValidateOperationL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1, "CSmsEnhancedVoiceMailOperations::ValidateOperationL()");
if (iMessage.Version() < CSmsMessage::ESmsMessageV1)
{
- LOGGSMU2("CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Operation not supported, Msg Version %d", iMessage.Version());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2, "CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Operation not supported, Msg Version %d", iMessage.Version());
User::Leave(KErrNotSupported);
}
if (!MessageTypeSupported())
{
- LOGGSMU2("CSmsSpecialSMSMessageOperations::AddEnhancedVoiceMailIEL, Operation not supported by this PDU type, type = %d", iMessage.Type());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3, "CSmsSpecialSMSMessageOperations::AddEnhancedVoiceMailIEL, Operation not supported by this PDU type, type = %d", iMessage.Type());
User::Leave(KErrNotSupported);
}
} // CSmsEnhancedVoiceMailOperations::ValidateOperationL
@@ -1289,13 +1295,13 @@
*/
EXPORT_C void CSmsEnhancedVoiceMailOperations::AddEnhancedVoiceMailIEL(const CEnhancedVoiceMailBoxInformation& aEVMI) const
{
- LOGGSMU1("CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL");
ValidateOperationL();
if (ContainsEnhancedVoiceMailIEL())
{
- LOGGSMU1("CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Already Exists");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2, "CSmsEnhancedVoiceMailInformation::AddEnhancedVoiceMailIEL, Already Exists");
User::Leave(KErrAlreadyExists);
}
@@ -1333,7 +1339,7 @@
*/
EXPORT_C CEnhancedVoiceMailBoxInformation* CSmsEnhancedVoiceMailOperations::RemoveEnhancedVoiceMailIEL() const
{
- LOGGSMU1("CSmsEnhancedVoiceMailInformation::RemoveEnhancedVoiceMailIE");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::RemoveEnhancedVoiceMailIE");
ValidateOperationL();
@@ -1360,7 +1366,7 @@
*/
EXPORT_C CEnhancedVoiceMailBoxInformation* CSmsEnhancedVoiceMailOperations::CopyEnhancedVoiceMailIEL() const
{
- LOGGSMU1("CSmsEnhancedVoiceMailInformation::CopyEnhancedVoiceMailIEL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::CopyEnhancedVoiceMailIEL");
ValidateOperationL();
@@ -1386,7 +1392,7 @@
*/
CEnhancedVoiceMailBoxInformation* CSmsEnhancedVoiceMailOperations::GetEnhancedVoiceMailIEL(TBool aRemove) const
{
- LOGGSMU1("CSmsEnhancedVoiceMailOperations::GetEnhancedVoiceMailIEL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailOperations::GetEnhancedVoiceMailIEL()");
TBool found = EFalse;
@@ -1455,7 +1461,7 @@
*/
EXPORT_C TBool CSmsEnhancedVoiceMailOperations::ContainsEnhancedVoiceMailIEL() const
{
- LOGGSMU1("CSmsEnhancedVoiceMailInformation::ContainsEnhancedVoiceMailIEL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1, "CSmsEnhancedVoiceMailInformation::ContainsEnhancedVoiceMailIEL");
ValidateOperationL();
@@ -1523,7 +1529,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsSMSCCtrlParameterOperations::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1, "CSmsSMSCCtrlParameterOperations::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -1540,7 +1546,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsSMSCCtrlParameterOperations::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1, "CSmsSMSCCtrlParameterOperations::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -1558,13 +1564,13 @@
{
if (iMessage.Version() < CSmsMessage::ESmsMessageV2)
{
- LOGGSMU2("CSmsSMSCCtrlParameterOperations Operation not supported, Msg Version %d", iMessage.Version());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1, "CSmsSMSCCtrlParameterOperations Operation not supported, Msg Version %d", iMessage.Version());
User::Leave(KErrNotSupported);
}
if (!MessageTypeSupported())
{
- LOGGSMU2("CSmsSMSCCtrlParameterOperations Operation not supported by this PDU type, type = %d", iMessage.Type());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2, "CSmsSMSCCtrlParameterOperations Operation not supported by this PDU type, type = %d", iMessage.Type());
User::Leave(KErrNotSupported);
}
} // CSmsSMSCCtrlParameterOperations::ValidateOperationL()
--- a/smsprotocols/smsstack/gsmu/src/gsmumsgadditionattributes.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmumsgadditionattributes.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -15,13 +15,19 @@
//
//
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "gsmumsgadditionattributesTraces.h"
+#endif
+
#include "gsmumsgadditionalattributes.h"
#include "smsstacklog.h"
CSmsMessageAdditionalAttributes* CSmsMessageAdditionalAttributes::NewL()
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1, "CSmsMessageAdditionalAttributes::NewL()");
CSmsMessageAdditionalAttributes* additionalAttributes=new(ELeave) CSmsMessageAdditionalAttributes();
CleanupStack::PushL(additionalAttributes);
@@ -39,7 +45,7 @@
CSmsMessageAdditionalAttributes::~CSmsMessageAdditionalAttributes()
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::~CSmsMessageAdditionalAttributes()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1, "CSmsMessageAdditionalAttributes::~CSmsMessageAdditionalAttributes()");
iSmsPDUArray.ResetAndDestroy();
@@ -66,7 +72,7 @@
void CSmsMessageAdditionalAttributes::ConstructL()
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1, "CSmsMessageAdditionalAttributes::ConstructL()");
iStatusReportScheme = new (ELeave) CSmsMessageAdditionalAttributes::CDefaultScheme();
@@ -79,7 +85,7 @@
void CSmsMessageAdditionalAttributes::AddControlInformationElementL(CSmsInformationElement* aIE)
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::AddControlInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1, "CSmsMessageAdditionalAttributes::AddControlInformationElementL()");
TSmsInformationElementCategories::TInformationElementCategory category;
if (aIE != NULL)
@@ -90,13 +96,13 @@
}
else
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::AddControlInformationElementL, aIE->Identifier() is invalid");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2, "CSmsMessageAdditionalAttributes::AddControlInformationElementL, aIE->Identifier() is invalid");
User::Leave(KErrArgument);
}
}
else
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::AddControlInformationElementL, aIE == NULL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3, "CSmsMessageAdditionalAttributes::AddControlInformationElementL, aIE == NULL");
User::Leave(KErrArgument);
}
} // CSmsMessageAdditionalAttributes::AddControlInformationElementL
@@ -104,7 +110,7 @@
TBool CSmsMessageAdditionalAttributes::Find1stInstanceOfControlInformationElement(TInformationElementId aId, TUint& aIndex) const
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::Find1stInstanceOfControlInformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::Find1stInstanceOfControlInformationElement()");
TBool rc = EFalse;
TSmsInformationElementCategories::TInformationElementCategory category;
@@ -128,7 +134,7 @@
TBool CSmsMessageAdditionalAttributes::FindNextInstanceOfControlInformationElement(TInformationElementId aId, TUint aStartIndex, TUint& aIndex) const
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::FindNextInstanceOfControlInformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::FindNextInstanceOfControlInformationElement()");
TBool rc = EFalse;
TSmsInformationElementCategories::TInformationElementCategory category;
@@ -153,7 +159,7 @@
CSmsInformationElement& CSmsMessageAdditionalAttributes::GetControlInformationElementL(TInformationElementId aId, TUint aIndex) const
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::GetControlInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1, "CSmsMessageAdditionalAttributes::GetControlInformationElementL()");
TSmsInformationElementCategories::TInformationElementCategory category;
@@ -165,21 +171,21 @@
if (aIndex >= iCollectionOfPointersToIEArrays[category]->Count())
{
- LOGGSMU3("CSmsMessageAdditionalAttributes::GetControlInformationElementL aId = %d , aIndex = %d", aId, aIndex);
- LOGGSMU2("CSmsMessageAdditionalAttributes::GetControlInformationElementL Count = %d", iCollectionOfPointersToIEArrays[category]->Count());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2, "CSmsMessageAdditionalAttributes::GetControlInformationElementL aId = %d , aIndex = %d", aId, aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3, "CSmsMessageAdditionalAttributes::GetControlInformationElementL Count = %d", iCollectionOfPointersToIEArrays[category]->Count());
User::Leave(KErrArgument);
}
if (iCollectionOfPointersToIEArrays[category]->operator[](aIndex) == NULL)
{
- LOGGSMU3("CSmsMessageAdditionalAttributes::GetControlInformationElementL aId = %d , aIndex = %d", aId, aIndex);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4, "CSmsMessageAdditionalAttributes::GetControlInformationElementL aId = %d , aIndex = %d", aId, aIndex);
User::Leave(KErrArgument);
}
if (iCollectionOfPointersToIEArrays[category]->operator[](aIndex)->Identifier()!=aId)
{
- LOGGSMU3("CSmsMessageAdditionalAttributes::GetControlInformationElementL aId = %d, aIndex = %d", aId, aIndex);
- LOGGSMU2("CSmsMessageAdditionalAttributes::GetControlInformationElementL id = %d", iCollectionOfPointersToIEArrays[category]->operator[](aIndex)->Identifier());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5, "CSmsMessageAdditionalAttributes::GetControlInformationElementL aId = %d, aIndex = %d", aId, aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6, "CSmsMessageAdditionalAttributes::GetControlInformationElementL id = %d", iCollectionOfPointersToIEArrays[category]->operator[](aIndex)->Identifier());
User::Leave(KErrArgument);
}
@@ -190,7 +196,7 @@
TBool CSmsMessageAdditionalAttributes::RemoveControlInformationElement(TInformationElementId aId, TUint aIndex, CSmsInformationElementPtr& aIE)
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::RemoveControlInformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::RemoveControlInformationElement()");
TBool rc = EFalse;
TSmsInformationElementCategories::TInformationElementCategory category;
@@ -212,7 +218,7 @@
void CSmsMessageAdditionalAttributes::AddControlInformationElementL(TCategory aCategory, CSmsInformationElementPtr aIE)
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::AddControlInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1, "CSmsMessageAdditionalAttributes::AddControlInformationElementL()");
if ((aIE != NULL) &&
(aCategory < TSmsInformationElementCategories::ENumberOfCategories))
@@ -228,7 +234,7 @@
TBool CSmsMessageAdditionalAttributes::RemoveNextControlInformationElement(TCategory aCategory, CSmsInformationElementPtr& aIEPtr)
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::RemoveNextControlInformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::RemoveNextControlInformationElement()");
TBool rc = EFalse;
if (aCategory < TSmsInformationElementCategories::ENumberOfCategories)
@@ -247,19 +253,18 @@
CSmsInformationElement& CSmsMessageAdditionalAttributes::GetControlInformationElementL(TCategory aCategory, TUint aIndex) const
{
- LOGGSMU3("CSmsMessageAdditionalAttributes::GetControlInformationElementL(): aCategory=%d, aIndex=%d",
- aCategory, aIndex);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1, "CSmsMessageAdditionalAttributes::GetControlInformationElementL(): aCategory=%d, aIndex=%d",aCategory, aIndex);
if ((aCategory >= TSmsInformationElementCategories::ENumberOfCategories) ||
(aIndex >= iCollectionOfPointersToIEArrays[aCategory]->Count()))
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::GetControlInformationElementL: KErrArgument");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2, "CSmsMessageAdditionalAttributes::GetControlInformationElementL: KErrArgument");
User::Leave(KErrArgument);
}
if ((iCollectionOfPointersToIEArrays[aCategory])->operator[](aIndex) == NULL)
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::GetControlInformationElementL: KErrCorrupt");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3, "CSmsMessageAdditionalAttributes::GetControlInformationElementL: KErrCorrupt");
User::Leave(KErrCorrupt);
}
@@ -269,7 +274,7 @@
void CSmsMessageAdditionalAttributes::DeleteControlInformationElement(TCategory aCategory, TUint8 aIndex)
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::DeleteControlInformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1, "CSmsMessageAdditionalAttributes::DeleteControlInformationElement()");
if (aCategory < TSmsInformationElementCategories::ENumberOfCategories)
{
@@ -288,7 +293,7 @@
TUint CSmsMessageAdditionalAttributes::NumberOfControlInformationElements(TCategory aCategory) const
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::NumberOfControlInformationElements1()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1, "CSmsMessageAdditionalAttributes::NumberOfControlInformationElements1()");
TUint count = 0;
@@ -303,7 +308,7 @@
void CSmsMessageAdditionalAttributes::ExternalizeL(RWriteStream& aStream, TInt aVersion) const
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::ExternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1, "CSmsMessageAdditionalAttributes::ExternalizeL()");
if(aVersion == CSmsMessage::ESmsIncompleteClass0MessageV)
{
@@ -367,7 +372,7 @@
void CSmsMessageAdditionalAttributes::InternalizeL(RReadStream& aStream, TInt aVersion)
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::InternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1, "CSmsMessageAdditionalAttributes::InternalizeL()");
if(aVersion == CSmsMessage::ESmsIncompleteClass0MessageV)
{
@@ -447,7 +452,7 @@
void CSmsMessageAdditionalAttributes::ResetAttributesL()
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::ResetAttributesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1, "CSmsMessageAdditionalAttributes::ResetAttributesL()");
for (TInt category = 0; category < TSmsInformationElementCategories::ENumberOfCategories; category++)
{
@@ -468,7 +473,7 @@
CSmsIEOperation& CSmsMessageAdditionalAttributes::GetIEOperationL(TInformationElementId aId) const
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::GetIEOperation()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1, "CSmsMessageAdditionalAttributes::GetIEOperation()");
CSmsIEOperation* operation = NULL;
@@ -507,7 +512,7 @@
*/
CSmsNonIEOperation& CSmsMessageAdditionalAttributes::GetNonIEOperationL(TSmsNonIEIdentifier aId) const
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::GetNonIEOperationL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1, "CSmsMessageAdditionalAttributes::GetNonIEOperationL");
CSmsNonIEOperation* operation = NULL;
@@ -530,14 +535,14 @@
void CSmsMessageAdditionalAttributes::SetIEOperationL(CSmsIEOperation* aOperation)
{
- LOGGSMU1("CSmsMessageAdditionalAttributes::SetIEOperationL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1, "CSmsMessageAdditionalAttributes::SetIEOperationL()");
if (aOperation == NULL)
{
User::Leave(KErrArgument);
}
- LOGGSMU2("CSmsMessageAdditionalAttributes::AddIEOperation, operation=%d", aOperation->Id());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2, "CSmsMessageAdditionalAttributes::AddIEOperation, operation=%d", aOperation->Id());
switch(aOperation->Id())
{
@@ -576,7 +581,7 @@
User::Leave(KErrArgument);
}
- LOGGSMU2("CSmsMessageAdditionalAttributes::SetNonIEOperationL, operation = %d", aOperation->Id());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1, "CSmsMessageAdditionalAttributes::SetNonIEOperationL, operation = %d", aOperation->Id());
if (aOperation->Id() == ESmsTPSRRParameter)
{
--- a/smsprotocols/smsstack/gsmu/src/gsmunonieoperations.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmunonieoperations.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -13,6 +13,12 @@
// Description:
//
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "gsmunonieoperationsTraces.h"
+#endif
+
#include "Gsmumain.h"
#include "gsmunonieoperations.h"
#include "Gsmumsg.h"
@@ -101,7 +107,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsNonIEOperation::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSNONIEOPERATION_OPERATOR_1, "CSmsNonIEOperation::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -118,7 +124,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsNonIEOperation::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSNONIEOPERATION_OPERATOR1_1, "CSmsNonIEOperation::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -136,7 +142,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsCtrlNonIEOperation::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLNONIEOPERATION_OPERATOR_1, "CSmsCtrlNonIEOperation::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -153,7 +159,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsCtrlNonIEOperation::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCTRLNONIEOPERATION_OPERATOR1_1, "CSmsCtrlNonIEOperation::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -194,7 +200,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsTPSRROperations::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_OPERATOR_1, "CSmsTPSRROperations::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -211,7 +217,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CSmsTPSRROperations::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_OPERATOR1_1, "CSmsTPSRROperations::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -228,13 +234,13 @@
{
if (iMessage.Version() < CSmsMessage::ESmsMessageV2)
{
- LOGGSMU2("CSmsTPSRROperations Operation not supported, Msg Version %d", iMessage.Version());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1, "CSmsTPSRROperations Operation not supported, Msg Version %d", iMessage.Version());
User::Leave(KErrNotSupported);
}
if (!MessageTypeSupported())
{
- LOGGSMU2("CSmsTPSRROperations Operation not supported by this PDU type, type = %d", iMessage.Type());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2, "CSmsTPSRROperations Operation not supported by this PDU type, type = %d", iMessage.Type());
User::Leave(KErrNotSupported);
}
}
@@ -547,7 +553,7 @@
CIncompleteClass0MessageInfo::CIncompleteClass0MessageInfo(TSmsNonIEIdentifier aId, CSmsMessage& aMessage)
: CSmsNonIEOperation(aId, aMessage)
{
- LOGGSMU1("CIncompleteClass0MessageInfo constructor");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_CTOR_1, "CIncompleteClass0MessageInfo constructor");
}
/**
@@ -564,7 +570,7 @@
*/
EXPORT_C void CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL(TInt& aStartPos, TInt& aEndPos, TBool& aIsLastIncompleteMessage)
{
- LOGGSMU1("CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1, "CIncompleteClass0MessageInfo::GetIncompleteMessageInfoL");
ValidateOperationL();
aStartPos = iStartPos;
aEndPos = iEndPos;
@@ -585,7 +591,7 @@
*/
EXPORT_C void CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL(TInt aStartPos, TInt aEndPos, TBool aIsLastIncompleteMessage)
{
- LOGGSMU1("CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1, "CIncompleteClass0MessageInfo::SetIncompleteMessageInfoL");
ValidateOperationL();
iStartPos = aStartPos;
iEndPos = aEndPos;
@@ -604,7 +610,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CIncompleteClass0MessageInfo::operator=");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1, "CIncompleteClass0MessageInfo::operator=");
Panic(KGsmuPanicMethodBodyNotImplemented1);
BULLSEYE_RESTORE
}
@@ -621,7 +627,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGGSMU1("CIncompleteClass0MessageInfo::operator==");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1, "CIncompleteClass0MessageInfo::operator==");
Panic(KGsmuPanicMethodBodyNotImplemented1);
return EFalse;
BULLSEYE_RESTORE
@@ -636,7 +642,7 @@
*/
TBool CIncompleteClass0MessageInfo::MessageTypeSupported() const
{
- LOGGSMU1("CIncompleteClass0MessageInfo::MessageTypeSupported");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1, "CIncompleteClass0MessageInfo::MessageTypeSupported");
CSmsPDU::TSmsPDUType type = iMessage.Type();
return (type == CSmsPDU::ESmsDeliver);
}
@@ -650,17 +656,17 @@
*/
void CIncompleteClass0MessageInfo::ValidateOperationL() const
{
- LOGGSMU1("CIncompleteClass0MessageInfo::ValidateOperationL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1, "CIncompleteClass0MessageInfo::ValidateOperationL");
if (iMessage.Version() != CSmsMessage::ESmsIncompleteClass0MessageV)
{
- LOGGSMU2("CIncompleteClass0MessageInfo Operation not supported, Msg Version %d", iMessage.Version());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2, "CIncompleteClass0MessageInfo Operation not supported, Msg Version %d", iMessage.Version());
User::Leave(KErrNotSupported);
}
if (!MessageTypeSupported())
{
- LOGGSMU2("CIncompleteClass0MessageInfo Operation not supported by this PDU type, type = %d", iMessage.Type());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3, "CIncompleteClass0MessageInfo Operation not supported by this PDU type, type = %d", iMessage.Type());
User::Leave(KErrNotSupported);
}
}
@@ -675,7 +681,7 @@
// class, no need to check the version. Expected to be used if
// a new version of the class is added
BULLSEYE_OFF
- LOGGSMU1("CIncompleteClass0MessageInfo::Version()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_VERSION_1, "CIncompleteClass0MessageInfo::Version()");
return iVersion;
BULLSEYE_RESTORE
}
@@ -689,7 +695,7 @@
*/
void CIncompleteClass0MessageInfo::SetVersion(TInt aVersion)
{
- LOGGSMU2("CIncompleteClass0MessageInfo::SetVersion()", aVersion);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1, "CIncompleteClass0MessageInfo::SetVersion() version:%d", aVersion);
__ASSERT_DEBUG((aVersion<EMaxSmsIncompleteClass0MessageV),Panic(KGsmuPanicVersionNotSupported));
@@ -704,7 +710,7 @@
*/
void CIncompleteClass0MessageInfo::InternalizeL(RReadStream& aStream)
{
- LOGGSMU1("CIncompleteClass0MessageInfo::InternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1, "CIncompleteClass0MessageInfo::InternalizeL()");
iVersion = aStream.ReadInt32L();
iStartPos = aStream.ReadInt32L();
iEndPos = aStream.ReadInt32L();
@@ -719,7 +725,7 @@
*/
void CIncompleteClass0MessageInfo::ExternalizeL(RWriteStream& aStream) const
{
- LOGGSMU1("CIncompleteClass0MessageInfo::ExternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1, "CIncompleteClass0MessageInfo::ExternalizeL()");
aStream.WriteInt32L(iVersion);
aStream.WriteInt32L(iStartPos);
aStream.WriteInt32L(iEndPos);
--- a/smsprotocols/smsstack/gsmu/src/gsmupdu.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmupdu.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "gsmupduTraces.h"
+#endif
+
#include <etelmm.h>
#include "gsmuNmspaceMobMsg.h"
#include "gsmuetel.h"
@@ -43,7 +49,7 @@
*/
EXPORT_C CSmsPDU* CSmsPDU::NewL(RReadStream& aStream,CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- LOGGSMU1("CSmsPDU::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NEWL_1, "CSmsPDU::NewL()");
TInt type=aStream.ReadUint8L();
CSmsPDU* smspdu=NULL;
@@ -111,8 +117,7 @@
*/
EXPORT_C CSmsPDU* CSmsPDU::NewL(const TGsmSms& aGsmSms,CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs, TBool aIsRPError,TBool aIsMobileTerminated)
{
- LOGGSMU3("CSmsPDU::NewL(): aIsRPError=%d, aIsMobileTerminated=%d",
- aIsRPError, aIsMobileTerminated);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NEWL1_1, "CSmsPDU::NewL(): aIsRPError=%d, aIsMobileTerminated=%d",aIsRPError, aIsMobileTerminated);
const TUint8* ptr1=aGsmSms.Pdu().Ptr();
@@ -176,7 +181,7 @@
*/
EXPORT_C CSmsPDU* CSmsPDU::NewL(TSmsPDUType aType,CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TBool aIsRPError)
{
- LOGGSMU2("CSmsPDU::NewL(): aIsRPError=%d", aIsRPError);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NEWL2_1, "CSmsPDU::NewL(): aIsRPError=%d", aIsRPError);
CSmsPDU* smspdu=NULL;
switch (aType)
@@ -229,7 +234,7 @@
*/
EXPORT_C CSmsPDU* CSmsPDU::DuplicateL() const
{
- LOGGSMU1("CSmsPDU::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_DUPLICATEL_1, "CSmsPDU::DuplicateL()");
CSmsPDU* smsPDU = NULL;
@@ -303,7 +308,7 @@
*/
EXPORT_C void CSmsPDU::EncodeMessagePDUL(TGsmSms& aGsmSms) const
{
- LOGGSMU1("CSmsPDU::EncodeMessagePDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_ENCODEMESSAGEPDUL_1, "CSmsPDU::EncodeMessagePDUL()");
NMobileSmsMessaging::TMobileSmsGsmTpdu pdu;
pdu.SetLength(NMobileSmsMessaging::KGsmTpduSize);
@@ -321,7 +326,7 @@
void CSmsPDU::EncodeMessagePDUL(TGsmSms& aGsmSms, const TEncodeParams* aEncodeParams) const
{
- LOGGSMU1("CSmsPDU::EncodeMessagePDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_ENCODEMESSAGEPDUL1_1, "CSmsPDU::EncodeMessagePDUL()");
NMobileSmsMessaging::TMobileSmsGsmTpdu pdu;
pdu.SetLength(NMobileSmsMessaging::KGsmTpduSize);
@@ -348,7 +353,7 @@
*/
EXPORT_C TPtrC CSmsPDU::ServiceCenterAddress() const
{
- LOGGSMU1("CSmsPDU::ServiceCenterAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SERVICECENTERADDRESS_1, "CSmsPDU::ServiceCenterAddress()");
return iServiceCenterAddress->Address();
} // CSmsPDU::ServiceCenterAddress
@@ -364,7 +369,7 @@
*/
EXPORT_C void CSmsPDU::SetServiceCenterAddressL(const TDesC& aAddress)
{
- LOGGSMU1("CSmsPDU::SetServiceCenterAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETSERVICECENTERADDRESSL_1, "CSmsPDU::SetServiceCenterAddressL()");
iServiceCenterAddress->SetAddressL(aAddress);
} // CSmsPDU::SetServiceCenterAddressL
@@ -380,7 +385,7 @@
*/
EXPORT_C void CSmsPDU::ParsedServiceCenterAddress(TGsmSmsTelNumber& aParsedAddress) const
{
- LOGGSMU1("CSmsPDU::ParsedServiceCenterAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PARSEDSERVICECENTERADDRESS_1, "CSmsPDU::ParsedServiceCenterAddress()");
iServiceCenterAddress->ParsedAddress(aParsedAddress);
} // CSmsPDU::ParsedServiceCenterAddress
@@ -396,7 +401,7 @@
*/
EXPORT_C void CSmsPDU::SetParsedServiceCenterAddressL(const TGsmSmsTelNumber& aParsedAddress)
{
- LOGGSMU1("CSmsPDU::SetParsedServiceCenterAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1, "CSmsPDU::SetParsedServiceCenterAddressL()");
iServiceCenterAddress->SetParsedAddressL(aParsedAddress);
} // CSmsPDU::SetParsedServiceCenterAddressL
@@ -421,7 +426,7 @@
*/
EXPORT_C TPtrC CSmsPDU::ToFromAddress() const
{
- LOGGSMU1("CSmsPDU::SetParsedServiceCenterAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TOFROMADDRESS_1, "CSmsPDU::SetParsedServiceCenterAddressL()");
if (ToFromAddressPtr() == NULL)
{
@@ -445,7 +450,7 @@
*/
EXPORT_C void CSmsPDU::SetToFromAddressL(const TDesC& aAddress)
{
- LOGGSMU1("CSmsPDU::SetToFromAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTOFROMADDRESSL_1, "CSmsPDU::SetToFromAddressL()");
__ASSERT_DEBUG(ToFromAddressPtr()!=NULL,Panic(KGsmuPanicToFromAddressNotPresent));
CSmsAddress* tofromaddress=(CSmsAddress*) ToFromAddressPtr();
@@ -463,7 +468,7 @@
*/
EXPORT_C void CSmsPDU::ParsedToFromAddress(TGsmSmsTelNumber& aParsedAddress) const
{
- LOGGSMU1("CSmsPDU::ParsedToFromAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PARSEDTOFROMADDRESS_1, "CSmsPDU::ParsedToFromAddress()");
__ASSERT_DEBUG(ToFromAddressPtr()!=NULL,Panic(KGsmuPanicToFromAddressNotPresent));
ToFromAddressPtr()->ParsedAddress(aParsedAddress);
@@ -478,7 +483,7 @@
*/
EXPORT_C void CSmsPDU::SetParsedToFromAddressL(const TGsmSmsTelNumber& aParsedAddress)
{
- LOGGSMU1("CSmsPDU::SetParsedToFromAddressL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPARSEDTOFROMADDRESSL_1, "CSmsPDU::SetParsedToFromAddressL()");
__ASSERT_DEBUG(ToFromAddressPtr()!=NULL,Panic(KGsmuPanicToFromAddressNotPresent));
CSmsAddress* tofromaddress=(CSmsAddress*) ToFromAddressPtr();
@@ -497,7 +502,7 @@
*/
void CSmsPDU::UpdateConcatenationDataL(TInt aRef, TInt aPduIndex, TInt aMaxPdu)
{
- LOGGSMU1("CSmsPDU::UpdateConcatenationDataL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_UPDATECONCATENATIONDATAL_1, "CSmsPDU::UpdateConcatenationDataL()");
SetConcatenatedMessageReference(aRef);
SetConcatenatedMessagePDUIndex(aPduIndex);
@@ -512,7 +517,7 @@
*/
void CSmsPDU::UpdateEmailHeaderDataL(TInt& aEmailOverallHeaderLength)
{
- LOGGSMU1("CSmsPDU::UpdateEmailHeaderDataL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_UPDATEEMAILHEADERDATAL_1, "CSmsPDU::UpdateEmailHeaderDataL()");
TInt emailIndex(0);
TInt udLength=0;
@@ -610,7 +615,7 @@
EXPORT_C TSmsEncoding CSmsPDU::NationalLanguageEncoding() const
{
- LOGGSMU1("CSmsPDU::NationalLanguageEncoding()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_1, "CSmsPDU::NationalLanguageEncoding()");
TSmsEncoding encodingUsed = ESmsEncodingNone;
@@ -720,9 +725,9 @@
};
}
- LOGGSMU2("CSmsPDU::NationalLanguageEncoding(): lockingShift=%d", lockingShiftValue);
- LOGGSMU2("CSmsPDU::NationalLanguageEncoding(): singleShift=%d", singleShiftValue);
- LOGGSMU2("CSmsPDU::NationalLanguageEncoding(): encodingUsed=%d", encodingUsed);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_2, "CSmsPDU::NationalLanguageEncoding(): lockingShift=%d", lockingShiftValue);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_3, "CSmsPDU::NationalLanguageEncoding(): singleShift=%d", singleShiftValue);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NATIONALLANGUAGEENCODING_4, "CSmsPDU::NationalLanguageEncoding(): encodingUsed=%d", encodingUsed);
return encodingUsed;
} // CSmsPDU::NationalLanguageEncoding
@@ -730,7 +735,7 @@
EXPORT_C void CSmsPDU::SetNationalLanguageEncodingL(TSmsEncoding aEncoding)
{
- LOGGSMU2("CSmsPDU::SetNationalLanguageEncodingL(): aEncoding=%d", aEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1, "CSmsPDU::SetNationalLanguageEncodingL(): aEncoding=%d", aEncoding);
//
// Convert the encoding enum into two parts: Single Shift and Locking Shift
@@ -810,8 +815,8 @@
}
};
- LOGGSMU2("CSmsPDU::SetNationalLanguageEncodingL(): lockingShift=%d", lockingShiftValue);
- LOGGSMU2("CSmsPDU::SetNationalLanguageEncodingL(): singleShift=%d", singleShiftValue);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2, "CSmsPDU::SetNationalLanguageEncodingL(): lockingShift=%d", lockingShiftValue);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3, "CSmsPDU::SetNationalLanguageEncodingL(): singleShift=%d", singleShiftValue);
//
// Update the locking shift setting...
@@ -899,7 +904,7 @@
*/
EXPORT_C TSmsDataCodingScheme::TSmsDCSBits7To4 CSmsPDU::Bits7To4() const
{
- LOGGSMU1("CSmsPDU::Bits7To4()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_BITS7TO4_1, "CSmsPDU::Bits7To4()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
@@ -921,7 +926,7 @@
*/
EXPORT_C void CSmsPDU::SetBits7To4(TSmsDataCodingScheme::TSmsDCSBits7To4 aBits7To4)
{
- LOGGSMU1("CSmsPDU::SetBits7To4()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETBITS7TO4_1, "CSmsPDU::SetBits7To4()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -939,7 +944,7 @@
*/
EXPORT_C TSmsDataCodingScheme::TSmsAlphabet CSmsPDU::Alphabet() const
{
- LOGGSMU1("CSmsPDU::Alphabet()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_ALPHABET_1, "CSmsPDU::Alphabet()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->Alphabet();
@@ -956,7 +961,7 @@
*/
EXPORT_C void CSmsPDU::SetAlphabet(TSmsDataCodingScheme::TSmsAlphabet aAlphabet)
{
- LOGGSMU1("CSmsPDU::SetAlphabet()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETALPHABET_1, "CSmsPDU::SetAlphabet()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -975,7 +980,7 @@
*/
EXPORT_C TBool CSmsPDU::Class(TSmsDataCodingScheme::TSmsClass& aClass) const
{
- LOGGSMU1("CSmsPDU::Class()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_CLASS_1, "CSmsPDU::Class()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->Class(aClass);
@@ -993,7 +998,7 @@
*/
EXPORT_C void CSmsPDU::SetClass(TBool aClassDefined,TSmsDataCodingScheme::TSmsClass aClass)
{
- LOGGSMU1("CSmsPDU::SetClass()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETCLASS_1, "CSmsPDU::SetClass()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1011,7 +1016,7 @@
*/
EXPORT_C TBool CSmsPDU::TextCompressed() const
{
- LOGGSMU1("CSmsPDU::TextCompressed()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TEXTCOMPRESSED_1, "CSmsPDU::TextCompressed()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->TextCompressed();
@@ -1028,7 +1033,7 @@
*/
EXPORT_C void CSmsPDU::SetTextCompressed(TBool aCompressed)
{
- LOGGSMU1("CSmsPDU::SetTextCompressed()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTEXTCOMPRESSED_1, "CSmsPDU::SetTextCompressed()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1046,7 +1051,7 @@
*/
EXPORT_C TSmsDataCodingScheme::TSmsIndicationState CSmsPDU::IndicationState() const
{
- LOGGSMU1("CSmsPDU::IndicationState()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_INDICATIONSTATE_1, "CSmsPDU::IndicationState()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->IndicationState();
@@ -1063,7 +1068,7 @@
*/
EXPORT_C void CSmsPDU::SetIndicationState(TSmsDataCodingScheme::TSmsIndicationState aState)
{
- LOGGSMU1("CSmsPDU::SetIndicationState()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETINDICATIONSTATE_1, "CSmsPDU::SetIndicationState()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1081,7 +1086,7 @@
*/
EXPORT_C TSmsDataCodingScheme::TSmsIndicationType CSmsPDU::IndicationType() const
{
- LOGGSMU1("CSmsPDU::IndicationType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_INDICATIONTYPE_1, "CSmsPDU::IndicationType()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
return DataCodingScheme()->IndicationType();
@@ -1098,7 +1103,7 @@
*/
EXPORT_C void CSmsPDU::SetIndicationType(TSmsDataCodingScheme::TSmsIndicationType aType)
{
- LOGGSMU1("CSmsPDU::SetIndicationType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETINDICATIONTYPE_1, "CSmsPDU::SetIndicationType()");
__ASSERT_DEBUG(DataCodingScheme()!=NULL,Panic(KGsmuPanicDataCodingSchemeNotPresent));
TSmsDataCodingScheme* datacodingscheme=(TSmsDataCodingScheme*) DataCodingScheme();
@@ -1116,7 +1121,7 @@
*/
EXPORT_C TBool CSmsPDU::TextConcatenated(TBool* aIs16Bit) const
{
- LOGGSMU1("CSmsPDU::TextConcatenated()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TEXTCONCATENATED_1, "CSmsPDU::TextConcatenated()");
TInt index;
return DoTextConcatenated(index,aIs16Bit);
@@ -1135,7 +1140,7 @@
*/
EXPORT_C void CSmsPDU::SetTextConcatenatedL(TBool aConcatenated,TBool aIs16Bit)
{
- LOGGSMU1("CSmsPDU::SetTextConcatenatedL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTEXTCONCATENATEDL_1, "CSmsPDU::SetTextConcatenatedL()");
TInt index=0;
TInt is16bit;
@@ -1173,7 +1178,7 @@
*/
EXPORT_C TInt CSmsPDU::ConcatenatedMessageReference() const
{
- LOGGSMU1("CSmsPDU::ConcatenatedMessageReference()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1, "CSmsPDU::ConcatenatedMessageReference()");
TInt index=0;
TBool is16bit;
@@ -1201,7 +1206,7 @@
*/
EXPORT_C void CSmsPDU::SetConcatenatedMessageReference(TInt aReference)
{
- LOGGSMU1("CSmsPDU::SetConcatenatedMessageReference()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1, "CSmsPDU::SetConcatenatedMessageReference()");
TInt index=0;
TBool is16bit;
@@ -1231,7 +1236,7 @@
*/
EXPORT_C TInt CSmsPDU::NumConcatenatedMessagePDUs() const
{
- LOGGSMU1("CSmsPDU::NumConcatenatedMessagePDUs()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1, "CSmsPDU::NumConcatenatedMessagePDUs()");
TInt index=0;
TBool is16bit;
@@ -1252,7 +1257,7 @@
*/
EXPORT_C void CSmsPDU::SetNumConcatenatedMessagePDUs(TInt aNum)
{
- LOGGSMU1("CSmsPDU::SetNumConcatenatedMessagePDUs()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1, "CSmsPDU::SetNumConcatenatedMessagePDUs()");
TInt index=0;
TBool is16bit;
@@ -1274,7 +1279,7 @@
*/
EXPORT_C TInt CSmsPDU::ConcatenatedMessagePDUIndex() const
{
- LOGGSMU1("CSmsPDU::ConcatenatedMessagePDUIndex()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1, "CSmsPDU::ConcatenatedMessagePDUIndex()");
TInt index=0;
TBool is16bit;
@@ -1295,7 +1300,7 @@
*/
EXPORT_C void CSmsPDU::SetConcatenatedMessagePDUIndex(TInt aIndex)
{
- LOGGSMU1("CSmsPDU::SetConcatenatedMessagePDUIndex()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1, "CSmsPDU::SetConcatenatedMessagePDUIndex()");
TInt index=0;
TBool is16bit;
@@ -1319,7 +1324,7 @@
*/
EXPORT_C TBool CSmsPDU::ApplicationPortAddressing(TInt& aDestination,TInt& aOriginator,TBool* aIs16Bit) const
{
- LOGGSMU1("CSmsPDU::ApplicationPortAddressing()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_APPLICATIONPORTADDRESSING_1, "CSmsPDU::ApplicationPortAddressing()");
TInt index;
return DoApplicationPortAddressing(index,aDestination,aOriginator,aIs16Bit);
@@ -1338,7 +1343,7 @@
*/
EXPORT_C void CSmsPDU::SetApplicationPortAddressingL(TBool aAddressing,TInt aDestination,TInt aOriginator,TBool aIs16Bit)
{
- LOGGSMU1("CSmsPDU::SetApplicationPortAddressingL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1, "CSmsPDU::SetApplicationPortAddressingL()");
TInt index=0;
TInt is16bit;
@@ -1376,7 +1381,7 @@
*/
EXPORT_C TSmsProtocolIdentifier::TSmsPIDType CSmsPDU::PIDType() const
{
- LOGGSMU1("CSmsPDU::PIDType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PIDTYPE_1, "CSmsPDU::PIDType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
return ProtocolIdentifier()->PIDType();
@@ -1391,7 +1396,7 @@
*/
EXPORT_C void CSmsPDU::SetPIDType(TSmsProtocolIdentifier::TSmsPIDType aSmsPIDType)
{
- LOGGSMU1("CSmsPDU::SetPIDType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPIDTYPE_1, "CSmsPDU::SetPIDType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1407,7 +1412,7 @@
*/
EXPORT_C TSmsProtocolIdentifier::TSmsTelematicDeviceIndicator CSmsPDU::TelematicDeviceIndicator() const
{
- LOGGSMU1("CSmsPDU::TelematicDeviceIndicator()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TELEMATICDEVICEINDICATOR_1, "CSmsPDU::TelematicDeviceIndicator()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
return ProtocolIdentifier()->TelematicDeviceIndicator();
@@ -1422,7 +1427,7 @@
*/
EXPORT_C void CSmsPDU::SetTelematicDeviceIndicator(TSmsProtocolIdentifier::TSmsTelematicDeviceIndicator aIndicator)
{
- LOGGSMU1("CSmsPDU::SetTelematicDeviceIndicator()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTELEMATICDEVICEINDICATOR_1, "CSmsPDU::SetTelematicDeviceIndicator()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1438,7 +1443,7 @@
*/
EXPORT_C TSmsProtocolIdentifier::TSmsShortMessageType CSmsPDU::ShortMessageType() const
{
- LOGGSMU1("CSmsPDU::ShortMessageType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SHORTMESSAGETYPE_1, "CSmsPDU::ShortMessageType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
return (TSmsProtocolIdentifier::TSmsShortMessageType) ProtocolIdentifier()->ShortMessageType();
@@ -1453,7 +1458,7 @@
*/
EXPORT_C void CSmsPDU::SetShortMessageType(TSmsProtocolIdentifier::TSmsShortMessageType aShortMessageType)
{
- LOGGSMU1("CSmsPDU::SetShortMessageType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETSHORTMESSAGETYPE_1, "CSmsPDU::SetShortMessageType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1469,7 +1474,7 @@
*/
EXPORT_C TSmsProtocolIdentifier::TSmsTelematicDeviceType CSmsPDU::TelematicDeviceType() const
{
- LOGGSMU1("CSmsPDU::TelematicDeviceType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_TELEMATICDEVICETYPE_1, "CSmsPDU::TelematicDeviceType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
return ProtocolIdentifier()->TelematicDeviceType();
@@ -1484,7 +1489,7 @@
*/
EXPORT_C void CSmsPDU::SetTelematicDeviceType(TSmsProtocolIdentifier::TSmsTelematicDeviceType aDeviceType)
{
- LOGGSMU1("CSmsPDU::SetTelematicDeviceType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETTELEMATICDEVICETYPE_1, "CSmsPDU::SetTelematicDeviceType()");
__ASSERT_DEBUG(ProtocolIdentifier()!=NULL,Panic(KGsmuPanicProtocolIdentifierNotPresent));
TSmsProtocolIdentifier* protocolidentifier=(TSmsProtocolIdentifier*) ProtocolIdentifier();
@@ -1502,7 +1507,7 @@
*/
EXPORT_C TBool CSmsPDU::UserDataPresent() const
{
- LOGGSMU1("CSmsPDU::UserDataPresent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_USERDATAPRESENT_1, "CSmsPDU::UserDataPresent()");
TBool udPresent=ETrue;
switch (iSmsPDUType)
@@ -1535,7 +1540,7 @@
*/
EXPORT_C void CSmsPDU::SetUserDataPresent(TBool aPresent)
{
- LOGGSMU2("CSmsPDU::SetUserDataPresent(): aPresent=%d", aPresent);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETUSERDATAPRESENT_1, "CSmsPDU::SetUserDataPresent(): aPresent=%d", aPresent);
__ASSERT_DEBUG(ParameterIndicator()!=NULL,Panic(KGsmuPanicParameterIndicatorNotPresent));
TSmsParameterIndicator* parameterindicator=(TSmsParameterIndicator*) ParameterIndicator();
@@ -1553,7 +1558,7 @@
*/
EXPORT_C TBool CSmsPDU::DataCodingSchemePresent() const
{
- LOGGSMU1("CSmsPDU::DataCodingSchemePresent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_DATACODINGSCHEMEPRESENT_1, "CSmsPDU::DataCodingSchemePresent()");
TBool dcsPresent=ETrue;
switch (iSmsPDUType)
@@ -1587,7 +1592,7 @@
*/
EXPORT_C void CSmsPDU::SetDataCodingSchemePresent(TBool aPresent)
{
- LOGGSMU2("CSmsPDU::SetDataCodingSchemePresent(): aPresent=%d", aPresent);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETDATACODINGSCHEMEPRESENT_1, "CSmsPDU::SetDataCodingSchemePresent(): aPresent=%d", aPresent);
__ASSERT_DEBUG(ParameterIndicator()!=NULL,Panic(KGsmuPanicParameterIndicatorNotPresent));
TSmsParameterIndicator* parameterindicator=(TSmsParameterIndicator*) ParameterIndicator();
@@ -1605,7 +1610,7 @@
*/
EXPORT_C TBool CSmsPDU::ProtocolIdentifierPresent() const
{
- LOGGSMU1("CSmsPDU::ProtocolIdentifierPresent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1, "CSmsPDU::ProtocolIdentifierPresent()");
TBool pidPresent=ETrue;
switch (iSmsPDUType)
@@ -1639,7 +1644,7 @@
*/
EXPORT_C void CSmsPDU::SetProtocolIdentifierPresent(TBool aPresent)
{
- LOGGSMU2("CSmsPDU::SetProtocolIdentifierPresent(): aPresent=%d", aPresent);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1, "CSmsPDU::SetProtocolIdentifierPresent(): aPresent=%d", aPresent);
__ASSERT_DEBUG(ParameterIndicator()!=NULL,Panic(KGsmuPanicParameterIndicatorNotPresent));
TSmsParameterIndicator* parameterindicator=(TSmsParameterIndicator*) ParameterIndicator();
@@ -1656,7 +1661,7 @@
*/
EXPORT_C CSmsUserData& CSmsPDU::UserData()
{
- LOGGSMU1("CSmsPDU::UserData()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_USERDATA_1, "CSmsPDU::UserData()");
__ASSERT_DEBUG(UserDataPtr()!=NULL,Panic(KGsmuPanicUserDataNotPresent));
CSmsUserData* userdata=(CSmsUserData*) UserDataPtr();
@@ -1672,7 +1677,7 @@
*/
EXPORT_C const CSmsUserData& CSmsPDU::UserData() const
{
- LOGGSMU1("CSmsPDU::UserData()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSPDU_USERDATA1_1, "CSmsPDU::UserData()");
__ASSERT_DEBUG(UserDataPtr()!=NULL,Panic(KGsmuPanicUserDataNotPresent));
return *UserDataPtr();
@@ -1733,7 +1738,7 @@
TBool CSmsPDU::DoTextConcatenated(TInt& aIndex,TBool* aIs16Bit) const
{
- LOGGSMU1("CSmsPDU::DoTextConcatenated()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOTEXTCONCATENATED_1, "CSmsPDU::DoTextConcatenated()");
TBool is8bit=UserData().InformationElementIndex(CSmsInformationElement::ESmsIEIConcatenatedShortMessages8BitReference,aIndex);
TBool is16bit=EFalse;
@@ -1747,7 +1752,7 @@
void CSmsPDU::DoSetTextConcatenatedL(TBool aIs16Bit)
{
- LOGGSMU2("CSmsPDU::DoSetTextConcatenatedL(): aIs16Bit=%d", aIs16Bit);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOSETTEXTCONCATENATEDL_1, "CSmsPDU::DoSetTextConcatenatedL(): aIs16Bit=%d", aIs16Bit);
if (!aIs16Bit)
{
@@ -1773,7 +1778,7 @@
TBool CSmsPDU::DoApplicationPortAddressing(TInt& aIndex,TInt& aDestination,TInt& aOriginator,TBool* aIs16Bit) const
{
- LOGGSMU1("CSmsPDU::DoApplicationPortAddressing()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOAPPLICATIONPORTADDRESSING_1, "CSmsPDU::DoApplicationPortAddressing()");
TBool is8bit=UserData().InformationElementIndex(CSmsInformationElement::ESmsIEIApplicationPortAddressing8Bit,aIndex);
TBool is16bit=EFalse;
@@ -1803,8 +1808,7 @@
void CSmsPDU::DoSetApplicationPortAddressingL(TInt aDestination,TInt aOriginator,TBool aIs16Bit)
{
- LOGGSMU4("CSmsPDU::DoSetApplicationPortAddressingL(): aDestination=%d, aOriginator=%d, aIs16Bit=%d",
- aDestination, aOriginator, aIs16Bit);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1, "CSmsPDU::DoSetApplicationPortAddressingL(): aDestination=%d, aOriginator=%d, aIs16Bit=%d",aDestination, aOriginator, aIs16Bit);
if (!aIs16Bit)
{
@@ -1845,7 +1849,7 @@
*/
EXPORT_C TBool CSmsDeliver::MoreMessagesToSend() const
{
- LOGGSMU1("CSmsDeliver::MoreMessagesToSend");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_MOREMESSAGESTOSEND_1, "CSmsDeliver::MoreMessagesToSend");
return (iFirstOctet&TSmsFirstOctet::ESmsMoreMessagesToSendMask)==TSmsFirstOctet::ESmsMoreMessagesToSend;
} // CSmsDeliver::MoreMessagesToSend
@@ -1859,7 +1863,7 @@
*/
EXPORT_C void CSmsDeliver::SetMoreMessagesToSend(TBool aMore)
{
- LOGGSMU2("CSmsDeliver::SetMoreMessagesToSend(): aMore=%d", aMore);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETMOREMESSAGESTOSEND_1, "CSmsDeliver::SetMoreMessagesToSend(): aMore=%d", aMore);
iFirstOctet=aMore? (iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsMoreMessagesToSend):
(iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsNoMoreMessagesToSend);
@@ -1877,7 +1881,7 @@
*/
EXPORT_C TBool CSmsDeliver::ReplyPath() const
{
- LOGGSMU1("CSmsDeliver::ReplyPath");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_REPLYPATH_1, "CSmsDeliver::ReplyPath");
return (iFirstOctet&TSmsFirstOctet::ESmsReplyPathMask)==TSmsFirstOctet::ESmsReplyPathExists;
} // CSmsDeliver::ReplyPath
@@ -1891,7 +1895,7 @@
*/
EXPORT_C void CSmsDeliver::SetReplyPath(TBool aReplyPath)
{
- LOGGSMU2("CSmsDeliver::SetReplyPath(): aReplyPath=%d", aReplyPath);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETREPLYPATH_1, "CSmsDeliver::SetReplyPath(): aReplyPath=%d", aReplyPath);
iFirstOctet=aReplyPath? (iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathExists):
(iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathNone);
@@ -1906,7 +1910,7 @@
*/
EXPORT_C TBool CSmsDeliver::StatusReportIndication() const
{
- LOGGSMU1("CSmsDeliver::StatusReportIndication");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_STATUSREPORTINDICATION_1, "CSmsDeliver::StatusReportIndication");
return (iFirstOctet&TSmsFirstOctet::ESmsStatusReportIndicatorMask)==TSmsFirstOctet::ESmsStatusReportReturned;
} // CSmsDeliver::StatusReportIndication
@@ -1920,7 +1924,7 @@
*/
EXPORT_C void CSmsDeliver::SetStatusReportIndication(TBool aIndication)
{
- LOGGSMU2("CSmsDeliver::SetStatusReportIndication(): aIndication=%d", aIndication);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETSTATUSREPORTINDICATION_1, "CSmsDeliver::SetStatusReportIndication(): aIndication=%d", aIndication);
iFirstOctet=aIndication? (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportIndicatorMask)|TSmsFirstOctet::ESmsStatusReportReturned):
(iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportIndicatorMask)|TSmsFirstOctet::ESmsStatusReportNotReturned);
@@ -1947,7 +1951,7 @@
*/
EXPORT_C void CSmsDeliver::ServiceCenterTimeStamp(TTime& aTime,TInt& aNumQuarterHours)
{
- LOGGSMU1("CSmsDeliver::ServiceCenterTimeStamp()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SERVICECENTERTIMESTAMP_1, "CSmsDeliver::ServiceCenterTimeStamp()");
aTime=iServiceCenterTimeStamp.Time();
aNumQuarterHours=iServiceCenterTimeStamp.TimeOffset();
@@ -1963,7 +1967,7 @@
*/
EXPORT_C void CSmsDeliver::SetServiceCenterTimeStamp(const TTime& aTime,TInt aNumQuarterHours)
{
- LOGGSMU2("CSmsDeliver::ServiceCenterTimeStamp(): aNumQuarterHours=%d", aNumQuarterHours);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1, "CSmsDeliver::ServiceCenterTimeStamp(): aNumQuarterHours=%d", aNumQuarterHours);
iServiceCenterTimeStamp.SetTime(aTime);
iServiceCenterTimeStamp.SetTimeOffset(aNumQuarterHours);
@@ -1972,7 +1976,7 @@
void CSmsDeliver::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- LOGGSMU1("CSmsDeliver::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_CONSTRUCTL_1, "CSmsDeliver::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iOriginalAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -1987,7 +1991,7 @@
*/
EXPORT_C CSmsDeliver* CSmsDeliver::DuplicateL() const
{
- LOGGSMU1("CSmsDeliver::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_DUPLICATEL_1, "CSmsDeliver::DuplicateL()");
CSmsDeliver* smsDeliver = new (ELeave) CSmsDeliver();
CleanupStack::PushL(smsDeliver);
@@ -2009,7 +2013,7 @@
TUint8* CSmsDeliver::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("CSmsDeliver::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_ENCODEL_1, "CSmsDeliver::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iOriginalAddress->EncodeL(aPtr);
@@ -2026,7 +2030,7 @@
void CSmsDeliver::DecodeL(TGsmuLex8& aPdu)
{
- LOGGSMU1("CSmsDeliver::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_DECODEL_1, "CSmsDeliver::DecodeL()");
iFirstOctet.DecodeL(aPdu);
iOriginalAddress->DecodeL(aPdu);
@@ -2055,7 +2059,7 @@
void CSmsDeliver::InternalizeMessagePDUL(RReadStream& aStream)
{
- LOGGSMU1("CSmsDeliver::InternalizeMessagePDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1, "CSmsDeliver::InternalizeMessagePDUL()");
iServiceCenterAddress->InternalizeL(aStream);
@@ -2074,7 +2078,7 @@
void CSmsDeliver::ExternalizeMessagePDUL(RWriteStream& aStream) const
{
- LOGGSMU1("CSmsDeliver::ExternalizeMessagePDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1, "CSmsDeliver::ExternalizeMessagePDUL()");
iServiceCenterAddress->ExternalizeL(aStream);
@@ -2093,7 +2097,7 @@
const TSmsDataCodingScheme* CSmsDeliver::DataCodingScheme() const
{
- LOGGSMU1("CSmsDeliver::DataCodingScheme()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_DATACODINGSCHEME_1, "CSmsDeliver::DataCodingScheme()");
return &iDataCodingScheme;
} // CSmsDeliver::DataCodingScheme
@@ -2107,7 +2111,7 @@
*/
EXPORT_C const TSmsProtocolIdentifier* CSmsDeliver::ProtocolIdentifier() const
{
- LOGGSMU1("CSmsDeliver::ProtocolIdentifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVER_PROTOCOLIDENTIFIER_1, "CSmsDeliver::ProtocolIdentifier()");
return &iProtocolIdentifier;
} // CSmsDeliver::ProtocolIdentifier
@@ -2115,7 +2119,7 @@
const CSmsUserData* CSmsDeliver::UserDataPtr() const
{
- LOGGSMU1("CSmsDeliver::UserDataPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_USERDATAPTR_1, "CSmsDeliver::UserDataPtr()");
return iUserData;
} // CSmsDeliver::UserDataPtr
@@ -2123,7 +2127,7 @@
const CSmsAddress* CSmsDeliver::ToFromAddressPtr() const
{
- LOGGSMU1("CSmsDeliver::ToFromAddressPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVER_TOFROMADDRESSPTR_1, "CSmsDeliver::ToFromAddressPtr()");
return iOriginalAddress;
} // CSmsDeliver::ToFromAddressPtr
@@ -2159,7 +2163,7 @@
*/
EXPORT_C TBool CSmsSubmit::RejectDuplicates() const
{
- LOGGSMU1("CSmsSubmit::RejectDuplicates()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_REJECTDUPLICATES_1, "CSmsSubmit::RejectDuplicates()");
return (iFirstOctet&TSmsFirstOctet::ESmsRejectDuplicatesMask)==TSmsFirstOctet::ESmsRejectDuplicates;
} // CSmsSubmit::RejectDuplicates
@@ -2173,7 +2177,7 @@
*/
EXPORT_C void CSmsSubmit::SetRejectDuplicates(TBool aRejectDuplicates)
{
- LOGGSMU2("CSmsSubmit::SetRejectDuplicates(): aRejectDuplicates=%d", aRejectDuplicates);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETREJECTDUPLICATES_1, "CSmsSubmit::SetRejectDuplicates(): aRejectDuplicates=%d", aRejectDuplicates);
iFirstOctet=aRejectDuplicates? (iFirstOctet&(~TSmsFirstOctet::ESmsRejectDuplicatesMask)|TSmsFirstOctet::ESmsRejectDuplicates):
(iFirstOctet&(~TSmsFirstOctet::ESmsRejectDuplicatesMask)|TSmsFirstOctet::ESmsAcceptDuplicates);
@@ -2188,7 +2192,7 @@
*/
EXPORT_C TSmsFirstOctet::TSmsValidityPeriodFormat CSmsSubmit::ValidityPeriodFormat() const
{
- LOGGSMU1("CSmsSubmit::ValidityPeriodFormat()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_VALIDITYPERIODFORMAT_1, "CSmsSubmit::ValidityPeriodFormat()");
return iValidityPeriod.ValidityPeriodFormat();
} // TSmsFirstOctet::TSmsValidityPeriodFormat
@@ -2202,7 +2206,7 @@
*/
EXPORT_C void CSmsSubmit::SetValidityPeriodFormat(TSmsFirstOctet::TSmsValidityPeriodFormat aValidityPeriodFormat)
{
- LOGGSMU1("CSmsSubmit::SetValidityPeriodFormat()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1, "CSmsSubmit::SetValidityPeriodFormat()");
iValidityPeriod.SetValidityPeriodFormat(aValidityPeriodFormat);
} // CSmsSubmit::SetValidityPeriodFormat
@@ -2219,7 +2223,7 @@
*/
EXPORT_C TBool CSmsSubmit::ReplyPath() const
{
- LOGGSMU1("CSmsSubmit::ReplyPath()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_REPLYPATH_1, "CSmsSubmit::ReplyPath()");
return (iFirstOctet&TSmsFirstOctet::ESmsReplyPathMask)==TSmsFirstOctet::ESmsReplyPathExists;
} // CSmsSubmit::ReplyPath
@@ -2233,7 +2237,7 @@
*/
EXPORT_C void CSmsSubmit::SetReplyPath(TBool aReplyPath)
{
- LOGGSMU2("CSmsSubmit::SetReplyPath(): aReplyPath=%d", aReplyPath);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETREPLYPATH_1, "CSmsSubmit::SetReplyPath(): aReplyPath=%d", aReplyPath);
iFirstOctet=aReplyPath? (iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathExists):
(iFirstOctet&(~TSmsFirstOctet::ESmsReplyPathMask)|TSmsFirstOctet::ESmsReplyPathNone);
@@ -2250,7 +2254,7 @@
*/
EXPORT_C TBool CSmsSubmit::StatusReportRequest() const
{
- LOGGSMU1("CSmsSubmit::StatusReportRequest()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_STATUSREPORTREQUEST_1, "CSmsSubmit::StatusReportRequest()");
return (iFirstOctet&TSmsFirstOctet::ESmsStatusReportRequestMask)==TSmsFirstOctet::ESmsStatusReportRequested;
} // CSmsSubmit::StatusReportRequest
@@ -2264,7 +2268,7 @@
*/
EXPORT_C void CSmsSubmit::SetStatusReportRequest(TBool aRequest)
{
- LOGGSMU2("CSmsSubmit::SetStatusReportRequest(): aRequest=%d", aRequest);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETSTATUSREPORTREQUEST_1, "CSmsSubmit::SetStatusReportRequest(): aRequest=%d", aRequest);
iFirstOctet=aRequest? (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsStatusReportRequested):
(iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsStatusReportNotRequested);
@@ -2279,7 +2283,7 @@
*/
EXPORT_C TInt CSmsSubmit::MessageReference() const
{
- LOGGSMU1("CSmsSubmit::MessageReference()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_MESSAGEREFERENCE_1, "CSmsSubmit::MessageReference()");
return iMessageReference;
} // CSmsSubmit::MessageReference
@@ -2293,8 +2297,7 @@
*/
EXPORT_C void CSmsSubmit::SetMessageReference(TInt aMessageReference)
{
- LOGGSMU2("CSmsSubmit::SetMessageReference(): aMessageReference=%d",
- aMessageReference);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETMESSAGEREFERENCE_1, "CSmsSubmit::SetMessageReference(): aMessageReference=%d",aMessageReference);
iMessageReference=aMessageReference;
} // CSmsSubmit::SetMessageReference
@@ -2307,7 +2310,7 @@
*/
EXPORT_C const TTimeIntervalMinutes& CSmsSubmit::ValidityPeriod() const
{
- LOGGSMU1("CSmsSubmit::ValidityPeriod()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_VALIDITYPERIOD_1, "CSmsSubmit::ValidityPeriod()");
return iValidityPeriod.TimeIntervalMinutes();
} // CSmsSubmit::ValidityPeriod
@@ -2321,8 +2324,7 @@
*/
EXPORT_C void CSmsSubmit::SetValidityPeriod(const TTimeIntervalMinutes& aTimeIntervalMinutes)
{
- LOGGSMU2("CSmsSubmit::SetValidityPeriod(): aTimeIntervalMinutes",
- aTimeIntervalMinutes.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_SETVALIDITYPERIOD_1, "CSmsSubmit::SetValidityPeriod(): %d",aTimeIntervalMinutes.Int());
iValidityPeriod.SetTimeIntervalMinutes(aTimeIntervalMinutes);
} // CSmsSubmit::SetValidityPeriod
@@ -2330,7 +2332,7 @@
const TSmsDataCodingScheme* CSmsSubmit::DataCodingScheme() const
{
- LOGGSMU1("CSmsSubmit::DataCodingScheme()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_DATACODINGSCHEME_1, "CSmsSubmit::DataCodingScheme()");
return &iDataCodingScheme;
} // CSmsSubmit::DataCodingScheme
@@ -2338,7 +2340,7 @@
const TSmsProtocolIdentifier* CSmsSubmit::ProtocolIdentifier() const
{
- LOGGSMU1("CSmsSubmit::ProtocolIdentifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_PROTOCOLIDENTIFIER_1, "CSmsSubmit::ProtocolIdentifier()");
return &iProtocolIdentifier;
} // CSmsSubmit::ProtocolIdentifier
@@ -2346,7 +2348,7 @@
const CSmsUserData* CSmsSubmit::UserDataPtr() const
{
- LOGGSMU1("CSmsSubmit::UserDataPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_USERDATAPTR_1, "CSmsSubmit::UserDataPtr()");
return iUserData;
} // CSmsSubmit::UserDataPtr
@@ -2354,7 +2356,7 @@
const CSmsAddress* CSmsSubmit::ToFromAddressPtr() const
{
- LOGGSMU1("CSmsSubmit::ToFromAddressPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_TOFROMADDRESSPTR_1, "CSmsSubmit::ToFromAddressPtr()");
return iDestinationAddress;
} // CSmsSubmit::ToFromAddressPtr
@@ -2362,7 +2364,7 @@
void CSmsSubmit::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- LOGGSMU1("CSmsSubmit::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_CONSTRUCTL_1, "CSmsSubmit::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iDestinationAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -2377,7 +2379,7 @@
*/
EXPORT_C CSmsSubmit* CSmsSubmit::DuplicateL() const
{
- LOGGSMU1("CSmsSubmit::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMIT_DUPLICATEL_1, "CSmsSubmit::DuplicateL()");
CSmsSubmit* smsSubmit = new (ELeave) CSmsSubmit();
CleanupStack::PushL(smsSubmit);
@@ -2401,7 +2403,7 @@
TUint8* CSmsSubmit::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("CSmsSubmit::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_ENCODEL_1, "CSmsSubmit::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iMessageReference.EncodeL(aPtr);
@@ -2414,7 +2416,7 @@
TUint8* CSmsSubmit::EncodeL(TUint8* aPtr, const TEncodeParams* aEncodeParams) const
{
- LOGGSMU1("CSmsSubmit::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_ENCODEL1_1, "CSmsSubmit::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iMessageReference.EncodeL(aPtr);
@@ -2427,7 +2429,7 @@
void CSmsSubmit::DecodeL(TGsmuLex8& aPdu)
{
- LOGGSMU1("CSmsSubmit::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_DECODEL_1, "CSmsSubmit::DecodeL()");
iFirstOctet.DecodeL(aPdu);
iMessageReference.DecodeL(aPdu);
@@ -2447,7 +2449,7 @@
void CSmsSubmit::InternalizeMessagePDUL(RReadStream& aStream)
{
- LOGGSMU1("CSmsSubmit::InternalizeMessagePDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1, "CSmsSubmit::InternalizeMessagePDUL()");
iServiceCenterAddress->InternalizeL(aStream);
@@ -2503,7 +2505,7 @@
*/
EXPORT_C TInt CSmsDeliverReport::FailureCause() const
{
- LOGGSMU1("CSmsDeliverReport::FailureCause()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVERREPORT_FAILURECAUSE_1, "CSmsDeliverReport::FailureCause()");
__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
return iFailureCause.Error();
@@ -2518,7 +2520,7 @@
*/
EXPORT_C void CSmsDeliverReport::SetFailureCause(TSmsFailureCause::TSmsFailureCauseError aFailureCause)
{
- LOGGSMU1("CSmsDeliverReport::SetFailureCause()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVERREPORT_SETFAILURECAUSE_1, "CSmsDeliverReport::SetFailureCause()");
__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
iFailureCause.SetError(aFailureCause);
@@ -2527,7 +2529,7 @@
const TSmsDataCodingScheme* CSmsDeliverReport::DataCodingScheme() const
{
- LOGGSMU1("CSmsDeliverReport::DataCodingScheme()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_DATACODINGSCHEME_1, "CSmsDeliverReport::DataCodingScheme()");
__ASSERT_DEBUG(DataCodingSchemePresent(),Panic(KGsmuPanicDataCodingSchemeNotPresent));
return &iDataCodingScheme;
@@ -2536,7 +2538,7 @@
const TSmsProtocolIdentifier* CSmsDeliverReport::ProtocolIdentifier() const
{
- LOGGSMU1("CSmsDeliverReport::ProtocolIdentifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1, "CSmsDeliverReport::ProtocolIdentifier()");
__ASSERT_DEBUG(ProtocolIdentifierPresent(),Panic(KGsmuPanicProtocolIdentifierNotPresent));
return &iProtocolIdentifier;
@@ -2545,7 +2547,7 @@
const TSmsParameterIndicator* CSmsDeliverReport::ParameterIndicator() const
{
- LOGGSMU1("CSmsDeliverReport::ParameterIndicator()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_PARAMETERINDICATOR_1, "CSmsDeliverReport::ParameterIndicator()");
return &iParameterIndicator;
} // CSmsDeliverReport::ParameterIndicator
@@ -2553,7 +2555,7 @@
const CSmsUserData* CSmsDeliverReport::UserDataPtr() const
{
- LOGGSMU1("CSmsDeliverReport::UserDataPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_USERDATAPTR_1, "CSmsDeliverReport::UserDataPtr()");
__ASSERT_DEBUG(UserDataPresent(),Panic(KGsmuPanicUserDataNotPresent));
return iUserData;
@@ -2562,7 +2564,7 @@
void CSmsDeliverReport::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- LOGGSMU1("CSmsDeliverReport::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_CONSTRUCTL_1, "CSmsDeliverReport::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iUserData=CSmsUserData::NewL(aCharacterSetConverter,aFs,iFirstOctet,iDataCodingScheme);
@@ -2576,7 +2578,7 @@
*/
EXPORT_C CSmsDeliverReport* CSmsDeliverReport::DuplicateL() const
{
- LOGGSMU1("CSmsDeliverReport::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSDELIVERREPORT_DUPLICATEL_1, "CSmsDeliverReport::DuplicateL()");
CSmsDeliverReport* smsDeliverReport = new (ELeave) CSmsDeliverReport(iIsRPError);
CleanupStack::PushL(smsDeliverReport);
@@ -2598,7 +2600,7 @@
TUint8* CSmsDeliverReport::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("CSmsDeliverReport::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_ENCODEL_1, "CSmsDeliverReport::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
if (iIsRPError)
@@ -2620,7 +2622,7 @@
void CSmsDeliverReport::DecodeL(TGsmuLex8& aPdu)
{
- LOGGSMU1("CSmsDeliverReport::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSDELIVERREPORT_DECODEL_1, "CSmsDeliverReport::DecodeL()");
iFirstOctet.DecodeL(aPdu);
if (iIsRPError)
@@ -2717,7 +2719,7 @@
*/
EXPORT_C TInt CSmsSubmitReport::FailureCause() const
{
- LOGGSMU1("CSmsSubmitReport::FailureCause()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMITREPORT_FAILURECAUSE_1, "CSmsSubmitReport::FailureCause()");
__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
return iFailureCause.Error();
@@ -2732,7 +2734,7 @@
*/
EXPORT_C void CSmsSubmitReport::SetFailureCause(TSmsFailureCause::TSmsFailureCauseError aFailureCause)
{
- LOGGSMU1("CSmsSubmitReport::SetFailureCause()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMITREPORT_SETFAILURECAUSE_1, "CSmsSubmitReport::SetFailureCause()");
__ASSERT_DEBUG(iIsRPError,Panic(KGsmuPanicNotRPError));
iFailureCause.SetError(aFailureCause);
@@ -2741,7 +2743,7 @@
const TSmsDataCodingScheme* CSmsSubmitReport::DataCodingScheme() const
{
- LOGGSMU1("CSmsSubmitReport::DataCodingScheme()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_DATACODINGSCHEME_1, "CSmsSubmitReport::DataCodingScheme()");
__ASSERT_DEBUG(DataCodingSchemePresent(),Panic(KGsmuPanicDataCodingSchemeNotPresent));
return &iDataCodingScheme;
@@ -2750,7 +2752,7 @@
const TSmsProtocolIdentifier* CSmsSubmitReport::ProtocolIdentifier() const
{
- LOGGSMU1("CSmsSubmitReport::ProtocolIdentifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1, "CSmsSubmitReport::ProtocolIdentifier()");
__ASSERT_DEBUG(ProtocolIdentifierPresent(),Panic(KGsmuPanicProtocolIdentifierNotPresent));
return &iProtocolIdentifier;
@@ -2759,7 +2761,7 @@
const TSmsParameterIndicator* CSmsSubmitReport::ParameterIndicator() const
{
- LOGGSMU1("CSmsSubmitReport::ParameterIndicator()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_PARAMETERINDICATOR_1, "CSmsSubmitReport::ParameterIndicator()");
return &iParameterIndicator;
} // CSmsSubmitReport::ParameterIndicator
@@ -2767,7 +2769,7 @@
const CSmsUserData* CSmsSubmitReport::UserDataPtr() const
{
- LOGGSMU1("CSmsSubmitReport::UserDataPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_USERDATAPTR_1, "CSmsSubmitReport::UserDataPtr()");
__ASSERT_DEBUG(UserDataPresent(),Panic(KGsmuPanicUserDataNotPresent));
return iUserData;
@@ -2776,7 +2778,7 @@
void CSmsSubmitReport::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- LOGGSMU1("CSmsSubmitReport::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_CONSTRUCTL_1, "CSmsSubmitReport::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iUserData=CSmsUserData::NewL(aCharacterSetConverter,aFs,iFirstOctet,iDataCodingScheme);
@@ -2790,7 +2792,7 @@
*/
EXPORT_C CSmsSubmitReport* CSmsSubmitReport::DuplicateL() const
{
- LOGGSMU1("CSmsSubmitReport::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSUBMITREPORT_DUPLICATEL_1, "CSmsSubmitReport::DuplicateL()");
CSmsSubmitReport* smsSubmitReport = new (ELeave) CSmsSubmitReport(iIsRPError);
CleanupStack::PushL(smsSubmitReport);
@@ -2813,7 +2815,7 @@
TUint8* CSmsSubmitReport::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("CSmsSubmitReport::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_ENCODEL_1, "CSmsSubmitReport::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
if (iIsRPError)
@@ -2836,7 +2838,7 @@
void CSmsSubmitReport::DecodeL(TGsmuLex8& aPdu)
{
- LOGGSMU1("CSmsSubmitReport::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSUBMITREPORT_DECODEL_1, "CSmsSubmitReport::DecodeL()");
iFirstOctet.DecodeL(aPdu);
if (iIsRPError)
@@ -2931,7 +2933,7 @@
*/
EXPORT_C TBool CSmsStatusReport::MoreMessagesToSend() const
{
- LOGGSMU1("CSmsStatusReport::MoreMessagesToSend()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1, "CSmsStatusReport::MoreMessagesToSend()");
return (iFirstOctet&TSmsFirstOctet::ESmsMoreMessagesToSendMask)==TSmsFirstOctet::ESmsMoreMessagesToSend;
} // CSmsStatusReport::MoreMessagesToSend
@@ -2945,7 +2947,7 @@
*/
EXPORT_C void CSmsStatusReport::SetMoreMessagesToSend(TBool aMore)
{
- LOGGSMU1("CSmsStatusReport::SetMoreMessagesToSend()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1, "CSmsStatusReport::SetMoreMessagesToSend()");
iFirstOctet=aMore? (iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsMoreMessagesToSend):
(iFirstOctet&(~TSmsFirstOctet::ESmsMoreMessagesToSendMask)|TSmsFirstOctet::ESmsNoMoreMessagesToSend);
@@ -2961,7 +2963,7 @@
*/
EXPORT_C TSmsFirstOctet::TSmsStatusReportQualifier CSmsStatusReport::StatusReportQualifier() const
{
- LOGGSMU1("TSmsFirstOctet::TSmsStatusReportQualifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1, "CSmsStatusReport::StatusReportQualifier()");
return (TSmsFirstOctet::TSmsStatusReportQualifier) (iFirstOctet&TSmsFirstOctet::ESmsStatusReportQualifierMask);
} // TSmsFirstOctet::TSmsStatusReportQualifier
@@ -2975,7 +2977,7 @@
*/
EXPORT_C void CSmsStatusReport::SetStatusReportQualifier(TSmsFirstOctet::TSmsStatusReportQualifier aQualifier)
{
- LOGGSMU1("CSmsStatusReport::SetStatusReportQualifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1, "CSmsStatusReport::SetStatusReportQualifier()");
iFirstOctet=iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportQualifierMask)|aQualifier;
} // CSmsStatusReport::SetStatusReportQualifier
@@ -3007,7 +3009,7 @@
*/
EXPORT_C TInt CSmsStatusReport::MessageReference() const
{
- LOGGSMU2("CSmsStatusReport::MessageReference %d", (TInt)iMessageReference );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_MESSAGEREFERENCE_1, "CSmsStatusReport::MessageReference %d", (TInt)iMessageReference );
return iMessageReference;
} // CSmsStatusReport::MessageReference
@@ -3021,7 +3023,7 @@
EXPORT_C void CSmsStatusReport::SetMessageReference(TInt aMessageReference)
{
iMessageReference=aMessageReference;
- LOGGSMU2("CSmsStatusReport::SetMessageReference %d", (TInt)iMessageReference );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1, "CSmsStatusReport::SetMessageReference %d", (TInt)iMessageReference );
} // CSmsStatusReport::SetMessageReference
@@ -3034,7 +3036,7 @@
*/
EXPORT_C void CSmsStatusReport::ServiceCenterTimeStamp(TTime& aTime,TInt& aNumQuarterHours)
{
- LOGGSMU1("CSmsStatusReport::ServiceCenterTimeStamp()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1, "CSmsStatusReport::ServiceCenterTimeStamp()");
aTime=iServiceCenterTimeStamp.Time();
aNumQuarterHours=iServiceCenterTimeStamp.TimeOffset();
@@ -3050,7 +3052,7 @@
*/
EXPORT_C void CSmsStatusReport::SetServiceCenterTimeStamp(const TTime& aTime,TInt& aNumQuarterHours)
{
- LOGGSMU1("CSmsStatusReport::SetServiceCenterTimeStamp()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1, "CSmsStatusReport::SetServiceCenterTimeStamp()");
iServiceCenterTimeStamp.SetTime(aTime);
iServiceCenterTimeStamp.SetTimeOffset(aNumQuarterHours);
@@ -3066,7 +3068,7 @@
*/
EXPORT_C void CSmsStatusReport::DischargeTime(TTime& aTime,TInt& aNumQuarterHours)
{
- LOGGSMU1("CSmsStatusReport::DischargeTime()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_DISCHARGETIME_1, "CSmsStatusReport::DischargeTime()");
aTime=iDischargeTime.Time();
aNumQuarterHours=iDischargeTime.TimeOffset();
@@ -3082,7 +3084,7 @@
*/
EXPORT_C void CSmsStatusReport::SetDischargeTime(const TTime& aTime,TInt& aNumQuarterHours)
{
- LOGGSMU1("CSmsStatusReport::SetDischargeTime()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETDISCHARGETIME_1, "CSmsStatusReport::SetDischargeTime()");
iDischargeTime.SetTime(aTime);
iDischargeTime.SetTimeOffset(aNumQuarterHours);
@@ -3097,7 +3099,7 @@
*/
EXPORT_C TSmsStatus::TSmsStatusValue CSmsStatusReport::Status() const
{
- LOGGSMU2("CSmsStatusReport::Status %d", iStatus.Status());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_STATUS_1, "CSmsStatusReport::Status %d", iStatus.Status());
return iStatus.Status();
} // TSmsStatus::TSmsStatusValue
@@ -3110,7 +3112,7 @@
*/
EXPORT_C void CSmsStatusReport::SetStatus(TSmsStatus::TSmsStatusValue aValue)
{
- LOGGSMU1("CSmsStatusReport::SetStatus()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_SETSTATUS_1, "CSmsStatusReport::SetStatus()");
iStatus.SetStatus(aValue);
} // CSmsStatusReport::SetStatus
@@ -3118,7 +3120,7 @@
const TSmsDataCodingScheme* CSmsStatusReport::DataCodingScheme() const
{
- LOGGSMU1("CSmsStatusReport::DataCodingScheme()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_DATACODINGSCHEME_1, "CSmsStatusReport::DataCodingScheme()");
__ASSERT_DEBUG(DataCodingSchemePresent(),Panic(KGsmuPanicDataCodingSchemeNotPresent));
return &iDataCodingScheme;
@@ -3127,7 +3129,7 @@
const TSmsProtocolIdentifier* CSmsStatusReport::ProtocolIdentifier() const
{
- LOGGSMU1("CSmsStatusReport::ProtocolIdentifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1, "CSmsStatusReport::ProtocolIdentifier()");
__ASSERT_DEBUG(ProtocolIdentifierPresent(),Panic(KGsmuPanicProtocolIdentifierNotPresent));
return &iProtocolIdentifier;
@@ -3136,7 +3138,7 @@
const TSmsParameterIndicator* CSmsStatusReport::ParameterIndicator() const
{
- LOGGSMU1("CSmsStatusReport::ParameterIndicator()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_PARAMETERINDICATOR_1, "CSmsStatusReport::ParameterIndicator()");
__ASSERT_DEBUG(iParameterIndicatorPresent,Panic(KGsmuPanicParameterIndicatorNotPresent));
return &iParameterIndicator;
@@ -3145,7 +3147,7 @@
const CSmsUserData* CSmsStatusReport::UserDataPtr() const
{
- LOGGSMU1("CSmsStatusReport::UserDataPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_USERDATAPTR_1, "CSmsStatusReport::UserDataPtr()");
__ASSERT_DEBUG(UserDataPresent(),Panic(KGsmuPanicUserDataNotPresent));
return iUserData;
@@ -3154,7 +3156,7 @@
const CSmsAddress* CSmsStatusReport::ToFromAddressPtr() const
{
- LOGGSMU1("CSmsStatusReport::ToFromAddressPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_TOFROMADDRESSPTR_1, "CSmsStatusReport::ToFromAddressPtr()");
return iRecipientAddress;
} // CSmsStatusReport::ToFromAddressPtr
@@ -3162,7 +3164,7 @@
void CSmsStatusReport::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- LOGGSMU1("CSmsStatusReport::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_CONSTRUCTL_1, "CSmsStatusReport::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iRecipientAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -3177,7 +3179,7 @@
*/
EXPORT_C CSmsStatusReport* CSmsStatusReport::DuplicateL() const
{
- LOGGSMU1("CSmsStatusReport::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSSTATUSREPORT_DUPLICATEL_1, "CSmsStatusReport::DuplicateL()");
CSmsStatusReport* smsStatusReport = new (ELeave) CSmsStatusReport();
CleanupStack::PushL(smsStatusReport);
@@ -3204,7 +3206,7 @@
TUint8* CSmsStatusReport::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("CSmsStatusReport::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_ENCODEL_1, "CSmsStatusReport::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iMessageReference.EncodeL(aPtr);
@@ -3232,7 +3234,7 @@
void CSmsStatusReport::DecodeL(TGsmuLex8& aPdu)
{
- LOGGSMU1("CSmsStatusReport::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTATUSREPORT_DECODEL_1, "CSmsStatusReport::DecodeL()");
iFirstOctet.DecodeL(aPdu);
iMessageReference.DecodeL(aPdu);
@@ -3379,7 +3381,7 @@
*/
EXPORT_C TBool CSmsCommand::StatusReportRequest() const
{
- LOGGSMU1("CSmsCommand::StatusReportRequest()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_STATUSREPORTREQUEST_1, "CSmsCommand::StatusReportRequest()");
return (iFirstOctet&TSmsFirstOctet::ESmsStatusReportRequestMask)==TSmsFirstOctet::ESmsStatusReportRequested;
} // CSmsCommand::StatusReportRequest
@@ -3393,7 +3395,7 @@
*/
EXPORT_C void CSmsCommand::SetStatusReportRequest(TBool aRequest)
{
- LOGGSMU1("CSmsCommand::SetStatusReportRequest()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETSTATUSREPORTREQUEST_1, "CSmsCommand::SetStatusReportRequest()");
__ASSERT_DEBUG(CommandType()==TSmsCommandType::ESmsCommandTypeEnableStatusReportRequest,Panic(KGsmuPanicSetStatusReportRequestNotSupportedForCommandType));
DoSetStatusReportRequest(aRequest);
@@ -3408,7 +3410,7 @@
*/
EXPORT_C TInt CSmsCommand::MessageReference() const
{
- LOGGSMU1("CSmsCommand::MessageReference()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_MESSAGEREFERENCE_1, "CSmsCommand::MessageReference()");
return iMessageReference;
} // CSmsCommand::MessageReference
@@ -3422,7 +3424,7 @@
*/
EXPORT_C void CSmsCommand::SetMessageReference(TInt aMessageReference)
{
- LOGGSMU1("CSmsCommand::SetMessageReference()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETMESSAGEREFERENCE_1, "CSmsCommand::SetMessageReference()");
iMessageReference=aMessageReference;
} // CSmsCommand::SetMessageReference
@@ -3436,7 +3438,7 @@
*/
EXPORT_C TInt CSmsCommand::CommandType() const
{
- LOGGSMU1("CSmsCommand::CommandType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_COMMANDTYPE_1, "CSmsCommand::CommandType()");
return iCommandType.CommandType();
} // CSmsCommand::CommandType
@@ -3450,7 +3452,7 @@
*/
EXPORT_C void CSmsCommand::SetCommandType(TSmsCommandType::TSmsCommandTypeValue aCommandType)
{
- LOGGSMU1("CSmsCommand::SetCommandType()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETCOMMANDTYPE_1, "CSmsCommand::SetCommandType()");
// Some command types have default status report request
switch (aCommandType)
@@ -3483,7 +3485,7 @@
*/
EXPORT_C TInt CSmsCommand::MessageNumber() const
{
- LOGGSMU1("CSmsCommand::MessageNumber()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_MESSAGENUMBER_1, "CSmsCommand::MessageNumber()");
return iMessageNumber;
} // CSmsCommand::MessageNumber
@@ -3497,7 +3499,7 @@
*/
EXPORT_C void CSmsCommand::SetMessageNumber(TInt aMessageNumber)
{
- LOGGSMU1("CSmsCommand::SetMessageNumber()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETMESSAGENUMBER_1, "CSmsCommand::SetMessageNumber()");
iMessageNumber=aMessageNumber;
} // CSmsCommand::SetMessageNumber
@@ -3511,7 +3513,7 @@
*/
EXPORT_C TInt CSmsCommand::NumInformationElements() const
{
- LOGGSMU1("CSmsCommand::NumInformationElements()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_NUMINFORMATIONELEMENTS_1, "CSmsCommand::NumInformationElements()");
return iCommandData->NumInformationElements();
} // CSmsCommand::NumInformationElements
@@ -3526,7 +3528,7 @@
*/
EXPORT_C CSmsInformationElement& CSmsCommand::InformationElement(TInt aIndex) const
{
- LOGGSMU1("CSmsCommand::InformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_INFORMATIONELEMENT_1, "CSmsCommand::InformationElement()");
return iCommandData->InformationElement(aIndex);
} // CSmsCommand::InformationElement
@@ -3544,7 +3546,7 @@
// Ignore in code coverage - not used in SMS stack and not exported
// but cannot be removed as impacts public header.
BULLSEYE_OFF
- LOGGSMU1("CSmsCommand::InformationElementPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_INFORMATIONELEMENTPTR_1, "CSmsCommand::InformationElementPtr()");
return iCommandData->InformationElementPtr(aIndex);
BULLSEYE_RESTORE
}
@@ -3560,7 +3562,7 @@
EXPORT_C TBool CSmsCommand::InformationElementIndex(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier,
TInt& aIndex) const
{
- LOGGSMU1("CSmsCommand::InformationElementIndex()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_INFORMATIONELEMENTINDEX_1, "CSmsCommand::InformationElementIndex()");
return iCommandData->InformationElementIndex(aIdentifier,aIndex);
} // CSmsCommand::InformationElementIndex
@@ -3575,7 +3577,7 @@
*/
EXPORT_C void CSmsCommand::AddInformationElementL(CSmsInformationElement::TSmsInformationElementIdentifier aIdentifier, TDesC8& aData)
{
- LOGGSMU1("CSmsCommand::AddInformationElementL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_ADDINFORMATIONELEMENTL_1, "CSmsCommand::AddInformationElementL()");
iCommandData->AddInformationElementL(aIdentifier,aData);
} // CSmsCommand::AddInformationElementL
@@ -3589,7 +3591,7 @@
*/
EXPORT_C void CSmsCommand::RemoveInformationElement(TInt aIndex)
{
- LOGGSMU1("CSmsCommand::RemoveInformationElement()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1, "CSmsCommand::RemoveInformationElement()");
iCommandData->RemoveInformationElement(aIndex);
} // CSmsCommand::RemoveInformationElement
@@ -3603,7 +3605,7 @@
*/
EXPORT_C TInt CSmsCommand::MaxCommandDataLength() const
{
- LOGGSMU1("CSmsCommand::MaxCommandDataLength()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_MAXCOMMANDDATALENGTH_1, "CSmsCommand::MaxCommandDataLength()");
return iCommandData->MaxDataLength();
} // CSmsCommand::MaxCommandDataLength
@@ -3617,7 +3619,7 @@
*/
EXPORT_C TPtrC8 CSmsCommand::CommandData() const
{
- LOGGSMU1("CSmsCommand::CommandData()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_COMMANDDATA_1, "CSmsCommand::CommandData()");
return iCommandData->Data();
} // CSmsCommand::CommandData
@@ -3631,7 +3633,7 @@
*/
EXPORT_C void CSmsCommand::SetCommandDataL(const TDesC8& aData)
{
- LOGGSMU1("CSmsCommand::SetCommandDataL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_SETCOMMANDDATAL_1, "CSmsCommand::SetCommandDataL()");
iCommandData->SetDataL(aData);
} // CSmsCommand::SetCommandDataL
@@ -3639,7 +3641,7 @@
const TSmsProtocolIdentifier* CSmsCommand::ProtocolIdentifier() const
{
- LOGGSMU1("CSmsCommand::ProtocolIdentifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_PROTOCOLIDENTIFIER_1, "CSmsCommand::ProtocolIdentifier()");
return &iProtocolIdentifier;
} // CSmsCommand::ProtocolIdentifier
@@ -3647,7 +3649,7 @@
const CSmsAddress* CSmsCommand::ToFromAddressPtr() const
{
- LOGGSMU1("CSmsCommand::ToFromAddressPtr()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_TOFROMADDRESSPTR_1, "CSmsCommand::ToFromAddressPtr()");
return iDestinationAddress;
} // CSmsCommand::ToFromAddressPtr
@@ -3655,7 +3657,7 @@
void CSmsCommand::ConstructL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs)
{
- LOGGSMU1("CSmsCommand::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_CONSTRUCTL_1, "CSmsCommand::ConstructL()");
iServiceCenterAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
iDestinationAddress=CSmsAddress::NewL(aCharacterSetConverter,aFs);
@@ -3670,7 +3672,7 @@
*/
EXPORT_C CSmsCommand* CSmsCommand::DuplicateL() const
{
- LOGGSMU1("CSmsCommand::DuplicateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSCOMMAND_DUPLICATEL_1, "CSmsCommand::DuplicateL()");
CSmsCommand* smsCommand = new (ELeave) CSmsCommand();
CleanupStack::PushL(smsCommand);
@@ -3692,7 +3694,7 @@
TUint8* CSmsCommand::EncodeL(TUint8* aPtr) const
{
- LOGGSMU1("CSmsCommand::EncodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_ENCODEL_1, "CSmsCommand::EncodeL()");
aPtr=iFirstOctet.EncodeL(aPtr);
aPtr=iMessageReference.EncodeL(aPtr);
@@ -3714,7 +3716,7 @@
void CSmsCommand::DecodeL(TGsmuLex8& aPdu)
{
- LOGGSMU1("CSmsCommand::DecodeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_DECODEL_1, "CSmsCommand::DecodeL()");
iFirstOctet.DecodeL(aPdu);
iMessageReference.DecodeL(aPdu);
@@ -3756,7 +3758,7 @@
void CSmsCommand::DoSetStatusReportRequest(TBool aRequest)
{
- LOGGSMU1("CSmsCommand::DoSetStatusReportRequest()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1, "CSmsCommand::DoSetStatusReportRequest()");
iFirstOctet=aRequest? (iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsStatusReportRequested):
(iFirstOctet&(~TSmsFirstOctet::ESmsStatusReportRequestMask)|TSmsFirstOctet::ESmsAcceptDuplicates);
--- a/smsprotocols/smsstack/gsmu/src/gsmupriv.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmupriv.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "gsmuprivTraces.h"
+#endif
+
#include "gsmupriv.h"
#include "Gsmumain.h"
#include <exterror.h>
@@ -42,7 +48,7 @@
*/
TInt TSmsAlphabetPacker::PackL(TDes8& aOut,const TDesC8& aIn)
{
- LOGGSMU1("TSmsAlphabetPacker::PackL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_PACKL_1, "TSmsAlphabetPacker::PackL()");
// Ensure we've got the right length
TInt packedOctetsRequired=PackedOctetsRequiredL(aIn.Length());
@@ -90,7 +96,7 @@
*/
TInt TSmsAlphabetPacker::UnpackL(const TDesC8& aIn,TDes8& aOut,TInt aNumUDUnits)
{
- LOGGSMU1("TSmsAlphabetPacker::UnpackL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_UNPACKL_1, "TSmsAlphabetPacker::UnpackL()");
TInt length=aNumUDUnits;
// Ensure we've got enough input and output buffer
@@ -142,7 +148,7 @@
*/
TInt TSmsAlphabetPacker::ConvertAndPackL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,TDes8& aOut,const TDesC& aIn,TInt& aConvertedNumUDUnits)
{
- LOGGSMU1("TSmsAlphabetPacker::ConvertAndPackL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_CONVERTANDPACKL_1, "TSmsAlphabetPacker::ConvertAndPackL()");
// Do the conversion
// VEP Fix for defect EXT-568BMW, when length of alphanumeric destination address
@@ -164,7 +170,7 @@
*/
TInt TSmsAlphabetPacker::UnpackAndConvertL(CCnvCharacterSetConverter& aCharacterSetConverter,RFs& aFs,const TDesC8& aIn,TDes& aOut,TInt aNumUDUnits)
{
- LOGGSMU1("TSmsAlphabetPacker::UnpackAndConvertL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_UNPACKANDCONVERTL_1, "TSmsAlphabetPacker::UnpackAndConvertL()");
// Unpack first
HBufC8* unpackedBuffer=HBufC8::NewLC(aNumUDUnits);
@@ -187,7 +193,7 @@
*/
TInt TSmsAlphabetPacker::PackedOctetsRequiredL(TInt aNumUDUnits) const
{
- LOGGSMU1("TSmsAlphabetPacker::PackedOctetsRequiredL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_PACKEDOCTETSREQUIREDL_1, "TSmsAlphabetPacker::PackedOctetsRequiredL()");
TInt octetsRequired=0;
TInt elementSizeInBits=ElementSizeInBitsL();
@@ -218,7 +224,7 @@
*/
TInt TSmsAlphabetPacker::ElementSizeInBitsL() const
{
- LOGGSMU1("TSmsAlphabetPacker::ElementSizeInBitsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSMSALPHABETPACKER_ELEMENTSIZEINBITSL_1, "TSmsAlphabetPacker::ElementSizeInBitsL()");
TInt ret = 8;
--- a/smsprotocols/smsstack/gsmu/src/gsmusar.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmusar.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "gsmusarTraces.h"
+#endif
+
#include "gsmusar.h"
#include "Gsmumain.h"
@@ -38,7 +44,7 @@
*/
EXPORT_C CSmsBufferSegmenter* CSmsBufferSegmenter::NewLC(CSmsAlphabetConverter& aAlphabetConverter,const CSmsBufferBase& aBuffer,TInt aSegmentSize)
{
- LOGGSMU1("CSmsBufferSegmenter::NewLC()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSBUFFERSEGMENTER_NEWLC_1, "CSmsBufferSegmenter::NewLC()");
CSmsBufferSegmenter* segmenter=new(ELeave) CSmsBufferSegmenter(aAlphabetConverter,aBuffer,aSegmentSize);
CleanupStack::PushL(segmenter);
@@ -59,7 +65,7 @@
*/
void CSmsBufferSegmenter::ConstructL()
{
- LOGGSMU1("CSmsBufferSegmenter::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_CONSTRUCTL_1, "CSmsBufferSegmenter::ConstructL()");
iConvertedBuffer=HBufC8::NewMaxL(iSegmentSize);
iConvertedBufferPtr.Set((TUint8*)iConvertedBuffer->Des().Ptr(),0,iConvertedBuffer->Length());
@@ -82,7 +88,7 @@
*/
void CSmsBufferSegmenter::Reset()
{
- LOGGSMU1("CSmsBufferSegmenter::Reset()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_RESET_1, "CSmsBufferSegmenter::Reset()");
iConvertedBufferPtr.Zero();
iElementsExtracted=0;
@@ -104,12 +110,12 @@
TInt& aUnconvertedChars, TInt& aDowngradedChars,
TSmsEncoding aEncoding)
{
- LOGGSMU2("CSmsBufferSegmenter::SegmentNextL(): iSegmentSize=%d", iSegmentSize);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1, "CSmsBufferSegmenter::SegmentNextL(): iSegmentSize=%d", iSegmentSize);
TBool ret = DoSegmentNextL(aSegmentBuffer, iSegmentSize,
aUnconvertedChars, aDowngradedChars,
aEncoding);
- LOGGSMU2("CSmsBufferSegmenter::SegmentNextL() returns %d ", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2, "CSmsBufferSegmenter::SegmentNextL() returns %d ", ret);
return ret;
} // CSmsBufferSegmenter::SegmentNextL
@@ -124,7 +130,7 @@
// Returns true if this was the last segment
//
{
- LOGGSMU2("CSmsBufferSegmenter::DoSegmentNextL(): aSegmentSize=%d", aSegmentSize);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1, "CSmsBufferSegmenter::DoSegmentNextL(): aSegmentSize=%d", aSegmentSize);
__ASSERT_ALWAYS(aSegmentSize>0,Panic(KGsmuPanicIllegalSegmentSize));
__ASSERT_ALWAYS(aSegmentBuffer.MaxLength()>=aSegmentSize,Panic(KGsmuPanicSegmentBufferTooSmall));
@@ -163,7 +169,7 @@
TBool CSmsBufferSegmenter::MoreL()
{
- LOGGSMU1("CSmsBufferSegmenter::MoreL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_MOREL_1, "CSmsBufferSegmenter::MoreL()");
if ((iElementsExtracted>=iSmsBuffer.Length())&&(iConvertedBufferPtr.Length()==0))
{
@@ -190,7 +196,7 @@
*/
EXPORT_C TInt CSmsBufferSegmenter::TotalConvertedLengthL(TSmsEncoding aEncoding)
{
- LOGGSMU2("CSmsBufferSegmenter::TotalConvertedLengthL(): aEncoding=%d", aEncoding);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1, "CSmsBufferSegmenter::TotalConvertedLengthL(): aEncoding=%d", aEncoding);
// Check for shortcut
CSmsAlphabetConverter::TSmsAlphabetConversionProperties conversionProperties;
@@ -229,8 +235,7 @@
TSmsEncoding CSmsBufferSegmenter::FindBestAlternativeEncodingL(TSmsEncoding aSuggestedEncoding,
TInt aMaxBodyLength) const
{
- LOGGSMU3("CSmsBufferSegmenter::FindBestAlternativeEncodingL(): aSuggestedEncoding=%d, aMaxBodyLength=%d",
- aSuggestedEncoding, aMaxBodyLength);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1, "CSmsBufferSegmenter::FindBestAlternativeEncodingL(): aSuggestedEncoding=%d, aMaxBodyLength=%d",aSuggestedEncoding, aMaxBodyLength);
TSmsEncoding encodingToUse = ESmsEncodingNone;
@@ -266,8 +271,7 @@
*/
void CSmsBufferSegmenter::CheckConvertedBufferAllocL(TInt aMaxLength)
{
- LOGGSMU2("CSmsBufferSegmenter::CheckConvertedBufferAllocL(): aMaxLength=%d",
- aMaxLength);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1, "CSmsBufferSegmenter::CheckConvertedBufferAllocL(): aMaxLength=%d",aMaxLength);
if (iConvertedBuffer->Length()<aMaxLength)
{
@@ -284,8 +288,7 @@
*/
TInt CSmsBufferSegmenter::ElementsToReturnFromConvertedBufferL(TInt aSegmentSize)
{
- LOGGSMU2("CSmsBufferSegmenter::CheckConvertedBufferAllocL(): aSegmentSize=%d",
- aSegmentSize);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1, "CSmsBufferSegmenter::CheckConvertedBufferAllocL(): aSegmentSize=%d",aSegmentSize);
TInt elementCount=Min(aSegmentSize,iConvertedBufferPtr.Length());
if (iAlphabetConverter.Alphabet()==TSmsDataCodingScheme::ESmsAlphabet7Bit)
@@ -308,7 +311,7 @@
*/
EXPORT_C CSmsEMSBufferSegmenter* CSmsEMSBufferSegmenter::NewLC(CSmsAlphabetConverter& aAlphabetConverter,const CSmsBufferBase& aBuffer, TInt aSegmentSize)
{
- LOGGSMU2("CSmsBufferSegmenter::NewLC(): aSegmentSize=%d", aSegmentSize);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEMSBUFFERSEGMENTER_NEWLC_1, "CSmsBufferSegmenter::NewLC(): aSegmentSize=%d", aSegmentSize);
CSmsEMSBufferSegmenter* self = new (ELeave) CSmsEMSBufferSegmenter(aAlphabetConverter, aBuffer, aSegmentSize);
CleanupStack::PushL(self);
@@ -337,12 +340,12 @@
TInt& aUnconvertedChars, TInt& aDowngradedChars,
TSmsEncoding aEncoding)
{
- LOGGSMU2("CSmsEMSBufferSegmenter::SegmentNext(): aSegmentSize=%d", aSegmentSize);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1, "CSmsEMSBufferSegmenter::SegmentNext(): aSegmentSize=%d", aSegmentSize);
TBool ret=DoSegmentNextL(aSegmentBuffer, aSegmentSize, aUnconvertedChars, aDowngradedChars,
aEncoding);
- LOGGSMU2("CSmsEMSBufferSegmenter::SegmentNext() returns %d ", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2, "CSmsEMSBufferSegmenter::SegmentNext() returns %d ", ret);
return ret;
} // CSmsEMSBufferSegmenter::SegmentNextL
@@ -361,8 +364,7 @@
TInt& aUnconvertedChars, TInt& aDowngradedChars,
TSmsEncoding aEncoding)
{
- LOGGSMU3("CSmsEMSBufferSegmenter::SegmentL(): aNativeChars=%d, aSegmentMax=%d",
- aNativeChars, aSegmentMax);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEMSBUFFERSEGMENTER_SEGMENTL_1, "CSmsEMSBufferSegmenter::SegmentL(): aNativeChars=%d, aSegmentMax=%d",aNativeChars, aSegmentMax);
__ASSERT_ALWAYS(iConvertedBufferPtr.Length()==0, User::Leave(KGsmuPanicBufferNotReset));
__ASSERT_ALWAYS(aNativeChars>0,User::Leave(KGsmuPanicIllegalSegmentSize));
@@ -430,8 +432,7 @@
EXPORT_C void TSmsBufferReassembler::ReassembleNextL(const TDesC8& aSegmentBuffer,
TSmsEncoding aEncoding,TBool aIsLast)
{
- LOGGSMU3("TSmsBufferReassembler::ReassembleNextL(): aEncoding=%d aIsLast=%d",
- aEncoding, aIsLast);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1, "TSmsBufferReassembler::ReassembleNextL(): aEncoding=%d aIsLast=%d",aEncoding, aIsLast);
TPtrC nativeChars=iAlphabetConverter.ConvertToNativeL(aSegmentBuffer, aEncoding);
iSmsBuffer.InsertL(iSmsBuffer.Length(),nativeChars);
--- a/smsprotocols/smsstack/gsmu/src/gsmuset.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmuset.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -13,6 +13,12 @@
// Description:
//
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "gsmusetTraces.h"
+#endif
+
#include "gsmuset.h"
#include "smsstacklog.h"
@@ -39,7 +45,7 @@
*/
EXPORT_C TBool TSmsUserDataSettings::TextConcatenated(TBool* aIs16Bit) const
{
- LOGGSMU1("TSmsUserDataSettings::TextConcatenated()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSUSERDATASETTINGS_TEXTCONCATENATED_1, "TSmsUserDataSettings::TextConcatenated()");
if (aIs16Bit!=NULL)
*aIs16Bit=iFlags&ESmsFlagConcatenatedUsing16BitReference;
@@ -57,7 +63,7 @@
*/
EXPORT_C void TSmsUserDataSettings::SetTextConcatenated(TBool aConcatenated,TBool aIs16Bit)
{
- LOGGSMU1("TSmsUserDataSettings::SetTextConcatenated()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1, "TSmsUserDataSettings::SetTextConcatenated()");
iFlags=aIs16Bit? iFlags|ESmsFlagConcatenatedUsing16BitReference: iFlags&(~ESmsFlagConcatenatedUsing16BitReference);
iFlags=aConcatenated? iFlags|ESmsFlagConcatenated: iFlags&(~ESmsFlagConcatenated);
--- a/smsprotocols/smsstack/gsmu/src/gsmustor.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/gsmu/src/gsmustor.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "gsmustorTraces.h"
+#endif
+
#include <e32svr.h>
#include "gsmustor.h"
@@ -33,7 +39,7 @@
*/
void CSARStoreCloseObject(TAny* aObj)
{
- LOGGSMU2("WARNING! Hey, CSARStoreCloseObject called by Untrapper! [0x%08x]", aObj);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORECLOSEOBJECT_1, "WARNING! Hey, CSARStoreCloseObject called by Untrapper! [0x%08x]", aObj);
((CSARStore*)aObj)->Revert();
}
@@ -125,11 +131,7 @@
*/
EXPORT_C void CSARStore::OpenL(const TDesC& aFullName, const TUid& aThirdUid)
{
-#ifdef _SMS_LOGGING_ENABLED
- TBuf8<80> buf8;
- buf8.Copy(aFullName);
- LOGGSMU2("CSARStore::OpenL(): '%S'", &buf8);
-#endif
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_OPENL_1, "CSARStore::OpenL(): '%S'", aFullName);
// sanity check
__ASSERT_DEBUG(iFileStore==NULL,Panic(KGsmuPanicSARStoreAlreadyOpen));
@@ -145,7 +147,7 @@
TRAPD(ret, InternalizeEntryArrayL());
if (ret != KErrNone)
{
- LOGGSMU2("WARNING: InteralizeEntryArrayL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_OPENL_2, "WARNING: InteralizeEntryArrayL left with %d", ret);
}
if(ret == KErrCorrupt || ret == KErrEof || ret == KErrNotFound)
@@ -166,17 +168,16 @@
EXPORT_C void CSARStore::CommitTransactionL()
// This function does the real work of updating the filestore
{
- LOGGSMU4("CSARStore::CommitTransactionL(): this=0x%08X iInTransaction=%d iFileStore=0x%08X",
- this, iInTransaction, iFileStore);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_COMMITTRANSACTIONL_1, "CSARStore::CommitTransactionL(): this=0x%08X iInTransaction=%d iFileStore=0x%08X",(TUint)this, iInTransaction, (TUint)iFileStore);
__ASSERT_DEBUG(iFileStore!=NULL, Panic(KGsmuPanicSARStoreNotOpen));
__ASSERT_DEBUG(iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
-#ifdef _SMS_LOGGING_ENABLED
+#ifdef OST_TRACE_COMPILER_IN_USE
TRAPD(err, DoCommitAndCompactL());
if (err != KErrNone)
{
- LOGGSMU2("WARNING! could not CommitL/CompactL due to %d", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_COMMITTRANSACTIONL_2, "WARNING! could not CommitL/CompactL due to %d", err);
User::Leave(err);
}
#else
@@ -199,11 +200,7 @@
*/
EXPORT_C void CSARStore::Close()
{
-#ifdef _SMS_LOGGING_ENABLED
- TBuf8<80> buf8;
- buf8.Copy(iFullName);
- LOGGSMU2("CSARStore::Close(): '%S'", &buf8);
-#endif
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_CLOSE_1, "CSARStore::Close(): '%S'", iFullName);
__ASSERT_DEBUG(!iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
@@ -263,8 +260,7 @@
// storing it in the reassembly store.
//
{
- LOGGSMU3("CSARStore::PurgeL(): aTimeIntervalMinutes=%d, aPurgeIncompleteOnly=%d",
- aTimeIntervalMinutes.Int(), aPurgeIncompleteOnly);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL_1, "CSARStore::PurgeL(): aTimeIntervalMinutes=%d, aPurgeIncompleteOnly=%d",aTimeIntervalMinutes.Int(), aPurgeIncompleteOnly);
// TODO - flag
// we could also save the call of the method from the consruction of the smsprot
@@ -272,7 +268,7 @@
return;
TInt count=iEntryArray.Count();
- LOGGSMU2("CSARStore::PurgeL(): count=%d", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL_2, "CSARStore::PurgeL(): count=%d", count);
TTime time;
time.UniversalTime();
@@ -313,11 +309,10 @@
*/
EXPORT_C void CSARStore::PurgeL(TInt aKSegmentationLifetimeMultiplier,TBool aPurgeIncompleteOnly)
{
- LOGGSMU3("CSARStore::PurgeL(): aKSegmentationLifetimeMultiplier=%d, aPurgeIncompleteOnly=%d",
- aKSegmentationLifetimeMultiplier, aPurgeIncompleteOnly);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL1_1, "CSARStore::PurgeL(): aKSegmentationLifetimeMultiplier=%d, aPurgeIncompleteOnly=%d",aKSegmentationLifetimeMultiplier, aPurgeIncompleteOnly);
TInt count=Entries().Count();
- LOGGSMU2("CSARStore::PurgeL(): count=%d", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL1_2, "CSARStore::PurgeL(): count=%d", count);
TTime time;
time.UniversalTime();
@@ -375,7 +370,7 @@
ExternalizeEntryArrayL();
CommitTransactionL();
- LOGGSMU1("CSmsSegmentationStore::PurgeL End");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PURGEL1_3, "CSmsSegmentationStore::PurgeL End");
} // CSARStore::PurgeL
@@ -389,7 +384,7 @@
*/
EXPORT_C void CSARStore::DeleteEntryL(TInt aIndex)
{
- LOGGSMU2("CSARStore::DeleteEntryL(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_DELETEENTRYL_1, "CSARStore::DeleteEntryL(): aIndex=%d", aIndex);
DoDeleteEntryL(aIndex);
ExternalizeEntryArrayL();
@@ -427,7 +422,7 @@
*/
EXPORT_C CFileStore& CSARStore::FileStore()
{
- LOGGSMU1("CSARStore::FileStore()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_FILESTORE_1, "CSARStore::FileStore()");
__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
return *iFileStore;
@@ -444,7 +439,7 @@
{
// Ignore in code coverage - not used in SMS stack.
BULLSEYE_OFF
- LOGGSMU1("CSARStore::FileStore()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_FILESTORE1_1, "CSARStore::FileStore()");
__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
return *iFileStore;
BULLSEYE_RESTORE
@@ -463,7 +458,7 @@
*/
EXPORT_C void CSARStore::AddEntryL(const TSAREntry& aEntry)
{
- LOGGSMU1("CSARStore::AddEntryL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_ADDENTRYL_1, "CSARStore::AddEntryL()");
__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
__ASSERT_DEBUG(aEntry.DataStreamId()!=KNullStreamId,Panic(KGsmuPanicSAREntryDataStreamIdNotSet));
@@ -485,7 +480,7 @@
*/
EXPORT_C void CSARStore::ChangeEntryL(TInt aIndex,const TSAREntry& aNewEntry)
{
- LOGGSMU2("CSARStore::ChangeEntryL(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_CHANGEENTRYL_1, "CSARStore::ChangeEntryL(): aIndex=%d", aIndex);
__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
__ASSERT_DEBUG(iEntryArray[aIndex].DataStreamId()==aNewEntry.DataStreamId(),Panic(KGsmuPanicSAREntryDataStreamIdChanged));
@@ -506,7 +501,7 @@
*/
EXPORT_C TStreamId CSARStore::ExtraStreamId() const
{
- LOGGSMU1("CSARStore::ExtraStreamId");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_EXTRASTREAMID_1, "CSARStore::ExtraStreamId");
return iExtraStreamId;
} // CSARStore::ExtraStreamId
@@ -522,7 +517,7 @@
*/
EXPORT_C void CSARStore::SetExtraStreamIdL(const TStreamId& aExtraStreamId)
{
- LOGGSMU2("CSARStore::SetExtraStreamIdL(): id=%d", aExtraStreamId.Value());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_SETEXTRASTREAMIDL_1, "CSARStore::SetExtraStreamIdL(): id=%d", aExtraStreamId.Value());
__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
TStreamId streamid=iExtraStreamId;
@@ -530,7 +525,7 @@
TRAPD(ret, ExternalizeEntryArrayL());
if (ret!=KErrNone)
{
- LOGGSMU2("WARNING! CSARStore::DoExternalizeEntryArrayL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_SETEXTRASTREAMIDL_2, "WARNING! CSARStore::DoExternalizeEntryArrayL left with %d", ret);
iExtraStreamId=streamid; // Roll back
User::Leave(ret); // re-leave to allow caller to also roll back
}
@@ -548,14 +543,14 @@
*/
EXPORT_C void CSARStore::CompactL()
{
- LOGGSMU1("CSARStore::CompactL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_COMPACTL_1, "CSARStore::CompactL Start");
__ASSERT_DEBUG(iFileStore!=NULL, Panic(KGsmuPanicSARStoreNotOpen));
__ASSERT_DEBUG(iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
TInt space = iFileStore->CompactL();
iFileStore->CommitL();
- LOGGSMU2("CSARStore::CompactL End [space=%d]", space);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_COMPACTL_2, "CSARStore::CompactL End [space=%d]", space);
(void)space;
} // CSARStore::CompactL
@@ -569,11 +564,11 @@
*/
EXPORT_C void CSARStore::BeginTransactionLC()
{
- LOGGSMU4("CSARStore::BeginTransactionLC [this=0x%08X iInTransaction=%d iFileStore=0x%08X]", this, iInTransaction, iFileStore);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_BEGINTRANSACTIONLC_1, "CSARStore::BeginTransactionLC [this=0x%08X iInTransaction=%d iFileStore=0x%08X]", (TUint)this, iInTransaction, (TUint)iFileStore);
if (iFileStore == NULL || iInTransaction)
{
- LOGGSMU1("WARNING CSARStore::BeginTransactionLC leaving with KErrAccessDenied");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_BEGINTRANSACTIONLC_2, "WARNING CSARStore::BeginTransactionLC leaving with KErrAccessDenied");
User::Leave(KErrAccessDenied);
}
@@ -584,8 +579,7 @@
void CSARStore::Revert()
{
- LOGGSMU3("CSARStore::Revert(): this=0x%08X, iInTransaction=%d",
- this, iInTransaction);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_REVERT_1, "CSARStore::Revert(): this=0x%08X, iInTransaction=%d", (TUint)this, iInTransaction);
__ASSERT_DEBUG(iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
@@ -604,11 +598,8 @@
*/
EXPORT_C void CSARStore::DoOpenL()
{
-#ifdef _SMS_LOGGING_ENABLED
- TBuf8<80> buf8;
- buf8.Copy(iFullName);
- LOGGSMU3("CSARStore::DoOpenL(): '%S' this=0x%08X", &buf8, this);
-#endif
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_DOOPENL_1, "CSARStore::DoOpenL(): '%S' this=0x%08X", iFullName, (TUint)this);
+
TUidType uidtype(KPermanentFileStoreLayoutUid,KSARStoreUid,iThirdUid);
TEntry entry;
@@ -626,7 +617,7 @@
TRAP(ret,(iFileStore=CPermanentFileStore::OpenL(iFs,iFullName,EFileShareExclusive|EFileStream|EFileRead|EFileWrite)));
if(ret != KErrNone)
{
- LOGGSMU2("WARNING! CPermanentFileStore::OpenLC left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_DOOPENL_2, "WARNING! CPermanentFileStore::OpenLC left with %d", ret);
}
}
@@ -638,11 +629,8 @@
{
// create a new file and push the close function on the cleanup stack,
// so that the trap handler will close the file automatically
-#ifdef _SMS_LOGGING_ENABLED
- TBuf8<80> buf8;
- buf8.Copy(iFullName);
- LOGGSMU2("CSARStore::DoOpenL(): New file created '%S'", &buf8);
-#endif
+
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_DOOPENL_3, "CSARStore::DoOpenL(): New file created '%S'", iFullName);
TInt kerr(iFs.MkDirAll(iFullName)); //the directory may not exist, So create one.
if(kerr != KErrAlreadyExists)
{
@@ -666,18 +654,14 @@
*/
void CSARStore::DoDeleteEntryL(TInt aIndex)
{
-#ifdef _SMS_LOGGING_ENABLED
+#ifdef OST_TRACE_COMPLIER_IN_USE
const TSmsSegmentationEntry& entry = (const TSmsSegmentationEntry&)iEntryArray[aIndex];
- LOGGSMU3("CSARStore::DoDeleteEntryL [aIndex=%d Count=%d]",
- aIndex, iEntryArray.Count());
- LOGGSMU4("CSARStore::DoDeleteEntryL [aIndex=%d Delivered=%d Failed=%d]",
- aIndex, entry.Delivered(), entry.Failed());
- LOGGSMU4("CSARStore::DoDeleteEntryL [aIndex=%d Count=%d Total=%d]",
- aIndex, entry.Count(), entry.Total());
- LOGGSMU4("CSARStore::DoDeleteEntryL [aIndex=%d logId=%d StreamId=%d]",
- aIndex, entry.LogServerId(), entry.DataStreamId().Value());
-#endif // _SMS_LOGGING_ENABLED
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DODELETEENTRYL_1, "CSARStore::DoDeleteEntryL [aIndex=%d Count=%d]",aIndex, iEntryArray.Count());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DODELETEENTRYL_2, "CSARStore::DoDeleteEntryL [aIndex=%d Delivered=%d Failed=%d]",aIndex, entry.Delivered(), entry.Failed());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DODELETEENTRYL_3, "CSARStore::DoDeleteEntryL [aIndex=%d Count=%d Total=%d]",aIndex, entry.Count(), entry.Total());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DODELETEENTRYL_4, "CSARStore::DoDeleteEntryL [aIndex=%d logId=%d StreamId=%u]",aIndex, entry.LogServerId(), (TUint) entry.DataStreamId().Value());
+#endif // OST_TRACE_COMPLIER_IN_USE
__ASSERT_DEBUG(iFileStore!=NULL,Panic(KGsmuPanicSARStoreNotOpen));
TRAPD(err, iFileStore->DeleteL(iEntryArray[aIndex].DataStreamId()));
@@ -693,7 +677,7 @@
*/
void CSARStore::InternalizeEntryArrayL()
{
- LOGGSMU1("CSARStore::InternalizeEntryArrayL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_INTERNALIZEENTRYARRAYL_1, "CSARStore::InternalizeEntryArrayL()");
__ASSERT_DEBUG(iFileStore!=NULL, Panic(KGsmuPanicSARStoreNotOpen));
@@ -714,7 +698,7 @@
void CSARStore::RemoveDeletedEntries()
{
- LOGGSMU1("CSARStore::RemoveDeletedEntries()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_REMOVEDELETEDENTRIES_1, "CSARStore::RemoveDeletedEntries()");
TInt count=iEntryArray.Count();
while (count--)
@@ -731,7 +715,7 @@
void CSARStore::ReinstateDeletedEntries()
{
- LOGGSMU1("CSARStore::ReinstateDeletedEntries()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_REINSTATEDELETEDENTRIES_1, "CSARStore::ReinstateDeletedEntries()");
TInt count=iEntryArray.Count();
while (count--)
@@ -754,8 +738,7 @@
__ASSERT_DEBUG(iFileStore!=NULL, Panic(KGsmuPanicSARStoreNotOpen));
__ASSERT_DEBUG(iInTransaction, Panic(KGsmuPanicSARStoreTransaction));
- LOGGSMU4("CSARStore::ExternalizeEntryArrayL(): this=0x%08X count=%d headerid=%d]",
- this, iEntryArray.Count(), iFileStore->Root().Value());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_EXTERNALIZEENTRYARRAYL_1, "CSARStore::ExternalizeEntryArrayL(): this=0x%08X count=%d headerid=%u]",(TUint)this, iEntryArray.Count(), (TUint)iFileStore->Root().Value());
TStreamId headerid=iFileStore->Root();
RStoreWriteStream stream;
@@ -802,11 +785,18 @@
*/
void CSARStore::DoCommitAndCompactL()
{
- LOGGSMU1("CSARStore::DoCommitAndCompactL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSARSTORE_DOCOMMITANDCOMPACTL_1, "CSARStore::DoCommitAndCompactL()");
- LOGGSMUTIMESTAMP();
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ TBuf<40> timestamp;
+ SmsTimeStampL(timestamp);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSARSTORE_DOCOMMITANDCOMPACTL_2, "%S",timestamp);
+#endif
iFileStore->CommitL();
- LOGGSMUTIMESTAMP();
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ SmsTimeStampL(timestamp);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSARSTORE_DOCOMMITANDCOMPACTL_3, "%S",timestamp);
+#endif
iCommitCount--;
if (iCommitCount < 0)
@@ -826,7 +816,7 @@
*/
EXPORT_C void CSARStore::PrivatePath(TDes& aPath)
{
- LOGGSMU1("CSARStore::PrivatePath()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSARSTORE_PRIVATEPATH_1, "CSARStore::PrivatePath()");
TDriveUnit driveUnit(KStoreDrive);
TDriveName drive=driveUnit.Name();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/gsmu/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/gsmu/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,700 @@
+#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]_CENHANCEDVOICEMAILBOXINFORMATION_ACCESSADDRESS_1=0x22
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_ALMOSTMAXIMUMCAPACITY_1=0x1d
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_EXTENSIONINDICATOR_1=0x20
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_MAXIMUMCAPACITY_1=0x1f
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_NUMBEROFVOICEMESSAGES_1=0x26
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_PARSEDACCESSADDRESS_1=0x24
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_PROFILE_1=0x19
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETACCESSADDRESSL_1=0x21
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETALMOSTMAXIMUMCAPACITY_1=0x1c
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETMAXIMUMCAPACITY_1=0x1e
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETNUMBEROFVOICEMESSAGES_1=0x25
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETPARSEDACCESSADDRESSL_1=0x23
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETPROFILE_1=0x18
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETSTORAGE_1=0x1a
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_STORE_1=0x1b
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_TYPE_1=0x17
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_DTOR_1=0x3f
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_GETVOICEMAILDELETIONS_1=0x42
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWL_1=0x40
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NUMBEROFDELETES_1=0x41
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_DTOR_1=0x39
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_GETVOICEMAILNOTIFICATIONS_1=0x37
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NEWL_1=0x38
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NUMBEROFVOICEMAILS_1=0x36
+[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x95
+[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x96
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x123
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x12a
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x12b
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x124
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x11a
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x118
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x119
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x128
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x129
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x120
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x12c
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x12d
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x12e
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x125
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x122
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x121
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x116
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x117
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x12f
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x11d
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x11e
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x11f
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x11b
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x11c
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x126
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x127
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL1_1=0x3
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL_1=0x2
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL1_1=0x5
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL_1=0x4
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_NEWLC_1=0x1
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x10c
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x10d
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x10e
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x10f
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x106
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x109
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0xff
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x10b
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x105
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x104
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x108
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x101
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0xfd
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x103
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x107
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x10a
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x100
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x102
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0xfe
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0xfc
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0xfb
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0xea
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0xe8
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0xe9
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0xd9
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0xd1
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0xda
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0xd3
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0xd7
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0xd2
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0xd4
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0xd8
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0xd6
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0xd5
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x110
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x111
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x112
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x90
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x91
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x94
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x93
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x92
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x7e
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x80
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x7f
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x81
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x82
+[TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x7d
+[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA1_1=0x8
+[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA_1=0x7
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x6b
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x60
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x67
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x68
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x69
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x58
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x66
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x7a
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x5d
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x5e
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x46
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x5f
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x5c
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x4a
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x74
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x48
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x7c
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x6d
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x64
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x50
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x51
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x52
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x53
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x54
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x75
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x76
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x77
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x78
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x49
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x73
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x47
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x6c
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x5b
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x5a
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x6a
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x4e
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x4f
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x45
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x44
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x4c
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x4d
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x57
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x61
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x62
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x63
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x59
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x79
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x7b
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x56
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x6f
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x70
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x72
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x4b
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x65
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x55
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x6e
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x71
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0xad
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0xbf
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0xab
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0xaf
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0xbd
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0xb9
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0xcb
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x9a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x9b
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0xb3
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0xb5
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0xa4
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0xa5
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0xa6
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0xa7
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x98
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x99
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x97
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0xbb
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x9e
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0xa2
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0xc1
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0xcd
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x9c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0xae
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0xc0
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0xac
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0xb0
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0xbe
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0xba
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0xcc
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0xb4
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0xb6
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0xa8
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0xa9
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0xaa
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0xbc
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x9f
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0xa3
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0xc2
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0xce
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x9d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0xc6
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0xc4
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0xc8
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0xb2
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0xb8
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0xa1
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0xca
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0xc5
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0xc3
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0xc7
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0xb1
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0xb7
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0xa0
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0xd0
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0xc9
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0xcf
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x85
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x86
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x83
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x84
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x87
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x89
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x88
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x8a
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x8b
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x8c
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x8d
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x8f
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x8e
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0xf6
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0xfa
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0xf2
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0xee
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0xf4
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0xf7
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0xf3
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0xef
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0xf5
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0xf1
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0xf9
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0xf0
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0xf8
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0xed
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0xeb
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0xec
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0xe7
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0xe3
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0xdb
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0xdf
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0xe4
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0xdc
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0xe0
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0xe2
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0xde
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0xe6
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0xe1
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0xdd
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0xe5
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ADDINFORMATIONELEMENTL_1=0xc
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_BODY_1=0x10
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTINDEX_1=0xa
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTLASTINDEX_1=0xb
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENT_1=0x9
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL1_1=0x13
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL2_1=0x14
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL_1=0x12
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_MAXBODYLENGTHINCHARS_1=0xe
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_MAXBODYLENGTHINCHARS_2=0xf
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_REMOVEINFORMATIONELEMENT_1=0xd
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_SETBODYL_1=0x11
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_DTOR_1=0x3d
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_MESSAGEEXTENSIONINDICATION_1=0x3c
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_MESSAGEID_1=0x3b
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_NEWL_1=0x3e
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_SETMESSAGEID_1=0x3a
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_CALLINGLINEIDENTITY_1=0x31
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_DTOR_1=0x34
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGEEXTENSIONINDICATION_1=0x2f
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGEID_1=0x28
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGELENGTH_1=0x2a
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_NEWL_1=0x35
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_PARSEDCALLINGLINEIDENTITY_1=0x33
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_PRIORITYINDICATION_1=0x2e
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_RETENTIONDAYS_1=0x2c
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETCALLINGLINEIDENTITYL_1=0x30
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETMESSAGEID_1=0x27
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETMESSAGELENGTH_1=0x29
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETPARSEDCALLINGLINEIDENTITYL_1=0x32
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETPRIORITYINDICATION_1=0x2d
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETRETENTIONDAYS_1=0x2b
+[TRACE]TRACE_BORDER[0x84]_GSMUMAIN_PANIC_1=0x43
+[TRACE]TRACE_BORDER[0x84]_TGSMSMSTELNUMBER_ISINSTANCEOF_1=0x6
+[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_CONVERTTOETELMM_1=0x15
+[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_SETFROMETELMM_1=0x16
+[TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x113
+[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x115
+[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x114
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CONSTRUCTL_1=0x87
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR1_1=0x83
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR2_1=0x84
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR_1=0x82
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_1=0x80
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_2=0x81
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DOSETPARSEDADDRESSL_1=0x7e
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DTOR_1=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_ENCODEL_1=0x7f
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_NEWBUFFERL_1=0x7d
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_NEWL_1=0x89
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR1_1=0x86
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR_1=0x85
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_CONSTRUCTL_1=0xa8
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_CTOR1_1=0xa5
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_DECODEL_1=0xaa
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_ENCODEL_1=0xa9
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWEXTENSIONL_1=0xa4
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR1_1=0xa7
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR_1=0xa6
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_CONSTRUCTL_1=0x99
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_CTOR1_1=0x96
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_DECODEL_1=0x9b
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_ENCODEL_1=0x9a
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x95
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR1_1=0x98
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR_1=0x97
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x130
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x13a
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x139
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x133
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x132
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x131
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x138
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x134
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x135
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x136
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x137
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x17e
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x188
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x189
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x18a
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x180
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x181
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x182
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x183
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x187
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x184
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x186
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x185
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x17f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_ADDRESS_1=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DOSETPARSEDADDRESSL_1=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DUPLICATEL_1=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_NEWBUFFERL_1=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_NEWL_1=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETADDRESSL_1=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETPARSEDADDRESSL_1=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETRAWADDRESSL_1=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SIZEL_1=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_TYPEOFADDRESS_1=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL1_1=0x44
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1=0x43
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONSTRUCTL_1=0x2a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1=0x42
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3=0x30
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4=0x31
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1=0x32
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2=0x33
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3=0x34
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4=0x35
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1=0x36
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2=0x37
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3=0x38
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4=0x39
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_1=0x2c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_2=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1=0x3e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2=0x3f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1=0x40
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_2=0x41
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x17b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x176
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x178
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x17c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x17a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x179
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x177
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ADDINFORMATIONELEMENTL_1=0x6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DATA_1=0x8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DECODEL_1=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DUPLICATEL_1=0x2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ENCODEL_1=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_HEADERLENGTH_1=0xc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_HEADERPRESENT_1=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENTINDEX_1=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENTPTR_1=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENT_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_NEWL_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_REMOVEINFORMATIONELEMENT_1=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETDATAL_1=0x9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETHEADERPRESENT_1=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_TOTALHEADERLENGTHINUDLUNITS_1=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x16c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x16e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x16f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x16d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x169
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x16a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x16b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x12b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x12a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0xef
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0xee
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x157
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x153
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x159
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x158
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x155
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x154
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x156
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x142
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x147
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x144
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x143
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x146
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x145
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x149
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x148
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x17d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x105
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x101
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x100
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x102
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x103
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x104
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0xf2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0xf1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0xf3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0xf4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0xf5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0xf0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0xeb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0xea
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0xed
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0xec
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_CONSTRUCTL_1=0x59
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_DECODEL_1=0x58
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_ENCODEL_1=0x57
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_LENGTH_1=0x5b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWDATAL_1=0x5a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL1_1=0x56
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL_1=0x55
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x119
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x10d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x10e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x10f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x10c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x11e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x10b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x120
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x110
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x111
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x11b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x11c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x11d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x112
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x113
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x114
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x115
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x116
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x117
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x123
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x124
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x121
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x10a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x11f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x118
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x11a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x122
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x125
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x126
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x127
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0xbe
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xbd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0xb9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xc0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0xc1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0xc2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0xc3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0xc4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0xe4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0xe3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0xba
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0xd5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0xe6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0xe1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0xe2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0xb2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0xb1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0xab
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0xac
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0xb8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0xb6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0xb7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0xe9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0xd3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0xd4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0xc5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0xce
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0xcf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0xc6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0xc7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0xc8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0xc9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0xca
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0xcb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0xcc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0xcd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0xd0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0xd1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0xd2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0xbb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0xd6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0xd7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0xd8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0xd9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0xda
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0xdb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0xdc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0xdd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0xde
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0xe8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0xe7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0xe0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0xdf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0xad
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0xae
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0xb3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0xb4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0xaf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0xb0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0xb5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0xe5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x129
+[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x128
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x140
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x141
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x13f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x13e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x13b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x13c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x13d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0xf7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0xf6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0xf8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0xf9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0xfa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x107
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x106
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x108
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x109
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0xff
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0xfe
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0xfb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0xfc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0xfd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x166
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x161
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x168
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x167
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x163
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x162
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x165
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x164
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x15e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x15a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x160
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x15f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x15c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x15b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x15d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x14e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x14a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x151
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x150
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x14f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x152
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x14b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x14d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x14c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x12d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x12c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x12e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x12f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ADDEMSINFORMATIONELEMENTL_1=0x6c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_APPENDBODYL_1=0x6f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_BODYLENGTHINUDLUNITS_1=0x78
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_CONSTRUCTL_1=0x72
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_CONTROLINFORMATIONELEMENTWILLFITL_1=0x64
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_DECODEL1_1=0x71
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_DUPLICATEL_1=0x73
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_EMSINFORMATIONELEMENTWILLFITL_1=0x63
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ENCODEL_1=0x70
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_HEADERLENGTH_1=0x74
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_HEADERPRESENT_1=0x7a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_INFORMATIONELEMENTINDICESL_1=0x62
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_INFORMATIONELEMENTPTR_1=0x61
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ISBINARYDATA_1=0x7c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING1_1=0x6e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING_1=0x6d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_NEWBODYL_1=0x79
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_NEWL_1=0x60
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_SETHEADERPRESENT_1=0x7b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS1_1=0x77
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_1=0x75
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_2=0x76
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_1=0x65
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_2=0x66
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_3=0x67
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_4=0x68
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_5=0x69
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_6=0x6a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_7=0x6b
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_CONSTRUCTL_1=0xa2
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_CTOR1_1=0x9f
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_DECODEL_1=0x9e
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_ENCODEL_1=0x9d
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_NEWBUFFERL_1=0xa3
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_OPERATOR1_1=0xa1
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_OPERATOR_1=0xa0
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_SIZEL_1=0x9c
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CONSTRUCTL_1=0x93
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CTOR1_1=0x92
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CTOR_1=0x8f
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_DECODEL_1=0x8e
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_DOSETPARSEDADDRESSL_1=0x94
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_ENCODEL_1=0x8d
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_NEWBUFFERL_1=0x8a
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x8b
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_OPERATOR1_1=0x91
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_OPERATOR_1=0x90
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_SIZEL_1=0x8c
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_CONVERTANDPACKL_1=0x172
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_ELEMENTSIZEINBITSL_1=0x175
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_PACKEDOCTETSREQUIREDL_1=0x174
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_PACKL_1=0x170
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_UNPACKANDCONVERTL_1=0x173
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_UNPACKL_1=0x171
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_ALPHABET_1=0x18
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_ALPHABET_2=0x19
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_CLASS_1=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONSTATE_1=0x22
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONSTATE_2=0x23
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONTYPE_1=0x26
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONTYPE_2=0x27
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_1=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_2=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_3=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_4=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_5=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETCLASS_1=0x20
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETCLASS_2=0x21
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONSTATE_1=0x24
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONSTATE_2=0x25
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONTYPE_1=0x28
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONTYPE_2=0x29
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETTEXTCOMPRESSED_1=0x17
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_TEXTCOMPRESSED_1=0x16
+[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_1=0x5e
+[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_2=0x5f
+[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_1=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_2=0x5d
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGEALPROTOCOL_1=0x13
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGETYPE_1=0x15
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICEINDICATOR_1=0x10
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICETYPE_1=0x11
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SHORTMESSAGEALPROTOCOL_1=0x12
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SHORTMESSAGETYPE_1=0x14
+[TRACE]TRACE_INTERNALS[0x88]_TSMSSERVICECENTERTIMESTAMP_DECODEL_1=0x50
+[TRACE]TRACE_INTERNALS[0x88]_TSMSSERVICECENTERTIMESTAMP_ENCODEL_1=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_DECODEL_1=0x54
+[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL1_1=0x53
+[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL_1=0x52
+[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_TIME_1=0x51
--- a/smsprotocols/smsstack/smsprot/Group/SMSPROT.mmp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Group/SMSPROT.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -55,13 +55,14 @@
USERINCLUDE ../../smsu/inc
USERINCLUDE ../../gsmu/inc
USERINCLUDE ../../common/inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib estor.lib efsrv.lib esocksvr.lib esock.lib
LIBRARY etelmm.lib etel.lib gsmu.lib smsu.lib mbufmgr.lib
LIBRARY logwrap.lib bafl.lib
-DEBUGLIBRARY comsdbgutil.lib
+
LIBRARY commsdat.lib
--- a/smsprotocols/smsstack/smsprot/Group/bld.inf Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -37,113 +37,4 @@
../Group/SMSPROT.mmp
-PRJ_TESTEXPORTS
-
-../Test/TE_SMSEMSPRT/TE_SMSEMSPRT.script z:/testdata/scripts/te_smsemsprt.script
-../Test/TE_SMSEMSPRT/TE_smsemsprt_setup.script z:/testdata/scripts/te_smsemsprt_setup.script
-../Test/TE_SMSEMSPRT/te_smsemsprt_commdb.cfg z:/testdata/configs/te_smsemsprt_commdb.cfg
-
-../Test/TE_SMSPRTSTRESS/te_smsprtstress.script z:/testdata/scripts/te_smsprtstress.script
-../Test/TE_SMSPRTSTRESS/TE_smsprtstress_setup.script z:/testdata/scripts/te_smsprtstress_setup.script
-../Test/TE_SMSPRTSTRESS/te_smsprtstress_commdb.cfg z:/testdata/configs/te_smsprtstress_commdb.cfg
-
-../Test/TE_SMSCAPS/te_smscapsRead.script z:/testdata/scripts/te_smscapsread.script
-../Test/TE_SMSCAPS/te_smscapsWrite.script z:/testdata/scripts/te_smscapswrite.script
-../Test/TE_SMSCAPS/te_smscapsReadDevice.script z:/testdata/scripts/te_smscapsreaddevice.script
-../Test/TE_SMSCAPS/te_smscapsWriteDevice.script z:/testdata/scripts/te_smscapswritedevice.script
-../Test/TE_SMSCAPS/te_smscapsReadWrite.script z:/testdata/scripts/te_smscapsreadwrite.script
-../Test/TE_SMSCAPS/te_smscapsWriteNetwork.script z:/testdata/scripts/te_smscapswritenetwork.script
-../Test/TE_SMSCAPS/te_smscapsReadWriteNetwork.script z:/testdata/scripts/te_smscapsreadwritenetwork.script
-../Test/TE_SMSCAPS/te_smscapsNoReadWriteNetwork.script z:/testdata/scripts/te_smscapsnoreadwritenetwork.script
-../Test/TE_SMSCAPS/te_smscaps.script z:/testdata/scripts/te_smscaps.script
-
-../Test/configfiles/t_sms_inter_auto.txt c:/sms/t_sms_inter_auto.txt
-../Test/configfiles/t_sms_inter_ems.txt c:/sms/t_sms_inter_ems.txt
-../Test/configfiles/t_sms_inter_auto_9210.txt c:/sms/t_sms_inter_auto_9210.txt
-../Test/configfiles/t_sms_inter_auto_R520.txt c:/sms/t_sms_inter_auto_r520.txt
-../Test/configfiles/t_sms_inter_auto_T65.txt c:/sms/t_sms_inter_auto_t65.txt
-../Test/configfiles/t_sms_inter_auto_6210.txt c:/sms/t_sms_inter_auto_6210.txt
-../Test/configfiles/TWAPSMS_9210.txt c:/sms/twapsms_9210.txt
-../Test/configfiles/TWAPSMS_R520.txt c:/sms/twapsms_r520.txt
-../Test/configfiles/TWAPSMS_T65.txt c:/sms/twapsms_t65.txt
-../Test/configfiles/t_sms_inter_ems_9210.txt c:/sms/t_sms_inter_ems_9210.txt
-../Test/configfiles/t_sms_inter_ems_R520.txt c:/sms/t_sms_inter_ems_r520.txt
-../Test/configfiles/t_sms_inter_ems_T68.txt c:/sms/t_sms_inter_ems_t68.txt
-../Test/configfiles/t_sms_inter_ems_6210.txt c:/sms/t_sms_inter_ems_6210.txt
-
-../../test/configfiles/setupgsmsms.txt z:/sms/setupgsmsms.txt
-../../test/configfiles/te_intersetupgsmsms.txt z:/sms/te_intersetupgsmsms.txt
-
-../Test/configfiles/tsmsprtstress_config.txt z:/sms/tsmsprtstress_config.txt
-../Test/configfiles/tsmsemsprt_config.txt z:/sms/tsmsemsprt_config.txt
-
-../Test/configfiles/tsmscaps_config.txt z:/testdata/configs/tsmscaps_config.txt
-../Test/TE_SMSCAPS/te_smscaps.cfg z:/testdata/configs/te_smscaps.cfg
-../Test/TE_SMSCAPS/te_smscaps_setup.script z:/testdata/scripts/te_smscaps_setup.script
-
-//
-// TE_SMSINTER test files...
-//
-../Test/TE_SMSINTER/TE_smsinter.script z:/testdata/scripts/te_smsinter.script
-
-//
-// TE_SMSSTOR test files...
-//
-../Test/TE_SMSSTOR/te_smsstor.script z:/testdata/scripts/te_smsstor.script
-../Test/TE_SMSSTOR/smsreastnopdu.dat z:/sms/smsreastnopdu.dat
-../Test/TE_SMSSTOR/smsreastnostream.dat z:/sms/smsreastnostream.dat
-../Test/TE_SMSSTOR/smsreastarraynoroot.dat z:/sms/smsreastarraynoroot.dat
-../Test/TE_SMSSTOR/smsreastcountwrong.dat z:/sms/smsreastcountwrong.dat
-../Test/TE_SMSSTOR/smsreastarraynoentries.dat z:/sms/smsreastarraynoentries.dat
-../Test/TE_SMSSTOR/smswap.sms.esk z:/sms/smswap.sms-class0test.esk
-../Test/TE_SMSSTOR/smswap.sms-maxnummessagetest.esk z:/sms/smswap.sms-maxnummessagetest.esk
-../Test/TE_SMSSTOR/smswap.sms-0nummessagetest.esk z:/sms/smswap.sms-0nummessagetest.esk
-
-//
-// TE_SMSPRT test files...
-//
-../Test/TE_Smsprt/TE_smsprt.script z:/testdata/scripts/te_smsprt.script
-../Test/TE_Smsprt/TE_smsprt_setup.script z:/testdata/scripts/te_smsprt_setup.script
-../Test/TE_Smsprt/tsmsprt_config.txt z:/sms/tsmsprt_config.txt
-../Test/TE_Smsprt/tsmsprt_config_extra.txt z:/sms/tsmsprt_config_extra.txt
-../Test/TE_Smsprt/tsmsprt_config_tx_rx_maxmsg.txt z:/sms/tsmsprt_config_tx_rx_maxmsg.txt
-../Test/TE_Smsprt/TE_smsprt.cfg z:/testdata/configs/te_smsprt.cfg
-../Test/TE_Smsprt/Te_smsprt_data.ini z:/testdata/configs/te_smsprt_data.ini
-../Test/TE_Smsprt/Te_statusReportScheme.ini z:/testdata/configs/te_statusreportscheme.ini
-../Test/TE_Smsprt/TE_DiskSpaceMonitor.ini z:/testdata/configs/te_diskspacemonitor.ini
-../Test/TE_Smsprt/smswap.sms-sendTryTimeout.esk z:/sms/smswap.sms-sendtrytimeout.esk
-../Test/TE_Smsprt/smswap.sms-bootTimerTimeout.esk z:/sms/smswap.sms-boottimertimeout.esk
-../Test/TE_Smsprt/smswap.sms-AutomaticDeletionOfType0.esk z:/sms/smswap.sms-automaticdeletionoftype0.esk
-../Test/TE_Smsprt/smswap.sms-AutoDeletionClass2.esk z:/sms/smswap.sms-autodeletionclass2.esk
-../Test/TE_Smsprt/testsmswap.Sms.esk z:/sms/testsmswap.sms.esk
-
-//SMSOutOfDiskSpace
-../Test/TE_Smsprt/Te_SMSStackOutOfDiskSpace.script z:/testdata/scripts/te_smsstackoutofdiskspace.script
-../Test/TE_Smsprt/Te_SMSStackOutOfDiskSpace_ARM_UREL.script z:/testdata/scripts/te_smsstackoutofdiskspace_arm_urel.script
-../Test/TE_Smsprt/TE_SetupSMSStackOutOfDiskSpace.script z:/testdata/scripts/te_setupsmsstackoutofdiskspace.script
-../Test/TE_Smsprt/SMSOutOfDiskSpace.ini z:/testdata/configs/smsoutofdiskspace.ini
-../Test/TE_Smsprt/SMSStackOutOfDiskSpace.txt z:/sms/smsstackoutofdiskspace.txt
-../Test/TE_Smsprt/smsclass0preallocated.dat z:/testdata/configs/smsclass0preallocated.dat
-../Test/TE_Smsprt/smsclass0reast.dat z:/testdata/configs/smsclass0reast.dat
-../Test/TE_Smsprt/smswap_class0.sms.esk z:/testdata/configs/smswap_class0.sms.esk
-../Test/TE_Smsprt/smswap_DontDiscardType0s.esk z:/testdata/configs/smswap_dontdiscardtype0s.esk
-../Test/TE_Smsprt/smswap_discardType0s.esk z:/testdata/configs/smswap_discardtype0s.esk
-../Test/TE_Smsprt/smswap_MaxFivePDUsInOOD.esk z:/testdata/configs/smswap_maxfivepdusinood.esk
-../Test/TE_Smsprt/smswap_Class0DisabledMaxFivePDUsInOOD.esk z:/testdata/configs/smswap_class0disabledmaxfivepdusinood.esk
-
-//Class0RegressionTestSuite
-../Test/TE_Smsprt/smswap.sms-sendTryTimeoutClass0.esk z:/sms/smswap.sms-sendtrytimeoutclass0.esk
-../Test/TE_Smsprt/smswap.sms-bootTimerTimeoutClass0.esk z:/sms/smswap.sms-boottimertimeoutclass0.esk
-../Test/TE_Smsprt/smswap.sms-AutoDeletionClass2EnableClass0Store.esk z:/sms/smswap.sms-autodeletionclass2enableclass0store.esk
-../Test/TE_Smsprt/testsmswapClass0.Sms.esk z:/sms/testsmswapclass0.sms.esk
-../Test/TE_Smsprt/smswap.sms-class0test_onepduseg.esk z:/sms/smswap.sms-class0test_onepduseg.esk
-../Test/TE_Smsprt/TE_smsprtRegressionClass0StoreEnabled.script z:/testdata/scripts/te_smsprtregressionclass0storeenabled.script
-
-PRJ_TESTMMPFILES
-
-../Test/TE_SMSINTER/TE_smsinter.mmp
-../Test/TE_SMSSTOR/TE_smsstor.mmp
-../Test/TE_SMSEMSPRT/TE_SMSEMSPRT.mmp
-../Test/TE_SMSPRTSTRESS/TE_smsprtstress.mmp
-../Test/TE_Smsprt/TE_smsprt.mmp
-../Test/TE_SMSCAPS/te_smscaps.mmp
+#include "../test/group/bld.inf"
--- a/smsprotocols/smsstack/smsprot/Src/smspbear.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspbear.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 "smspbearTraces.h"
+#endif
+
#include <commsdattypesv1_1.h>
#include <cdbcols.h>
#include "smspmain.h"
@@ -38,7 +44,7 @@
*/
CSmspSetBearer* CSmspSetBearer::NewL(const TSmsSettings& aSmsSettings,RMobileSmsMessaging& aSmsMessaging, TInt aPriority)
{
- LOGSMSPROT2("CSmspSetBearer::NewL aPriority = %d", aPriority);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NEWL_1, "CSmspSetBearer::NewL aPriority = %d", aPriority);
CSmspSetBearer* smsSetBearer=new(ELeave) CSmspSetBearer(aSmsSettings,aSmsMessaging, aPriority);
CleanupStack::PushL(smsSetBearer);
@@ -54,7 +60,7 @@
*/
void CSmspSetBearer::ConstructL()
{
- LOGSMSPROT1("CSmspSetBearer::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_CONSTRUCTL_1, "CSmspSetBearer::ConstructL()");
CSmspCommDbEvent::ConstructL();
@@ -92,7 +98,7 @@
*/
void CSmspSetBearer::NotifyBearerSet(TRequestStatus& aStatus)
{
- LOGSMSPROT2("CSmspSetBearer::NotifyBearerSet, aStatus = %d", aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYBEARERSET_1, "CSmspSetBearer::NotifyBearerSet, aStatus = %d", aStatus.Int());
if (!iBearerSet && IsActive())
{
Cancel();
@@ -102,12 +108,12 @@
if (iBearerSet)
{
- LOGSMSPROT1("CSmspSetBearer::NotifyBearerSet RequestComplete called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYBEARERSET_2, "CSmspSetBearer::NotifyBearerSet RequestComplete called");
CSmsuActiveBase::Complete(KErrNone);
}
else
{
- LOGSMSPROT1("CSmspSetBearer::NotifyBearerSet started");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYBEARERSET_3, "CSmspSetBearer::NotifyBearerSet started");
Start();
}
} // CSmspSetBearer::NotifyBearerSet
@@ -118,7 +124,7 @@
*/
void CSmspSetBearer::Start()
{
- LOGSMSPROT1("CSmspSetBearer::Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_START_1, "CSmspSetBearer::Start");
// Cancel any outstanding request
TRAPD(err, GetSmsBearerL(iBearer));
@@ -126,7 +132,7 @@
if (err == KErrNone)
{
- LOGSMSPROT2("CSmspSetBearer::GetSmsBearerL() left with %d", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_START_2, "CSmspSetBearer::GetSmsBearerL() left with %d", err);
// Set the previous bearer to the one that has been read
// from CommDB so that iPreviousBearer has an initial value
@@ -136,7 +142,7 @@
}
else
{
- LOGSMSPROT2("CSmspSetBearer::Start failed to get SMS bearer, error = %d", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_START_3, "CSmspSetBearer::Start failed to get SMS bearer, error = %d", err);
Complete(err);
}
} // CSmspSetBearer::Start
@@ -151,7 +157,7 @@
*/
void CSmspSetBearer::DoRunL()
{
- LOGSMSPROT3("CSmspSetBearer::DoRunL(): iState=%d iStatus=%d", iState, iStatus.Int());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_1, "CSmspSetBearer::DoRunL(): iState=%d iStatus=%d", iState, iStatus.Int());
switch (iState)
{
@@ -170,13 +176,13 @@
TRAPD(err, globalSettingsRecord.LoadL(*dbSession));
if (err != KErrNone)
{
- LOGSMSPROT2("CSmspSetBearer::DoRunL, could not load global settings, leave error code = %d", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_2, "CSmspSetBearer::DoRunL, could not load global settings, leave error code = %d", err);
User::Leave(err);
}
iPreviousBearer = iBearer;
- LOGSMSPROT2("CSmspSetBearer::DoRunL Storing previous bearer setting. Previous bearer now = %d", iBearer);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_3, "CSmspSetBearer::DoRunL Storing previous bearer setting. Previous bearer now = %d", iBearer);
tempBearer = ((CCDGlobalSettingsRecord*)globalSettingsRecord.iRecords[0])->iSMSBearer;
iBearer = static_cast<RMobileSmsMessaging::TMobileSmsBearer>(tempBearer);
@@ -204,10 +210,10 @@
// (e.g. KErrNotSupported)
// Set global setting to previous value,
// then complete.
- LOGSMSPROT3("CSmspSetBearer::DoRunL TSY failed to set MO SMS bearer. status = %d. Bearer = %d", iStatus.Int(), iBearer);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_4, "CSmspSetBearer::DoRunL TSY failed to set MO SMS bearer. status = %d. Bearer = %d", iStatus.Int(), iBearer);
iBearer = iPreviousBearer;
- LOGSMSPROT2("CSmspSetBearer::DoRunL Setting bearer back to previous setting. Bearer = %d", iBearer);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_5, "CSmspSetBearer::DoRunL Setting bearer back to previous setting. Bearer = %d", iBearer);
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
CMDBSession *dbSession = CMDBSession::NewL(KCDVersion1_2);
@@ -219,7 +225,7 @@
TRAPD(err, globalSettingsRecord.LoadL(*dbSession));
if (err != KErrNone)
{
- LOGSMSPROT2("CSmspSetBearer::DoRunL could not load global settings, error = %d", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_6, "CSmspSetBearer::DoRunL could not load global settings, error = %d", err);
User::Leave(err);
}
@@ -227,7 +233,7 @@
TRAP(err, globalSettingsRecord.ModifyL(*dbSession));
if (err != KErrNone)
{
- LOGSMSPROT2("CSmspSetBearer::DoRunL could not modify global settings, error = %d", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_7, "CSmspSetBearer::DoRunL could not modify global settings, error = %d", err);
User::Leave(err);
}
@@ -256,7 +262,7 @@
*/
void CSmspSetBearer::DoCancel()
{
- LOGSMSPROT1("CSmspSetBearer::DoCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DOCANCEL_1, "CSmspSetBearer::DoCancel");
TimedSetActiveCancel();
@@ -313,7 +319,7 @@
*/
void CSmspSetBearer::GetSmsBearerL(RMobileSmsMessaging::TMobileSmsBearer& aBearer)
{
- LOGSMSPROT1("CSmspSetBearer::GetSmsBearerL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_GETSMSBEARERL_1, "CSmspSetBearer::GetSmsBearerL()");
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
CMDBSession* sess = CMDBSession::NewL(KCDVersion1_2);
@@ -331,7 +337,7 @@
smsBearerField->LoadL(*sess);
aBearer = static_cast<RMobileSmsMessaging::TMobileSmsBearer>(static_cast<TUint32>(*smsBearerField));
- LOGSMSPROT2("CSmspSetBearer::GetSmsBearerL(): aBearer=%d", aBearer);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_GETSMSBEARERL_2, "CSmspSetBearer::GetSmsBearerL(): aBearer=%d", aBearer);
CleanupStack::PopAndDestroy(smsBearerField);
CleanupStack::PopAndDestroy(sess);
@@ -344,7 +350,7 @@
*/
void CSmspSetBearer::SetSmsBearer()
{
- LOGSMSPROT2("CSmspSetBearer::SetSmsBearer, iBearer = %d", iBearer);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_SETSMSBEARER_1, "CSmspSetBearer::SetSmsBearer, iBearer = %d", iBearer);
iBearerSet = EFalse;
iState = ESmsSetBearerStateSettingBearer;
@@ -359,7 +365,7 @@
*/
void CSmspSetBearer::NotifyOnEvent()
{
- LOGSMSPROT1("CSmspSetBearer::NotifyOnEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYONEVENT_1, "CSmspSetBearer::NotifyOnEvent");
iState = ESmsSetBearerNotifyOnEvent;
CSmspCommDbEvent::NotifyOnEvent();
--- a/smsprotocols/smsstack/smsprot/Src/smspcdb.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspcdb.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspcdbTraces.h"
+#endif
+
#include "smspcdb.h"
#include "smspmain.h"
#include "smsuset.h"
@@ -48,7 +54,7 @@
void CSmspCommDbEvent::ConstructL()
{
- LOGSMSPROT1("CSmspCommDbEvent::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPCOMMDBEVENT_CONSTRUCTL_1, "CSmspCommDbEvent::ConstructL()");
ConstructTimeoutL();
} // CSmspCommDbEvent::ConstructL
@@ -60,7 +66,7 @@
*/
void CSmspCommDbEvent::NotifyOnEvent()
{
- LOGSMSPROT1("CSmspCommDbEvent::NotifyOnEvent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPCOMMDBEVENT_NOTIFYONEVENT_1, "CSmspCommDbEvent::NotifyOnEvent()");
iProperty.Subscribe(iStatus);
SetActive();
@@ -74,7 +80,7 @@
*/
void CSmspCommDbEvent::Complete(TInt aError)
{
- LOGSMSPROT1("CSmspCommDbEvent::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPCOMMDBEVENT_COMPLETE_1, "CSmspCommDbEvent::Complete()");
//
// Call the base function to perform the actual complete...
--- a/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspclass0stor.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +18,12 @@
/**
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspclass0storTraces.h"
+#endif
+
#include "smspclass0stor.h"
#include "gsmubuf.h"
#include "gsmunonieoperations.h"
@@ -51,7 +57,7 @@
*/
CSmsPermanentFileStore* CSmsPermanentFileStore::NewL(RFs& aFs, const TDesC& aFileName, const TUid& aThirdUid)
{
- LOGSMSPROT1("CSmsPermanentFileStore::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_NEWL_1, "CSmsPermanentFileStore::NewL()");
CSmsPermanentFileStore* self = new (ELeave) CSmsPermanentFileStore(aFs, aThirdUid);
CleanupStack::PushL(self);
self->ConstructL(aFileName);
@@ -62,7 +68,7 @@
void CSmsPermanentFileStore::ConstructL(const TDesC& aFileName)
{
- LOGSMSPROT1("CSmsPermanentFileStore::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CONSTRUCTL_1, "CSmsPermanentFileStore::ConstructL()");
iFileName = aFileName.AllocL();
}
@@ -109,7 +115,7 @@
*/
void CSmsPermanentFileStore::CreateL()
{
- LOGSMSPROT1("CSmsPermanentFileStore::CreateL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CREATEL_1, "CSmsPermanentFileStore::CreateL()");
TUidType uidtype(KPermanentFileStoreLayoutUid,KSARStoreUid,iThirdUid);
iFileStore=CPermanentFileStore::ReplaceL(iFs, iFileName->Des(), EFileShareExclusive|EFileStream|EFileRead|EFileWrite);
iFileStore->SetTypeL(uidtype);
@@ -129,7 +135,7 @@
*/
void CSmsPermanentFileStore::OpenL()
{
- LOGSMSPROT1("CSmsPermanentFileStore::OpenL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_OPENL_1, "CSmsPermanentFileStore::OpenL()");
iFileStore=CPermanentFileStore::OpenL(iFs,iFileName->Des(),EFileShareExclusive|EFileStream|EFileRead|EFileWrite);
InternalizeEntryArrayL();
}
@@ -141,7 +147,7 @@
*/
void CSmsPermanentFileStore::Close()
{
- LOGSMSPROT1("CSmsPermanentFileStore::Close()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CLOSE_1, "CSmsPermanentFileStore::Close()");
delete iFileStore;
iFileStore = NULL;
iEntryArray.Reset();
@@ -165,7 +171,7 @@
{
// Ignore in code coverage - a previous CleanupEntries would need to have failed with KErrDiskFull
BULLSEYE_OFF
- LOGSMSPROT1("CSmsPermanentFileStore::CleanupEntriesWithCompactL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CLEANUPENTRIESWITHCOMPACTL_1, "CSmsPermanentFileStore::CleanupEntriesWithCompactL()");
iCompact = ETrue;
CleanupEntriesL(aEntryArray);
@@ -187,7 +193,7 @@
*/
void CSmsPermanentFileStore::CleanupEntriesL(const CArrayFix<TSmsPreAllocatedFileStoreReassemblyEntry>& aEntryArray)
{
- LOGSMSPROT1("CSmsPermanentFileStore::CleanupEntriesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CLEANUPENTRIESL_1, "CSmsPermanentFileStore::CleanupEntriesL()");
TInt reassemblyCount = iEntryArray.Count();
TInt index, index2;
@@ -257,7 +263,7 @@
*/
void CSmsPermanentFileStore::InternalizeEntryArrayL()
{
- LOGSMSPROT1("CSmsPermanentFileStore::InternalizeEntryArrayL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_INTERNALIZEENTRYARRAYL_1, "CSmsPermanentFileStore::InternalizeEntryArrayL()");
iEntryArray.Reset();
TStreamId headerid=iFileStore->Root();
@@ -280,8 +286,7 @@
*/
void CSmsPermanentFileStore::ExternalizeEntryArrayL()
{
- LOGSMSPROT4("CSmsPermanentFileStore::ExternalizeEntryArrayL(): this=0x%08X count=%d headerid=%d]",
- this, iEntryArray.Count(), iFileStore->Root().Value());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYARRAYL_1, "CSmsPermanentFileStore::ExternalizeEntryArrayL(): this=0x%08X count=%d headerid=%u]",(TUint) this, iEntryArray.Count(), (TUint)iFileStore->Root().Value());
TStreamId headerid=iFileStore->Root();
RStoreWriteStream stream;
@@ -330,7 +335,7 @@
*/
void CSmsPermanentFileStore::AddNewMessageL(TInt& aIndex, CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
{
- LOGSMSPROT1("CSmsPermanentFileStore::AddNewMessageL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_ADDNEWMESSAGEL_1, "CSmsPermanentFileStore::AddNewMessageL");
CArrayFix<TInt>* indexArray=new(ELeave) CArrayFixFlat<TInt>(KFlatArrayGranularity);
CleanupStack::PushL(indexArray);
@@ -371,7 +376,7 @@
*/
void CSmsPermanentFileStore::UpdateExistingMessageL(TInt aIndex, const CSmsMessage& aSmsMessage,const CArrayFix<TInt>& aIndexArray,const CArrayFix<TGsmSms>& aSmsArray)
{
- LOGSMSPROT1("CSmsPermanentFileStore::UpdateExistingMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_UPDATEEXISTINGMESSAGEL_1, "CSmsPermanentFileStore::UpdateExistingMessageL()");
TStreamId streamid = iEntryArray[aIndex].DataStreamId();
ExternalizeEntryL(streamid, aSmsMessage, aIndexArray, aSmsArray);
TSmsReassemblyEntry entry;
@@ -392,7 +397,7 @@
void CSmsPermanentFileStore::MatchEntryToExistingMessage(const TReassemblyEntry& aEntry,
TInt& aIndex)
{
- LOGSMSPROT1("CSmsPermanentFileStore::MatchEntryToExistingMessage()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_1, "CSmsPermanentFileStore::MatchEntryToExistingMessage()");
aIndex = KErrNotFound;
@@ -418,7 +423,7 @@
}
}
- LOGSMSPROT2("CSmsPermanentFileStore::MatchEntryToExistingMessage(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_2, "CSmsPermanentFileStore::MatchEntryToExistingMessage(): aIndex=%d", aIndex);
}
/*
@@ -431,7 +436,7 @@
*/
void CSmsPermanentFileStore::UpdateLogServerIdL(TInt& aIndex, TLogId aLogServerId)
{
- LOGSMSPROT1("CSmsPermanentFileStore::UpdateLogServerIdL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_UPDATELOGSERVERIDL_1, "CSmsPermanentFileStore::UpdateLogServerIdL");
TSmsReassemblyEntry entry;
entry = iEntryArray[aIndex];
@@ -453,7 +458,7 @@
*/
void CSmsPermanentFileStore::SetPassedToClientL(TInt aIndex, TBool aBool)
{
- LOGSMSPROT2("CSmsPermanentFileStore::SetPassedToClientL(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_SETPASSEDTOCLIENTL_1, "CSmsPermanentFileStore::SetPassedToClientL(): aIndex=%d", aIndex);
TSmsReassemblyEntry entry;
entry = iEntryArray[aIndex];
@@ -488,7 +493,7 @@
*/
void CSmsPermanentFileStore::ChangeEntryL(TInt aIndex,const TSmsReassemblyEntry& aNewEntry)
{
- LOGSMSPROT2("CSmsPermanentFileStore::ChangeEntryL(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_CHANGEENTRYL_1, "CSmsPermanentFileStore::ChangeEntryL(): aIndex=%d", aIndex);
iEntryArray[aIndex].SetIsDeleted(ETrue);
iEntryArray.InsertL(aIndex,aNewEntry);
@@ -520,7 +525,7 @@
*/
void CSmsPermanentFileStore::ExternalizeEntryL(TStreamId& aStreamId,const CSmsMessage& aSmsMessage,const CArrayFix<TInt>& aIndexArray,const CArrayFix<TGsmSms>& aSmsArray)
{
- LOGSMSPROT2("CSmsPermanentFileStore::ExternalizeEntryL Start [sid=%d]", aStreamId.Value());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_1, "CSmsPermanentFileStore::ExternalizeEntryL Start [sid=%d]", aStreamId.Value());
RStoreWriteStream writestream;
if (aStreamId==KNullStreamId)
@@ -544,7 +549,7 @@
writestream.CommitL();
CleanupStack::PopAndDestroy();
- LOGSMSPROT2("CClass0PermanentFileStore::ExternalizeEntryL End [count=%d]", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_2, "CClass0PermanentFileStore::ExternalizeEntryL End [count=%d]", count);
}
/*
@@ -560,7 +565,7 @@
void CSmsPermanentFileStore::InternalizeEntryL(const TInt aIndex, CSmsMessage& aSmsMessage, CArrayFix<TInt>& aIndexArray, CArrayFix<TGsmSms>& aSmsArray)
{
TSmsReassemblyEntry& entry = iEntryArray[aIndex];
- LOGSMSPROT2("CSmsPermanentFileStore::InternalizeEntryL Start [sid=%d]", entry.DataStreamId().Value());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_1, "CSmsPermanentFileStore::InternalizeEntryL Start [sid=%d]", entry.DataStreamId().Value());
RStoreReadStream readstream;
readstream.OpenLC(*iFileStore, entry.DataStreamId());
readstream >> aSmsMessage;
@@ -589,7 +594,7 @@
aSmsMessage.SetStorage(entry.Storage());
aSmsMessage.SetLogServerId(entry.LogServerId());
aSmsMessage.SetTime(entry.Time());
- LOGSMSPROT2("CSmsPermanentFileStore::InternalizeEntryL End [count=%d]", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_2, "CSmsPermanentFileStore::InternalizeEntryL End [count=%d]", count);
}
/*
@@ -607,7 +612,7 @@
*/
void CSmsPermanentFileStore::RemovePDUsL(TInt aIndex, TInt aStartPos, TInt aEndPos)
{
- LOGSMSPROT1("CSmsPermanentFileStore::RemovePDUsL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_REMOVEPDUSL_1, "CSmsPermanentFileStore::RemovePDUsL");
CSmsBuffer* buffer = CSmsBuffer::NewL();
CSmsMessage* smsMessage = CSmsMessage::NewL(iFs, CSmsPDU::ESmsDeliver, buffer);
@@ -664,11 +669,11 @@
*/
void CSmsPermanentFileStore::BeginTransactionL()
{
- LOGSMSPROT4("CSmsPermanentFileStore::BeginTransactionL [this=0x%08X iInTransaction=%d iFileStore=0x%08X]", this, iInTransaction, iFileStore);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_1, "CSmsPermanentFileStore::BeginTransactionL [this=0x%08X iInTransaction=%d iFileStore=0x%08X]", (TUint)this, iInTransaction, (TUint)iFileStore);
if (iFileStore == NULL || iInTransaction)
{
- LOGSMSPROT1("WARNING CSmsPermanentFileStore::BeginTransactionL leaving with KErrAccessDenied");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_2, "WARNING CSmsPermanentFileStore::BeginTransactionL leaving with KErrAccessDenied");
User::Leave(KErrAccessDenied);
}
@@ -680,8 +685,7 @@
*/
void CSmsPermanentFileStore::Revert()
{
- LOGSMSPROT3("CSmsPermanentFileStore::Revert(): this=0x%08X, iInTransaction=%d",
- this, iInTransaction);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_REVERT_1, "CSmsPermanentFileStore::Revert(): this=0x%08X, iInTransaction=%d",(TUint)this, iInTransaction);
iFileStore->Revert();
iInTransaction = EFalse;
@@ -693,11 +697,18 @@
*/
void CSmsPermanentFileStore::DoCommitAndCompactL()
{
- LOGSMSPROT1("CSmsPermanentFileStore::DoCommitAndCompactL()");
-
- LOGSMSPROTTIMESTAMP();
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_1, "CSmsPermanentFileStore::DoCommitAndCompactL()");
+
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ TBuf<40> timestamp;
+ SmsTimeStampL(timestamp);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_2, "%S",timestamp);
+#endif
iFileStore->CommitL();
- LOGSMSPROTTIMESTAMP();
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ SmsTimeStampL(timestamp);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_3, "%S",timestamp);
+#endif
iCommitCount--;
if ((iCommitCount < 0) || (iCompact))
@@ -714,16 +725,15 @@
*/
void CSmsPermanentFileStore::CommitTransactionL()
{
- LOGSMSPROT4("CSmsPermanentFileStore::CommitTransactionL(): this=0x%08X iInTransaction=%d iFileStore=0x%08X",
- this, iInTransaction, iFileStore);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_1, "CSmsPermanentFileStore::CommitTransactionL(): this=0x%08X iInTransaction=%d iFileStore=0x%08X",(TUint)this, iInTransaction, (TUint)iFileStore);
ExternalizeEntryArrayL();
-#ifdef _SMS_LOGGING_ENABLED
+#ifdef OST_TRACE_COMPLIER_IN_USE
TRAPD(err, DoCommitAndCompactL());
if (err != KErrNone)
{
- LOGGSMU2("WARNING! could not CommitL/CompactL due to %d", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_2, "WARNING! could not CommitL/CompactL due to %d", err);
User::Leave(err);
}
#else
@@ -740,7 +750,7 @@
*/
void CSmsPermanentFileStore::RemoveDeletedEntries()
{
- LOGSMSPROT1("CSmsPermanentFileStore::RemoveDeletedEntries()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_REMOVEDELETEDENTRIES_1, "CSmsPermanentFileStore::RemoveDeletedEntries()");
TInt count=iEntryArray.Count();
while (count--)
@@ -764,7 +774,7 @@
*/
void CSmsPermanentFileStore::ReinstateDeletedEntries()
{
- LOGSMSPROT1("CSmsPermanentFileStore::ReinstateDeletedEntries()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPERMANENTFILESTORE_REINSTATEDELETEDENTRIES_1, "CSmsPermanentFileStore::ReinstateDeletedEntries()");
TInt count=iEntryArray.Count();
while (count--)
@@ -849,7 +859,7 @@
*/
CPreallocatedFile* CPreallocatedFile::NewL(RFs& aFs, const TDesC& aFileName, TInt aMaxClass0Msg, TInt aMaxPDUSeg, TPreAllocatedFileVersion aVersion)
{
- LOGSMSPROT1("CPreallocatedFile::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_NEWL_1, "CPreallocatedFile::NewL()");
CPreallocatedFile* self = new (ELeave) CPreallocatedFile(aFs, aMaxClass0Msg, aMaxPDUSeg, aVersion);
CleanupStack::PushL(self);
self->ConstructL(aFileName);
@@ -860,7 +870,7 @@
void CPreallocatedFile::ConstructL(const TDesC& aFileName)
{
- LOGSMSPROT1("CPreallocatedFile::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_CONSTRUCTL_1, "CPreallocatedFile::ConstructL()");
iFileName = aFileName.AllocL();
}
@@ -914,7 +924,7 @@
*/
TBool CPreallocatedFile::IsFileOK()
{
- LOGSMSPROT1("CPreallocatedFile::IsFileOK()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_ISFILEOK_1, "CPreallocatedFile::IsFileOK()");
TEntry entry;
// Check file exists
@@ -943,7 +953,7 @@
*/
void CPreallocatedFile::CreateL()
{
- LOGSMSPROT1("CPreallocatedFile::CreateL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_CREATEL_1, "CPreallocatedFile::CreateL");
User::LeaveIfError(iFile.Replace(iFs, iFileName->Des(), EFileWrite));
User::LeaveIfError(iFile.SetSize(iSizeOfFile));
@@ -1098,7 +1108,7 @@
*/
void CPreallocatedFile::AddNewMessageL(TInt& aIndex, CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
{
- LOGSMSPROT1("CPreallocatedFile::AddNewMessageL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_ADDNEWMESSAGEL_1, "CPreallocatedFile::AddNewMessageL");
//Gets the next free slot where the message will be stored.
TInt nextFreeSlot = GetFreeContainer();
TInt pduIndex=aSmsMessage.IsDecoded()? 0: aSmsMessage.SmsPDU().ConcatenatedMessagePDUIndex();
@@ -1147,7 +1157,7 @@
*/
void CPreallocatedFile::UpdateExistingMessageL(TInt aIndex, const CSmsMessage& aSmsMessage, TInt aPduIndex, const TGsmSms& aSms)
{
- LOGSMSPROT1("CPreallocatedFile::UpdateExistingMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_UPDATEEXISTINGMESSAGEL_1, "CPreallocatedFile::UpdateExistingMessageL()");
TInt preAllocatedStorageId = iEntryArray[aIndex].PreAllocatedStorageId();
if (preAllocatedStorageId == KErrNotFound)
{
@@ -1195,7 +1205,7 @@
void CPreallocatedFile::MatchEntryToExistingMessage(const TReassemblyEntry& aEntry,
TInt& aIndex)
{
- LOGSMSPROT1("CPreallocatedFile::MatchEntryToExistingMessage()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_1, "CPreallocatedFile::MatchEntryToExistingMessage()");
aIndex = KErrNotFound;
@@ -1222,7 +1232,7 @@
}
}
- LOGSMSPROT2("CPreallocatedFile::MatchEntryToExistingMessage(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_2, "CPreallocatedFile::MatchEntryToExistingMessage(): aIndex=%d", aIndex);
}
/*
@@ -1235,7 +1245,7 @@
*/
void CPreallocatedFile::UpdateLogServerIdL(TInt& aIndex, TLogId aLogServerId)
{
- LOGSMSPROT1("CPreallocatedFile::UpdateLogServerId");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_UPDATELOGSERVERIDL_1, "CPreallocatedFile::UpdateLogServerId");
TSmsPreAllocatedFileStoreReassemblyEntry entry;
entry = iEntryArray[aIndex];
@@ -1257,7 +1267,7 @@
*/
void CPreallocatedFile::SetPassedToClientL(TInt aIndex, TBool aBool)
{
- LOGSMSPROT2("CPreallocatedFile::SetPassedToClientL(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_SETPASSEDTOCLIENTL_1, "CPreallocatedFile::SetPassedToClientL(): aIndex=%d", aIndex);
TSmsPreAllocatedFileStoreReassemblyEntry entry;
entry = iEntryArray[aIndex];
@@ -1278,7 +1288,7 @@
*/
void CPreallocatedFile::AddEntryL(TSmsPreAllocatedFileStoreReassemblyEntry& aEntry)
{
- LOGSMSPROT1("CPreallocatedFile::AddEntryL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_ADDENTRYL_1, "CPreallocatedFile::AddEntryL");
iEntryArray.AppendL(aEntry);
iEntryArray[iEntryArray.Count()-1].SetIsAdded(ETrue);
}
@@ -1293,7 +1303,7 @@
*/
void CPreallocatedFile::ChangeEntryL(TInt aIndex, const TSmsPreAllocatedFileStoreReassemblyEntry& aNewEntry)
{
- LOGSMSPROT2("CPreallocatedFile::ChangeEntryL(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_CHANGEENTRYL_1, "CPreallocatedFile::ChangeEntryL(): aIndex=%d", aIndex);
iEntryArray[aIndex].SetIsDeleted(ETrue);
iEntryArray.InsertL(aIndex,aNewEntry);
iEntryArray[aIndex].SetIsAdded(ETrue);
@@ -1308,7 +1318,7 @@
*/
void CPreallocatedFile::DeleteEntryL(TInt aIndex)
{
- LOGSMSPROT2("CPreallocatedFile::DeleteEntryL(): aIndex=%d", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_DELETEENTRYL_1, "CPreallocatedFile::DeleteEntryL(): aIndex=%d", aIndex);
if (iEntryArray[aIndex].PreAllocatedStorageId() != KErrNotFound)
{
ClearEntryL(iEntryArray[aIndex].PreAllocatedStorageId(), iEntryArray[aIndex].Count());
@@ -1338,7 +1348,7 @@
*/
void CPreallocatedFile::ClearEntryL(TInt aStorageId, TInt aNumberOfPDUs)
{
- LOGSMSPROT1("CPreallocatedFile::ClearEntryL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_CLEARENTRYL_1, "CPreallocatedFile::ClearEntryL");
//Read storage id.
TInt storageId;
@@ -1486,7 +1496,7 @@
*/
void CPreallocatedFile::ExternalizeEntry(TInt aContainerId, const TGsmSmsSlotEntry& aSmsSlot, TInt aIndex, const TGsmSms& aGsmSms)
{
- LOGSMSPROT3("CPreallocatedFile::ExternalizeEntry() 1: aContainerId=%d, aIndex=%d", aContainerId, aIndex);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_EXTERNALIZEENTRY_1, "CPreallocatedFile::ExternalizeEntry() 1: aContainerId=%d, aIndex=%d", aContainerId, aIndex);
// Container id must not be greater than max pdu segment.
TInt pos = iBeginOfDataSection + ((aContainerId - 1) * (KSizeOfGsmSmsSlotEntry + sizeof(TInt) + KSizeOfSmsGsmPDU));
@@ -1517,7 +1527,7 @@
*/
void CPreallocatedFile::ExternalizeEntry(TInt aContainerId, TInt aIndex, const TGsmSms& aGsmSms)
{
- LOGSMSPROT3("CPreallocatedFile::ExternalizeEntry() 2: aContainerId=%d, aIndex=%d", aContainerId, aIndex);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_EXTERNALIZEENTRY1_1, "CPreallocatedFile::ExternalizeEntry() 2: aContainerId=%d, aIndex=%d", aContainerId, aIndex);
// Container id must not be greater than max pdu segment.
TInt pos = iBeginOfDataSection + ((aContainerId - 1) * (KSizeOfGsmSmsSlotEntry + sizeof(TInt) + KSizeOfSmsGsmPDU));
@@ -1546,7 +1556,7 @@
*/
void CPreallocatedFile::InternalizeEntryL(const TInt aIndex, CSmsMessage& aSmsMessage, CArrayFix<TInt>& aIndexArray, CArrayFix<TGsmSms>& aSmsArray)
{
- LOGSMSPROT1("CPreallocatedFile::InternalizeEntryL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_INTERNALIZEENTRYL_1, "CPreallocatedFile::InternalizeEntryL");
TSmsPreAllocatedFileStoreReassemblyEntry& entry = iEntryArray[aIndex];
//Set other properties of CSmsMessage
aSmsMessage.SetStorage(entry.Storage());
@@ -1558,7 +1568,7 @@
aSmsMessage.SetForwardToClient(entry.ForwardToClient());
aSmsMessage.SetToFromAddressL(entry.Description2());
- LOGSMSPROT2("CPreallocatedFile::InternalizeEntryL Start [sid=%d]", entry.PreAllocatedStorageId());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_INTERNALIZEENTRYL_2, "CPreallocatedFile::InternalizeEntryL Start [sid=%d]", entry.PreAllocatedStorageId());
if (entry.PreAllocatedStorageId()==KErrNotFound)
{
return;
@@ -1618,7 +1628,7 @@
}
}
- LOGSMSPROT2("CPreallocatedFile::InternalizeEntryL End [noOfPDUsRead=%d]", noOfPDUsRead);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_INTERNALIZEENTRYL_3, "CPreallocatedFile::InternalizeEntryL End [noOfPDUsRead=%d]", noOfPDUsRead);
}
/*
@@ -1636,14 +1646,14 @@
*/
void CPreallocatedFile::RemovePDUsL(TInt aIndex, TInt aStartPos, TInt aEndPos)
{
- LOGSMSPROT1("CPreallocatedFile::RemovePDUsL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REMOVEPDUSL_1, "CPreallocatedFile::RemovePDUsL");
if ((aStartPos < 1) || (aEndPos > 256) || (aStartPos > aEndPos))
{
User::Leave(KErrArgument);
}
- LOGSMSPROT2("CPreallocatedFile::RemovePDUsL Start [sid=%d]", iEntryArray[aIndex].PreAllocatedStorageId());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REMOVEPDUSL_2, "CPreallocatedFile::RemovePDUsL Start [sid=%d]", iEntryArray[aIndex].PreAllocatedStorageId());
if (iEntryArray[aIndex].PreAllocatedStorageId()==KErrNotFound)
{
return;
@@ -1881,11 +1891,11 @@
*/
void CPreallocatedFile::BeginTransactionL()
{
- LOGSMSPROT3("CPreallocatedFile::BeginTransactionL [this=0x%08X iInTransaction=%d]", this, iInTransaction);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_BEGINTRANSACTIONL_1, "CPreallocatedFile::BeginTransactionL [this=0x%08X iInTransaction=%d]", (TUint)this, iInTransaction);
if (iInTransaction)
{
- LOGGSMU1("WARNING CPreallocatedFile::BeginTransactionL leaving with KErrAccessDenied");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_BEGINTRANSACTIONL_2, "WARNING CPreallocatedFile::BeginTransactionL leaving with KErrAccessDenied");
User::Leave(KErrAccessDenied);
}
@@ -1897,8 +1907,7 @@
*/
void CPreallocatedFile::CommitTransactionL()
{
- LOGSMSPROT3("CPreallocatedFile::CommitTransactionL(): this=0x%08X iInTransaction=%d",
- this, iInTransaction);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_COMMITTRANSACTIONL_1, "CPreallocatedFile::CommitTransactionL(): this=0x%08X iInTransaction=%d",(TUint)this, iInTransaction);
ExternalizeEntryArray();
//Commit
@@ -1913,8 +1922,7 @@
*/
void CPreallocatedFile::Revert()
{
- LOGSMSPROT3("CPreallocatedFile::Revert(): this=0x%08X, iInTransaction=%d",
- this, iInTransaction);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REVERT_1, "CPreallocatedFile::Revert(): this=0x%08X, iInTransaction=%d",(TUint)this, iInTransaction);
ReinstateEntries();
ExternalizeEntryArray();
@@ -1928,7 +1936,7 @@
*/
void CPreallocatedFile::RemoveDeletedEntries()
{
- LOGSMSPROT1("CPreallocatedFile::RemoveDeletedEntries()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REMOVEDELETEDENTRIES_1, "CPreallocatedFile::RemoveDeletedEntries()");
TInt count=iEntryArray.Count();
while (count--)
@@ -1952,7 +1960,7 @@
*/
void CPreallocatedFile::ReinstateDeletedEntries()
{
- LOGSMSPROT1("CPreallocatedFile::ReinstateDeletedEntries()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REINSTATEDELETEDENTRIES_1, "CPreallocatedFile::ReinstateDeletedEntries()");
TInt count=iEntryArray.Count();
while (count--)
@@ -1978,7 +1986,7 @@
*/
void CPreallocatedFile::ReinstateEntries()
{
- LOGSMSPROT1("CPreallocatedFile::ReinstateEntries()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_REINSTATEENTRIES_1, "CPreallocatedFile::ReinstateEntries()");
TInt containerId;
TInt storageId;
@@ -2014,7 +2022,7 @@
*/
TInt CPreallocatedFile::GetOldestMessageEntryIndex()
{
- LOGSMSPROT1("CPreallocatedFile::GetOldestMessageEntryIndex()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPREALLOCATEDFILE_GETOLDESTMESSAGEENTRYINDEX_1, "CPreallocatedFile::GetOldestMessageEntryIndex()");
TInt index = KErrNotFound;
TTime time;
@@ -2044,7 +2052,7 @@
*/
CGuardTimer* CGuardTimer::NewL(CClass0SmsReassemblyStore& aClass0ReassemblyStore, TInt aGuardTimeout)
{
- LOGSMSPROT1("CGuardTimer::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGUARDTIMER_NEWL_1, "CGuardTimer::NewL()");
CGuardTimer* timer = new(ELeave) CGuardTimer(aClass0ReassemblyStore, aGuardTimeout);
CleanupStack::PushL(timer);
@@ -2077,7 +2085,7 @@
*/
void CGuardTimer::EnableGuardTimer()
{
- LOGSMSPROT1("CGuardTimer::EnableGuardTimer()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGUARDTIMER_ENABLEGUARDTIMER_1, "CGuardTimer::EnableGuardTimer()");
if (!IsActive())
{
TTime nextTimeOut;
@@ -2099,7 +2107,7 @@
*/
void CGuardTimer::RunL()
{
- LOGSMSPROT2("CGuardTimer::RunL [iStatus=%d]", iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGUARDTIMER_RUNL_1, "CGuardTimer::RunL [iStatus=%d]", iStatus.Int());
iClass0ReassemblyStore.ProcessTimeoutMessageL();
EnableGuardTimer();
} // CGuardTimer::RunL
@@ -2120,7 +2128,7 @@
*/
CClass0SmsReassemblyStore* CClass0SmsReassemblyStore::NewL(RFs& aFs, MSmsComm& aSmsComm)
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_NEWL_1, "CClass0SmsReassemblyStore::NewL()");
CClass0SmsReassemblyStore* self = new (ELeave) CClass0SmsReassemblyStore(aFs, aSmsComm);
CleanupStack::PushL(self);
@@ -2188,7 +2196,7 @@
*/
void CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL(TInt& aMaxClass0Msg, TInt& aMaxPDUSeg, TInt& aGuardTimeOut)
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_1, "CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL()");
aMaxClass0Msg = KMaxNumberOfClass0MessagesInReassemblyStore;
aMaxPDUSeg = KNumberOfPDUSegmentsStoredInOODCondition;
@@ -2198,7 +2206,7 @@
TRAPD(ret, ini=CESockIniData::NewL(_L("smswap.sms.esk")));
if(ret!=KErrNone)
{
- LOGSMSPROT2("CESockIniData::NewL() returned=%d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_2, "CESockIniData::NewL() returned=%d", ret);
}
else
{
@@ -2209,7 +2217,7 @@
{
if (var > 0)
{
- LOGSMSPROT2("MaxClass0Messages [%d]", var);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_3, "MaxClass0Messages [%d]", var);
aMaxClass0Msg = var;
}
}
@@ -2218,7 +2226,7 @@
{
if (var > 0)
{
- LOGSMSPROT2("MaxClass0Messages [%d]", var);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_4, "MaxClass0Messages [%d]", var);
aMaxPDUSeg = var;
}
}
@@ -2227,7 +2235,7 @@
{
if (var > 0)
{
- LOGSMSPROT2("MaxClass0Messages [%d]", var);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_5, "MaxClass0Messages [%d]", var);
aGuardTimeOut = var;
}
}
@@ -2235,8 +2243,7 @@
CleanupStack::PopAndDestroy(ini);
}
- LOGSMSPROT4("CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL(): aMaxClass0Msg=%d, aMaxPDUSeg=%d, aGuardTimeOut=%d",
- aMaxClass0Msg, aMaxPDUSeg, aGuardTimeOut);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_6, "CClass0SmsReassemblyStore::ReadConfigurableClass0SmsSettingsL(): aMaxClass0Msg=%d, aMaxPDUSeg=%d, aGuardTimeOut=%d",aMaxClass0Msg, aMaxPDUSeg, aGuardTimeOut);
}
/**
@@ -2247,7 +2254,7 @@
*/
void CClass0SmsReassemblyStore::OpenStoreL()
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::OpenStoreL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_OPENSTOREL_1, "CClass0SmsReassemblyStore::OpenStoreL()");
TFileName pathName;
CReassemblyStoreUtility::PrivatePath(iFs, pathName);
//Create the directory if it is not created.
@@ -2274,7 +2281,7 @@
*/
void CClass0SmsReassemblyStore::Close()
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::CloseStore()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_CLOSE_1, "CClass0SmsReassemblyStore::CloseStore()");
iGuardTimer->DisableGuardTimer();
iEntryArray.Reset();
iPreallocatedFile->Close();
@@ -2290,7 +2297,7 @@
*/
void CClass0SmsReassemblyStore::PopulateEntryArrayL(CArrayFix<TReassemblyEntry>& aEntryArray)
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::PopulateEntryArrayL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_1, "CClass0SmsReassemblyStore::PopulateEntryArrayL()");
aEntryArray.Reset();
//Populate Entries from Pre-allocated file.
for (TInt count = 0; count < iPreallocatedFile->Entries().Count(); count++)
@@ -2355,7 +2362,7 @@
}
else if (ret == KErrDiskFull)
{
- LOGSMSPROT1("CleanReassemblyEntries() returns KErrDiskFull");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_2, "CleanReassemblyEntries() returns KErrDiskFull");
/*
In this case permanent store file contains incorrect information.
For example forwarded message might be still stored in this store.
@@ -2423,7 +2430,7 @@
*/
void CClass0SmsReassemblyStore::SetDiskSpaceState(TSmsDiskSpaceMonitorStatus aDiskSpaceStatus)
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::SetDiskSpaceState()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_SETDISKSPACESTATE_1, "CClass0SmsReassemblyStore::SetDiskSpaceState()");
iDiskSpaceStatus = aDiskSpaceStatus;
}
@@ -2441,7 +2448,7 @@
*/
void CClass0SmsReassemblyStore::AddNewMessageL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::AddNewMessageL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_ADDNEWMESSAGEL_1, "CClass0SmsReassemblyStore::AddNewMessageL");
// Add entry in permanent store file
TInt index;
@@ -2499,7 +2506,7 @@
*/
void CClass0SmsReassemblyStore::UpdateExistingMessageL(CSmsMessage& aSmsMessage, const TGsmSms& aGsmSms, TBool& aDuplicateMsgRef, TBool& aDuplicateSlot)
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::UpdateExistingMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1, "CClass0SmsReassemblyStore::UpdateExistingMessageL()");
aDuplicateMsgRef = EFalse;
aDuplicateSlot = EFalse;
@@ -2559,7 +2566,7 @@
if (slot.iIndex == newSlot.iIndex && slot.iStore == newSlot.iStore)
{
- LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate enumerated PDU.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2, "CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate enumerated PDU.");
// It is a duplicate that was already stored on the SIM...
aDuplicateSlot = ETrue;
@@ -2574,7 +2581,7 @@
{
if (indexArray->At(index) == concatPDUIndex)
{
- LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate concatenated PDU.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3, "CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate concatenated PDU.");
// The PDU is already stored in the reassembly store.
aDuplicateMsgRef = ETrue;
@@ -3061,7 +3068,7 @@
*/
void CClass0SmsReassemblyStore::ProcessTimeoutMessageL()
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::ProcessTimeoutMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_PROCESSTIMEOUTMESSAGEL_1, "CClass0SmsReassemblyStore::ProcessTimeoutMessageL()");
TBool passedToClient=ETrue;
TInt count=iEntryArray.Count();
@@ -3185,12 +3192,12 @@
*/
void CClass0SmsReassemblyStore::SetIncompleteMessageForwardedToClientL(const CSmsMessage& aSmsMessage)
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1, "CClass0SmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
TInt index = KErrNotFound;
if (aSmsMessage.IsComplete())
{
- LOGSMSPROT1("This function must be called when message is incomplete");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_2, "This function must be called when message is incomplete");
User::Leave(KErrArgument);
}
@@ -3246,7 +3253,7 @@
*/
TInt CClass0SmsReassemblyStore::CleanReassemblyEntries()
{
- LOGSMSPROT1("CleanReassemblyEntries");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_1, "CleanReassemblyEntries");
const CArrayFix<TSmsPreAllocatedFileStoreReassemblyEntry>& preAllocatedFileEntryArray = iPreallocatedFile->Entries();
TInt ret=KErrNone;
TRAP(ret, BeginTransactionLC();
@@ -3255,7 +3262,7 @@
if (ret == KErrDiskFull)
{
- LOGSMSPROT1("CleanupEntriesL returns KErrDiskFull");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_2, "CleanupEntriesL returns KErrDiskFull");
/*
Get access to reserve memory, call again to clean the entries with compact.
Compact needs to be called at this instance because permanent store
@@ -3267,7 +3274,7 @@
TRAP(ret, BeginTransactionLC();
iPermanentFileStore->CleanupEntriesWithCompactL(preAllocatedFileEntryArray);
CommitTransactionL(););
- LOGSMSPROT2("CleanupEntriesWithCompactL returns %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_3, "CleanupEntriesWithCompactL returns %d", ret);
iFs.ReleaseReserveAccess(KStoreDrive);
}
return ret;
@@ -3287,7 +3294,7 @@
*/
void CClass0SmsReassemblyStore::GetSmsEntriesL(const TReassemblyEntry& aEntry, CSmsMessage& aSmsMessage, CArrayFix<TInt>& aIndexArray, CArrayFix<TGsmSms>& aSmsArray)
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::GetSmsEntriesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_1, "CClass0SmsReassemblyStore::GetSmsEntriesL()");
TInt permanentStoreIndex=KErrNotFound;
iPermanentFileStore->MatchEntryToExistingMessage(aEntry, permanentStoreIndex);
if (permanentStoreIndex!=KErrNotFound)
@@ -3296,7 +3303,7 @@
}
else
{
- LOGSMSPROT1("No PDUs in Permanent store file");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_2, "No PDUs in Permanent store file");
}
TInt preAllocatedFileIndex=KErrNotFound;
@@ -3330,7 +3337,7 @@
{
//In this scenario a CSmsMessage object has to be created from the existing PDU in
//pre-allocated file & then serialized into aSmsMessage.
- LOGSMSPROT2("Number of PDUs in Pre-allocated file %d", aIndexArray.Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_3, "Number of PDUs in Pre-allocated file %d", aIndexArray.Count());
if (aIndexArray.Count() > 0)
{
CSmsBuffer* smsBuffer = CSmsBuffer::NewL();
@@ -3503,7 +3510,7 @@
*/
void CClass0StoreCloseObject(TAny* aObj)
{
- LOGGSMU2("WARNING! Hey, CClass0StoreCloseObject called by Untrapper! [0x%08x]", aObj);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0STORECLOSEOBJECT_1, "WARNING! Hey, CClass0StoreCloseObject called by Untrapper! [0x%08x]", (TUint)aObj);
((CClass0SmsReassemblyStore*)aObj)->Revert();
}
@@ -3516,11 +3523,11 @@
*/
void CClass0SmsReassemblyStore::BeginTransactionLC()
{
- LOGSMSPROT3("CClass0SmsReassemblyStore::BeginTransactionLC [this=0x%08X iInTransaction=%d]", this, iInTransaction);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_1, "CClass0SmsReassemblyStore::BeginTransactionLC [this=0x%08X iInTransaction=%d]", (TUint)this, iInTransaction);
if (iInTransaction)
{
- LOGGSMU1("WARNING CClass0SmsReassemblyStore::BeginTransactionLC leaving with KErrAccessDenied");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_2, "WARNING CClass0SmsReassemblyStore::BeginTransactionLC leaving with KErrAccessDenied");
User::Leave(KErrAccessDenied);
}
@@ -3536,8 +3543,7 @@
*/
void CClass0SmsReassemblyStore::CommitTransactionL()
{
- LOGSMSPROT3("CClass0SmsReassemblyStore::CommitTransactionL(): this=0x%08X iInTransaction=%d",
- this, iInTransaction);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_COMMITTRANSACTIONL_1, "CClass0SmsReassemblyStore::CommitTransactionL(): this=0x%08X iInTransaction=%d",(TUint)this, iInTransaction);
//Commit permanent store file
iPermanentFileStore->CommitTransactionL();
@@ -3552,8 +3558,7 @@
*/
void CClass0SmsReassemblyStore::Revert()
{
- LOGSMSPROT3("CClass0SmsReassemblyStore::Revert(): this=0x%08X, iInTransaction=%d",
- this, iInTransaction);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CCLASS0SMSREASSEMBLYSTORE_REVERT_1, "CClass0SmsReassemblyStore::Revert(): this=0x%08X, iInTransaction=%d",(TUint)this, iInTransaction);
iPreallocatedFile->Revert();
iPermanentFileStore->Revert();
--- a/smsprotocols/smsstack/smsprot/Src/smspdel.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspdel.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 "smspdelTraces.h"
+#endif
+
#include "smspdel.h"
#include "smspmain.h"
@@ -34,7 +40,7 @@
RMobileSmsMessaging& aSmsMessaging
)
{
- LOGSMSPROT1("CSmsPDUDelete::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_NEWL_1, "CSmsPDUDelete::NewL()");
CSmsPDUDelete* smsPduDelete =
new(ELeave) CSmsPDUDelete(aSmsSettings,aSmsMessaging);
@@ -68,7 +74,7 @@
*/
void CSmsPDUDelete::ConstructL()
{
- LOGSMSPROT1("CSmsPDUDelete::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_CONSTRUCTL_1, "CSmsPDUDelete::ConstructL()");
ConstructTimeoutL();
} // CSmsPDUDelete::ConstructL
@@ -83,7 +89,7 @@
*/
void CSmsPDUDelete::Start(CArrayFix<TGsmSmsSlotEntry>& aLocationArray, TRequestStatus& aStatus)
{
- LOGSMSPROT1("CSmsPDUDelete::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_START_1, "CSmsPDUDelete::Start()");
__ASSERT_DEBUG(iState==ESmsPDUDeleteIdle,SmspPanic(KSmspPanicUnexpectedState));
@@ -102,7 +108,7 @@
*/
void CSmsPDUDelete::DoRunL()
{
- LOGSMSPROT2("CSmsPDUDelete::RunL [iStatus=%d]", iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_DORUNL_1, "CSmsPDUDelete::RunL [iStatus=%d]", iStatus.Int());
switch (iState)
{
@@ -173,7 +179,7 @@
*/
void CSmsPDUDelete::OpenStore()
{
- LOGSMSPROT1("CSmsPDUDelete::OpenStore()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_OPENSTORE_1, "CSmsPDUDelete::OpenStore()");
//
// Open the SMS Store for the first PDU...
@@ -212,7 +218,7 @@
*/
void CSmsPDUDelete::DeletePDU()
{
- LOGSMSPROT1("CSmsPDUDelete::DeletePDU()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_DELETEPDU_1, "CSmsPDUDelete::DeletePDU()");
//
// Delete the first entry in the list...
@@ -233,7 +239,7 @@
*/
void CSmsPDUDelete::DoCancel()
{
- LOGSMSPROT1("CSmsPDUDelete::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_DOCANCEL_1, "CSmsPDUDelete::DoCancel()");
TimedSetActiveCancel();
@@ -279,7 +285,7 @@
*/
void CSmsPDUDelete::Complete(TInt aStatus)
{
- LOGSMSPROT1("CSmsPDUDelete::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUDELETE_COMPLETE_1, "CSmsPDUDelete::Complete()");
//
// Only close the SMS Storage if the object is not active (and it may be
--- a/smsprotocols/smsstack/smsprot/Src/smspenum.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspenum.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -17,6 +17,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspenumTraces.h"
+#endif
+
#include "smspenum.h"
#include "smspproc.h"
#include "smsuset.h"
@@ -52,7 +58,7 @@
TInt aPriority,
CSmsMonitorDiskSpace& aSmsMonitorDiskSpace)
{
- LOGSMSPROT1("CSmsStoreRead::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_NEWL_1, "CSmsStoreRead::NewL()");
CSmsStoreRead* smsStoreRead = new ( ELeave ) CSmsStoreRead(aSmsComm,
aSmsSettings,
@@ -105,7 +111,7 @@
*/
void CSmsStoreRead::ConstructL()
{
- LOGSMSPROT1("CSmsStoreRead::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_CONSTRUCTL_1, "CSmsStoreRead::ConstructL()");
ConstructTimeoutL();
ReadConfigurableSmsSettingsL();
@@ -154,13 +160,13 @@
*/
void CSmsStoreRead::ReadConfigurableSmsSettingsL()
{
- LOGSMSPROT1("CSmsStoreRead::ReadConfigurableSmsSettingsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_1, "CSmsStoreRead::ReadConfigurableSmsSettingsL()");
CESockIniData* ini = NULL;
TRAPD(ret, ini=CESockIniData::NewL(_L("smswap.sms.esk")));
if(ret!=KErrNone)
{
- LOGSMSPROT2("CSmsStoreRead::ReadConfigurableSmsSettingsL(): ret=%d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_2, "CSmsStoreRead::ReadConfigurableSmsSettingsL(): ret=%d", ret);
User::Leave(ret);
}
@@ -177,8 +183,7 @@
iConfigAutomaticDeletionForClass2 = status;
}
- LOGSMSPROT2("CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigAutomaticDeletionForClass2=%d",
- iConfigAutomaticDeletionForClass2);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_3, "CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigAutomaticDeletionForClass2=%d",iConfigAutomaticDeletionForClass2);
if (ini->FindVar(_L("Release6Configurability"),
_L("DiscardType0_Class2Message"), status))
@@ -186,8 +191,7 @@
iConfigDiscardingType0Class2 = status;
}
- LOGSMSPROT2("CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigDiscardingType0Class2=%d",
- iConfigDiscardingType0Class2);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_4, "CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigDiscardingType0Class2=%d",iConfigDiscardingType0Class2);
if (ini->FindVar(_L("Release6Configurability"),
_L("DiscardType0_Class0Message"), status))
@@ -195,8 +199,7 @@
iConfigDiscardingType0Class0 = status;
}
- LOGSMSPROT2("CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigDiscardingType0Class0=%d",
- iConfigDiscardingType0Class0);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_5, "CSmsStoreRead::ReadConfigurableSmsSettingsL(): iConfigDiscardingType0Class0=%d",iConfigDiscardingType0Class0);
CleanupStack::PopAndDestroy(ini);
} // CSmsStoreRead::ReadConfigurableSmsSettingsL
@@ -211,7 +214,7 @@
*/
void CSmsStoreRead::Start( TRequestStatus& aStatus, TInt aStoreIndex )
{
- LOGSMSPROT1("CSmsStoreRead::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_START_1, "CSmsStoreRead::Start()");
iState = ESmsStoreReadGettingStoreInfo;
// Initialises current slot index
@@ -250,7 +253,7 @@
*/
void CSmsStoreRead::DoRunL()
{
- LOGSMSPROT2("CSmsStoreRead::DoRunL [iStatus=%d]", iStatus.Int() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_DORUNL_1, "CSmsStoreRead::DoRunL [iStatus=%d]", iStatus.Int() );
TInt status = iStatus.Int();
@@ -315,7 +318,9 @@
{
// Add current message to the list
iMobilePhoneGsmSmsList->AddEntryL( iSmsEntry );
- LOGSMSIFSMSENTRY(_L8("SMSENTRY: "), iSmsEntry);
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ LogSmsIfSmsEntry(_L8("SMSENTRY: "), iSmsEntry);
+#endif
iStoreInfo.iUsedEntries--;
}
// Reads next single message from the store
@@ -361,7 +366,7 @@
*/
void CSmsStoreRead::ReadNextSlotL()
{
- LOGSMSPROT1("CSmsStoreRead::ReadNextSlotL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_READNEXTSLOTL_1, "CSmsStoreRead::ReadNextSlotL()");
//Increments current slot index
iCurrentSlotIndex++;
@@ -387,7 +392,7 @@
*/
void CSmsStoreRead::ProcessPduL()
{
- LOGSMSPROT1("CSmsStoreRead::ProcessPduL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_PROCESSPDUL_1, "CSmsStoreRead::ProcessPduL()");
// Increments slot index
for ( iCurrentSlotIndex = 0; iCurrentSlotIndex < iMobilePhoneGsmSmsList->Enumerate(); iCurrentSlotIndex++ )
@@ -416,7 +421,7 @@
// but in this case none of the messages have been passed
// to the client, this has been fixed here
TRAPD(ret, pduProcessor->DecodeAndProcessPDUL(iSlot, ETrue));
- LOGSMSPROT2("CSmsStoreRead::ProcessPduL(): DecodeAndProcessPDUL() returned %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_PROCESSPDUL_2, "CSmsStoreRead::ProcessPduL(): DecodeAndProcessPDUL() returned %d", ret);
if (ret == KErrNone)
{
@@ -462,7 +467,7 @@
*/
void CSmsStoreRead::DoCancel()
{
- LOGSMSPROT1("CSmsStoreRead::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_DOCANCEL_1, "CSmsStoreRead::DoCancel()");
TimedSetActiveCancel();
@@ -522,7 +527,7 @@
*/
void CSmsStoreRead::Complete(TInt aStatus)
{
- LOGSMSPROT1("CSmsStoreRead::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSTOREREAD_COMPLETE_1, "CSmsStoreRead::Complete()");
__ASSERT_DEBUG(iState != ESmsStoreReadIdle, SmspPanic(KSmspPanicUnexpectedState));
@@ -583,7 +588,7 @@
TInt aPriority,
CSmsMonitorDiskSpace& aSmsMonitorDiskSpace )
{
- LOGSMSPROT1("CSmsPhoneEnumeration::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_NEWL_1, "CSmsPhoneEnumeration::NewL()");
CSmsPhoneEnumeration* smsPhoneEnumeration =
new ( ELeave ) CSmsPhoneEnumeration( aSmsComm,
@@ -638,7 +643,7 @@
*/
void CSmsPhoneEnumeration::Start()
{
- LOGSMSPROT1("CSmsPhoneEnumeration::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_START_1, "CSmsPhoneEnumeration::Start()");
iState = ESmsPhoneEnumerationInitializing;
iCurrentStore = 0;
@@ -668,7 +673,7 @@
*/
void CSmsPhoneEnumeration::DoRunL()
{
- LOGSMSPROT3("CSmsPhoneEnumeration::RunL [iStatus=%d], [iState=%d]", iStatus.Int(), iState );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_DORUNL_1, "CSmsPhoneEnumeration::RunL [iStatus=%d], [iState=%d]", iStatus.Int(), iState );
switch (iState)
{
@@ -716,7 +721,7 @@
void CSmsPhoneEnumeration::DoCancel()
{
- LOGSMSPROT1("CSmsPhoneEnumeration::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_DOCANCEL_1, "CSmsPhoneEnumeration::DoCancel()");
TimedSetActiveCancel();
@@ -762,7 +767,7 @@
*/
void CSmsPhoneEnumeration::ConstructL(CFacadeSmsReassemblyStore& aReassemblyStore,CSmsSegmentationStore& aSegmentationStore,CSmsMonitorDiskSpace& aSmsMonitorDiskSpace)
{
- LOGSMSPROT1("CSmsPhoneEnumeration::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_CONSTRUCTL_1, "CSmsPhoneEnumeration::ConstructL()");
iSmsStoreRead = CSmsStoreRead::NewL(iSmsComm, iSmsSettings, iSmsMessaging, aReassemblyStore, aSegmentationStore, Priority(), aSmsMonitorDiskSpace);
ConstructTimeoutL();
@@ -771,7 +776,7 @@
void CSmsPhoneEnumeration::Complete(TInt aStatus)
{
- LOGSMSPROT2("CSmsPhoneEnumeration::Complete [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEENUMERATION_COMPLETE_1, "CSmsPhoneEnumeration::Complete [aStatus=%d]", aStatus);
//
// Call the base function to perform the actual complete...
@@ -803,7 +808,7 @@
CSmsSegmentationStore& aSegmentationStore
)
{
- LOGSMSPROT1("CSmsMessageWrite::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_NEWL_1, "CSmsMessageWrite::NewL()");
CSmsMessageWrite* smsMessageWrite = new (ELeave) CSmsMessageWrite(aSmsComm, aSmsSettings,
aGsmPhone,
@@ -820,7 +825,7 @@
*/
CSmsMessageWrite::~CSmsMessageWrite()
{
- LOGSMSPROT1("CSmsMessageWrite::~CSmsMessageWrite()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DTOR_1, "CSmsMessageWrite::~CSmsMessageWrite()");
Cancel();
iSmsStorage.Close();
@@ -839,7 +844,7 @@
iSmsMessage = aSmsMessage;
- LOGSMSPROT3("CSmsMessageWrite::Start Storage=[%d] Type=[%d]", iSmsMessage->Storage(), iSmsMessage->Type());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_START_1, "CSmsMessageWrite::Start Storage=[%d] Type=[%d]", iSmsMessage->Storage(), iSmsMessage->Type());
iCurrentStore = 0;
iStoreInfo.iName = KNullDesC;
@@ -910,7 +915,7 @@
void CSmsMessageWrite::DoRunL()
{
- LOGSMSPROT3("CSmsMessageWrite::DoRunL [iStatus=%d iState=%d]", iStatus.Int() , iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DORUNL_1, "CSmsMessageWrite::DoRunL [iStatus=%d iState=%d]", iStatus.Int() , iState);
switch (iState)
{
@@ -937,7 +942,7 @@
{
if ((iStoreInfo.iCaps & RMobilePhoneStore::KCapsWriteAccess) == 0)
{
- LOGSMSPROT2("CSmsMessageWrite::DoRunL left with KErrNotSuported [iState=%d]", iState);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DORUNL_2, "CSmsMessageWrite::DoRunL left with KErrNotSuported [iState=%d]", iState);
User::Leave(KErrNotSupported);
}
@@ -955,7 +960,7 @@
}
else
{
- LOGSMSPROT2("CSmsMessageWrite::DoRunL left with KErrNotFound [iState=%d]", iState);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DORUNL_3, "CSmsMessageWrite::DoRunL left with KErrNotFound [iState=%d]", iState);
User::Leave(KErrNotFound);
}
}
@@ -999,7 +1004,7 @@
void CSmsMessageWrite::DoCancel()
{
- LOGSMSPROT1("CSmsMessageWrite::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_DOCANCEL_1, "CSmsMessageWrite::DoCancel()");
TimedSetActiveCancel();
@@ -1058,14 +1063,14 @@
iSegmentationStore(aSegmentationStore),
iSmsArray(8)
{
- LOGSMSPROT1("CSmsMessageWrite::CSmsMessageWrite()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_CTOR_1, "CSmsMessageWrite::CSmsMessageWrite()");
} // CSmsMessageWrite::CSmsMessageWrite
void CSmsMessageWrite::ConstructL()
{
- LOGSMSPROT1("CSmsMessageWrite::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_CONSTRUCTL_1, "CSmsMessageWrite::ConstructL()");
ConstructTimeoutL();
} // CSmsMessageWrite::ConstructL
@@ -1073,7 +1078,7 @@
void CSmsMessageWrite::SegmentMessageL()
{
- LOGSMSPROT1("CSmsMessageWrite::SegmentMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_SEGMENTMESSAGEL_1, "CSmsMessageWrite::SegmentMessageL()");
if (iStoreInfo.iTotalEntries == iStoreInfo.iUsedEntries)
{
@@ -1117,7 +1122,7 @@
void CSmsMessageWrite::WriteNextSlot()
{
- LOGSMSPROT1("CSmsMessageWrite::WriteNextSlot()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_WRITENEXTSLOT_1, "CSmsMessageWrite::WriteNextSlot()");
if (iSmsArray.Count()>0)
{
@@ -1141,7 +1146,7 @@
void CSmsMessageWrite::Complete(TInt aStatus)
{
- LOGSMSPROT2("CSmsMessageWrite::Complete [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGEWRITE_COMPLETE_1, "CSmsMessageWrite::Complete [aStatus=%d]", aStatus);
__ASSERT_DEBUG(iState != ESmsMessageWriteIdle, SmspPanic(KSmspPanicUnexpectedState));
--- a/smsprotocols/smsstack/smsprot/Src/smspfacadestor.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspfacadestor.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +13,12 @@
// Description:
//
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspfacadestorTraces.h"
+#endif
+
#include "gsmubuf.h"
#include "smspfacadestor.h"
@@ -32,7 +38,7 @@
*/
CFacadeSmsReassemblyStore* CFacadeSmsReassemblyStore::NewL(RFs& aFs, MSmsComm& aSmsComm)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_NEWL_1, "CFacadeSmsReassemblyStore::NewL()");
CFacadeSmsReassemblyStore* self = new (ELeave) CFacadeSmsReassemblyStore(aFs, aSmsComm);
CleanupStack::PushL(self);
@@ -56,7 +62,7 @@
*/
CFacadeSmsReassemblyStore::~CFacadeSmsReassemblyStore()
{
- LOGSMSPROT1("~CFacadeSmsReassemblyStore()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DTOR_1, "~CFacadeSmsReassemblyStore()");
iReassemblyStore->Close();
delete iReassemblyStore;
@@ -82,7 +88,7 @@
*/
void CFacadeSmsReassemblyStore::ConstructL()
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_CONSTRUCTL_1, "CFacadeSmsReassemblyStore::ConstructL()");
iReassemblyStore = CSmsReassemblyStore::NewL(iFs);
/*
@@ -133,7 +139,7 @@
*/
void CFacadeSmsReassemblyStore::OpenStoreL()
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::OpenStoreL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_OPENSTOREL_1, "CFacadeSmsReassemblyStore::OpenStoreL()");
iReassemblyStore->OpenStoreL();
if (iClass0ReassemblyStore)
{
@@ -148,7 +154,7 @@
*/
void CFacadeSmsReassemblyStore::Close()
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::Close()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_CLOSE_1, "CFacadeSmsReassemblyStore::Close()");
// Close general Re-assembly store.
iReassemblyStore->Close();
// Close Class0 re-assembly store.
@@ -182,7 +188,7 @@
*/
void CFacadeSmsReassemblyStore::InitL()
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::InitL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_INITL_1, "CFacadeSmsReassemblyStore::InitL()");
// Initialize Non-class 0 Re-assembly store.
InitializeNonClass0StoreL();
// Initialize Class0 re-assembly store.
@@ -202,7 +208,7 @@
*/
void CFacadeSmsReassemblyStore::PurgeL(const TTimeIntervalMinutes& aTimeIntervalMinutes,TBool aPurgeIncompleteOnly)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::PurgeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PURGEL_1, "CFacadeSmsReassemblyStore::PurgeL()");
iReassemblyStore->PurgeL(aTimeIntervalMinutes, aPurgeIncompleteOnly);
if (iClass0ReassemblyStore)
{
@@ -219,7 +225,7 @@
*/
TBool CFacadeSmsReassemblyStore::IsFull()
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::IsFull()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ISFULL_1, "CFacadeSmsReassemblyStore::IsFull()");
//local variable for complete entries
TInt count( 0 );
@@ -246,7 +252,7 @@
*/
void CFacadeSmsReassemblyStore::DeleteEnumeratedSIMEntries()
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::DeleteEnumeratedSIMEntries()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1, "CFacadeSmsReassemblyStore::DeleteEnumeratedSIMEntries()");
DeleteNonClass0EnumeratedSIMEntries();
if (iClass0ReassemblyStore)
{
@@ -267,7 +273,7 @@
*/
TInt CFacadeSmsReassemblyStore::ExternalizeEnumeratedMessagesL(CSmsProvider& aProvider,TInt& aCount)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::ExternalizeEnumeratedMessagesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDMESSAGESL_1, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedMessagesL()");
TInt numNewSegments(0);
numNewSegments = ExternalizeEnumeratedNonClass0SmsMessagesL(aProvider, aCount);
if (iClass0ReassemblyStore)
@@ -289,7 +295,7 @@
*/
void CFacadeSmsReassemblyStore::ProcessCompleteSmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage* aCurrentSmsMessage)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::ProcessCompleteSmsMessagesL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETESMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ProcessCompleteSmsMessagesL");
ProcessCompleteNonClass0SmsMessagesL(aSmsComm, aCurrentSmsMessage);
if (iClass0ReassemblyStore)
@@ -340,8 +346,7 @@
*/
void CFacadeSmsReassemblyStore::AddSegmentToReassemblyStoreL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms, TInt& aIndex, TBool& aIsComplete, TBool aIsEnumeration, TInt& aCount, TInt& aTotal)
{
- LOGSMSPROT2("CFacadeSmsReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",
- aSmsMessage.IsComplete());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1, "CFacadeSmsReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",aSmsMessage.IsComplete());
TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
@@ -376,7 +381,7 @@
*/
void CFacadeSmsReassemblyStore::ForwardCompleteClass0SmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage& aSmsMessage,const TSmsAddr* aOriginalSmsAddr,const CSmsMessage* aOriginalSmsMessage,TDes& aDes)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::ForwardCompleteClass0SmsMessagesL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_FORWARDCOMPLETECLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ForwardCompleteClass0SmsMessagesL");
if (iClass0ReassemblyStore)
{
iClass0ReassemblyStore->ForwardCompleteClass0SmsMessagesL(aSmsComm, aSmsMessage, aOriginalSmsAddr, aOriginalSmsMessage, aDes);
@@ -395,7 +400,7 @@
*/
void CFacadeSmsReassemblyStore::ProcessMessageIfExceedLimitationL(MSmsComm& aSmsComm)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::ProcessMessageIfExceedLimitationL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSMESSAGEIFEXCEEDLIMITATIONL_1, "CFacadeSmsReassemblyStore::ProcessMessageIfExceedLimitationL");
if (iClass0ReassemblyStore)
{
iClass0ReassemblyStore->ProcessMessageIfExceedLimitationL(aSmsComm);
@@ -415,7 +420,7 @@
*/
void CFacadeSmsReassemblyStore::SetIncompleteMessageForwardedToClientL(const CSmsMessage& aSmsMessage)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1, "CFacadeSmsReassemblyStore::SetIncompleteMessageForwardedToClientL()");
if (iClass0ReassemblyStore)
{
iClass0ReassemblyStore->SetIncompleteMessageForwardedToClientL(aSmsMessage);
@@ -429,7 +434,7 @@
*/
void CFacadeSmsReassemblyStore::SetDiskSpaceState(TSmsDiskSpaceMonitorStatus aDiskSpaceStatus)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::SetDiskSpaceState()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETDISKSPACESTATE_1, "CFacadeSmsReassemblyStore::SetDiskSpaceState()");
if (iClass0ReassemblyStore)
{
iClass0ReassemblyStore->SetDiskSpaceState(aDiskSpaceStatus);
@@ -447,7 +452,7 @@
*/
void CFacadeSmsReassemblyStore::DeleteMessageL(const CSmsMessage& aSmsMessage, TBool aPassed)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::DeleteEntryL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETEMESSAGEL_1, "CFacadeSmsReassemblyStore::DeleteEntryL()");
TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
@@ -471,7 +476,7 @@
*/
void CFacadeSmsReassemblyStore::UpdateLogServerIdL(const CSmsMessage& aSmsMessage, TInt aIndex)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::UpdateLogServerIdL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1, "CFacadeSmsReassemblyStore::UpdateLogServerIdL()");
TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
@@ -494,7 +499,7 @@
*/
void CFacadeSmsReassemblyStore::SetMessagePassedToClientL(const CSmsMessage& aSmsMessage, TBool aPassed)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::SetMessagePassedToClientL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1, "CFacadeSmsReassemblyStore::SetMessagePassedToClientL()");
TBool toBeStoredInClass0ReassemblyStore = IsForClass0ReassemblyStore(aSmsMessage);
@@ -569,7 +574,7 @@
*/
void CFacadeSmsReassemblyStore::InitializeNonClass0StoreL()
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::InitializeNonClass0StoreL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_INITIALIZENONCLASS0STOREL_1, "CFacadeSmsReassemblyStore::InitializeNonClass0StoreL()");
// Initialize Re-assembly store.
iReassemblyStore->OpenStoreL();
iReassemblyStore->BeginTransactionLC();
@@ -606,7 +611,7 @@
{
const TInt count = iReassemblyStore->Entries().Count();
- LOGSMSPROT2("CFacadeSmsReassemblyStore::DeleteNonClass0EnumeratedSIMEntries(): %d messages in RAS", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0ENUMERATEDSIMENTRIES_1, "CFacadeSmsReassemblyStore::DeleteNonClass0EnumeratedSIMEntries(): %d messages in RAS", count);
TInt index;
@@ -634,7 +639,7 @@
*/
void CFacadeSmsReassemblyStore::DeleteNonClass0MessageL(const CSmsMessage& aSmsMessage, TBool aPassed)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::DeleteNonClass0MessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0MESSAGEL_1, "CFacadeSmsReassemblyStore::DeleteNonClass0MessageL()");
TInt index(0);
if(!iReassemblyStore->InTransaction())
@@ -661,7 +666,7 @@
*/
void CFacadeSmsReassemblyStore::SetNonClass0MessagePassedToClientL(const CSmsMessage& aSmsMessage, TBool aPassed)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::SetNonClass0MessagePassedToClientL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_SETNONCLASS0MESSAGEPASSEDTOCLIENTL_1, "CFacadeSmsReassemblyStore::SetNonClass0MessagePassedToClientL()");
TInt index(0);
iReassemblyStore->BeginTransactionLC();
@@ -677,8 +682,7 @@
*/
TInt CFacadeSmsReassemblyStore::NumberOfCompleteNonClass0Messages()
{
- LOGSMSPROT2("CFacadeSmsReassemblyStore::NumberOfCompleteMessages(): Entries().Count()=%d",
- iReassemblyStore->Entries().Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_NUMBEROFCOMPLETENONCLASS0MESSAGES_1, "CFacadeSmsReassemblyStore::NumberOfCompleteMessages(): Entries().Count()=%d",iReassemblyStore->Entries().Count());
//local variable for complete entries
TInt count( 0 );
@@ -706,7 +710,7 @@
*/
void CFacadeSmsReassemblyStore::ProcessCompleteNonClass0SmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage* aCurrentSmsMessage)
{
- LOGSMSPROT2("CFacadeSmsReassemblyStore::ProcessCompleteNonClass0SmsMessagesL [from %d to 0]", iReassemblyStore->Entries().Count()-1);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETENONCLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ProcessCompleteNonClass0SmsMessagesL [from %d to 0]", iReassemblyStore->Entries().Count()-1);
iReassemblyStore->BeginTransactionLC();
TInt count = iReassemblyStore->Entries().Count();
@@ -752,7 +756,7 @@
*/
void CFacadeSmsReassemblyStore::ProcessCompleteClass0SmsMessagesL(MSmsComm& aSmsComm, const CSmsMessage* aCurrentSmsMessage)
{
- LOGSMSPROT2("CFacadeSmsReassemblyStore::ProcessCompleteClass0SmsMessagesL [from %d to 0]", iClass0ReassemblyStore->Entries().Count()-1);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETECLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ProcessCompleteClass0SmsMessagesL [from %d to 0]", iClass0ReassemblyStore->Entries().Count()-1);
iClass0ReassemblyStore->BeginTransactionLC();
TInt count = iClass0ReassemblyStore->Entries().Count();
@@ -802,7 +806,7 @@
*/
TInt CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL(CSmsProvider& aProvider,TInt& aCount)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL()");
TInt count = iReassemblyStore->Entries().Count();
TInt index,numNewSegments(0);
for(index = count-1; index >=0; --index)
@@ -821,7 +825,7 @@
numNewSegments+=aProvider.ExternalizeMessageL(*smsMessage,EFalse);
for(TInt i=0; i< smsMessage->iSlotArray.Count() ;i++)
{
- LOGSMSPROT2("CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL %d", smsMessage->iSlotArray[i].iIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_2, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedNonClass0SmsMessagesL %d", smsMessage->iSlotArray[i].iIndex);
}
++aCount;
iReassemblyStore->BeginTransactionLC();
@@ -847,7 +851,7 @@
*/
TInt CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL(CSmsProvider& aProvider,TInt& aCount)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_1, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL()");
TInt count = iClass0ReassemblyStore->Entries().Count();
TInt index,numNewSegments(0);
for(index = count-1; index >=0; --index)
@@ -866,7 +870,7 @@
numNewSegments+=aProvider.ExternalizeMessageL(*smsMessage,EFalse);
for(TInt i=0; i< smsMessage->iSlotArray.Count() ;i++)
{
- LOGSMSPROT2("CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL() %d", smsMessage->iSlotArray[i].iIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_2, "CFacadeSmsReassemblyStore::ExternalizeEnumeratedClass0SmsMessagesL() %d", smsMessage->iSlotArray[i].iIndex);
}
++aCount;
iClass0ReassemblyStore->BeginTransactionLC();
@@ -913,8 +917,7 @@
*/
void CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms, TInt& aIndex, TBool& aIsComplete, TBool aIsEnumeration, TInt& aCount, TInt& aTotal)
{
- LOGSMSPROT2("CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): isComplete Message=%d",
- aSmsMessage.IsComplete());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_1, "CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): isComplete Message=%d",aSmsMessage.IsComplete());
if (aIsComplete || aSmsMessage.Type() == CSmsPDU::ESmsStatusReport)
{
@@ -938,8 +941,7 @@
TInt segStoreIndex(KErrNotFound);
iReassemblyStore->MatchPDUToExistingMessage(aSmsMessage, segStoreIndex);
- LOGSMSPROT2("CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): "
- "segStoreIndex=%d", segStoreIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_2, "CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): ""segStoreIndex=%d", segStoreIndex);
//
// If not yet complete, then we must be part of a multiple PDU message.
@@ -958,9 +960,7 @@
iReassemblyStore->UpdateExistingMessageL(aSmsMessage, aGsmSms, aIndex,
aIsComplete, isDuplicateMsgRef,
isDuplicateSlot);
- LOGSMSPROT5("CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): "
- "aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",
- aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
+ OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_3, "CFacadeSmsReassemblyStore::AddSegmentToNonClass0ReassemblyStoreL(): ""aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
if (isDuplicateMsgRef)
{
@@ -1050,8 +1050,7 @@
iReassemblyStore->CommitTransactionL();
}
- LOGSMSPROT3("CFacadeSmsReassemblyStore::UpdateLogServerIdOfNonClass0MessageL(): found=%d, foundIndex=%d",
- found, foundIndex);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDOFNONCLASS0MESSAGEL_1, "CFacadeSmsReassemblyStore::UpdateLogServerIdOfNonClass0MessageL(): found=%d, foundIndex=%d",found, foundIndex);
//
// If found and the index is valid, then update the Log Server ID...
@@ -1069,7 +1068,7 @@
*/
TBool CFacadeSmsReassemblyStore::IsWapSMS(const CSmsMessage& aSmsMessage)
{
- LOGSMSPROT1("CFacadeSmsReassemblyStore::IsWapSMS()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CFACADESMSREASSEMBLYSTORE_ISWAPSMS_1, "CFacadeSmsReassemblyStore::IsWapSMS()");
return CSmsProtocol::IsAppPortSMS(aSmsMessage);
}
--- a/smsprotocols/smsstack/smsprot/Src/smspmain.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspmain.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspmainTraces.h"
+#endif
+
#include <e32std.h>
#include "Gsmuelem.h"
#include <exterror.h>
@@ -62,7 +68,7 @@
rpError = KErrGsmSMSUnspecifiedProtocolError;
break;
}
- LOGSMSPROT3("ErrorToRPError (%d->%d)", aError, rpError);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, ERRORTORPERROR_1, "ErrorToRPError (%d->%d)", aError, rpError);
return rpError;
} // ErrorToRPError
@@ -98,7 +104,7 @@
} break;
}
}
- LOGSMSPROT3("ErrorToTPError (%d->%d)", aError, tpError);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, ERRORTOTPERROR_1, "ErrorToTPError (%d->%d)", aError, tpError);
return tpError;
}
@@ -115,7 +121,7 @@
{
// Ignore in code coverage - panic method
BULLSEYE_OFF
- LOGSMSPROT2("SMSPPANIC %d", aPanic);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, SMSPPANIC_1, "SMSPPANIC %d", aPanic);
_LIT(KSmsprotPanic, "SMSP");
User::Panic(KSmsprotPanic,aPanic);
BULLSEYE_RESTORE
--- a/smsprotocols/smsstack/smsprot/Src/smspmodm.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspmodm.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspmodmTraces.h"
+#endif
+
#include "smspmodm.h"
#include "smsuset.h"
#include "smspmain.h"
@@ -45,7 +51,7 @@
*/
void CSmsPhoneInitialization::Start()
{
- LOGSMSPROT1("CSmsPhoneInitialization::Start Start initializing the phone");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_START_1, "CSmsPhoneInitialization::Start Start initializing the phone");
Cancel();
@@ -60,7 +66,7 @@
void CSmsPhoneInitialization::DoRunL()
{
- LOGSMSPROT3("CSmsPhoneInitialization::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_1, "CSmsPhoneInitialization::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
switch (iState)
{
@@ -74,7 +80,7 @@
{
if (iStatus.Int() != KErrNone)
{
- LOGSMSPROT1("ERROR - TSY failed to set bearer but initialisation will continue; bearer setting may be successful during send");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_2, "ERROR - TSY failed to set bearer but initialisation will continue; bearer setting may be successful during send");
}
iState=ESmsPhoneInitializationGettingRegistrationStatus;
@@ -87,7 +93,7 @@
{
if(iStatus == KErrNone)
{
- LOGSMSPROT2("CSmsPhoneInitialization::DoRunL registration status : >%d<",iRegistrationStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_3, "CSmsPhoneInitialization::DoRunL registration status : >%d<",iRegistrationStatus);
if (iRegistrationStatus==RMobilePhone::ERegisteredOnHomeNetwork ||
iRegistrationStatus == RMobilePhone::ERegisteredRoaming)
{
@@ -106,7 +112,7 @@
{
iState=ESmsPhoneInitializationCompleted;
iNetworkInfoAvailable =EFalse;
- LOGSMSPROT2("CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_4, "CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
iSmsPDURead.Start();
}
}
@@ -124,7 +130,7 @@
{
iState=ESmsPhoneInitializationCompleted;
iNetworkInfoAvailable =EFalse;
- LOGSMSPROT2("CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_5, "CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
iSmsPDURead.Start();
}
}
@@ -136,14 +142,14 @@
if(iStatus == KErrNone)
{
iNetworkInfoAvailable =ETrue;
- LOGSMSPROT2("CSmsPhoneInitialization::DoRunL network longname : >%S<",&iNetworkInfo.iLongName);
- LOGSMSPROT2("CSmsPhoneInitialization::DoRunL network shortname : >%S<",&iNetworkInfo.iShortName);
- LOGSMSPROT2("CSmsPhoneInitialization::DoRunL network shortname : >%S<",&iNetworkInfo.iDisplayTag);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_6, "CSmsPhoneInitialization::DoRunL network longname : >%S<",iNetworkInfo.iLongName);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_7, "CSmsPhoneInitialization::DoRunL network shortname : >%S<",iNetworkInfo.iShortName);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_8, "CSmsPhoneInitialization::DoRunL network shortname : >%S<",iNetworkInfo.iDisplayTag);
}
else
{
iNetworkInfoAvailable =EFalse;
- LOGSMSPROT2("CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DORUNL_9, "CSmsPhoneInitialization::DoRunL NETWORK INFO NOT available due %d",iStatus.Int());
}
iSmsPDURead.Start();
}
@@ -168,7 +174,7 @@
*/
void CSmsPhoneInitialization::DoCancel()
{
- LOGSMSPROT1("CSmsPhoneInitialization::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_DOCANCEL_1, "CSmsPhoneInitialization::DoCancel()");
switch (iState)
{
@@ -227,7 +233,7 @@
*/
void CSmsPhoneInitialization::Complete(TInt aStatus)
{
- LOGSMSPROT1("CSmsPhoneInitialization::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_COMPLETE_1, "CSmsPhoneInitialization::Complete()");
//
// Call the base function to perform the actual complete...
@@ -245,7 +251,7 @@
*/
void CSmsPhoneInitialization::AfterPhoneInitialize(TInt aStatus)
{
- LOGSMSPROT2("CSmsPhoneInitialization::AfterPhoneIntialize [status=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_1, "CSmsPhoneInitialization::AfterPhoneIntialize [status=%d]", aStatus);
if (aStatus == KErrNone)
{
@@ -257,7 +263,7 @@
{
if (iMobileSmsCaps.iSmsMode != RMobileSmsMessaging::KCapsGsmSms)
{
- LOGSMSPROT1("TSY does not support GsmSms");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_2, "TSY does not support GsmSms");
aStatus = KErrNotSupported;
}
else
@@ -273,13 +279,13 @@
{
if (++iNumberOfAttempts < iMaxNumberOfAttempts)
{
- LOGSMSPROT2("CSmsPhoneInitialization Restarting [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_3, "CSmsPhoneInitialization Restarting [aStatus=%d]", aStatus);
iGsmPhone.Initialise(iStatus);
SetActive();
}
else
{
- LOGSMSPROT3("CSmsPhoneInitialization Failed after %d attempts [aStatus=%d]", iNumberOfAttempts, aStatus);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_4, "CSmsPhoneInitialization Failed after %d attempts [aStatus=%d]", iNumberOfAttempts, aStatus);
}
}
@@ -314,7 +320,7 @@
*/
CSmsModemNotification* CSmsModemNotification::NewL(MSmsComm& aSmsComm)
{
- LOGSMSPROT1("CSmsModemNotification::NewL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_NEWL_1, "CSmsModemNotification::NewL");
CSmsModemNotification* self=new(ELeave) CSmsModemNotification(aSmsComm);
CleanupStack::PushL(self);
@@ -327,7 +333,7 @@
void CSmsModemNotification::ConstructL()
{
- LOGSMSPROT1("CSmsModemNotification::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_CONSTRUCTL_1, "CSmsModemNotification::ConstructL()");
User::LeaveIfError(iPhonePowerProperty.Attach(KUidSystemCategory, KUidPhonePwr.iUid));
@@ -347,7 +353,7 @@
RPhone::TModemDetection CSmsModemNotification::ModemState()
{
- LOGSMSPROT1("CSmsModemNotification::ModemState()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_MODEMSTATE_1, "CSmsModemNotification::ModemState()");
//
// Get the phone power state.
@@ -375,7 +381,7 @@
*/
void CSmsModemNotification::Start()
{
- LOGSMSPROT1("CSmsModemNotification::Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_START_1, "CSmsModemNotification::Start");
__ASSERT_DEBUG(iState==ESmsModemNotificationIdle,SmspPanic(KSmspPanicUnexpectedState));
@@ -394,7 +400,7 @@
*/
void CSmsModemNotification::DoRunL()
{
- LOGSMSPROT2("CSmsModemNotification::RunL [iStatus=%d]", iStatus.Int() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_DORUNL_1, "CSmsModemNotification::RunL [iStatus=%d]", iStatus.Int() );
__ASSERT_DEBUG(iState==ESmsModemNotificationWaitingForNotification,SmspPanic(KSmspPanicUnexpectedState));
@@ -410,7 +416,7 @@
*/
void CSmsModemNotification::DoCancel()
{
- LOGSMSPROT1("CSmsModemNotification::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_DOCANCEL_1, "CSmsModemNotification::DoCancel()");
__ASSERT_DEBUG(iState==ESmsModemNotificationWaitingForNotification,SmspPanic(KSmspPanicUnexpectedState));
@@ -450,7 +456,7 @@
*/
void CSmsModemNotification::Complete(TInt aStatus)
{
- LOGSMSPROT1("CSmsModemNotification::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMODEMNOTIFICATION_COMPLETE_1, "CSmsModemNotification::Complete()");
//
// Call the base function to perform the actual complete...
--- a/smsprotocols/smsstack/smsprot/Src/smspmondsk.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspmondsk.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -45,6 +45,12 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspmondskTraces.h"
+#endif
+
#include <barsc.h>
#include <bautils.h>
@@ -68,7 +74,7 @@
*/
CSmsMonitorDiskSpace* CSmsMonitorDiskSpace::NewL(MSmsComm& aSmsComm, RMobileSmsMessaging& aSmsMessaging,RFs& aFs)
{
- LOGSMSPROT1("CSmsMonitorDiskSpace::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_NEWL_1, "CSmsMonitorDiskSpace::NewL()");
CSmsMonitorDiskSpace* self = new(ELeave) CSmsMonitorDiskSpace(aSmsComm, aSmsMessaging, aFs);
CleanupStack::PushL(self);
@@ -157,15 +163,12 @@
//
// Log the filename in use and whether it is ROM based...
//
-#ifdef _SMS_LOGGING_ENABLED
- TBuf8<KMaxFileName> buf8;
- buf8.Copy(fileName);
- LOGSMSPROT2("CSmsMonitorDiskSpace::ConstructL(): fileName=\"%S\"", &buf8);
-#endif
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_1, "CSmsMonitorDiskSpace::ConstructL(): fileName=\"%S\"", fileName);
+
if (iFs.IsFileInRom(fileName) == NULL)
{
- LOGSMSPROT1("CSmsMonitorDiskSpace::ConstructL(): Smsu.rsc not in ROM");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_2, "CSmsMonitorDiskSpace::ConstructL(): Smsu.rsc not in ROM");
}
//
@@ -199,14 +202,13 @@
TInt ret = iFreeDiskSpaceProperty.Attach(KUidPSSMSStackCategory, KUidPSSMSStackFreeDiskSpaceKey);
if (ret != KErrNone)
{
- LOGSMSPROT2("iFreeDiskSpaceProperty.Attach(): error=%d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_3, "iFreeDiskSpaceProperty.Attach(): error=%d", ret);
User::Leave(ret);
}
}
#endif
- LOGSMSPROT3("CSmsMonitorDiskSpace::ConstructL(): iLowLimit=%d, iHighLimit=%d",
- iLowLimit, iHighLimit);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_4, "CSmsMonitorDiskSpace::ConstructL(): iLowLimit=%u, iHighLimit=%u",iLowLimit, iHighLimit);
} // CSmsMonitorDiskSpace::ConstructL
@@ -215,8 +217,7 @@
*/
void CSmsMonitorDiskSpace::RunL()
{
- LOGSMSPROT3("CSmsMonitorDiskSpace:RunL(): iStatus=%d, iState=%d",
- iStatus.Int(), iState );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_RUNL_1, "CSmsMonitorDiskSpace:RunL(): iStatus=%d, iState=%d",iStatus.Int(), iState );
switch (iState)
{
@@ -300,7 +301,7 @@
*/
void CSmsMonitorDiskSpace::DoCancel()
{
- LOGSMSPROT2("CSmsMonitorDiskSpace::DoCancel(): iState=%d", iState);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_DOCANCEL_1, "CSmsMonitorDiskSpace::DoCancel(): iState=%d", iState);
switch (iState)
{
@@ -348,8 +349,7 @@
*/
void CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(TBool aPDUIsClass0)
{
- LOGSMSPROT2("CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(): aPDUIsClass0=%d",
- aPDUIsClass0);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CHECKDISKSPACEFORPDUL_1, "CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(): aPDUIsClass0=%d",aPDUIsClass0);
//
// First check the actual disk space before working out what to do.
@@ -438,8 +438,7 @@
void CSmsMonitorDiskSpace::NotifyDiskSpace(TInt aLimit,
TSmsMonitorDiskSpaceState aState)
{
- LOGSMSPROT3("CSmsMonitorDiskSpace::NotifyDiskSpace(): aLimit=%d, aState=%d",
- aLimit, aState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_NOTIFYDISKSPACE_1, "CSmsMonitorDiskSpace::NotifyDiskSpace(): aLimit=%d, aState=%d",aLimit, aState);
//
// Cancel any previously outstanding requests...
@@ -513,7 +512,7 @@
*/
void CSmsMonitorDiskSpace::ResumeSmsReception()
{
- LOGSMSPROT1("CSmsMonitorDiskSpace::ResumeSmsReception");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_RESUMESMSRECEPTION_1, "CSmsMonitorDiskSpace::ResumeSmsReception");
//
// Cancel any previously outstanding requests...
@@ -569,7 +568,7 @@
if (ret != KErrNone)
{
- LOGSMSPROT2("CSmsMonitorDiskSpace::GetFreeDiskSpace(): error=%d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_GETFREEDISKSPACE_1, "CSmsMonitorDiskSpace::GetFreeDiskSpace(): error=%d", ret);
return KErrGeneral;
}
@@ -587,7 +586,7 @@
freeSpace = (TInt) volumeInfo.iFree;
}
- LOGSMSPROT2("CSmsMonitorDiskSpace::GetFreeDiskSpace(): freeSpace=%d", freeSpace);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_GETFREEDISKSPACE_2, "CSmsMonitorDiskSpace::GetFreeDiskSpace(): freeSpace=%d", freeSpace);
return freeSpace;
} // CSmsMonitorDiskSpace::GetFreeDiskSpace
--- a/smsprotocols/smsstack/smsprot/Src/smsppara.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smsppara.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -14,6 +14,12 @@
//
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspparaTraces.h"
+#endif
+
#include "smsppara.h"
#include "smsuset.h"
#include "smsulog.h"
@@ -50,7 +56,7 @@
*/
void CSmsParamsBase::ConstructL()
{
- LOGSMSPROT1("CSmsParamsBase::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPARAMSBASE_CONSTRUCTL_1, "CSmsParamsBase::ConstructL()");
ConstructTimeoutL();
} // CSmsParamsBase::ConstructL
@@ -68,7 +74,7 @@
*/
CSmsReadParams* CSmsReadParams::NewL(MSmsComm& aSmsComm,const TSmsSettings& aSmsSettings,RMobileSmsMessaging& aSmsMessaging)
{
- LOGSMSPROT1("CSmsReadParams::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_NEWL_1, "CSmsReadParams::NewL()");
CSmsReadParams* smsReadParams=new(ELeave) CSmsReadParams(aSmsComm,aSmsSettings,aSmsMessaging);
CleanupStack::PushL(smsReadParams);
@@ -115,7 +121,7 @@
*/
void CSmsReadParams::Start(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmsReadParams::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_START_1, "CSmsReadParams::Start()");
__ASSERT_DEBUG(iSmsMessageObserver == NULL && iReport == NULL,
SmspPanic(KSmspPanicUnexpectedState));
@@ -155,7 +161,7 @@
*/
void CSmsReadParams::Start(TRequestStatus& aStatus)
{
- LOGSMSPROT1("CSmsReadParams::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_START1_1, "CSmsReadParams::Start()");
__ASSERT_DEBUG(iSmsMessageObserver == NULL && iReport == NULL,
SmspPanic(KSmspPanicUnexpectedState));
@@ -181,7 +187,7 @@
*/
void CSmsReadParams::DoRunL()
{
- LOGSMSPROT2("CSmsReadParams::RunL [iStatus=%d]", iStatus.Int() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_DORUNL_1, "CSmsReadParams::RunL [iStatus=%d]", iStatus.Int() );
//
// If the start retrieve was successful, then continue retrieving the list.
@@ -212,7 +218,7 @@
*/
void CSmsReadParams::DoCancel()
{
- LOGSMSPROT1("CSmsReadParams::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_DOCANCEL_1, "CSmsReadParams::DoCancel()");
TimedSetActiveCancel();
@@ -258,7 +264,7 @@
*/
void CSmsReadParams::ConstructL()
{
- LOGSMSPROT1("CSmsReadParams::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_CONSTRUCTL_1, "CSmsReadParams::ConstructL()");
CSmsParamsBase::ConstructL();
@@ -277,7 +283,7 @@
*/
void CSmsReadParams::CheckListValidityL(CMobilePhoneSmspList& aMobilePhoneSmspList)
{
- LOGSMSPROT1("CSmsReadParams::CheckListValidityL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_CHECKLISTVALIDITYL_1, "CSmsReadParams::CheckListValidityL()");
//
// MaxNumberEntries method returns the maximum number of entries that can
@@ -308,7 +314,7 @@
*/
void CSmsReadParams::StoreParameters(CMobilePhoneSmspList* aMobilePhoneSmspList)
{
- LOGSMSPROT1("CSmsReadParams::StoreParameters()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_STOREPARAMETERS_1, "CSmsReadParams::StoreParameters()");
__ASSERT_DEBUG(iMobilePhoneSmspList != NULL && aMobilePhoneSmspList != NULL && iMobilePhoneSmspList->MaxNumberEntries() == aMobilePhoneSmspList->MaxNumberEntries(),SmspPanic(KSmspPanicCorruptedSmspList));
@@ -328,7 +334,7 @@
*/
void CSmsReadParams::Complete(TInt aStatus)
{
- LOGSMSPROT1("CSmsReadParams::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREADPARAMS_COMPLETE_1, "CSmsReadParams::Complete()");
//
// Call the base function to perform the actual complete...
@@ -357,7 +363,7 @@
*/
CSmsWriteParams* CSmsWriteParams::NewL(MSmsComm& aSmsComm,const TSmsSettings& aSmsSettings,RMobileSmsMessaging& aSmsMessaging,CSmsReadParams& aSmsReadParams)
{
- LOGSMSPROT1("CSmsWriteParams::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_NEWL_1, "CSmsWriteParams::NewL()");
CSmsWriteParams* smsWriteParams=new(ELeave) CSmsWriteParams(aSmsComm,aSmsSettings,aSmsMessaging,aSmsReadParams);
CleanupStack::PushL(smsWriteParams);
@@ -396,7 +402,7 @@
*/
void CSmsWriteParams::Start(MSmsMessageObserver& aObserver,CMobilePhoneSmspList* aMobilePhoneSmspList)
{
- LOGSMSPROT1("CSmsWriteParams::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_START_1, "CSmsWriteParams::Start()");
__ASSERT_DEBUG(iState==ESmsParamsIdle,SmspPanic(KSmspPanicUnexpectedState));
@@ -435,7 +441,7 @@
*/
void CSmsWriteParams::DoRunL()
{
- LOGSMSPROT2("CSmsWriteParams::DoRunL [iStatus=%d]", iStatus.Int() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_DORUNL_1, "CSmsWriteParams::DoRunL [iStatus=%d]", iStatus.Int() );
switch (iState)
{
@@ -497,7 +503,7 @@
*/
void CSmsWriteParams::DoCancel()
{
- LOGSMSPROT1("CSmsWriteParams::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_DOCANCEL_1, "CSmsWriteParams::DoCancel()");
TimedSetActiveCancel();
@@ -562,7 +568,7 @@
*/
void CSmsWriteParams::ConstructL()
{
- LOGSMSPROT1("CSmsWriteParams::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_CONSTRUCTL_1, "CSmsWriteParams::ConstructL()");
CSmsParamsBase::ConstructL();
} // CSmsWriteParams::ConstructL
@@ -580,7 +586,7 @@
*/
void CSmsWriteParams::Complete(TInt aStatus)
{
- LOGSMSPROT1("CSmsWriteParams::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSWRITEPARAMS_COMPLETE_1, "CSmsWriteParams::Complete()");
//
// Call the base function to perform the actual complete...
--- a/smsprotocols/smsstack/smsprot/Src/smspproc.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspproc.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -18,6 +18,12 @@
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspprocTraces.h"
+#endif
+
#include "smspproc.h"
#include "smspmondsk.h"
#include "smspfacadestor.h"
@@ -43,7 +49,7 @@
CSmsSegmentationStore& aSegmentationStore,
CSmsMonitorDiskSpace& aSmsMonitorDiskSpace)
{
- LOGSMSPROT1("CSmsPDUProcessor::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_NEWL_1, "CSmsPDUProcessor::NewL()");
CSmsPDUProcessor* smsPDUProcessor = new (ELeave) CSmsPDUProcessor(aSmsComm,
aSmsSettings,
@@ -87,14 +93,13 @@
*/
void CSmsPDUProcessor::ConstructL()
{
- LOGSMSPROT1("CSmsPDUProcessor::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_CONSTRUCTL_1, "CSmsPDUProcessor::ConstructL()");
} // CSmsPDUProcessor::ConstructL
void CSmsPDUProcessor::DecodeAndProcessPDUL(TGsmSmsSlot& aSlot, TBool aIsEnumeration)
{
- LOGSMSPROT2("CSmsPDUProcessor::DecodeAndProcessPDUL(): aIsEnumeration=%d",
- aIsEnumeration);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_1, "CSmsPDUProcessor::DecodeAndProcessPDUL(): aIsEnumeration=%d",aIsEnumeration);
//
// Store the slot...
@@ -110,8 +115,7 @@
iIsMobileTerminated = ETrue;
}
- LOGSMSPROT2("CSmsStoreRead::DecodeAndProcessPDUL(): iIsMobileTerminated=%d",
- iIsMobileTerminated);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_2, "CSmsStoreRead::DecodeAndProcessPDUL(): iIsMobileTerminated=%d",iIsMobileTerminated);
//
// Put the PDU and Service Center Address in the TGsmSms structure...
@@ -192,7 +196,7 @@
//
if (iSmsMessage->ToFromAddress().CompareF(KNETWORK) == 0)
{
- LOGSMSPROT1("CSmsPDUProcessor::DecodeAndProcessPDUL(): MOSES OTE message!");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_3, "CSmsPDUProcessor::DecodeAndProcessPDUL(): MOSES OTE message!");
if (iSmsComm.NetworkInfoAvailable())
{
iSmsMessage->SetToFromAddressL(iSmsComm.NetworkInfo().iDisplayTag);
@@ -313,7 +317,7 @@
void CSmsPDUProcessor::AnalysePDUCharacteristics()
{
- LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_1, "CSmsPDUProcessor::AnalysePDUCharacteristics()");
CSmsPDU& pdu = iSmsMessage->SmsPDU();
@@ -326,32 +330,32 @@
{
if (msgClass == TSmsDataCodingScheme::ESmsClass0)
{
- LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 0");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_2, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 0");
iIsClass0Message = ETrue;
}
else if (msgClass == TSmsDataCodingScheme::ESmsClass1)
{
- LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 1");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_3, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 1");
iIsClass1Message = ETrue;
}
else if (msgClass == TSmsDataCodingScheme::ESmsClass2)
{
- LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 2");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_4, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 2");
iIsClass2Message = ETrue;
}
else if (msgClass == TSmsDataCodingScheme::ESmsClass3)
{
- LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 3");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_5, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 3");
iIsClass3Message = ETrue;
}
else
{
- LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class Unknown!");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_6, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class Unknown!");
}
}
else
{
- LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class-less");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_7, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class-less");
}
//
@@ -364,8 +368,7 @@
iIsPIDType0 = ETrue;
}
- LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPIDType0=%d",
- iIsPIDType0);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_8, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPIDType0=%d",iIsPIDType0);
//
// Should this message be forwarded to the client?
@@ -378,8 +381,7 @@
iIsForwardMessageToClient = ETrue;
}
- LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsForwardMessageToClient=%d",
- iIsForwardMessageToClient);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_9, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsForwardMessageToClient=%d",iIsForwardMessageToClient);
//
// Is it flaged for auto-delete?
@@ -394,8 +396,7 @@
}
}
- LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMarkedForAutoDelete=%d",
- iIsMarkedForAutoDelete);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_10, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMarkedForAutoDelete=%d",iIsMarkedForAutoDelete);
//
// Should this PDU be deleted after processing?
@@ -411,8 +412,7 @@
iIsPDUToBeDeleted = ETrue;
}
- LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPDUToBeDeleted=%d",
- iIsPDUToBeDeleted);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_11, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPDUToBeDeleted=%d",iIsPDUToBeDeleted);
//
// Does the message need to be stored???
@@ -430,8 +430,7 @@
iIsMessageGoingToBeStored = ETrue;
}
- LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMessageGoingToBeStored=%d",
- iIsMessageGoingToBeStored);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_12, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMessageGoingToBeStored=%d",iIsMessageGoingToBeStored);
//
// Is the message complete? This value may change later, when the segmentation and
@@ -439,8 +438,7 @@
//
iIsComplete = iSmsMessage->IsComplete();
- LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsComplete=%d",
- iIsComplete);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_13, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsComplete=%d",iIsComplete);
//
// Store PDU Data. These values may be updated later.
@@ -462,7 +460,7 @@
//
TBool found = iSegmentationStore.AddStatusReportL(iIndex, iIsComplete, *iSmsMessage);
- LOGSMSPROT2("CSmsPDUReadProcess::FindOriginalMessageAndProcessStatusReportL(): found=%d",found);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_FINDORIGINALMESSAGEANDPROCESSSTATUSREPORTL_1, "CSmsPDUReadProcess::FindOriginalMessageAndProcessStatusReportL(): found=%d",found);
if (found)
{
@@ -498,7 +496,7 @@
void CSmsPDUProcessor::UpdateStatusReportL()
{
- LOGSMSPROT1("CSmsPDUProcessor::UpdateStatusReportL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_UPDATESTATUSREPORTL_1, "CSmsPDUProcessor::UpdateStatusReportL()");
//
// Update the receive time of the status report...
@@ -531,7 +529,7 @@
void CSmsPDUProcessor::AddSlotToSmsMessageIfRequiredL()
{
- LOGSMSPROT1("CSmsPDUProcessor::AddSlotToSmsMessageIfRequiredL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ADDSLOTTOSMSMESSAGEIFREQUIREDL_1, "CSmsPDUProcessor::AddSlotToSmsMessageIfRequiredL()");
//
// Add the slot to the message (if it is not going to be deleted and
@@ -567,8 +565,7 @@
*/
void CSmsPDUProcessor::AddSegmentOfMessageToReassemblyStoreIfRequiredL()
{
- LOGSMSPROT2("CSmsPDUReadProcess::AddSegmentOfMessageToReassemblyStoreIfRequiredL(): iIsComplete=%d",
- iIsComplete);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ADDSEGMENTOFMESSAGETOREASSEMBLYSTOREIFREQUIREDL_1, "CSmsPDUReadProcess::AddSegmentOfMessageToReassemblyStoreIfRequiredL(): iIsComplete=%d",iIsComplete);
iReassemblyStore.AddSegmentToReassemblyStoreL(*iSmsMessage, iGsmSms, iIndex, iIsComplete, iIsEnumeration, iSmsPDUData.iReceived, iSmsPDUData.iTotal);
} // CSmsPDUProcessor::AddSegmentOfMessageToReassemblyStoreIfRequiredL
@@ -576,7 +573,7 @@
void CSmsPDUProcessor::UpdateLogServerIdL()
{
- LOGSMSPROT1("CSmsPDUProcessor::UpdateLogServerIdL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_UPDATELOGSERVERIDL_1, "CSmsPDUProcessor::UpdateLogServerIdL()");
//
// If this is a SUBMIT or DELIVER PDU,
@@ -592,7 +589,7 @@
void CSmsPDUProcessor::ProcessMessageIfCompleteL()
{
- LOGSMSPROT1("CSmsPDUProcessor::ProcessMessageIfCompleteL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_PROCESSMESSAGEIFCOMPLETEL_1, "CSmsPDUProcessor::ProcessMessageIfCompleteL()");
if ((iIsClass0Message && !iIsWapSms) && iReassemblyStore.IsSeparateClass0StoreSupported())
{
@@ -650,7 +647,7 @@
void CSmsPDUProcessor::DeletePDUL()
{
- LOGSMSPROT1("CSmsPDUProcessor::DeletePDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DELETEPDUL_1, "CSmsPDUProcessor::DeletePDUL()");
//
// If the slot number has an index and store assigned, then we can delete
--- a/smsprotocols/smsstack/smsprot/Src/smspqueue.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspqueue.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspqueueTraces.h"
+#endif
+
#include "smspqueue.h"
#include "smspcomm.h"
#include "Gsmumsg.h"
@@ -79,7 +85,7 @@
void CSmspMessageQueue::DoRunL()
{
- LOGSMSPROT1("CSmspMessageQueue::DoRunL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_DORUNL_1, "CSmspMessageQueue::DoRunL()");
CompleteFirst(iStatus.Int());
Start();
@@ -90,7 +96,7 @@
{
TRAPD(err, DoQueueL(aMessage, aObserver, aOptions));
- LOGSMSPROT4("*** CSmspMessageQueue::Queue [err=%d aObserver=0x%08x IsActive=%d]", err, &aObserver, IsActive());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_QUEUE_1, "*** CSmspMessageQueue::Queue [err=%d aObserver=0x%08x IsActive=%d]", err, (TUint) &aObserver, IsActive());
if (err != KErrNone)
{
@@ -105,7 +111,7 @@
void CSmspMessageQueue::DoQueueL(CSmsMessage* aMessage, MSmsMessageObserver& aObserver, TUint aOptions)
{
- LOGSMSPROT1("CSmspMessageQueue::DoQueueL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_DOQUEUEL_1, "CSmspMessageQueue::DoQueueL()");
CleanupStack::PushL(aMessage);
@@ -132,7 +138,7 @@
*/
void CSmspMessageQueue::DoCancel()
{
- LOGSMSPROT1("*** CSmspMessageQueue::DoCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_DOCANCEL_1, "*** CSmspMessageQueue::DoCancel");
TSglQueIter<CQueuedSmsMessage> iter(iMessageQueue);
CQueuedSmsMessage* queuedsmsmessage = iter;
@@ -146,7 +152,7 @@
void CSmspMessageQueue::CompleteFirst(TInt aStatus)
{
- LOGSMSPROT1("CSmspMessageQueue::CompleteFirst()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_COMPLETEFIRST_1, "CSmspMessageQueue::CompleteFirst()");
CompleteRequest(iMessageQueue.First(), aStatus);
} // CSmspMessageQueue::CompleteFirst
@@ -154,7 +160,7 @@
void CSmspMessageQueue::CompleteRequest(CQueuedSmsMessage* aQueuedMessage, TInt aStatus)
{
- LOGSMSPROT4("*** CSmspMessageQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus, &aQueuedMessage->iObserver, iMessageQueue.IsFirst(aQueuedMessage));
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_COMPLETEREQUEST_1, "*** CSmspMessageQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus,(TUint) &aQueuedMessage->iObserver, iMessageQueue.IsFirst(aQueuedMessage));
// From defect HOE-563KLY, need to cancel request if active and remove from queue
// before observer has chance to manipulate queue
@@ -167,7 +173,7 @@
void CSmspMessageQueue::CancelObserver(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT2("*** CSmspMessageQueue::CancelObserver [aObserver=0x%X]", &aObserver);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPMESSAGEQUEUE_CANCELOBSERVER_1, "*** CSmspMessageQueue::CancelObserver [aObserver=0x%X]", &aObserver);
TSglQueIter<CQueuedSmsMessage> iter(iMessageQueue);
CQueuedSmsMessage* queuedsmsmessage = iter;
@@ -220,7 +226,7 @@
*/
CQueuedPDUDelete* CQueuedPDUDelete::NewL(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray,MSmsMessageObserver* aObserver)
{
- LOGSMSPROT1("CQueuedPDUDelete::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQUEUEDPDUDELETE_NEWL_1, "CQueuedPDUDelete::NewL()");
CQueuedPDUDelete* queuedpdudelete=new(ELeave) CQueuedPDUDelete(aObserver);
CleanupStack::PushL(queuedpdudelete);
@@ -249,7 +255,7 @@
*/
void CQueuedPDUDelete::ConstructL(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray)
{
- LOGSMSPROT1("CQueuedPDUDelete::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQUEUEDPDUDELETE_CONSTRUCTL_1, "CQueuedPDUDelete::ConstructL()");
TInt count=aSlotArray.Count();
for (TInt i=0; i<count; i++)
@@ -278,7 +284,7 @@
*/
void CSmspDeleteQueue::RunL()
{
- LOGSMSPROT1("CSmspDeleteQueue::RunL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_RUNL_1, "CSmspDeleteQueue::RunL()");
CompleteFirst(iStatus.Int());
@@ -299,7 +305,7 @@
{
// Ignore in code coverage - the delete queue implements its own RunL.
BULLSEYE_OFF
- LOGSMSPROT1("CSmspDeleteQueue::DoRunL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_DORUNL_1, "CSmspDeleteQueue::DoRunL()");
// This CSmspDeleteQueue::DoRunL() function would be called by
// CSmsuActiveBase::RunL(). However, CSmspDeleteQueue::RunL() now
@@ -313,7 +319,7 @@
{
TRAPD(err, DoQueueL(aSlotArray, aObserver));
- LOGSMSPROT4("*** CSmspDeleteQueue::Queue [err=%d aObserver=0x%X IsActive=%d]", err, aObserver, IsActive());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_QUEUE_1, "*** CSmspDeleteQueue::Queue [err=%d aObserver=0x%X IsActive=%d]", err, (TUint)aObserver, IsActive());
if (err != KErrNone)
{
@@ -329,7 +335,7 @@
void CSmspDeleteQueue::DoQueueL(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray, MSmsMessageObserver* aObserver)
{
- LOGSMSPROT1("CSmspDeleteQueue::DoQueueL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_DOQUEUEL_1, "CSmspDeleteQueue::DoQueueL()");
CQueuedPDUDelete* queuedDelete= CQueuedPDUDelete::NewL(aSlotArray, aObserver);
iDeleteQueue.AddLast(*queuedDelete);
@@ -339,7 +345,7 @@
CSmspDeleteQueue::CSmspDeleteQueue(MSmsComm& aSmsComm, TInt aPriority)
: CSmspProtocolQueue(aSmsComm, aPriority)
{
- LOGSMSPROT1("CSmspDeleteQueue::CSmspDeleteQueue()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_CTOR_1, "CSmspDeleteQueue::CSmspDeleteQueue()");
iDeleteQueue.SetOffset(_FOFF(CQueuedPDUDelete,iLink));
} // CSmspDeleteQueue::CSmspDeleteQueue
@@ -350,7 +356,7 @@
*/
void CSmspDeleteQueue::DoCancel()
{
- LOGSMSPROT1("*** CSmspDeleteQueue::DoCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_DOCANCEL_1, "*** CSmspDeleteQueue::DoCancel");
iSmsPDUDelete->Cancel();
@@ -364,7 +370,7 @@
void CSmspDeleteQueue::CompleteFirst(TInt aStatus)
{
- LOGSMSPROT1("CSmspDeleteQueue::CompleteFirst()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_COMPLETEFIRST_1, "CSmspDeleteQueue::CompleteFirst()");
CompleteRequest(iDeleteQueue.First(), aStatus);
} // CSmspDeleteQueue::CompleteFirst
@@ -372,7 +378,7 @@
void CSmspDeleteQueue::CompleteRequest(CQueuedPDUDelete* aQueuedDelete, TInt aStatus)
{
- LOGSMSPROT4("*** CSmspDeleteQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus, aQueuedDelete->iObserver, iDeleteQueue.IsFirst(aQueuedDelete));
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_COMPLETEREQUEST_1, "*** CSmspDeleteQueue::CompleteRequest [aStatus=%d aObserver=0x%X IsFirst=%d]", aStatus, (TUint)aQueuedDelete->iObserver, iDeleteQueue.IsFirst(aQueuedDelete));
if (aQueuedDelete->iObserver != NULL)
CompleteObserver(*aQueuedDelete->iObserver, aStatus);
@@ -384,7 +390,7 @@
void CSmspDeleteQueue::CancelObserver(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT2("*** CSmspDeleteQueue::CancelObserver [aObserver=0x%X]", &aObserver);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_CANCELOBSERVER_1, "*** CSmspDeleteQueue::CancelObserver [aObserver=0x%X]", &aObserver);
TSglQueIter<CQueuedPDUDelete> iter(iDeleteQueue);
CQueuedPDUDelete* queuedDelete = iter;
@@ -409,7 +415,7 @@
CSmspDeleteQueue* CSmspDeleteQueue::NewL(MSmsComm& aSmsComm, const TSmsSettings& aSmsSettings, RMobileSmsMessaging& aSmsMessaging, TInt aPriority)
{
- LOGSMSPROT1("CSmspDeleteQueue::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_NEWL_1, "CSmspDeleteQueue::NewL()");
CSmspDeleteQueue* self = new (ELeave) CSmspDeleteQueue(aSmsComm, aPriority);
CleanupStack::PushL(self);
@@ -421,7 +427,7 @@
void CSmspDeleteQueue::Start()
{
- LOGSMSPROT3("*** CSmspDeleteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iDeleteQueue.IsEmpty());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_START_1, "*** CSmspDeleteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iDeleteQueue.IsEmpty());
if (!IsActive() && !iDeleteQueue.IsEmpty())
{
@@ -449,7 +455,7 @@
void CSmspDeleteQueue::ConstructL(const TSmsSettings& aSmsSettings, RMobileSmsMessaging& aSmsMessaging)
{
- LOGSMSPROT1("CSmspDeleteQueue::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_CONSTRUCTL_1, "CSmspDeleteQueue::ConstructL()");
iSmsPDUDelete = CSmsPDUDelete::NewL(aSmsSettings, aSmsMessaging);
} // CSmspDeleteQueue::ConstructL
@@ -457,7 +463,7 @@
void CSmspDeleteQueue::CompleteObserver(MSmsMessageObserver& aObserver, TInt aError, const CSmsMessage*)
{
- LOGSMSPROT4("*** CSmspDeleteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", &aObserver, aError, IsActive());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDELETEQUEUE_COMPLETEOBSERVER_1, "*** CSmspDeleteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", (TUint)&aObserver, aError, IsActive());
if (iSmsComm.ObserverIsPresent(aObserver))
{
@@ -473,7 +479,7 @@
CSmspSendQueue* CSmspSendQueue::NewL(MSmsComm& aSmsComm, CSmsSegmentationStore& aSegmentationStore, const TSmsSettings& aSmsSettings, const RMobileSmsMessaging::TMobileSmsCapsV1& aMobileSmsCaps, RMobileSmsMessaging& aSmsMessaging, TInt aPriority, CSmspSetBearer& aSmspSetBearer)
{
- LOGSMSPROT1("CSmspSendQueue::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_NEWL_1, "CSmspSendQueue::NewL()");
CSmspSendQueue* self = new (ELeave) CSmspSendQueue(aSmsComm, aPriority);
CleanupStack::PushL(self);
@@ -485,7 +491,7 @@
void CSmspSendQueue::Start()
{
- LOGSMSPROT3("*** CSmspSendQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_START_1, "*** CSmspSendQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
if (!IsActive() && !iMessageQueue.IsEmpty())
{
@@ -511,7 +517,7 @@
void CSmspSendQueue::ConstructL(CSmsSegmentationStore& aSegmentationStore, const TSmsSettings& aSmsSettings, const RMobileSmsMessaging::TMobileSmsCapsV1& aMobileSmsCaps, RMobileSmsMessaging& aSmsMessaging, CSmspSetBearer& aSmspSetBearer)
{
- LOGSMSPROT1("CSmspSendQueue::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_CONSTRUCTL_1, "CSmspSendQueue::ConstructL()");
iSmsMessageSend = CSmsMessageSend::NewL(aSegmentationStore, aSmsSettings, aMobileSmsCaps, aSmsMessaging, Priority(), aSmspSetBearer);
} // CSmspSendQueue::ConstructL
@@ -519,7 +525,7 @@
void CSmspSendQueue::CancelRequestIfObserved(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmspSendQueue::CancelRequestIfObserved()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_CANCELREQUESTIFOBSERVED_1, "CSmspSendQueue::CancelRequestIfObserved()");
if (IsActive() && &iMessageQueue.First()->iObserver == &aObserver)
{
@@ -530,7 +536,7 @@
void CSmspSendQueue::CompleteObserver(MSmsMessageObserver& aObserver, TInt aError, const CSmsMessage*)
{
- LOGSMSPROT4("*** CSmspSendQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", &aObserver, aError, IsActive());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_COMPLETEOBSERVER_1, "*** CSmspSendQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", (TUint)&aObserver, aError, IsActive());
if (iSmsComm.ObserverIsPresent(aObserver))
{
@@ -541,7 +547,7 @@
void CSmspSendQueue::Complete(TInt aStatus)
{
- LOGSMSPROT1("CSmspSendQueue::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSENDQUEUE_COMPLETE_1, "CSmspSendQueue::Complete()");
iSmsComm.MessageSendCompleted(aStatus);
} // CSmspSendQueue::Complete
@@ -555,7 +561,7 @@
CSmspWriteQueue* CSmspWriteQueue::NewL(MSmsComm& aSmsComm, const TSmsSettings& aSmsSettings, RMobilePhone& aGsmPhone, CSmsSegmentationStore& aSegmentationStore, TInt aPriority)
{
- LOGSMSPROT1("CSmspWriteQueue::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_NEWL_1, "CSmspWriteQueue::NewL()");
CSmspWriteQueue* self = new (ELeave) CSmspWriteQueue(aSmsComm, aPriority);
CleanupStack::PushL(self);
@@ -567,7 +573,7 @@
void CSmspWriteQueue::Start()
{
- LOGSMSPROT3("*** CSmspWriteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_START_1, "*** CSmspWriteQueue::Start [IsActive=%d IsEmpty=%d]", IsActive(), iMessageQueue.IsEmpty());
if (!IsActive() && !iMessageQueue.IsEmpty())
{
@@ -593,7 +599,7 @@
void CSmspWriteQueue::ConstructL(const TSmsSettings& aSmsSettings, RMobilePhone& aGsmPhone, CSmsSegmentationStore& aSegmentationStore)
{
- LOGSMSPROT1("CSmspWriteQueue::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_CONSTRUCTL_1, "CSmspWriteQueue::ConstructL()");
iSmsMessageWrite = CSmsMessageWrite::NewL(iSmsComm, aSmsSettings, aGsmPhone, aSegmentationStore);
} // CSmspWriteQueue::ConstructL
@@ -601,7 +607,7 @@
void CSmspWriteQueue::CancelRequestIfObserved(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmspWriteQueue::CancelRequestIfObserved()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_CANCELREQUESTIFOBSERVED_1, "CSmspWriteQueue::CancelRequestIfObserved()");
if (IsActive() && &iMessageQueue.First()->iObserver == &aObserver)
{
@@ -612,7 +618,7 @@
void CSmspWriteQueue::CompleteObserver(MSmsMessageObserver& aObserver, TInt aError, const CSmsMessage* aSmsMessage)
{
- LOGSMSPROT4("*** CSmspWriteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", &aObserver, aError, IsActive());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_COMPLETEOBSERVER_1, "*** CSmspWriteQueue::CompleteObserver [aObserver=0x%X aError=%d IsActive=%d]", (TUint)&aObserver, aError, IsActive());
if (iSmsComm.ObserverIsPresent(aObserver))
{
aObserver.MessageWriteCompleted(aError, aSmsMessage);
@@ -622,7 +628,7 @@
void CSmspWriteQueue::Complete(TInt)
{
- LOGSMSPROT1("CSmspWriteQueue::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPWRITEQUEUE_COMPLETE_1, "CSmspWriteQueue::Complete()");
//Do Nothing :o)
} // CSmspWriteQueue::Complete
--- a/smsprotocols/smsstack/smsprot/Src/smspread.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspread.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -16,6 +16,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspreadTraces.h"
+#endif
+
#include "smspread.h"
#include "smspmain.h"
@@ -53,7 +59,7 @@
CSmspReceiveMode& aSmspReceiveMode,
CSmsMonitorDiskSpace& aSmsMonitorDiskSpace)
{
- LOGSMSPROT1("CSmsPDURead::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_NEWL_1, "CSmsPDURead::NewL()");
CSmsPDURead* smsPduRead = new (ELeave) CSmsPDURead(aSmsComm,
aSmsSettings,
@@ -75,7 +81,7 @@
void CSmsPDURead::ConstructL()
{
- LOGSMSPROT1("CSmsPDURead::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_CONSTRUCTL_1, "CSmsPDURead::ConstructL()");
ConstructTimeoutL();
User::LeaveIfError(iOOMTimer.CreateLocal());
@@ -128,7 +134,7 @@
*/
void CSmsPDURead::Start()
{
- LOGSMSPROT3("CSmsPDURead::Start(): iStatus=%d, iState=%d", iStatus.Int(), iState );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_START_1, "CSmsPDURead::Start(): iStatus=%d, iState=%d", iStatus.Int(), iState );
if (IsSupported() && IsActive() == EFalse && iReassemblyStore.IsFull() == EFalse)
{
@@ -142,7 +148,7 @@
void CSmsPDURead::ProcessPDUL()
{
- LOGSMSPROT1("CSmsPDURead::ProcessPDUL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_PROCESSPDUL_1, "CSmsPDURead::ProcessPDUL()");
//
// Initilse the Slot location data...
@@ -169,7 +175,7 @@
TRAPD(decodeError, iPduProcessor->DecodeAndProcessPDUL(iSlot, EFalse));
iStatus = decodeError;
- LOGSMSPROT2("CSmsPDURead::ProcessPDUL(): DecodeAndProcessPDUL() returned %d", iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_PROCESSPDUL_2, "CSmsPDURead::ProcessPDUL(): DecodeAndProcessPDUL() returned %d", iStatus.Int());
//
// If the PDU cannot be decoded, and this was not due to memory or disk
@@ -200,7 +206,7 @@
*/
void CSmsPDURead::DoRunL()
{
- LOGSMSPROT3("CSmsPDURead::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DORUNL_1, "CSmsPDURead::DoRunL [iStatus=%d, iState=%d]", iStatus.Int(), iState);
//
// Handle state changes only for successful operations. Any errors will be
@@ -231,8 +237,12 @@
{
if (iStatus.Int() == KErrNone)
{
- LOGSMSIFPDU(_L8("ETEL RX PDU: "), iMsgData, EFalse);
- LOGSMSIFTIMESTAMP();
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ LogSmsIfPDU(_L8("ETEL RX PDU: "), iMsgData, EFalse);
+ TBuf<40> timestamp;
+ SmsTimeStampL(timestamp);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSPDUREAD_DORUNL_2, "%S",timestamp);
+#endif
ProcessPDUL();
}
}
@@ -266,8 +276,8 @@
{
if (iStatus.Int() == KErrNone)
{
- LOGSMSPROT1("CSmsPDURead::DoRunL in ESmsPDUReadSystemOutOfMemorySendNack2");
- LOGSMSPROT1("CSmsPDURead::DoRunL activate post OOM timer");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DORUNL_3, "CSmsPDURead::DoRunL in ESmsPDUReadSystemOutOfMemorySendNack2");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DORUNL_4, "CSmsPDURead::DoRunL activate post OOM timer");
iState = ESmsPDUWaitTimerAfterOOM;
iOOMTimer.After(iStatus,KWaitReadPduTime);
SetActive();
@@ -311,7 +321,7 @@
*/
void CSmsPDURead::ResumeSmsReception()
{
- LOGSMSPROT3("CSmsPDURead::ResumeSmsReception [iStatus=%d, iState=%d]", iStatus.Int(), iState );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_RESUMESMSRECEPTION_1, "CSmsPDURead::ResumeSmsReception [iStatus=%d, iState=%d]", iStatus.Int(), iState );
if (!IsActive())
{
@@ -336,7 +346,7 @@
*/
void CSmsPDURead::Receive()
{
- LOGSMSPROT3("CSmsPDURead::Receive [iStatus=%d, iState=%d]", iStatus.Int(), iState );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_RECEIVE_1, "CSmsPDURead::Receive [iStatus=%d, iState=%d]", iStatus.Int(), iState );
//
// Check if we need to resume reception first. This may be required if a
@@ -374,7 +384,7 @@
*/
void CSmsPDURead::DoCancel()
{
- LOGSMSPROT3("CSmsPDURead::DoCancel [iStatus=%d iState=%d]", iStatus.Int(), iState );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOCANCEL_1, "CSmsPDURead::DoCancel [iStatus=%d iState=%d]", iStatus.Int(), iState );
TimedSetActiveCancel();
@@ -455,7 +465,7 @@
void CSmsPDURead::AddLogEvent()
{
- LOGSMSPROT1("CSmsPDURead::AddLogEvent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_ADDLOGEVENT_1, "CSmsPDURead::AddLogEvent()");
iState = ESmsPDUReadLogging;
@@ -486,7 +496,7 @@
void CSmsPDURead::DoEncodeDeliverReportL()
{
- LOGSMSPROT2("CSmsPDUReadProcess::DoEncodeDeliverReport [iStatus=%d]", iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOENCODEDELIVERREPORTL_1, "CSmsPDUReadProcess::DoEncodeDeliverReport [iStatus=%d]", iStatus.Int());
iDeliverReport.SetPdu(KNullDesC8);
@@ -502,8 +512,7 @@
case ESmsPDUReadInvalidPDUSendNegativeAck:
case ESmsPDUReadSystemOutOfMemorySendNegativeAck:
{
- LOGSMSPROT4("CSmsPDURead::DoEncodeDeliverReport SendNegativeAck [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",
- iStatus.Int(), iState, iRpErrorCodesSupported);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOENCODEDELIVERREPORTL_2, "CSmsPDURead::DoEncodeDeliverReport SendNegativeAck [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",iStatus.Int(), iState, iRpErrorCodesSupported);
deliverReport.SetIsRPError(ETrue);
const TInt failureCause = ErrorToTPError(iStatus.Int());
@@ -514,15 +523,13 @@
case ESmsPDUReadAbsorbInvalidPduSendPositiveAck:
case ESmsPDUReadAbsorbValidPduSendPositiveAck:
{
- LOGSMSPROT4("CSmsPDURead::DoEncodeDeliverReport SendPositiveAck [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",
- iStatus.Int(), iState, iRpErrorCodesSupported);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOENCODEDELIVERREPORTL_3, "CSmsPDURead::DoEncodeDeliverReport SendPositiveAck [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",iStatus.Int(), iState, iRpErrorCodesSupported);
deliverReport.SetIsRPError(EFalse);
break;
}
default:
{
- LOGSMSPROT4("CSmsPDURead::DoEncodeDeliverReport [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",
- iStatus.Int(), iState, iRpErrorCodesSupported);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_DOENCODEDELIVERREPORTL_4, "CSmsPDURead::DoEncodeDeliverReport [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",iStatus.Int(), iState, iRpErrorCodesSupported);
SmspPanic( KSmspPanicUnexpectedStateEncountered );
break;
}
@@ -568,7 +575,7 @@
void CSmsPDURead::SendDeliverReport()
{
// Method behaviour based on DEF047323
- LOGSMSPROT2("CSmsPDUReadProcess::SendDeliverReport(): iStatus=%d ",iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_SENDDELIVERREPORT_1, "CSmsPDUReadProcess::SendDeliverReport(): iStatus=%d ",iStatus.Int());
MakeStateTransitionBasedOnErrorCode();
@@ -580,7 +587,7 @@
TRAPD(err, DoEncodeDeliverReportL());
if(err != KErrNone)
{
- LOGSMSPROT2("CSmsPDURead::DoEncodeDeliverReport [err=%d]", err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_SENDDELIVERREPORT_2, "CSmsPDURead::DoEncodeDeliverReport [err=%d]", err);
}
}
else
@@ -611,8 +618,7 @@
default:
{
- LOGSMSPROT4("CSmsPDURead::DoEncodeDeliverReport [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",
- iStatus.Int(), iState, iRpErrorCodesSupported);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_SENDDELIVERREPORT_3, "CSmsPDURead::DoEncodeDeliverReport [iStatus=%d, iState=%d, iRpErrorCodesSupported= %d]",iStatus.Int(), iState, iRpErrorCodesSupported);
SmspPanic( KSmspPanicUnexpectedStateEncountered );
}
break;
@@ -628,7 +634,7 @@
*/
void CSmsPDURead::Complete(TInt aError)
{
- LOGSMSPROT3("CSmsPDURead::Complete [aError=%d, iState=%d]", aError, iState );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_COMPLETE_1, "CSmsPDURead::Complete [aError=%d, iState=%d]", aError, iState );
switch (iState)
{
@@ -728,7 +734,7 @@
*/
void CSmsPDURead::SetErrorCodeStatus(enum TRpErrorCodeIndex aIndex, TBool aValue)
{
- LOGSMSPROT1("CSmsPDURead::SetErrorCodeStatus()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_SETERRORCODESTATUS_1, "CSmsPDURead::SetErrorCodeStatus()");
if (aValue)
{
@@ -752,7 +758,7 @@
*/
TBool CSmsPDURead::GetErrorCodeStatus(enum TRpErrorCodeIndex aIndex)
{
- LOGSMSPROT1("CSmsPDURead::GetErrorCodeStatus()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_GETERRORCODESTATUS_1, "CSmsPDURead::GetErrorCodeStatus()");
TBool rc;
iRpErrorCodesSupported & (((TUint8) 0x01) << aIndex) ? rc = ETrue : rc = EFalse;
@@ -770,7 +776,7 @@
*/
TBool CSmsPDURead::MapRpErrorToIndex(TInt aRpErrorCode, TRpErrorCodeIndex& aIndex)
{
- LOGSMSPROT1("CSmsPDURead::MapRpErrorToIndex()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_MAPRPERRORTOINDEX_1, "CSmsPDURead::MapRpErrorToIndex()");
switch( aRpErrorCode )
{
@@ -903,7 +909,7 @@
TRAPD(ret, ini=CESockIniData::NewL(_L("smswap.sms.esk")));
if(ret!=KErrNone)
{
- LOGSMSPROT2("esk read failed, error code = [%d]", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_READCONFIGURABLESMSSETTINGSL_1, "esk read failed, error code = [%d]", ret);
User::Leave(ret);
}
@@ -980,7 +986,7 @@
*/
TBool CSmsPDURead::IsSupported() const
{
- LOGSMSPROT1("CSmsPDURead::IsSupported()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_ISSUPPORTED_1, "CSmsPDURead::IsSupported()");
if (( iMobileSmsCaps.iSmsControl & RMobileSmsMessaging::KCapsReceiveUnstoredClientAck ) ||
( iMobileSmsCaps.iSmsControl & RMobileSmsMessaging::KCapsReceiveUnstoredPhoneAck ) ||
@@ -1007,7 +1013,7 @@
*/
void CSmsPDURead::MakeStateTransitionBasedOnErrorCode()
{
- LOGSMSPROT1("CSmsPDURead::MakeStateTransitionBasedOnErrorCode()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_MAKESTATETRANSITIONBASEDONERRORCODE_1, "CSmsPDURead::MakeStateTransitionBasedOnErrorCode()");
if (iState != ESmsPDUReadWaitingForPDU)
SmspPanic( KSmspPanicUnexpectedStateEncountered );
@@ -1040,7 +1046,7 @@
(iPduProcessor->IsClass2Message() && iPduProcessor->IsDiscardType0Class2() ) ||
(iPduProcessor->IsClass0Message() == EFalse && iPduProcessor->IsClass2Message() == EFalse)) )
{
- LOGSMSPROT1("CSmsPDURead::MakeStateTransitionBasedOnErrorCode Absorb Valid PDU");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREAD_MAKESTATETRANSITIONBASEDONERRORCODE_2, "CSmsPDURead::MakeStateTransitionBasedOnErrorCode Absorb Valid PDU");
iState = ESmsPDUReadAbsorbValidPduSendPositiveAck;
}
else
@@ -1061,7 +1067,7 @@
*/
CSmsPDUReadLogger* CSmsPDUReadLogger::NewL(RFs& aFs, TInt aPriority)
{
- LOGSMSPROT1("CSmsPDUReadLogger::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_NEWL_1, "CSmsPDUReadLogger::NewL()");
CSmsPDUReadLogger* self = new (ELeave) CSmsPDUReadLogger(aPriority);
CleanupStack::PushL(self);
@@ -1091,7 +1097,7 @@
*/
void CSmsPDUReadLogger::ConstructL(RFs& aFs)
{
- LOGSMSPROT1("CSmsPDUReadLogger::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_CONSTRUCTL_1, "CSmsPDUReadLogger::ConstructL()");
iLogger = CSmsEventLogger::NewL(aFs, Priority());
} // CSmsPDUReadLogger::ConstructL
@@ -1117,7 +1123,7 @@
*/
void CSmsPDUReadLogger::ChangeOrAddLogEvent(CSmsMessage& aSmsMessage, const TLogSmsPduData& aSmsPDUData, const TTime* aTime, TRequestStatus& aStatus)
{
- LOGSMSPROT1("CSmsPDUReadLogger::ChangeOrAddLogEvent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_CHANGEORADDLOGEVENT_1, "CSmsPDUReadLogger::ChangeOrAddLogEvent()");
__ASSERT_DEBUG(iState == ESmsPDUReadLoggerIdle, SmspPanic(KSmspPanicUnexpectedState));
@@ -1153,7 +1159,7 @@
*/
void CSmsPDUReadLogger::AddLogEvent()
{
- LOGSMSPROT1("CSmsPDUReadLogger::AddLogEvent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_ADDLOGEVENT_1, "CSmsPDUReadLogger::AddLogEvent()");
iState = ESmsPDUReadLoggerAdd;
@@ -1167,7 +1173,7 @@
*/
void CSmsPDUReadLogger::GetLogEvent()
{
- LOGSMSPROT1("CSmsPDUReadLogger::GetLogEvent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_GETLOGEVENT_1, "CSmsPDUReadLogger::GetLogEvent()");
__ASSERT_DEBUG(iSmsMessage->LogServerId() != KLogNullId, SmspPanic(KSmspPanicLogIdNull));
@@ -1183,7 +1189,7 @@
*/
void CSmsPDUReadLogger::ChangeLogEvent()
{
- LOGSMSPROT1("CSmsPDUReadLogger::ChangeLogEvent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_CHANGELOGEVENT_1, "CSmsPDUReadLogger::ChangeLogEvent()");
iState = ESmsPDUReadLoggerChange;
iLogger->ChangeEvent(iStatus, *iSmsMessage, iTimePtr, *iSmsPDUData);
@@ -1193,7 +1199,7 @@
void CSmsPDUReadLogger::DoRunL()
{
- LOGSMSPROT1("CSmsPDUReadLogger::DoRunL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_DORUNL_1, "CSmsPDUReadLogger::DoRunL()");
switch (iState)
{
@@ -1243,7 +1249,7 @@
// conditions are very difficult to create in a deterministic way.
BULLSEYE_OFF
- LOGSMSPROT1("CSmsPDUReadLogger::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_DOCANCEL_1, "CSmsPDUReadLogger::DoCancel()");
iLogger->Cancel();
@@ -1264,7 +1270,7 @@
void CSmsPDUReadLogger::Complete(TInt aStatus)
{
- LOGSMSPROT1("CSmsPDUReadLogger::Complete()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUREADLOGGER_COMPLETE_1, "CSmsPDUReadLogger::Complete()");
// Call the base function to perform the actual complete...
CSmsuActiveBase::Complete(aStatus);
--- a/smsprotocols/smsstack/smsprot/Src/smspreassemblystore.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspreassemblystore.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +13,12 @@
// Description:
//
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspreassemblystoreTraces.h"
+#endif
+
#include "smsstacklog.h"
#include "gsmubuf.h"
#include "smspreassemblystore.h"
@@ -25,7 +31,7 @@
*/
void CReassemblyStoreUtility::PopulateEntry(TSmsReassemblyEntry& aEntry,const CSmsMessage& aSmsMessage,TInt aNumSmss)
{
- LOGSMSPROT1("CReassemblyStoreUtility::PopulateEntry");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTOREUTILITY_POPULATEENTRY_1, "CReassemblyStoreUtility::PopulateEntry");
aEntry.SetReference(0);
aEntry.SetTotal(1);
aEntry.SetCount(1);
@@ -87,7 +93,7 @@
*/
void CReassemblyStoreUtility::PrivatePath(RFs& aFs, TDes& aPath)
{
- LOGSMSPROT1("CReassemblyStoreUtility::PrivatePath()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTOREUTILITY_PRIVATEPATH_1, "CReassemblyStoreUtility::PrivatePath()");
TDriveUnit driveUnit(KStoreDrive);
TDriveName drive=driveUnit.Name();
@@ -124,7 +130,7 @@
*/
void CReassemblyStore::InitializeL()
{
- LOGSMSPROT1("CClass0SmsReassemblyStore::InitializeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_INITIALIZEL_1, "CClass0SmsReassemblyStore::InitializeL()");
// Initialize Re-assembly store.
OpenStoreL();
BeginTransactionLC();
@@ -165,8 +171,7 @@
void CReassemblyStore::PurgeL(const TTimeIntervalMinutes& aTimeIntervalMinutes,TBool aPurgeIncompleteOnly)
{
//Call purging function
- LOGSMSPROT3("CReassemblyStore::PurgeL(): aTimeIntervalMinutes=%d, aPurgeIncompleteOnly=%d",
- aTimeIntervalMinutes.Int(), aPurgeIncompleteOnly);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_PURGEL_1, "CReassemblyStore::PurgeL(): aTimeIntervalMinutes=%d, aPurgeIncompleteOnly=%d",aTimeIntervalMinutes.Int(), aPurgeIncompleteOnly);
// TODO - flag
// we could also save the call of the method from the consruction of the smsprot
@@ -174,7 +179,7 @@
return;
TInt count=iEntryArray.Count();
- LOGSMSPROT2("CClass0SmsReassemblyStore::PurgeL(): count=%d", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_PURGEL_2, "CClass0SmsReassemblyStore::PurgeL(): count=%d", count);
TTime time;
time.UniversalTime();
@@ -209,7 +214,7 @@
{
const TInt count = iEntryArray.Count();
- LOGSMSPROT2("CReassemblyStore::DeleteEnumeratedSIMEntries(): %d messages in RAS", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1, "CReassemblyStore::DeleteEnumeratedSIMEntries(): %d messages in RAS", count);
TInt index;
@@ -234,8 +239,7 @@
*/
TInt CReassemblyStore::NumberOfCompleteMessages()
{
- LOGSMSPROT2("CReassemblyStore::NumberOfCompleteMessages(): iEntryArray.Count()=%d",
- iEntryArray.Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_NUMBEROFCOMPLETEMESSAGES_1, "CReassemblyStore::NumberOfCompleteMessages(): iEntryArray.Count()=%d",iEntryArray.Count());
//local variable for complete entries
TInt count( 0 );
@@ -290,8 +294,7 @@
*/
void CReassemblyStore::AddSegmentToReassemblyStoreL(CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms, TInt& aIndex, TBool& aIsComplete, TBool aIsEnumeration, TInt& aCount, TInt& aTotal)
{
- LOGSMSPROT2("CReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",
- aSmsMessage.IsComplete());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1, "CReassemblyStore::AddSegmentToReassemblyStoreL(): isComplete Message=%d",aSmsMessage.IsComplete());
/*
(1) If it is a single segment message create a new message
@@ -324,8 +327,7 @@
TInt segStoreIndex(KErrNotFound);
MatchPDUToExistingMessage(aSmsMessage, segStoreIndex);
- LOGSMSPROT2("CSmsReassemblyStore::AddSegmentToReassemblyStoreL(): "
- "segStoreIndex=%d", segStoreIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_2, "CSmsReassemblyStore::AddSegmentToReassemblyStoreL(): ""segStoreIndex=%d", segStoreIndex);
//
// If not yet complete, then we must be part of a multiple PDU message.
@@ -344,9 +346,7 @@
UpdateExistingMessageL(aSmsMessage, aGsmSms, aIndex,
aIsComplete, isDuplicateMsgRef,
isDuplicateSlot);
- LOGSMSPROT5("CSmsReassemblyStore::AddSegmentToReassemblyStoreL(): "
- "aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",
- aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
+ OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_3, "CSmsReassemblyStore::AddSegmentToReassemblyStoreL(): ""aIndex=%d, isComplete=%d, isDuplicateMsgRef=%d, isDuplicateSlot=%d",aIndex, aIsComplete, isDuplicateMsgRef, isDuplicateSlot);
if (isDuplicateMsgRef)
{
@@ -413,7 +413,7 @@
*/
void CReassemblyStore::DeleteMessageL(const CSmsMessage& aSmsMessage, TBool aPassed)
{
- LOGSMSPROT1("CReassemblyStore::DeleteMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_DELETEMESSAGEL_1, "CReassemblyStore::DeleteMessageL()");
TInt index(0);
BeginTransactionLC();
if (FindMessageL(aSmsMessage, aPassed, index))
@@ -435,7 +435,7 @@
*/
void CReassemblyStore::UpdateLogServerIdOfMessageL(const CSmsMessage& aSmsMessage, TInt aIndex)
{
- LOGSMSPROT1("CReassemblyStore::UpdateLogServerIdOfMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_UPDATELOGSERVERIDOFMESSAGEL_1, "CReassemblyStore::UpdateLogServerIdOfMessageL()");
TInt foundIndex(KErrNotFound);
TBool found(EFalse);
@@ -460,7 +460,7 @@
*/
void CReassemblyStore::SetMessagePassedToClientL(const CSmsMessage& aSmsMessage, TBool aPassed)
{
- LOGSMSPROT1("CReassemblyStore::SetMessagePassedToClientL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1, "CReassemblyStore::SetMessagePassedToClientL()");
TInt index(0);
BeginTransactionLC();
@@ -490,7 +490,7 @@
*/
void CReassemblyStore::NewMessagePDUL(TInt& aIndex,CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
{
- LOGSMSPROT1("CReassemblyStore::NewMessagePDUL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_NEWMESSAGEPDUL_1, "CReassemblyStore::NewMessagePDUL");
if (aSmsMessage.Time() >= iLastRealTime)
{
@@ -545,7 +545,7 @@
TInt aIndex, TBool& aIsComplete,
TBool& aDuplicateMsgRef, TBool& aDuplicateSlot)
{
- LOGSMSPROT1("CReassemblyStore::UpdateExistingMessageL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1, "CReassemblyStore::UpdateExistingMessageL");
aIsComplete = EFalse;
BeginTransactionLC();
UpdateExistingMessageL(aSmsMessage, aGsmSms, aDuplicateMsgRef, aDuplicateSlot);
@@ -574,7 +574,7 @@
void CReassemblyStore::MatchPDUToExistingMessage(const CSmsMessage& aSmsMessage,
TInt& aIndex)
{
- LOGSMSPROT1("CReassemblyStore::MatchPDUToExistingMessage()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1, "CReassemblyStore::MatchPDUToExistingMessage()");
aIndex = KErrNotFound;
@@ -611,7 +611,7 @@
}
}
- LOGSMSPROT3("CReassemblyStore::MatchPDUToExistingMessage(): reassemblyCount=%d, aIndex=%d", reassemblyCount, aIndex);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2, "CReassemblyStore::MatchPDUToExistingMessage(): reassemblyCount=%d, aIndex=%d", reassemblyCount, aIndex);
} // CReassemblyStore::MatchPDUToExistingMessage
/**
@@ -627,7 +627,7 @@
*/
void CReassemblyStore::GetMessageL(TInt aIndex, CSmsMessage& aSmsMessage)
{
- LOGSMSPROT1("CReassemblyStore::GetMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_GETMESSAGEL_1, "CReassemblyStore::GetMessageL()");
const TReassemblyEntry& entry = iEntryArray[aIndex];
RetrieveMessageL(entry, aSmsMessage);
}
@@ -647,7 +647,7 @@
TBool aPassed,
TInt& aIndex)
{
- LOGSMSPROT1("CReassemblyStore::FindMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_FINDMESSAGEL_1, "CReassemblyStore::FindMessageL()");
//
// Parse the GSM data from the SMS message...
@@ -673,7 +673,7 @@
//
// Found!
//
- LOGSMSPROT2("CReassemblyStore::FindMessage(): Found! index=%d", index);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_FINDMESSAGEL_2, "CReassemblyStore::FindMessage(): Found! index=%d", index);
aIndex = index;
@@ -684,7 +684,7 @@
//
// Not found...
//
- LOGSMSPROT1("CReassemblyStore::FindMessage(): Not found!");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREASSEMBLYSTORE_FINDMESSAGEL_3, "CReassemblyStore::FindMessage(): Not found!");
return EFalse;
} // CReassemblyStore::FindMessageL
--- a/smsprotocols/smsstack/smsprot/Src/smsprecvmode.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smsprecvmode.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsprecvmodeTraces.h"
+#endif
+
#include <commsdattypesv1_1.h>
#include <cdbcols.h>
@@ -61,7 +67,7 @@
*/
CSmspReceiveMode* CSmspReceiveMode::NewL(const TSmsSettings& aSmsSettings, RMobileSmsMessaging& aSmsMessaging, const RMobileSmsMessaging::TMobileSmsCapsV1& aSmsCaps, TInt aPriority)
{
- LOGSMSPROT1("CSmspReceiveMode::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_NEWL_1, "CSmspReceiveMode::NewL()");
CSmspReceiveMode* self = new (ELeave) CSmspReceiveMode(aSmsSettings, aSmsMessaging, aSmsCaps, aPriority);
CleanupStack::PushL(self);
@@ -73,7 +79,7 @@
void CSmspReceiveMode::ConstructL()
{
- LOGSMSPROT1("CSmspReceiveMode::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_CONSTRUCTL_1, "CSmspReceiveMode::ConstructL()");
CSmspCommDbEvent::ConstructL();
User::LeaveIfError(iCommDbRetryTimer.CreateLocal());
@@ -86,7 +92,7 @@
*/
void CSmspReceiveMode::Start(TRequestStatus& aStatus)
{
- LOGSMSPROT1("CSmspReceiveMode::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_START_1, "CSmspReceiveMode::Start()");
Cancel();
Queue(aStatus);
@@ -121,7 +127,7 @@
*/
void CSmspReceiveMode::NotifyOnEvent()
{
- LOGSMSPROT1("CSmspReceiveMode::NotifyOnEvent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_NOTIFYONEVENT_1, "CSmspReceiveMode::NotifyOnEvent()");
iState = ESmspReceiveModeNotifyOnEvent;
CSmspCommDbEvent::NotifyOnEvent();
@@ -135,7 +141,7 @@
*/
void CSmspReceiveMode::SetReceiveMode(RMobileSmsMessaging::TMobileSmsReceiveMode aReceiveMode)
{
- LOGSMSPROT1("CSmspReceiveMode::SetReceiveMode()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_SETRECEIVEMODE_1, "CSmspReceiveMode::SetReceiveMode()");
aReceiveMode = SelectReceiveMode(aReceiveMode);
iSmsReceiveModeLastSet = aReceiveMode;
@@ -148,7 +154,7 @@
void CSmspReceiveMode::DoCancel()
{
- LOGSMSPROT1("CSmspReceiveMode::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_DOCANCEL_1, "CSmspReceiveMode::DoCancel()");
TimedSetActiveCancel();
switch (iState)
@@ -207,7 +213,7 @@
*/
void CSmspReceiveMode::GetCommDbReceiveModeL(RMobileSmsMessaging::TMobileSmsReceiveMode& aReceiveMode)
{
- LOGSMSPROT1("CSmspReceiveMode::GetCommDbReceiveModeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_GETCOMMDBRECEIVEMODEL_1, "CSmspReceiveMode::GetCommDbReceiveModeL()");
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
CMDBSession* sess = CMDBSession::NewL(KCDVersion1_2);
@@ -230,7 +236,7 @@
void CSmspReceiveMode::DoRunL()
{
- LOGSMSPROT1("CSmspReceiveMode::DoRunL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_DORUNL_1, "CSmspReceiveMode::DoRunL()");
switch (iState)
{
@@ -263,7 +269,7 @@
else
{
// Failed to read CommDB even after retries. Set the receive mode to the last known setting
- LOGSMSPROT2("CSmspReceiveMode::DoRunL in ESmspReceiveModeRetryCommDb state, failed to read CommDb, using mode #%d", iSmsReceiveModeLastSet );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_DORUNL_2, "CSmspReceiveMode::DoRunL in ESmspReceiveModeRetryCommDb state, failed to read CommDb, using mode #%d", iSmsReceiveModeLastSet );
SetReceiveMode(iSmsReceiveModeLastSet);
}
}
@@ -308,7 +314,7 @@
*/
RMobileSmsMessaging::TMobileSmsReceiveMode CSmspReceiveMode::SelectReceiveMode() const
{
- LOGSMSPROT1("CSmspReceiveMode::SelectReceiveMode()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_SELECTRECEIVEMODE_1, "CSmspReceiveMode::SelectReceiveMode()");
const TUint32 smsControl = iSmsCaps.iSmsControl;
RMobileSmsMessaging::TMobileSmsReceiveMode recvMode = RMobileSmsMessaging::EReceiveModeUnspecified;
@@ -342,7 +348,7 @@
*/
RMobileSmsMessaging::TMobileSmsReceiveMode CSmspReceiveMode::SelectReceiveMode(RMobileSmsMessaging::TMobileSmsReceiveMode aPreferredMode) const
{
- LOGSMSPROT1("CSmspReceiveMode::SelectReceiveMode()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPRECEIVEMODE_SELECTRECEIVEMODE1_1, "CSmspReceiveMode::SelectReceiveMode()");
const TUint32 smsControl = iSmsCaps.iSmsControl;
TBool usePreferred = EFalse;
--- a/smsprotocols/smsstack/smsprot/Src/smsprot.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smsprot.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsprotTraces.h"
+#endif
+
#include <commsdattypesv1_1.h>
#include <logwrap.h>
#include "Gsmumsg.h"
@@ -62,11 +68,7 @@
*/
CSmsProtocolFamily * CSmsProtocolFamily::NewL()
{
- LOGSMSPROT4("CSmsProtocolFamily::NewL [version %d.%d.%d]",
- KSmsPrtMajorVersionNumber,
- KSmsPrtMinorVersionNumber,
- KSmsPrtBuildVersionNumber
- );
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_NEWL_1, "CSmsProtocolFamily::NewL [version %u.%u.%u]",KSmsPrtMajorVersionNumber,KSmsPrtMinorVersionNumber,KSmsPrtBuildVersionNumber );
return new (ELeave)CSmsProtocolFamily;
} // CSmsProtocolFamily::NewL
@@ -79,7 +81,7 @@
*/
TInt CSmsProtocolFamily::Install()
{
- LOGSMSPROT1("CSmsProtocolFamily::Install");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_INSTALL_1, "CSmsProtocolFamily::Install");
return KErrNone;
} // CProtocolFamilyBase::Install
@@ -93,7 +95,7 @@
*/
TInt CSmsProtocolFamily::Remove()
{
- LOGSMSPROT1("CSmsProtocolFamily::Remove");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_REMOVE_1, "CSmsProtocolFamily::Remove");
return KErrNone;
} // CProtocolFamilyBase::Remove
@@ -109,7 +111,7 @@
*/
CProtocolBase * CSmsProtocolFamily::NewProtocolL(TUint /*aSockType*/,TUint /*aProtocol*/)
{
- LOGSMSPROT1("CSmsProtocolFamily::NewProtocolL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_NEWPROTOCOLL_1 , "CSmsProtocolFamily::NewProtocolL");
return CSmsProtocol::NewL();
} // CProtocolFamilyBase::NewProtocolL
@@ -127,12 +129,12 @@
*/
TUint CSmsProtocolFamily::ProtocolList(TServerProtocolDesc *& aProtocolList)
{
- LOGSMSPROT1("CSmsProtocolFamily::ProtocolList");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_PROTOCOLLIST_1, "CSmsProtocolFamily::ProtocolList");
TRAPD(ret, (aProtocolList=new(ELeave) TServerProtocolDesc[1]));
if(ret!=KErrNone)
{
- LOGSMSPROT2("WARNING! new TServerProtocolDesc left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLFAMILY_PROTOCOLLIST_2, "WARNING! new TServerProtocolDesc left with %d", ret);
return 0;
}
@@ -169,7 +171,7 @@
*/
EXPORT_C CProtocolFamilyBase* InstallSMS()
{
- LOGSMSPROT1("CSmsProtocolFamily::CSmsProtocolFamily()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, INSTALLSMS_1, "CSmsProtocolFamily::CSmsProtocolFamily()");
CSmsProtocolFamily* smsProtocolFamily(NULL);
@@ -190,7 +192,7 @@
*/
CSmsProtocol* CSmsProtocol::NewL()
{
- LOGSMSPROT1("CSmsProtocol::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWL_1, "CSmsProtocol::NewL()");
return new (ELeave) CSmsProtocol();
} // CSmsProtocol::NewL
@@ -252,7 +254,7 @@
*/
CServProviderBase *CSmsProtocol::NewSAPL(TUint aSocketType)
{
- LOGSMSPROT2("*CSmsProtocol::NewSAPL [sockettype=%d]", aSocketType);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWSAPL_1, "*CSmsProtocol::NewSAPL [sockettype=%d]", aSocketType);
if (aSocketType!=KSockDatagram)
User::Leave(KErrNotSupported);
return CSmsProvider::NewL(*this);
@@ -274,14 +276,14 @@
*/
void CSmsProtocol::InitL(TDesC& /*aTag*/)
{
- LOGSMSPROT1("CSmsProtocol::InitL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_INITL_1, "CSmsProtocol::InitL");
User::LeaveIfError(iFs.Connect());
iReassemblyStore=CFacadeSmsReassemblyStore::NewL(iFs, *this);
iReassemblyStore->InitL();
- LOGSMSPROT1("CSmsProtocol::InitL Constructing members");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_INITL_2, "CSmsProtocol::InitL Constructing members");
ReadConfigurableSettingsL();
@@ -315,7 +317,7 @@
User::LeaveIfError(ret);
#endif
*/
- LOGSMSPROT1("CSmsProtocol::InitL Querying CommDb");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_INITL_3, "CSmsProtocol::InitL Querying CommDb");
// Read the global modem ID setting from Cooms Database
TUint32 modemId = 0;
@@ -344,12 +346,7 @@
CleanupStack::PopAndDestroy(sess);
-#ifdef _SMS_LOGGING_ENABLED
- TBuf8<KCommsDbSvrMaxFieldLength> buf8;
- buf8.Copy(iGsmTsyName);
- LOGSMSPROT3("CSmsProtocol::InitL [modemId=%d tsy=%S]",
- modemId, &buf8);
-#endif
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_INITL_4, "CSmsProtocol::InitL [modemId=%d tsy=%S]",(TInt)modemId, iGsmTsyName );
// Start event notification state machines
iSmsModemNotification->Start();
@@ -396,7 +393,7 @@
*/
void CSmsProtocol::StartL(void)
{
- LOGSMSPROT1("CSmsProtocol::StartL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_STARTL_1, "CSmsProtocol::StartL");
} // CSmsProtocol::StartL
@@ -407,7 +404,7 @@
*/
void CSmsProtocol::Identify(TServerProtocolDesc *aDesc)const
{
- LOGSMSPROT1("CSmsProtocol::Identify");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_IDENTIFY_1, "CSmsProtocol::Identify");
aDesc->iName=KSmsDatagram;
aDesc->iAddrFamily=KSMSAddrFamily;
@@ -436,7 +433,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::NewHostResolverL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWHOSTRESOLVERL_1, "CSmsProtocol::NewHostResolverL");
SmspPanic(ESmspCantCreateHostResolver);
return NULL;
BULLSEYE_RESTORE
@@ -454,7 +451,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("*CSmsProtocol::NewServiceResolverL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWSERVICERESOLVERL_1, "*CSmsProtocol::NewServiceResolverL");
SmspPanic(ESmspCantCreateServiceResolver);
return NULL;
BULLSEYE_RESTORE
@@ -472,7 +469,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::NewNetDatabaseL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NEWNETDATABASEL_1, "CSmsProtocol::NewNetDatabaseL");
SmspPanic(ESmspCantCreateNetDatabase);
return NULL;
BULLSEYE_RESTORE
@@ -490,7 +487,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::BindL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_BINDL_1, "CSmsProtocol::BindL");
SmspPanic(ESmspCantBind);
BULLSEYE_RESTORE
}
@@ -508,7 +505,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::BindToL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_BINDTOL_1, "CSmsProtocol::BindToL");
SmspPanic(ESmspCantBindTo);
BULLSEYE_RESTORE
}
@@ -525,7 +522,7 @@
TRAPD(ret, ini=CESockIniData::NewL(_L("smswap.sms.esk")));
if(ret!=KErrNone)
{
- LOGSMSPROT2("esk read failed, error code = [%d]", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_READCONFIGURABLESETTINGSL_1, "esk read failed, error code = [%d]", ret);
User::Leave(ret);
}
@@ -536,7 +533,7 @@
{
if (var > 0)
{
- LOGSMSPROT2("sendTryTimeout [%d]", var);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_READCONFIGURABLESETTINGSL_2, "sendTryTimeout [%d]", var);
iSmsSettings.SetSendTryTimeout(var);
}
else
@@ -549,7 +546,7 @@
{
if (var > 0)
{
- LOGSMSPROT2("bootTimerTimeout [%d]", var);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_READCONFIGURABLESETTINGSL_3, "bootTimerTimeout [%d]", var);
iSmsSettings.SetBootTimerTimeout(var);
}
else
@@ -574,7 +571,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::Send");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_SEND_1, "CSmsProtocol::Send");
SmspPanic(ESmspCantSend);
return KErrNotSupported;
BULLSEYE_RESTORE
@@ -592,7 +589,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::Process");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PROCESS_1, "CSmsProtocol::Process");
SmspPanic(ESmspCantProcess);
BULLSEYE_RESTORE
}
@@ -609,7 +606,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::GetOption");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_GETOPTION_1, "CSmsProtocol::GetOption");
// SmspPanic(ESmspCantGetOption);
return KErrNotSupported;
BULLSEYE_RESTORE
@@ -627,7 +624,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::SetOption");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_SETOPTION_1, "CSmsProtocol::SetOption");
//SmspPanic(ESmspCantSetOption);
return KErrNotSupported;
BULLSEYE_RESTORE
@@ -645,7 +642,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::Error");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ERROR_1, "CSmsProtocol::Error");
SmspPanic(ESmspCantError);
BULLSEYE_RESTORE
}
@@ -659,7 +656,7 @@
*/
void CSmsProtocol::AddSmsMessageObserverL(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT2("CSmsProtocol::AddSmsMessageObserverL [aObserver=0x%08x]", &aObserver);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ADDSMSMESSAGEOBSERVERL_1, "CSmsProtocol::AddSmsMessageObserverL [aObserver=0x%08x]", &aObserver);
iSmsMessageObserverList.AppendL(&aObserver);
SetClosingDown(EFalse);
}
@@ -676,7 +673,7 @@
*/
TInt CSmsProtocol::BindSmsMessageObserver(MSmsMessageObserver& aObserver,const TSmsAddr& aSmsAddr)
{
- LOGSMSPROT2("CSmsProtocol::BindSmsMessageObserver 0x%08x", &aObserver);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_BINDSMSMESSAGEOBSERVER_1, "CSmsProtocol::BindSmsMessageObserver 0x%08x", &aObserver);
__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
TInt ret=KErrNone;
@@ -696,7 +693,7 @@
TRAP(ret, ProcessCompleteSmsMessagesL());
if(ret != KErrNone)
{
- LOGSMSPROT2("WARNING! CSmsProtocol::ProcessCompleteSmsMessagesL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_BINDSMSMESSAGEOBSERVER_2, "WARNING! CSmsProtocol::ProcessCompleteSmsMessagesL left with %d", ret);
}
}
}
@@ -715,7 +712,7 @@
*/
void CSmsProtocol::RemoveSmsMessageObserver(const MSmsMessageObserver& aObserver)
{
- LOGSMSPROT2("CSmsProtocol::RemoveSmsMessageObserver 0x%08x", &aObserver);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_REMOVESMSMESSAGEOBSERVER_1, "CSmsProtocol::RemoveSmsMessageObserver 0x%08x", &aObserver);
__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
TInt index=ObserverIndex(aObserver);
iSmsMessageObserverList.Delete(index);
@@ -728,7 +725,7 @@
*/
void CSmsProtocol::SendSmsMessage(CSmsMessage* aSmsMessage,MSmsMessageObserver& aObserver,TUint aOptions)
{
- LOGSMSPROT2("CSmsProtocol::SendSmsMessage [aObserver=0x%X]", &aObserver);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_SENDSMSMESSAGE_1, "CSmsProtocol::SendSmsMessage [aObserver=0x%08X]", (TUint) &aObserver);
__ASSERT_DEBUG(ObserverIsPresent(aObserver), SmspPanic(ESmspMessageObserverNotFound));
// Ensure the modem is connected and initialized
@@ -764,7 +761,7 @@
}
if( err != KErrNone )
{
- LOGSMSPROT4("CSmsProtocol::CheckPoweredUp [err=%d, iModemDetection=%d, IsBackupOrRestoreInProgress=%d]", err, iModemDetection, iBackupRestoreSession->IsBackupOrRestoreInProgress());
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CHECKPOWEREDUP_1, "CSmsProtocol::CheckPoweredUp [err=%d, iModemDetection=%d, IsBackupOrRestoreInProgress=%d]", err, iModemDetection, iBackupRestoreSession->IsBackupOrRestoreInProgress());
}
return err;
}
@@ -782,7 +779,7 @@
*/
void CSmsProtocol::CancelSendSmsMessage(MSmsMessageObserver& aObserver,TBool)
{
- LOGSMSPROT2("CSmsProtocol::CancelSendSmsMessage 0x%08x", &aObserver);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELSENDSMSMESSAGE_1, "CSmsProtocol::CancelSendSmsMessage 0x%08x", &aObserver);
__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
@@ -795,7 +792,7 @@
*/
void CSmsProtocol::EnumeratePhone(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmsProtocol::EnumeratePhone");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ENUMERATEPHONE_1, "CSmsProtocol::EnumeratePhone");
__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
// Ensure the modem is connected and initialized
@@ -826,7 +823,7 @@
*/
void CSmsProtocol::CancelEnumeratePhone(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmsProtocol::CancelEnumeratePhone");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELENUMERATEPHONE_1, "CSmsProtocol::CancelEnumeratePhone");
__ASSERT_DEBUG(ObserverIsPresent(aObserver), SmspPanic(ESmspMessageObserverNotFound));
__ASSERT_DEBUG(iPhoneEnumerationObserver==NULL || &aObserver==iPhoneEnumerationObserver, SmspPanic(ESmspMessageWrongObserver));
@@ -855,7 +852,7 @@
*/
void CSmsProtocol::WriteSmsMessage(CSmsMessage* aSmsMessage,MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmsProtocol::WriteSmsMessage");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_WRITESMSMESSAGE_1, "CSmsProtocol::WriteSmsMessage");
__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
const TInt err = CheckPoweredUp();
@@ -874,7 +871,7 @@
void CSmsProtocol::CancelWriteSmsMessage(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmsProtocol::CancelWriteSmsMessage()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELWRITESMSMESSAGE_1, "CSmsProtocol::CancelWriteSmsMessage()");
if (iWriteQueue != NULL)
iWriteQueue->CancelObserver(aObserver);
@@ -893,7 +890,7 @@
*/
void CSmsProtocol::DeleteSmsMessage(CSmsMessage* aSmsMessage,MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmsProtocol::DeleteSmsMessage");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSMESSAGE_1, "CSmsProtocol::DeleteSmsMessage");
__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
// Ensure the modem is connected and initialized
@@ -921,7 +918,7 @@
*/
void CSmsProtocol::CancelDeleteSmsMessage(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmsProtocol::CancelDeleteSmsMessage");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELDELETESMSMESSAGE_1, "CSmsProtocol::CancelDeleteSmsMessage");
__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
@@ -942,7 +939,7 @@
*/
void CSmsProtocol::ReadSmsParameters(MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmsProtocol::ReadSmsParameters");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_READSMSPARAMETERS_1, "CSmsProtocol::ReadSmsParameters");
__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
TInt ret = CheckPoweredUp();
@@ -976,7 +973,7 @@
*/
void CSmsProtocol::CancelReadSmsParams()
{
- LOGSMSPROT1("CSmsProtocol::CancelReadSmsParams");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELREADSMSPARAMS_1, "CSmsProtocol::CancelReadSmsParams");
if(iSmsReadParams != NULL)
iSmsReadParams->Cancel();
@@ -996,7 +993,7 @@
*/
void CSmsProtocol::WriteSmsParameters(CMobilePhoneSmspList* aMobilePhoneSmspList,MSmsMessageObserver& aObserver)
{
- LOGSMSPROT1("CSmsProtocol::WriteSmsParameters");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_WRITESMSPARAMETERS_1, "CSmsProtocol::WriteSmsParameters");
__ASSERT_DEBUG(ObserverIsPresent(aObserver),SmspPanic(ESmspMessageObserverNotFound));
TInt ret = CheckPoweredUp();
@@ -1042,7 +1039,7 @@
*/
void CSmsProtocol::CancelWriteSmsParams()
{
- LOGSMSPROT1("CSmsProtocol::CancelWriteSmsParams");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CANCELWRITESMSPARAMS_1, "CSmsProtocol::CancelWriteSmsParams");
if(iSmsWriteParams != NULL)
iSmsWriteParams->Cancel();
@@ -1073,7 +1070,7 @@
TInt CSmsProtocol::ProcessMessageL(const CSmsMessage& aSmsMessage,const TSmsAddr* aOriginalSmsAddr,
const CSmsMessage* /*aOriginalSmsMessage*/,TDes& aDes)
{
- LOGSMSPROT1("CSmsProtocol::ProcessMessage");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PROCESSMESSAGEL_1, "CSmsProtocol::ProcessMessage");
MSmsMessageObserver* observer=NULL;
if (aOriginalSmsAddr!=NULL)
@@ -1092,7 +1089,7 @@
observer = MatchSmsMessageToObserver(aSmsMessage);
}
- LOGSMSPROT2("CSmsProtocol::ProcessMessage [observer=0x%08x]",observer);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PROCESSMESSAGEL_2, "CSmsProtocol::ProcessMessage [observer=0x%08x]",observer);
TInt ret=KErrNone;
if (observer!=NULL)
@@ -1142,13 +1139,13 @@
*/
void CSmsProtocol::DeletePDUs(const CArrayFix<TGsmSmsSlotEntry>& aSlotArray, MSmsMessageObserver* aObserver)
{
- LOGSMSPROT3("CSmsProtocol::DeletePDUs [count=%d aObserver=0x%08X", aSlotArray.Count(), aObserver);
- __ASSERT_DEBUG(aSlotArray.Count() != 0, SmspPanic(KSmspSlotArrayEmpty));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETEPDUS_1, "CSmsProtocol::DeletePDUs [count=%d aObserver=0x%08X", aSlotArray.Count(), (TUint)aObserver);
+ __ASSERT_DEBUG(aSlotArray.Count() != 0, SmspPanic(KSmspSlotArrayEmpty));
- for(TInt i=0; i< aSlotArray.Count() ;i++)
- {
- LOGSMSPROT3("CSmsProtocol::DeletePDUs index: %d store %S", aSlotArray[i].iIndex, &aSlotArray[i].iStore);
- }
+ for(TInt i=0; i< aSlotArray.Count() ;i++)
+ {
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETEPDUS_2, "CSmsProtocol::DeletePDUs index: %d store %S", aSlotArray[i].iIndex, aSlotArray[i].iStore);
+ }
if (iDeleteQueue != NULL && aSlotArray.Count() != 0)
{
@@ -1166,8 +1163,7 @@
void CSmsProtocol::ModemNotificationCompleted(TInt aStatus,
RPhone::TModemDetection aNewState)
{
- LOGSMSPROT3("CSmsProtocol::ModemNotificationCompleted(): aStatus=%d, aNewState=%d",
- aStatus, aNewState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_1, "CSmsProtocol::ModemNotificationCompleted(): aStatus=%d, aNewState=%d",aStatus, aNewState);
TBool stateChanged = EFalse;
@@ -1181,7 +1177,7 @@
case RPhone::EDetectedNotPresent:
case RPhone::EDetectedUnknown:
{
- LOGSMSPROT1("RPhone::EDetectedNotPresent: [OFF -> ON]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_2, "RPhone::EDetectedNotPresent: [OFF -> ON]");
if (aNewState==RPhone::EDetectedPresent)
{
// There is a new modem connection
@@ -1195,7 +1191,7 @@
//
case RPhone::EDetectedPresent:
{
- LOGSMSPROT1("RPhone::EDetectedPresent: [ON -> OFF]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_3, "RPhone::EDetectedPresent: [ON -> OFF]");
if (aNewState!=RPhone::EDetectedPresent)
{
// Ah, lost our modem - cancel outstanding operations
@@ -1230,7 +1226,7 @@
* Called when the Disk Space Monitor state has changed.
*/
{
- LOGSMSPROT2("CSmsProtocol::DiskSpaceMonitorStateChange(): aStatus=%d", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DISKSPACEMONITORSTATECHANGE_1, "CSmsProtocol::DiskSpaceMonitorStateChange(): aStatus=%d", aStatus);
RProperty::Set(KUidPSSMSStackCategory, KUidPSSMSStackDiskSpaceMonitorKey, aStatus);
} // CSmsProtocol::DiskSpaceMonitorStateChange
@@ -1243,22 +1239,22 @@
*/
void CSmsProtocol::MessageSendCompleted(TInt aStatus)
{
- LOGSMSPROT3("*** CSmsProtocol::MessageSendCompleted [aStatus=%d iNumSegmentationStoreAccesses=%d]", aStatus, iNumSegmentationStoreAccesses);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGESENDCOMPLETED_1, "*** CSmsProtocol::MessageSendCompleted [aStatus=%d iNumSegmentationStoreAccesses=%d]", aStatus, iNumSegmentationStoreAccesses);
(void) aStatus;
iNumSegmentationStoreAccesses++;
if (iNumSegmentationStoreAccesses>=KNumSARStoreAccessesBeforePurging)
{
- LOGSMSPROT1("iSegmentationStore->PurgeL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGESENDCOMPLETED_2, "iSegmentationStore->PurgeL Start");
TRAPD(ret, iSegmentationStore->PurgeL(iSmsSettings.KSegmentationLifetimeMultiplier(),EFalse));
if(ret!=KErrNone)
{
// we need to close the file because the function
// left with the file opened
// iSegmentationStore->CloseFile();
- LOGSMSPROT2("WARNING! iSegmentationStore->PurgeL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGESENDCOMPLETED_3, "WARNING! iSegmentationStore->PurgeL left with %d", ret);
}
iNumSegmentationStoreAccesses=0;
- LOGSMSPROT2("iSegmentationStore->PurgeL End [ret=%d]", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGESENDCOMPLETED_4, "iSegmentationStore->PurgeL End [ret=%d]", ret);
}
} // CSmsProtocol::KNumSARStoreAccessesBeforePurging
@@ -1270,7 +1266,7 @@
*/
void CSmsProtocol::PhoneEnumerationCompleted(TInt aStatus)
{
- LOGSMSPROT1("CSmsProtocol::PhoneEnumerationCompleted");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PHONEENUMERATIONCOMPLETED_1, "CSmsProtocol::PhoneEnumerationCompleted");
iPhoneEnumerationObserver->EnumeratePhoneCompleted(aStatus);
} // CSmsProtocol::PhoneEnumerationCompleted
@@ -1283,7 +1279,7 @@
*/
void CSmsProtocol::CloseNow()
{
- LOGSMSPROT1("CSmsProtocol::CloseNow");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CLOSENOW_1, "CSmsProtocol::CloseNow");
if (iDeleteQueue != NULL && iDeleteQueue->IsActive())
SetClosingDown(ETrue);
else
@@ -1313,7 +1309,7 @@
*/
TInt CSmsProtocol::ObserverIndex(const MSmsMessageObserver& aObserver) const
{
- LOGSMSPROT1("CSmsProtocol::ObserverIndex()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_OBSERVERINDEX_1, "CSmsProtocol::ObserverIndex()");
TInt count=iSmsMessageObserverList.Count();
TInt index=0;
@@ -1330,7 +1326,7 @@
*/
TBool CSmsProtocol::SmsAddrIsAlreadyUsed(const MSmsMessageObserver* aObserver,const TSmsAddr& aSmsAddr)const
{
- LOGSMSPROT1("CSmsProtocol::SmsAddrIsAlreadyUsed()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_SMSADDRISALREADYUSED_1, "CSmsProtocol::SmsAddrIsAlreadyUsed()");
TBool isduplicate=EFalse;
TInt count=iSmsMessageObserverList.Count();
@@ -1415,7 +1411,7 @@
*/
TInt TKeySmsObserver::Compare(TInt aLeft, TInt aRight) const
{
- LOGSMSPROT3("TKeySmsObserver::Compare [left=%d, right=%d]", aLeft, aRight);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TKEYSMSOBSERVER_COMPARE_1, "TKeySmsObserver::Compare [left=%d, right=%d]", aLeft, aRight);
const TInt lhptr = -1; // Left higher priority than right
const TInt rhptl = 1; // Right higher priority than left
@@ -1458,7 +1454,7 @@
*/
void CSmsProtocol::OrderSmsMessageObserver(const MSmsMessageObserver& /*aObserver*/)
{
- LOGSMSPROT1("CSmsProtocol::OrderSmsMessageObserver()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ORDERSMSMESSAGEOBSERVER_1, "CSmsProtocol::OrderSmsMessageObserver()");
TKeySmsObserver smsObsKey;
#ifdef _DEBUG
@@ -1477,7 +1473,7 @@
*/
MSmsMessageObserver* CSmsProtocol::MatchSmsMessageToObserver(const CSmsMessage& aSmsMessage)
{
- LOGSMSPROT1("CSmsProtocol::MatchSmsMessageToObserver()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MATCHSMSMESSAGETOOBSERVER_1, "CSmsProtocol::MatchSmsMessageToObserver()");
TInt count=iSmsMessageObserverList.Count();
for (TInt i=0;i<count;i++)
@@ -1497,7 +1493,7 @@
*/
MSmsMessageObserver* CSmsProtocol::MatchSmsAddressToObserver(const TSmsAddr& aAddr)
{
- LOGSMSPROT1("CSmsProtocol::MatchSmsAddressToObserver()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MATCHSMSADDRESSTOOBSERVER_1, "CSmsProtocol::MatchSmsAddressToObserver()");
TInt count=iSmsMessageObserverList.Count();
for (TInt i=0;i<count;i++)
@@ -1517,7 +1513,7 @@
*/
TBool CSmsProtocol::IsMatch(const TSmsAddr& aSmsAddr, const CSmsMessage& aSmsMessage)
{
- LOGSMSPROT1("CSmsProtocol::IsMatch()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ISMATCH_1, "CSmsProtocol::IsMatch()");
TSmsAddrFamily family = aSmsAddr.SmsAddrFamily();
@@ -1573,7 +1569,7 @@
case (ESmsAddrStatusReport):
{
- LOGSMSPROT1("TSmsDataCodingScheme::ESmsDCSMessageWaitingIndicationDiscardMessage:");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ISMATCH_2, "TSmsDataCodingScheme::ESmsDCSMessageWaitingIndicationDiscardMessage:");
if (aSmsMessage.Type() == CSmsPDU::ESmsStatusReport)
return ETrue;
}
@@ -1616,7 +1612,7 @@
*/
TBool CSmsProtocol::MatchApplicationPort(const CSmsMessage& aSmsMessage,TUint aPort,TBool a16Bit)
{
- LOGSMSPROT1("CSmsProtocol::MatchApplicationPort");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MATCHAPPLICATIONPORT_1, "CSmsProtocol::MatchApplicationPort");
if (!aSmsMessage.SmsPDU().UserDataPresent())
return EFalse;
@@ -1640,7 +1636,7 @@
*/
TBool CSmsProtocol::MatchInformationElement(const CSmsMessage& aSmsMessage, CSmsInformationElement::TSmsInformationElementIdentifier aIeVal)
{
- LOGSMSPROT1("CSmsProtocol::MatchInformationElement");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MATCHINFORMATIONELEMENT_1, "CSmsProtocol::MatchInformationElement");
if (!aSmsMessage.SmsPDU().UserDataPresent())
return EFalse;
@@ -1666,7 +1662,7 @@
*/
void CSmsProtocol::ProcessCompleteSmsMessagesL()
{
- LOGSMSPROT1("CSmsProtocol::ProcessCompleteSmsMessagesL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_PROCESSCOMPLETESMSMESSAGESL_1, "CSmsProtocol::ProcessCompleteSmsMessagesL");
if(iPhoneEnumerationObserver) return;
@@ -1684,11 +1680,11 @@
*/
void CSmsProtocol::MessageReadedSuccessfully()
{
- LOGSMSPROT1("CSmsProtocol::MessageReadedSuccessfully");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_1, "CSmsProtocol::MessageReadedSuccessfully");
TRAPD(ret,ProcessCompleteSmsMessagesL());
if(ret!=KErrNone)
{
- LOGSMSPROT2("WARNING! CSmsProtocol::ProcessCompleteSmsMessagesL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_2, "WARNING! CSmsProtocol::ProcessCompleteSmsMessagesL left with %d", ret);
}
iNumReassemblyStoreAccesses++;
@@ -1698,7 +1694,7 @@
if(ret!=KErrNone)
{
- LOGSMSPROT2("WARNING! iReassemblyStore->PurgeL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_3, "WARNING! iReassemblyStore->PurgeL left with %d", ret);
}
iNumReassemblyStoreAccesses=0;
@@ -1713,10 +1709,10 @@
*/
void CSmsProtocol::DeleteSMSFromReaStoreL(const CSmsMessage& aSmsMessage)
{
- LOGSMSPROT1("CSmsProtocol::DeleteSMSFromReaStoreL entry");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSFROMREASTOREL_1, "CSmsProtocol::DeleteSMSFromReaStoreL entry");
if (aSmsMessage.Type() == CSmsPDU::ESmsStatusReport)
{
- LOGSMSPROT1("CSmsProtocol::DeleteSMSFromReaStoreL it's SR");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSFROMREASTOREL_2, "CSmsProtocol::DeleteSMSFromReaStoreL it's SR");
return;
}
@@ -1739,7 +1735,7 @@
Only in this condition set incomplete message as forwarded
which internally will remove the PDUs from pre-allocated file.
*/
- LOGSMSPROT1("CSmsProtocol::DeleteSMSFromReaStoreL Incomplete Message Not last segment");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSFROMREASTOREL_3, "CSmsProtocol::DeleteSMSFromReaStoreL Incomplete Message Not last segment");
iReassemblyStore->SetIncompleteMessageForwardedToClientL(aSmsMessage);
return;
}
@@ -1748,7 +1744,7 @@
}
iReassemblyStore->DeleteMessageL(aSmsMessage, ETrue);
- LOGSMSPROT1("CSmsProtocol::DeleteSMSFromReaStoreL exit");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DELETESMSFROMREASTOREL_4, "CSmsProtocol::DeleteSMSFromReaStoreL exit");
} // CSmsProtocol::DeleteSMSFromReaStoreL
@@ -1758,15 +1754,15 @@
*/
void CSmsProtocol::NotifyMessageObservers(TInt aStatus)
{
- LOGSMSPROT1("CSmsProtocol::NotifyMessageObservers");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_1, "CSmsProtocol::NotifyMessageObservers");
TInt count=iSmsMessageObserverList.Count();
- LOGSMSPROT3("CSmsProtocol::NotifyMessageObservers [count=%d, aStatus=%d]",count, aStatus);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_2, "CSmsProtocol::NotifyMessageObservers [count=%d, aStatus=%d]",count, aStatus);
for (TInt index=0; index<count; index++)
{
MSmsMessageObserver* observer=iSmsMessageObserverList[index];
TSmsAddrFamily fam = observer->GetLocalAddress().SmsAddrFamily();
- LOGSMSPROT2("CSmsProtocol::NotifyMessageObservers [family=%d]", fam);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_3, "CSmsProtocol::NotifyMessageObservers [family=%d]", fam);
switch (fam)
{
case ESmsAddrMessageIndication:
@@ -1794,7 +1790,7 @@
void CSmsProtocol::PowerUp()
{
- LOGSMSPROT2("CSmsProtocol::PowerUp [iState=%d]", iState);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERUP_1, "CSmsProtocol::PowerUp [iState=%d]", iState);
__ASSERT_DEBUG(iState == EPoweredDown, SmspPanic(KSmspPanicUnexpectedState));
if (iState == EPoweredDown)
@@ -1803,7 +1799,7 @@
if (err != KErrNone)
{
- LOGSMSPROT3("WARNING: CSmsProtocol::DoPowerUpL left [err=%d iState=%d]", err, iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERUP_2, "WARNING: CSmsProtocol::DoPowerUpL left [err=%d iState=%d]", err, iState);
__ASSERT_DEBUG(iState == EPoweredDown, SmspPanic(KSmspPanicUnexpectedState));
PowerDown();
}
@@ -1822,24 +1818,24 @@
*/
void CSmsProtocol::DoPowerUpL()
{
- LOGSMSPROT1("CSmsProtocol::DoPowerUpL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_1, "CSmsProtocol::DoPowerUpL");
__ASSERT_DEBUG(iModemDetection==RPhone::EDetectedPresent,SmspPanic(KSmspPhoneHasNotTurnedOn));
//Open the segmentation and reassembly stores
iReassemblyStore->OpenStoreL();
iSegmentationStore->OpenStoreL();
- LOGSMSPROT1("CSmsProtocol::DoPowerUpL->PurgeL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_2, "CSmsProtocol::DoPowerUpL->PurgeL Start");
iReassemblyStore->PurgeL(iSmsSettings.ReassemblyLifetime(), ETrue);
- LOGSMSPROT1("CSmsProtocol::DoPowerUpL->PurgeL End");
- LOGSMSPROT1("CSmsProtocol::DoPowerUpL->PurgeL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_3, "CSmsProtocol::DoPowerUpL->PurgeL End");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_4, "CSmsProtocol::DoPowerUpL->PurgeL Start");
iSegmentationStore->PurgeL(iSmsSettings.KSegmentationLifetimeMultiplier(),EFalse);
- LOGSMSPROT1("CSmsProtocol::DoPowerUpL->PurgeL End");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_5, "CSmsProtocol::DoPowerUpL->PurgeL End");
// Connect to ETEL and load the TSY
User::LeaveIfError(iTelServer.Connect());
User::LeaveIfError(iTelServer.LoadPhoneModule(iGsmTsyName));
- LOGSMSPROT1("CSmsProtocol::DoPowerUpL Connected to Etel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_6, "CSmsProtocol::DoPowerUpL Connected to Etel");
// Find the phone corresponding to this TSY and open a number of handles on it
TInt numPhones;
@@ -1864,7 +1860,7 @@
User::LeaveIfError(iTelServer.SetExtendedErrorGranularity(RTelServer::EErrorBasic));
User::LeaveIfError(iSmsMessaging.Open(iGsmPhone));
- LOGSMSPROT1("CSmsProtocol::DoPowerUpL Opened TSY handles");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_7, "CSmsProtocol::DoPowerUpL Opened TSY handles");
if (iSmsPhoneEnumeration == NULL)
iSmsPhoneEnumeration=CSmsPhoneEnumeration::NewL(*this, iSmsSettings, *iReassemblyStore, *iSegmentationStore, iEnumerationPhone, KSmsSessionPriority, *iSmsMonitorDiskSpace);
@@ -1878,10 +1874,10 @@
// Start state machines
iSmsPhoneInitialization->Start();
- LOGSMSPROT1("CSmsProtocol::DoPowerUpL Started state machines");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_8, "CSmsProtocol::DoPowerUpL Started state machines");
NotifyMessageObservers(KIoctlSelectModemPresent);
- LOGSMSPROT1("CSmsProtocol::DoPowerUpL Notified message observers");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_DOPOWERUPL_9, "CSmsProtocol::DoPowerUpL Notified message observers");
// Process any waiting messages
@@ -1902,7 +1898,7 @@
*/
void CSmsProtocol::PowerDown()
{
- LOGSMSPROT1("CSmsProtocol::PowerDown");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_1, "CSmsProtocol::PowerDown");
iSetBearer->Cancel();
iReceiveMode->Cancel();
@@ -1933,21 +1929,21 @@
delete iDeleteQueue; //must be deleted because uses iSmsMessaging which is soon closed
iDeleteQueue = NULL;
- LOGSMSPROT1("CSmsProtocol::PowerDown Cancelled state machines");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_2, "CSmsProtocol::PowerDown Cancelled state machines");
NotifyMessageObservers(KIoctlSelectModemNotPresent);
- LOGSMSPROT1("CSmsProtocol::PowerDown Notified message observers");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_3, "CSmsProtocol::PowerDown Notified message observers");
// Close TSY handles
iSmsMessaging.Close();
iGsmPhone.Close();
iEnumerationPhone.Close();
iWritePhone.Close();
- LOGSMSPROT1("CSmsProtocol::PowerDown Closed TSY handles");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_4, "CSmsProtocol::PowerDown Closed TSY handles");
// Disconnect from Etel
iTelServer.Close();
- LOGSMSPROT1("CSmsProtocol::PowerDown Disconnected from Etel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_POWERDOWN_5, "CSmsProtocol::PowerDown Disconnected from Etel");
iReassemblyStore->Close();
iSegmentationStore->Close();
@@ -1963,7 +1959,7 @@
// (rather than the client) and the PDUs are still being deleted
// when last client disconnects.
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProtocol::CloseNowWrap()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_CLOSENOWWRAP_1, "CSmsProtocol::CloseNowWrap()");
if( iDeleteQueue == NULL || !iDeleteQueue->IsActive() )
{
@@ -1974,13 +1970,13 @@
void CSmsProtocol::HandleBackupOrRestoreStartingL()
{
- LOGSMSPROT2("CSmsProtocol::HandleBackupOrRestoreStartingL [ModemState=%d]", iSmsModemNotification->ModemState());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_HANDLEBACKUPORRESTORESTARTINGL_1, "CSmsProtocol::HandleBackupOrRestoreStartingL [ModemState=%d]", iSmsModemNotification->ModemState());
PowerDown();
}
void CSmsProtocol::HandleBackupOrRestoreCompleteL()
{
- LOGSMSPROT2("CSmsProtocol::HandleBackupOrRestoreCompleteL [ModemState=%d]", iSmsModemNotification->ModemState());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_HANDLEBACKUPORRESTORECOMPLETEL_1, "CSmsProtocol::HandleBackupOrRestoreCompleteL [ModemState=%d]", iSmsModemNotification->ModemState());
if (iModemDetection == RPhone::EDetectedPresent)
{
@@ -1993,7 +1989,7 @@
*/
TBool CSmsProtocol::AllocateLocalAddress(TSmsAddr& aAddr)
{
- LOGSMSPROT1("CSmsProtocol::AllocateLocalAddressL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ALLOCATELOCALADDRESS_1, "CSmsProtocol::AllocateLocalAddressL");
TBool found=EFalse;
TUint count=0,attempts=0;
@@ -2041,7 +2037,7 @@
*/
TBool CSmsProtocol::IsAppPortSMS(const CSmsMessage& aSmsMessage)
{
- LOGSMSPROT1("CSmsProtocol::IsAppPortSMS()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_ISAPPPORTSMS_1, "CSmsProtocol::IsAppPortSMS()");
TSmsAddr addr;
addr.SetSmsAddrFamily(ESmsAddrMatchIEI);
@@ -2071,7 +2067,7 @@
const RMobilePhone::TMobilePhoneNetworkInfoV1& CSmsProtocol::NetworkInfo() const
{
- LOGSMSPROT1("CSmsProtocol::NetworkInfo()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NETWORKINFO_1, "CSmsProtocol::NetworkInfo()");
return iSmsPhoneInitialization->NetworkInfo();
} // CSmsProtocol::NetworkInfo
@@ -2079,7 +2075,7 @@
TBool CSmsProtocol::NetworkInfoAvailable() const
{
- LOGSMSPROT1("CSmsProtocol::NetworkInfoAvailable()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOL_NETWORKINFOAVAILABLE_1, "CSmsProtocol::NetworkInfoAvailable()");
return iSmsPhoneInitialization->NetworkInfoAvailable();
} // CSmsProtocol::NetworkInfoAvailable
@@ -2095,7 +2091,7 @@
*/
CSmsProtocolBootTimer* CSmsProtocolBootTimer::NewL(CSmsProtocol& aSmsProtocol)
{
- LOGSMSPROT1("CSmsProtocolBootTimer::NewL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLBOOTTIMER_NEWL_1, "CSmsProtocolBootTimer::NewL");
CSmsProtocolBootTimer* self = new(ELeave) CSmsProtocolBootTimer(aSmsProtocol);
CleanupStack::PushL(self);
@@ -2117,7 +2113,7 @@
*/
void CSmsProtocolBootTimer::Start(const TTimeIntervalMicroSeconds32& aTimeIntervalMicroSeconds32)
{
- LOGSMSPROT1("CSmsProtocolBootTimer::Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLBOOTTIMER_START_1, "CSmsProtocolBootTimer::Start");
After(aTimeIntervalMicroSeconds32);
}
@@ -2135,6 +2131,6 @@
*/
void CSmsProtocolBootTimer::RunL()
{
- LOGSMSPROT2("CSmsProtocolBootTimer::RunL [iStatus=%d]", iStatus.Int() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROTOCOLBOOTTIMER_RUNL_1, "CSmsProtocolBootTimer::RunL [iStatus=%d]", iStatus.Int() );
iSmsProtocol.MessageReadedSuccessfully();
}
--- a/smsprotocols/smsstack/smsprot/Src/smsprov.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smsprov.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +20,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsprovTraces.h"
+#endif
+
#include "smsprot.h"
#include <es_ver.h>
@@ -33,6 +39,8 @@
#include "smspmain.h"
#include "smspfacadestor.h"
+#include "smsstacklog.h"
+
// CSmsProvider policies
//
static _LIT_SECURITY_POLICY_C1(smsProviderIoctlDeleteSmsMessagePolicy,ECapabilityWriteUserData);
@@ -61,14 +69,14 @@
*/
CSmsProvider* CSmsProvider::NewL(CSmsProtocol& aProtocol)
{
- LOGSMSPROT1("CSmsProvider::NewL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_NEWL_1, "CSmsProvider::NewL");
CSmsProvider* self =new(ELeave) CSmsProvider(aProtocol);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
- LOGSMSPROT1("-> CSmsProvider::NewL - done");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_NEWL_2, "-> CSmsProvider::NewL - done");
return self;
}
@@ -91,14 +99,14 @@
*/
void CSmsProvider::ConstructL()
{
- LOGSMSPROT1("CSmsProvider::ConstructL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CONSTRUCTL_1, "CSmsProvider::ConstructL");
iProtocol.AddSmsMessageObserverL(*this);
SetObserverAddedToProtocol(ETrue);
iRecvBufSegArray=new(ELeave) CArrayPtrFlat<CBufSeg>(8);
iSendBufSeg = CBufSeg::NewL(KSmsMaxSegmentLength);
- LOGSMSPROT1("-> CSmsProvider::ConstructL - done");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CONSTRUCTL_2, "-> CSmsProvider::ConstructL - done");
}
/**
@@ -128,7 +136,7 @@
*/
void CSmsProvider::Start()
{
- LOGSMSPROT1("CSmsProvider::Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_START_1, "CSmsProvider::Start");
}
/**
@@ -138,7 +146,7 @@
*/
void CSmsProvider::LocalName(TSockAddr& aAddr) const
{
- LOGSMSPROT1("CSmsProvider::LocalName");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_LOCALNAME_1, "CSmsProvider::LocalName");
aAddr = iLocalAddress;
}
@@ -154,7 +162,7 @@
*/
TInt CSmsProvider::SetLocalName(TSockAddr& aAddr)
{
- LOGSMSPROT1("CSmsProvider::SetLocalName");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SETLOCALNAME_1, "CSmsProvider::SetLocalName");
if( !iSecurityChecker || (iSecurityChecker->CheckPolicy(smsProviderSetLocalNamePolicy,"CSmsProvider SetLocal Name policy check") != KErrNone) )
{
@@ -182,7 +190,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProvider::RemName");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_REMNAME_1, "CSmsProvider::RemName");
BULLSEYE_RESTORE
}
@@ -197,7 +205,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProvider::SetRemName");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SETREMNAME_1, "CSmsProvider::SetRemName");
return KErrNotSupported;
BULLSEYE_RESTORE
}
@@ -212,7 +220,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProvider::GetOption");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_GETOPTION_1, "CSmsProvider::GetOption");
return 0;
BULLSEYE_RESTORE
}
@@ -236,8 +244,7 @@
*/
void CSmsProvider::Ioctl(TUint aLevel,TUint aName,TDes8* aOption)
{
- LOGSMSPROT3("CSmsProvider::Ioctl [aLevel=%d, aName=%d]", aLevel, aName);
- LOGSMSPROT2("CSmsProvider::Ioctl [provider=0x%08x]",this);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_1, "CSmsProvider::Ioctl [aLevel=%u, aName=%u provider=0x%08x]", aLevel, aName, (TUint)this);
// Panic in debug mode if this call is invalid in this SAPs current state
__ASSERT_DEBUG(iLocalAddress.SmsAddrFamily()!=ESmsAddrUnbound,SmspPanic(KSmspPanicWrongSmsAddressFamily));
@@ -375,7 +382,7 @@
TRAPD(ret,(smsmessage=InternalizeMessageL()));
if( ret!=KErrNone )
{
- LOGSMSPROT2("-> CSmsProvider::Ioctl - CSmsProvider::InternalizeMessageL [ret=%d]", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_3, "-> CSmsProvider::Ioctl - CSmsProvider::InternalizeMessageL [ret=%d]", ret);
iSendBufSeg->Reset();
iSocket->Error(ret, MSocketNotify::EErrorIoctl);
}
@@ -401,11 +408,11 @@
if( ret==KErrNone )
{
TRAP(ret,(iProtocol.DeleteSMSFromReaStoreL( *smsmessage )));
- LOGSMSPROT2("-> CSmsProvider::Ioctl - CSmsProvider::DeleteSMSFromReaStoreL [ret=%d]", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_4, "-> CSmsProvider::Ioctl - CSmsProvider::DeleteSMSFromReaStoreL [ret=%d]", ret);
}
else
{
- LOGSMSPROT2("-> CSmsProvider::Ioctl - CSmsProvider::InternalizeMessageL [ret=%d]", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_5, "-> CSmsProvider::Ioctl - CSmsProvider::InternalizeMessageL [ret=%d]", ret);
}
delete smsmessage;
// Looking for more sms left in the store
@@ -414,13 +421,13 @@
if( iEnumSocket )
{
--iNumOfEnumeratedMessages;
- LOGSMSPROT2("-> CSmsProvider::Ioctl - [iNumOfEnumeratedMessages=%d]", iNumOfEnumeratedMessages);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_6, "-> CSmsProvider::Ioctl - [iNumOfEnumeratedMessages=%d]", iNumOfEnumeratedMessages);
if( iNumOfEnumeratedMessages <= 0 )
{
iProtocol.iPhoneEnumerationObserver=NULL;
iEnumSocket=EFalse;
iProtocol.MessageReadedSuccessfully();
- LOGSMSPROT1("-> CSmsProvider::Ioctl - [iNumOfEnumeratedMessages=NULL]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_7, "-> CSmsProvider::Ioctl - [iNumOfEnumeratedMessages=NULL]");
}
}
// Remove the message from the receive buffer & complete
@@ -449,7 +456,7 @@
if( iNumOfEnumeratedMessages <= 0 )
{
iProtocol.iPhoneEnumerationObserver=NULL;
- LOGSMSPROT1("-> CSmsProvider::Ioctl - fail [iNumOfEnumeratedMessages=NULL]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_IOCTL_8, "-> CSmsProvider::Ioctl - fail [iNumOfEnumeratedMessages=NULL]");
iEnumSocket=EFalse;
iProtocol.MessageReadedSuccessfully();
}
@@ -557,7 +564,7 @@
*/
void CSmsProvider::CancelIoctl(TUint aLevel, TUint aName)
{
- LOGSMSPROT3("CSmsProvider::CancelIoctl [aLevel=%d, aName=%d]", aLevel, aName);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CANCELIOCTL_1, "CSmsProvider::CancelIoctl [aLevel=%u, aName=%u]", aLevel, aName);
// Panic in debug mode if this call is invalid in this SAPs current state
__ASSERT_DEBUG(iLocalAddress.SmsAddrFamily()!=ESmsAddrUnbound,SmspPanic(KSmspPanicWrongSmsAddressFamily));
@@ -583,7 +590,7 @@
iProtocol.CancelEnumeratePhone(*this);
iEnumSocket=EFalse;
iProtocol.iPhoneEnumerationObserver=NULL;
- LOGSMSPROT1("-> CSmsProvider::CancelIoctl - [iNumOfEnumeratedMessages=NULL]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CANCELIOCTL_2, "-> CSmsProvider::CancelIoctl - [iNumOfEnumeratedMessages=NULL]");
} break;
case KIoctlWriteSmsMessage:
{
@@ -630,7 +637,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProvider::SetOption()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SETOPTION_1, "CSmsProvider::SetOption()");
return 0;
BULLSEYE_RESTORE
}
@@ -654,7 +661,7 @@
*/
TInt CSmsProvider::Write(RMBufChain& aBufChain, TUint /*aOptions*/, TSockAddr* /*aAddr*/)
{
- LOGSMSPROT1("CSmsProvider::Write");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_WRITE_1, "CSmsProvider::Write");
if( !iSecurityChecker || (iSecurityChecker->CheckPolicy(smsProviderWritePolicy,"CSmsProvider Write policy check") != KErrNone) )
{
@@ -663,7 +670,7 @@
__ASSERT_DEBUG(iLocalAddress.SmsAddrFamily()!=ESmsAddrUnbound,SmspPanic(KSmspPanicWrongSmsAddressFamily));
/// @note: LOGIFH2A2 macro for logging esock write
- LOGSMSPROT2("-> CSmsProvider::Write [%d bytes]", aBufChain.Length());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_WRITE_2, "-> CSmsProvider::Write [%d bytes]", aBufChain.Length());
#ifdef SMSLOGGERIF
HBufC8* debugBuf = HBufC8::New(aBufChain.Length());
if(debugBuf)
@@ -723,7 +730,7 @@
{
__ASSERT_DEBUG((iLocalAddress.SmsAddrFamily()!=ESmsAddrUnbound) && (iLocalAddress.SmsAddrFamily()!=ESmsAddrSendOnly),SmspPanic(KSmspPanicWrongSmsAddressFamily));
- LOGSMSPROT2("CSmsProvider::GetData [provider=0x%08x]", this);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_GETDATA_1, "CSmsProvider::GetData [provider=0x%08x]", (TUint)this);
// Get the segmented buffer of first message
CBufSeg* recvbufseg=iRecvBufSegArray->At(0);
@@ -774,7 +781,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProvider::ActiveOpen [does nothing]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_ACTIVEOPEN_1, "CSmsProvider::ActiveOpen [does nothing]");
BULLSEYE_RESTORE
}
@@ -789,7 +796,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProvider::ActiveOpen [does nothing]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_ACTIVEOPEN1_1, "CSmsProvider::ActiveOpen [does nothing]");
BULLSEYE_RESTORE
}
@@ -805,7 +812,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProvider::PassiveOpen [not supported]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_PASSIVEOPEN_1, "CSmsProvider::PassiveOpen [not supported]");
return KErrNotSupported;
BULLSEYE_RESTORE
}
@@ -822,7 +829,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProvider::PassiveOpen [not supported]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_PASSIVEOPEN1_1, "CSmsProvider::PassiveOpen [not supported]");
return KErrNotSupported;
BULLSEYE_RESTORE
}
@@ -835,7 +842,7 @@
*/
void CSmsProvider::Shutdown(TCloseType aOption)
{
- LOGSMSPROT2("CSmsProvider::Shutdown [aOption=%d]", aOption);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SHUTDOWN_1, "CSmsProvider::Shutdown [aOption=%d]", aOption);
TInt messagesInBuffer = iRecvBufSegArray->Count();
for( TInt index = 0; index < messagesInBuffer; ++index )
@@ -846,11 +853,11 @@
if( ret == KErrNone )
{
TRAP(ret, (iProtocol.iReassemblyStore->SetMessagePassedToClientL(*smsmessage, EFalse)));
- LOGSMSPROT2("-> CSmsProvider::Shutdown - SetMessagePassedToClientL [ret=%d]", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SHUTDOWN_2, "-> CSmsProvider::Shutdown - SetMessagePassedToClientL [ret=%d]", ret);
}
else
{
- LOGSMSPROT2("-> CSmsProvider::Shutdown - CSmsProvider::InternalizeMessageL leave [ret=%d]", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SHUTDOWN_3, "-> CSmsProvider::Shutdown - CSmsProvider::InternalizeMessageL leave [ret=%d]", ret);
}
delete smsmessage;
}
@@ -879,7 +886,7 @@
*/
void CSmsProvider::Shutdown(TCloseType aOption, const TDesC8& /*aDisconnectionData*/)
{
- LOGSMSPROT1("CSmsProvider::Shutdown");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SHUTDOWN1_1, "CSmsProvider::Shutdown");
Shutdown(aOption);
}
@@ -894,7 +901,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGSMSPROT1("CSmsProvider::AutoBind [does nothing]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_AUTOBIND_1, "CSmsProvider::AutoBind [does nothing]");
BULLSEYE_RESTORE
}
@@ -906,7 +913,7 @@
*/
const TSmsAddr& CSmsProvider::GetLocalAddress() const
{
- LOGSMSPROT1("CSmsProvider::GetLocalAddress");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_GETLOCALADDRESS_1, "CSmsProvider::GetLocalAddress");
return iLocalAddress;
}
@@ -916,7 +923,7 @@
*/
void CSmsProvider::SetLocalAddress(const TSmsAddr& aSmsAddr)
{
- LOGSMSPROT1("CSmsProvider::SetLocalAddress");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SETLOCALADDRESS_1, "CSmsProvider::SetLocalAddress");
iLocalAddress = aSmsAddr;
}
@@ -929,7 +936,7 @@
*/
void CSmsProvider::ModemNotificationCompleted(TInt aStatus)
{
- LOGSMSPROT2("CSmsProvider::ModemNotificationCompleted [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MODEMNOTIFICATIONCOMPLETED_1, "CSmsProvider::ModemNotificationCompleted [aStatus=%d]", aStatus);
if( !IoctlOutstanding() )
{
@@ -946,7 +953,7 @@
*/
void CSmsProvider::MessageSendCompleted(TInt aStatus)
{
- LOGSMSPROT2("CSmsProvider::MessageSendCompleted [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MESSAGESENDCOMPLETED_1, "CSmsProvider::MessageSendCompleted [aStatus=%d]", aStatus);
iSocket->Error(aStatus,MSocketNotify::EErrorIoctl);
SetIoctlOutstanding(EFalse);
@@ -961,7 +968,7 @@
*/
TInt CSmsProvider::MessageReceived(const CSmsMessage& aSmsMessage,TDes& /*aDes*/)
{
- LOGSMSPROT1("CSmsProvider::MessageReceived");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MESSAGERECEIVED_1, "CSmsProvider::MessageReceived");
// Attempt to serial the message to the receive buffer & notify
// the socket of the new data
@@ -979,7 +986,7 @@
*/
TBool CSmsProvider::ClientConfirmsMessage() const
{
- LOGSMSPROT1("CSmsProvider::ClientConfirmsMessage");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_CLIENTCONFIRMSMESSAGE_1, "CSmsProvider::ClientConfirmsMessage");
return ETrue;
}
@@ -989,7 +996,7 @@
*/
TInt CSmsProvider::SmsAddrIsDuplicate(const MSmsMessageObserver* aObserver, const TSmsAddr& aAddr) const
{
- LOGSMSPROT1("CSmsProvider::SmsAddrIsDuplicate");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SMSADDRISDUPLICATE_1, "CSmsProvider::SmsAddrIsDuplicate");
if( this == aObserver )
{
@@ -1007,7 +1014,7 @@
*/
void CSmsProvider::EnumeratePhoneCompleted(TInt aStatus)
{
- LOGSMSPROT2("CSmsProvider::EnumeratePhoneCompleted [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_ENUMERATEPHONECOMPLETED_1, "CSmsProvider::EnumeratePhoneCompleted [aStatus=%d]", aStatus);
// Attempt to serialize all enumerated messages to the receive buffer
TInt numnewsegments=0;
@@ -1074,7 +1081,7 @@
*/
void CSmsProvider::MessageWriteCompleted(TInt aStatus, const CSmsMessage* aSmsMessage)
{
- LOGSMSPROT2("CSmsProvider::MessageWriteCompleted [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MESSAGEWRITECOMPLETED_1, "CSmsProvider::MessageWriteCompleted [aStatus=%d]", aStatus);
// If no errors at present populate the buffer
if( aStatus == KErrNone )
@@ -1097,7 +1104,7 @@
*/
void CSmsProvider::PopulateBufferWithPDUSlotsL(const CSmsMessage& aSmsMessage)
{
- LOGSMSPROT1("CSmsProvider::PopulateBufferWithPDUSlotsL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_POPULATEBUFFERWITHPDUSLOTSL_1, "CSmsProvider::PopulateBufferWithPDUSlotsL");
// Create buffer for store id and PDU slot indexes based on size of slot array
@@ -1115,7 +1122,7 @@
iSocket->IoctlComplete(&textBufPtr);
delete buf;
- LOGSMSPROT1("-> CSmsProvider::PopulateBufferWithPDUSlotsL - done");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_POPULATEBUFFERWITHPDUSLOTSL_2, "-> CSmsProvider::PopulateBufferWithPDUSlotsL - done");
}
/**
@@ -1128,7 +1135,7 @@
*/
void CSmsProvider::MessageDeleteCompleted(TInt aStatus)
{
- LOGSMSPROT2("CSmsProvider::MessageDeleteCompleted [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_MESSAGEDELETECOMPLETED_1, "CSmsProvider::MessageDeleteCompleted [aStatus=%d]", aStatus);
iSocket->Error(aStatus,MSocketNotify::EErrorIoctl);
SetIoctlOutstanding(EFalse);
}
@@ -1143,7 +1150,7 @@
*/
void CSmsProvider::ReadSmsParamsCompleted(TInt aStatus, CMobilePhoneSmspList* aSmspList)
{
- LOGSMSPROT2("CSmsProvider::ReadSmsParamsCompleted [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_READSMSPARAMSCOMPLETED_1, "CSmsProvider::ReadSmsParamsCompleted [aStatus=%d]", aStatus);
TInt numNewSegments=0;
@@ -1177,7 +1184,7 @@
*/
void CSmsProvider::WriteSmsParamsCompleted(TInt aStatus)
{
- LOGSMSPROT2("CSmsProvider::WriteSmsParamsCompleted [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_WRITESMSPARAMSCOMPLETED_1, "CSmsProvider::WriteSmsParamsCompleted [aStatus=%d]", aStatus);
iSocket->Error(aStatus,MSocketNotify::EErrorIoctl);
SetIoctlOutstanding(EFalse);
}
@@ -1192,12 +1199,12 @@
*/
TInt CSmsProvider::ExternalizeEnumeratedMessagesL(TInt& aCount)
{
- LOGSMSPROT1("CSmsProvider::ExternalizeEnumeratedMessagesL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEENUMERATEDMESSAGESL_1, "CSmsProvider::ExternalizeEnumeratedMessagesL");
TInt numnewsegments(0);
numnewsegments=iProtocol.ExternalizeEnumeratedMessagesL(*this,aCount);
- LOGSMSPROT1("-> CSmsProvider::ExternalizeEnumeratedMessagesL - done");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEENUMERATEDMESSAGESL_2, "-> CSmsProvider::ExternalizeEnumeratedMessagesL - done");
return numnewsegments;
}
@@ -1215,7 +1222,7 @@
*/
TInt CSmsProvider::ExternalizeMessageL(const CSmsMessage& aSmsMessage,TBool aAppend)
{
- LOGSMSPROT1("CSmsProvider::ExternalizeMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEMESSAGEL_1, "CSmsProvider::ExternalizeMessageL()");
// Create a new segmented buffer for the serialization of this message
CBufSeg* recvbufseg = CBufSeg::NewL(KSmsMaxSegmentLength);
@@ -1239,7 +1246,7 @@
CleanupStack::PopAndDestroy(); // writestream
CleanupStack::Pop(); // recvbufseg
- LOGSMSPROT1("-> CSmsProvider::ExternalizeMessageL - done");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEMESSAGEL_2, "-> CSmsProvider::ExternalizeMessageL - done");
return NumSegments(recvbufseg->Size());
}
@@ -1255,7 +1262,7 @@
*/
CSmsMessage* CSmsProvider::InternalizeMessageL()
{
- LOGSMSPROT1("CSmsProvider::InternalizeMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEMESSAGEL_1, "CSmsProvider::InternalizeMessageL()");
// Initialize the read stream with the buffer
RBufReadStream readstream(*iSendBufSeg);
@@ -1274,7 +1281,7 @@
CleanupStack::PopAndDestroy(); // readstream
iSendBufSeg->Reset();
- LOGSMSPROT1("-> CSmsProvider::InternalizeMessageL - done");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEMESSAGEL_2, "-> CSmsProvider::InternalizeMessageL - done");
return smsmessage;
}
@@ -1291,7 +1298,7 @@
*/
TInt CSmsProvider::ExternalizeParametersL(const CMobilePhoneSmspList& aMobilePhoneSmspList)
{
- LOGSMSPROT1("CSmsProvider::ExternalizeParametersL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEPARAMETERSL_1, "CSmsProvider::ExternalizeParametersL");
// Create a new segmented buffer for the serialization of this message
CBufSeg* recvBufSeg = CBufSeg::NewL(KSmsMaxSegmentLength);
@@ -1309,7 +1316,7 @@
iRecvBufSegArray->InsertL(0,recvBufSeg);
CleanupStack::Pop(recvBufSeg);
- LOGSMSPROT1("-> CSmsProvider::ExternalizeParametersL - done");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_EXTERNALIZEPARAMETERSL_2, "-> CSmsProvider::ExternalizeParametersL - done");
return NumSegments(recvBufSeg->Size());
}
@@ -1325,7 +1332,7 @@
*/
CMobilePhoneSmspList* CSmsProvider::InternalizeParametersL()
{
- LOGSMSPROT1("CSmsProvider::InternalizeParametersL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEPARAMETERSL_1, "CSmsProvider::InternalizeParametersL");
// Initialize the read stream with the buffer
RBufReadStream readStream(*iSendBufSeg);
@@ -1343,14 +1350,14 @@
CleanupStack::PopAndDestroy(); //readStream
iSendBufSeg->Reset();
- LOGSMSPROT1("-> CSmsProvider::InternalizeParametersL - done");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEPARAMETERSL_2, "-> CSmsProvider::InternalizeParametersL - done");
return mobilePhoneSmspList;
}
CSmsMessage* CSmsProvider::InternalizeMessageL( CBufSeg* aBufSeg)
{
- LOGSMSPROT1("CSmsProvider::InternalizeMessageL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEMESSAGEL1_1, "CSmsProvider::InternalizeMessageL");
RBufReadStream readstream(*aBufSeg);
readstream.Open(*aBufSeg,0);
@@ -1364,14 +1371,14 @@
CleanupStack::Pop(); // smsmessage
CleanupStack::PopAndDestroy(); // readsream
- LOGSMSPROT1("-> CSmsProvider::InternalizeMessageL - done");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_INTERNALIZEMESSAGEL1_2, "-> CSmsProvider::InternalizeMessageL - done");
return smsmessage;
}
TInt CSmsProvider::SecurityCheck(MProvdSecurityChecker* aSecurityChecker)
{
- LOGSMSPROT1("CSmsProvider::SecurityCheck");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPROVIDER_SECURITYCHECK_1, "CSmsProvider::SecurityCheck");
iSecurityChecker = aSecurityChecker;
return KErrNone;
}
--- a/smsprotocols/smsstack/smsprot/Src/smspsend.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspsend.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -20,6 +20,12 @@
@internalAll
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspsendTraces.h"
+#endif
+
#include "smspsend.h"
#include "smspstor.h"
#include "smspmain.h"
@@ -48,7 +54,7 @@
TInt aPriority,
CSmspSetBearer& aSmspSetBearer)
{
- LOGSMSPROT1("CSmsMessageSend::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_NEWL_1, "CSmsMessageSend::NewL()");
CSmsMessageSend* self = new (ELeave) CSmsMessageSend(aSegmentationStore,
aSmsSettings,
@@ -71,7 +77,7 @@
*/
void CSmsMessageSend::ConstructL()
{
- LOGSMSPROT1("CSmsMessageSend::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_CONSTRUCTL_1, "CSmsMessageSend::ConstructL()");
iSmsEventLogger = CSmsEventLogger::NewL(iSegmentationStore.FileSession(),
Priority());
@@ -124,7 +130,7 @@
void CSmsMessageSend::Start(CSmsMessage& aSmsMessage, TInt aOptions,
const TSmsAddr& aSmsAddr, TRequestStatus& aStatus)
{
- LOGSMSPROT1("CSmsMessageSend::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_START_1, "CSmsMessageSend::Start()");
__ASSERT_DEBUG(iState == ESmsMessageSendIdle,SmspPanic(KSmspPanicUnexpectedState));
@@ -160,7 +166,7 @@
void CSmsMessageSend::DoRunL()
{
- LOGSMSPROT3("CSmsMessageSend::RunL(): iStatus=%d, iState=%d", iStatus.Int(), iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_1, "CSmsMessageSend::RunL(): iStatus=%d, iState=%d", iStatus.Int(), iState);
switch (iState)
{
@@ -248,18 +254,15 @@
if (iStatus.Int() == KErrNone && !IsRPError())
{
- LOGSMSIF2("CSmsMessageSend::RunL(): Submit ACK'd MsgRef=%d",
- iMobileSmsSendAttributesV1.iMsgRef);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_2, "CSmsMessageSend::RunL(): Submit ACK'd MsgRef=%d",iMobileSmsSendAttributesV1.iMsgRef);
}
else if (IsRPError())
{
- LOGSMSIF2("CSmsMessageSend::RunL(): Submit N'ACK'D MsgRef=%d",
- iMobileSmsSendAttributesV1.iMsgRef);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_3, "CSmsMessageSend::RunL(): Submit N'ACK'D MsgRef=%d",iMobileSmsSendAttributesV1.iMsgRef);
}
else
{
- LOGSMSIF2("CSmsMessageSend::RunL(): MsgRef=%d",
- iMobileSmsSendAttributesV1.iMsgRef);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DORUNL_4, "CSmsMessageSend::RunL(): MsgRef=%d",iMobileSmsSendAttributesV1.iMsgRef);
}
//
@@ -352,7 +355,7 @@
void CSmsMessageSend::DoCancel()
{
- LOGSMSPROT2("CSmsMessageSend::DoCancel(): iState=%d", iState);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOCANCEL_1, "CSmsMessageSend::DoCancel(): iState=%d", iState);
TimedSetActiveCancel();
@@ -422,7 +425,7 @@
*/
void CSmsMessageSend::DecodeSubmitReportL()
{
- LOGSMSPROT1("CSmsMessageSend::DecodeSubmitReportL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DECODESUBMITREPORTL_1, "CSmsMessageSend::DecodeSubmitReportL()");
//
// Only try to decode the submit report if error is a RP-error, in which case there should be a valid PDU
@@ -450,7 +453,7 @@
}
else
{
- LOGSMSPROT3("Invalid PDU Type = %d with iStatus = %d", smsMessage->SmsPDU().Type(), iStatus.Int() );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DECODESUBMITREPORTL_2, "Invalid PDU Type = %d with iStatus = %d", smsMessage->SmsPDU().Type(), iStatus.Int() );
}
CleanupStack::PopAndDestroy(smsMessage);
@@ -465,7 +468,7 @@
*/
TBool CSmsMessageSend::IsRPError() const
{
- LOGSMSPROT1("CSmsMessageSend::IsRPError()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_ISRPERROR_1, "CSmsMessageSend::IsRPError()");
TBool isRPError = EFalse;
@@ -514,7 +517,7 @@
void CSmsMessageSend::SegmentMessage()
{
- LOGSMSPROT1("CSmsMessageSend::SegmentMessage()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_SEGMENTMESSAGE_1, "CSmsMessageSend::SegmentMessage()");
iState = ESmsMessageSendSegmentingMessage;
@@ -526,7 +529,7 @@
void CSmsMessageSend::DoSegmentMessageL()
{
- LOGSMSPROT1("CSmsMessageSend::DoSegmentMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOSEGMENTMESSAGEL_1, "CSmsMessageSend::DoSegmentMessageL()");
TInt reference=0;
if (iSmsMessage->Type()==CSmsPDU::ESmsCommand)
@@ -598,8 +601,8 @@
}
}
- LOGSMSPROT3("CSmsMesageSend::DoSegmentMessageL [LogServerId=%d][iSentBefore=%d]",iSmsMessage->LogServerId(),iSentBefore);
- LOGSMSPROT3("CSmsMesageSend::DoSegmentMessageL [referenceNo=%d] [iCountOfSentBefore=%d ]",reference,iSmsPDUData.iSent);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOSEGMENTMESSAGEL_2, "CSmsMesageSend::DoSegmentMessageL [LogServerId=%d][iSentBefore=%d]",iSmsMessage->LogServerId(),iSentBefore);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOSEGMENTMESSAGEL_3, "CSmsMesageSend::DoSegmentMessageL [referenceNo=%d] [iCountOfSentBefore=%d ]",reference,iSmsPDUData.iSent);
if(!iSentBefore)
{
iSegmentationStore.AddSubmitL(iSmsAddr,*iSmsMessage);
@@ -610,7 +613,7 @@
void CSmsMessageSend::CreateLogServerEvent()
{
- LOGSMSPROT1("CSmsMessageSend::CreateLogServerEvent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_CREATELOGSERVEREVENT_1, "CSmsMessageSend::CreateLogServerEvent()");
iState=ESmsMessageSendCreatingLogServerEvent;
TLogId logid=(TLogId) iSmsMessage->LogServerId();
@@ -630,7 +633,7 @@
void CSmsMessageSend::SendNextPDU()
{
- LOGSMSPROT3("CSmsMessageSend::SendNextPDU [sending pdu %d of count=%d]",iSmsPDUData.iSent, iSmsArray.Count() );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_SENDNEXTPDU_1, "CSmsMessageSend::SendNextPDU [sending pdu %d of count=%d]",iSmsPDUData.iSent, iSmsArray.Count() );
if (iSmsPDUData.iSent<iSmsArray.Count())
{
@@ -674,10 +677,13 @@
//
// Debug logging of the PDU we are sending...
//
- LOGSMSIFPDU(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
- LOGSMSIFSENDATTRIBUTES(_L8("SENDATTRIBS: "), iMobileSmsSendAttributesV1);
- LOGSMSIFTIMESTAMP();
-
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ LogSmsIfPDU(_L8("ETEL TX PDU: "), iSmsArray[iSmsPDUData.iSent].Pdu(), ETrue);
+ LogSmsIfSendAttributes(_L8("SENDATTRIBS: "), iMobileSmsSendAttributesV1);
+ TBuf<40> timestamp;
+ SmsTimeStampL(timestamp);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSMESSAGESEND_SENDNEXTPDU_2, "%S",timestamp);
+#endif
//
// Send the message and enter the correct state...
//
@@ -701,7 +707,7 @@
void CSmsMessageSend::DoUpdateSegmentationStoreL()
{
- LOGSMSPROT1("CSmsMessageSend::DoUpdateSegmentationStoreL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_DOUPDATESEGMENTATIONSTOREL_1, "CSmsMessageSend::DoUpdateSegmentationStoreL()");
iSmsPDUData.iSent++; // This is the end of the sequence for sending an SMS PDU
@@ -723,7 +729,7 @@
void CSmsMessageSend::UpdateLogServerEvent()
{
- LOGSMSPROT1("CSmsMessageSend::UpdateLogServerEvent()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_UPDATELOGSERVEREVENT_1, "CSmsMessageSend::UpdateLogServerEvent()");
//
// Fill in log event...
@@ -737,7 +743,7 @@
void CSmsMessageSend::Complete(TInt aStatus)
{
- LOGSMSPROT3("CSmsMessageSend::Complete [iStatus=%d, iState=%d]", iStatus.Int(), iState );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMESSAGESEND_COMPLETE_1, "CSmsMessageSend::Complete [iStatus=%d, iState=%d]", iStatus.Int(), iState );
//
// For completion during log events, use the saved error code instead...
--- a/smsprotocols/smsstack/smsprot/Src/smspstor.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspstor.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspstorTraces.h"
+#endif
+
#include <e32svr.h>
#include <es_ini.h>
#include "smspstor.h"
@@ -26,7 +32,6 @@
#include "smsuaddr.H"
#include "Gsmumsg.h"
#include "gsmubuf.h"
-#include <logwrap.h>
#include <logwraplimits.h>
#include "Gsmuelem.h"
#include "gsmuieoperations.h"
@@ -34,7 +39,7 @@
LOCAL_C TPtrC TrimLeadingZeros(const TDesC& aString)
{
- LOGSMSPROT1("CSARStore::ExternalizeEntryArrayL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TRIMLEADINGZEROS_1, "CSARStore::ExternalizeEntryArrayL()");
const TInt len = aString.Length();
@@ -59,7 +64,7 @@
*/
CSmsReassemblyStore* CSmsReassemblyStore::NewL(RFs& aFs)
{
- LOGSMSPROT1("CSmsReassemblyStore::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_NEWL_1, "CSmsReassemblyStore::NewL()");
CSmsReassemblyStore* self = new (ELeave) CSmsReassemblyStore(aFs);
CleanupStack::PushL(self);
@@ -75,7 +80,7 @@
*/
void CSmsReassemblyStore::ConstructL()
{
- LOGSMSPROT1("CSmsReassemblyStore::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_CONSTRUCTL_1, "CSmsReassemblyStore::ConstructL()");
//
// Generate the full path to the reassembly store.
@@ -99,7 +104,7 @@
void CSmsReassemblyStore::UpdateLogServerIdL(TInt aIndex, TLogId aLogServerId)
{
- LOGSMSPROT1("CSmsReassemblyStore::UpdateLogServerIdL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1, "CSmsReassemblyStore::UpdateLogServerIdL()");
TSmsReassemblyEntry entry(reinterpret_cast<const TSmsReassemblyEntry&>(Entries()[aIndex]));
@@ -127,7 +132,7 @@
TBool aPassed,
TInt& aIndex)
{
- LOGSMSPROT1("CSmsReassemblyStore::FindMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_FINDMESSAGEL_1, "CSmsReassemblyStore::FindMessageL()");
//
// Parse the GSM data from the SMS message...
@@ -153,7 +158,7 @@
//
// Found!
//
- LOGSMSPROT2("CSmsReassemblyStore::FindMessage(): Found! index=%d", index);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_FINDMESSAGEL_2, "CSmsReassemblyStore::FindMessage(): Found! index=%d", index);
aIndex = index;
@@ -164,7 +169,7 @@
//
// Not found...
//
- LOGSMSPROT1("CSmsReassemblyStore::FindMessage(): Not found!");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_FINDMESSAGEL_3, "CSmsReassemblyStore::FindMessage(): Not found!");
return EFalse;
} // CSmsReassemblyStore::FindMessageL
@@ -182,7 +187,7 @@
void CSmsReassemblyStore::MatchPDUToExistingMessage(const CSmsMessage& aSmsMessage,
TInt& aIndex)
{
- LOGSMSPROT1("CSmsReassemblyStore::MatchPDUToExistingMessage()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1, "CSmsReassemblyStore::MatchPDUToExistingMessage()");
__ASSERT_ALWAYS(!aSmsMessage.IsDecoded(), SmspPanic(KSmspPanicMessageConcatenated));
@@ -222,7 +227,7 @@
}
}
- LOGSMSPROT3("CSmsReassemblyStore::MatchPDUToExistingMessage(): reassemblyCount=%d, aIndex=%d", reassemblyCount, aIndex);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2, "CSmsReassemblyStore::MatchPDUToExistingMessage(): reassemblyCount=%d, aIndex=%d", reassemblyCount, aIndex);
} // CSmsReassemblyStore::MatchPDUToExistingMessage
@@ -232,7 +237,7 @@
TBool& aDuplicateMsgRef,
TBool& aDuplicateSlot)
{
- LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1, "CSmsReassemblyStore::UpdateExistingMessageL()");
aComplete = EFalse;
aDuplicateMsgRef = EFalse;
@@ -276,7 +281,7 @@
if (slot.iIndex == newSlot.iIndex && slot.iStore == newSlot.iStore)
{
- LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate enumerated PDU.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2, "CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate enumerated PDU.");
// It is a duplicate that was already stored on the SIM...
aDuplicateSlot = ETrue;
@@ -291,7 +296,7 @@
{
if (indexArray->At(index) == concatPDUIndex)
{
- LOGSMSPROT1("CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate concatenated PDU.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3, "CSmsReassemblyStore::UpdateExistingMessageL(): Duplicate concatenated PDU.");
// The PDU is already stored in the reassembly store.
aDuplicateMsgRef = ETrue;
@@ -360,7 +365,7 @@
void CSmsReassemblyStore::NewMessagePDUL(TInt& aIndex,CSmsMessage& aSmsMessage,const TGsmSms& aGsmSms)
{
- LOGSMSPROT1("CSmsReassemblyStore::NewMessagePDUL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_NEWMESSAGEPDUL_1, "CSmsReassemblyStore::NewMessagePDUL");
CArrayFix<TInt>* indexarray=new(ELeave) CArrayFixFlat<TInt>(8);
CleanupStack::PushL(indexarray);
@@ -377,7 +382,7 @@
void CSmsReassemblyStore::GetMessageL(TInt aIndex,CSmsMessage& aSmsMessage)
{
- LOGSMSPROT2("CSmsReassemblyStore::GetMessageL [aIndex=%d]", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_GETMESSAGEL_1, "CSmsReassemblyStore::GetMessageL [aIndex=%d]", aIndex);
CArrayFix<TInt>* indexarray=new(ELeave) CArrayFixFlat<TInt>(8);
CleanupStack::PushL(indexarray);
@@ -398,7 +403,7 @@
*/
void CSmsReassemblyStore::InternalizeEntryL(const TStreamId& aStreamId,CSmsMessage& aSmsMessage,CArrayFix<TInt>& aIndexArray,CArrayFix<TGsmSms>& aSmsArray)
{
- LOGSMSPROT2("CSmsReassemblyStore::InternalizeEntryL Start [sid=%d]", aStreamId.Value());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_1, "CSmsReassemblyStore::InternalizeEntryL Start [sid=%d]", aStreamId.Value());
RStoreReadStream readstream;
readstream.OpenLC(FileStore(),aStreamId);
readstream >> aSmsMessage;
@@ -423,7 +428,7 @@
aSmsArray.AppendL(sms);
}
CleanupStack::PopAndDestroy();
- LOGSMSPROT2("CSmsReassemblyStore::InternalizeEntryL End [count=%d]", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_2, "CSmsReassemblyStore::InternalizeEntryL End [count=%d]", count);
} // CSARStore::OpenFileLC
@@ -434,7 +439,7 @@
*/
void CSmsReassemblyStore::ExternalizeEntryL(TStreamId& aStreamId,const CSmsMessage& aSmsMessage,const CArrayFix<TInt>& aIndexArray,const CArrayFix<TGsmSms>& aSmsArray)
{
- LOGSMSPROT2("CSmsReassemblyStore::ExternalizeEntryL Start [sid=%d]", aStreamId.Value());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_1, "CSmsReassemblyStore::ExternalizeEntryL Start [sid=%d]", aStreamId.Value());
RStoreWriteStream writestream;
if (aStreamId==KNullStreamId)
@@ -459,13 +464,13 @@
writestream.CommitL();
CleanupStack::PopAndDestroy();
- LOGSMSPROT2("CSmsReassemblyStore::ExternalizeEntryL End [count=%d]", count);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_2, "CSmsReassemblyStore::ExternalizeEntryL End [count=%d]", count);
} // CSARStore::OpenFileLC
void CSmsReassemblyStore::PopulateEntry(TSmsReassemblyEntry& aEntry,const CSmsMessage& aSmsMessage,TInt aNumSmss)
{
- LOGSMSPROT1("CSmsReassemblyStore::PopulateEntry");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_POPULATEENTRY_1, "CSmsReassemblyStore::PopulateEntry");
aEntry.SetReference(0);
aEntry.SetTotal(1);
aEntry.SetCount(1);
@@ -523,7 +528,7 @@
void CSmsReassemblyStore::CreateEntryL(CSmsMessage& aSmsMessage,const CArrayFix<TInt>& aIndexArray,const CArrayFix<TGsmSms>& aSmsArray)
{
- LOGSMSPROT1("CSmsReassemblyStore::CreateEntryL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_CREATEENTRYL_1, "CSmsReassemblyStore::CreateEntryL");
TStreamId streamid=KNullStreamId;
if (aSmsMessage.Time() >= iLastRealTime)
{
@@ -551,7 +556,7 @@
TBool CSmsReassemblyStore::PassedToClient( TInt aIndex ) const
{
- LOGSMSPROT1("CSmsReassemblyStore::PassedToClient()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_PASSEDTOCLIENT_1, "CSmsReassemblyStore::PassedToClient()");
const TSmsReassemblyEntry& entry = reinterpret_cast<const TSmsReassemblyEntry&>(Entries()[ aIndex ]);
return entry.PassedToClient();
@@ -560,7 +565,7 @@
void CSmsReassemblyStore::SetPassedToClientL(TInt aIndex, TBool aPassed)
{
- LOGSMSPROT1("CSmsReassemblyStore::SetPassedToClientL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_SETPASSEDTOCLIENTL_1, "CSmsReassemblyStore::SetPassedToClientL()");
TSmsReassemblyEntry entry(reinterpret_cast<const TSmsReassemblyEntry&>(Entries()[aIndex]));
@@ -579,7 +584,7 @@
*/
void CSmsReassemblyStore::OpenStoreL()
{
- LOGSMSPROT1("CSmsReassemblyStore::OpenStoreL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSREASSEMBLYSTORE_OPENSTOREL_1, "CSmsReassemblyStore::OpenStoreL()");
this->OpenL(iFullPathBuf,KReassemblyStoreUid);
} // CSmsReassemblyStore::OpenStoreL
@@ -599,7 +604,7 @@
CSmsSegmentationStore* CSmsSegmentationStore::NewL(RFs& aFs)
{
- LOGSMSPROT1("CSmsSegmentationStore::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEWL_1, "CSmsSegmentationStore::NewL()");
CSmsSegmentationStore* segmentationStore = new(ELeave) CSmsSegmentationStore(aFs);
CleanupStack::PushL( segmentationStore );
@@ -611,7 +616,7 @@
void CSmsSegmentationStore::ConstructL()
{
- LOGSMSPROT1("CSmsSegmentationStore::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_CONSTRUCTL_1, "CSmsSegmentationStore::ConstructL()");
//generate fullpath of segmentation store.
PrivatePath(iFullPathBuf);
@@ -652,7 +657,7 @@
TInt CSmsSegmentationStore::Next8BitReferenceL()
{
- LOGSMSPROT1("CSmsSegmentationStore::Next8BitReferenceL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_1, "CSmsSegmentationStore::Next8BitReferenceL");
TInt reference8bit=0;
TInt reference16bit=0;
@@ -669,7 +674,7 @@
{
// We have to leave on any error; otherwise a duplicate reference number will be generated
// The transaction will revert
- LOGSMSPROT2("WARNING! CSmsSegmentationStore::InternalizeConcatenationReferencesL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_2, "WARNING! CSmsSegmentationStore::InternalizeConcatenationReferencesL left with %d", ret);
User::Leave(ret); // stream not corrupted
}
reference8bit=(reference8bit+1)%0x100;
@@ -679,7 +684,7 @@
{
// We have to leave on any error; otherwise a duplicate reference number will be generated
// The transaction will revert
- LOGSMSPROT2("WARNING! CSmsSegmentationStore::ExternalizeConcatenationReferencesL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_3, "WARNING! CSmsSegmentationStore::ExternalizeConcatenationReferencesL left with %d", ret);
User::Leave(ret); // stream not corrupted
}
SetExtraStreamIdL(streamid);
@@ -690,7 +695,7 @@
TInt CSmsSegmentationStore::Next16BitReferenceL()
{
- LOGSMSPROT1("CSmsSegmentationStore::Next16BitReferenceL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_1, "CSmsSegmentationStore::Next16BitReferenceL");
TInt reference8bit=0;
TInt reference16bit=0x100;
TStreamId streamid=ExtraStreamId();
@@ -705,7 +710,7 @@
{
// We have to leave on any error; otherwise a duplicate reference number will be generated
// The transaction will revert
- LOGSMSPROT2("WARNING! CSmsSegmentationStore::InternalizeConcatenationReferencesL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_2, "WARNING! CSmsSegmentationStore::InternalizeConcatenationReferencesL left with %d", ret);
User::Leave(ret); // stream not corrupted
}
reference16bit=((reference16bit+1)%0xFF00)+0x100;
@@ -715,7 +720,7 @@
{
// We have to leave on any error; otherwise a duplicate reference number will be generated
// The transaction will revert
- LOGSMSPROT2("WARNING! CSmsSegmentationStore::ExternalizeConcatenationReferencesL left with %d", ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_3, "WARNING! CSmsSegmentationStore::ExternalizeConcatenationReferencesL left with %d", ret);
User::Leave(ret); // stream not corrupted
}
SetExtraStreamIdL(streamid);
@@ -735,7 +740,7 @@
*/
void CSmsSegmentationStore::AddSubmitL(const TSmsAddr& aSmsAddr,CSmsMessage& aSubmit)
{
- LOGSMSPROT1("CSmsSegmentationStore::AddSubmitL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSUBMITL_1, "CSmsSegmentationStore::AddSubmitL");
__ASSERT_ALWAYS(aSubmit.Type()==CSmsPDU::ESmsSubmit,SmspPanic(KSmspPanicNotSubmit));
@@ -766,7 +771,7 @@
TBool CSmsSegmentationStore::AddCommandL(const TSmsAddr& aSmsAddr,const CSmsMessage& aCommand, CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray& aRefStatus)
{
- LOGSMSPROT1("CSmsSegmentationStore::AddCommandL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDCOMMANDL_1, "CSmsSegmentationStore::AddCommandL");
__ASSERT_ALWAYS(aCommand.Type()==CSmsPDU::ESmsCommand,SmspPanic(KSmspPanicNotCommand));
const TInt count=Entries().Count();
const TLogId logid=(TLogId) aCommand.LogServerId();
@@ -842,7 +847,7 @@
TBool CSmsSegmentationStore::AddReferenceL(const CSmsMessage& aSmsMessage,TInt aReference)
{
const TInt count=Entries().Count();
- LOGSMSPROT3("CSmsSegmentationStore::AddReferenceL [count=%d, ref=%d]", count, aReference);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDREFERENCEL_1, "CSmsSegmentationStore::AddReferenceL [count=%d, ref=%d]", count, aReference);
TInt i=0;
TInt logserverid=aSmsMessage.LogServerId();
if (logserverid!=KLogNullId)
@@ -870,7 +875,7 @@
}
if(i>=count)
{
- LOGSMSPROT3("WARNING! KSmspPanicEntryWithLogServerIdNotFound [i=%d, count=%d]", i, count);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDREFERENCEL_2, "WARNING! KSmspPanicEntryWithLogServerIdNotFound [i=%d, count=%d]", i, count);
return EFalse;
}
@@ -922,7 +927,7 @@
TBool CSmsSegmentationStore::AddReferenceStatusPairL(const CSmsMessage& aSmsMessage,TInt aReference, TUint aSegmentSequenceNumber)
{
const TInt count=Entries().Count();
- LOGSMSPROT3("CSmsSegmentationStore::AddReferenceStatusPairL [count=%d, ref=%d]", count, aReference);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_1, "CSmsSegmentationStore::AddReferenceStatusPairL [count=%d, ref=%d]", count, aReference);
TInt i=0;
TInt logserverid=aSmsMessage.LogServerId();
if (logserverid!=KLogNullId)
@@ -950,7 +955,7 @@
}
if(i>=count)
{
- LOGSMSPROT3("WARNING! KSmspPanicEntryWithLogServerIdNotFound [i=%d, count=%d]", i, count);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_2, "WARNING! KSmspPanicEntryWithLogServerIdNotFound [i=%d, count=%d]", i, count);
return EFalse;
}
@@ -1028,7 +1033,7 @@
TBool CSmsSegmentationStore::AddStatusReportL(TInt& aIndex,TBool& aComplete,const CSmsMessage& aStatusReport)
{
- LOGSMSPROT1("CSmsSegmentationStore::AddStatusReportL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_1, "CSmsSegmentationStore::AddStatusReportL");
__ASSERT_DEBUG(aStatusReport.Type()==CSmsPDU::ESmsStatusReport,SmspPanic(KSmspPanicNotStatusReport));
@@ -1040,7 +1045,7 @@
TBool found=EFalse;
aComplete=EFalse;
- LOGSMSPROT4("CSmsSegmentationStore::AddStatusReportL [ref=%d status=%d IsPerm=%d]", reference, status, isPerm);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_2, "CSmsSegmentationStore::AddStatusReportL [ref=%d status=%d IsPerm=%d]", reference, status, isPerm);
if(!isPerm)
{
@@ -1083,11 +1088,11 @@
if (sameTelNumbers)
{
- LOGSMSPROT1("CSmsSegmentationStore::AddStatusReportL telNumber from submit report matches that from SMS message");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_3, "CSmsSegmentationStore::AddStatusReportL telNumber from submit report matches that from SMS message");
}
else
{
- LOGSMSPROT1("CSmsSegmentationStore::AddStatusReportL telNumber from submit report does NOT match that from SMS message");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_4, "CSmsSegmentationStore::AddStatusReportL telNumber from submit report does NOT match that from SMS message");
}
if (sameTelNumbers &&
@@ -1114,21 +1119,21 @@
}
else
{
- LOGSMSPROT4("CSmsSegmentationStore::AddStatusReportL WARNING: Status already perm [status=%d refStatusPos=%d count=%d]", refStatusArray[refStatusPos].Status(), refStatusPos, refStatusArrayCount);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_5, "CSmsSegmentationStore::AddStatusReportL WARNING: Status already perm [status=%d refStatusPos=%d count=%d]", refStatusArray[refStatusPos].Status(), refStatusPos, refStatusArrayCount);
refStatusPos++;
}
}
if (found)
{
- LOGSMSPROT2("CSmsSegmentationStore::AddStatusReportL Found [refStatusPos=%d]", refStatusPos);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_6, "CSmsSegmentationStore::AddStatusReportL Found [refStatusPos=%d]", refStatusPos);
refStatusArray[refStatusPos].SetStatus(status);
TStreamId streamid=entry.DataStreamId();
ExternalizeEntryL(streamid,smsaddr,*smsmessage, refStatusArray);
PopulateEntry(entry,*smsmessage, refStatusArray);
ChangeEntryL(aIndex,entry);
aComplete=StatusArrayComplete(refStatusArray, entry);
- LOGSMSPROT2("CSmsSegmentationStore::AddStatusReportL StatusArrayComplete %d", aComplete);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_7, "CSmsSegmentationStore::AddStatusReportL StatusArrayComplete %d", aComplete);
}
}
}
@@ -1188,7 +1193,7 @@
PopulateEntry(entry,/*smsaddr,*/*smsmessage, refStatusArray2);
ChangeEntryL(aIndex,entry);
aComplete=StatusArrayComplete(refStatusArray2, entry);
- LOGSMSPROT3("CSmsSegmentationStore::StatusArrayComplete [aStatus=%d, ret=%d]", status, aComplete);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_8, "CSmsSegmentationStore::StatusArrayComplete [aStatus=%d, ret=%d]", status, aComplete);
break;
}
}
@@ -1199,14 +1204,14 @@
CommitTransactionL();
CleanupStack::PopAndDestroy(2); // smsmessage, refStatusArray
- LOGSMSPROT2("CSmsSegmentationStore::AddStatusReportL Exit [found=%d]", found);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_9, "CSmsSegmentationStore::AddStatusReportL Exit [found=%d]", found);
return found;
} // CSmsSegmentationStore::AddStatusReportL
void CSmsSegmentationStore::GetMessageL(TInt aIndex,TSmsAddr& aSmsAddr,CSmsMessage& aSmsMessage, RSmsSegmentationStoreRefStatusArray& aRefStatusArray)
{
- LOGSMSPROT2("CSmsSegmentationStore::GetMessageL [aIndex=%d]", aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_GETMESSAGEL_1, "CSmsSegmentationStore::GetMessageL [aIndex=%d]", aIndex);
InternalizeEntryL(Entries()[aIndex].DataStreamId(),aSmsAddr,aSmsMessage, aRefStatusArray);
} // CSmsSegmentationStore::GetMessageL
@@ -1220,13 +1225,13 @@
*/
void CSmsSegmentationStore::InternalizeConcatenationReferencesL(const TStreamId& aStreamId,TInt& aReference8bit,TInt& aReference16bit)
{
- LOGSMSPROT1("CSmsSegmentationStore::InternalizeConcatenationReferencesL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_1, "CSmsSegmentationStore::InternalizeConcatenationReferencesL Start");
RStoreReadStream readstream;
readstream.OpenLC(FileStore(),aStreamId);
aReference8bit=readstream.ReadInt32L();
aReference16bit=readstream.ReadInt32L();
CleanupStack::PopAndDestroy();
- LOGSMSPROT1("CSmsSegmentationStore::InternalizeConcatenationReferencesL End");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_2, "CSmsSegmentationStore::InternalizeConcatenationReferencesL End");
} // CSmsSegmentationStore::InternalizeConcatenationReferencesL
@@ -1238,7 +1243,7 @@
*/
void CSmsSegmentationStore::ExternalizeConcatenationReferencesL(TStreamId& aStreamId,TInt aReference8bit,TInt aReference16bit)
{
- LOGSMSPROT1("CSmsSegmentationStore::ExternalizeConcatenationReferencesL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_1, "CSmsSegmentationStore::ExternalizeConcatenationReferencesL Start");
RStoreWriteStream writestream;
if (aStreamId==KNullStreamId)
aStreamId=writestream.CreateLC(FileStore());
@@ -1248,7 +1253,7 @@
writestream.WriteInt32L(aReference16bit);
writestream.CommitL();
CleanupStack::PopAndDestroy();
- LOGSMSPROT1("CSmsSegmentationStore::ExternalizeConcatenationReferencesL End");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_2, "CSmsSegmentationStore::ExternalizeConcatenationReferencesL End");
} // CSmsSegmentationStore::ExternalizeConcatenationReferencesL
@@ -1260,7 +1265,7 @@
*/
void CSmsSegmentationStore::InternalizeEntryL(const TStreamId& aStreamId,TSmsAddr& aSmsAddr,CSmsMessage& aSmsMessage, RSmsSegmentationStoreRefStatusArray& aRefStatusArray)
{
- LOGSMSPROT1("CSmsSegmentationStore::InternalizeEntryL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_1, "CSmsSegmentationStore::InternalizeEntryL Start");
aRefStatusArray.Reset();
@@ -1271,7 +1276,7 @@
readstream >> aRefStatusArray;
CleanupStack::PopAndDestroy(&readstream);
- LOGSMSPROT2("CSmsSegmentationStore::InternalizeEntryL End [count=%d]", aRefStatusArray.Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_2, "CSmsSegmentationStore::InternalizeEntryL End [count=%d]", aRefStatusArray.Count());
} // CSmsSegmentationStore::InternalizeEntryL
@@ -1280,7 +1285,7 @@
*/
void CSmsSegmentationStore::ExternalizeEntryL(TStreamId& aStreamId,const TSmsAddr& aSmsAddr,const CSmsMessage& aSmsMessage, const RSmsSegmentationStoreRefStatusArray& aRefStatusArray)
{
- LOGSMSPROT1("CSmsSegmentationStore::ExternalizeEntryL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_1, "CSmsSegmentationStore::ExternalizeEntryL Start");
RStoreWriteStream writestream;
@@ -1295,7 +1300,7 @@
writestream.CommitL();
CleanupStack::PopAndDestroy(&writestream);
- LOGSMSPROT2("CSmsSegmentationStore::ExternalizeEntryL End [count=%d]", aRefStatusArray.Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_2, "CSmsSegmentationStore::ExternalizeEntryL End [count=%d]", aRefStatusArray.Count());
} // CSmsSegmentationStore::ExternalizeEntryL
@@ -1313,7 +1318,7 @@
const CSmsMessage& aSmsMessage,
const RSmsSegmentationStoreRefStatusArray& aRefStatusArray)
{
- LOGSMSPROT1("CSmsSegmentationStore::PopulateEntry");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_POPULATEENTRY_1, "CSmsSegmentationStore::PopulateEntry");
TBool statusreportrequest=EFalse;
if (aSmsMessage.Type()==CSmsPDU::ESmsSubmit)
{
@@ -1421,7 +1426,7 @@
for (TInt i=0; i<count; i++)
{
const TBool ret = IsPermanentStatus(aRefStatusArray[i].Status());
- LOGSMSPROT4("CSmsSegmentationStore::IsPermanentStatus [Status: %d, RetVal: %d, count=%d]", aRefStatusArray[i].Status(), ret, count);
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_STATUSARRAYCOMPLETE_1, "CSmsSegmentationStore::IsPermanentStatus [Status: %d, RetVal: %d, count=%d]", aRefStatusArray[i].Status(), ret, count);
if (ret)
permanent++;
}
@@ -1435,14 +1440,14 @@
CSmsSegmentationStore::CSmsSegmentationStore(RFs& aFs)
:CSARStore(aFs)
{
- LOGSMSPROT1("CSmsSegmentationStore::CSmsSegmentationStore()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_CTOR_1, "CSmsSegmentationStore::CSmsSegmentationStore()");
} // CSmsSegmentationStore::CSmsSegmentationStore
TInt CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::Compare(const TSmsSegmentationStoreRefStatus& aLeft, const TSmsSegmentationStoreRefStatus& aRight)
{
- LOGSMSPROT1("CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::Compare()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_COMPARE_1, "CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::Compare()");
return aLeft.iReference - aRight.iReference;
} // CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::Compare
@@ -1450,7 +1455,7 @@
void CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::InternalizeL(RReadStream& aStream)
{
- LOGSMSPROT1("CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::InternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_INTERNALIZEL_1, "CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::InternalizeL()");
iReference = aStream.ReadInt32L();
iStatus = aStream.ReadInt32L();
@@ -1459,7 +1464,7 @@
void CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::ExternalizeL(RWriteStream& aStream) const
{
- LOGSMSPROT1("CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::ExternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_EXTERNALIZEL_1, "CSmsSegmentationStore::TSmsSegmentationStoreRefStatus::ExternalizeL()");
aStream.WriteInt32L(iReference);
aStream.WriteInt32L(iStatus);
@@ -1468,7 +1473,7 @@
void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InsertL(const TSmsSegmentationStoreRefStatus& aRefStatus)
{
- LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InsertL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INSERTL_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InsertL()");
TLinearOrder<TSmsSegmentationStoreRefStatus> order(TSmsSegmentationStoreRefStatus::Compare);
User::LeaveIfError(InsertInOrderAllowRepeats(aRefStatus, order));
@@ -1477,7 +1482,7 @@
TInt CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::Find(const TSmsSegmentationStoreRefStatus& aRefStatus) const
{
- LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::Find()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_FIND_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::Find()");
TLinearOrder<TSmsSegmentationStoreRefStatus> order(TSmsSegmentationStoreRefStatus::Compare);
TInt index = FindInOrder(aRefStatus, order);
@@ -1497,7 +1502,7 @@
void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::CopyL(const RSmsSegmentationStoreRefStatusArray& aOther)
{
- LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::CopyL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_COPYL_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::CopyL()");
Reset();
@@ -1511,7 +1516,7 @@
void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ResetAllStatus(TInt aStatus)
{
- LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ResetAllStatus()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_RESETALLSTATUS_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ResetAllStatus()");
TInt count = Count();
while (count--)
@@ -1523,7 +1528,7 @@
void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InternalizeL(RReadStream& aStream)
{
- LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INTERNALIZEL_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::InternalizeL()");
TInt count = aStream.ReadInt32L();
while (count--)
@@ -1537,7 +1542,7 @@
void CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ExternalizeL(RWriteStream& aStream) const
{
- LOGSMSPROT1("CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ExternalizeL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAYEXTERNALIZEL_1, "CSmsSegmentationStore::RSmsSegmentationStoreRefStatusArray::ExternalizeL()");
const TInt count = Count();
aStream.WriteInt32L(count);
@@ -1551,7 +1556,7 @@
TBool CSmsSegmentationStore::HasEntryWithLogIdL(TLogId aLogID,TInt& aRefNo,TInt& aSent)
{
- LOGSMSPROT1("CSmsSegmentationStore::HasEntryWithLogIdL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_1, "CSmsSegmentationStore::HasEntryWithLogIdL()");
TInt count=Entries().Count();
TBool found=EFalse;
@@ -1576,7 +1581,7 @@
else
{
DeleteEntryL(i);
- LOGSMSPROT3("CSmsSegmentationStore::HasEntryWithLogIdL [Entry: %d LogId %d - deleted]", i, aLogID );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_2, "CSmsSegmentationStore::HasEntryWithLogIdL [Entry: %d LogId %d - deleted]", i, (TInt)aLogID );
}
break;
}
@@ -1592,7 +1597,7 @@
*/
void CSmsSegmentationStore::OpenStoreL()
{
- LOGSMSPROT1("CSmsSegmentationStore::OpenStoreL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSSEGMENTATIONSTORE_OPENSTOREL_1, "CSmsSegmentationStore::OpenStoreL()");
this->OpenL(iFullPathBuf,KSegmentationStoreUid);
} // CSmsSegmentationStore::OpenStoreL
--- a/smsprotocols/smsstack/smsprot/Test/TE_SMSSTOR/TE_smsstor.mmp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Test/TE_SMSSTOR/TE_smsstor.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -31,10 +31,12 @@
SOURCE smspreassemblystore.cpp
SOURCE smspclass0stor.cpp
+userinclude .
USERINCLUDE ../../Inc
USERINCLUDE ../../../gsmu/inc
USERINCLUDE ../../../common/inc
USERINCLUDE ../../../smsu/inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -43,6 +45,6 @@
LIBRARY euser.lib efsrv.lib estor.lib bafl.lib esock.lib
LIBRARY testexecutelogclient.lib
LIBRARY testexecuteutils.lib
-DEBUGLIBRARY comsdbgutil.lib
+
SMPSAFE
--- a/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/TE_smsprt.script Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/TE_smsprt.script Fri Jun 11 14:49:29 2010 +0300
@@ -323,7 +323,7 @@
//!@SYMTestActions Test send sms with out of memory conditions
//!@SYMTestExpectedResults Pass
//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestOOMSendSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber21
+RUN_TEST_STEP 1000 TE_smsprt TestOOMSendSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber21
END_TESTCASE SMS-SMSStack-NA-3023
@@ -335,7 +335,7 @@
//!@SYMTestActions Test write sms with out of memory conditions
//!@SYMTestExpectedResults Pass
//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestOOMWriteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber22
+RUN_TEST_STEP 1000 TE_smsprt TestOOMWriteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber22
END_TESTCASE SMS-SMSStack-NA-3024
@@ -347,7 +347,7 @@
//!@SYMTestActions Test Read Sms with out of memory conditions
//!@SYMTestExpectedResults Pass
//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestOOMReadSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber23
+RUN_TEST_STEP 1000 TE_smsprt TestOOMReadSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber23
END_TESTCASE SMS-SMSStack-NA-3025
@@ -371,7 +371,7 @@
//!@SYMTestActions Test delete sms with out of memory conditions
//!@SYMTestExpectedResults Pass
//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestOOMDeleteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber25
+RUN_TEST_STEP 1000 TE_smsprt TestOOMDeleteSms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber25
END_TESTCASE SMS-SMSStack-NA-3027
@@ -383,7 +383,7 @@
//!@SYMTestActions Test sms params with out of memory conditions
//!@SYMTestExpectedResults Pass
//!@SYMTestType CT
-RUN_TEST_STEP 500 TE_smsprt TestOOMSmsParams z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber26
+RUN_TEST_STEP 1000 TE_smsprt TestOOMSmsParams z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber26
END_TESTCASE SMS-SMSStack-NA-3028
@@ -1213,7 +1213,7 @@
//!@SYMTestExpectedResults Assume that sending a R6 SMS requires 'M' heap allocations. The stack should return an Out of Memory error when heap allocation request fails because 'n' has a value in the range 1..m. When 'n' has value m+1, the message should be sent successfully and the test should exit.
//!@SYMTestType CIT
//!@SYMTestCaseDependencies SIM.TSY
-RUN_TEST_STEP 120 TE_smsprt TestOOMSendR6Sms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber82
+RUN_TEST_STEP 500 TE_smsprt TestOOMSendR6Sms z:\testdata\configs\smsstacksimtsytestnumbers.ini TestNumber82
END_TESTCASE SMS-SMSS-SMSPROT-I-3093
START_TESTCASE SMS-SMSS-SMSPROT-I-3094
--- a/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_R6.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/te_smsprt_R6.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -902,7 +902,7 @@
//Get the operations
CSmsReplyAddressOperations& corruptReplyOperations = static_cast<CSmsReplyAddressOperations&>(smsMessage->GetOperationsForIEL(CSmsInformationElement::ESmsReplyAddressFormat));
//Check has reply address
- result=deliverMultipleReplyOperations.ContainsReplyAddressIEL();
+ result=corruptReplyOperations.ContainsReplyAddressIEL();
TEST(result==1);
//Get address
TRAP(err,replyAddressHBuf=corruptReplyOperations.GetReplyAddressL());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Test/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,132 @@
+// 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"
+// 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:
+// Toplevel build information for SMS prot - part of SmsStack
+// SMS protocol module for GSM
+//
+//
+
+/**
+ @file
+*/
+
+PRJ_TESTEXPORTS
+
+../TE_SMSEMSPRT/TE_SMSEMSPRT.script z:/testdata/scripts/te_smsemsprt.script
+../TE_SMSEMSPRT/TE_smsemsprt_setup.script z:/testdata/scripts/te_smsemsprt_setup.script
+../TE_SMSEMSPRT/te_smsemsprt_commdb.cfg z:/testdata/configs/te_smsemsprt_commdb.cfg
+
+../TE_SMSPRTSTRESS/te_smsprtstress.script z:/testdata/scripts/te_smsprtstress.script
+../TE_SMSPRTSTRESS/TE_smsprtstress_setup.script z:/testdata/scripts/te_smsprtstress_setup.script
+../TE_SMSPRTSTRESS/te_smsprtstress_commdb.cfg z:/testdata/configs/te_smsprtstress_commdb.cfg
+
+../TE_SMSCAPS/te_smscapsRead.script z:/testdata/scripts/te_smscapsread.script
+../TE_SMSCAPS/te_smscapsWrite.script z:/testdata/scripts/te_smscapswrite.script
+../TE_SMSCAPS/te_smscapsReadDevice.script z:/testdata/scripts/te_smscapsreaddevice.script
+../TE_SMSCAPS/te_smscapsWriteDevice.script z:/testdata/scripts/te_smscapswritedevice.script
+../TE_SMSCAPS/te_smscapsReadWrite.script z:/testdata/scripts/te_smscapsreadwrite.script
+../TE_SMSCAPS/te_smscapsWriteNetwork.script z:/testdata/scripts/te_smscapswritenetwork.script
+../TE_SMSCAPS/te_smscapsReadWriteNetwork.script z:/testdata/scripts/te_smscapsreadwritenetwork.script
+../TE_SMSCAPS/te_smscapsNoReadWriteNetwork.script z:/testdata/scripts/te_smscapsnoreadwritenetwork.script
+../TE_SMSCAPS/te_smscaps.script z:/testdata/scripts/te_smscaps.script
+
+../configfiles/t_sms_inter_auto.txt c:/sms/t_sms_inter_auto.txt
+../configfiles/t_sms_inter_ems.txt c:/sms/t_sms_inter_ems.txt
+../configfiles/t_sms_inter_auto_9210.txt c:/sms/t_sms_inter_auto_9210.txt
+../configfiles/t_sms_inter_auto_R520.txt c:/sms/t_sms_inter_auto_r520.txt
+../configfiles/t_sms_inter_auto_T65.txt c:/sms/t_sms_inter_auto_t65.txt
+../configfiles/t_sms_inter_auto_6210.txt c:/sms/t_sms_inter_auto_6210.txt
+../configfiles/TWAPSMS_9210.txt c:/sms/twapsms_9210.txt
+../configfiles/TWAPSMS_R520.txt c:/sms/twapsms_r520.txt
+../configfiles/TWAPSMS_T65.txt c:/sms/twapsms_t65.txt
+../configfiles/t_sms_inter_ems_9210.txt c:/sms/t_sms_inter_ems_9210.txt
+../configfiles/t_sms_inter_ems_R520.txt c:/sms/t_sms_inter_ems_r520.txt
+../configfiles/t_sms_inter_ems_T68.txt c:/sms/t_sms_inter_ems_t68.txt
+../configfiles/t_sms_inter_ems_6210.txt c:/sms/t_sms_inter_ems_6210.txt
+
+../../../test/configfiles/setupgsmsms.txt z:/sms/setupgsmsms.txt
+../../../test/configfiles/te_intersetupgsmsms.txt z:/sms/te_intersetupgsmsms.txt
+
+../configfiles/tsmsprtstress_config.txt z:/sms/tsmsprtstress_config.txt
+../configfiles/tsmsemsprt_config.txt z:/sms/tsmsemsprt_config.txt
+
+../configfiles/tsmscaps_config.txt z:/testdata/configs/tsmscaps_config.txt
+../TE_SMSCAPS/te_smscaps.cfg z:/testdata/configs/te_smscaps.cfg
+../TE_SMSCAPS/te_smscaps_setup.script z:/testdata/scripts/te_smscaps_setup.script
+
+//
+// TE_SMSINTER test files...
+//
+../TE_SMSINTER/TE_smsinter.script z:/testdata/scripts/te_smsinter.script
+
+//
+// TE_SMSSTOR test files...
+//
+../TE_SMSSTOR/te_smsstor.script z:/testdata/scripts/te_smsstor.script
+../TE_SMSSTOR/smsreastnopdu.dat z:/sms/smsreastnopdu.dat
+../TE_SMSSTOR/smsreastnostream.dat z:/sms/smsreastnostream.dat
+../TE_SMSSTOR/smsreastarraynoroot.dat z:/sms/smsreastarraynoroot.dat
+../TE_SMSSTOR/smsreastcountwrong.dat z:/sms/smsreastcountwrong.dat
+../TE_SMSSTOR/smsreastarraynoentries.dat z:/sms/smsreastarraynoentries.dat
+../TE_SMSSTOR/smswap.sms.esk z:/sms/smswap.sms-class0test.esk
+../TE_SMSSTOR/smswap.sms-maxnummessagetest.esk z:/sms/smswap.sms-maxnummessagetest.esk
+../TE_SMSSTOR/smswap.sms-0nummessagetest.esk z:/sms/smswap.sms-0nummessagetest.esk
+
+//
+// TE_SMSPRT test files...
+//
+../TE_Smsprt/TE_smsprt.script z:/testdata/scripts/te_smsprt.script
+../TE_Smsprt/TE_smsprt_setup.script z:/testdata/scripts/te_smsprt_setup.script
+../TE_Smsprt/tsmsprt_config.txt z:/sms/tsmsprt_config.txt
+../TE_Smsprt/tsmsprt_config_extra.txt z:/sms/tsmsprt_config_extra.txt
+../TE_Smsprt/tsmsprt_config_tx_rx_maxmsg.txt z:/sms/tsmsprt_config_tx_rx_maxmsg.txt
+../TE_Smsprt/TE_smsprt.cfg z:/testdata/configs/te_smsprt.cfg
+../TE_Smsprt/Te_smsprt_data.ini z:/testdata/configs/te_smsprt_data.ini
+../TE_Smsprt/Te_statusReportScheme.ini z:/testdata/configs/te_statusreportscheme.ini
+../TE_Smsprt/TE_DiskSpaceMonitor.ini z:/testdata/configs/te_diskspacemonitor.ini
+../TE_Smsprt/smswap.sms-sendTryTimeout.esk z:/sms/smswap.sms-sendtrytimeout.esk
+../TE_Smsprt/smswap.sms-bootTimerTimeout.esk z:/sms/smswap.sms-boottimertimeout.esk
+../TE_Smsprt/smswap.sms-AutomaticDeletionOfType0.esk z:/sms/smswap.sms-automaticdeletionoftype0.esk
+../TE_Smsprt/smswap.sms-AutoDeletionClass2.esk z:/sms/smswap.sms-autodeletionclass2.esk
+../TE_Smsprt/testsmswap.Sms.esk z:/sms/testsmswap.sms.esk
+
+//SMSOutOfDiskSpace
+../TE_Smsprt/Te_SMSStackOutOfDiskSpace.script z:/testdata/scripts/te_smsstackoutofdiskspace.script
+../TE_Smsprt/Te_SMSStackOutOfDiskSpace_ARM_UREL.script z:/testdata/scripts/te_smsstackoutofdiskspace_arm_urel.script
+../TE_Smsprt/TE_SetupSMSStackOutOfDiskSpace.script z:/testdata/scripts/te_setupsmsstackoutofdiskspace.script
+../TE_Smsprt/SMSOutOfDiskSpace.ini z:/testdata/configs/smsoutofdiskspace.ini
+../TE_Smsprt/SMSStackOutOfDiskSpace.txt z:/sms/smsstackoutofdiskspace.txt
+../TE_Smsprt/smsclass0preallocated.dat z:/testdata/configs/smsclass0preallocated.dat
+../TE_Smsprt/smsclass0reast.dat z:/testdata/configs/smsclass0reast.dat
+../TE_Smsprt/smswap_class0.sms.esk z:/testdata/configs/smswap_class0.sms.esk
+../TE_Smsprt/smswap_DontDiscardType0s.esk z:/testdata/configs/smswap_dontdiscardtype0s.esk
+../TE_Smsprt/smswap_discardType0s.esk z:/testdata/configs/smswap_discardtype0s.esk
+../TE_Smsprt/smswap_MaxFivePDUsInOOD.esk z:/testdata/configs/smswap_maxfivepdusinood.esk
+../TE_Smsprt/smswap_Class0DisabledMaxFivePDUsInOOD.esk z:/testdata/configs/smswap_class0disabledmaxfivepdusinood.esk
+
+//Class0RegressionTestSuite
+../TE_Smsprt/smswap.sms-sendTryTimeoutClass0.esk z:/sms/smswap.sms-sendtrytimeoutclass0.esk
+../TE_Smsprt/smswap.sms-bootTimerTimeoutClass0.esk z:/sms/smswap.sms-boottimertimeoutclass0.esk
+../TE_Smsprt/smswap.sms-AutoDeletionClass2EnableClass0Store.esk z:/sms/smswap.sms-autodeletionclass2enableclass0store.esk
+../TE_Smsprt/testsmswapClass0.Sms.esk z:/sms/testsmswapclass0.sms.esk
+../TE_Smsprt/smswap.sms-class0test_onepduseg.esk z:/sms/smswap.sms-class0test_onepduseg.esk
+../TE_Smsprt/TE_smsprtRegressionClass0StoreEnabled.script z:/testdata/scripts/te_smsprtregressionclass0storeenabled.script
+
+PRJ_TESTMMPFILES
+
+../TE_SMSINTER/TE_smsinter.mmp
+../TE_SMSSTOR/TE_smsstor.mmp
+../TE_SMSEMSPRT/TE_SMSEMSPRT.mmp
+../TE_SMSPRTSTRESS/TE_smsprtstress.mmp
+../TE_Smsprt/TE_smsprt.mmp
+../TE_SMSCAPS/te_smscaps.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Test/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/Test/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,190 @@
+#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]_ERRORTORPERROR_1=0x1
+[TRACE]TRACE_BORDER[0x84]_ERRORTOTPERROR_1=0x2
+[TRACE]TRACE_BORDER[0x84]_SMSPPANIC_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_ADDNEWMESSAGEL_1=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_1=0x5a
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_2=0x5b
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_1=0x53
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_2=0x54
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_3=0x55
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLOSE_1=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_COMMITTRANSACTIONL_1=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_1=0x56
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_2=0x57
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_3=0x58
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_NEWL_1=0x40
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_OPENSTOREL_1=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_1=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_2=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_PROCESSTIMEOUTMESSAGEL_1=0x50
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_1=0x41
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_2=0x42
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_3=0x43
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_4=0x44
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_5=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_6=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_REVERT_1=0x5d
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETDISKSPACESTATE_1=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1=0x51
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_2=0x52
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0STORECLOSEOBJECT_1=0x59
+[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_ENABLEGUARDTIMER_1=0x3e
+[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_NEWL_1=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_RUNL_1=0x3f
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ADDENTRYL_1=0x2a
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ADDNEWMESSAGEL_1=0x24
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_BEGINTRANSACTIONL_1=0x35
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_BEGINTRANSACTIONL_2=0x36
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CHANGEENTRYL_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CLEARENTRYL_1=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_COMMITTRANSACTIONL_1=0x37
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CONSTRUCTL_1=0x21
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CREATEL_1=0x23
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_DELETEENTRYL_1=0x2c
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_EXTERNALIZEENTRY1_1=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_EXTERNALIZEENTRY_1=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_GETOLDESTMESSAGEENTRYINDEX_1=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_1=0x30
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_2=0x31
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_3=0x32
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ISFILEOK_1=0x22
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_1=0x26
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_2=0x27
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_NEWL_1=0x20
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REINSTATEDELETEDENTRIES_1=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REINSTATEENTRIES_1=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEDELETEDENTRIES_1=0x39
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEPDUSL_1=0x33
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEPDUSL_2=0x34
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REVERT_1=0x38
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_SETPASSEDTOCLIENTL_1=0x29
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_UPDATEEXISTINGMESSAGEL_1=0x25
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_UPDATELOGSERVERIDL_1=0x28
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTOREUTILITY_POPULATEENTRY_1=0x5e
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTOREUTILITY_PRIVATEPATH_1=0x5f
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1=0x65
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_2=0x66
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_3=0x67
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1=0x63
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_DELETEMESSAGEL_1=0x68
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_1=0x70
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_2=0x71
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_3=0x72
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_GETMESSAGEL_1=0x6f
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_INITIALIZEL_1=0x60
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1=0x6d
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2=0x6e
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_NEWMESSAGEPDUL_1=0x6b
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_NUMBEROFCOMPLETEMESSAGES_1=0x64
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_PURGEL_1=0x61
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_PURGEL_2=0x62
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1=0x6a
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x6c
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_UPDATELOGSERVERIDOFMESSAGEL_1=0x69
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_ADDNEWMESSAGEL_1=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_1=0x16
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_2=0x17
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CHANGEENTRYL_1=0x10
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLEANUPENTRIESL_1=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLEANUPENTRIESWITHCOMPACTL_1=0x6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLOSE_1=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_1=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_2=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CONSTRUCTL_1=0x2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CREATEL_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_1=0x19
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_2=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_3=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYARRAYL_1=0x9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_1=0x11
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_2=0x12
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYARRAYL_1=0x8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_1=0x13
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_2=0x14
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_1=0xc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_2=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_NEWL_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_OPENL_1=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REINSTATEDELETEDENTRIES_1=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REMOVEDELETEDENTRIES_1=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REMOVEPDUSL_1=0x15
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REVERT_1=0x18
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_SETPASSEDTOCLIENTL_1=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_UPDATEEXISTINGMESSAGEL_1=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_UPDATELOGSERVERIDL_1=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_CONSTRUCTL_1=0x75
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_CREATEENTRYL_1=0x86
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x83
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_2=0x84
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_1=0x77
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_2=0x78
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_3=0x79
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_GETMESSAGEL_1=0x80
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x81
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x82
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1=0x7a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2=0x7b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_NEWL_1=0x74
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_NEWMESSAGEPDUL_1=0x7f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_OPENSTOREL_1=0x89
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_PASSEDTOCLIENT_1=0x87
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_POPULATEENTRY_1=0x85
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_SETPASSEDTOCLIENTL_1=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x7c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2=0x7d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3=0x7e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1=0x76
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDCOMMANDL_1=0x93
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCEL_1=0x94
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCEL_2=0x95
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_1=0x96
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_2=0x97
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_1=0x98
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_2=0x99
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_3=0x9a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_4=0x9b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_5=0x9c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_6=0x9d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_7=0x9e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_8=0x9f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_9=0xa0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSUBMITL_1=0x92
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_CONSTRUCTL_1=0x8b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_CTOR_1=0xac
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_1=0xa4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_2=0xa5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_1=0xa8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_2=0xa9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_GETMESSAGEL_1=0xa1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_1=0xb6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_2=0xb7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_1=0xa2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_2=0xa3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_1=0xa6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_2=0xa7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEWL_1=0x8a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_1=0x8f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_2=0x90
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_3=0x91
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_1=0x8c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_2=0x8d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_3=0x8e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_OPENSTOREL_1=0xb8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_POPULATEENTRY_1=0xaa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAYEXTERNALIZEL_1=0xb5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_COPYL_1=0xb2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_FIND_1=0xb1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INSERTL_1=0xb0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INTERNALIZEL_1=0xb4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_RESETALLSTATUS_1=0xb3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_STATUSARRAYCOMPLETE_1=0xab
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_COMPARE_1=0xad
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_EXTERNALIZEL_1=0xaf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_INTERNALIZEL_1=0xae
+[TRACE]TRACE_INTERNALS[0x88]_TRIMLEADINGZEROS_1=0x73
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsprot/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,700 @@
+#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]_ERRORTORPERROR_1=0x1
+[TRACE]TRACE_BORDER[0x84]_ERRORTOTPERROR_1=0x2
+[TRACE]TRACE_BORDER[0x84]_INSTALLSMS_1=0x4
+[TRACE]TRACE_BORDER[0x84]_SMSPPANIC_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_ADDNEWMESSAGEL_1=0xa7
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_1=0xb5
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_BEGINTRANSACTIONLC_2=0xb6
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_1=0xae
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_2=0xaf
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLEANREASSEMBLYENTRIES_3=0xb0
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_CLOSE_1=0xa3
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_COMMITTRANSACTIONL_1=0xb7
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_1=0xb1
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_2=0xb2
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_GETSMSENTRIESL_3=0xb3
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_NEWL_1=0x9b
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_OPENSTOREL_1=0xa2
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_1=0xa4
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_POPULATEENTRYARRAYL_2=0xa5
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_PROCESSTIMEOUTMESSAGEL_1=0xab
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_1=0x9c
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_2=0x9d
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_3=0x9e
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_4=0x9f
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_5=0xa0
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_READCONFIGURABLECLASS0SMSSETTINGSL_6=0xa1
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_REVERT_1=0xb8
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETDISKSPACESTATE_1=0xa6
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1=0xac
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_2=0xad
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0xa8
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2=0xa9
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0SMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3=0xaa
+[TRACE]TRACE_INTERNALS[0x88]_CCLASS0STORECLOSEOBJECT_1=0xb4
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_1=0xff
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_2=0x100
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTONONCLASS0REASSEMBLYSTOREL_3=0x101
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1=0xec
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_CLOSE_1=0xe5
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_CONSTRUCTL_1=0xe3
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1=0xe9
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DELETEMESSAGEL_1=0xf1
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0ENUMERATEDSIMENTRIES_1=0xf5
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DELETENONCLASS0MESSAGEL_1=0xf6
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_DTOR_1=0xe2
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_1=0xfd
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDCLASS0SMSMESSAGESL_2=0xfe
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDMESSAGESL_1=0xea
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_1=0xfb
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_EXTERNALIZEENUMERATEDNONCLASS0SMSMESSAGESL_2=0xfc
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_FORWARDCOMPLETECLASS0SMSMESSAGESL_1=0xed
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_INITIALIZENONCLASS0STOREL_1=0xf4
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_INITL_1=0xe6
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ISFULL_1=0xe8
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_ISWAPSMS_1=0x103
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_NEWL_1=0xe1
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_NUMBEROFCOMPLETENONCLASS0MESSAGES_1=0xf8
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_OPENSTOREL_1=0xe4
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETECLASS0SMSMESSAGESL_1=0xfa
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETENONCLASS0SMSMESSAGESL_1=0xf9
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PROCESSCOMPLETESMSMESSAGESL_1=0xeb
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PROCESSMESSAGEIFEXCEEDLIMITATIONL_1=0xee
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_PURGEL_1=0xe7
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_SETDISKSPACESTATE_1=0xf0
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_SETINCOMPLETEMESSAGEFORWARDEDTOCLIENTL_1=0xef
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1=0xf3
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_SETNONCLASS0MESSAGEPASSEDTOCLIENTL_1=0xf7
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1=0xf2
+[TRACE]TRACE_INTERNALS[0x88]_CFACADESMSREASSEMBLYSTORE_UPDATELOGSERVERIDOFNONCLASS0MESSAGEL_1=0x102
+[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_ENABLEGUARDTIMER_1=0x99
+[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_NEWL_1=0x98
+[TRACE]TRACE_INTERNALS[0x88]_CGUARDTIMER_RUNL_1=0x9a
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ADDENTRYL_1=0x85
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ADDNEWMESSAGEL_1=0x7f
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_BEGINTRANSACTIONL_1=0x90
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_BEGINTRANSACTIONL_2=0x91
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CHANGEENTRYL_1=0x86
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CLEARENTRYL_1=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_COMMITTRANSACTIONL_1=0x92
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CONSTRUCTL_1=0x7c
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_CREATEL_1=0x7e
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_DELETEENTRYL_1=0x87
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_EXTERNALIZEENTRY1_1=0x8a
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_EXTERNALIZEENTRY_1=0x89
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_GETOLDESTMESSAGEENTRYINDEX_1=0x97
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_1=0x8b
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_2=0x8c
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_INTERNALIZEENTRYL_3=0x8d
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_ISFILEOK_1=0x7d
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_1=0x81
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_MATCHENTRYTOEXISTINGMESSAGE_2=0x82
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_NEWL_1=0x7b
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REINSTATEDELETEDENTRIES_1=0x95
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REINSTATEENTRIES_1=0x96
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEDELETEDENTRIES_1=0x94
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEPDUSL_1=0x8e
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REMOVEPDUSL_2=0x8f
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_REVERT_1=0x93
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_SETPASSEDTOCLIENTL_1=0x84
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_UPDATEEXISTINGMESSAGEL_1=0x80
+[TRACE]TRACE_INTERNALS[0x88]_CPREALLOCATEDFILE_UPDATELOGSERVERIDL_1=0x83
+[TRACE]TRACE_INTERNALS[0x88]_CQUEUEDPDUDELETE_CONSTRUCTL_1=0x158
+[TRACE]TRACE_INTERNALS[0x88]_CQUEUEDPDUDELETE_NEWL_1=0x157
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTOREUTILITY_POPULATEENTRY_1=0x197
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTOREUTILITY_PRIVATEPATH_1=0x198
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_1=0x19e
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_2=0x19f
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_ADDSEGMENTTOREASSEMBLYSTOREL_3=0x1a0
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_DELETEENUMERATEDSIMENTRIES_1=0x19c
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_DELETEMESSAGEL_1=0x1a1
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_1=0x1a9
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_2=0x1aa
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_FINDMESSAGEL_3=0x1ab
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_GETMESSAGEL_1=0x1a8
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_INITIALIZEL_1=0x199
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1=0x1a6
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2=0x1a7
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_NEWMESSAGEPDUL_1=0x1a4
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_NUMBEROFCOMPLETEMESSAGES_1=0x19d
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_PURGEL_1=0x19a
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_PURGEL_2=0x19b
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_SETMESSAGEPASSEDTOCLIENTL_1=0x1a3
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x1a5
+[TRACE]TRACE_INTERNALS[0x88]_CREASSEMBLYSTORE_UPDATELOGSERVERIDOFMESSAGEL_1=0x1a2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_COMPLETE_1=0x26f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_CONSTRUCTL_1=0x25c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_CREATELOGSERVEREVENT_1=0x26a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DECODESUBMITREPORTL_1=0x263
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DECODESUBMITREPORTL_2=0x264
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOCANCEL_1=0x262
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DORUNL_1=0x25e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DORUNL_2=0x25f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DORUNL_3=0x260
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DORUNL_4=0x261
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOSEGMENTMESSAGEL_1=0x267
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOSEGMENTMESSAGEL_2=0x268
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOSEGMENTMESSAGEL_3=0x269
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_DOUPDATESEGMENTATIONSTOREL_1=0x26d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_ISRPERROR_1=0x265
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_NEWL_1=0x25b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_SEGMENTMESSAGE_1=0x266
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_SENDNEXTPDU_1=0x26b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_SENDNEXTPDU_2=0x26c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_START_1=0x25d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGESEND_UPDATELOGSERVEREVENT_1=0x26e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_COMPLETE_1=0xe0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_CONSTRUCTL_1=0xdd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_CTOR_1=0xdc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DOCANCEL_1=0xdb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DORUNL_1=0xd8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DORUNL_2=0xd9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DORUNL_3=0xda
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_DTOR_1=0xd6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_NEWL_1=0xd5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_SEGMENTMESSAGEL_1=0xde
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_START_1=0xd7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEWRITE_WRITENEXTSLOT_1=0xdf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_COMPLETE_1=0x11a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_CONSTRUCTL_1=0x115
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_DOCANCEL_1=0x119
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_DORUNL_1=0x118
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_MODEMSTATE_1=0x116
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_NEWL_1=0x114
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMODEMNOTIFICATION_START_1=0x117
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CHECKDISKSPACEFORPDUL_1=0x122
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CONSTRUCTL_1=0x11c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CONSTRUCTL_2=0x11d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CONSTRUCTL_3=0x11e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_CONSTRUCTL_4=0x11f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_DOCANCEL_1=0x121
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_GETFREEDISKSPACE_1=0x125
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_GETFREEDISKSPACE_2=0x126
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_NEWL_1=0x11b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_NOTIFYDISKSPACE_1=0x123
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_RESUMESMSRECEPTION_1=0x124
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMONITORDISKSPACE_RUNL_1=0x120
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPARAMSBASE_CONSTRUCTL_1=0x127
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPCOMMDBEVENT_COMPLETE_1=0x5b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPCOMMDBEVENT_CONSTRUCTL_1=0x59
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPCOMMDBEVENT_NOTIFYONEVENT_1=0x5a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_CANCELOBSERVER_1=0x161
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_COMPLETEFIRST_1=0x15f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_COMPLETEOBSERVER_1=0x165
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_COMPLETEREQUEST_1=0x160
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_CONSTRUCTL_1=0x164
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_CTOR_1=0x15d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_DOCANCEL_1=0x15e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_DOQUEUEL_1=0x15c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_DORUNL_1=0x15a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_NEWL_1=0x162
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_QUEUE_1=0x15b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_RUNL_1=0x159
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDELETEQUEUE_START_1=0x163
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_COMPLETE_1=0xc0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_CONSTRUCTL_1=0xba
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_DELETEPDU_1=0xbe
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_DOCANCEL_1=0xbf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_DORUNL_1=0xbc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_NEWL_1=0xb9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_OPENSTORE_1=0xbd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUDELETE_START_1=0xbb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ADDSEGMENTOFMESSAGETOREASSEMBLYSTOREIFREQUIREDL_1=0x14c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ADDSLOTTOSMSMESSAGEIFREQUIREDL_1=0x14b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_1=0x13c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_10=0x145
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_11=0x146
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_12=0x147
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_13=0x148
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_2=0x13d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_3=0x13e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_4=0x13f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_5=0x140
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_6=0x141
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_7=0x142
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_8=0x143
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_9=0x144
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_CONSTRUCTL_1=0x138
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_1=0x139
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_2=0x13a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_3=0x13b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_DELETEPDUL_1=0x14f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_FINDORIGINALMESSAGEANDPROCESSSTATUSREPORTL_1=0x149
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_NEWL_1=0x137
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_PROCESSMESSAGEIFCOMPLETEL_1=0x14e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_UPDATELOGSERVERIDL_1=0x14d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUPROCESSOR_UPDATESTATUSREPORTL_1=0x14a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_ADDLOGEVENT_1=0x191
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_CHANGELOGEVENT_1=0x193
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_CHANGEORADDLOGEVENT_1=0x190
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_COMPLETE_1=0x196
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_CONSTRUCTL_1=0x18f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_DOCANCEL_1=0x195
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_DORUNL_1=0x194
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_GETLOGEVENT_1=0x192
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREADLOGGER_NEWL_1=0x18e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_ADDLOGEVENT_1=0x17e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_COMPLETE_1=0x186
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_CONSTRUCTL_1=0x173
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOCANCEL_1=0x17d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOENCODEDELIVERREPORTL_1=0x17f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOENCODEDELIVERREPORTL_2=0x180
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOENCODEDELIVERREPORTL_3=0x181
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DOENCODEDELIVERREPORTL_4=0x182
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DORUNL_1=0x177
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DORUNL_2=0x178
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DORUNL_3=0x179
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_DORUNL_4=0x17a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_GETERRORCODESTATUS_1=0x188
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_ISSUPPORTED_1=0x18b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_MAKESTATETRANSITIONBASEDONERRORCODE_1=0x18c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_MAKESTATETRANSITIONBASEDONERRORCODE_2=0x18d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_MAPRPERRORTOINDEX_1=0x189
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_NEWL_1=0x172
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_PROCESSPDUL_1=0x175
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_PROCESSPDUL_2=0x176
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_READCONFIGURABLESMSSETTINGSL_1=0x18a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_RECEIVE_1=0x17c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_RESUMESMSRECEPTION_1=0x17b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_SENDDELIVERREPORT_1=0x183
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_SENDDELIVERREPORT_2=0x184
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_SENDDELIVERREPORT_3=0x185
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_SETERRORCODESTATUS_1=0x187
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDUREAD_START_1=0x174
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_ADDNEWMESSAGEL_1=0x65
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_1=0x71
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_BEGINTRANSACTIONL_2=0x72
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CHANGEENTRYL_1=0x6b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLEANUPENTRIESL_1=0x62
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLEANUPENTRIESWITHCOMPACTL_1=0x61
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CLOSE_1=0x60
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_1=0x77
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_COMMITTRANSACTIONL_2=0x78
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CONSTRUCTL_1=0x5d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_CREATEL_1=0x5e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_1=0x74
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_2=0x75
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_DOCOMMITANDCOMPACTL_3=0x76
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYARRAYL_1=0x64
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_1=0x6c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_EXTERNALIZEENTRYL_2=0x6d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYARRAYL_1=0x63
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_1=0x6e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_INTERNALIZEENTRYL_2=0x6f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_1=0x67
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_MATCHENTRYTOEXISTINGMESSAGE_2=0x68
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_NEWL_1=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_OPENL_1=0x5f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REINSTATEDELETEDENTRIES_1=0x7a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REMOVEDELETEDENTRIES_1=0x79
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REMOVEPDUSL_1=0x70
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_REVERT_1=0x73
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_SETPASSEDTOCLIENTL_1=0x6a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_UPDATEEXISTINGMESSAGEL_1=0x66
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPERMANENTFILESTORE_UPDATELOGSERVERIDL_1=0x69
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_COMPLETE_1=0xd4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_CONSTRUCTL_1=0xd3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_DOCANCEL_1=0xd2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_DORUNL_1=0xd1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_NEWL_1=0xcf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEENUMERATION_START_1=0xd0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_1=0x110
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_2=0x111
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_3=0x112
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_AFTERPHONEINITIALIZE_4=0x113
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_COMPLETE_1=0x10f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DOCANCEL_1=0x10e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_1=0x105
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_2=0x106
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_3=0x107
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_4=0x108
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_5=0x109
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_6=0x10a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_7=0x10b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_8=0x10c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_DORUNL_9=0x10d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPHONEINITIALIZATION_START_1=0x104
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_CANCELOBSERVER_1=0x156
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_COMPLETEFIRST_1=0x154
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_COMPLETEREQUEST_1=0x155
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_DOCANCEL_1=0x153
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_DOQUEUEL_1=0x152
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_DORUNL_1=0x150
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPMESSAGEQUEUE_QUEUE_1=0x151
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_CONSTRUCTL_1=0x1ad
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_DOCANCEL_1=0x1b1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_DORUNL_1=0x1b3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_DORUNL_2=0x1b4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_GETCOMMDBRECEIVEMODEL_1=0x1b2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_NEWL_1=0x1ac
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_NOTIFYONEVENT_1=0x1af
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_SELECTRECEIVEMODE1_1=0x1b6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_SELECTRECEIVEMODE_1=0x1b5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_SETRECEIVEMODE_1=0x1b0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPRECEIVEMODE_START_1=0x1ae
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLBOOTTIMER_NEWL_1=0x21d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLBOOTTIMER_RUNL_1=0x21f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLBOOTTIMER_START_1=0x21e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_INSTALL_1=0x1b8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_NEWL_1=0x1b7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_NEWPROTOCOLL_1=0x1ba
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_PROTOCOLLIST_1=0x1bb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_PROTOCOLLIST_2=0x1bc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOLFAMILY_REMOVE_1=0x1b9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ADDSMSMESSAGEOBSERVERL_1=0x1d2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ALLOCATELOCALADDRESS_1=0x219
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_BINDL_1=0x1c8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_BINDSMSMESSAGEOBSERVER_1=0x1d3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_BINDSMSMESSAGEOBSERVER_2=0x1d4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_BINDTOL_1=0x1c9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELDELETESMSMESSAGE_1=0x1de
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELENUMERATEPHONE_1=0x1da
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELREADSMSPARAMS_1=0x1e0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELSENDSMSMESSAGE_1=0x1d8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELWRITESMSMESSAGE_1=0x1dc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CANCELWRITESMSPARAMS_1=0x1e2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CHECKPOWEREDUP_1=0x1d7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CLOSENOWWRAP_1=0x216
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_CLOSENOW_1=0x1f0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETEPDUS_1=0x1e5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETEPDUS_2=0x1e6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSFROMREASTOREL_1=0x1ff
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSFROMREASTOREL_2=0x200
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSFROMREASTOREL_3=0x201
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSFROMREASTOREL_4=0x202
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DELETESMSMESSAGE_1=0x1dd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DISKSPACEMONITORSTATECHANGE_1=0x1ea
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_1=0x208
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_2=0x209
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_3=0x20a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_4=0x20b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_5=0x20c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_6=0x20d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_7=0x20e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_8=0x20f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_DOPOWERUPL_9=0x210
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ENUMERATEPHONE_1=0x1d9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ERROR_1=0x1d1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_GETOPTION_1=0x1cf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_HANDLEBACKUPORRESTORECOMPLETEL_1=0x218
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_HANDLEBACKUPORRESTORESTARTINGL_1=0x217
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_IDENTIFY_1=0x1c4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_INITL_1=0x1bf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_INITL_2=0x1c0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_INITL_3=0x1c1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_INITL_4=0x1c2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ISAPPPORTSMS_1=0x21a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ISMATCH_1=0x1f7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ISMATCH_2=0x1f8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MATCHAPPLICATIONPORT_1=0x1f9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MATCHINFORMATIONELEMENT_1=0x1fa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MATCHSMSADDRESSTOOBSERVER_1=0x1f6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MATCHSMSMESSAGETOOBSERVER_1=0x1f5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_1=0x1fc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_2=0x1fd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGEREADEDSUCCESSFULLY_3=0x1fe
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGESENDCOMPLETED_1=0x1eb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGESENDCOMPLETED_2=0x1ec
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGESENDCOMPLETED_3=0x1ed
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MESSAGESENDCOMPLETED_4=0x1ee
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_1=0x1e7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_2=0x1e8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_MODEMNOTIFICATIONCOMPLETED_3=0x1e9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NETWORKINFOAVAILABLE_1=0x21c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NETWORKINFO_1=0x21b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWHOSTRESOLVERL_1=0x1c5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWL_1=0x1bd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWNETDATABASEL_1=0x1c7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWSAPL_1=0x1be
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NEWSERVICERESOLVERL_1=0x1c6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_1=0x203
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_2=0x204
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_NOTIFYMESSAGEOBSERVERS_3=0x205
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_OBSERVERINDEX_1=0x1f1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_ORDERSMSMESSAGEOBSERVER_1=0x1f4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PHONEENUMERATIONCOMPLETED_1=0x1ef
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_1=0x211
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_2=0x212
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_3=0x213
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_4=0x214
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERDOWN_5=0x215
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERUP_1=0x206
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_POWERUP_2=0x207
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PROCESSCOMPLETESMSMESSAGESL_1=0x1fb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PROCESSMESSAGEL_1=0x1e3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PROCESSMESSAGEL_2=0x1e4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_PROCESS_1=0x1ce
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_READCONFIGURABLESETTINGSL_1=0x1ca
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_READCONFIGURABLESETTINGSL_2=0x1cb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_READCONFIGURABLESETTINGSL_3=0x1cc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_READSMSPARAMETERS_1=0x1df
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_REMOVESMSMESSAGEOBSERVER_1=0x1d5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_SENDSMSMESSAGE_1=0x1d6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_SEND_1=0x1cd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_SETOPTION_1=0x1d0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_SMSADDRISALREADYUSED_1=0x1f2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_STARTL_1=0x1c3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_WRITESMSMESSAGE_1=0x1db
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROTOCOL_WRITESMSPARAMETERS_1=0x1e1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_ACTIVEOPEN1_1=0x238
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_ACTIVEOPEN_1=0x237
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_AUTOBIND_1=0x23f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CANCELIOCTL_1=0x231
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CANCELIOCTL_2=0x232
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CLIENTCONFIRMSMESSAGE_1=0x245
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CONSTRUCTL_1=0x222
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_CONSTRUCTL_2=0x223
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_ENUMERATEPHONECOMPLETED_1=0x247
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEENUMERATEDMESSAGESL_1=0x24e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEENUMERATEDMESSAGESL_2=0x24f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEMESSAGEL_1=0x250
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEMESSAGEL_2=0x251
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEPARAMETERSL_1=0x254
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_EXTERNALIZEPARAMETERSL_2=0x255
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_GETDATA_1=0x236
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_GETLOCALADDRESS_1=0x240
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_GETOPTION_1=0x229
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEMESSAGEL1_1=0x258
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEMESSAGEL1_2=0x259
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEMESSAGEL_1=0x252
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEMESSAGEL_2=0x253
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEPARAMETERSL_1=0x256
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_INTERNALIZEPARAMETERSL_2=0x257
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_1=0x22a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_3=0x22b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_4=0x22c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_5=0x22d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_6=0x22e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_7=0x22f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_IOCTL_8=0x230
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_LOCALNAME_1=0x225
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MESSAGEDELETECOMPLETED_1=0x24b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MESSAGERECEIVED_1=0x244
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MESSAGESENDCOMPLETED_1=0x243
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MESSAGEWRITECOMPLETED_1=0x248
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_MODEMNOTIFICATIONCOMPLETED_1=0x242
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_NEWL_1=0x220
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_NEWL_2=0x221
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_PASSIVEOPEN1_1=0x23a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_PASSIVEOPEN_1=0x239
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_POPULATEBUFFERWITHPDUSLOTSL_1=0x249
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_POPULATEBUFFERWITHPDUSLOTSL_2=0x24a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_READSMSPARAMSCOMPLETED_1=0x24c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_REMNAME_1=0x227
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SECURITYCHECK_1=0x25a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SETLOCALADDRESS_1=0x241
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SETLOCALNAME_1=0x226
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SETOPTION_1=0x233
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SETREMNAME_1=0x228
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SHUTDOWN1_1=0x23e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SHUTDOWN_1=0x23b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SHUTDOWN_2=0x23c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SHUTDOWN_3=0x23d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_SMSADDRISDUPLICATE_1=0x246
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_START_1=0x224
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_WRITESMSPARAMSCOMPLETED_1=0x24d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_WRITE_1=0x234
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPROVIDER_WRITE_2=0x235
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_CANCELREQUESTIFOBSERVED_1=0x169
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_COMPLETEOBSERVER_1=0x16a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_COMPLETE_1=0x16b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_CONSTRUCTL_1=0x168
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_NEWL_1=0x166
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSENDQUEUE_START_1=0x167
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_CONSTRUCTL_1=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DOCANCEL_1=0x54
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_1=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_2=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_3=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_4=0x50
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_5=0x51
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_6=0x52
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_DORUNL_7=0x53
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_GETSMSBEARERL_1=0x55
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_GETSMSBEARERL_2=0x56
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NEWL_1=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NOTIFYBEARERSET_1=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NOTIFYBEARERSET_2=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NOTIFYBEARERSET_3=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_NOTIFYONEVENT_1=0x58
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_SETSMSBEARER_1=0x57
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_START_1=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_START_2=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPSETBEARER_START_3=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_CANCELREQUESTIFOBSERVED_1=0x16f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_COMPLETEOBSERVER_1=0x170
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_COMPLETE_1=0x171
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_CONSTRUCTL_1=0x16e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_NEWL_1=0x16c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPWRITEQUEUE_START_1=0x16d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_CHECKLISTVALIDITYL_1=0x12e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_COMPLETE_1=0x130
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_CONSTRUCTL_1=0x12d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_DOCANCEL_1=0x12c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_DORUNL_1=0x12b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_NEWL_1=0x128
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_START1_1=0x12a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_START_1=0x129
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREADPARAMS_STOREPARAMETERS_1=0x12f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_CONSTRUCTL_1=0x272
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_CREATEENTRYL_1=0x283
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x280
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_EXTERNALIZEENTRYL_2=0x281
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_1=0x274
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_2=0x275
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_FINDMESSAGEL_3=0x276
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_GETMESSAGEL_1=0x27d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x27e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x27f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_1=0x277
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_MATCHPDUTOEXISTINGMESSAGE_2=0x278
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_NEWL_1=0x271
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_NEWMESSAGEPDUL_1=0x27c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_OPENSTOREL_1=0x286
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_PASSEDTOCLIENT_1=0x284
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_POPULATEENTRY_1=0x282
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_SETPASSEDTOCLIENTL_1=0x285
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_1=0x279
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_2=0x27a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATEEXISTINGMESSAGEL_3=0x27b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREASSEMBLYSTORE_UPDATELOGSERVERIDL_1=0x273
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDCOMMANDL_1=0x290
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCEL_1=0x291
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCEL_2=0x292
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_1=0x293
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDREFERENCESTATUSPAIRL_2=0x294
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_1=0x295
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_2=0x296
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_3=0x297
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_4=0x298
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_5=0x299
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_6=0x29a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_7=0x29b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_8=0x29c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSTATUSREPORTL_9=0x29d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_ADDSUBMITL_1=0x28f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_CONSTRUCTL_1=0x288
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_CTOR_1=0x2a9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_1=0x2a1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZECONCATENATIONREFERENCESL_2=0x2a2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_1=0x2a5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_EXTERNALIZEENTRYL_2=0x2a6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_GETMESSAGEL_1=0x29e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_1=0x2b3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_HASENTRYWITHLOGIDL_2=0x2b4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_1=0x29f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZECONCATENATIONREFERENCESL_2=0x2a0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_1=0x2a3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_INTERNALIZEENTRYL_2=0x2a4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEWL_1=0x287
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_1=0x28c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_2=0x28d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT16BITREFERENCEL_3=0x28e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_1=0x289
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_2=0x28a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_NEXT8BITREFERENCEL_3=0x28b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_OPENSTOREL_1=0x2b5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_POPULATEENTRY_1=0x2a7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAYEXTERNALIZEL_1=0x2b2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_COPYL_1=0x2af
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_FIND_1=0x2ae
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INSERTL_1=0x2ad
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_INTERNALIZEL_1=0x2b1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_RSMSSEGMENTATIONSTOREREFSTATUSARRAY_RESETALLSTATUS_1=0x2b0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_STATUSARRAYCOMPLETE_1=0x2a8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_COMPARE_1=0x2aa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_EXTERNALIZEL_1=0x2ac
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSEGMENTATIONSTORE_TSMSSEGMENTATIONSTOREREFSTATUS_INTERNALIZEL_1=0x2ab
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_COMPLETE_1=0xce
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_CONSTRUCTL_1=0xc2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_DOCANCEL_1=0xcd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_DORUNL_1=0xc9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_NEWL_1=0xc1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_PROCESSPDUL_1=0xcb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_PROCESSPDUL_2=0xcc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_1=0xc3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_2=0xc4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_3=0xc5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_4=0xc6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READCONFIGURABLESMSSETTINGSL_5=0xc7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_READNEXTSLOTL_1=0xca
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTOREREAD_START_1=0xc8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_COMPLETE_1=0x136
+[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_CONSTRUCTL_1=0x135
+[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_DOCANCEL_1=0x134
+[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_DORUNL_1=0x133
+[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_NEWL_1=0x131
+[TRACE]TRACE_INTERNALS[0x88]_CSMSWRITEPARAMS_START_1=0x132
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFHEXBUF_1=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_1=0x24
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_10=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_2=0x25
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_3=0x26
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_4=0x27
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_5=0x28
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_6=0x29
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x2a
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x2c
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_10=0xa
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_11=0xb
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_12=0xc
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_13=0xd
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_14=0xe
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_15=0xf
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_16=0x10
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_17=0x11
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_18=0x12
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_19=0x13
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_2=0x2
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_20=0x14
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_21=0x15
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_22=0x16
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_23=0x17
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_24=0x18
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_25=0x19
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_26=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_3=0x3
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_4=0x4
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_5=0x5
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_6=0x6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_7=0x7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_8=0x8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_9=0x9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x38
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x41
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x42
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_12=0x43
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_13=0x44
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_2=0x39
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_3=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_4=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_5=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_6=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_7=0x3e
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_8=0x3f
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_9=0x40
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_1=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_10=0x37
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_2=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_3=0x30
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_4=0x31
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_5=0x32
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_6=0x33
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_7=0x34
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_8=0x35
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_9=0x36
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_1=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_2=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_3=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_4=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_5=0x20
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_6=0x21
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_7=0x22
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_8=0x23
+[TRACE]TRACE_INTERNALS[0x88]_TKEYSMSOBSERVER_COMPARE_1=0x1f3
+[TRACE]TRACE_INTERNALS[0x88]_TRIMLEADINGZEROS_1=0x270
--- a/smsprotocols/smsstack/smsu/group/bld.inf Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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"
--- a/smsprotocols/smsstack/smsu/group/smsu.mmp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/group/smsu.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -46,10 +46,10 @@
USERINCLUDE ../inc
USERINCLUDE ../../common/inc
USERINCLUDE ../../gsmu/inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib estor.lib esock.lib gsmu.lib logwrap.lib bafl.lib
-DEBUGLIBRARY comsdbgutil.lib
//#if defined(WINS)
// libraries needed by CCover
--- a/smsprotocols/smsstack/smsu/src/SmsuAddr.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/SmsuAddr.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +19,14 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "SmsuAddrTraces.h"
+#endif
+
#include "smsumain.h"
#include "smsuaddr.H"
-#include "smsstacklog.h"
/**
@@ -42,7 +47,7 @@
*/
EXPORT_C TSmsAddrFamily TSmsAddr::SmsAddrFamily() const
{
- LOGSMSU1("TSmsAddr::SmsAddrFamily()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SMSADDRFAMILY_1, "TSmsAddr::SmsAddrFamily()");
return static_cast<TSmsAddrFamily>(Family());
} // TSmsAddr::SmsAddrFamily
@@ -56,7 +61,7 @@
*/
EXPORT_C void TSmsAddr::SetSmsAddrFamily(TSmsAddrFamily aFamily)
{
- LOGSMSU1("TSmsAddr::SetSmsAddrFamily()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SETSMSADDRFAMILY_1, "TSmsAddr::SetSmsAddrFamily()");
SetFamily(static_cast<TUint>(aFamily));
} // TSmsAddr::SetSmsAddrFamily
@@ -70,7 +75,7 @@
*/
EXPORT_C TInt TSmsAddr::IdentifierMatch() const
{
- LOGSMSU1("TSmsAddr::IdentifierMatch()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_IDENTIFIERMATCH_1, "TSmsAddr::IdentifierMatch()");
__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchIEI,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
return (TInt) Port();
@@ -85,7 +90,7 @@
*/
EXPORT_C void TSmsAddr::SetIdentifierMatch(TInt aIdentifier)
{
- LOGSMSU1("TSmsAddr::SetIdentifierMatch()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SETIDENTIFIERMATCH_1, "TSmsAddr::SetIdentifierMatch()");
__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchIEI,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
SetPort((TUint) aIdentifier);
@@ -100,7 +105,7 @@
*/
EXPORT_C TPtrC8 TSmsAddr::TextMatch() const
{
- LOGSMSU1("TSmsAddr::TextMatch()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_TEXTMATCH_1, "TSmsAddr::TextMatch()");
__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchText,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
return TPtrC8(UserPtr(),const_cast<TSmsAddr*>(this)->GetUserLen());
@@ -115,7 +120,7 @@
*/
EXPORT_C void TSmsAddr::SetTextMatch(const TDesC8& aText)
{
- LOGSMSU1("TSmsAddr::SetTextMatch()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_SETTEXTMATCH_1, "TSmsAddr::SetTextMatch()");
__ASSERT_DEBUG(SmsAddrFamily()==ESmsAddrMatchText,SmsuPanic(ESmsuPanicWrongSmsAddressFamily));
TUint8* target = UserPtr();
@@ -134,7 +139,7 @@
*/
EXPORT_C TBool TSmsAddr::operator==(const TSmsAddr& aAddr) const
{
- LOGSMSU1("TSmsAddr::operator=()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TSMSADDR_OPERATOR_1, "TSmsAddr::operator=()");
TSmsAddrFamily family=aAddr.SmsAddrFamily();
TBool same=(SmsAddrFamily()==family);
--- a/smsprotocols/smsstack/smsu/src/smsuact.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsuact.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 Nokia Corporation and/or 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 "smsuactTraces.h"
+#endif
+
#include "smsuact.h"
#include "SmsuTimer.h"
#include "smsstacklog.h"
@@ -56,7 +62,7 @@
*/
EXPORT_C void CSmsuActiveBase::ConstructTimeoutL()
{
- LOGSMSU1("CSmsuActiveBase::ConstructTimeoutL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_CONSTRUCTTIMEOUTL_1, "CSmsuActiveBase::ConstructTimeoutL()");
iSmsuTimeout = CSmsuTimeout::NewL(*this);
} // CSmsuActiveBase::ConstructTimeoutL
@@ -70,8 +76,7 @@
*/
EXPORT_C void CSmsuActiveBase::TimedSetActive(const TTimeIntervalMicroSeconds32& aTimeIntervalMicroSeconds32)
{
- LOGSMSU2("CSmsuActiveBase::TimedSetActive(): aTimeIntervalMicroSeconds32=%d",
- aTimeIntervalMicroSeconds32.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_TIMEDSETACTIVE_1, "CSmsuActiveBase::TimedSetActive(): aTimeIntervalMicroSeconds32=%d",aTimeIntervalMicroSeconds32.Int());
__ASSERT_DEBUG(iSmsuTimeout != NULL, SmsuPanic(ESmsuTimeoutNull));
@@ -91,7 +96,7 @@
*/
EXPORT_C void CSmsuActiveBase::TimedSetActiveCancel()
{
- LOGSMSU1("CSmsuActiveBase::TimedSetActiveCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_TIMEDSETACTIVECANCEL_1, "CSmsuActiveBase::TimedSetActiveCancel()");
if (iSmsuTimeout != NULL)
{
@@ -107,7 +112,7 @@
*/
EXPORT_C TBool CSmsuActiveBase::TimedOut() const
{
- LOGSMSU1("CSmsuActiveBase::TimedOut()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_TIMEDOUT_1, "CSmsuActiveBase::TimedOut()");
if (iSmsuTimeout != NULL)
{
@@ -126,7 +131,7 @@
*/
EXPORT_C void CSmsuActiveBase::Queue(TRequestStatus& aStatus)
{
- LOGSMSU1("CSmsuActiveBase::Queue()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_QUEUE_1, "CSmsuActiveBase::Queue()");
__ASSERT_DEBUG(iReport==NULL, SmsuPanic(ESmsuAlreadyActive));
@@ -144,7 +149,7 @@
*/
EXPORT_C void CSmsuActiveBase::RunL()
{
- LOGSMSU1("CSmsuActiveBase::RunL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_RUNL_1, "CSmsuActiveBase::RunL()");
if (iSmsuTimeout != NULL)
{
@@ -174,7 +179,7 @@
*/
EXPORT_C void CSmsuActiveBase::Complete(TInt aStatus)
{
- LOGSMSU2("CSmsuActiveBase::Complete(): aStatus=%d", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_COMPLETE_1, "CSmsuActiveBase::Complete(): aStatus=%d", aStatus);
if (iReport)
{
@@ -196,7 +201,7 @@
*/
EXPORT_C TInt CSmsuActiveBase::RunError(TInt aError)
{
- LOGSMSU2("CSmsuActiveBase::RunError(): aError=%d", aError);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_RUNERROR_1, "CSmsuActiveBase::RunError(): aError=%d", aError);
__ASSERT_DEBUG(!IsActive(), User::Invariant());
@@ -217,8 +222,7 @@
{
// Ignore in code coverage - not used within the SMS stack.
BULLSEYE_OFF
- LOGSMSU3("CSmsuActiveBase::CompleteMyself(): aStatus=%d, aSetActive=%d",
- aStatus, aSetActive);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_COMPLETEMYSELF_1, "CSmsuActiveBase::CompleteMyself(): aStatus=%d, aSetActive=%d",aStatus, aSetActive);
// Initialise iStatus with a pending request...
iStatus = KRequestPending;
@@ -254,7 +258,7 @@
*/
EXPORT_C void CSmsuActiveBase::CompleteMyselfAfterTimeout(TInt aStatus)
{
- LOGSMSU2("CSmsuActiveBase::CompleteMyselfAfterTimeout(): aStatus=%d", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSUACTIVEBASE_COMPLETEMYSELFAFTERTIMEOUT_1, "CSmsuActiveBase::CompleteMyselfAfterTimeout(): aStatus=%d", aStatus);
__ASSERT_DEBUG(iSmsuTimeout != NULL, SmsuPanic(ESmsuTimeoutNull));
--- a/smsprotocols/smsstack/smsu/src/smsubackup.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsubackup.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 Nokia Corporation and/or 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,15 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsubackupTraces.h"
+#endif
+
#include <e32std.h>
#include "SmsuBackup.h"
#include <babackup.h>
-#include "smsstacklog.h"
const TInt KBURPartMask = 0x000000FF;
@@ -34,7 +39,7 @@
EXPORT_C CBackupAndRestore* CBackupAndRestore::NewL(MNBBackupAndRestoreObserver& aBackupAndRestoreObserver)
{
- LOGSMSU1("CBackupAndRestore::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CBACKUPANDRESTORE_NEWL_1, "CBackupAndRestore::NewL()");
CBackupAndRestore* me = new(ELeave) CBackupAndRestore(aBackupAndRestoreObserver);
CleanupStack::PushL(me);
@@ -53,7 +58,7 @@
void CBackupAndRestore::ConstructL()
{
- LOGSMSU1("CBackupAndRestore::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBACKUPANDRESTORE_CONSTRUCTL_1, "CBackupAndRestore::ConstructL()");
iBackupOrRestoreInProgress = EFalse;
User::LeaveIfError(iBackupProperty.Attach(KUidSystemCategory,KUidBackupRestoreKey));
@@ -72,7 +77,7 @@
void CBackupAndRestore::DoCancel()
{
- LOGSMSU1("CBackupAndRestore::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBACKUPANDRESTORE_DOCANCEL_1, "CBackupAndRestore::DoCancel()");
iBackupProperty.Cancel();
} // CBackupAndRestore::DoCancel
@@ -80,7 +85,7 @@
EXPORT_C TBool CBackupAndRestore::IsBackupOrRestoreInProgress()
{
- LOGSMSU1("CBackupAndRestore::IsBackupOrRestoreInProgress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CBACKUPANDRESTORE_ISBACKUPORRESTOREINPROGRESS_1, "CBackupAndRestore::IsBackupOrRestoreInProgress()");
return iBackupOrRestoreInProgress;
} // CBackupAndRestore::IsBackupOrRestoreInProgress
@@ -91,7 +96,7 @@
*/
void CBackupAndRestore::RunL()
{
- LOGSMSU1("CBackupAndRestore::RunL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBACKUPANDRESTORE_RUNL_1, "CBackupAndRestore::RunL()");
iBackupProperty.Subscribe(iStatus);
SetActive();
--- a/smsprotocols/smsstack/smsu/src/smsulog.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsulog.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,13 +19,18 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsulogTraces.h"
+#endif
+
#include "smsulog.h"
#include "smsumain.h"
#include "smsstacklog.h"
#include "gsmubuf.h"
#include "Gsmumsg.h"
#include "Gsmuelem.h"
-#include <logwrap.h>
#include <logwraplimits.h>
@@ -39,7 +44,7 @@
*/
EXPORT_C CSmsEventLogger* CSmsEventLogger::NewL(RFs& aFs,TInt aPriority)
{
- LOGSMSU1("CSmsEventLogger::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_NEWL_1, "CSmsEventLogger::NewL()");
CSmsEventLogger* smseventlogger = new(ELeave) CSmsEventLogger(aPriority);
CleanupStack::PushL(smseventlogger);
@@ -73,7 +78,7 @@
*/
EXPORT_C void CSmsEventLogger::AddEvent(TRequestStatus& aStatus,const CSmsMessage& aSmsMessage,const TLogSmsPduData& aData,TInt* aStatusId)
{
- LOGSMSU1("CSmsEventLogger::AddEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_ADDEVENT_1, "CSmsEventLogger::AddEvent");
__ASSERT_DEBUG(iState==ESmsEventLoggerIdle,SmsuPanic(KSmsuPanicUnexpectedState));
@@ -108,7 +113,7 @@
*/
EXPORT_C void CSmsEventLogger::GetEvent(TRequestStatus& aStatus,TLogId aId)
{
- LOGSMSU1("CSmsEventLogger::GetEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_GETEVENT_1, "CSmsEventLogger::GetEvent");
__ASSERT_DEBUG(iState==ESmsEventLoggerIdle,SmsuPanic(KSmsuPanicUnexpectedState));
iState=ESmsEventLoggerGettingEvent;
@@ -132,7 +137,7 @@
*/
EXPORT_C void CSmsEventLogger::ChangeEvent(TRequestStatus& aStatus,const CSmsMessage& aSmsMessage, const TTime* aTime, const TLogSmsPduData& aData, TInt* aStatusId)
{
- LOGSMSU1("CSmsEventLogger::ChangeEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_CHANGEEVENT_1, "CSmsEventLogger::ChangeEvent");
__ASSERT_DEBUG(iState==ESmsEventLoggerIdle,SmsuPanic(KSmsuPanicUnexpectedState));
__ASSERT_DEBUG(aSmsMessage.LogServerId()==iLogEvent->Id(),SmsuPanic(KSmsuPanicWrongLogServerId));
@@ -183,7 +188,7 @@
{
// Ignore in code coverage - not used within the SMS stack.
BULLSEYE_OFF
- LOGSMSU1("CSmsEventLogger::DeleteEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSMSEVENTLOGGER_DELETEEVENT_1, "CSmsEventLogger::DeleteEvent");
__ASSERT_DEBUG(iState==ESmsEventLoggerIdle,SmsuPanic(KSmsuPanicUnexpectedState));
@@ -203,7 +208,7 @@
// message would need to cancel these activities during event the
// logger request - too difficult to test. Need to add unit test.
BULLSEYE_OFF
- LOGSMSU3("CSmsEventLogger::DoCancel [iStatus=%d, iState=%d]", iStatus.Int(), iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOCANCEL_1, "CSmsEventLogger::DoCancel [iStatus=%d, iState=%d]", iStatus.Int(), iState);
switch( iState )
{
@@ -242,7 +247,7 @@
void CSmsEventLogger::ConstructL(RFs& aFs)
{
- LOGSMSU1("CSmsEventLogger::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_CONSTRUCTL_1, "CSmsEventLogger::ConstructL()");
iLogWrapper=CLogWrapper::NewL(aFs);
iLogEvent=CLogEvent::NewL();
@@ -251,7 +256,7 @@
void CSmsEventLogger::DoRunL()
{
- LOGSMSU2("CSmsEventLogger::DoRunL [iStatus=%d]", iStatus.Int() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DORUNL_1, "CSmsEventLogger::DoRunL [iStatus=%d]", iStatus.Int() );
switch (iState)
{
@@ -290,7 +295,7 @@
void CSmsEventLogger::DoAddEventL(const CSmsMessage& aSmsMessage,TInt* aStatusId)
{
- LOGSMSU2("CSmsEventLogger::DoAddEventL [statusID*=%d]", aStatusId);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_1, "CSmsEventLogger::DoAddEventL [statusID*=%d]", aStatusId);
// Reset event
CLogEvent* logevent=CLogEvent::NewL();
@@ -302,32 +307,32 @@
// Incoming SMS
case CSmsPDU::ESmsDeliver:
{
- LOGSMSU1("DoAddEventL ESmsDeliver");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_2, "DoAddEventL ESmsDeliver");
GetStringL(direction,R_LOG_DIR_IN);
break;
}
case CSmsPDU::ESmsStatusReport:
{
- LOGSMSU1("DoAddEventL ESmsStatusReport");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_3, "DoAddEventL ESmsStatusReport");
GetStringL(direction,R_LOG_DIR_IN);
break;
}
// Outgoing SMS
case CSmsPDU::ESmsSubmit:
{
- LOGSMSU1("DoAddEventL ESmsSubmit");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_4, "DoAddEventL ESmsSubmit");
GetStringL(direction,R_LOG_DIR_OUT);
break;
}
case CSmsPDU::ESmsCommand:
{
- LOGSMSU1("DoAddEventL ESmsCommand");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_5, "DoAddEventL ESmsCommand");
GetStringL(direction,R_LOG_DIR_OUT);
break;
}
default:
{
- LOGSMSU1("DoAddEventL ESmsuUnexpectedSmsPDUType");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOADDEVENTL_6, "DoAddEventL ESmsuUnexpectedSmsPDUType");
SmsuPanic(ESmsuUnexpectedSmsPDUType);
}
}
@@ -358,7 +363,7 @@
TBuf<KLogMaxStatusLength> status;
#ifdef _DEBUG
if (aStatusId!=NULL)
- LOGSMSU2("CSmsEventLogger::SetDataL StatusID = %d", *aStatusId);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_1, "CSmsEventLogger::SetDataL StatusID = %d", *aStatusId);
#endif
if (aStatusId==NULL)
{
@@ -370,12 +375,12 @@
{
if (iSmsPDUData.iTotal==iSmsPDUData.iReceived)
{
- LOGSMSU1("SetDataL ESmsDeliver R_LOG_DEL_DONE");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_2, "SetDataL ESmsDeliver R_LOG_DEL_DONE");
GetStringL(status,R_LOG_DEL_DONE);
}
else if (iSmsPDUData.iTotal>iSmsPDUData.iReceived)
{
- LOGSMSU1("SetDataL ESmsDeliver R_LOG_DEL_PENDING");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_3, "SetDataL ESmsDeliver R_LOG_DEL_PENDING");
GetStringL(status,R_LOG_DEL_PENDING);
}
break;
@@ -384,12 +389,12 @@
{
if (iSmsPDUData.iTotal==iSmsPDUData.iReceived)
{
- LOGSMSU1("SetDataL ESmsStatusReport R_LOG_DEL_DONE");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_4, "SetDataL ESmsStatusReport R_LOG_DEL_DONE");
GetStringL(status,R_LOG_DEL_DONE);
}
else if (iSmsPDUData.iTotal>iSmsPDUData.iReceived)
{
- LOGSMSU1("SetDataL ESmsStatusReport R_LOG_DEL_PENDING");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_5, "SetDataL ESmsStatusReport R_LOG_DEL_PENDING");
GetStringL(status,R_LOG_DEL_PENDING);
}
break;
@@ -415,63 +420,63 @@
{
// None sent yet
GetStringL(status,R_LOG_DEL_NOT_SENT);
- LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_NOT_SENT SR");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_6, "SetDataL ESmsSubmit R_LOG_DEL_NOT_SENT SR");
}
else if (iSmsPDUData.iTotal==iSmsPDUData.iDelivered)
{
// All have been delivered
- LOGSMSU2("SetDataL ESmsSubmit R_LOG_DEL_DONE SR iSmsPDUData.iDelivered=%d", iSmsPDUData.iDelivered);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_7, "SetDataL ESmsSubmit R_LOG_DEL_DONE SR iSmsPDUData.iDelivered=%d", iSmsPDUData.iDelivered);
GetStringL(status,R_LOG_DEL_DONE);
}
else if (iSmsPDUData.iSent<=iSmsPDUData.iTotal && iSmsPDUData.iFailed==0)
{
// One or more sent but not all, no failures
- LOGSMSU3("SetDataL ESmsSubmit R_LOG_DEL_PENDING SR iSmsPDUData.iSent==%d, iSmsPDUData.iTotal==%d, iFailed==0", iSmsPDUData.iSent, iSmsPDUData.iTotal);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_8, "SetDataL ESmsSubmit R_LOG_DEL_PENDING SR iSmsPDUData.iSent==%d, iSmsPDUData.iTotal==%d, iFailed==0", iSmsPDUData.iSent, iSmsPDUData.iTotal);
GetStringL(status,R_LOG_DEL_PENDING);
}
else
{
// One or more failures or corruption of iSmsPDUData values
- LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_FAILED SR");
- LOGSMSU3(" Total: %d, Sent: %d",iSmsPDUData.iTotal, iSmsPDUData.iSent );
- LOGSMSU3(" Failed: %d, Delivered: %d",iSmsPDUData.iFailed, iSmsPDUData.iDelivered );
- GetStringL(status,R_LOG_DEL_FAILED);
- }
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_9, "SetDataL ESmsSubmit R_LOG_DEL_FAILED SR");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_10, " Total: %d, Sent: %d",iSmsPDUData.iTotal, iSmsPDUData.iSent );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_11, " Failed: %d, Delivered: %d",iSmsPDUData.iFailed, iSmsPDUData.iDelivered );
+ GetStringL(status,R_LOG_DEL_FAILED);
+ }
if (aDischargeTime != NULL)
{
iLogEvent->SetTime(*aDischargeTime);
- }
- }
- else
- {
- if (iSmsPDUData.iSent<iSmsPDUData.iTotal)
- {
- // IF not all PDUs sent, state is "NOT SENT".
- LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_NOT_SENT NOSR");
- LOGSMSU3(" Total: %d, Sent: %d", iSmsPDUData.iTotal, iSmsPDUData.iSent );
- GetStringL(status,R_LOG_DEL_NOT_SENT);
- }
+ }
+ }
+ else
+ {
+ if (iSmsPDUData.iSent<iSmsPDUData.iTotal)
+ {
+ // IF not all PDUs sent, state is "NOT SENT".
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_12, "SetDataL ESmsSubmit R_LOG_DEL_NOT_SENT NOSR");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_13, " Total: %d, Sent: %d", iSmsPDUData.iTotal, iSmsPDUData.iSent );
+ GetStringL(status,R_LOG_DEL_NOT_SENT);
+ }
else if (iSmsPDUData.iTotal==iSmsPDUData.iSent)
{
// All sent
- LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_SENT NOSR");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_14, "SetDataL ESmsSubmit R_LOG_DEL_SENT NOSR");
GetStringL(status,R_LOG_DEL_SENT);
}
else
{
// The iSmsPDUData values have become corrupt
- LOGSMSU1("SetDataL ESmsSubmit R_LOG_DEL_FAILED NOSR");
- LOGSMSU3(" Total: %d, Sent: %d",iSmsPDUData.iTotal, iSmsPDUData.iSent );
- LOGSMSU3(" Failed: %d, Delivered: %d",iSmsPDUData.iFailed, iSmsPDUData.iDelivered );
- GetStringL(status,R_LOG_DEL_FAILED);
- }
- }
- LOGSMSU2("SetDataL [status string=%S]",&status);
- break;
- }
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_15, "SetDataL ESmsSubmit R_LOG_DEL_FAILED NOSR");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_16, " Total: %d, Sent: %d",iSmsPDUData.iTotal, iSmsPDUData.iSent );
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_17, " Failed: %d, Delivered: %d",iSmsPDUData.iFailed, iSmsPDUData.iDelivered );
+ GetStringL(status,R_LOG_DEL_FAILED);
+ }
+ }
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_18, "SetDataL [status string=%S]",status);
+ break;
+ }
default:
{
- LOGSMSU1("SetDataL ESmsuUnexpectedSmsPDUType");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_SETDATAL_19, "SetDataL ESmsuUnexpectedSmsPDUType");
SmsuPanic(ESmsuUnexpectedSmsPDUType);
}
}
@@ -508,7 +513,7 @@
void CSmsEventLogger::DoComplete(TInt& aStatus)
{
- LOGSMSU3("CSmsEventLogger::DoComplete(): aStatus=%d, iState=%d", aStatus, iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSEVENTLOGGER_DOCOMPLETE_1, "CSmsEventLogger::DoComplete(): aStatus=%d, iState=%d", aStatus, iState);
//
// Check the state is valid and finish up...
--- a/smsprotocols/smsstack/smsu/src/smsumain.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsumain.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsumainTraces.h"
+#endif
+
#include "smsumain.h"
#include "smsstacklog.h"
@@ -30,7 +36,7 @@
{
// Ignore in code coverage - panic method
BULLSEYE_OFF
- LOGSMSU2("SMSUPANIC %d", aPanic);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, SMSUPANIC_1, "SMSUPANIC %d", aPanic);
_LIT(KSmsuPanic, "SMSU");
User::Panic(KSmsuPanic,aPanic);
BULLSEYE_RESTORE
--- a/smsprotocols/smsstack/smsu/src/smsuset.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsuset.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -23,8 +23,11 @@
#include <s32strm.h>
+
#include "smsstacklog.h"
+
+
/**
* Constructor.
*
--- a/smsprotocols/smsstack/smsu/src/smsustrm.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsustrm.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsustrmTraces.h"
+#endif
+
#include "smsustrm.h"
#include "smsumain.h"
#include <es_sock.h>
@@ -48,7 +54,7 @@
//Panics if ERead==0
//
{
- LOGSMSU1("RSmsSocketBuf::UnderflowL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_UNDERFLOWL_1, "RSmsSocketBuf::UnderflowL()");
__ASSERT_ALWAYS(Avail(ERead)==0,SmsuPanic(KSsmuPanicStreamReadUnavailable));
SocketWriteL();
@@ -75,7 +81,7 @@
void RSmsSocketBuf::OverflowL()
//Panics if EWrite == 0
{
- LOGSMSU1("RSmsSocketBuf::OverflowL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_OVERFLOWL_1, "RSmsSocketBuf::OverflowL()");
__ASSERT_ALWAYS(Avail(EWrite)==0,SmsuPanic(KSsmuPanicStreamWriteUnavailable));
SetBuf(ERead,iBuffer,iBuffer);
@@ -90,7 +96,7 @@
*/
void RSmsSocketBuf::DoSynchL()
{
- LOGSMSU1("RSmsSocketBuf::DoSynchL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_DOSYNCHL_1, "RSmsSocketBuf::DoSynchL()");
SocketWriteL();
SetBuf(ERead|EWrite,iBuffer,iBuffer);
@@ -102,7 +108,7 @@
*/
void RSmsSocketBuf::SocketWriteL()
{
- LOGSMSU1("RSmsSocketBuf::SocketWriteL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RSMSSOCKETBUF_SOCKETWRITEL_1, "RSmsSocketBuf::SocketWriteL()");
TInt length=Lag(EWrite);
if (length==0)
@@ -125,7 +131,7 @@
:RReadStream(&iBuf),
iBuf(aSocket)
{
- LOGSMSU1("RSmsSocketReadStream::RSmsSocketReadStream()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, RSMSSOCKETREADSTREAM_CTOR_1, "RSmsSocketReadStream::RSmsSocketReadStream()");
} // RSmsSocketReadStream::RSmsSocketReadStream
@@ -140,7 +146,7 @@
:RWriteStream(&iBuf),
iBuf(aSocket)
{
- LOGSMSU1("RSmsSocketWriteStream::RSmsSocketWriteStream()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, RSMSSOCKETWRITESTREAM_CTOR_1, "RSmsSocketWriteStream::RSmsSocketWriteStream()");
} // RSmsSocketWriteStream::RSmsSocketWriteStream
--- a/smsprotocols/smsstack/smsu/src/smsutimer.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/smsu/src/smsutimer.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 Nokia Corporation and/or 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 "smsutimerTraces.h"
+#endif
+
#include "SmsuTimer.h"
#include <e32std.h>
@@ -33,7 +39,7 @@
*/
CSmsuTimeout* CSmsuTimeout::NewL(CSmsuActiveBase& aActive)
{
- LOGSMSU1("CSmsuTimeout::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_NEWL_1, "CSmsuTimeout::NewL()");
CSmsuTimeout* self = new(ELeave) CSmsuTimeout(aActive);
CleanupStack::PushL(self);
@@ -56,7 +62,7 @@
*/
void CSmsuTimeout::Start(const TTimeIntervalMicroSeconds32& aTimeIntervalMicroSeconds32)
{
- LOGSMSU1("CSmsuTimeout::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_START_1, "CSmsuTimeout::Start()");
iTimedOut = EFalse;
After(aTimeIntervalMicroSeconds32);
@@ -72,7 +78,7 @@
iTimedOut(EFalse),
iCompleteMyselfRequested(EFalse)
{
- LOGSMSU1("CSmsuTimeout::CSmsuTimeout()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_CTOR_1, "CSmsuTimeout::CSmsuTimeout()");
CActiveScheduler::Add(this);
} // CSmsuTimeout::CSmsuTimeout
@@ -83,7 +89,7 @@
*/
void CSmsuTimeout::RunL()
{
- LOGSMSU2("CSmsuTimeout::RunL [iStatus=%d]", iStatus.Int() );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSUTIMEOUT_RUNL_1, "CSmsuTimeout::RunL [iStatus=%d]", iStatus.Int() );
iTimedOut = ETrue;
iActive.Cancel();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsu/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/smsu/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,70 @@
+#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]_CBACKUPANDRESTORE_ISBACKUPORRESTOREINPROGRESS_1=0x13
+[TRACE]TRACE_BORDER[0x84]_CBACKUPANDRESTORE_NEWL_1=0x12
+[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_ADDEVENT_1=0x15
+[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_CHANGEEVENT_1=0x17
+[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_DELETEEVENT_1=0x18
+[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_GETEVENT_1=0x16
+[TRACE]TRACE_BORDER[0x84]_CSMSEVENTLOGGER_NEWL_1=0x14
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_COMPLETEMYSELFAFTERTIMEOUT_1=0x11
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_COMPLETEMYSELF_1=0x10
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_COMPLETE_1=0xe
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_CONSTRUCTTIMEOUTL_1=0x8
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_QUEUE_1=0xc
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_RUNERROR_1=0xf
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_RUNL_1=0xd
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_TIMEDOUT_1=0xb
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_TIMEDSETACTIVECANCEL_1=0xa
+[TRACE]TRACE_BORDER[0x84]_CSMSUACTIVEBASE_TIMEDSETACTIVE_1=0x9
+[TRACE]TRACE_BORDER[0x84]_RSMSSOCKETREADSTREAM_CTOR_1=0x1a
+[TRACE]TRACE_BORDER[0x84]_RSMSSOCKETWRITESTREAM_CTOR_1=0x1b
+[TRACE]TRACE_BORDER[0x84]_SMSUPANIC_1=0x19
+[TRACE]TRACE_BORDER[0x84]_TSMSADDR_IDENTIFIERMATCH_1=0x3
+[TRACE]TRACE_BORDER[0x84]_TSMSADDR_OPERATOR_1=0x7
+[TRACE]TRACE_BORDER[0x84]_TSMSADDR_SETIDENTIFIERMATCH_1=0x4
+[TRACE]TRACE_BORDER[0x84]_TSMSADDR_SETSMSADDRFAMILY_1=0x2
+[TRACE]TRACE_BORDER[0x84]_TSMSADDR_SETTEXTMATCH_1=0x6
+[TRACE]TRACE_BORDER[0x84]_TSMSADDR_SMSADDRFAMILY_1=0x1
+[TRACE]TRACE_BORDER[0x84]_TSMSADDR_TEXTMATCH_1=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CBACKUPANDRESTORE_CONSTRUCTL_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CBACKUPANDRESTORE_DOCANCEL_1=0x2
+[TRACE]TRACE_INTERNALS[0x88]_CBACKUPANDRESTORE_RUNL_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_CONSTRUCTL_1=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_1=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_2=0x8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_3=0x9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_4=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_5=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOADDEVENTL_6=0xc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOCANCEL_1=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DOCOMPLETE_1=0x20
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_DORUNL_1=0x6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_1=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_10=0x16
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_11=0x17
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_12=0x18
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_13=0x19
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_14=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_15=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_16=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_17=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_18=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_19=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_2=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_3=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_4=0x10
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_5=0x11
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_6=0x12
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_7=0x13
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_8=0x14
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEVENTLOGGER_SETDATAL_9=0x15
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUTIMEOUT_CTOR_1=0x27
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUTIMEOUT_NEWL_1=0x25
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUTIMEOUT_RUNL_1=0x28
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUTIMEOUT_START_1=0x26
+[TRACE]TRACE_INTERNALS[0x88]_RSMSSOCKETBUF_DOSYNCHL_1=0x23
+[TRACE]TRACE_INTERNALS[0x88]_RSMSSOCKETBUF_OVERFLOWL_1=0x22
+[TRACE]TRACE_INTERNALS[0x88]_RSMSSOCKETBUF_SOCKETWRITEL_1=0x24
+[TRACE]TRACE_INTERNALS[0x88]_RSMSSOCKETBUF_UNDERFLOWL_1=0x21
--- a/smsprotocols/smsstack/test/TE_R6SMS/TE_R6SMS.mmp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/test/TE_R6SMS/TE_R6SMS.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -51,6 +51,7 @@
USERINCLUDE ../../ems/inc
USERINCLUDE ../../common/inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -59,6 +60,5 @@
LIBRARY testexecutelogclient.lib
LIBRARY testexecuteutils.lib
LIBRARY fbscli.lib bitgdi.lib
-DEBUGLIBRARY comsdbgutil.lib
SMPSAFE
--- a/smsprotocols/smsstack/test/TE_SMSPDUDB/TE_smspdudb.mmp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/test/TE_SMSPDUDB/TE_smspdudb.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -52,6 +52,7 @@
USERINCLUDE ../../gsmu/inc
USERINCLUDE ../../ems/inc
USERINCLUDE ../../common/inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -60,6 +61,5 @@
LIBRARY testexecutelogclient.lib
LIBRARY testexecuteutils.lib
LIBRARY fbscli.lib bitgdi.lib
-DEBUGLIBRARY comsdbgutil.lib
SMPSAFE
--- a/smsprotocols/smsstack/test/bld.inf Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +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:
-//
-
-/**
- @file
-*/
-
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_TESTEXPORTS
-
-te_smsstack.iby /epoc32/rom/include/te_smsstack.iby
-
-configfiles/setupgsmsms.txt c:/sms/setupgsmsms.txt
-configfiles/te_intersetupgsmsms.txt c:/sms/te_intersetupgsmsms.txt
-
-configfiles/t_smspdudb.txt c:/sms/t_smspdudb.txt
-configfiles/smspdudb.txt c:/sms/smspdudb.txt
-
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./EmsTestUtils.h /epoc32/include/emstestutils.h
-#endif
-
-TE_SMSPDUDB/TE_smspdudb.script z:/testdata/scripts/te_smspdudb.script
-TE_SMSPDUDB/TE_smspdudb_setup.script z:/testdata/scripts/te_smspdudb_setup.script
-
-configfiles/te_smspdudb.txt z:/testdata/configs/te_smspdudb.txt
-configfiles/smspdudb.txt z:/testdata/configs/smspdudb.txt
-configfiles/t_smspdudb.txt z:/testdata/configs/t_smspdudb.txt
-
-TE_R6SMS/TE_R6SMS.script z:/testdata/scripts/te_r6sms.script
-TE_R6SMS/TE_R6SMS_setup.script z:/testdata/scripts/te_r6sms_setup.script
-
-//Class0 Store Regresssion Test Suite
-./Te_Class0StoreRegressionSuite.script z:/testdata/scripts/te_class0storeregressionsuite.script
-
-./smsstackcleanprivatedata.script z:/testdata/scripts/smsstackcleanprivatedata.script
-./smsstackbackupeskfile.script z:/testdata/scripts/smsstackbackupeskfile.script
-./smsstackrestoreeskfile.script z:/testdata/scripts/smsstackrestoreeskfile.script
-
-./smsstacksimtsytestnumbers.ini z:/testdata/configs/smsstacksimtsytestnumbers.ini
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-
-smsstacktestutilities.mmp
-TE_SMSPDUDB/TE_smspdudb.mmp
-TE_R6SMS/TE_R6SMS.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/test/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,64 @@
+// 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"
+// 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
+*/
+
+
+PRJ_PLATFORMS
+
+DEFAULT
+
+PRJ_TESTEXPORTS
+
+te_smsstack.iby /epoc32/rom/include/te_smsstack.iby
+
+../configfiles/setupgsmsms.txt c:/sms/setupgsmsms.txt
+../configfiles/te_intersetupgsmsms.txt c:/sms/te_intersetupgsmsms.txt
+
+../configfiles/t_smspdudb.txt c:/sms/t_smspdudb.txt
+../configfiles/smspdudb.txt c:/sms/smspdudb.txt
+
+#ifdef SYMBIAN_OLD_EXPORT_LOCATION
+../../EmsTestUtils.h /epoc32/include/emstestutils.h
+#endif
+
+../TE_SMSPDUDB/TE_smspdudb.script z:/testdata/scripts/te_smspdudb.script
+../TE_SMSPDUDB/TE_smspdudb_setup.script z:/testdata/scripts/te_smspdudb_setup.script
+
+../configfiles/te_smspdudb.txt z:/testdata/configs/te_smspdudb.txt
+../configfiles/smspdudb.txt z:/testdata/configs/smspdudb.txt
+../configfiles/t_smspdudb.txt z:/testdata/configs/t_smspdudb.txt
+
+../TE_R6SMS/TE_R6SMS.script z:/testdata/scripts/te_r6sms.script
+../TE_R6SMS/TE_R6SMS_setup.script z:/testdata/scripts/te_r6sms_setup.script
+
+//Class0 Store Regresssion Test Suite
+../Te_Class0StoreRegressionSuite.script z:/testdata/scripts/te_class0storeregressionsuite.script
+
+../smsstackcleanprivatedata.script z:/testdata/scripts/smsstackcleanprivatedata.script
+../smsstackbackupeskfile.script z:/testdata/scripts/smsstackbackupeskfile.script
+../smsstackrestoreeskfile.script z:/testdata/scripts/smsstackrestoreeskfile.script
+
+../smsstacksimtsytestnumbers.ini z:/testdata/configs/smsstacksimtsytestnumbers.ini
+
+PRJ_MMPFILES
+
+PRJ_TESTMMPFILES
+
+smsstacktestutilities.mmp
+../TE_SMSPDUDB/TE_smspdudb.mmp
+../TE_R6SMS/TE_R6SMS.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/test/group/smsstacktestutilities.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,75 @@
+// 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:
+// Top-level project file for interactive SMSPROT test code
+//
+//
+
+/**
+ @file
+*/
+
+TARGET smsstacktestutilities.dll
+CAPABILITY All -TCB
+UID 0x1000008D 0x101FBB4F
+EPOCSTACKSIZE 0x10000
+TARGETTYPE dll
+
+SOURCEPATH ../
+SOURCE smsstacktestutilities.cpp EmsTestUtils.cpp
+SOURCE smspdudb.cpp
+SOURCE smspdudbitems.cpp
+SOURCE smsstackbaseteststeps.cpp smsstacktestcase.cpp
+SOURCE smsstackbasetestserver.cpp
+SOURCEPATH ../../gsmu/src
+SOURCE gsmupriv.cpp
+SOURCE Gsmumain.cpp
+SOURCE Gsmuelem.cpp
+SOURCEPATH ../../ems/src
+SOURCE EMSInformationElement.cpp EMSFormatIE.cpp EMSAnimationIE.cpp
+SOURCE EMSObjectDistributionIE.cpp EMSPictureIE.cpp EMSSoundIE.cpp
+SOURCE EMSUserPromptIE.cpp
+
+SOURCEPATH ../../common/src
+SOURCE smsstacklog.cpp
+
+USERINCLUDE ../../gsmu/inc
+USERINCLUDE ../../ems/inc
+USERINCLUDE ../../smsu/inc
+USERINCLUDE ../../test
+USERINCLUDE ../../common/inc
+USERINCLUDE ../../smsprot/inc
+USERINCLUDE ../traces
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+
+LIBRARY smsu.lib gsmu.lib // components under test
+LIBRARY esock.lib // loading SMSPROT.PRT
+LIBRARY euser.lib estor.lib
+LIBRARY logwrap.lib testconfigfileparser.lib etel.lib efsrv.lib charconv.lib etelmm.lib fbscli.lib bitgdi.lib
+LIBRARY testexecuteutils.lib
+LIBRARY testexecutelogclient.lib
+
+LIBRARY commsdat.lib logcli.lib c32root.lib
+
+#if defined(WINS)
+DEFFILE ../../test/bwins/SMSSTACKTESTUTILITIES.DEF
+#elif defined(GCC32)
+DEFFILE ../../test/bmarm/smsstacktestutilities.def
+#else
+DEFFILE ../../test/eabi/smsstacktestutilities.def
+#endif
+
+VENDORID 0x70000001
+
+SMPSAFE
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/test/group/te_smsstack.iby Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,222 @@
+// 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
+*/
+
+
+#ifndef __TE_SMSSTACK_IBY__
+#define __TE_SMSSTACK_IBY__
+
+#include <smsstack.iby>
+#include <autotest.iby>
+#include <simtsy.iby>
+#include <testexecute.iby>
+
+//
+// SMS Stack Test Utility DLLs...
+//
+file=ABI_DIR\DEBUG_DIR\smsstacktestutilities.dll SYSTEM_BINDIR\smsstacktestutilities.dll
+
+//
+// Gsmu Test Code...
+//
+file=ABI_DIR\DEBUG_DIR\te_gsmu.exe SYSTEM_BINDIR\te_gsmu.exe
+file=ABI_DIR\DEBUG_DIR\te_gsmustor.exe SYSTEM_BINDIR\te_gsmustor.exe
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_gsmu.script testdata\scripts\te_gsmu.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_gsmustor.script testdata\scripts\te_gsmustor.script
+
+//
+// Smsprot Test Code...
+//
+file=ABI_DIR\DEBUG_DIR\te_smsinter.exe SYSTEM_BINDIR\te_smsinter.exe stack=0x5000
+file=ABI_DIR\DEBUG_DIR\te_smsemsprt.exe SYSTEM_BINDIR\te_smsemsprt.exe
+file=ABI_DIR\DEBUG_DIR\te_smsstor.exe SYSTEM_BINDIR\te_smsstor.exe
+file=ABI_DIR\DEBUG_DIR\te_smsprtstress.exe SYSTEM_BINDIR\te_smsprtstress.exe
+file=ABI_DIR\DEBUG_DIR\te_smsprt.exe SYSTEM_BINDIR\te_smsprt.exe stack=0x5000
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsstor.script TestData\scripts\te_smsstor.script
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-class0test.esk SMS\smswap.sms-class0test.esk
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprtstress.script TestData\scripts\te_smsprtstress.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprtstress_setup.script TestData\scripts\te_smsprtstress_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsprtstress_commdb.cfg TestData\configs\te_smsprtstress_commdb.cfg
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsemsprt.script TestData\scripts\te_smsemsprt.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsemsprt_setup.script TestData\scripts\te_smsemsprt_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsemsprt_commdb.cfg TestData\configs\te_smsemsprt_commdb.cfg
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsinter.script testdata\scripts\te_smsinter.script
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SMSPRT.script testdata\scripts\TE_SMSPRT.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SMSPRT_setup.script testdata\scripts\TE_SMSPRT_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SMSPRT.cfg testdata\configs\te_smsprt.cfg
+
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-sendTryTimeout.esk SMS\smswap.sms-sendTryTimeout.esk
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-bootTimerTimeout.esk SMS\smswap.sms-bootTimerTimeout.esk
+
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackcleanprivatedata.script TestData\scripts\smsstackcleanprivatedata.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackbackupeskfile.script TestData\scripts\smsstackbackupeskfile.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackrestoreeskfile.script TestData\scripts\smsstackrestoreeskfile.script
+
+data=EPOCROOT##epoc32\data\z\testdata\configs\smsstacksimtsytestnumbers.ini TestData\configs\smsstacksimtsytestnumbers.ini
+
+data=EPOCROOT##epoc32\data\z\testdata\configs\t_smspdudb.txt testdata\configs\t_smspdudb.txt
+
+// te_smspdudb
+file=ABI_DIR\DEBUG_DIR\te_smspdudb.exe SYSTEM_BINDIR\te_smspdudb.exe
+
+//te_smspdudb script and configs
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smspdudb.script testdata\scripts\te_smspdudb.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smspdudb_setup.script testdata\scripts\te_smspdudb_setup.script
+
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_smspdudb.txt testdata\configs\te_smspdudb.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\smspdudb.txt testdata\configs\smspdudb.txt
+
+// te_R6SMS
+file=ABI_DIR\DEBUG_DIR\te_R6SMS.exe SYSTEM_BINDIR\te_R6SMS.exe
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_R6SMS.script testdata\scripts\te_R6SMS.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\te_R6SMS_setup.script testdata\scripts\te_R6SMS_setup.script
+
+// Gsmu Ems Data
+data=EPOCROOT##epoc32\data\c\ems\anims.mbm Ems\anims.mbm
+data=EPOCROOT##epoc32\data\c\ems\pics.mbm Ems\pics.mbm
+
+// Smsprot Data
+data=EPOCROOT##epoc32\data\c\sms\setupgsmsms.txt Sms\setupgsmsms.txt
+data=EPOCROOT##epoc32\data\c\sms\te_intersetupgsmsms.txt Sms\te_intersetupgsmsms.txt
+data=EPOCROOT##epoc32\data\z\sms\testsmswap.sms.esk Sms\testsmswap.sms.esk
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-maxnummessagetest.esk Sms\smswap.sms-maxnummessagetest.esk
+data=EPOCROOT##epoc32\data\z\sms\smswap.sms-0nummessagetest.esk Sms\smswap.sms-0nummessagetest.esk
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto.txt Sms\t_sms_inter_auto.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems.txt Sms\t_sms_inter_ems.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_9210.txt Sms\t_sms_inter_auto_9210.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_R520.txt Sms\t_sms_inter_auto_R520.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_T65.txt Sms\t_sms_inter_auto_T65.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_6210.txt Sms\t_sms_inter_auto_6210.txt
+data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_9210.txt Sms\TWAPSMS_9210.txt
+data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_R520.txt Sms\TWAPSMS_R520.txt
+data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_T65.txt Sms\TWAPSMS_T65.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_9210.txt Sms\t_sms_inter_ems_9210.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_R520.txt Sms\t_sms_inter_ems_R520.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_T68.txt Sms\t_sms_inter_ems_T68.txt
+data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_6210.txt Sms\t_sms_inter_ems_6210.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config.txt Sms\tsmsprt_config.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config_extra.txt Sms\tsmsprt_config_extra.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config_tx_rx_maxmsg.txt Sms\tsmsprt_config_tx_rx_maxmsg.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsprtstress_config.txt Sms\tsmsprtstress_config.txt
+data=EPOCROOT##epoc32\data\z\sms\tsmsemsprt_config.txt Sms\tsmsemsprt_config.txt
+data=EPOCROOT##epoc32\data\c\sms\smspdudb.txt Sms\smspdudb.txt
+data=EPOCROOT##epoc32\data\c\sms\t_smspdudb.txt Sms\t_smspdudb.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_statusReportScheme.ini testdata\configs\te_statusReportScheme.ini
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_DiskSpaceMonitor.ini testdata\configs\TE_DiskSpaceMonitor.ini
+
+//SMSOutOfDiskSpace
+#ifndef _DEBUG
+data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SMSStackOutOfDiskSpace_ARM_UREL.script testdata\scripts\Te_SMSStackOutOfDiskSpace.script
+#else
+data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SMSStackOutOfDiskSpace.script testdata\scripts\Te_SMSStackOutOfDiskSpace.script
+#endif
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\SMSOutOfDiskSpace.ini testdata\configs\SMSOutOfDiskSpace.ini
+data=EPOCROOT##epoc32\data\z\sms\SMSStackOutOfDiskSpace.txt sms\SMSStackOutOfDiskSpace.txt
+data=EPOCROOT##epoc32\data\z\testdata\configs\smsclass0preallocated.dat testdata\configs\smsclass0preallocated.dat
+data=EPOCROOT##epoc32\data\z\testdata\configs\smsclass0reast.dat testdata\configs\smsclass0reast.dat
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_class0.sms.esk testdata\configs\smswap_class0.sms.esk
+
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_discardType0s.esk testdata\configs\smswap_discardType0s.esk
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_DontDiscardType0s.esk testdata\configs\smswap_DontDiscardType0s.esk
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_MaxFivePDUsInOOD.esk testdata\configs\smswap_MaxFivePDUsInOOD.esk
+data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_Class0DisabledMaxFivePDUsInOOD.esk testdata\configs\smswap_Class0DisabledMaxFivePDUsInOOD.esk
+
+// Wapprot Data
+data=EPOCROOT##epoc32\data\z\testdata\configs\tone1.rtp testdata\configs\tone1.rtp
+data=EPOCROOT##epoc32\data\z\testdata\configs\tone2.rtp testdata\configs\tone2.rtp
+data=EPOCROOT##epoc32\data\z\testdata\configs\tone3.rtp testdata\configs\tone3.rtp
+data=EPOCROOT##epoc32\data\z\testdata\configs\vcard1.vcf testdata\configs\vcard1.vcf
+data=EPOCROOT##epoc32\data\z\testdata\configs\vcard2.vcf testdata\configs\vcard2.vcf
+data=EPOCROOT##epoc32\data\z\testdata\configs\vcard3.vcf testdata\configss\vcard3.vcf
+
+
+data=EPOCROOT##epoc32\data\z\sms\smsreastnopdu.dat Sms\smsreastnopdu.dat
+data=EPOCROOT##epoc32\data\z\sms\smsreastnostream.dat Sms\smsreastnostream.dat
+data=EPOCROOT##epoc32\data\z\sms\smsreastarraynoroot.dat Sms\smsreastarraynoroot.dat
+data=EPOCROOT##epoc32\data\z\sms\smsreastcountwrong.dat Sms\smsreastcountwrong.dat
+data=EPOCROOT##epoc32\data\z\sms\smsreastarraynoentries.dat Sms\smsreastarraynoentries.dat
+
+// Release 6 test data
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsprt_data.ini testdata\configs\te_smsprt_data.ini
+
+// Release 6 automatic deletion configuration files
+data=EPOCROOT##Epoc32\data\z\sms\smswap.sms-AutoDeletionClass2.esk sms\smswap.sms-AutoDeletionClass2.esk
+data=EPOCROOT##Epoc32\data\z\sms\smswap.sms-AutomaticDeletionOfType0.esk sms\smswap.sms-AutomaticDeletionOfType0.esk
+
+file=ABI_DIR\DEBUG_DIR\te_gsmu_ems.exe System\bin\te_gsmu_ems.exe
+
+data=EPOCROOT##Epoc32\data\z\TestData\scripts\te_gsmu_ems.script TestData\Scripts\te_gsmu_ems.Script
+
+
+// Test Suite
+
+file=ABI_DIR\DEBUG_DIR\TE_WapDgrm.exe SYSTEM_BINDIR\TE_WapDgrm.exe
+
+// Scripts and Ini files
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapdgrm.script testdata\scripts\TE_wapdgrm.script
+
+// Test Suite
+
+file=ABI_DIR\DEBUG_DIR\TE_WapThdr.exe SYSTEM_BINDIR\TE_WapThdr.exe
+
+// Scripts and Ini files
+
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapthdr.script testdata\scripts\TE_wapthdr.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapthdr_setup.script testdata\scripts\TE_wapthdr_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_waphdr.txt testdata\configs\TE_waphdr.txt
+
+// This binary file is marked as "data=" because in the ROM it is must be a RAM executable image to be used with SETCAP.exe.
+data=ABI_DIR\DEBUG_DIR\TE_WapProt.exe SYSTEM_BINDIR\TE_WapProt.exe
+
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapProtSuite.ini testdata\configs\WapProtSuite\WapProtSuite.ini
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapStatusReports.ini testdata\configs\WapProtSuite\WapStatusReports.ini
+data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapProt.script testdata\scripts\Te_WapProt.Script
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapProtSuite.cfg testdata\configs\WapProtSuite\WapProtSuite.cfg
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\StatusReportsRequested.cfg testdata\configs\WapProtSuite\StatusReportsRequested.cfg
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\Config.txt testdata\configs\WapProtSuite\Config.txt
+data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapStackOutOfDiskSpace.ini testdata\configs\WapProtSuite\WapStackOutOfDiskSpace.ini
+
+#ifndef _DEBUG
+data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapStackOutOfDiskSpace_ARM_UREL.script testdata\scripts\Te_WapStackOutOfDiskSpace.script
+#else
+data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapStackOutOfDiskSpace.script testdata\scripts\Te_WapStackOutOfDiskSpace.script
+#endif
+
+
+
+//
+// TE_WAPSMS files...
+//
+file=ABI_DIR\DEBUG_DIR\TE_WAPSMS.exe SYSTEM_BINDIR\TE_WAPSMS.exe
+data=EPOCROOT##epoc32\data\z\testdata\configs\te_setupgsmsms.txt testdata\configs\te_setupgsmsms.txt
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_WAPSMS.script testdata\scripts\TE_WAPSMS.script
+data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_WAPSMS_setup.script testdata\scripts\TE_WAPSMS_setup.script
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_WAPSMS_commdb.cfg testdata\configs\TE_WAPSMS_commdb.cfg
+data=EPOCROOT##epoc32\data\z\testdata\configs\TE_WAPSMS.txt testdata\configs\TE_WAPSMS.txt
+
+#endif // __TE_SMSSTACK_IBY__
--- a/smsprotocols/smsstack/test/smsstacktestutilities.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/test/smsstacktestutilities.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smsstacktestutilitiesTraces.h"
+#endif
+
#include "smsstacktestutilities.h"
#include <commsdattypesv1_1.h>
@@ -1497,8 +1503,12 @@
* TODO
*/
{
- LOGSMSIFPDU(_L8("TestPduDbToolsL PDU: "), aPdu.Pdu(), EFalse);
- LOGSMSIFTIMESTAMP();
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ LogSmsIfPDU(_L8("TestPduDbToolsL PDU: "), aPdu.Pdu(), EFalse);
+ TBuf<40> timestamp;
+ SmsTimeStampL(timestamp);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1, "%S",timestamp);
+#endif
CSmsPDU* pdu = NULL;
TRAPD(err, pdu = CSmsPDU::NewL(aPdu, *iCharConv, iFs, aIsMobileTerminated));
--- a/smsprotocols/smsstack/test/smsstacktestutilities.mmp Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-// 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:
-// Top-level project file for interactive SMSPROT test code
-//
-//
-
-/**
- @file
-*/
-
-TARGET smsstacktestutilities.dll
-CAPABILITY All -TCB
-UID 0x1000008D 0x101FBB4F
-EPOCSTACKSIZE 0x10000
-TARGETTYPE dll
-
-SOURCEPATH .
-SOURCE smsstacktestutilities.cpp EmsTestUtils.cpp
-SOURCE smspdudb.cpp
-SOURCE smspdudbitems.cpp
-SOURCE smsstackbaseteststeps.cpp smsstacktestcase.cpp
-SOURCE smsstackbasetestserver.cpp
-SOURCEPATH ../gsmu/src
-SOURCE gsmupriv.cpp
-SOURCE Gsmumain.cpp
-SOURCE Gsmuelem.cpp
-SOURCEPATH ../ems/src
-SOURCE EMSInformationElement.cpp EMSFormatIE.cpp EMSAnimationIE.cpp
-SOURCE EMSObjectDistributionIE.cpp EMSPictureIE.cpp EMSSoundIE.cpp
-SOURCE EMSUserPromptIE.cpp
-
-SOURCEPATH ../common/src
-SOURCE smsstacklog.cpp
-
-USERINCLUDE ../gsmu/inc
-USERINCLUDE ../ems/inc
-USERINCLUDE ../smsu/inc
-USERINCLUDE ../test
-USERINCLUDE ../common/inc
-USERINCLUDE ../smsprot/inc
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-LIBRARY smsu.lib gsmu.lib // components under test
-LIBRARY esock.lib // loading SMSPROT.PRT
-LIBRARY euser.lib estor.lib
-LIBRARY logwrap.lib testconfigfileparser.lib etel.lib efsrv.lib charconv.lib etelmm.lib fbscli.lib bitgdi.lib
-LIBRARY testexecuteutils.lib
-LIBRARY testexecutelogclient.lib
-
-LIBRARY commsdat.lib logcli.lib c32root.lib
-
-DEBUGLIBRARY comsdbgutil.lib
-
-#if defined(WINS)
-DEFFILE ../test/bwins/SMSSTACKTESTUTILITIES.DEF
-#elif defined(GCC32)
-DEFFILE ../test/bmarm/smsstacktestutilities.def
-#else
-DEFFILE ../test/eabi/smsstacktestutilities.def
-#endif
-
-VENDORID 0x70000001
-
-SMPSAFE
--- a/smsprotocols/smsstack/test/te_smsstack.iby Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +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:
-//
-
-/**
- @file
-*/
-
-
-#ifndef __TE_SMSSTACK_IBY__
-#define __TE_SMSSTACK_IBY__
-
-#include <smsstack.iby>
-#include <autotest.iby>
-#include <simtsy.iby>
-#include <testexecute.iby>
-
-//
-// SMS Stack Test Utility DLLs...
-//
-file=ABI_DIR\DEBUG_DIR\smsstacktestutilities.dll SYSTEM_BINDIR\smsstacktestutilities.dll
-
-//
-// Gsmu Test Code...
-//
-file=ABI_DIR\DEBUG_DIR\te_gsmu.exe SYSTEM_BINDIR\te_gsmu.exe
-file=ABI_DIR\DEBUG_DIR\te_gsmustor.exe SYSTEM_BINDIR\te_gsmustor.exe
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_gsmu.script testdata\scripts\te_gsmu.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_gsmustor.script testdata\scripts\te_gsmustor.script
-
-//
-// Smsprot Test Code...
-//
-file=ABI_DIR\DEBUG_DIR\te_smsinter.exe SYSTEM_BINDIR\te_smsinter.exe stack=0x5000
-file=ABI_DIR\DEBUG_DIR\te_smsemsprt.exe SYSTEM_BINDIR\te_smsemsprt.exe
-file=ABI_DIR\DEBUG_DIR\te_smsstor.exe SYSTEM_BINDIR\te_smsstor.exe
-file=ABI_DIR\DEBUG_DIR\te_smsprtstress.exe SYSTEM_BINDIR\te_smsprtstress.exe
-file=ABI_DIR\DEBUG_DIR\te_smsprt.exe SYSTEM_BINDIR\te_smsprt.exe stack=0x5000
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsstor.script TestData\scripts\te_smsstor.script
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-class0test.esk SMS\smswap.sms-class0test.esk
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprtstress.script TestData\scripts\te_smsprtstress.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsprtstress_setup.script TestData\scripts\te_smsprtstress_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsprtstress_commdb.cfg TestData\configs\te_smsprtstress_commdb.cfg
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsemsprt.script TestData\scripts\te_smsemsprt.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsemsprt_setup.script TestData\scripts\te_smsemsprt_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsemsprt_commdb.cfg TestData\configs\te_smsemsprt_commdb.cfg
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smsinter.script testdata\scripts\te_smsinter.script
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SMSPRT.script testdata\scripts\TE_SMSPRT.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SMSPRT_setup.script testdata\scripts\TE_SMSPRT_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_SMSPRT.cfg testdata\configs\te_smsprt.cfg
-
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-sendTryTimeout.esk SMS\smswap.sms-sendTryTimeout.esk
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-bootTimerTimeout.esk SMS\smswap.sms-bootTimerTimeout.esk
-
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackcleanprivatedata.script TestData\scripts\smsstackcleanprivatedata.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackbackupeskfile.script TestData\scripts\smsstackbackupeskfile.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\smsstackrestoreeskfile.script TestData\scripts\smsstackrestoreeskfile.script
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\smsstacksimtsytestnumbers.ini TestData\configs\smsstacksimtsytestnumbers.ini
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\t_smspdudb.txt testdata\configs\t_smspdudb.txt
-
-// te_smspdudb
-file=ABI_DIR\DEBUG_DIR\te_smspdudb.exe SYSTEM_BINDIR\te_smspdudb.exe
-
-//te_smspdudb script and configs
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smspdudb.script testdata\scripts\te_smspdudb.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_smspdudb_setup.script testdata\scripts\te_smspdudb_setup.script
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_smspdudb.txt testdata\configs\te_smspdudb.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\smspdudb.txt testdata\configs\smspdudb.txt
-
-// te_R6SMS
-file=ABI_DIR\DEBUG_DIR\te_R6SMS.exe SYSTEM_BINDIR\te_R6SMS.exe
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_R6SMS.script testdata\scripts\te_R6SMS.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\te_R6SMS_setup.script testdata\scripts\te_R6SMS_setup.script
-
-// Gsmu Ems Data
-data=EPOCROOT##epoc32\data\c\ems\anims.mbm Ems\anims.mbm
-data=EPOCROOT##epoc32\data\c\ems\pics.mbm Ems\pics.mbm
-
-// Smsprot Data
-data=EPOCROOT##epoc32\data\c\sms\setupgsmsms.txt Sms\setupgsmsms.txt
-data=EPOCROOT##epoc32\data\c\sms\te_intersetupgsmsms.txt Sms\te_intersetupgsmsms.txt
-data=EPOCROOT##epoc32\data\z\sms\testsmswap.sms.esk Sms\testsmswap.sms.esk
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-maxnummessagetest.esk Sms\smswap.sms-maxnummessagetest.esk
-data=EPOCROOT##epoc32\data\z\sms\smswap.sms-0nummessagetest.esk Sms\smswap.sms-0nummessagetest.esk
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto.txt Sms\t_sms_inter_auto.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems.txt Sms\t_sms_inter_ems.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_9210.txt Sms\t_sms_inter_auto_9210.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_R520.txt Sms\t_sms_inter_auto_R520.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_T65.txt Sms\t_sms_inter_auto_T65.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_auto_6210.txt Sms\t_sms_inter_auto_6210.txt
-data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_9210.txt Sms\TWAPSMS_9210.txt
-data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_R520.txt Sms\TWAPSMS_R520.txt
-data=EPOCROOT##epoc32\data\c\sms\TWAPSMS_T65.txt Sms\TWAPSMS_T65.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_9210.txt Sms\t_sms_inter_ems_9210.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_R520.txt Sms\t_sms_inter_ems_R520.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_T68.txt Sms\t_sms_inter_ems_T68.txt
-data=EPOCROOT##epoc32\data\c\sms\t_sms_inter_ems_6210.txt Sms\t_sms_inter_ems_6210.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config.txt Sms\tsmsprt_config.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config_extra.txt Sms\tsmsprt_config_extra.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsprt_config_tx_rx_maxmsg.txt Sms\tsmsprt_config_tx_rx_maxmsg.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsprtstress_config.txt Sms\tsmsprtstress_config.txt
-data=EPOCROOT##epoc32\data\z\sms\tsmsemsprt_config.txt Sms\tsmsemsprt_config.txt
-data=EPOCROOT##epoc32\data\c\sms\smspdudb.txt Sms\smspdudb.txt
-data=EPOCROOT##epoc32\data\c\sms\t_smspdudb.txt Sms\t_smspdudb.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_statusReportScheme.ini testdata\configs\te_statusReportScheme.ini
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_DiskSpaceMonitor.ini testdata\configs\TE_DiskSpaceMonitor.ini
-
-//SMSOutOfDiskSpace
-#ifndef _DEBUG
-data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SMSStackOutOfDiskSpace_ARM_UREL.script testdata\scripts\Te_SMSStackOutOfDiskSpace.script
-#else
-data=EPOCROOT##epoc32\data\z\testdata\scripts\Te_SMSStackOutOfDiskSpace.script testdata\scripts\Te_SMSStackOutOfDiskSpace.script
-#endif
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script testdata\scripts\TE_SetupSMSStackOutOfDiskSpace.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\SMSOutOfDiskSpace.ini testdata\configs\SMSOutOfDiskSpace.ini
-data=EPOCROOT##epoc32\data\z\sms\SMSStackOutOfDiskSpace.txt sms\SMSStackOutOfDiskSpace.txt
-data=EPOCROOT##epoc32\data\z\testdata\configs\smsclass0preallocated.dat testdata\configs\smsclass0preallocated.dat
-data=EPOCROOT##epoc32\data\z\testdata\configs\smsclass0reast.dat testdata\configs\smsclass0reast.dat
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_class0.sms.esk testdata\configs\smswap_class0.sms.esk
-
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_discardType0s.esk testdata\configs\smswap_discardType0s.esk
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_DontDiscardType0s.esk testdata\configs\smswap_DontDiscardType0s.esk
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_MaxFivePDUsInOOD.esk testdata\configs\smswap_MaxFivePDUsInOOD.esk
-data=EPOCROOT##epoc32\data\z\testdata\configs\smswap_Class0DisabledMaxFivePDUsInOOD.esk testdata\configs\smswap_Class0DisabledMaxFivePDUsInOOD.esk
-
-// Wapprot Data
-data=EPOCROOT##epoc32\data\z\testdata\configs\tone1.rtp testdata\configs\tone1.rtp
-data=EPOCROOT##epoc32\data\z\testdata\configs\tone2.rtp testdata\configs\tone2.rtp
-data=EPOCROOT##epoc32\data\z\testdata\configs\tone3.rtp testdata\configs\tone3.rtp
-data=EPOCROOT##epoc32\data\z\testdata\configs\vcard1.vcf testdata\configs\vcard1.vcf
-data=EPOCROOT##epoc32\data\z\testdata\configs\vcard2.vcf testdata\configs\vcard2.vcf
-data=EPOCROOT##epoc32\data\z\testdata\configs\vcard3.vcf testdata\configss\vcard3.vcf
-
-
-data=EPOCROOT##epoc32\data\z\sms\smsreastnopdu.dat Sms\smsreastnopdu.dat
-data=EPOCROOT##epoc32\data\z\sms\smsreastnostream.dat Sms\smsreastnostream.dat
-data=EPOCROOT##epoc32\data\z\sms\smsreastarraynoroot.dat Sms\smsreastarraynoroot.dat
-data=EPOCROOT##epoc32\data\z\sms\smsreastcountwrong.dat Sms\smsreastcountwrong.dat
-data=EPOCROOT##epoc32\data\z\sms\smsreastarraynoentries.dat Sms\smsreastarraynoentries.dat
-
-// Release 6 test data
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_smsprt_data.ini testdata\configs\te_smsprt_data.ini
-
-// Release 6 automatic deletion configuration files
-data=EPOCROOT##Epoc32\data\z\sms\smswap.sms-AutoDeletionClass2.esk sms\smswap.sms-AutoDeletionClass2.esk
-data=EPOCROOT##Epoc32\data\z\sms\smswap.sms-AutomaticDeletionOfType0.esk sms\smswap.sms-AutomaticDeletionOfType0.esk
-
-file=ABI_DIR\DEBUG_DIR\te_gsmu_ems.exe System\bin\te_gsmu_ems.exe
-
-data=EPOCROOT##Epoc32\data\z\TestData\scripts\te_gsmu_ems.script TestData\Scripts\te_gsmu_ems.Script
-
-
-// Test Suite
-
-file=ABI_DIR\DEBUG_DIR\TE_WapDgrm.exe SYSTEM_BINDIR\TE_WapDgrm.exe
-
-// Scripts and Ini files
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapdgrm.script testdata\scripts\TE_wapdgrm.script
-
-// Test Suite
-
-file=ABI_DIR\DEBUG_DIR\TE_WapThdr.exe SYSTEM_BINDIR\TE_WapThdr.exe
-
-// Scripts and Ini files
-
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapthdr.script testdata\scripts\TE_wapthdr.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_wapthdr_setup.script testdata\scripts\TE_wapthdr_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_waphdr.txt testdata\configs\TE_waphdr.txt
-
-// This binary file is marked as "data=" because in the ROM it is must be a RAM executable image to be used with SETCAP.exe.
-data=ABI_DIR\DEBUG_DIR\TE_WapProt.exe SYSTEM_BINDIR\TE_WapProt.exe
-
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapProtSuite.ini testdata\configs\WapProtSuite\WapProtSuite.ini
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapStatusReports.ini testdata\configs\WapProtSuite\WapStatusReports.ini
-data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapProt.script testdata\scripts\Te_WapProt.Script
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapProtSuite.cfg testdata\configs\WapProtSuite\WapProtSuite.cfg
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\StatusReportsRequested.cfg testdata\configs\WapProtSuite\StatusReportsRequested.cfg
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\Config.txt testdata\configs\WapProtSuite\Config.txt
-data=EPOCROOT##Epoc32\data\z\testdata\configs\WapProtSuite\WapStackOutOfDiskSpace.ini testdata\configs\WapProtSuite\WapStackOutOfDiskSpace.ini
-
-#ifndef _DEBUG
-data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapStackOutOfDiskSpace_ARM_UREL.script testdata\scripts\Te_WapStackOutOfDiskSpace.script
-#else
-data=EPOCROOT##Epoc32\data\z\testdata\scripts\Te_WapStackOutOfDiskSpace.script testdata\scripts\Te_WapStackOutOfDiskSpace.script
-#endif
-
-
-
-//
-// TE_WAPSMS files...
-//
-file=ABI_DIR\DEBUG_DIR\TE_WAPSMS.exe SYSTEM_BINDIR\TE_WAPSMS.exe
-data=EPOCROOT##epoc32\data\z\testdata\configs\te_setupgsmsms.txt testdata\configs\te_setupgsmsms.txt
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_WAPSMS.script testdata\scripts\TE_WAPSMS.script
-data=EPOCROOT##epoc32\data\z\testdata\scripts\TE_WAPSMS_setup.script testdata\scripts\TE_WAPSMS_setup.script
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_WAPSMS_commdb.cfg testdata\configs\TE_WAPSMS_commdb.cfg
-data=EPOCROOT##epoc32\data\z\testdata\configs\TE_WAPSMS.txt testdata\configs\TE_WAPSMS.txt
-
-#endif // __TE_SMSSTACK_IBY__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/test/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/test/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,1223 @@
+#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]_CENHANCEDVOICEMAILBOXINFORMATION_ACCESSADDRESS_1=0x22
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_ALMOSTMAXIMUMCAPACITY_1=0x1d
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_EXTENSIONINDICATOR_1=0x20
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_MAXIMUMCAPACITY_1=0x1f
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_NUMBEROFVOICEMESSAGES_1=0x26
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_PARSEDACCESSADDRESS_1=0x24
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_PROFILE_1=0x19
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETACCESSADDRESSL_1=0x21
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETALMOSTMAXIMUMCAPACITY_1=0x1c
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETMAXIMUMCAPACITY_1=0x1e
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETNUMBEROFVOICEMESSAGES_1=0x25
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETPARSEDACCESSADDRESSL_1=0x23
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETPROFILE_1=0x18
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_SETSTORAGE_1=0x1a
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_STORE_1=0x1b
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILBOXINFORMATION_TYPE_1=0x17
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_DTOR_1=0x3f
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_GETVOICEMAILDELETIONS_1=0x42
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWL_1=0x40
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NUMBEROFDELETES_1=0x41
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_DTOR_1=0x39
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_GETVOICEMAILNOTIFICATIONS_1=0x37
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NEWL_1=0x38
+[TRACE]TRACE_BORDER[0x84]_CENHANCEDVOICEMAILNOTIFICATION_NUMBEROFVOICEMAILS_1=0x36
+[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x181
+[TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x182
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x20f
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x216
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x217
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x210
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x206
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x204
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x205
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x214
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x215
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x20c
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x218
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x219
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x21a
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x211
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x20e
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x20d
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x202
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x203
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x21b
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x209
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x20a
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x20b
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x207
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x208
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x212
+[TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x213
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL1_1=0x3
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTFROMNATIVEL_1=0x2
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL1_1=0x5
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_CONVERTTONATIVEL_1=0x4
+[TRACE]TRACE_BORDER[0x84]_CSMSALPHABETCONVERTER_NEWLC_1=0x1
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x1f8
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x1f9
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x1fa
+[TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x1fb
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x1f2
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x1f5
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0x1eb
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x1f7
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x1f1
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x1f0
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x1f4
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x1ed
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0x1e9
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x1ef
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x1f3
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x1f6
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x1ec
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x1ee
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0x1ea
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0x1e8
+[TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0x1e7
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0x1d6
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0x1d4
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0x1d5
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0x1c5
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0x1bd
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0x1c6
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0x1bf
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0x1c3
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0x1be
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0x1c0
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0x1c4
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0x1c2
+[TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0x1c1
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x1fc
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x1fd
+[TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x1fe
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x17c
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x17d
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x180
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x17f
+[TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x17e
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x16a
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x16c
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x16b
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x16d
+[TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x16e
+[TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x169
+[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA1_1=0x8
+[TRACE]TRACE_BORDER[0x84]_CSMSINFORMATIONELEMENT_DATA_1=0x7
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x157
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x14c
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x153
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x154
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x155
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x144
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x152
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x166
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x149
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x14a
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x132
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x14b
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x148
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x136
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x160
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x134
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x168
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x159
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x150
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x13c
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x13d
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x13e
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x13f
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x140
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x161
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x162
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x163
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x164
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x135
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x15f
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x133
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x158
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x147
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x146
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x156
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x13a
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x13b
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x131
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x130
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x138
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x139
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x143
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x14d
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x14e
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x14f
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x145
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x165
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x167
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x142
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x15b
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x15c
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x15e
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x137
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x151
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x141
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x15a
+[TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x15d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0x199
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0x1ab
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0x197
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0x19b
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0x1a9
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0x1a5
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0x1b7
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x186
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x187
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0x19f
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0x1a1
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0x190
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0x191
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0x192
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0x193
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x184
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x185
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x183
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0x1a7
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x18a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0x18e
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0x1ad
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0x1b9
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x188
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0x19a
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0x1ac
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0x198
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0x19c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0x1aa
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0x1a6
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0x1b8
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0x1a0
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0x1a2
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0x194
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0x195
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0x196
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0x1a8
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x18b
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0x18f
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0x1ae
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0x1ba
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x189
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0x1b2
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0x1b0
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0x1b4
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0x19e
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0x1a4
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0x18d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0x1b6
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0x1b1
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0x1af
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0x1b3
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0x19d
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0x1a3
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0x18c
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0x1bc
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0x1b5
+[TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0x1bb
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x171
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x172
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x16f
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x170
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x173
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x175
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x174
+[TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x176
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x177
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x178
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x179
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x17b
+[TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x17a
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0x1e2
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0x1e6
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0x1de
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0x1da
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0x1e0
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0x1e3
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0x1df
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0x1db
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0x1e1
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0x1dd
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0x1e5
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0x1dc
+[TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0x1e4
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0x1d9
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0x1d7
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0x1d8
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0x1d3
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0x1cf
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0x1c7
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0x1cb
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0x1d0
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0x1c8
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0x1cc
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0x1ce
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0x1ca
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0x1d2
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0x1cd
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0x1c9
+[TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0x1d1
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ADDINFORMATIONELEMENTL_1=0xc
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_BODY_1=0x10
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTINDEX_1=0xa
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENTLASTINDEX_1=0xb
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_INFORMATIONELEMENT_1=0x9
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL1_1=0x13
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL2_1=0x14
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_ISSUPPORTEDL_1=0x12
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_MAXBODYLENGTHINCHARS_1=0xe
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_MAXBODYLENGTHINCHARS_2=0xf
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_REMOVEINFORMATIONELEMENT_1=0xd
+[TRACE]TRACE_BORDER[0x84]_CSMSUSERDATA_SETBODYL_1=0x11
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_DTOR_1=0x3d
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_MESSAGEEXTENSIONINDICATION_1=0x3c
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_MESSAGEID_1=0x3b
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_NEWL_1=0x3e
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILDELETION_SETMESSAGEID_1=0x3a
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_CALLINGLINEIDENTITY_1=0x31
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_DTOR_1=0x34
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGEEXTENSIONINDICATION_1=0x2f
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGEID_1=0x28
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_MESSAGELENGTH_1=0x2a
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_NEWL_1=0x35
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_PARSEDCALLINGLINEIDENTITY_1=0x33
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_PRIORITYINDICATION_1=0x2e
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_RETENTIONDAYS_1=0x2c
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETCALLINGLINEIDENTITYL_1=0x30
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETMESSAGEID_1=0x27
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETMESSAGELENGTH_1=0x29
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETPARSEDCALLINGLINEIDENTITYL_1=0x32
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETPRIORITYINDICATION_1=0x2d
+[TRACE]TRACE_BORDER[0x84]_CVOICEMAILNOTIFICATION_SETRETENTIONDAYS_1=0x2b
+[TRACE]TRACE_BORDER[0x84]_GSMUMAIN_PANIC_1=0x43
+[TRACE]TRACE_BORDER[0x84]_TGSMSMSTELNUMBER_ISINSTANCEOF_1=0x6
+[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_CONVERTTOETELMM_1=0x15
+[TRACE]TRACE_BORDER[0x84]_TGSMSMSTYPEOFADDRESS_SETFROMETELMM_1=0x16
+[TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x1ff
+[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x201
+[TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x200
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CONSTRUCTL_1=0x87
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR1_1=0x83
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR2_1=0x84
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_CTOR_1=0x82
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_1=0x80
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DECODEL_2=0x81
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DOSETPARSEDADDRESSL_1=0x7e
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_DTOR_1=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_ENCODEL_1=0x7f
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_NEWBUFFERL_1=0x7d
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_NEWL_1=0x89
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR1_1=0x86
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILBOXINFORMATION_OPERATOR_1=0x85
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_CONSTRUCTL_1=0xa8
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_CTOR1_1=0xa5
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_DECODEL_1=0xaa
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_ENCODEL_1=0xa9
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_NEWEXTENSIONL_1=0xa4
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR1_1=0xa7
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILDELETECONFIRMATIONS_OPERATOR_1=0xa6
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_CONSTRUCTL_1=0x99
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_CTOR1_1=0x96
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_DECODEL_1=0x9b
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_ENCODEL_1=0x9a
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x95
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR1_1=0x98
+[TRACE]TRACE_INTERNALS[0x88]_CENHANCEDVOICEMAILNOTIFICATION_OPERATOR_1=0x97
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x255
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x25f
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x25e
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x258
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x257
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x256
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x25d
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x259
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x25a
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x25b
+[TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x25c
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x29d
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x2a7
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x2a8
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x2a9
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x29f
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x2a0
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x2a1
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x2a2
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x2a6
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x2a3
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x2a5
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x2a4
+[TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x29e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_ADDRESS_1=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DOSETPARSEDADDRESSL_1=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_DUPLICATEL_1=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_NEWBUFFERL_1=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_NEWL_1=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETADDRESSL_1=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETPARSEDADDRESSL_1=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SETRAWADDRESSL_1=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_SIZEL_1=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSADDRESS_TYPEOFADDRESS_1=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL1_1=0x44
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1=0x43
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONSTRUCTL_1=0x2a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1=0x42
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_1=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3=0x30
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4=0x31
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1=0x32
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2=0x33
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3=0x34
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4=0x35
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1=0x36
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2=0x37
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3=0x38
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4=0x39
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_1=0x2c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_2=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1=0x3e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2=0x3f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1=0x40
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_2=0x41
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x29a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x295
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x297
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x29b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x299
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x298
+[TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x296
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ADDINFORMATIONELEMENTL_1=0x6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DATA_1=0x8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DECODEL_1=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_DUPLICATEL_1=0x2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_ENCODEL_1=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_HEADERLENGTH_1=0xc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_HEADERPRESENT_1=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENTINDEX_1=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENTPTR_1=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_INFORMATIONELEMENT_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_NEWL_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_REMOVEINFORMATIONELEMENT_1=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETDATAL_1=0x9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_SETHEADERPRESENT_1=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMANDDATA_TOTALHEADERLENGTHINUDLUNITS_1=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x291
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x293
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x294
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x292
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x28e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x28f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x290
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x250
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x24f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0x214
+[TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0x213
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x27c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x278
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x27e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x27d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x27a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x279
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x27b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x267
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x26c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x269
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x268
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x26b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x26a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x26e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x26d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x29c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x22a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x226
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x225
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x227
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x228
+[TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x229
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0x217
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0x216
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0x218
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0x219
+[TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0x21a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0x215
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0x210
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0x20f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0x212
+[TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0x211
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_CONSTRUCTL_1=0x59
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_DECODEL_1=0x58
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_ENCODEL_1=0x57
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_LENGTH_1=0x5b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWDATAL_1=0x5a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL1_1=0x56
+[TRACE]TRACE_INTERNALS[0x88]_CSMSINFORMATIONELEMENT_NEWL_1=0x55
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x23e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x232
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x233
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x234
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x231
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x243
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x230
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x245
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x235
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x236
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x240
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x241
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x242
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x237
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x238
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x239
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x23a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x23b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x23c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x248
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x249
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x246
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x22f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x244
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x23d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x23f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x247
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x24a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x24b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x24c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0x1e3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x1e1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x1e2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0x1de
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0x1e4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0x1e5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0x1e6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0x1e7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0x1e8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0x1e9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0x209
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0x208
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0x1df
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0x1fa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0x20b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0x206
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0x207
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0x1d7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0x1d6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0x1d0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0x1d1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0x1dd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0x1db
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0x1dc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0x20e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0x1f8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0x1f9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0x1ea
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0x1f3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0x1f4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0x1eb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0x1ec
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0x1ed
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0x1ee
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0x1ef
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0x1f0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0x1f1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0x1f2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0x1f5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0x1f6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0x1f7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0x1e0
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0x1fb
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0x1fc
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0x1fd
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0x1fe
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0x1ff
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0x200
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0x201
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0x202
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0x203
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0x20d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0x20c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0x205
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0x204
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0x1d2
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0x1d3
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0x1d8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0x1d9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0x1d4
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0x1d5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0x1da
+[TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0x20a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x24e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x24d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x265
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x266
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x264
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x263
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x260
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x261
+[TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x262
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0x21c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0x21b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0x21d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0x21e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0x21f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x22c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x22b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x22d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x22e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0x224
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0x223
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0x220
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0x221
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0x222
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x28b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x286
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x28d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x28c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x288
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x287
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x28a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x289
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x283
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x27f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x285
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x284
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x281
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x280
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x282
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x273
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x26f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x276
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x275
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x274
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x277
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x270
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x272
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x271
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x252
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x251
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x253
+[TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x254
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ADDEMSINFORMATIONELEMENTL_1=0x6c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_APPENDBODYL_1=0x6f
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_BODYLENGTHINUDLUNITS_1=0x78
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_CONSTRUCTL_1=0x72
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_CONTROLINFORMATIONELEMENTWILLFITL_1=0x64
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_DECODEL1_1=0x71
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_DUPLICATEL_1=0x73
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_EMSINFORMATIONELEMENTWILLFITL_1=0x63
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ENCODEL_1=0x70
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_HEADERLENGTH_1=0x74
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_HEADERPRESENT_1=0x7a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_INFORMATIONELEMENTINDICESL_1=0x62
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_INFORMATIONELEMENTPTR_1=0x61
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_ISBINARYDATA_1=0x7c
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING1_1=0x6e
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_MAXPACKEDUDUNITSINBODYREMAINING_1=0x6d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_NEWBODYL_1=0x79
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_NEWL_1=0x60
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_SETHEADERPRESENT_1=0x7b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS1_1=0x77
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_1=0x75
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_TOTALHEADERLENGTHINUDLUNITS_2=0x76
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_1=0x65
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_2=0x66
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_3=0x67
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_4=0x68
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_5=0x69
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_6=0x6a
+[TRACE]TRACE_INTERNALS[0x88]_CSMSUSERDATA_UPDATEINFORMATIONELEMENTARRAYL_7=0x6b
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_CONSTRUCTL_1=0xa2
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_CTOR1_1=0x9f
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_DECODEL_1=0x9e
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_ENCODEL_1=0x9d
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_NEWBUFFERL_1=0xa3
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_OPERATOR1_1=0xa1
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_OPERATOR_1=0xa0
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILDELETION_SIZEL_1=0x9c
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CONSTRUCTL_1=0x93
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CTOR1_1=0x92
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_CTOR_1=0x8f
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_DECODEL_1=0x8e
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_DOSETPARSEDADDRESSL_1=0x94
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_ENCODEL_1=0x8d
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_NEWBUFFERL_1=0x8a
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_NEWEXTENSIONL_1=0x8b
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_OPERATOR1_1=0x91
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_OPERATOR_1=0x90
+[TRACE]TRACE_INTERNALS[0x88]_CVOICEMAILNOTIFICATION_SIZEL_1=0x8c
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_CONVERTANDPACKL_1=0x172
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_ELEMENTSIZEINBITSL_1=0x175
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_PACKEDOCTETSREQUIREDL_1=0x174
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_PACKL_1=0x170
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_UNPACKANDCONVERTL_1=0x173
+[TRACE]TRACE_INTERNALS[0x88]_TSMSALPHABETPACKER_UNPACKL_1=0x171
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_ALPHABET_1=0x18
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_ALPHABET_2=0x19
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_CLASS_1=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONSTATE_1=0x22
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONSTATE_2=0x23
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONTYPE_1=0x26
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_INDICATIONTYPE_2=0x27
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_1=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_2=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_3=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_4=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETALPHABET_5=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETCLASS_1=0x20
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETCLASS_2=0x21
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONSTATE_1=0x24
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONSTATE_2=0x25
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONTYPE_1=0x28
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETINDICATIONTYPE_2=0x29
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_SETTEXTCOMPRESSED_1=0x17
+[TRACE]TRACE_INTERNALS[0x88]_TSMSDATACODINGSCHEME_TEXTCOMPRESSED_1=0x16
+[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_1=0x5e
+[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_GETCATEGORYDEFINITION_2=0x5f
+[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_1=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_TSMSINFORMATIONELEMENTCATEGORIES_TRANSLATECATEGORYTOINDEX_2=0x5d
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGEALPROTOCOL_1=0x13
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETSHORTMESSAGETYPE_1=0x15
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICEINDICATOR_1=0x10
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SETTELEMATICDEVICETYPE_1=0x11
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SHORTMESSAGEALPROTOCOL_1=0x12
+[TRACE]TRACE_INTERNALS[0x88]_TSMSPROTOCOLIDENTIFIER_SHORTMESSAGETYPE_1=0x14
+[TRACE]TRACE_INTERNALS[0x88]_TSMSSERVICECENTERTIMESTAMP_DECODEL_1=0x50
+[TRACE]TRACE_INTERNALS[0x88]_TSMSSERVICECENTERTIMESTAMP_ENCODEL_1=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_DECODEL_1=0x54
+[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL1_1=0x53
+[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_ENCODEL_1=0x52
+[TRACE]TRACE_INTERNALS[0x88]_TSMSVALIDITYPERIOD_TIME_1=0x51
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_GETINCOMPLETEMESSAGEINFOL_1=0x95
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CINCOMPLETECLASS0MESSAGEINFO_SETINCOMPLETEMESSAGEINFOL_1=0x96
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_ADDENTRYL_1=0x123
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_1=0x12a
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_BEGINTRANSACTIONLC_2=0x12b
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_CHANGEENTRYL_1=0x124
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_CLOSE_1=0x11a
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_1=0x118
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMMITTRANSACTIONL_2=0x119
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_1=0x128
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_COMPACTL_2=0x129
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DELETEENTRYL_1=0x120
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_1=0x12c
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_2=0x12d
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_DOOPENL_3=0x12e
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_EXTRASTREAMID_1=0x125
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE1_1=0x122
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_FILESTORE_1=0x121
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_1=0x116
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_OPENL_2=0x117
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PRIVATEPATH_1=0x12f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_1=0x11d
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_2=0x11e
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL1_3=0x11f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_1=0x11b
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_PURGEL_2=0x11c
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_1=0x126
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSARSTORE_SETEXTRASTREAMIDL_2=0x127
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_NEWLC_1=0x10c
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x10d
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x10e
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSBUFFERSEGMENTER_TOTALCONVERTEDLENGTHL_1=0x10f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_ADDINFORMATIONELEMENTL_1=0x106
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDDATA_1=0x109
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_COMMANDTYPE_1=0xff
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_DUPLICATEL_1=0x10b
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENTINDEX_1=0x105
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_INFORMATIONELEMENT_1=0x104
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MAXCOMMANDDATALENGTH_1=0x108
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGENUMBER_1=0x101
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_MESSAGEREFERENCE_1=0xfd
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_NUMINFORMATIONELEMENTS_1=0x103
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_REMOVEINFORMATIONELEMENT_1=0x107
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDDATAL_1=0x10a
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETCOMMANDTYPE_1=0x100
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGENUMBER_1=0x102
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETMESSAGEREFERENCE_1=0xfe
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_SETSTATUSREPORTREQUEST_1=0xfc
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSCOMMAND_STATUSREPORTREQUEST_1=0xfb
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_DUPLICATEL_1=0xea
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_FAILURECAUSE_1=0xe8
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVERREPORT_SETFAILURECAUSE_1=0xe9
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_DUPLICATEL_1=0xd9
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_MOREMESSAGESTOSEND_1=0xd1
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_PROTOCOLIDENTIFIER_1=0xda
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_REPLYPATH_1=0xd3
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SERVICECENTERTIMESTAMP_1=0xd7
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETMOREMESSAGESTOSEND_1=0xd2
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETREPLYPATH_1=0xd4
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSERVICECENTERTIMESTAMP_1=0xd8
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_SETSTATUSREPORTINDICATION_1=0xd6
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSDELIVER_STATUSREPORTINDICATION_1=0xd5
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_NEWLC_1=0x110
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_1=0x111
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSEMSBUFFERSEGMENTER_SEGMENTNEXTL_2=0x112
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_1=0x90
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_ADDENHANCEDVOICEMAILIEL_2=0x91
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_CONTAINSENHANCEDVOICEMAILIEL_1=0x94
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_COPYENHANCEDVOICEMAILIEL_1=0x93
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSENHANCEDVOICEMAILOPERATIONS_REMOVEENHANCEDVOICEMAILIEL_1=0x92
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_ADDHYPERLINKL_1=0x7e
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_COPYHYPERLINKATINDEXL_1=0x80
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_NUMBEROFHYPERLINKSL_1=0x7f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEALLHYPERLINKSL_1=0x81
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSHYPERLINKOPERATIONS_REMOVEHYPERLINKL_1=0x82
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSIEOPERATION_ID_1=0x7d
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMAILHEADERL_1=0x6b
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTL_1=0x60
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_1=0x67
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_2=0x68
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ADDSLOTL_3=0x69
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ALTERNATIVE7BITENCODING_1=0x58
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_COPYEMSELEMENTSL_1=0x66
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEDONSIM_1=0x7a
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEMESSAGEPDUSL_1=0x5d
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DECODEPARTIALCOMPLETEMESSAGEPDUSL_1=0x5e
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_DTOR_1=0x46
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL1_1=0x5f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ENCODEMESSAGEPDUSL_1=0x5c
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEL_1=0x4a
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x74
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_EXTERNALIZEWITHOUTBUFFERL_1=0x48
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_FORWARDTOCLIENT_1=0x7c
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMAILHEADERL_1=0x6d
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETEMSINFORMATIONELEMENTSL_1=0x64
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_1=0x50
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_2=0x51
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_3=0x52
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_4=0x53
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETENCODINGINFOL_5=0x54
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_1=0x75
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORIEL_2=0x76
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_1=0x77
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_GETOPERATIONSFORNONIEL_2=0x78
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEL_1=0x49
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERANDVERSIONL_1=0x73
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_INTERNALIZEWITHOUTBUFFERL_1=0x47
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISEMAILHEADER_1=0x6c
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL1_1=0x5b
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_ISSUPPORTEDL_1=0x5a
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MATCHSLOTS_1=0x6a
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MAXMESSAGELENGTH_1=0x4e
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_MESSAGELENGTHL_1=0x4f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL1_1=0x45
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NEWL_1=0x44
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_1=0x4c
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_NUMMESSAGEPDUSL_2=0x4d
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_OPTIMIZESETTINGSL_1=0x57
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTL_1=0x61
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_REMOVEEMSINFORMATIONELEMENTSL_1=0x62
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_RESETEMSL_1=0x63
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETALTERNATIVE7BITENCODING_1=0x59
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETDECODEDONSIM_1=0x79
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETFORWARDTOCLIENT_1=0x7b
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUSERDATASETTINGSL_1=0x56
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_1=0x6f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETUTCOFFSET_2=0x70
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_SETVERSION_1=0x72
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_TEXTPRESENT_1=0x4b
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UPDATESLOTSL_1=0x65
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_USERDATASETTINGS_1=0x55
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_UTCOFFSET_1=0x6e
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSMESSAGE_VERSION_1=0x71
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_ALPHABET_1=0xad
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_APPLICATIONPORTADDRESSING_1=0xbf
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_BITS7TO4_1=0xab
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_CLASS_1=0xaf
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEPDUINDEX_1=0xbd
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_CONCATENATEDMESSAGEREFERENCE_1=0xb9
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_DATACODINGSCHEMEPRESENT_1=0xcb
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_DUPLICATEL_1=0x9a
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_ENCODEMESSAGEPDUL_1=0x9b
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONSTATE_1=0xb3
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_INDICATIONTYPE_1=0xb5
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_1=0xa4
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_2=0xa5
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_3=0xa6
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NATIONALLANGUAGEENCODING_4=0xa7
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL1_1=0x98
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL2_1=0x99
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NEWL_1=0x97
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_NUMCONCATENATEDMESSAGEPDUS_1=0xbb
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDSERVICECENTERADDRESS_1=0x9e
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PARSEDTOFROMADDRESS_1=0xa2
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PIDTYPE_1=0xc1
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_PROTOCOLIDENTIFIERPRESENT_1=0xcd
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SERVICECENTERADDRESS_1=0x9c
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETALPHABET_1=0xae
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETAPPLICATIONPORTADDRESSINGL_1=0xc0
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETBITS7TO4_1=0xac
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCLASS_1=0xb0
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEPDUINDEX_1=0xbe
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETCONCATENATEDMESSAGEREFERENCE_1=0xba
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETDATACODINGSCHEMEPRESENT_1=0xcc
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONSTATE_1=0xb4
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETINDICATIONTYPE_1=0xb6
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_1=0xa8
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_2=0xa9
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNATIONALLANGUAGEENCODINGL_3=0xaa
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETNUMCONCATENATEDMESSAGEPDUS_1=0xbc
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDSERVICECENTERADDRESSL_1=0x9f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPARSEDTOFROMADDRESSL_1=0xa3
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPIDTYPE_1=0xc2
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETPROTOCOLIDENTIFIERPRESENT_1=0xce
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSERVICECENTERADDRESSL_1=0x9d
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETSHORTMESSAGETYPE_1=0xc6
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICEINDICATOR_1=0xc4
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTELEMATICDEVICETYPE_1=0xc8
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCOMPRESSED_1=0xb2
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTEXTCONCATENATEDL_1=0xb8
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETTOFROMADDRESSL_1=0xa1
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SETUSERDATAPRESENT_1=0xca
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_SHORTMESSAGETYPE_1=0xc5
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICEINDICATOR_1=0xc3
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TELEMATICDEVICETYPE_1=0xc7
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCOMPRESSED_1=0xb1
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TEXTCONCATENATED_1=0xb7
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_TOFROMADDRESS_1=0xa0
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA1_1=0xd0
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATAPRESENT_1=0xc9
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSPDU_USERDATA_1=0xcf
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_1=0x85
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDPARSEDREPLYADDRESSL_2=0x86
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_1=0x83
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_ADDREPLYADDRESSL_2=0x84
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_CONTAINSREPLYADDRESSIEL_1=0x87
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETPARSEDREPLYADDRESSL_1=0x89
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_GETREPLYADDRESSL_1=0x88
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSREPLYADDRESSOPERATIONS_REMOVEREPLYADDRESSL_1=0x8a
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_ADDSPECIALMESSAGEINDICATIONL_1=0x8b
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETCOUNTOFSPECIALMESSAGEINDICATIONSL_1=0x8c
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_GETMESSAGEINDICATIONIEL_1=0x8d
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVEALLSPECIALMESSAGEINDICATIONSL_1=0x8f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSPECIALSMSMESSAGEOPERATIONS_REMOVESPECIALMESSAGEINDICATIONL_1=0x8e
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DISCHARGETIME_1=0xf6
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_DUPLICATEL_1=0xfa
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MESSAGEREFERENCE_1=0xf2
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_MOREMESSAGESTOSEND_1=0xee
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SERVICECENTERTIMESTAMP_1=0xf4
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETDISCHARGETIME_1=0xf7
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMESSAGEREFERENCE_1=0xf3
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETMOREMESSAGESTOSEND_1=0xef
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSERVICECENTERTIMESTAMP_1=0xf5
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUSREPORTQUALIFIER_1=0xf1
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_SETSTATUS_1=0xf9
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUSREPORTQUALIFIER_1=0xf0
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSTATUSREPORT_STATUS_1=0xf8
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_DUPLICATEL_1=0xed
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_FAILURECAUSE_1=0xeb
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMITREPORT_SETFAILURECAUSE_1=0xec
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_DUPLICATEL_1=0xe7
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_MESSAGEREFERENCE_1=0xe3
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REJECTDUPLICATES_1=0xdb
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_REPLYPATH_1=0xdf
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETMESSAGEREFERENCE_1=0xe4
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREJECTDUPLICATES_1=0xdc
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETREPLYPATH_1=0xe0
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETSTATUSREPORTREQUEST_1=0xe2
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIODFORMAT_1=0xde
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_SETVALIDITYPERIOD_1=0xe6
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_STATUSREPORTREQUEST_1=0xe1
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIODFORMAT_1=0xdd
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_CSMSSUBMIT_VALIDITYPERIOD_1=0xe5
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TSMSBUFFERREASSEMBLER_REASSEMBLENEXTL_1=0x113
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_SETTEXTCONCATENATED_1=0x115
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TSMSUSERDATASETTINGS_TEXTCONCATENATED_1=0x114
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_CTOR_1=0x130
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_EXTERNALIZEL_1=0x13a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_INTERNALIZEL_1=0x139
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_MESSAGETYPESUPPORTED_1=0x133
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR1_1=0x132
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_OPERATOR_1=0x131
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_SETVERSION_1=0x138
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_1=0x134
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_2=0x135
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VALIDATEOPERATIONL_3=0x136
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CINCOMPLETECLASS0MESSAGEINFO_VERSION_1=0x137
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORECLOSEOBJECT_1=0x17e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_1=0x188
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_2=0x189
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DOCOMMITANDCOMPACTL_3=0x18a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_1=0x180
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_2=0x181
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_3=0x182
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_DODELETEENTRYL_4=0x183
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_EXTERNALIZEENTRYARRAYL_1=0x187
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_INTERNALIZEENTRYARRAYL_1=0x184
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REINSTATEDELETEDENTRIES_1=0x186
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REMOVEDELETEDENTRIES_1=0x185
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSARSTORE_REVERT_1=0x17f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CHECKCONVERTEDBUFFERALLOCL_1=0x17b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_CONSTRUCTL_1=0x176
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_DOSEGMENTNEXTL_1=0x178
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_ELEMENTSTORETURNFROMCONVERTEDBUFFERL_1=0x17c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_FINDBESTALTERNATIVEENCODINGL_1=0x17a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_MOREL_1=0x179
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSBUFFERSEGMENTER_RESET_1=0x177
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_CONSTRUCTL_1=0x16c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DECODEL_1=0x16e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_DOSETSTATUSREPORTREQUEST_1=0x16f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_ENCODEL_1=0x16d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_INFORMATIONELEMENTPTR_1=0x169
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_PROTOCOLIDENTIFIER_1=0x16a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCOMMAND_TOFROMADDRESSPTR_1=0x16b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR1_1=0x12b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLNONIEOPERATION_OPERATOR_1=0x12a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR1_1=0xef
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSCTRLOPERATION_OPERATOR_1=0xee
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_CONSTRUCTL_1=0x157
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DATACODINGSCHEME_1=0x153
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_DECODEL_1=0x159
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_ENCODEL_1=0x158
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PARAMETERINDICATOR_1=0x155
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_PROTOCOLIDENTIFIER_1=0x154
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVERREPORT_USERDATAPTR_1=0x156
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_CONSTRUCTL_1=0x142
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DATACODINGSCHEME_1=0x147
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_DECODEL_1=0x144
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_ENCODEL_1=0x143
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_EXTERNALIZEMESSAGEPDUL_1=0x146
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_INTERNALIZEMESSAGEPDUL_1=0x145
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_TOFROMADDRESSPTR_1=0x149
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSDELIVER_USERDATAPTR_1=0x148
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSEMSBUFFERSEGMENTER_SEGMENTL_1=0x17d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_GETENHANCEDVOICEMAILIEL_1=0x105
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR1_1=0x101
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_OPERATOR_1=0x100
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_1=0x102
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_2=0x103
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSENHANCEDVOICEMAILOPERATIONS_VALIDATEOPERATIONL_3=0x104
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR1_1=0xf2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_OPERATOR_1=0xf1
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_1=0xf3
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_2=0xf4
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSHYPERLINKOPERATIONS_VALIDATEOPERATIONL_3=0xf5
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_CONSTRUCTL_1=0xf0
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_MESSAGETYPESUPPORTED_1=0xeb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_NEWL_1=0xea
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR1_1=0xed
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSIEOPERATION_OPERATOR_1=0xec
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL1_1=0x119
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_1=0x10d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_2=0x10e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_ADDCONTROLINFORMATIONELEMENTL_3=0x10f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_CONSTRUCTL_1=0x10c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DELETECONTROLINFORMATIONELEMENT_1=0x11e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_DTOR_1=0x10b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_EXTERNALIZEL_1=0x120
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FIND1STINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x110
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_FINDNEXTINSTANCEOFCONTROLINFORMATIONELEMENT_1=0x111
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_1=0x11b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_2=0x11c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL1_3=0x11d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_1=0x112
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_2=0x113
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_3=0x114
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_4=0x115
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_5=0x116
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETCONTROLINFORMATIONELEMENTL_6=0x117
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETIEOPERATIONL_1=0x123
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_GETNONIEOPERATIONL_1=0x124
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_INTERNALIZEL_1=0x121
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NEWL_1=0x10a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_NUMBEROFCONTROLINFORMATIONELEMENTS_1=0x11f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVECONTROLINFORMATIONELEMENT_1=0x118
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_REMOVENEXTCONTROLINFORMATIONELEMENT_1=0x11a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_RESETATTRIBUTESL_1=0x122
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_1=0x125
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETIEOPERATIONL_2=0x126
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGEADDITIONALATTRIBUTES_SETNONIEOPERATIONL_1=0x127
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL1_1=0xbe
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbc
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCONTROLINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xbd
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDCURRENTPDUTOPDUARRAYL_1=0xb9
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_1=0xbf
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_2=0xc0
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_3=0xc1
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_4=0xc2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOMULTISEGMENTMESSAGEL_5=0xc3
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSINFORMATIONELEMENTSTOSINGLESEGMENTMESSAGEL_1=0xc4
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSOBJECTDISTRIBUTIONL_1=0xe4
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDEMSUSERPROMPTL_1=0xe3
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDIETOUSERDATAL_1=0xba
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDINCOMPLETEMESSAGEINFOL_1=0xd5
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ADDRECEIVEDEMSINFORMATIONELEMENT_1=0xe6
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_1=0xe1
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CANBEREMOVED_2=0xe2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL1_1=0xb2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONSTRUCTL_1=0xb1
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_1=0xab
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CONVERTEDBUFFERLENGTHL_2=0xac
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGINSINGLEPDUL_1=0xb8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_1=0xb6
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CORRECTFORMATTINGL_2=0xb7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_CREATECONTROLIEOPERATIONSCLASSESL_1=0xe9
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEBUFFERL_1=0xd3
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_DECODEONLYTEXTL_1=0xd4
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_1=0xc5
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_10=0xce
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_11=0xcf
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_2=0xc6
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_3=0xc7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_4=0xc8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_5=0xc9
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_6=0xca
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_7=0xcb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_8=0xcc
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEBUFFERL_9=0xcd
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_1=0xd0
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_2=0xd1
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_ENCODEINTOSINGLEPDUL_3=0xd2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_FILLPDUL_1=0xbb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_1=0xd6
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_2=0xd7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_3=0xd8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_4=0xd9
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_5=0xda
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_6=0xdb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_7=0xdc
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_8=0xdd
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLCONTROLINFORMATIONELEMENTSL_9=0xde
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL1_1=0xe8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMAILHEADERINFORMATIONELEMENTL_1=0xe7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL1_1=0xe0
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_INSTALLEMSINFORMATIONELEMENTSL_1=0xdf
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_1=0xad
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_MERGEALTERNATIVE7BITENCODING_2=0xae
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_1=0xb3
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_NUMMESSAGEEMSPDUSL_2=0xb4
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_1=0xaf
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_PREPARECOMMANDMESSAGEL_2=0xb0
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_RESETWORKINGPDUL_1=0xb5
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSMESSAGE_UPDATEUSERPROMPTANDODIELEMENTSSTARTPOSITION_1=0xe5
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR1_1=0x129
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSNONIEOPERATION_OPERATOR_1=0x128
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOAPPLICATIONPORTADDRESSING_1=0x140
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETAPPLICATIONPORTADDRESSINGL_1=0x141
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOSETTEXTCONCATENATEDL_1=0x13f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_DOTEXTCONCATENATED_1=0x13e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_ENCODEMESSAGEPDUL1_1=0x13b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATECONCATENATIONDATAL_1=0x13c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSPDU_UPDATEEMAILHEADERDATAL_1=0x13d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR1_1=0xf7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_OPERATOR_1=0xf6
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_1=0xf8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_2=0xf9
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSREPLYADDRESSOPERATIONS_VALIDATEOPERATIONL_3=0xfa
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR1_1=0x107
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_OPERATOR_1=0x106
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_1=0x108
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSMSCCTRLPARAMETEROPERATIONS_VALIDATEOPERATIONL_2=0x109
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR1_1=0xff
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_OPERATOR_1=0xfe
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_1=0xfb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_2=0xfc
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSPECIALSMSMESSAGEOPERATIONS_VALIDATEOPERATIONL_3=0xfd
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1=0x1cf
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_CONSTRUCTL_1=0x166
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DATACODINGSCHEME_1=0x161
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_DECODEL_1=0x168
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_ENCODEL_1=0x167
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PARAMETERINDICATOR_1=0x163
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_PROTOCOLIDENTIFIER_1=0x162
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_TOFROMADDRESSPTR_1=0x165
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSTATUSREPORT_USERDATAPTR_1=0x164
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_CONSTRUCTL_1=0x15e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DATACODINGSCHEME_1=0x15a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_DECODEL_1=0x160
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_ENCODEL_1=0x15f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PARAMETERINDICATOR_1=0x15c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_PROTOCOLIDENTIFIER_1=0x15b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMITREPORT_USERDATAPTR_1=0x15d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_CONSTRUCTL_1=0x14e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DATACODINGSCHEME_1=0x14a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_DECODEL_1=0x151
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL1_1=0x150
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_ENCODEL_1=0x14f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_INTERNALIZEMESSAGEPDUL_1=0x152
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_PROTOCOLIDENTIFIER_1=0x14b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_TOFROMADDRESSPTR_1=0x14d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSSUBMIT_USERDATAPTR_1=0x14c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR1_1=0x12d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_OPERATOR_1=0x12c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_1=0x12e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CSMSTPSRROPERATIONS_VALIDATEOPERATIONL_2=0x12f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFHEXBUF_1=0x1a5
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_1=0x1ae
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_10=0x1b7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_2=0x1af
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_3=0x1b0
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_4=0x1b1
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_5=0x1b2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_6=0x1b3
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x1b4
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x1b5
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x1b6
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_1=0x18b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_10=0x194
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_11=0x195
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_12=0x196
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_13=0x197
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_14=0x198
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_15=0x199
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_16=0x19a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_17=0x19b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_18=0x19c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_19=0x19d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_2=0x18c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_20=0x19e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_21=0x19f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_22=0x1a0
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_23=0x1a1
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_24=0x1a2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_25=0x1a3
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_26=0x1a4
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_3=0x18d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_4=0x18e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_5=0x18f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_6=0x190
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_7=0x191
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_8=0x192
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_9=0x193
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x1c2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x1cb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x1cc
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_12=0x1cd
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_13=0x1ce
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_2=0x1c3
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_3=0x1c4
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_4=0x1c5
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_5=0x1c6
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_6=0x1c7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_7=0x1c8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_8=0x1c9
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_9=0x1ca
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_1=0x1b8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_10=0x1c1
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_2=0x1b9
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_3=0x1ba
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_4=0x1bb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_5=0x1bc
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_6=0x1bd
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_7=0x1be
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_8=0x1bf
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_9=0x1c0
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_1=0x1a6
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_2=0x1a7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_3=0x1a8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_4=0x1a9
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_5=0x1aa
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_6=0x1ab
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_7=0x1ac
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_8=0x1ad
--- a/smsprotocols/smsstack/wapprot/Group/bld.inf Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -44,58 +44,4 @@
../Group/wapprot.mmp
-PRJ_TESTEXPORTS
-
-//
-// Test files used by all WAP tests...
-//
-../test/configfiles/tone1.rtp z:/testdata/configs/tone1.rtp
-../test/configfiles/tone2.rtp z:/testdata/configs/tone2.rtp
-../test/configfiles/tone3.rtp z:/testdata/configs/tone3.rtp
-../test/configfiles/vcard1.vcf z:/testdata/configs/vcard1.vcf
-../test/configfiles/vcard2.vcf z:/testdata/configs/vcard2.vcf
-../test/configfiles/vcard3.vcf z:/testdata/configs/vcard3.vcf
-
-//
-// TE_WAPDGRM test files...
-//
-../test/TE_WAPDGRM/TE_wapdgrm.script z:/testdata/scripts/te_wapdgrm.script
-
-//
-// TE_WAPHDR test files...
-//
-../test/configfiles/te_waphdr.txt z:/testdata/configs/te_waphdr.txt
-../test/TE_WAPTHDR/TE_wapthdr.script z:/testdata/scripts/te_wapthdr.script
-../test/TE_WAPTHDR/TE_wapthdr_setup.script z:/testdata/scripts/te_wapthdr_setup.script
-
-//
-// TE_WAPSMS test files...
-//
-../test/TE_WAPSMS/TE_wapsms.script z:/testdata/scripts/te_wapsms.script
-../test/TE_WAPSMS/TE_wapsms_setup.script z:/testdata/scripts/te_wapsms_setup.script
-../test/TE_WAPSMS/TE_wapsms.txt z:/testdata/configs/te_wapsms.txt
-../test/TE_WAPSMS/te_setupgsmsms.txt z:/testdata/configs/te_setupgsmsms.txt
-../test/TE_WAPSMS/te_wapsms_commdb.cfg z:/testdata/configs/te_wapsms_commdb.cfg
-
-//
-// TE_WAPPROT test files...
-//
-../test/Te_wapprot/Te_WapProt.script z:/testdata/scripts/te_wapprot.script
-../test/Te_wapprot/Config.txt z:/testdata/configs/wapprotsuite/config.txt
-../test/Te_wapprot/WapProtSuite.cfg z:/testdata/configs/wapprotsuite/wapprotsuite.cfg
-../test/Te_wapprot/WapProtSuiteMM.cfg z:/testdata/configs/wapprotsuite/wapprotsuitemm.cfg
-../test/Te_wapprot/StatusReportsRequested.cfg z:/testdata/configs/wapprotsuite/statusreportsrequested.cfg
-../test/Te_wapprot/WapProtSuite.ini z:/testdata/configs/wapprotsuite/wapprotsuite.ini
-../test/Te_wapprot/WapStatusReports.ini z:/testdata/configs/wapprotsuite/wapstatusreports.ini
-../test/Te_wapprot/WAPStackOutOfDiskSpace.ini z:/testdata/configs/wapprotsuite/wapstackoutofdiskspace.ini
-../test/Te_wapprot/Te_WapStackOutOfDiskSpace.script z:/testdata/scripts/te_wapstackoutofdiskspace.script
-../test/Te_wapprot/Te_WapStackOutOfDiskSpace_ARM_UREL.script z:/testdata/scripts/te_wapstackoutofdiskspace_arm_urel.script
-
-
-
-PRJ_TESTMMPFILES
-
-../test/TE_WAPDGRM/TE_wapdgrm.mmp
-../test/TE_WAPTHDR/TE_wapthdr.mmp
-../test/TE_WAPSMS/TE_wapsms.mmp
-../test/Te_wapprot/TE_WapProt.mmp
+#include "../test/group/bld.inf"
\ No newline at end of file
--- a/smsprotocols/smsstack/wapprot/Group/wapprot.mmp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Group/wapprot.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -44,6 +44,7 @@
USERINCLUDE ../../gsmu/inc
USERINCLUDE ../../smsprot/Inc
USERINCLUDE ../../smsu/inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
@@ -53,8 +54,6 @@
LIBRARY commsdat.lib
-DEBUGLIBRARY comsdbgutil.lib
-
//#if defined(WINS)
// libraries needed by CCover
//LIBRARY covrt.obj covrt-nt-entryuser.obj covrt-nt-link.obj
--- a/smsprotocols/smsstack/wapprot/Src/wapdgrm.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/wapdgrm.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 "wapdgrmTraces.h"
+#endif
+
#include "gsmubuf.h"
#include "gsmuset.h"
#include "Gsmuelem.h"
@@ -28,7 +34,7 @@
//
CWapDatagram* CWapDatagram::NewL(const CSmsMessage& aSms)
{
- LOGWAPPROT2("CWapDatagram::NewL(): aSms=0x%08x", (TInt) &aSms);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_1, "CWapDatagram::NewL(): aSms=0x%08x", (TInt) &aSms);
CWapDatagram* datagram = new (ELeave)CWapDatagram();
@@ -36,38 +42,38 @@
datagram->ConstructL(aSms);
CleanupStack::Pop();
- LOGWAPPROT2("CWapDatagram::NewL(): iFromPort: %d", datagram->iFromPort);
- LOGWAPPROT2("CWapDatagram::NewL(): iToPort: %d", datagram->iToPort);
- LOGWAPPROT2("CWapDatagram::NewL(): iReference: %d", datagram->iReference);
- LOGWAPPROT2("CWapDatagram::NewL(): iTotalSegments: %d", datagram->iTotalSegments);
- LOGWAPPROT2("CWapDatagram::NewL(): iSegmentNumber: %d", datagram->iSegmentNumber);
- LOGWAPPROT2("CWapDatagram::NewL(): iIsComplete: %d", datagram->iIsComplete);
- LOGWAPPROT2("CWapDatagram::NewL(): iReference: %d", datagram->iReference);
- LOGWAPPROT2("CWapDatagram::NewL(): iIsTextHeader: %d", datagram->iIsTextHeader);
- LOGWAPPROT2("CWapDatagram::NewL(): iLogServerId: %d", datagram->iLogServerId);
- LOGWAPPROT2("CWapDatagram::NewL(): i16BitPorts: %d", datagram->i16BitPorts);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_2, "CWapDatagram::NewL(): iFromPort: %d", datagram->iFromPort);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_3, "CWapDatagram::NewL(): iToPort: %d", datagram->iToPort);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_4, "CWapDatagram::NewL(): iReference: %d", datagram->iReference);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_5, "CWapDatagram::NewL(): iTotalSegments: %d", datagram->iTotalSegments);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_6, "CWapDatagram::NewL(): iSegmentNumber: %d", datagram->iSegmentNumber);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_7, "CWapDatagram::NewL(): iIsComplete: %d", datagram->iIsComplete);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_8, "CWapDatagram::NewL(): iReference: %d", datagram->iReference);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_9, "CWapDatagram::NewL(): iIsTextHeader: %d", datagram->iIsTextHeader);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_10, "CWapDatagram::NewL(): iLogServerId: %d", datagram->iLogServerId);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_11, "CWapDatagram::NewL(): i16BitPorts: %d", datagram->i16BitPorts);
// assert destination port
if (datagram->i16BitPorts)
{
if (datagram->iToPort>=0 && datagram->iToPort<=65535)
{
- LOGWAPPROT1("iToPort OK");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_12, "iToPort OK");
}
else
{
- LOGWAPPROT1("iToPort FAILED");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_13, "iToPort FAILED");
}
}
else
{
if (datagram->iToPort>=0 && datagram->iToPort<=255)
{
- LOGWAPPROT1("iToPort OK");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_14, "iToPort OK");
}
else
{
- LOGWAPPROT1("iToPort FAILED");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_15, "iToPort FAILED");
}
}
@@ -75,22 +81,22 @@
{
if (datagram->iFromPort>=0 && datagram->iFromPort<=65535)
{
- LOGWAPPROT1("iFromPort OK");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_16, "iFromPort OK");
}
else
{
- LOGWAPPROT1("iFromPort FAILED");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_17, "iFromPort FAILED");
}
}
else
{
if (datagram->iFromPort>=0 && datagram->iFromPort<=255)
{
- LOGWAPPROT1("iFromPort OK");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_18, "iFromPort OK");
}
else
{
- LOGWAPPROT1("iFromPort FAILED");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL_19, "iFromPort FAILED");
}
}
@@ -103,7 +109,7 @@
//
CWapDatagram* CWapDatagram::NewL(const TDesC8& aSendBuffer)
{
- LOGWAPPROT2("CWapDatagram::NewL(): aSendBuffer=0x%08x", (TInt) &aSendBuffer);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_NEWL1_1, "CWapDatagram::NewL(): aSendBuffer=0x%08x", (TInt) &aSendBuffer);
CWapDatagram* datagram = new (ELeave)CWapDatagram();
@@ -117,7 +123,7 @@
CWapDatagram::~CWapDatagram()
{
- LOGWAPPROT1("CWapDatagram::~CWapDatagram()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_DTOR_1, "CWapDatagram::~CWapDatagram()");
delete iRecvbuf;
delete iBuffer;
@@ -131,7 +137,7 @@
//
void CWapDatagram::EncodeConcatenatedMessagesL(RFs& aFs, CArrayPtr<CSmsMessage>& aSmsMessageArray)
{
- LOGWAPPROT2("CWapDatagram::EncodeConcatenatedMessagesL(): %d messages", aSmsMessageArray.Count());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1, "CWapDatagram::EncodeConcatenatedMessagesL(): %d messages", aSmsMessageArray.Count());
// Couple of checkings makes sense
__ASSERT_DEBUG(iToPort >=0 && iToAddress.Length()>=0
@@ -195,7 +201,7 @@
void CWapDatagram::DecodeConcatenatedMessagesL(CArrayPtr<TSegmentData>& aSmsMessageArray)
{
- LOGWAPPROT1("CWapDatagram::DecodeConcatenatedMessagesL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1, "CWapDatagram::DecodeConcatenatedMessagesL()");
// The TSegmentData elements are in the random order in the array
TInt Count = aSmsMessageArray.Count();
@@ -361,7 +367,7 @@
//
void CWapDatagram::Construct(const TDesC8& aSendBuffer)
{
- LOGWAPPROT1("CWapDatagram::Construct()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONSTRUCT_1, "CWapDatagram::Construct()");
// Set version number to 1, as we have had to make
// changes to CWapDatagram for CR0929
@@ -379,7 +385,7 @@
//
void CWapDatagram::ConstructL(const CSmsMessage& aSms)
{
- LOGWAPPROT1("CWapDatagram::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONSTRUCTL_1, "CWapDatagram::ConstructL()");
// Set version number to 1, as we have had to make
// changes to CWapDatagram for CR0929
@@ -446,7 +452,7 @@
//
void CWapDatagram::GetDatagramSettingsL()
{
- LOGWAPPROT1("CWapDatagram::GetDatagramSettingsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1, "CWapDatagram::GetDatagramSettingsL()");
/* The WAP stack always receives 8 bit WAP datagrams from the SMS Stack as a single CSmsMessage.
This is because 8 bit WAP messages which cannot be encoded into a single PDU are sent in a segmented SMS
@@ -491,7 +497,7 @@
//
void CWapDatagram::GetDatagramSettings(const CSmsMessage& aSms)
{
- LOGWAPPROT1("CWapDatagram::GetDatagramSettings()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_GETDATAGRAMSETTINGS_1, "CWapDatagram::GetDatagramSettings()");
const CSmsPDU& Pdu = aSms.SmsPDU();
@@ -524,7 +530,7 @@
//
void CWapDatagram::ConvertL(const TDesC8& aNarrowChars,CSmsBufferBase& aSmsBuffer) const
{
- LOGWAPPROT1("CWapDatagram::ConvertL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONVERTL_1, "CWapDatagram::ConvertL()");
// Convert the data in segments of specified max size
const TInt KMaxSegmentSize=CSmsBufferBase::EMaxBufLength;
@@ -555,7 +561,7 @@
//
void CWapDatagram::ConvertL(const CSmsBufferBase& aSmsBuffer,HBufC8** aNarrowChars) const
{
- LOGWAPPROT1("CWapDatagram::ConvertL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_CONVERTL1_1, "CWapDatagram::ConvertL()");
// Convert the data in segments of specified max size
const TInt KMaxSegmentSize=CSmsBufferBase::EMaxBufLength;
@@ -600,7 +606,7 @@
void CWapDatagram::SetSmsMessageSettingsL(CSmsMessage& aSmsMessage, TBool aSetPorts)
{
- LOGWAPPROT1("CWapDatagram::SetSmsMessageSettingsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1, "CWapDatagram::SetSmsMessageSettingsL()");
CSmsPDU& Pdu = aSmsMessage.SmsPDU();
@@ -671,7 +677,7 @@
//
TInt CWapDatagram::LinkOffset()
{
- LOGWAPPROT1("CWapDatagram::LinkOffset()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_LINKOFFSET_1, "CWapDatagram::LinkOffset()");
return _FOFF(CWapDatagram,iLink);
@@ -680,7 +686,7 @@
TBool CWapDatagram::SetUTCOffset(const TTimeIntervalSeconds& aUTCOffset)
{
- LOGWAPPROT1("CWapDatagram::SetUTCOffset()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_SETUTCOFFSET_1, "CWapDatagram::SetUTCOffset()");
TBool rc = ETrue;
TInt utcOffset = aUTCOffset.Int();
@@ -692,7 +698,7 @@
}
else
{
- LOGWAPPROT2("CWapDatagram:SetUTCOffset offset [out of range] = %d",utcOffset);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPDATAGRAM_SETUTCOFFSET_2, "CWapDatagram:SetUTCOffset offset [out of range] = %d",utcOffset);
rc = EFalse;
}
--- a/smsprotocols/smsstack/wapprot/Src/wapmain.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/wapmain.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -12,6 +12,12 @@
//
// Description:
//
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "wapmainTraces.h"
+#endif
+
#include "wapmain.h"
#include <e32std.h>
#include "smsstacklog.h"
@@ -20,7 +26,7 @@
{
// Ignore in code coverag - panic method
BULLSEYE_OFF
- LOGWAPPROT2("WAPUPANIC %d", aPanic);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, WAPMAIN_PANIC_1, "WAPUPANIC %d", aPanic);
_LIT(KWapProtPanic, "WAPPROT");
User::Panic(KWapProtPanic, aPanic);
BULLSEYE_RESTORE
--- a/smsprotocols/smsstack/wapprot/Src/wappstor.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/wappstor.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 "wappstorTraces.h"
+#endif
+
#include "wappstor.h"
#include "ws_main.h"
#include "smsstackutils.h"
@@ -26,7 +32,7 @@
CWapReassemblyStore* CWapReassemblyStore::NewL(RFs& aFs)
{
- LOGWAPPROT1("CWapReassemblyStore::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_NEWL_1, "CWapReassemblyStore::NewL()");
CWapReassemblyStore* reassembly=new (ELeave)CWapReassemblyStore(aFs);
CleanupStack::PushL(reassembly);
@@ -44,7 +50,7 @@
TBool CWapReassemblyStore::AddMessageL( TInt& aIndex, const CWapDatagram& aDatagram)
{
- LOGWAPPROT1("CWapReassemblyStore::AddMessageL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_ADDMESSAGEL_1, "CWapReassemblyStore::AddMessageL()");
CArrayPtrFlat<CWapDatagram::TSegmentData>* segmentArray = new
(ELeave) CArrayPtrFlat<CWapDatagram::TSegmentData> (8);
@@ -198,7 +204,7 @@
void CWapReassemblyStore::GetDatagramL( TInt aIndex,
CWapDatagram& aDatagram)
{
- LOGWAPPROT1("CWapReassemblyStore::GetDatagramL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_GETDATAGRAML_1, "CWapReassemblyStore::GetDatagramL()");
CArrayPtrFlat<CWapDatagram::TSegmentData>* segmentArray = new
(ELeave) CArrayPtrFlat<CWapDatagram::TSegmentData> (8);
@@ -231,7 +237,7 @@
TBool CWapReassemblyStore::FindAndDeleteDatagramL( CWapDatagram& aDatagram)
{
- LOGWAPPROT1("CWapReassemblyStore::FindAndDeleteDatagramL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1, "CWapReassemblyStore::FindAndDeleteDatagramL()");
TInt index;
TBool isFound = EFalse;
@@ -263,7 +269,7 @@
void CWapReassemblyStore::ConstructL()
{
- LOGWAPPROT1("CWapReassemblyStore::ConstructL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_CONSTRUCTL_1, "CWapReassemblyStore::ConstructL()");
//get full path of reassembly store
PrivatePath(iFullPathBuf);
@@ -286,7 +292,7 @@
CWapDatagram& aDatagram,
CArrayPtr<CWapDatagram::TSegmentData>& aSegmentArray)
{
- LOGWAPPROT1("CWapReassemblyStore::InternalizeEntryL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1, "CWapReassemblyStore::InternalizeEntryL Start");
BeginTransactionLC();
RStoreReadStream ReadStream;
@@ -318,7 +324,7 @@
// Closes the ReadStream
CleanupStack::PopAndDestroy();
CommitTransactionL();
- LOGWAPPROT1("CWapReassemblyStore::InternalizeEntryL End");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2, "CWapReassemblyStore::InternalizeEntryL End");
} // CWapReassemblyStore::InternalizeEntryL
@@ -335,7 +341,7 @@
const CWapDatagram& aDatagram,
const CArrayPtr<CWapDatagram::TSegmentData>& aSegmentArray)
{
- LOGWAPPROT1("CWapReassemblyStore::ExternalizeEntryL Start");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1, "CWapReassemblyStore::ExternalizeEntryL Start");
TInt32 Count = aSegmentArray.Count();
RStoreWriteStream WriteStream;
@@ -370,7 +376,7 @@
const CWapDatagram& aDatagram,
TInt aNumDatagrams)
{
- LOGWAPPROT1("CWapReassemblyStore::PopulateEntry()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_POPULATEENTRY_1, "CWapReassemblyStore::PopulateEntry()");
TInt ToPort = 0;
TInt FromPort = 0;
@@ -402,7 +408,7 @@
void CWapReassemblyStore::CreateEntryL(const CWapDatagram& aDatagram,
const CArrayPtr<CWapDatagram::TSegmentData>& aSegmentArray)
{
- LOGWAPPROT1("CWapReassemblyStore::CreateEntryL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_CREATEENTRYL_1, "CWapReassemblyStore::CreateEntryL");
TWapReassemblyEntry Entry;
TStreamId WriteStream = KNullStreamId;
@@ -427,7 +433,7 @@
*/
void CWapReassemblyStore::OpenStoreL()
{
- LOGWAPPROT1("CWapReassemblyStore::OpenStoreL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPREASSEMBLYSTORE_OPENSTOREL_1, "CWapReassemblyStore::OpenStoreL()");
OpenL(iFullPathBuf,KWapReassemblyStoreUid);
} // CWapReassemblyStore::OpenStoreL
--- a/smsprotocols/smsstack/wapprot/Src/wapthdr.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/wapthdr.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -20,6 +20,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "wapthdrTraces.h"
+#endif
+
#include <e32std.h>
#include "wapthdr.h"
#include "ws_main.h"
@@ -38,21 +44,21 @@
{
// Long header ("//SCKL") indices
// destination port (, other header)
- { 1,{ 6, 10, 0, 0, 0, 0} },
+ { 1,{ 6, 10, 0, 0, 0, 0} },
// destination port, source port (, other header)
- { 2,{ 6, 10, 14, 0, 0, 0} },
+ { 2,{ 6, 10, 14, 0, 0, 0} },
// destination port, source port,
// reference, total segments, current segment(, other header)
- { 5,{ 6, 10, 14, 16, 18, 20}},
+ { 5,{ 6, 10, 14, 16, 18, 20}},
// Short header ("//SCK") indices
// destination port (, other header)
- { 1, { 5, 7, 0, 0, 0, 0}},
+ { 1, { 5, 7, 0, 0, 0, 0}},
// destination port, source port (, other header)
- { 2, { 5, 7, 9, 0, 0, 0}},
+ { 2, { 5, 7, 9, 0, 0, 0}},
// destination port, source port,
// reference, total segments, current segment(, other header)
- { 5,{ 5, 7, 9, 11, 13, 15}},
+ { 5,{ 5, 7, 9, 11, 13, 15}},
};
@@ -63,22 +69,22 @@
* @note simply use KNullDesC8, if you are going to encode.
*/
TWapTextMessage::TWapTextMessage(const TDesC8& aWapMessage)
- :iIsWapTextMessage(EFalse)
- ,iWAPMessage(aWapMessage)
- ,iIs16Bit(EFalse)
- ,iDestinationPort(-1)
- ,iSourcePort(-1)
- ,iReference(0)
- ,iTotalSegments(0)
- ,iSegmentNumber(0)
- ,iOtherHeader(0)
- ,iOtherHeaderLength(0)
- ,iData(0)
- ,iDataLength(0)
- ,iRefOtherHeader(KNullDesC8)
- ,iRefData(KNullDesC8)
- {
- } // TWapTextMessage::TWapTextMessage
+ :iIsWapTextMessage(EFalse)
+ ,iWAPMessage(aWapMessage)
+ ,iIs16Bit(EFalse)
+ ,iDestinationPort(-1)
+ ,iSourcePort(-1)
+ ,iReference(0)
+ ,iTotalSegments(0)
+ ,iSegmentNumber(0)
+ ,iOtherHeader(0)
+ ,iOtherHeaderLength(0)
+ ,iData(0)
+ ,iDataLength(0)
+ ,iRefOtherHeader(KNullDesC8)
+ ,iRefData(KNullDesC8)
+ {
+ } // TWapTextMessage::TWapTextMessage
/**
@@ -87,111 +93,111 @@
* what will be the array element type ?
*/
void TWapTextMessage::EncodeSegmentsL(CArrayPtr<HBufC8>& aSegmentArray)
- {
- TBuf8<KMaxSmsChars> header; // buffer for a modifiable header
- TInt headerLength = 0;
- TInt segmentNumberIndex = 0; // index of segment number field in the header
- TBuf8<2> hexSegmentNumber;
- TInt dataSegmented = 0;
+ {
+ TBuf8<KMaxSmsChars> header; // buffer for a modifiable header
+ TInt headerLength = 0;
+ TInt segmentNumberIndex = 0; // index of segment number field in the header
+ TBuf8<2> hexSegmentNumber;
+ TInt dataSegmented = 0;
- LOGWAPPROT1("TWapTextMessage::EncodeSegmentsL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_ENCODESEGMENTSL_1, "TWapTextMessage::EncodeSegmentsL()");
- iSegmentNumber = 0;
- do
- {
- //
- // Create the segment and add it to the array...
- //
- HBufC8* segment = HBufC8::NewL(KMaxSmsChars); // 160 characters
- CleanupStack::PushL(segment);
- TPtr8 ptr(segment->Des());
- aSegmentArray.AppendL(segment);
- CleanupStack::Pop(); // segment
+ iSegmentNumber = 0;
+ do
+ {
+ //
+ // Create the segment and add it to the array...
+ //
+ HBufC8* segment = HBufC8::NewL(KMaxSmsChars); // 160 characters
+ CleanupStack::PushL(segment);
+ TPtr8 ptr(segment->Des());
+ aSegmentArray.AppendL(segment);
+ CleanupStack::Pop(); // segment
- //
- // Calculate length of header and copy it...
- //
- if (iSegmentNumber==0)
- {
- headerLength = CreateHeader(header, segmentNumberIndex);
- }
+ //
+ // Calculate length of header and copy it...
+ //
+ if (iSegmentNumber==0)
+ {
+ headerLength = CreateHeader(header, segmentNumberIndex);
+ }
- ptr.Copy(header);
- if (iTotalSegments>255)
- {
- User::Leave(KErrOverflow);
- }
+ ptr.Copy(header);
+ if (iTotalSegments>255)
+ {
+ User::Leave(KErrOverflow);
+ }
- //
- // Set segment number...
- //
- if (segmentNumberIndex != 0)
- {
- hexSegmentNumber.NumFixedWidthUC(iSegmentNumber+1, EHex, 2); // two bytes wide
- ptr.Insert(segmentNumberIndex, hexSegmentNumber);
- }
+ //
+ // Set segment number...
+ //
+ if (segmentNumberIndex != 0)
+ {
+ hexSegmentNumber.NumFixedWidthUC(iSegmentNumber+1, EHex, 2); // two bytes wide
+ ptr.Insert(segmentNumberIndex, hexSegmentNumber);
+ }
- //
- // Count any escaped characters we can be sure that the converted data
- // size fits inside the remaining length (e.g. so that non-7bit characters
- // when converted by the SMS Stack will still fit).
- //
- TInt segmentSize = iRefData.Length() - dataSegmented;
+ //
+ // Count any escaped characters we can be sure that the converted data
+ // size fits inside the remaining length (e.g. so that non-7bit characters
+ // when converted by the SMS Stack will still fit).
+ //
+ TInt segmentSize = iRefData.Length() - dataSegmented;
- if (segmentSize > KMaxSmsChars - headerLength)
- {
- segmentSize = KMaxSmsChars - headerLength;
- }
+ if (segmentSize > KMaxSmsChars - headerLength)
+ {
+ segmentSize = KMaxSmsChars - headerLength;
+ }
- while (segmentSize > 1)
- {
- TPtrC8 segmentData(iRefData.Mid(dataSegmented, segmentSize));
- TInt non7bitCharEscapes = 0;
-
- //
- // Count all non-7bit characters that will be escaped (many non-7bit
- // characters are not escaped, but converted to "?"). The ones
- // that are known to be escaped are list below:
- //
- // 12 [Form Feed].
- // 91 "["
- // 92 "\"
- // 93 "]"
- // 94 "^"
- // 123 "{"
- // 124 "|"
- // 125 "}"
- // 126 "~"
- //
- for (TInt ch = 0; ch < segmentSize; ch++)
- {
- if (segmentData[ch] == 12 ||
- (segmentData[ch] >= 91 && segmentData[ch] <= 94) ||
- (segmentData[ch] >= 123 && segmentData[ch] <= 126))
- {
- non7bitCharEscapes++;
- }
- }
-
- //
- // Can it fit? If so store it, otherwise reduce the size...
- //
- if (segmentData.Length() + non7bitCharEscapes <= KMaxSmsChars - headerLength)
- {
- ptr.Append(segmentData);
- break;
- }
-
- segmentSize--;
- }
-
- dataSegmented += segmentSize;
- iSegmentNumber++;
- }
- while (dataSegmented < iRefData.Length());
+ while (segmentSize > 1)
+ {
+ TPtrC8 segmentData(iRefData.Mid(dataSegmented, segmentSize));
+ TInt non7bitCharEscapes = 0;
+
+ //
+ // Count all non-7bit characters that will be escaped (many non-7bit
+ // characters are not escaped, but converted to "?"). The ones
+ // that are known to be escaped are list below:
+ //
+ // 12 [Form Feed].
+ // 91 "["
+ // 92 "\"
+ // 93 "]"
+ // 94 "^"
+ // 123 "{"
+ // 124 "|"
+ // 125 "}"
+ // 126 "~"
+ //
+ for (TInt ch = 0; ch < segmentSize; ch++)
+ {
+ if (segmentData[ch] == 12 ||
+ (segmentData[ch] >= 91 && segmentData[ch] <= 94) ||
+ (segmentData[ch] >= 123 && segmentData[ch] <= 126))
+ {
+ non7bitCharEscapes++;
+ }
+ }
+
+ //
+ // Can it fit? If so store it, otherwise reduce the size...
+ //
+ if (segmentData.Length() + non7bitCharEscapes <= KMaxSmsChars - headerLength)
+ {
+ ptr.Append(segmentData);
+ break;
+ }
+
+ segmentSize--;
+ }
+
+ dataSegmented += segmentSize;
+ iSegmentNumber++;
+ }
+ while (dataSegmented < iRefData.Length());
- __ASSERT_DEBUG(iTotalSegments == aSegmentArray.Count(), Panic(KPanicEncodingError));
- } // TWapTextMessage::EncodeSegmentsL
+ __ASSERT_DEBUG(iTotalSegments == aSegmentArray.Count(), Panic(KPanicEncodingError));
+ } // TWapTextMessage::EncodeSegmentsL
/**
@@ -199,66 +205,66 @@
* WAP text message header set by SetWapTextMessage.
*/
TBool TWapTextMessage::Parse()
- {
- TInt waplength = iWAPMessage.Length();
- LOGWAPPROT2("TWapTextMessage::Parse [%d bytes]", waplength);
- if(waplength != 0)
- {
- // check whether long or short header
- TInt iBaseIndex = -1;
+ {
+ TInt waplength = iWAPMessage.Length();
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSE_1, "TWapTextMessage::Parse [%d bytes]", waplength);
+ if(waplength != 0)
+ {
+ // check whether long or short header
+ TInt iBaseIndex = -1;
- // minimum length is 8 "//SCKxx "
- if(waplength >= 8)
- {
- TPtrC8 HeaderIdPart(iWAPMessage.Left(6));
- if(!HeaderIdPart.Compare(KSCKHeaderLong))
- {
- iBaseIndex = 0;
- iIs16Bit = ETrue; // Yes, the ports are 16 bit wide
- }
- else
- HeaderIdPart.Set(iWAPMessage.Left(5));
+ // minimum length is 8 "//SCKxx "
+ if(waplength >= 8)
+ {
+ TPtrC8 HeaderIdPart(iWAPMessage.Left(6));
+ if(!HeaderIdPart.Compare(KSCKHeaderLong))
+ {
+ iBaseIndex = 0;
+ iIs16Bit = ETrue; // Yes, the ports are 16 bit wide
+ }
+ else
+ HeaderIdPart.Set(iWAPMessage.Left(5));
- if(iBaseIndex == (-1) && !HeaderIdPart.Compare(KSCKHeaderShort) )
- iBaseIndex = 3;
- // else no match
- }
+ if(iBaseIndex == (-1) && !HeaderIdPart.Compare(KSCKHeaderShort) )
+ iBaseIndex = 3;
+ // else no match
+ }
- if(iBaseIndex >= 0)
- {
- // check which of the TIndexInfos match
- for(TInt i=iBaseIndex; i<iBaseIndex+3; i++)
- {
- // Get length (index) of text header variant
- TInt lastIndex = KElemIndexes[i].iIndexes[KElemIndexes[i].iLastIndex];
- if (iWAPMessage.Length() <= lastIndex)
- {
- // no hope about match, because other variants are longer
- iIsWapTextMessage = EFalse;
- break;
- }
+ if(iBaseIndex >= 0)
+ {
+ // check which of the TIndexInfos match
+ for(TInt i=iBaseIndex; i<iBaseIndex+3; i++)
+ {
+ // Get length (index) of text header variant
+ TInt lastIndex = KElemIndexes[i].iIndexes[KElemIndexes[i].iLastIndex];
+ if (iWAPMessage.Length() <= lastIndex)
+ {
+ // no hope about match, because other variants are longer
+ iIsWapTextMessage = EFalse;
+ break;
+ }
- TInt LastChar = iWAPMessage[lastIndex];
- if (LastChar == '/' || LastChar == ' ' || LastChar == '\n')
- {
- // reinitialize, because following maybe absent
- iTotalSegments = 1;
- iSegmentNumber = 1;
- iIsWapTextMessage = ParseWapTextHeader(KElemIndexes[i]);
- break;
- }
+ TInt LastChar = iWAPMessage[lastIndex];
+ if (LastChar == '/' || LastChar == ' ' || LastChar == '\n')
+ {
+ // reinitialize, because following maybe absent
+ iTotalSegments = 1;
+ iSegmentNumber = 1;
+ iIsWapTextMessage = ParseWapTextHeader(KElemIndexes[i]);
+ break;
+ }
- }
+ }
- if (!iIsWapTextMessage)
- {
- LOGWAPPROT1("WARNING! illegal incoming WAP message");
- }
- }
- }
+ if (!iIsWapTextMessage)
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSE_2, "WARNING! illegal incoming WAP message");
+ }
+ }
+ }
- return iIsWapTextMessage;
- } // TWapTextMessage::Parse
+ return iIsWapTextMessage;
+ } // TWapTextMessage::Parse
/**
@@ -274,48 +280,48 @@
* TODO use TLex instead
*/
TInt TWapTextMessage::ParseNumber(const TDesC8& aInValue,
- TBool aBigEndian,
- TInt aRadix)
- {
- LOGWAPPROT2("TWapTextMessage::ParseNumber [%S]", &aInValue);
- // least significant byte first
- TInt Values[4] = {0,0,0,0};
- TInt Temp = 0;
- TInt length = aInValue.Length();
- TInt i = 0;
- TInt Value = 0;
+ TBool aBigEndian,
+ TInt aRadix)
+ {
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSENUMBER_1, "TWapTextMessage::ParseNumber [%s]", aInValue);
+ // least significant byte first
+ TInt Values[4] = {0,0,0,0};
+ TInt Temp = 0;
+ TInt length = aInValue.Length();
+ TInt i = 0;
+ TInt Value = 0;
- __ASSERT_DEBUG(length<5,Panic(KPanicInvalidParseNumber));
+ __ASSERT_DEBUG(length<5,Panic(KPanicInvalidParseNumber));
if( length >= 5 )
return KErrNotFound;
- for(i=0; i<length; i++)
- {
- Temp = aInValue[i];
- if (Temp>='0' && Temp<='9')
- Temp-='0';
- else if (Temp>='A' && Temp<='Z')
- Temp = Temp - 'A'+10;
- else if (Temp>='a' && Temp<='z')
- Temp = Temp - 'a'+10;
- else
+ for(i=0; i<length; i++)
+ {
+ Temp = aInValue[i];
+ if (Temp>='0' && Temp<='9')
+ Temp-='0';
+ else if (Temp>='A' && Temp<='Z')
+ Temp = Temp - 'A'+10;
+ else if (Temp>='a' && Temp<='z')
+ Temp = Temp - 'a'+10;
+ else
return KErrNotFound;
- if (aBigEndian)
- Values[(length-1)-i]=Temp;
- else
- Values[i]=Temp;
- }
+ if (aBigEndian)
+ Values[(length-1)-i]=Temp;
+ else
+ Values[i]=Temp;
+ }
- // build the value
- Value=Values[0];
- TInt Base=1;
- for(i=1; i<length; i++)
- {
- Base*=aRadix;
- Value+=(Base)*Values[i];
- }
+ // build the value
+ Value=Values[0];
+ TInt Base=1;
+ for(i=1; i<length; i++)
+ {
+ Base*=aRadix;
+ Value+=(Base)*Values[i];
+ }
- return Value;
- } // TWapTextMessage::ParseNumber
+ return Value;
+ } // TWapTextMessage::ParseNumber
/**
@@ -328,95 +334,95 @@
* except for KOtherHeader and user data, of course
*/
TBool TWapTextMessage::ParseWapTextHeader(const TIndexInfo& aIndexArray)
- {
- LOGWAPPROT2("TWapTextMessage::ParseWapTextHeader: %S", &iWAPMessage );
+ {
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_1, "TWapTextMessage::ParseWapTextHeader: %s", iWAPMessage );
- TInt ParsedNumber = 0;
+ TInt ParsedNumber = 0;
- // parse the header
- TInt ElemIndexCount=aIndexArray.iLastIndex+1;
- for(TInt i=0; i<ElemIndexCount; i++)
- {
- if (i<ElemIndexCount-1)
- {
- // all the elems have a length defined in advance
- if (iWAPMessage.Length() >= aIndexArray.iIndexes[i+1])
- {
- // the header fits into the wap datagram
- TPtrC8 Elem(iWAPMessage.Mid(aIndexArray.iIndexes[i],
- aIndexArray.iIndexes[i+1]-
- aIndexArray.iIndexes[i]));
+ // parse the header
+ TInt ElemIndexCount=aIndexArray.iLastIndex+1;
+ for(TInt i=0; i<ElemIndexCount; i++)
+ {
+ if (i<ElemIndexCount-1)
+ {
+ // all the elems have a length defined in advance
+ if (iWAPMessage.Length() >= aIndexArray.iIndexes[i+1])
+ {
+ // the header fits into the wap datagram
+ TPtrC8 Elem(iWAPMessage.Mid(aIndexArray.iIndexes[i],
+ aIndexArray.iIndexes[i+1]-
+ aIndexArray.iIndexes[i]));
- ParsedNumber = ParseNumber(Elem,ETrue,16);
+ ParsedNumber = ParseNumber(Elem,ETrue,16);
if( ParsedNumber == KErrNotFound )
return EFalse;
- switch(i)
- {
- case KIndexDestinationPort:
- iDestinationPort = ParsedNumber;
+ switch(i)
+ {
+ case KIndexDestinationPort:
+ iDestinationPort = ParsedNumber;
- break;
- case KIndexSourcePort:
- iSourcePort = ParsedNumber;
- break;
- case KIndexReferenceNumber:
- iReference = ParsedNumber;
- break;
- case KIndexTotalSegments:
- iTotalSegments = ParsedNumber;
- break;
- case KIndexSegmentNumber:
- iSegmentNumber = ParsedNumber;
- break;
- default:
- LOGWAPPROT2("Hm. unhandled WAP index [%d]", i );
- break;
- }
- }
- }
- else
- {
- // elems have not a length defined in advance
- iOtherHeader = 0;
- iOtherHeaderLength = 0;
+ break;
+ case KIndexSourcePort:
+ iSourcePort = ParsedNumber;
+ break;
+ case KIndexReferenceNumber:
+ iReference = ParsedNumber;
+ break;
+ case KIndexTotalSegments:
+ iTotalSegments = ParsedNumber;
+ break;
+ case KIndexSegmentNumber:
+ iSegmentNumber = ParsedNumber;
+ break;
+ default:
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_2, "Hm. unhandled WAP index [%d]", i );
+ break;
+ }
+ }
+ }
+ else
+ {
+ // elems have not a length defined in advance
+ iOtherHeader = 0;
+ iOtherHeaderLength = 0;
- // Search the terminating character ' '
- iData = iWAPMessage.Locate(' ');
- TInt dataTmp = iWAPMessage.Locate('\n');
+ // Search the terminating character ' '
+ iData = iWAPMessage.Locate(' ');
+ TInt dataTmp = iWAPMessage.Locate('\n');
- if (iData == KErrNotFound)
- {
- if (dataTmp == KErrNotFound)
- return EFalse;
- else
- iData = dataTmp;
- }
- else if (dataTmp != KErrNotFound)
- iData = Min(iData, dataTmp);
+ if (iData == KErrNotFound)
+ {
+ if (dataTmp == KErrNotFound)
+ return EFalse;
+ else
+ iData = dataTmp;
+ }
+ else if (dataTmp != KErrNotFound)
+ iData = Min(iData, dataTmp);
- // check the existence of other header
- // at least "// " should be there
- if ( iWAPMessage.Length() > aIndexArray.iIndexes[i]+2
- && iWAPMessage[aIndexArray.iIndexes[i]] == '/'
- && iWAPMessage[aIndexArray.iIndexes[i]+1] == '/')
- {
- iOtherHeader = aIndexArray.iIndexes[i];
- iOtherHeaderLength=iData-iOtherHeader;
- }
+ // check the existence of other header
+ // at least "// " should be there
+ if ( iWAPMessage.Length() > aIndexArray.iIndexes[i]+2
+ && iWAPMessage[aIndexArray.iIndexes[i]] == '/'
+ && iWAPMessage[aIndexArray.iIndexes[i]+1] == '/')
+ {
+ iOtherHeader = aIndexArray.iIndexes[i];
+ iOtherHeaderLength=iData-iOtherHeader;
+ }
- // data: check if any characters after ' '
- iDataLength = 0;
- iData++;
- if (iWAPMessage.Length() > iData)
- {
- iDataLength = iWAPMessage.Length() - iData;
- }
+ // data: check if any characters after ' '
+ iDataLength = 0;
+ iData++;
+ if (iWAPMessage.Length() > iData)
+ {
+ iDataLength = iWAPMessage.Length() - iData;
+ }
- // That's it
- } // end of other header and data
- }// end of for loop
- return ETrue;
- } // TWapTextMessage::ParseWapTextHeader
+ // That's it
+ } // end of other header and data
+ }// end of for loop
+ return ETrue;
+ } // TWapTextMessage::ParseWapTextHeader
/**
@@ -432,80 +438,80 @@
* aFixedHeader.Length() == (return value of this function) is true
*/
TInt TWapTextMessage::CreateHeader(TDes8& aFixedHeader, TInt& aSegmentNumberIndex)
- {
- LOGWAPPROT1("TWapTextMessage::CreateHeader");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_CREATEHEADER_1, "TWapTextMessage::CreateHeader");
- // Index into KElemIndexes indicating which header elements are present
- TInt elemIndex;
- // Index into Indexes, for current header element
- TInt minorIndex=KIndexDestinationPort;
- TBuf8<4> hexNumber;
+ // Index into KElemIndexes indicating which header elements are present
+ TInt elemIndex;
+ // Index into Indexes, for current header element
+ TInt minorIndex=KIndexDestinationPort;
+ TBuf8<4> hexNumber;
- // Segment number length is set, if SAR is needed
- TInt segmentNumberLength = 0;
- aSegmentNumberIndex = 0;
+ // Segment number length is set, if SAR is needed
+ TInt segmentNumberLength = 0;
+ aSegmentNumberIndex = 0;
- // Determine whether long or short form is used
- if (iIs16Bit || iSourcePort > 255 || iDestinationPort>255)
- {
- elemIndex = 0;
- aFixedHeader.Copy(KSCKHeaderLong);
- }
- else
- {
- elemIndex = 3;
- aFixedHeader.Copy(KSCKHeaderShort);
- }
+ // Determine whether long or short form is used
+ if (iIs16Bit || iSourcePort > 255 || iDestinationPort>255)
+ {
+ elemIndex = 0;
+ aFixedHeader.Copy(KSCKHeaderLong);
+ }
+ else
+ {
+ elemIndex = 3;
+ aFixedHeader.Copy(KSCKHeaderShort);
+ }
- // Set destination port
- hexNumber.NumFixedWidthUC(iDestinationPort,EHex,
- KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
- aFixedHeader.Append(hexNumber);
+ // Set destination port
+ hexNumber.NumFixedWidthUC(iDestinationPort,EHex,
+ KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
+ aFixedHeader.Append(hexNumber);
- // Don't set the source port,
- // 1) if it is not set or it same as destination port and
- // 2) data (and other header) fits in one segment
- if (!((iSourcePort==-1 || iDestinationPort==iSourcePort)
- && CalculateTotalSegments(KElemIndexes[elemIndex].iIndexes[minorIndex+1])==1))
- {
- // Source port is present
- elemIndex++;
- minorIndex++;
- if (iSourcePort==-1)
- iSourcePort = iDestinationPort;
+ // Don't set the source port,
+ // 1) if it is not set or it same as destination port and
+ // 2) data (and other header) fits in one segment
+ if (!((iSourcePort==-1 || iDestinationPort==iSourcePort)
+ && CalculateTotalSegments(KElemIndexes[elemIndex].iIndexes[minorIndex+1])==1))
+ {
+ // Source port is present
+ elemIndex++;
+ minorIndex++;
+ if (iSourcePort==-1)
+ iSourcePort = iDestinationPort;
- // Set source port
- hexNumber.NumFixedWidthUC(iSourcePort,EHex,
- KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
- aFixedHeader.Append(hexNumber);
+ // Set source port
+ hexNumber.NumFixedWidthUC(iSourcePort,EHex,
+ KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
+ aFixedHeader.Append(hexNumber);
- // Add the SAR info when source port is set
- elemIndex++;
+ // Add the SAR info when source port is set
+ elemIndex++;
- // Set reference
- minorIndex++;
- hexNumber.NumFixedWidthUC(iReference,EHex,
- KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
- aFixedHeader.Append(hexNumber);
+ // Set reference
+ minorIndex++;
+ hexNumber.NumFixedWidthUC(iReference,EHex,
+ KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
+ aFixedHeader.Append(hexNumber);
- // Set fragment count
- minorIndex++;
- CalculateTotalSegments(KElemIndexes[elemIndex].iIndexes[KElemIndexes[elemIndex].iLastIndex]);
- hexNumber.NumFixedWidthUC(iTotalSegments,EHex,
- KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
- aFixedHeader.Append(hexNumber);
+ // Set fragment count
+ minorIndex++;
+ CalculateTotalSegments(KElemIndexes[elemIndex].iIndexes[KElemIndexes[elemIndex].iLastIndex]);
+ hexNumber.NumFixedWidthUC(iTotalSegments,EHex,
+ KElemIndexes[elemIndex].iIndexes[minorIndex+1]-KElemIndexes[elemIndex].iIndexes[minorIndex]);
+ aFixedHeader.Append(hexNumber);
- // Return the index for segment number in the header
- minorIndex++;
- aSegmentNumberIndex = KElemIndexes[elemIndex].iIndexes[minorIndex];
- segmentNumberLength = 2;
- }
+ // Return the index for segment number in the header
+ minorIndex++;
+ aSegmentNumberIndex = KElemIndexes[elemIndex].iIndexes[minorIndex];
+ segmentNumberLength = 2;
+ }
- aFixedHeader.Append(iRefOtherHeader);
- aFixedHeader.Append(_L(" "));
+ aFixedHeader.Append(iRefOtherHeader);
+ aFixedHeader.Append(_L(" "));
- return aFixedHeader.Length()+segmentNumberLength;
- } // TWapTextMessage::CreateHeader
+ return aFixedHeader.Length()+segmentNumberLength;
+ } // TWapTextMessage::CreateHeader
/**
@@ -514,87 +520,87 @@
* The affect of terminating ' ' is taken into inside the method
*/
TInt TWapTextMessage::CalculateTotalSegments(TInt aFixedLength)
- {
- LOGWAPPROT2("TWapTextMessage::CalculateTotalSegments [aFixedLength=%d]", aFixedLength);
+ {
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TWAPTEXTMESSAGE_CALCULATETOTALSEGMENTS_1, "TWapTextMessage::CalculateTotalSegments [aFixedLength=%d]", aFixedLength);
- // '+1': length of terminating ' '
- TInt length = aFixedLength + iRefOtherHeader.Length() + 1;
- TInt remain = KMaxSmsChars - length;
- TInt dataSegmented = 0;
+ // '+1': length of terminating ' '
+ TInt length = aFixedLength + iRefOtherHeader.Length() + 1;
+ TInt remain = KMaxSmsChars - length;
+ TInt dataSegmented = 0;
- __ASSERT_DEBUG(remain > 0, Panic(KPanicTextHeaderTooLong));
+ __ASSERT_DEBUG(remain > 0, Panic(KPanicTextHeaderTooLong));
- iTotalSegments = 0;
- do
- {
- iTotalSegments++;
+ iTotalSegments = 0;
+ do
+ {
+ iTotalSegments++;
- //
- // Count any escaped characters we can be sure that the converted data
- // size fits inside the remaining length (e.g. so that non-7bit characters
- // when converted by the SMS Stack will still fit).
- //
- TInt segmentSize = iRefData.Length() - dataSegmented;
+ //
+ // Count any escaped characters we can be sure that the converted data
+ // size fits inside the remaining length (e.g. so that non-7bit characters
+ // when converted by the SMS Stack will still fit).
+ //
+ TInt segmentSize = iRefData.Length() - dataSegmented;
- if (segmentSize > remain)
- {
- segmentSize = remain;
- }
+ if (segmentSize > remain)
+ {
+ segmentSize = remain;
+ }
- while (segmentSize > 1)
- {
- TPtrC8 segmentData(iRefData.Mid(dataSegmented, segmentSize));
- TInt non7bitCharEscapes = 0;
-
- //
- // Count all non-7bit characters that will be escaped (many non-7bit
- // characters are not escaped, but converted to "?"). The ones
- // that are known to be escaped are list below:
- //
- // 12 [Form Feed].
- // 91 "["
- // 92 "\"
- // 93 "]"
- // 94 "^"
- // 123 "{"
- // 124 "|"
- // 125 "}"
- // 126 "~"
- //
- for (TInt ch = 0; ch < segmentSize; ch++)
- {
- if (segmentData[ch] == 12 ||
- (segmentData[ch] >= 91 && segmentData[ch] <= 94) ||
- (segmentData[ch] >= 123 && segmentData[ch] <= 126))
- {
- non7bitCharEscapes++;
- }
- }
-
- //
- // Can it fit? If so store it, otherwise reduce the size...
- //
- if (segmentData.Length() + non7bitCharEscapes <= remain)
- {
- break;
- }
-
- segmentSize--;
- }
-
- dataSegmented += segmentSize;
- }
- while (dataSegmented < iRefData.Length());
-
- //
- // At least one fragment is needed...
- //
- if (iTotalSegments == 0)
- {
- iTotalSegments = 1;
- }
+ while (segmentSize > 1)
+ {
+ TPtrC8 segmentData(iRefData.Mid(dataSegmented, segmentSize));
+ TInt non7bitCharEscapes = 0;
+
+ //
+ // Count all non-7bit characters that will be escaped (many non-7bit
+ // characters are not escaped, but converted to "?"). The ones
+ // that are known to be escaped are list below:
+ //
+ // 12 [Form Feed].
+ // 91 "["
+ // 92 "\"
+ // 93 "]"
+ // 94 "^"
+ // 123 "{"
+ // 124 "|"
+ // 125 "}"
+ // 126 "~"
+ //
+ for (TInt ch = 0; ch < segmentSize; ch++)
+ {
+ if (segmentData[ch] == 12 ||
+ (segmentData[ch] >= 91 && segmentData[ch] <= 94) ||
+ (segmentData[ch] >= 123 && segmentData[ch] <= 126))
+ {
+ non7bitCharEscapes++;
+ }
+ }
+
+ //
+ // Can it fit? If so store it, otherwise reduce the size...
+ //
+ if (segmentData.Length() + non7bitCharEscapes <= remain)
+ {
+ break;
+ }
+
+ segmentSize--;
+ }
+
+ dataSegmented += segmentSize;
+ }
+ while (dataSegmented < iRefData.Length());
+
+ //
+ // At least one fragment is needed...
+ //
+ if (iTotalSegments == 0)
+ {
+ iTotalSegments = 1;
+ }
- return iTotalSegments;
- } // TWapTextMessage::CalculateTotalSegments
+ return iTotalSegments;
+ } // TWapTextMessage::CalculateTotalSegments
// EOF - WAPTHDR.CPP
--- a/smsprotocols/smsstack/wapprot/Src/ws_main.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/ws_main.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 "ws_mainTraces.h"
+#endif
+
#include "es_ver.h"
#include "es_prot.h"
#include "es_wsms.h"
@@ -37,7 +43,7 @@
//
CWapSmsProtocolFamily * CWapSmsProtocolFamily::NewL()
{
- LOGWAPPROT1("CWapSmsProtocolFamily::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_NEWL_1, "CWapSmsProtocolFamily::NewL()");
return new (ELeave)CWapSmsProtocolFamily;
} // CWapSmsProtocolFamily::NewL
@@ -48,7 +54,7 @@
//
TInt CWapSmsProtocolFamily::Install()
{
- LOGWAPPROT1("CWapSmsProtocolFamily::Install()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_INSTALL_1, "CWapSmsProtocolFamily::Install()");
return KErrNone;
} // CWapSmsProtocolFamily::Install
@@ -59,7 +65,7 @@
//
TInt CWapSmsProtocolFamily::Remove()
{
- LOGWAPPROT1("CWapSmsProtocolFamily::Remove()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_REMOVE_1, "CWapSmsProtocolFamily::Remove()");
return KErrNone;
} // CWapSmsProtocolFamily::Remove
@@ -70,7 +76,7 @@
//
CProtocolBase * CWapSmsProtocolFamily::NewProtocolL(TUint aSockType,TUint /*aProtocol*/)
{
- LOGWAPPROT1("CWapSmsProtocolFamily::NewProtocolL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_NEWPROTOCOLL_1, "CWapSmsProtocolFamily::NewProtocolL()");
if (aSockType!=KSockDatagram)
return NULL;
@@ -84,7 +90,7 @@
//
TUint CWapSmsProtocolFamily::ProtocolList(TServerProtocolDesc *& aProtocolList)
{
- LOGWAPPROT1("CWapSmsProtocolFamily::ProtocolList()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOLFAMILY_PROTOCOLLIST_1, "CWapSmsProtocolFamily::ProtocolList()");
TRAPD(ret, (aProtocolList=new(ELeave) TServerProtocolDesc[1]) );
if(ret!=KErrNone)
@@ -113,11 +119,7 @@
//
EXPORT_C CProtocolFamilyBase * InstallWAPSMS(void)
{
- LOGWAPPROT4("InstallWAPSMS [version %d.%d.%d]",
- KWapSmsMajorVersionNumber,
- KWapSmsMinorVersionNumber,
- KWapSmsBuildVersionNumber
- );
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, INSTALLWAPSMS_1, "InstallWAPSMS [version %u.%u.%u]",KWapSmsMajorVersionNumber, KWapSmsMinorVersionNumber, KWapSmsBuildVersionNumber);
CWapSmsProtocolFamily* wapProt=NULL;
TRAPD(ret, (wapProt=CWapSmsProtocolFamily::NewL()) );
--- a/smsprotocols/smsstack/wapprot/Src/ws_obsvr.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/ws_obsvr.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ws_obsvrTraces.h"
+#endif
+
#include "ws_obsvr.h"
#include <commsdattypesv1_1.h>
@@ -83,7 +89,7 @@
*/
CWapSapMessageSender* CWapSapMessageSender::NewL(CSmsProtocol* aSmsProtocol, CWapSmsProvider* aWapSap)
{
- LOGWAPPROT1("CWapSapMessageSender::NewL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_NEWL_1, "CWapSapMessageSender::NewL");
CWapSapMessageSender* msgSender = new(ELeave) CWapSapMessageSender(aSmsProtocol,aWapSap);
CleanupStack::PushL(msgSender);
@@ -102,7 +108,7 @@
*/
void CWapSapMessageSender::SendDatagramL(CWapDatagram* aMsg)
{
- LOGWAPPROT1("CWapSapMessageSender::SendDatagramL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SENDDATAGRAML_1, "CWapSapMessageSender::SendDatagramL");
__ASSERT_DEBUG(iSmsMsgArray->Count()==0,Panic(EWapSmsSapMessageSenderBusy));
@@ -118,7 +124,7 @@
*/
void CWapSapMessageSender::SendNextSms()
{
- LOGWAPPROT1("CWapSapMessageSender::SendNextSms");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SENDNEXTSMS_1, "CWapSapMessageSender::SendNextSms");
__ASSERT_DEBUG(iSmsMsgArray->Count()>0,Panic(EWapSmsSapMessageSenderNothingToSend));
CSmsMessage* smsMsg = iSmsMsgArray->At(0);
@@ -139,7 +145,7 @@
*/
void CWapSapMessageSender::SetSmsMessageSettingsL(CSmsMessage* aSmsMessage)
{
- LOGWAPPROT1("CWapSapMessageSender::SetSmsMessageSettingsL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SETSMSMESSAGESETTINGSL_1, "CWapSapMessageSender::SetSmsMessageSettingsL");
TBuf<KCommsDbSvrMaxFieldLength> msgCenterNumberValue;
TUint32 msgValidityPeriodValue = KWapSmsMessageValidityPeriod;
@@ -277,7 +283,7 @@
*/
void CWapSapMessageSender::MessageSendCompleted(TInt aStatus)
{
- LOGWAPPROT2("CWapSapMessageSender::MessageSendCompleted [aStatus=%d]", aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGESENDCOMPLETED_1, "CWapSapMessageSender::MessageSendCompleted [aStatus=%d]", aStatus);
if (aStatus!=KErrNone)
iSmsMsgArray->ResetAndDestroy();
@@ -296,7 +302,7 @@
*/
const TSmsAddr& CWapSapMessageSender::GetLocalAddress() const
{
- LOGWAPPROT1("CWapSapMessageSender::GetLocalAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_GETLOCALADDRESS_1, "CWapSapMessageSender::GetLocalAddress()");
return iSmsAddr;
} // CWapSapMessageSender::GetLocalAddress
@@ -307,7 +313,7 @@
*/
void CWapSapMessageSender::SetLocalAddress(const TSmsAddr& aSmsAddr)
{
- LOGWAPPROT1("CWapSapMessageSender::SetLocalAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SETLOCALADDRESS_1, "CWapSapMessageSender::SetLocalAddress()");
iSmsAddr = aSmsAddr;
} // CWapSapMessageSender::SetLocalAddress
@@ -322,7 +328,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapSapMessageSender::ModemNotificationCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MODEMNOTIFICATIONCOMPLETED_1, "CWapSapMessageSender::ModemNotificationCompleted()");
BULLSEYE_RESTORE
}
@@ -335,7 +341,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapSapMessageSender::EnumeratePhoneCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_ENUMERATEPHONECOMPLETED_1, "CWapSapMessageSender::EnumeratePhoneCompleted()");
BULLSEYE_RESTORE
}
@@ -348,7 +354,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapSapMessageSender::MessageReceived");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGERECEIVED_1, "CWapSapMessageSender::MessageReceived");
__ASSERT_DEBUG(EFalse,Panic(EWapSmsReceiveOnMessageSender));
return KErrNone;
BULLSEYE_RESTORE
@@ -362,7 +368,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapSapMessageSender::ClientConfirmsMessage");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_CLIENTCONFIRMSMESSAGE_1, "CWapSapMessageSender::ClientConfirmsMessage");
__ASSERT_DEBUG(EFalse,Panic(EWapSmsReceiveOnMessageSender));
return ETrue;
BULLSEYE_RESTORE
@@ -373,7 +379,7 @@
*/
TInt CWapSapMessageSender::SmsAddrIsDuplicate(const MSmsMessageObserver* /*aObserver*/,const TSmsAddr& /*aAddr*/)const
{
- LOGWAPPROT1("CWapSapMessageSender::SmsAddrIsDuplicate()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_SMSADDRISDUPLICATE_1, "CWapSapMessageSender::SmsAddrIsDuplicate()");
return EFalse;
} // CWapSapMessageSender::SmsAddrIsDuplicate
@@ -388,7 +394,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapSapMessageSender::MessageWriteCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGEWRITECOMPLETED_1, "CWapSapMessageSender::MessageWriteCompleted()");
BULLSEYE_RESTORE
}
@@ -401,7 +407,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapSapMessageSender::MessageDeleteCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_MESSAGEDELETECOMPLETED_1, "CWapSapMessageSender::MessageDeleteCompleted()");
BULLSEYE_RESTORE
}
@@ -414,7 +420,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapSapMessageSender::ReadSmsParamsCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_READSMSPARAMSCOMPLETED_1, "CWapSapMessageSender::ReadSmsParamsCompleted()");
BULLSEYE_RESTORE
}
@@ -427,7 +433,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapSapMessageSender::WriteSmsParamsCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSAPMESSAGESENDER_WRITESMSPARAMSCOMPLETED_1, "CWapSapMessageSender::WriteSmsParamsCompleted()");
BULLSEYE_RESTORE
}
@@ -444,7 +450,7 @@
*/
CWapProtocolObserver* CWapProtocolObserver::NewL(CWapSmsProtocol* aProtocol)
{
- LOGWAPPROT1("CWapProtocolObserver::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_NEWL_1, "CWapProtocolObserver::NewL()");
CWapProtocolObserver* prot = new(ELeave) CWapProtocolObserver;
prot->iWapSmsProtocol=aProtocol;
@@ -457,7 +463,7 @@
*/
const TSmsAddr& CWapProtocolObserver::GetLocalAddress() const
{
- LOGWAPPROT1("CWapProtocolObserver::GetLocalAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_GETLOCALADDRESS_1, "CWapProtocolObserver::GetLocalAddress()");
return iSmsAddr;
} // CWapProtocolObserver::GetLocalAddress
@@ -468,7 +474,7 @@
*/
void CWapProtocolObserver::SetLocalAddress(const TSmsAddr& aSmsAddr)
{
- LOGWAPPROT1("CWapProtocolObserver::SetLocalAddress()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_SETLOCALADDRESS_1, "CWapProtocolObserver::SetLocalAddress()");
iSmsAddr = aSmsAddr;
} // CWapProtocolObserver::SetLocalAddress
@@ -480,7 +486,7 @@
*/
void CWapProtocolObserver::ModemNotificationCompleted(TInt /*aStatus*/)
{
- LOGWAPPROT1("CWapProtocolObserver::ModemNotificationCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MODEMNOTIFICATIONCOMPLETED_1, "CWapProtocolObserver::ModemNotificationCompleted()");
} // CWapProtocolObserver::ModemNotificationCompleted
@@ -494,7 +500,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapProtocolObserver::MessageSendCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGESENDCOMPLETED_1, "CWapProtocolObserver::MessageSendCompleted()");
BULLSEYE_RESTORE
}
@@ -503,7 +509,7 @@
*/
TBool CWapProtocolObserver::ClientConfirmsMessage()const
{
- LOGWAPPROT1("CWapProtocolObserver::ClientConfirmsMessage()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_CLIENTCONFIRMSMESSAGE_1, "CWapProtocolObserver::ClientConfirmsMessage()");
return EFalse;
} // CWapProtocolObserver::ClientConfirmsMessage
@@ -514,7 +520,7 @@
*/
TInt CWapProtocolObserver::SmsAddrIsDuplicate(const MSmsMessageObserver* aObserver,const TSmsAddr& aAddr)const
{
- LOGWAPPROT1("CWapProtocolObserver::SmsAddrIsDuplicate()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_SMSADDRISDUPLICATE_1, "CWapProtocolObserver::SmsAddrIsDuplicate()");
if(this == aObserver)return EFalse;
if(aAddr.SmsAddrFamily() == ESmsAddrApplication8BitPort || ( aAddr.SmsAddrFamily() == ESmsAddrApplication16BitPort && aAddr.Port() > 255))
@@ -533,7 +539,7 @@
*/
TInt CWapProtocolObserver::MessageReceived(const CSmsMessage& aSmsMessage,TDes& /*aDes*/)
{
- LOGWAPPROT1("CWapProtocolObserver::MessageReceived");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGERECEIVED_1, "CWapProtocolObserver::MessageReceived");
TRAPD(ret, iWapSmsProtocol->ProcessSmsL(aSmsMessage) );
return ret;
@@ -549,7 +555,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapProtocolObserver::EnumeratePhoneCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_ENUMERATEPHONECOMPLETED_1, "CWapProtocolObserver::EnumeratePhoneCompleted()");
BULLSEYE_RESTORE
}
@@ -562,7 +568,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapProtocolObserver::MessageWriteCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGEWRITECOMPLETED_1, "CWapProtocolObserver::MessageWriteCompleted()");
BULLSEYE_RESTORE
}
@@ -575,7 +581,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapProtocolObserver::MessageDeleteCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_MESSAGEDELETECOMPLETED_1, "CWapProtocolObserver::MessageDeleteCompleted()");
BULLSEYE_RESTORE
}
@@ -588,7 +594,7 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapProtocolObserver::ReadSmsParamsCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_READSMSPARAMSCOMPLETED_1, "CWapProtocolObserver::ReadSmsParamsCompleted()");
BULLSEYE_RESTORE
}
@@ -601,6 +607,6 @@
// Ignore in code coverage - implementation required by base class
// but not relavent for WAP PROT.
BULLSEYE_OFF
- LOGWAPPROT1("CWapProtocolObserver::WriteSmsParamsCompleted()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPPROTOCOLOBSERVER_WRITESMSPARAMSCOMPLETED_1, "CWapProtocolObserver::WriteSmsParamsCompleted()");
BULLSEYE_RESTORE
}
--- a/smsprotocols/smsstack/wapprot/Src/ws_prtcl.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/ws_prtcl.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -13,6 +13,12 @@
// Description:
//
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ws_prtclTraces.h"
+#endif
+
#include <e32base.h>
#include <f32file.h>
#include "smsprot.h"
@@ -48,7 +54,7 @@
//
CWapSmsProtocol* CWapSmsProtocol::NewL()
{
- LOGWAPPROT1("CWapSmsProtocol::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWL_1, "CWapSmsProtocol::NewL()");
CWapSmsProtocol* p=new(ELeave) CWapSmsProtocol;
CleanupStack::PushL(p);
@@ -66,14 +72,14 @@
void CWapSmsProtocol::HandleBackupOrRestoreStartingL()
{
- LOGWAPPROT1("CWapSmsProtocol::HandleBackupOrRestoreStartingL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_HANDLEBACKUPORRESTORESTARTINGL_1, "CWapSmsProtocol::HandleBackupOrRestoreStartingL");
iWapStore->Close();
} // CWapSmsProtocol::HandleBackupOrRestoreStartingL
void CWapSmsProtocol::HandleBackupOrRestoreCompleteL()
{
- LOGWAPPROT1("CWapSmsProtocol::HandleBackupOrRestoreCompleteL ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_HANDLEBACKUPORRESTORECOMPLETEL_1, "CWapSmsProtocol::HandleBackupOrRestoreCompleteL ");
iWapStore->DoOpenL();
} // CWapSmsProtocol::HandleBackupOrRestoreCompleteL
@@ -105,7 +111,7 @@
//
CServProviderBase *CWapSmsProtocol::NewSAPL(TUint aSocketType)
{
- LOGWAPPROT1("*CWapSmsProtocol::NewSAPL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWSAPL_1, "*CWapSmsProtocol::NewSAPL");
if (aSocketType!=KSockDatagram)
User::Leave(KErrNotSupported);
@@ -130,7 +136,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGWAPPROT1("CWapSmsProtocol::BindL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_BINDL_1, "CWapSmsProtocol::BindL");
Panic(EWapSmsCantBind);
BULLSEYE_RESTORE
}
@@ -149,7 +155,7 @@
//
void CWapSmsProtocol::Identify(TServerProtocolDesc *aDes) const
{
- LOGWAPPROT1("CWapSmsProtocol::Identify");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_IDENTIFY_1, "CWapSmsProtocol::Identify");
aDes->iName=KWAPSMSProtocolId;
aDes->iAddrFamily=KWAPSMSAddrFamily;
@@ -172,7 +178,7 @@
//
void CWapSmsProtocol::BindToL(CProtocolBase* aProtocol)
{
- LOGWAPPROT1("CWapSmsProtocol::BindToL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_BINDTOL_1, "CWapSmsProtocol::BindToL");
TServerProtocolDesc info;
aProtocol->Identify(&info);
@@ -198,7 +204,7 @@
//
void CWapSmsProtocol::BindObserversToSmsL()
{
- LOGWAPPROT1("CWapSmsProtocol::BindObserversToSmsL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_BINDOBSERVERSTOSMSL_1, "CWapSmsProtocol::BindObserversToSmsL");
iNextSapPort=KMinWapPortNumber;
TSmsAddr addr0;
@@ -231,7 +237,7 @@
//
void CWapSmsProtocol::RemoveObserversFromSmsProtocol()
{
- LOGWAPPROT1("CWapSmsProtocol::RemoveObserversFromSmsProtocol");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_REMOVEOBSERVERSFROMSMSPROTOCOL_1, "CWapSmsProtocol::RemoveObserversFromSmsProtocol");
if (iSmsProtocol==NULL)
return;
@@ -250,7 +256,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGWAPPROT1("CWapSmsProtocol::Send");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_SEND_1, "CWapSmsProtocol::Send");
Panic(EWapSmsSendCallCantBind);
return KErrNone;
BULLSEYE_RESTORE
@@ -261,7 +267,7 @@
//
void CWapSmsProtocol::ProcessSmsL(const CSmsMessage& aSmsMessage)
{
- LOGWAPPROT1("CWapSmsProtocol::ProcessSmsL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_PROCESSSMSL_1, "CWapSmsProtocol::ProcessSmsL");
TInt index=0;
TBool storeDatagramComplete = EFalse;
TBool isNewStyleClient = EFalse;
@@ -326,7 +332,7 @@
//
TInt CWapSmsProtocol::GetOption(TUint aLevel, TUint aName, TDes8& aOption, CProtocolBase* /*aSourceProtocol*/)
{
- LOGWAPPROT1("CWapSmsProtocol::GetOption");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_GETOPTION_1, "CWapSmsProtocol::GetOption");
TInt ret = iSmsProtocol->GetOption(aLevel, aName, aOption,this);
return ret;
@@ -339,7 +345,7 @@
//
TInt CWapSmsProtocol::SetOption(TUint aLevel, TUint aName, const TDesC8& aOption, CProtocolBase* /*aSourceProtocol*/)
{
- LOGWAPPROT1("CWapSmsProtocol::SetOption");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_SETOPTION_1, "CWapSmsProtocol::SetOption");
TInt ret= iSmsProtocol->SetOption(aLevel,aName,aOption,this);
return ret;
@@ -351,7 +357,7 @@
//
void CWapSmsProtocol::Error(TInt aError, CProtocolBase* /*aSourceProtocol*/)
{
- LOGWAPPROT1("CWapSmsProtocol::Error");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ERROR_1, "CWapSmsProtocol::Error");
TDblQueIter<CWapSmsProvider> iter(iSAPList);
CWapSmsProvider* sap;
@@ -366,7 +372,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGWAPPROT1("*CWapSmsProtocol::NewHostResolverL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWHOSTRESOLVERL_1, "*CWapSmsProtocol::NewHostResolverL");
Panic(EWapSmsCantCreateHostResolver);
return NULL;
BULLSEYE_RESTORE
@@ -379,7 +385,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGWAPPROT1("*CWapSmsProtocol::NewServiceResolverL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWSERVICERESOLVERL_1, "*CWapSmsProtocol::NewServiceResolverL");
Panic(EWapSmsCantCreateServiceResolver);
return NULL;
BULLSEYE_RESTORE
@@ -392,7 +398,7 @@
{
// Ignore in code coverage - not intended to be used
BULLSEYE_OFF
- LOGWAPPROT1("CWapSmsProtocol::NewNetDatabaseL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_NEWNETDATABASEL_1, "CWapSmsProtocol::NewNetDatabaseL");
Panic(EWapSmsCantCreateNetDatabase);
return NULL;
BULLSEYE_RESTORE
@@ -403,7 +409,7 @@
//
void CWapSmsProtocol::AddSAP(CWapSmsProvider* aSAP, TUint /*aSockType*/)
{
- LOGWAPPROT1("CWapSmsProtocol::AddSAP");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ADDSAP_1, "CWapSmsProtocol::AddSAP");
iSAPList.AddLast(*aSAP);
} // CWapSmsProtocol::AddSAP
@@ -414,7 +420,7 @@
//
TBool CWapSmsProtocol::AllocateLocalAddress(TWapAddr& aAddr)
{
- LOGWAPPROT1("CWapSmsProtocol::AllocateLocalAddressL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ALLOCATELOCALADDRESS_1, "CWapSmsProtocol::AllocateLocalAddressL");
//
TBool found=EFalse;
TUint count=0,attempts=0;
@@ -441,7 +447,7 @@
//
CWapSmsProvider* CWapSmsProtocol::LookupSAP(CWapDatagram* aMsg)
{
- LOGWAPPROT1("CWapSmsProtocol::LookupSAP");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_LOOKUPSAP_1, "CWapSmsProtocol::LookupSAP");
TBuf8<KMaxSockAddrSize> addrBuf;
addrBuf.Copy(aMsg->FromAddress());
@@ -477,7 +483,7 @@
//
TInt CWapSmsProtocol::AddrAlreadyUsedByWAP(const TWapAddr &aAddr, const CWapSmsProvider* aSap)
{
- LOGWAPPROT1("CWapSmsProtocol::AddrAlreadyUsedByWAP");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ADDRALREADYUSEDBYWAP_1, "CWapSmsProtocol::AddrAlreadyUsedByWAP");
TDblQueIter<CWapSmsProvider> iter(iSAPList);
CWapSmsProvider* sap;
@@ -492,7 +498,7 @@
return KErrInUse;
}
}
- LOGWAPPROT1("CWapSmsProtocol::AddrAlreadyUsedByWAP not used by WAP");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_ADDRALREADYUSEDBYWAP_2, "CWapSmsProtocol::AddrAlreadyUsedByWAP not used by WAP");
return KErrNone;
} // CWapSmsProtocol::AddrAlreadyUsedByWAP
@@ -502,7 +508,7 @@
//
CSmsProtocol* CWapSmsProtocol::SmsProtocol()
{
- LOGWAPPROT1("CWapSmsProtocol::SmsProtocol()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_SMSPROTOCOL_1, "CWapSmsProtocol::SmsProtocol()");
return iSmsProtocol;
} // CWapSmsProtocol::SmsProtocol
@@ -513,7 +519,7 @@
//
TBool CWapSmsProtocol::FindAndDeleteMsg(CWapDatagram& aDatagram)
{
- LOGWAPPROT1("CWapSmsProtocol::FindAndDeleteMsg()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_FINDANDDELETEMSG_1, "CWapSmsProtocol::FindAndDeleteMsg()");
TInt err;
TInt ret = EFalse;
@@ -533,7 +539,7 @@
//
TInt CWapSmsProtocol::CheckSarL(const TWapAddr& aAddr,CWapSmsProvider* aSap)
{
- LOGWAPPROT1("CWapSmsProtocol::CheckSarL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROTOCOL_CHECKSARL_1, "CWapSmsProtocol::CheckSarL()");
TInt count=0;
TInt err = KErrNone;
--- a/smsprotocols/smsstack/wapprot/Src/ws_prvdr.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/Src/ws_prvdr.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,6 +19,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ws_prvdrTraces.h"
+#endif
+
#include <e32std.h>
#include <wap_sock.h>
#include "ws_main.h"
@@ -27,33 +33,34 @@
#include "ws_obsvr.h"
#include "smsprot.h"
#include <es_mbuf.h>
+#include "smsstacklog.h"
//
// implementation of CWapSmsProvider
//
- // CWapSmsProvider policies
- static _LIT_SECURITY_POLICY_C1(wapSmsProviderSetLocalNamePolicy, ECapabilityNetworkServices );
- static _LIT_SECURITY_POLICY_C1(wapSmsProviderSetOptionPolicy, ECapability_None);
- static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetLengthIoctlPolicy,ECapability_None);
- static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetMessageParamLengthIoctlPolicy,ECapability_None);
- static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetMessageParametersIoctlPolicy,ECapabilityReadDeviceData);
- static _LIT_SECURITY_POLICY_C1(wapSmsProviderWritePolicy,ECapabilityNetworkServices);
+ // CWapSmsProvider policies
+ static _LIT_SECURITY_POLICY_C1(wapSmsProviderSetLocalNamePolicy, ECapabilityNetworkServices );
+ static _LIT_SECURITY_POLICY_C1(wapSmsProviderSetOptionPolicy, ECapability_None);
+ static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetLengthIoctlPolicy,ECapability_None);
+ static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetMessageParamLengthIoctlPolicy,ECapability_None);
+ static _LIT_SECURITY_POLICY_C1(wapSmsProviderGetMessageParametersIoctlPolicy,ECapabilityReadDeviceData);
+ static _LIT_SECURITY_POLICY_C1(wapSmsProviderWritePolicy,ECapabilityNetworkServices);
/**
* Factory
*/
CWapSmsProvider* CWapSmsProvider::NewL(CWapSmsProtocol* aProtocol)
- {
- LOGWAPPROT1("CWapSmsProvider::NewL()");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_NEWL_1, "CWapSmsProvider::NewL()");
- CWapSmsProvider* provider=new(ELeave) CWapSmsProvider(aProtocol);
- CleanupStack::PushL(provider);
- provider->iWapSmsProviderWrite = CWapSmsProviderWrite::NewL(*provider);
- CleanupStack::Pop();
- return provider;
- } // CWapSmsProvider::NewL
+ CWapSmsProvider* provider=new(ELeave) CWapSmsProvider(aProtocol);
+ CleanupStack::PushL(provider);
+ provider->iWapSmsProviderWrite = CWapSmsProviderWrite::NewL(*provider);
+ CleanupStack::Pop();
+ return provider;
+ } // CWapSmsProvider::NewL
/**
@@ -63,9 +70,9 @@
:iMessageType(ESmartMessage)
,iProtocol(aProtocol)
,iSendPending(EFalse)
- ,iIoctlOutstanding(EFalse)
- ,iIsNewStyleClient(EFalse)
- ,iStatusReportScheme(EWapSmsDefault)
+ ,iIoctlOutstanding(EFalse)
+ ,iIsNewStyleClient(EFalse)
+ ,iStatusReportScheme(EWapSmsDefault)
{
iRecvdMsgQueue.SetOffset(CWapDatagram::LinkOffset());
} // CWapSmsProvider::CWapSmsProvider
@@ -93,16 +100,16 @@
* Return WAPSMS options
*/
TInt CWapSmsProvider::GetOption(TUint aLevel,TUint aName, TDes8& aOption)const
- {
- LOGWAPPROT1("CWapSmsProvider::GetOption");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_GETOPTION_1, "CWapSmsProvider::GetOption");
- TInt ret=KErrNone;
- if (TInt(aLevel)==KWapSmsOptionLevel && TInt(aName)==KWapSmsOptionNameDCS)
- aOption = TPtrC8((TText8*)&iDataCodingScheme,sizeof(TWapSmsDataCodingScheme));
- else
- ret=iProtocol->GetOption(aLevel,aName,aOption,NULL);
- return ret;
- } // CWapSmsProvider::GetOption
+ TInt ret=KErrNone;
+ if (TInt(aLevel)==KWapSmsOptionLevel && TInt(aName)==KWapSmsOptionNameDCS)
+ aOption = TPtrC8((TText8*)&iDataCodingScheme,sizeof(TWapSmsDataCodingScheme));
+ else
+ ret=iProtocol->GetOption(aLevel,aName,aOption,NULL);
+ return ret;
+ } // CWapSmsProvider::GetOption
/**
@@ -112,76 +119,76 @@
*
*/
TInt CWapSmsProvider::SetOption(TUint aLevel, TUint aName, const TDesC8& aOption)
- {
- LOGWAPPROT1("CWapSmsProvider::SetOption");
- if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderSetOptionPolicy,"CWapSmsProvider SetOption policy check") != KErrNone))
- {
- return KErrPermissionDenied;
- }
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SETOPTION_1, "CWapSmsProvider::SetOption");
+ if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderSetOptionPolicy,"CWapSmsProvider SetOption policy check") != KErrNone))
+ {
+ return KErrPermissionDenied;
+ }
- TInt ret=KErrNone;
- if (TInt(aLevel)==KWapSmsOptionLevel)
- {
- switch(TInt(aName))
- {
- case KWapSmsOptionNameDCS:
- {
- iDataCodingScheme = static_cast<TWapSmsDataCodingScheme>(*aOption.Ptr());
- break;
- }
- case KWapSmsOptionWapDatagram:
- {
- iMessageType=EWapDatagram;
- break;
- }
- case KWapSmsStatusReportScheme:
- {
- iStatusReportScheme = static_cast<TWapSmsStatusReportScheme>(*aOption.Ptr());
- break;
- }
- case KWapSmsOptionNewStyleClient:
- {
- iIsNewStyleClient = ETrue;
- break;
- }
- case KWapSmsOptionOKToDeleteMessage:
- {
- //Get the first message from the queue
- CWapDatagram* msg = iRecvdMsgQueue.First();
- //Find and delete from SAR
- TBool found=iProtocol->FindAndDeleteMsg(*msg);
- if(!found)
- {
- LOGWAPPROT1("CWapSmsProvider::SetOption: Error. Couldn't find the message in the SAR for deletion");
- break;
- }
- //Remove from the queue
- iRecvdMsgQueue.Remove(*msg);
- delete msg;
- break;
- }
- default:
- ret=KErrNotSupported;
- }
+ TInt ret=KErrNone;
+ if (TInt(aLevel)==KWapSmsOptionLevel)
+ {
+ switch(TInt(aName))
+ {
+ case KWapSmsOptionNameDCS:
+ {
+ iDataCodingScheme = static_cast<TWapSmsDataCodingScheme>(*aOption.Ptr());
+ break;
+ }
+ case KWapSmsOptionWapDatagram:
+ {
+ iMessageType=EWapDatagram;
+ break;
+ }
+ case KWapSmsStatusReportScheme:
+ {
+ iStatusReportScheme = static_cast<TWapSmsStatusReportScheme>(*aOption.Ptr());
+ break;
+ }
+ case KWapSmsOptionNewStyleClient:
+ {
+ iIsNewStyleClient = ETrue;
+ break;
+ }
+ case KWapSmsOptionOKToDeleteMessage:
+ {
+ //Get the first message from the queue
+ CWapDatagram* msg = iRecvdMsgQueue.First();
+ //Find and delete from SAR
+ TBool found=iProtocol->FindAndDeleteMsg(*msg);
+ if(!found)
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SETOPTION_2, "CWapSmsProvider::SetOption: Error. Couldn't find the message in the SAR for deletion");
+ break;
+ }
+ //Remove from the queue
+ iRecvdMsgQueue.Remove(*msg);
+ delete msg;
+ break;
+ }
+ default:
+ ret=KErrNotSupported;
+ }
- }
- else
- {
- ret=iProtocol->SetOption(aLevel,aName,aOption,NULL);
- }
- return ret;
- } // CWapSmsProvider::SetOption
+ }
+ else
+ {
+ ret=iProtocol->SetOption(aLevel,aName,aOption,NULL);
+ }
+ return ret;
+ } // CWapSmsProvider::SetOption
/**
* Shutdown the SAP
*/
void CWapSmsProvider::Shutdown(TCloseType aType)
- {
- LOGWAPPROT1("CWapSmsProvider::Shutdown");
- if (aType!=CServProviderBase::EImmediate)
- iSocket->CanClose();
- } // CWapSmsProvider::Shutdown
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SHUTDOWN_1, "CWapSmsProvider::Shutdown");
+ if (aType!=CServProviderBase::EImmediate)
+ iSocket->CanClose();
+ } // CWapSmsProvider::Shutdown
/**
@@ -191,160 +198,160 @@
* @capability NetworkServices
*/
TInt CWapSmsProvider::Write(RMBufChain& aBufChain, TUint /*options*/, TSockAddr* aAddr)
- {
- LOGWAPPROT1("CWapSmsProvider::Write()");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_WRITE_1, "CWapSmsProvider::Write()");
- if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderWritePolicy,"CWapSmsProvider Write policy check") != KErrNone))
- {
- return KErrPermissionDenied;
- }
- // @note: LOGIFH2A2 macro for logging esock write
+ if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderWritePolicy,"CWapSmsProvider Write policy check") != KErrNone))
+ {
+ return KErrPermissionDenied;
+ }
+ // @note: LOGIFH2A2 macro for logging esock write
#ifdef SMSLOGGERIF
- TInt length = aBufChain.Length();
- LOGWAPPROT2("CWapSmsProvider::Write [%d bytes]", length);
- TBuf8<0x100> dumpBuf;
- if(length > 0x100)
- {
+ TInt length = aBufChain.Length();
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_WRITE_2, "CWapSmsProvider::Write [%d bytes]", length);
+ TBuf8<0x100> dumpBuf;
+ if(length > 0x100)
+ {
- TInt parts=0;
- TInt offset = 0;
- while (offset < length)
- {
- aBufChain.CopyOut(dumpBuf, offset);
- offset += length;
- LOGIF2(_L8("ESock WAP concantonated part: %d"),parts++);
- LOGIF2(_L8("ESOCK WRITE: %S"),&dumpBuf);
- LOGIFH2A2(_L8("ESOCK WRITE: "),dumpBuf);
- }
+ TInt parts=0;
+ TInt offset = 0;
+ while (offset < length)
+ {
+ aBufChain.CopyOut(dumpBuf, offset);
+ offset += length;
+ LOGIF2(_L8("ESock WAP concantonated part: %d"),parts++);
+ LOGIF2(_L8("ESOCK WRITE: %S"),&dumpBuf);
+ LOGIFH2A2(_L8("ESOCK WRITE: "),dumpBuf);
+ }
- }
- else
- {
- aBufChain.CopyOut(dumpBuf, 0);
- LOGIF2(_L8("ESOCK WRITE: %S"),&dumpBuf);
- LOGIFH2A2(_L8("ESOCK WRITE: "),dumpBuf);
- }
+ }
+ else
+ {
+ aBufChain.CopyOut(dumpBuf, 0);
+ LOGIF2(_L8("ESOCK WRITE: %S"),&dumpBuf);
+ LOGIFH2A2(_L8("ESOCK WRITE: "),dumpBuf);
+ }
#endif
- // Note that if this fails somehow it still frees the buf chain and sets itself active - it's
- // not clear to me whether this is good behaviour but it's the pre-mbuf behaviour too
- iWapSmsProviderWrite->Start(aBufChain, *aAddr);
- return KErrNone;
- } // CWapSmsProvider::Write
+ // Note that if this fails somehow it still frees the buf chain and sets itself active - it's
+ // not clear to me whether this is good behaviour but it's the pre-mbuf behaviour too
+ iWapSmsProviderWrite->Start(aBufChain, *aAddr);
+ return KErrNone;
+ } // CWapSmsProvider::Write
/**
* Read a datagram off the queue
*/
TInt CWapSmsProvider::GetData(RMBufChain& aBufChain, TUint aLength, TUint /*options*/,TSockAddr* aAddr)
- {
- LOGWAPPROT1("CWapSmsProvider::GetData()");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_GETDATA_1, "CWapSmsProvider::GetData()");
- CWapDatagram* msg = iRecvdMsgQueue.First();
- if(!iIsNewStyleClient)
- {
- iRecvdMsgQueue.Remove(*msg);
- }
- TInt err = msg->WapDatagram(aBufChain, aLength);
+ CWapDatagram* msg = iRecvdMsgQueue.First();
+ if(!iIsNewStyleClient)
+ {
+ iRecvdMsgQueue.Remove(*msg);
+ }
+ TInt err = msg->WapDatagram(aBufChain, aLength);
- //@note: LOGIFH2A2 macro for logging esock getdata
- LOGWAPPROT1("CWapSmsProvider::GetData");
- // Logging migrated to WapDatagram() for ease of descriptor ref
+ //@note: LOGIFH2A2 macro for logging esock getdata
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_GETDATA_2, "CWapSmsProvider::GetData");
+ // Logging migrated to WapDatagram() for ease of descriptor ref
- if (err > 0 && aAddr)
- {
- TWapAddr* wapAddr = reinterpret_cast<TWapAddr*>(aAddr);
- TInt toPort,fromPort;
- msg->Ports(fromPort,toPort);
- wapAddr->SetWapPort(static_cast<TWapPortNumber>(fromPort));
- TBuf8<KMaxSockAddrSize> addrBuf;
- addrBuf.Copy(msg->FromAddress());
- wapAddr->SetWapAddress(addrBuf);
- }
- if(!iIsNewStyleClient)
- {
- delete msg;
- }
- return err > 0? 1: err; // datagrams are atoms not byte counts
- } // CWapSmsProvider::GetData
+ if (err > 0 && aAddr)
+ {
+ TWapAddr* wapAddr = reinterpret_cast<TWapAddr*>(aAddr);
+ TInt toPort,fromPort;
+ msg->Ports(fromPort,toPort);
+ wapAddr->SetWapPort(static_cast<TWapPortNumber>(fromPort));
+ TBuf8<KMaxSockAddrSize> addrBuf;
+ addrBuf.Copy(msg->FromAddress());
+ wapAddr->SetWapAddress(addrBuf);
+ }
+ if(!iIsNewStyleClient)
+ {
+ delete msg;
+ }
+ return err > 0? 1: err; // datagrams are atoms not byte counts
+ } // CWapSmsProvider::GetData
/**
* New data has arrived notify ESOCK.
*/
void CWapSmsProvider::NewData(CWapDatagram* aMsg)
- {
- TBool notifyEsock = EFalse;
- LOGWAPPROT1("CWapSmsProvider::NewData");
+ {
+ TBool notifyEsock = EFalse;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_NEWDATA_1, "CWapSmsProvider::NewData");
- if(iIoctlOutstanding && iName==KSOGetLength && iIsNewStyleClient)
- {
- TPckgBuf<TInt> buf= aMsg->WapDatagramLength();
- iSocket->IoctlComplete(&buf);
- iIoctlOutstanding= EFalse;
- iName= NULL;
- notifyEsock = ETrue;
- }
- else if(iIoctlOutstanding && iName==KSOGetMessageParametersLength && iIsNewStyleClient)
- {
- CBufFlat* buffer = aMsg->SmsExternalisedStream();
- TPckgBuf<TInt> buf = buffer->Size();
- iSocket->IoctlComplete(&buf);
- iIoctlOutstanding= EFalse;
- iName= NULL;
- notifyEsock = ETrue;
- }
- else if(iIoctlOutstanding && iName==KSOGetMessageParameters && iIsNewStyleClient)
- {
- CBufFlat* buffer = aMsg->SmsExternalisedStream();
- TPtr8 buf = buffer->Ptr(0);
- iSocket->IoctlComplete(&buf);
- iIoctlOutstanding= EFalse;
- iName= NULL;
- notifyEsock = ETrue;
- }
- else if(iName!=KSOGetLength && iName!=KSOGetMessageParametersLength && iName!=KSOGetMessageParameters && iIsNewStyleClient)
- {
- notifyEsock= EFalse;
- }
+ if(iIoctlOutstanding && iName==KSOGetLength && iIsNewStyleClient)
+ {
+ TPckgBuf<TInt> buf= aMsg->WapDatagramLength();
+ iSocket->IoctlComplete(&buf);
+ iIoctlOutstanding= EFalse;
+ iName= NULL;
+ notifyEsock = ETrue;
+ }
+ else if(iIoctlOutstanding && iName==KSOGetMessageParametersLength && iIsNewStyleClient)
+ {
+ CBufFlat* buffer = aMsg->SmsExternalisedStream();
+ TPckgBuf<TInt> buf = buffer->Size();
+ iSocket->IoctlComplete(&buf);
+ iIoctlOutstanding= EFalse;
+ iName= NULL;
+ notifyEsock = ETrue;
+ }
+ else if(iIoctlOutstanding && iName==KSOGetMessageParameters && iIsNewStyleClient)
+ {
+ CBufFlat* buffer = aMsg->SmsExternalisedStream();
+ TPtr8 buf = buffer->Ptr(0);
+ iSocket->IoctlComplete(&buf);
+ iIoctlOutstanding= EFalse;
+ iName= NULL;
+ notifyEsock = ETrue;
+ }
+ else if(iName!=KSOGetLength && iName!=KSOGetMessageParametersLength && iName!=KSOGetMessageParameters && iIsNewStyleClient)
+ {
+ notifyEsock= EFalse;
+ }
- if(!iIsNewStyleClient || notifyEsock)
- iSocket->NewData(1);
- //else we notify ESock in IOCTL for new client
- } // CWapSmsProvider::NewData
+ if(!iIsNewStyleClient || notifyEsock)
+ iSocket->NewData(1);
+ //else we notify ESock in IOCTL for new client
+ } // CWapSmsProvider::NewData
/**
* Error happened, notify ESOCK
*/
void CWapSmsProvider::Error(TInt aError, TUint aOperationMask)
- {
- LOGWAPPROT3("CWapSmsProvider::Error [aError=%d, mask=%d] ", aError, aOperationMask);
+ {
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_ERROR_1, "CWapSmsProvider::Error [aError=%d, mask=%u] ", aError, aOperationMask);
- iSocket->Error(aError, aOperationMask);
- } // CWapSmsProvider::Error
+ iSocket->Error(aError, aOperationMask);
+ } // CWapSmsProvider::Error
/**
* Return the offset to the dblquelink
*/
TInt CWapSmsProvider::LinkOffset()
- {
- LOGWAPPROT1("CWapSmsProvider::LinkOffset");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_LINKOFFSET_1, "CWapSmsProvider::LinkOffset");
- return _FOFF(CWapSmsProvider,iSAPLink);
- } // CWapSmsProvider::LinkOffset
+ return _FOFF(CWapSmsProvider,iSAPLink);
+ } // CWapSmsProvider::LinkOffset
/**
* Return the address associated with the sap
*/
void CWapSmsProvider::LocalName(TSockAddr& aAddr) const
- {
- LOGWAPPROT1("CWapSmsProvider::LocalName");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_LOCALNAME_1, "CWapSmsProvider::LocalName");
- Mem::Copy(&aAddr,&iLocalAddress,sizeof(TSockAddr));
- } // CWapSmsProvider::LocalName
+ Mem::Copy(&aAddr,&iLocalAddress,sizeof(TSockAddr));
+ } // CWapSmsProvider::LocalName
/**
@@ -353,61 +360,61 @@
* @capability NetworkServices
*/
TInt CWapSmsProvider::SetLocalName(TSockAddr& aAddr)
- {
- LOGWAPPROT1("CWapSmsProvider::SetLocalName()");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SETLOCALNAME_1, "CWapSmsProvider::SetLocalName()");
- if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderSetLocalNamePolicy,"CWapSmsProvider SetLocalName policy check") != KErrNone))
- {
- return KErrPermissionDenied;
- }
- TWapAddr* wapAddr = reinterpret_cast<TWapAddr*>(&aAddr);
- LOGWAPPROT2("CWapSmsProvider::SetLocalName %d",wapAddr->WapPort());
- // Due ESOCK interface port EWapPortUnspecified value (-1) can be transferred as a maximum unsigned 16 int
- if (wapAddr->WapPort()==EWapPortUnspecified || wapAddr->WapPort()==static_cast<TUint16>(EWapPortUnspecified))
- {
- if(!iProtocol->AllocateLocalAddress(iLocalAddress))
- return KErrInUse;
- else return KErrNone;
- }
+ if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderSetLocalNamePolicy,"CWapSmsProvider SetLocalName policy check") != KErrNone))
+ {
+ return KErrPermissionDenied;
+ }
+ TWapAddr* wapAddr = reinterpret_cast<TWapAddr*>(&aAddr);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SETLOCALNAME_2, "CWapSmsProvider::SetLocalName %d",wapAddr->WapPort());
+ // Due ESOCK interface port EWapPortUnspecified value (-1) can be transferred as a maximum unsigned 16 int
+ if (wapAddr->WapPort()==EWapPortUnspecified || wapAddr->WapPort()==static_cast<TUint16>(EWapPortUnspecified))
+ {
+ if(!iProtocol->AllocateLocalAddress(iLocalAddress))
+ return KErrInUse;
+ else return KErrNone;
+ }
- TInt ret=iProtocol->AddrAlreadyUsedByWAP(*wapAddr,this);
- if(ret == KErrInUse) return ret;
- else if(ret == KErrAlreadyExists) return KErrNone;
+ TInt ret=iProtocol->AddrAlreadyUsedByWAP(*wapAddr,this);
+ if(ret == KErrInUse) return ret;
+ else if(ret == KErrAlreadyExists) return KErrNone;
- TSmsAddr addr;
- if(wapAddr->Port() <=255)
- addr.SetSmsAddrFamily(ESmsAddrApplication8BitPort);
- else
- addr.SetSmsAddrFamily(ESmsAddrApplication16BitPort);
+ TSmsAddr addr;
+ if(wapAddr->Port() <=255)
+ addr.SetSmsAddrFamily(ESmsAddrApplication8BitPort);
+ else
+ addr.SetSmsAddrFamily(ESmsAddrApplication16BitPort);
- addr.SetPort(wapAddr->Port());
+ addr.SetPort(wapAddr->Port());
- if((iProtocol->SmsProtocol()->SmsAddrIsAlreadyUsed(NULL,addr)))
- return KErrInUse;
+ if((iProtocol->SmsProtocol()->SmsAddrIsAlreadyUsed(NULL,addr)))
+ return KErrInUse;
- Mem::Copy(&iLocalAddress,&aAddr,sizeof(TSockAddr));
- TInt err;
- TRAP(err,ret = iProtocol->CheckSarL(*wapAddr,this));
- if(err!=KErrNone)
- return err;
- if(ret!=KErrNone)
- {
- Error(ret,MSocketNotify::EErrorAllOperations);
- }
- return KErrNone;
- } // RSocket::Bind
+ Mem::Copy(&iLocalAddress,&aAddr,sizeof(TSockAddr));
+ TInt err;
+ TRAP(err,ret = iProtocol->CheckSarL(*wapAddr,this));
+ if(err!=KErrNone)
+ return err;
+ if(ret!=KErrNone)
+ {
+ Error(ret,MSocketNotify::EErrorAllOperations);
+ }
+ return KErrNone;
+ } // RSocket::Bind
/**
* Returns true if aAddr matches the local address of the sap
*/
TBool CWapSmsProvider::MatchesLocalAddress(const TWapAddr& aAddr)
- {
- LOGWAPPROT1("CWapSmsProvider::MatchesLocalAddress");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_MATCHESLOCALADDRESS_1, "CWapSmsProvider::MatchesLocalAddress");
- return (iLocalAddress == aAddr);
- } // CWapSmsProvider::MatchesLocalAddress
+ return (iLocalAddress == aAddr);
+ } // CWapSmsProvider::MatchesLocalAddress
//
@@ -427,195 +434,195 @@
*
*/
void CWapSmsProvider::Ioctl(TUint aLevel,TUint aName,TDes8 * /*aOption*/)
- {
- LOGWAPPROT3("CWapSmsProvider::Ioctl [aLevel=%d, aName=%d]", aLevel, aName);
- LOGWAPPROT2("CWapSmsProtocol::Ioctl [provider=0x%08x]",this);
+ {
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_IOCTL_1, "CWapSmsProvider::Ioctl [aLevel=%u, aName=%u]", aLevel, aName);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_IOCTL_2, "CWapSmsProtocol::Ioctl [provider=0x%08x]",this);
- iName=aName;
- switch (aLevel)
- {
- case KSolWapProv:
- {
- if(iIoctlOutstanding || !iIsNewStyleClient)
- {
- Error(KErrInUse,MSocketNotify::EErrorIoctl);
- break;
- }
- switch (iName)
- {
- case KSOGetLength:
- //
- // Get the length
- //
- {
- if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetLengthIoctlPolicy,"CWapSmsProvider GetLength Ioctl policy check") != KErrNone))
- {
- Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
- return;
- }
- iIoctlOutstanding = ETrue;
- //check the queue for any other message for this client and call new data if any exist
- if(!iRecvdMsgQueue.IsEmpty())
- {
- CWapDatagram* msg = iRecvdMsgQueue.First();
- //check the datagram.
- if(msg->IsComplete())
- {
- NewData(msg);
- }
- else
- {
- // else notify the client with error.
- // Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
- Error(KErrGeneral,MSocketNotify::EErrorIoctl);
- iIoctlOutstanding = EFalse;
- }
+ iName=aName;
+ switch (aLevel)
+ {
+ case KSolWapProv:
+ {
+ if(iIoctlOutstanding || !iIsNewStyleClient)
+ {
+ Error(KErrInUse,MSocketNotify::EErrorIoctl);
+ break;
+ }
+ switch (iName)
+ {
+ case KSOGetLength:
+ //
+ // Get the length
+ //
+ {
+ if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetLengthIoctlPolicy,"CWapSmsProvider GetLength Ioctl policy check") != KErrNone))
+ {
+ Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
+ return;
+ }
+ iIoctlOutstanding = ETrue;
+ //check the queue for any other message for this client and call new data if any exist
+ if(!iRecvdMsgQueue.IsEmpty())
+ {
+ CWapDatagram* msg = iRecvdMsgQueue.First();
+ //check the datagram.
+ if(msg->IsComplete())
+ {
+ NewData(msg);
+ }
+ else
+ {
+ // else notify the client with error.
+ // Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
+ Error(KErrGeneral,MSocketNotify::EErrorIoctl);
+ iIoctlOutstanding = EFalse;
+ }
- }
- break;
- }
-
- case KSOGetMessageParametersLength:
- //
- // Get the Message Parameters Length
- //
- {
- if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetMessageParamLengthIoctlPolicy,"CWapSmsProvider KSOGetMessageParametersLength Ioctl policy check") != KErrNone))
- {
- Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
- return;
- }
- iIoctlOutstanding = ETrue;
- //check the queue for any other message for this client and call new data if any exist
- if(!iRecvdMsgQueue.IsEmpty())
- {
- CWapDatagram* msg = iRecvdMsgQueue.First();
- //check the datagram.
- if(msg->IsComplete())
- {
- NewData(msg);
- }
- else
- {
- // else notify the client with error.
- // Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
- Error(KErrGeneral,MSocketNotify::EErrorIoctl);
- iIoctlOutstanding = EFalse;
- }
+ }
+ break;
+ }
+
+ case KSOGetMessageParametersLength:
+ //
+ // Get the Message Parameters Length
+ //
+ {
+ if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetMessageParamLengthIoctlPolicy,"CWapSmsProvider KSOGetMessageParametersLength Ioctl policy check") != KErrNone))
+ {
+ Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
+ return;
+ }
+ iIoctlOutstanding = ETrue;
+ //check the queue for any other message for this client and call new data if any exist
+ if(!iRecvdMsgQueue.IsEmpty())
+ {
+ CWapDatagram* msg = iRecvdMsgQueue.First();
+ //check the datagram.
+ if(msg->IsComplete())
+ {
+ NewData(msg);
+ }
+ else
+ {
+ // else notify the client with error.
+ // Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
+ Error(KErrGeneral,MSocketNotify::EErrorIoctl);
+ iIoctlOutstanding = EFalse;
+ }
- }
- break;
- }
-
- case KSOGetMessageParameters:
- //
- // Get the Message Parameters
- //
- {
- if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetMessageParametersIoctlPolicy,"CWapSmsProvider GetMessageParameters Ioctl policy check") != KErrNone))
- {
- Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
- return;
- }
- iIoctlOutstanding = ETrue;
- //check the queue for any other message for this client and call new data if any exist
- if(!iRecvdMsgQueue.IsEmpty())
- {
- CWapDatagram* msg = iRecvdMsgQueue.First();
- //check the datagram.
- if(msg->IsComplete())
- {
- NewData(msg);
- }
- else
- {
- // else notify the client with error.
- // Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
- Error(KErrGeneral,MSocketNotify::EErrorIoctl);
- iIoctlOutstanding = EFalse;
- }
+ }
+ break;
+ }
+
+ case KSOGetMessageParameters:
+ //
+ // Get the Message Parameters
+ //
+ {
+ if(!iSecurityChecker || (iSecurityChecker->CheckPolicy(wapSmsProviderGetMessageParametersIoctlPolicy,"CWapSmsProvider GetMessageParameters Ioctl policy check") != KErrNone))
+ {
+ Error(KErrPermissionDenied,MSocketNotify::EErrorIoctl);
+ return;
+ }
+ iIoctlOutstanding = ETrue;
+ //check the queue for any other message for this client and call new data if any exist
+ if(!iRecvdMsgQueue.IsEmpty())
+ {
+ CWapDatagram* msg = iRecvdMsgQueue.First();
+ //check the datagram.
+ if(msg->IsComplete())
+ {
+ NewData(msg);
+ }
+ else
+ {
+ // else notify the client with error.
+ // Note:this can happen if client uses 8-Bit port number for 7-Bit datagram
+ Error(KErrGeneral,MSocketNotify::EErrorIoctl);
+ iIoctlOutstanding = EFalse;
+ }
- }
- break;
- }
+ }
+ break;
+ }
- default:
- //
- // Unsupported ioctl name
- //
- {
- // Error gracefully
- Error(KErrNotSupported,MSocketNotify::EErrorIoctl);
- }
- }
- break;
- }
- default:
- // Gracefully error in release build
- Error(KErrNotSupported,MSocketNotify::EErrorIoctl);
- }
- } // CServProviderBase::Ioctl
+ default:
+ //
+ // Unsupported ioctl name
+ //
+ {
+ // Error gracefully
+ Error(KErrNotSupported,MSocketNotify::EErrorIoctl);
+ }
+ }
+ break;
+ }
+ default:
+ // Gracefully error in release build
+ Error(KErrNotSupported,MSocketNotify::EErrorIoctl);
+ }
+ } // CServProviderBase::Ioctl
/**
* Cancel IOCTL- can only have one outstanding IOCTL at a time
*/
void CWapSmsProvider::CancelIoctl(TUint aLevel,TUint aName)
- {
- LOGWAPPROT1("CWapSmsProvider::CancelIoctl()");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_CANCELIOCTL_1, "CWapSmsProvider::CancelIoctl()");
- if(!iIoctlOutstanding || (aName!=iName) || (aLevel!=KSolWapProv))
- {
- Error(KErrNotFound,MSocketNotify::EErrorIoctl);
- }
- else
- {
- iIoctlOutstanding=EFalse;
- }
- } // CWapSmsProvider::CancelIoctl
+ if(!iIoctlOutstanding || (aName!=iName) || (aLevel!=KSolWapProv))
+ {
+ Error(KErrNotFound,MSocketNotify::EErrorIoctl);
+ }
+ else
+ {
+ iIoctlOutstanding=EFalse;
+ }
+ } // CWapSmsProvider::CancelIoctl
/**
* Start the provider- does nothing
*/
void CWapSmsProvider::Start()
- {
- LOGWAPPROT1("CWapSmsProvider::Start()");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_START_1, "CWapSmsProvider::Start()");
- } // CWapSmsProvider::Start
+ } // CWapSmsProvider::Start
void CWapSmsProvider::AddToQueue(CWapDatagram* aMsg)
/**
* Adding the datagram to received messages queue
*/
- {
- LOGWAPPROT1("CWapSmsProvider::AddToQueue...");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_ADDTOQUEUE_1, "CWapSmsProvider::AddToQueue...");
- iRecvdMsgQueue.AddLast(*aMsg);
- NewData(aMsg);
- } // CWapSmsProvider::AddToQueue
+ iRecvdMsgQueue.AddLast(*aMsg);
+ NewData(aMsg);
+ } // CWapSmsProvider::AddToQueue
TInt CWapSmsProvider::SecurityCheck(MProvdSecurityChecker* aSecurityChecker)
- {
- LOGWAPPROT1("CWapSmsProvider::SecurityCheck()");
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDER_SECURITYCHECK_1, "CWapSmsProvider::SecurityCheck()");
- iSecurityChecker=aSecurityChecker;
- return KErrNone;
- } // CWapSmsProvider::SecurityCheck
+ iSecurityChecker=aSecurityChecker;
+ return KErrNone;
+ } // CWapSmsProvider::SecurityCheck
TWapSmsStatusReportScheme CWapSmsProvider::GetStatusReportScheme()
- {
- return iStatusReportScheme;
- }
+ {
+ return iStatusReportScheme;
+ }
-
+
TWapSmsDataCodingScheme CWapSmsProvider::GetDataCodingScheme()
- {
- return iDataCodingScheme;
- }
+ {
+ return iDataCodingScheme;
+ }
//
@@ -627,14 +634,14 @@
* 2 phase constructor
*/
CWapSmsProviderWrite* CWapSmsProviderWrite::NewL(CWapSmsProvider& aWapSmsProvider)
- {
- LOGWAPPROT1("CWapSmsProviderWrite::NewL");
- CWapSmsProviderWrite* self = new (ELeave) CWapSmsProviderWrite(aWapSmsProvider);
- CleanupStack::PushL(self);
- self->iMsgSender = CWapSapMessageSender::NewL(aWapSmsProvider.iProtocol->SmsProtocol(), &aWapSmsProvider);
- CleanupStack::Pop(self);
- return self;
- } // CWapSmsProviderWrite::NewL
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_NEWL_1, "CWapSmsProviderWrite::NewL");
+ CWapSmsProviderWrite* self = new (ELeave) CWapSmsProviderWrite(aWapSmsProvider);
+ CleanupStack::PushL(self);
+ self->iMsgSender = CWapSapMessageSender::NewL(aWapSmsProvider.iProtocol->SmsProtocol(), &aWapSmsProvider);
+ CleanupStack::Pop(self);
+ return self;
+ } // CWapSmsProviderWrite::NewL
/**
@@ -644,7 +651,7 @@
:CActive(EPriorityStandard)
,iWapSmsProvider(aWapSmsProvider)
{
- LOGWAPPROT1("CWapSmsProviderWrite::CWapSmsProviderWrite()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_CTOR_1, "CWapSmsProviderWrite::CWapSmsProviderWrite()");
CActiveScheduler::Add(this);
} // CWapSmsProviderWrite::CWapSmsProviderWrite
@@ -662,76 +669,80 @@
void CWapSmsProviderWrite::Start(RMBufChain& aBufChain, TSockAddr& aAddr)
- {
- LOGWAPPROT1("CWapSmsProviderWrite::Start");
- iWapAddr = reinterpret_cast<TWapAddr&>(aAddr);
- delete iDes;
- iDes = NULL;
- TRAPD(err, (iDes = HBufC8::NewL(aBufChain.Length())) );
- if(err == KErrNone)
- {
- TPtr8 desBuf(iDes->Des());
- desBuf.SetLength(aBufChain.Length());
- aBufChain.CopyOut(desBuf, 0);
- // Logging migrated from CWapSmsProvider::GetData
- LOGSMSIF2("ESOCK READ: \"%S\"", iDes);
- LOGSMSIFHEXBUF(_L8("ESOCK READ"), *iDes);
- LOGSMSIFTIMESTAMP();
- }
- aBufChain.Free();
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_START_1, "CWapSmsProviderWrite::Start");
+ iWapAddr = reinterpret_cast<TWapAddr&>(aAddr);
+ delete iDes;
+ iDes = NULL;
+ TRAPD(err, (iDes = HBufC8::NewL(aBufChain.Length())) );
+ if(err == KErrNone)
+ {
+ TPtr8 desBuf(iDes->Des());
+ desBuf.SetLength(aBufChain.Length());
+ aBufChain.CopyOut(desBuf, 0);
+ // Logging migrated from CWapSmsProvider::GetData
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_START_2, "ESOCK READ: \"%s\"", *iDes);
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ LogSmsIfHexBuf(_L8("ESOCK READ"), *iDes);
+ TBuf<40> timestamp;
+ SmsTimeStampL(timestamp);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1, "%S",timestamp);
+#endif
+ }
+ aBufChain.Free();
- TRequestStatus* status = &iStatus;
- User::RequestComplete(status, err);
- SetActive();
- } // CWapSmsProviderWrite::Start
+ TRequestStatus* status = &iStatus;
+ User::RequestComplete(status, err);
+ SetActive();
+ } // CWapSmsProviderWrite::Start
void CWapSmsProviderWrite::RunL()
- {
- LOGWAPPROT1("CWapSmsProviderWrite::RunL");
- User::LeaveIfError(iStatus.Int());
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_RUNL_1, "CWapSmsProviderWrite::RunL");
+ User::LeaveIfError(iStatus.Int());
- //no need to use cleanup stack
- CWapDatagram* datagram = CWapDatagram::NewL(*iDes);
+ //no need to use cleanup stack
+ CWapDatagram* datagram = CWapDatagram::NewL(*iDes);
- if (iWapSmsProvider.iDataCodingScheme == EWapSms7BitDCS)
- datagram->SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet7Bit);
- else
- datagram->SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet8Bit);
-
- if (iWapSmsProvider.iStatusReportScheme == EWapSmsTPSRR)
- {
- datagram->SetStatusReportScheme(ETPSRRScheme);
- }
- else
- {
- datagram->SetStatusReportScheme(EDefaultScheme);
- }
-
- TBuf<KMaxSockAddrSize> addrBuf;
- addrBuf.Copy(iWapAddr.WapAddress());
- datagram->SetToAddress(addrBuf);
- TInt fromPort = iWapSmsProvider.iLocalAddress.WapPort();
- datagram->SetPorts(fromPort, iWapAddr.WapPort());
+ if (iWapSmsProvider.iDataCodingScheme == EWapSms7BitDCS)
+ datagram->SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet7Bit);
+ else
+ datagram->SetAlphabet(TSmsDataCodingScheme::ESmsAlphabet8Bit);
+
+ if (iWapSmsProvider.iStatusReportScheme == EWapSmsTPSRR)
+ {
+ datagram->SetStatusReportScheme(ETPSRRScheme);
+ }
+ else
+ {
+ datagram->SetStatusReportScheme(EDefaultScheme);
+ }
+
+ TBuf<KMaxSockAddrSize> addrBuf;
+ addrBuf.Copy(iWapAddr.WapAddress());
+ datagram->SetToAddress(addrBuf);
+ TInt fromPort = iWapSmsProvider.iLocalAddress.WapPort();
+ datagram->SetPorts(fromPort, iWapAddr.WapPort());
- iMsgSender->SendDatagramL(datagram); // takes ownership of datagram
- } // CWapSmsProviderWrite::RunL
+ iMsgSender->SendDatagramL(datagram); // takes ownership of datagram
+ } // CWapSmsProviderWrite::RunL
TInt CWapSmsProviderWrite::RunError(TInt aError)
- {
- LOGWAPPROT1("CWapSmsProviderWrite::RunError");
- iWapSmsProvider.Error(aError, MSocketNotify::EErrorSend);
- return KErrNone;
- } // CWapSmsProviderWrite::RunError
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_RUNERROR_1, "CWapSmsProviderWrite::RunError");
+ iWapSmsProvider.Error(aError, MSocketNotify::EErrorSend);
+ return KErrNone;
+ } // CWapSmsProviderWrite::RunError
void CWapSmsProviderWrite::DoCancel()
- {
- LOGWAPPROT1("CWapSmsProviderWrite::DoCancel");
- TRequestStatus* status = &iStatus;
- User::RequestComplete(status, KErrCancel);
- } // CWapSmsProviderWrite::DoCancel
+ {
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAPSMSPROVIDERWRITE_DOCANCEL_1, "CWapSmsProviderWrite::DoCancel");
+ TRequestStatus* status = &iStatus;
+ User::RequestComplete(status, KErrCancel);
+ } // CWapSmsProviderWrite::DoCancel
// EOF - WS_PRVDR.CPP
--- a/smsprotocols/smsstack/wapprot/test/TE_WAPDGRM/TE_wapdgrm.mmp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPDGRM/TE_wapdgrm.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -13,9 +13,6 @@
// Description:
//
-#include <comms-infras/commsdebugutility.mmh>
-#include <cflog.mmh>
-
TARGET te_wapdgrm.exe
CAPABILITY ReadDeviceData WriteDeviceData NetworkControl NetworkServices ReadUserData WriteUserData PowerMgmt
TARGETTYPE exe
@@ -37,6 +34,7 @@
USERINCLUDE ../../../common/inc
USERINCLUDE ../../../test
USERINCLUDE ../../../smsu/inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/smsprotocols/smsstack/wapprot/test/TE_WAPDGRM/TE_wapdgrmbase.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPDGRM/TE_wapdgrmbase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -18,10 +18,15 @@
#include "TE_wapdgrmbase.h"
#include "smsstackutils.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "TE_wapdgrmbaseTraces.h"
+#endif
+
// WapProt code needs it
GLDEF_C void Panic(TWAPSMSPanic aPanic)
{
- LOGWAPPROT2("WAPUPANIC %d", aPanic);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TE_WAPDGRMBASE_PANIC_1, "WAPUPANIC %d", aPanic);
_LIT(KWapProtPanic, "WAPPROT");
User::Panic(KWapProtPanic, aPanic);
}
--- a/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_testwapthdr.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_testwapthdr.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -20,6 +20,11 @@
#include "TE_wapthdrbase.h"
#include "smsstackutils.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "TE_testwapthdrTraces.h"
+#endif
+
const TInt KSmsLogBufferSize = 1280;
TVerdict CTestParseWapTextMessage::doTestStepL()
@@ -203,7 +208,7 @@
// Send a buffer too long for the logger to handle, therefore causing an overflow.
// Function will panic if overflow handler is not implemented correctly.
INFO_PRINTF1(_L("Testing LOGSMSIF2..."));
- LOGSMSIF2("%S",&buf);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTESTLOGGEROVERFLOW_DOTESTSTEPL_1, "%s",buf);
return TestStepResult();
}
--- a/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_wapthdr.mmp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_wapthdr.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -32,11 +32,12 @@
USERINCLUDE ../../../test
USERINCLUDE ../../../smsu/inc
+USERINCLUDE ../traces
+
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib efsrv.lib testconfigfileparser.lib
LIBRARY testexecutelogclient.lib
LIBRARY testexecuteutils.lib
-DEBUGLIBRARY comsdbgutil.lib
SMPSAFE
--- a/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_wapthdrbase.cpp Thu May 27 14:05:07 2010 +0300
+++ b/smsprotocols/smsstack/wapprot/test/TE_WAPTHDR/TE_wapthdrbase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -17,10 +17,15 @@
#include "TE_wapthdrbase.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "TE_wapthdrbaseTraces.h"
+#endif
+
// WapProt code needs it
GLDEF_C void Panic(TWAPSMSPanic aPanic)
{
- LOGWAPPROT2("WAPUPANIC %d", aPanic);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, TE_WAPTHDRBASE_PANIC_1, "WAPUPANIC %d", aPanic);
_LIT(KWapProtPanic, "WAPPROT");
User::Panic(KWapProtPanic, aPanic);
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/wapprot/test/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,76 @@
+// 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"
+// 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 ESOCK protocol module
+//
+//
+
+/**
+ @file
+*/
+
+PRJ_TESTEXPORTS
+
+//
+// Test files used by all WAP tests...
+//
+../configfiles/tone1.rtp z:/testdata/configs/tone1.rtp
+../configfiles/tone2.rtp z:/testdata/configs/tone2.rtp
+../configfiles/tone3.rtp z:/testdata/configs/tone3.rtp
+../configfiles/vcard1.vcf z:/testdata/configs/vcard1.vcf
+../configfiles/vcard2.vcf z:/testdata/configs/vcard2.vcf
+../configfiles/vcard3.vcf z:/testdata/configs/vcard3.vcf
+
+//
+// TE_WAPDGRM test files...
+//
+../TE_WAPDGRM/TE_wapdgrm.script z:/testdata/scripts/te_wapdgrm.script
+
+//
+// TE_WAPHDR test files...
+//
+../configfiles/te_waphdr.txt z:/testdata/configs/te_waphdr.txt
+../TE_WAPTHDR/TE_wapthdr.script z:/testdata/scripts/te_wapthdr.script
+../TE_WAPTHDR/TE_wapthdr_setup.script z:/testdata/scripts/te_wapthdr_setup.script
+
+//
+// TE_WAPSMS test files...
+//
+../TE_WAPSMS/TE_wapsms.script z:/testdata/scripts/te_wapsms.script
+../TE_WAPSMS/TE_wapsms_setup.script z:/testdata/scripts/te_wapsms_setup.script
+../TE_WAPSMS/TE_wapsms.txt z:/testdata/configs/te_wapsms.txt
+../TE_WAPSMS/te_setupgsmsms.txt z:/testdata/configs/te_setupgsmsms.txt
+../TE_WAPSMS/te_wapsms_commdb.cfg z:/testdata/configs/te_wapsms_commdb.cfg
+
+//
+// TE_WAPPROT test files...
+//
+../Te_wapprot/Te_WapProt.script z:/testdata/scripts/te_wapprot.script
+../Te_wapprot/Config.txt z:/testdata/configs/wapprotsuite/config.txt
+../Te_wapprot/WapProtSuite.cfg z:/testdata/configs/wapprotsuite/wapprotsuite.cfg
+../Te_wapprot/WapProtSuiteMM.cfg z:/testdata/configs/wapprotsuite/wapprotsuitemm.cfg
+../Te_wapprot/StatusReportsRequested.cfg z:/testdata/configs/wapprotsuite/statusreportsrequested.cfg
+../Te_wapprot/WapProtSuite.ini z:/testdata/configs/wapprotsuite/wapprotsuite.ini
+../Te_wapprot/WapStatusReports.ini z:/testdata/configs/wapprotsuite/wapstatusreports.ini
+../Te_wapprot/WAPStackOutOfDiskSpace.ini z:/testdata/configs/wapprotsuite/wapstackoutofdiskspace.ini
+../Te_wapprot/Te_WapStackOutOfDiskSpace.script z:/testdata/scripts/te_wapstackoutofdiskspace.script
+../Te_wapprot/Te_WapStackOutOfDiskSpace_ARM_UREL.script z:/testdata/scripts/te_wapstackoutofdiskspace_arm_urel.script
+
+
+
+PRJ_TESTMMPFILES
+
+../TE_WAPSMS/TE_wapsms.mmp
+../Te_wapprot/TE_WapProt.mmp
+../TE_WAPTHDR/TE_wapthdr.mmp
+../TE_WAPDGRM/TE_wapdgrm.mmp
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/wapprot/test/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/wapprot/test/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,103 @@
+#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]_TE_WAPDGRMBASE_PANIC_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x52
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x51
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x50
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x54
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x36
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x3f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x40
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x41
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x42
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x43
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x44
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x37
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x38
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x39
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x3e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x53
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x55
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x56
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x58
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x5b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x60
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x5e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x5a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x59
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x5d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x57
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x61
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x5f
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CALCULATETOTALSEGMENTS_1=0x34
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CREATEHEADER_1=0x33
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_ENCODESEGMENTSL_1=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSENUMBER_1=0x30
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_1=0x31
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_2=0x32
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_1=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_2=0x2f
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TE_WAPDGRMBASE_PANIC_1=0x1
+[[OBSOLETE]][TRACE]TRACE_BORDER[0x84]_TE_WAPTHDRBASE_PANIC_1=0x2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CTESTLOGGEROVERFLOW_DOTESTSTEPL_1=0x35
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x19
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x18
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x1d
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x1c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x17
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x15
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x16
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x1a
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x1b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x1f
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x14
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x1
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0xa
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0xb
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0xc
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0xd
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0xe
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0xf
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x10
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x11
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x12
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x13
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x2
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x3
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x4
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x5
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x6
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x7
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x8
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x9
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x1e
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x20
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x21
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x23
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x26
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x2b
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x29
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x25
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x24
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x27
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x28
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x22
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x2c
+[[OBSOLETE]][TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x2a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/wapprot/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/smsprotocols/smsstack/wapprot/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,214 @@
+#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]_INSTALLWAPSMS_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CSMSSTACKTESTUTILS_PRINTANDTESTDECODEL_1=0xcf
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCTL_1=0x5d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONSTRUCT_1=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL1_1=0x61
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_CONVERTL_1=0x60
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DECODECONCATENATEDMESSAGESL_1=0x5b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_DTOR_1=0x59
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_ENCODECONCATENATEDMESSAGESL_1=0x5a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGSL_1=0x5e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_GETDATAGRAMSETTINGS_1=0x5f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_LINKOFFSET_1=0x63
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL1_1=0x58
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_1=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_10=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_11=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_12=0x50
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_13=0x51
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_14=0x52
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_15=0x53
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_16=0x54
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_17=0x55
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_18=0x56
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_19=0x57
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_2=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_3=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_4=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_5=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_6=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_7=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_8=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_NEWL_9=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETSMSMESSAGESETTINGSL_1=0x62
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_1=0x64
+[TRACE]TRACE_INTERNALS[0x88]_CWAPDATAGRAM_SETUTCOFFSET_2=0x65
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_CLIENTCONFIRMSMESSAGE_1=0x94
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_ENUMERATEPHONECOMPLETED_1=0x97
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_GETLOCALADDRESS_1=0x90
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MESSAGEDELETECOMPLETED_1=0x99
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MESSAGERECEIVED_1=0x96
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MESSAGESENDCOMPLETED_1=0x93
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MESSAGEWRITECOMPLETED_1=0x98
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_MODEMNOTIFICATIONCOMPLETED_1=0x92
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_NEWL_1=0x8f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_READSMSPARAMSCOMPLETED_1=0x9a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_SETLOCALADDRESS_1=0x91
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_SMSADDRISDUPLICATE_1=0x95
+[TRACE]TRACE_INTERNALS[0x88]_CWAPPROTOCOLOBSERVER_WRITESMSPARAMSCOMPLETED_1=0x9b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_ADDMESSAGEL_1=0x68
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CONSTRUCTL_1=0x6b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_CREATEENTRYL_1=0x70
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_EXTERNALIZEENTRYL_1=0x6e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_FINDANDDELETEDATAGRAML_1=0x6a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_GETDATAGRAML_1=0x69
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_1=0x6c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_INTERNALIZEENTRYL_2=0x6d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_NEWL_1=0x67
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_OPENSTOREL_1=0x71
+[TRACE]TRACE_INTERNALS[0x88]_CWAPREASSEMBLYSTORE_POPULATEENTRY_1=0x6f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_CLIENTCONFIRMSMESSAGE_1=0x89
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_ENUMERATEPHONECOMPLETED_1=0x87
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_GETLOCALADDRESS_1=0x84
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MESSAGEDELETECOMPLETED_1=0x8c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MESSAGERECEIVED_1=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MESSAGESENDCOMPLETED_1=0x83
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MESSAGEWRITECOMPLETED_1=0x8b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_MODEMNOTIFICATIONCOMPLETED_1=0x86
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_NEWL_1=0x7f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_READSMSPARAMSCOMPLETED_1=0x8d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SENDDATAGRAML_1=0x80
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SENDNEXTSMS_1=0x81
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SETLOCALADDRESS_1=0x85
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SETSMSMESSAGESETTINGSL_1=0x82
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_SMSADDRISDUPLICATE_1=0x8a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSAPMESSAGESENDER_WRITESMSPARAMSCOMPLETED_1=0x8e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_INSTALL_1=0x7b
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_NEWL_1=0x7a
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_NEWPROTOCOLL_1=0x7d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_PROTOCOLLIST_1=0x7e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOLFAMILY_REMOVE_1=0x7c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ADDRALREADYUSEDBYWAP_1=0xb0
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ADDRALREADYUSEDBYWAP_2=0xb1
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ADDSAP_1=0xad
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ALLOCATELOCALADDRESS_1=0xae
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_BINDL_1=0xa0
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_BINDOBSERVERSTOSMSL_1=0xa3
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_BINDTOL_1=0xa2
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_CHECKSARL_1=0xb4
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_ERROR_1=0xa9
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_FINDANDDELETEMSG_1=0xb3
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_GETOPTION_1=0xa7
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_HANDLEBACKUPORRESTORECOMPLETEL_1=0x9e
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_HANDLEBACKUPORRESTORESTARTINGL_1=0x9d
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_IDENTIFY_1=0xa1
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_LOOKUPSAP_1=0xaf
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWHOSTRESOLVERL_1=0xaa
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWL_1=0x9c
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWNETDATABASEL_1=0xac
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWSAPL_1=0x9f
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_NEWSERVICERESOLVERL_1=0xab
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_PROCESSSMSL_1=0xa6
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_REMOVEOBSERVERSFROMSMSPROTOCOL_1=0xa4
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_SEND_1=0xa5
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_SETOPTION_1=0xa8
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROTOCOL_SMSPROTOCOL_1=0xb2
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_CTOR_1=0xcc
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_DOCANCEL_1=0xd2
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_NEWL_1=0xcb
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_RUNERROR_1=0xd1
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_RUNL_1=0xd0
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_START_1=0xcd
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDERWRITE_START_2=0xce
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_ADDTOQUEUE_1=0xc9
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_CANCELIOCTL_1=0xc7
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_ERROR_1=0xbf
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_GETDATA_1=0xbc
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_GETDATA_2=0xbd
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_GETOPTION_1=0xb6
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_IOCTL_1=0xc5
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_IOCTL_2=0xc6
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_LINKOFFSET_1=0xc0
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_LOCALNAME_1=0xc1
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_MATCHESLOCALADDRESS_1=0xc4
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_NEWDATA_1=0xbe
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_NEWL_1=0xb5
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SECURITYCHECK_1=0xca
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SETLOCALNAME_1=0xc2
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SETLOCALNAME_2=0xc3
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SETOPTION_1=0xb7
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SETOPTION_2=0xb8
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_SHUTDOWN_1=0xb9
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_START_1=0xc8
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_WRITE_1=0xba
+[TRACE]TRACE_INTERNALS[0x88]_CWAPSMSPROVIDER_WRITE_2=0xbb
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFHEXBUF_1=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_1=0x24
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_10=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_2=0x25
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_3=0x26
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_4=0x27
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_5=0x28
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_6=0x29
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_7=0x2a
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_8=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFNUMBERINGPLAN_9=0x2c
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_10=0xa
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_11=0xb
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_12=0xc
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_13=0xd
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_14=0xe
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_15=0xf
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_16=0x10
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_17=0x11
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_18=0x12
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_19=0x13
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_2=0x2
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_20=0x14
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_21=0x15
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_22=0x16
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_23=0x17
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_24=0x18
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_25=0x19
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_26=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_3=0x3
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_4=0x4
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_5=0x5
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_6=0x6
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_7=0x7
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_8=0x8
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFPDU_9=0x9
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_1=0x38
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_10=0x41
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_11=0x42
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_12=0x43
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_13=0x44
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_2=0x39
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_3=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_4=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_5=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_6=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_7=0x3e
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_8=0x3f
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSENDATTRIBUTES_9=0x40
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_1=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_10=0x37
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_2=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_3=0x30
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_4=0x31
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_5=0x32
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_6=0x33
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_7=0x34
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_8=0x35
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFSMSENTRY_9=0x36
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_1=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_2=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_3=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_4=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_5=0x20
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_6=0x21
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_7=0x22
+[TRACE]TRACE_INTERNALS[0x88]_LOGSMSIFTYPEOFNUMBER_8=0x23
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CALCULATETOTALSEGMENTS_1=0x79
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_CREATEHEADER_1=0x78
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_ENCODESEGMENTSL_1=0x72
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSENUMBER_1=0x75
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_1=0x76
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSEWAPTEXTHEADER_2=0x77
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_1=0x73
+[TRACE]TRACE_INTERNALS[0x88]_TWAPTEXTMESSAGE_PARSE_2=0x74
+[TRACE]TRACE_INTERNALS[0x88]_WAPMAIN_PANIC_1=0x66
--- a/telephonyprotocols/csdagt/group/CSD.IBY Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/group/CSD.IBY Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -24,7 +24,6 @@
#include <commdb.iby>
#include <charconv.iby>
#ifdef _DEBUG
-#include <commsdebugutility.iby>
#endif
#include <etelmm.iby>
#include <nifman.iby>
--- a/telephonyprotocols/csdagt/group/CSD.MMP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/group/CSD.MMP Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -42,6 +42,7 @@
USERINCLUDE ../src
USERINCLUDE ../script
USERINCLUDE ../inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
// The resource file containing csd error messages, generated
@@ -70,7 +71,6 @@
BASEADDRESS 0x47900000
END
-#include <comms-infras/commsdebugutility.mmh>
CAPABILITY CommDD PowerMgmt ReadDeviceData WriteDeviceData TrustedUI ProtServ NetworkControl NetworkServices LocalServices ReadUserData WriteUserData
UNPAGED
--- a/telephonyprotocols/csdagt/group/dummycsd.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/group/dummycsd.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -42,8 +42,6 @@
LIBRARY commdb.lib dummyetel.lib nifman.lib
LIBRARY commsdat.lib
-#include <comms-infras/commsdebugutility.mmh>
-
#if defined(WINS)
deffile /epoc32/release/wins/agent.def
#elif defined(GCC32)
--- a/telephonyprotocols/csdagt/group/networking_csdagt.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/group/networking_csdagt.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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_csdagt
source \sf\os\cellularsrv\telephonyprotocols\csdagt
binary \sf\os\cellularsrv\telephonyprotocols\csdagt\group all
--- a/telephonyprotocols/csdagt/group/tcsdagt.iby Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/group/tcsdagt.iby Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,9 +19,6 @@
#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
-REM Comms Framework FLogger extension
-#include <commsdebugutility.iby>
-
#include <csd.iby>
#include <integrationtest.iby>
--- a/telephonyprotocols/csdagt/script/SCOMMAND.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SCOMMAND.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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,10 +19,15 @@
@file Scommand.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "SCOMMANDTraces.h"
+#endif
+
#include "SSCRREAD.H"
#include "SSCREXEC.H"
#include "SIO.H"
-#include "SLOGGER.H"
// Command names
@@ -472,8 +477,7 @@
{
if (!iStatus.iSkip)
{
- __FLOG_STMT(_LIT8(KLogStringExecutingSet,"Script:\tExecuting Set");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingSet());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSETCOMMAND_PARSEL_1, "Script:\tExecuting Set");
}
iStatus.iOffset=end;
EatSpaces(iStatus.iOffset);
@@ -487,8 +491,7 @@
if (!iStatus.iSkip)
{
iVarMan->AddVariableL(varName,value);
- __FLOG_STMT(_LIT(KLogStringSetVar,"Script:\tSet Var: %S To %S"));
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KLogStringSetVar()),&varName,&value);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSETCOMMAND_PARSEL_2, "Script:\tSet Var: %S To %S",varName,value);
}
iStatus.iOffset=end;
return ETrue; // Consumed
@@ -550,8 +553,7 @@
{
if(!iStatus.iSkip)
{
- __FLOG_STMT(_LIT8(KLogStringExecutingSend,"Script:\tExecuting Send");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingSend());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDCOMMAND_PARSEL_1,"Script:\tExecuting Send");
}
iStatus.iOffset=end;
EatSpaces(iStatus.iOffset);
@@ -562,12 +564,7 @@
if(!iStatus.iSkip)
{
iScriptIO->Write(iSendString);
-#ifdef __FLOG_ACTIVE
- _LIT(KLogStringSending,"Script:\tSending %S");
- TBuf16<KLogBufferSize> temp;
- temp.Copy(iSendString.Left(Min(iSendString.Length(),KLogBufferSize)));
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KLogStringSending()),&temp);
-#endif
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDCOMMAND_PARSEL_2, "Script:\tSending %s",iSendString);
}
CleanupStack::PopAndDestroy();
return ETrue; // Consumed
@@ -714,8 +711,7 @@
queue a read.
*/
{
- __FLOG_STMT(_LIT8(KLogStringExecutingWait,"Script:\tExecuting Wait");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingWait());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAITCOMMAND_PARSEACTIONL_1, "Script:\tExecuting Wait");
EatSpaces(iStatus.iOffset);
TReal waitPeriod=ParseRealL(iStatus.iOffset);
EatSpacesAndLinesAndCommentsL();
@@ -740,16 +736,7 @@
TPtrC8 waitString(buf->Des());
label->CreateCommChatStringL(waitString,EFalse);
iLabelArray->AppendL(label);
- // for logging
- TBuf<KLogBufferSize> labelName;
- labelName.Copy(label->LabelName().Left(Min(KLogBufferSize,label->LabelName().Length())));
- //
-#ifdef __FLOG_ACTIVE
- _LIT(KLogStringGog,"Script:\tIf %S is found, Goto %S");
- TBuf16<KLogBufferSize> string;
- string.Copy(waitString.Left(Min(waitString.Length(),KLogBufferSize)));
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KLogStringGog()),&string,&labelName);
-#endif
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAITCOMMAND_PARSEACTIONL_2, "Script:\tIf %s is found, Goto %S",waitString,label->LabelName());
CleanupStack::Pop(); // label - will be deleted from array
CleanupStack::PopAndDestroy(); // buf - will have been copied into label array
}
@@ -893,8 +880,7 @@
User::Leave(KErrNestedLoop);
if (!iStatus.iSkip)
{
- __FLOG_STMT(_LIT8(KLogStringExecutingLoop,"Script:\tExecuting Loop");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingLoop());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_PARSEL_1,"Script:\tExecuting Loop");
}
iStatus.iOffset=end;
EatSpaces(iStatus.iOffset);
@@ -908,8 +894,7 @@
iScriptReader->CurrentPos(iLoopPosition,iStatus.iOffset);
if (!iStatus.iSkip)
{
- __FLOG_STMT(_LIT(KLogStringLoopCounter,"Script:\tLoop Counter %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),KLogStringLoopCounter(),iLoopCounter);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_PARSEL_2, "Script:\tLoop Counter %d",iLoopCounter);
}
return ETrue; // Consumed
}
@@ -934,10 +919,8 @@
else
{
iScriptReader->SetCurrentPos(iLoopPosition);
- __FLOG_STMT(_LIT8(logString1,"Script:\tRepeat Loop");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
- __FLOG_STMT(_LIT8(logString2,"Script:\tLoop Counter %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString2(),iLoopCounter);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_CHECKLOOPL_1,"Script:\tRepeat Loop");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_CHECKLOOPL_2,"Script:\tLoop Counter %d",iLoopCounter);
}
return ETrue; // Consumed Something
}
@@ -999,8 +982,7 @@
{
if(!iStatus.iSkip)
{
- __FLOG_STMT(_LIT8(logString,"Script:\tExecuting Goto");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_PARSEL_1,"Script:\tExecuting Goto");
}
iStatus.iOffset=end;
EatSpaces(iStatus.iOffset);
@@ -1029,10 +1011,8 @@
{
iSearchName.Copy(aLabelName);
iStatus.iSkipModeToggleReq=ETrue;
- __FLOG_STMT(_LIT(logString1,"Script:\tSearching for Label %S");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString1()),&aLabelName);
- __FLOG_STMT(_LIT8(logString2,"Script:\tEntering Skip Mode");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_GOTO_1,"Script:\tSearching for Label %S",aLabelName);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_GOTO_2, "Script:\tEntering Skip Mode");
}
else
iScriptReader->SetCurrentPos(pos);
@@ -1057,8 +1037,7 @@
if (iStatus.iSkip && (iLabelMan->FindLabel(iSearchName,dummyPos)==KErrNone))
{
iStatus.iSkipModeToggleReq=ETrue;
- __FLOG_STMT(_LIT8(logString,"Script:\tExiting Skip Mode");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_PARSELABELL_1,"Script:\tExiting Skip Mode");
}
return ETrue;
}
@@ -1131,8 +1110,7 @@
{
if(!iStatus.iSkip)
{
- __FLOG_STMT(_LIT8(logString1,"Script:\tExecuting DTR");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDTRCOMMAND_PARSEL_1,"Script:\tExecuting DTR");
}
iStatus.iOffset=end;
EatSpaces(iStatus.iOffset);
@@ -1141,8 +1119,7 @@
{
if(!iStatus.iSkip)
{
- __FLOG_STMT(_LIT8(logString2,"Script:\tRaising DTR");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDTRCOMMAND_PARSEL_2,"Script:\tRaising DTR");
iScriptIO->RaiseDTR(NULL);
}
}
@@ -1150,8 +1127,7 @@
{
if(!iStatus.iSkip)
{
- __FLOG_STMT(_LIT8(logString3,"Script:\tDropping DTR");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDTRCOMMAND_PARSEL_3,"Script:\tDropping DTR");
iScriptIO->DropDTR(NULL);
}
}
@@ -1217,8 +1193,7 @@
{
if (!iStatus.iSkip)
{
- __FLOG_STMT(_LIT8(logString,"Script:\tExecuting Read");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREADPCTCOMMAND_PARSEL_1, "Script:\tExecuting Read");
iCharSet=ParseCharacterTypeL(iStatus.iOffset);
iScriptExec->ReadPct();
}
@@ -1361,8 +1336,7 @@
{
if (!iStatus.iSkip)
{
- __FLOG_STMT(_LIT8(logString1,"Script:\tExecuting Exit");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CEXITCOMMAND_PARSEL_1,"Script:\tExecuting Exit");
}
iStatus.iOffset=end;
EatSpaces(iStatus.iOffset);
@@ -1386,8 +1360,7 @@
User::Leave(KErrScriptCompleted);
else
{
- __FLOG_STMT(_LIT8(logString2,"Script:\tExit With Error %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString2()),ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CEXITCOMMAND_PARSEL_2,"Script:\tExit With Error %d",ret);
User::Leave(ret);
}
}
--- a/telephonyprotocols/csdagt/script/SIO.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SIO.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +19,14 @@
@file Sio.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "SIOTraces.h"
+#endif
+
#include "SSCREXEC.H"
#include "SIO.H"
-#include "SLOGGER.H"
#include <networking/bca.h>
const TInt KChatterPriority=0;
@@ -80,13 +85,13 @@
void CScriptIO::CreateChannel(TRequestStatus& aStatus)
{
ASSERT(iCreateAndShutdownStatus == NULL);
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),_L("Script:\tOpening Comm Port '%S'"), &iCommsChannel);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CREATECHANNEL_1,"Script:\tOpening Comm Port '%S'", iCommsChannel);
iCommClosed = EFalse;
TInt err = CommOpen(iCommsChannel);
if (err != KErrNone)
{
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),_L("Script: Error %d opening Comm Port"), err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CREATECHANNEL_2, "Script: Error %d opening Comm Port", err);
TRequestStatus* stat = &aStatus;
User::RequestComplete(stat, err);
}
@@ -95,15 +100,13 @@
void CScriptIO::CancelCreateChannel()
{
- __FLOG_STMT(_LIT8(logString,"Script:\tCancelCreateChannel()");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CANCELCREATECHANNEL_1, "Script:\tCancelCreateChannel()");
CommCancel();
}
void CScriptIO::InitializeComplete()
{
- __FLOG_STMT(_LIT8(logString,"Script:\tInitializeComplete()");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_INITIALIZECOMPLETE_1,"Script:\tInitializeComplete()");
ASSERT(iCreateAndShutdownStatus);
User::RequestComplete(iCreateAndShutdownStatus, KErrNone);
iCreateAndShutdownStatus = NULL;
@@ -111,8 +114,7 @@
void CScriptIO::ShutdownComplete(TInt aError)
{
- __FLOG_STMT(_LIT8(logString,"Script:\tShutdownComplete(aError %d)");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString(), aError);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_SHUTDOWNCOMPLETE_1, _"Script:\tShutdownComplete(aError %d)", aError);
ASSERT(iCreateAndShutdownStatus);
if (iCreateError != KErrNone) //The creation error is probably more interesting than a bad shutdown error
@@ -159,8 +161,7 @@
@param aError System wide error code.
*/
{
- __FLOG_STMT(_LIT8(logString,"Script:\tStop(aError %d)");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString(), aError);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_STOP_1,"Script:\tStop(aError %d)", aError);
iCreateError = aError;
delete iChat;
@@ -200,19 +201,16 @@
Reads completely - stops timer and if no error checks string against the desired string
*/
{
- __FLOG_STMT(_LIT8(logString1,"Script:\tRead Complete");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_1,"Script:\tRead Complete");
if(aStatus==KErrCommsLineFail)
{
- __FLOG_STMT(_LIT8(logString2,"Script:\tComms Error %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString2()),aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_2,"Script:\tComms Error %d",aStatus);
iChat->StopTimer();
iReadPending=EFalse;
TRAPD(ret,iScriptExecutor->CompletedReadL(KErrCommsLineFail));
if (KErrNone != ret)
{
- __FLOG_STMT(_LIT8(logString6,"Script:\tCompleteReadL Failure");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString6());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_3,"Script:\tCompleteReadL Failure");
}
return;
}
@@ -223,8 +221,7 @@
if (aStatus==KErrCommsFrame)
{
- __FLOG_STMT(_LIT(logString3,"Script:\tComms Error %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString3()),aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_4, "Script:\tComms Error %d",aStatus);
User::After(KClockTick); // wait for a clock tick and continue
aStatus=KErrNone;
}
@@ -234,18 +231,13 @@
TRAPD(ret,iScriptExecutor->CompletedReadL(aStatus));
if (KErrNone != ret)
{
- __FLOG_STMT(_LIT8(logString7,"Script:\tCompleteReadL Failure");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString7());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_5,"Script:\tCompleteReadL Failure");
}
return;
}
-#ifdef __FLOG_ACTIVE
- _LIT(logString4,"Rx:\t%S");
- TBuf16<KLogBufferSize> temp;
- temp.Copy(iRxBuffer.Left(Min(iRxBuffer.Length(),KLogBufferSize)));
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString4()),&temp);
-#endif
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_7, "Rx:\t%s",iRxBuffer);
+
if (iScriptExecutor->RequestUsePct())
{
@@ -255,8 +247,7 @@
TRAPD(ret,iScriptExecutor->CompletedReadL(err));
if (KErrNone != ret)
{
- __FLOG_STMT(_LIT8(logString8,"Script:\tCompleteReadL Failure");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString8());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_8,"Script:\tCompleteReadL Failure");
}
return;
}
@@ -270,12 +261,7 @@
if(iStringFound!=-1)
{
iExcessData.Set(iRxBuffer.Right(iRxBuffer.Length()-iRxBufOffset-1));
-#ifdef __FLOG_ACTIVE
- _LIT(logString5,"Script:\tExcess data buffer set to: %S");
- TBuf16<KLogBufferSize> temp;
- temp.Copy(iExcessData.Left(Min(iExcessData.Length(),KLogBufferSize)));
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString5()),&temp);
-#endif
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_9, "Script:\tExcess data buffer set to: %s",iExcessData);
break;
}
}
@@ -289,8 +275,7 @@
TRAPD(ret,iScriptExecutor->CompletedReadL(aStatus,iStringFound));
if (KErrNone != ret)
{
- __FLOG_STMT(_LIT8(logString9,"Script:\tCompleteReadL Failure");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString9());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_10, "Script:\tCompleteReadL Failure");
}
}
else
@@ -305,13 +290,11 @@
Writes completely - stops timer
*/
{
- __FLOG_STMT(_LIT8(logString,"Script:\tWrite Complete");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMWRITECOMPLETE_1,"Script:\tWrite Complete");
iChat->StopTimer();
if(aStatus==KErrCommsLineFail)
{
- __FLOG_STMT(_LIT8(logString2,"Script:\tComms Error %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString2(),aStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMWRITECOMPLETE_2, "Script:\tComms Error %d",aStatus);
iWritePending=EFalse;
iScriptExecutor->CompletedWrite(KErrCommsLineFail);
return;
@@ -328,8 +311,7 @@
Logs matching string found and sets iStringFound to aIndex.
*/
{
- __FLOG_STMT(_LIT8(logString,"Script:\tMatching String Found %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aIndex);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATSTRINGMATCH_1, "Script:\tMatching String Found %d",aIndex);
iStringFound=aIndex;
}
@@ -341,21 +323,18 @@
CommCancel();
if(iWritePending)
{
- __FLOG_STMT(_LIT8(logString1,"Script:\tWrite Chat Time Out");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATTIMEOUT_1, "Script:\tWrite Chat Time Out");
iWritePending=EFalse;
iScriptExecutor->CompletedWrite(KErrTimedOut);
}
else if(iReadPending)
{
- __FLOG_STMT(_LIT8(logString2,"Script:\tRead Chat Time Out");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATTIMEOUT_2,"Script:\tRead Chat Time Out");
iReadPending=EFalse;
TRAPD(ret,iScriptExecutor->CompletedReadL(KErrTimedOut));
if (KErrNone != ret)
{
- __FLOG_STMT(_LIT8(logString3,"Script:\tCompleteReadL Failure");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATTIMEOUT_3,"Script:\tCompleteReadL Failure");
}
}
else
@@ -382,8 +361,8 @@
TInt timeInterval=TInt(realTimeInterval);
if (realTimeInterval>TReal(timeInterval))
timeInterval++;
- __FLOG_STMT(_LIT8(logString,"Script:\tRead Pending In %d Microseconds");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString(),timeInterval);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_READ_1,"Script:\tRead Pending In %d Microseconds",timeInterval);
+
//
iChat->StartTimer(timeInterval);
CommReadOneOrMore(iRxBuffer);
@@ -395,8 +374,7 @@
Reads echo.
*/
{
- __FLOG_STMT(_LIT8(logString,"Script:\tRead Echo");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_READECHO_1,"Script:\tRead Echo");
iExcessData.Set(NULL,0); // clear excess data buffer
iReadPending=ETrue;
@@ -424,12 +402,7 @@
PreSend pause is finished, can now do write.
*/
{
-#ifdef __FLOG_ACTIVE
- _LIT(logString,"Tx:\t%S");
- TBuf16<KLogBufferSize> temp;
- temp.Copy(iTxBuffer.Left(Min(iTxBuffer.Length(),KLogBufferSize)));
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()),&temp);
-#endif
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_PRESENDPAUSECOMPLETED_1, "Tx:\t%s",iTxBuffer);
CommWrite(iTxBuffer);
iChat->StartTimer(KWriteTimeOutSec*KOneSecInMicroSecs);
}
--- a/telephonyprotocols/csdagt/script/SLOGGER.H Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/**
-* 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:
-* Netdial Data and Event Logger header.
-*
-*
-*/
-
-
-
-/**
- @file Slogger.h
- @internalComponent
-*/
-
-#ifndef __SLOGGER_H__
-#define __SLOGGER_H__
-
-#include <comms-infras/commsdebugutility.h>
-#include <e32base.h>
-
-/**
-@internalComponent
-*/
-_LIT8(KNetDialLogFile,"NETDIAL.TXT");
-_LIT8(KNetDialLogFolder,"NETDIAL");
-
-_LIT(KIllegalTranstionPanicString,"NetDial (%d %d)");
-_LIT(KCompletedPhaseLogString,"NetDial:\tCompleted Phase '%S' with Error %d");
-_LIT(KPhaseTransitionLogString,"NetDial:\tPhase Transition from Phase %d to Phase %d");
-_LIT(KIllegalPhaseTransitionLogString,"NetDial:\tIllegal Phase Transition from Phase %d to Phase %d");
-_LIT(KStopLogString,"NetDial:\tStopped, Phase %d");
-_LIT(KServiceStartedLogString,"NetDial:\tService Started");
-_LIT(KServiceStartedReconnLogString,"NetDial:\tService Started On Reconnection");
-
-
-#endif // __SLOGGER_H__
--- a/telephonyprotocols/csdagt/script/SSCREXEC.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SSCREXEC.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +19,14 @@
@file Sscrexec.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "SSCREXECTraces.h"
+#endif
+
#include "SSCREXEC.H"
#include "SIO.H"
-#include "SLOGGER.H"
#include "ND_SCR.H"
_LIT(KPPPProtocolName,"PPP.");
@@ -173,8 +178,7 @@
__ASSERT_DEBUG(iLastCommand==NULL, NetDialPanic(ELastCommandNotNull));
__ASSERT_DEBUG(iScriptReader!=NULL, NetDialPanic(ENullScriptReader));
- __FLOG_STMT(_LIT8(logString,"Script:\tBeginning");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_SETSCRIPT_1,"Script:\tBeginning");
iScriptReader->SetScript(aScript);
iLoopCommand->Loop(EFalse);
}
@@ -184,8 +188,7 @@
Scans script for READ command.
*/
{
- __FLOG_STMT(_LIT8(logString1,"Script:\tScanning");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_SCANSCRIPTL_1,"Script:\tScanning");
__ASSERT_DEBUG(iScriptReader!=NULL, NetDialPanic(ENullScriptReader));
@@ -202,13 +205,11 @@
if (iReadFound)
{
- __FLOG_STMT(_LIT8(logString2,"Script:\tFound Read");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_SCANSCRIPTL_2,"Script:\tFound Read");
}
else
{
- __FLOG_STMT(_LIT8(logString3,"Script:\tDid Not Find Read");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_SCANSCRIPTL_3,"Script:\tDid Not Find Read");
}
User::LeaveIfError(iScriptReader->Reset());
@@ -397,8 +398,7 @@
TInt error=aStatus;
- __FLOG_STMT(_LIT8(logString,"Script:\tScript Completed With Error %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),error);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_COMPLETEDSCRIPT_1,"Script:\tScript Completed With Error %d",error);
ConvertScriptError(error);
PctCancelAndClose();
@@ -456,8 +456,7 @@
Close script.
*/
{
- __FLOG_STMT(_LIT8(logString,"Script:\tClosing");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_CLOSESCRIPT_1, "Script:\tClosing");
if (iScriptReader!=NULL)
iScriptReader->Reset(); // ignore error
}
@@ -596,12 +595,7 @@
return;
}
TPtr8 eightBitBuf(buf->Des());
-#ifdef __FLOG_ACTIVE
- _LIT(logString,"Script:\tRead %S from PCT");
- TBuf16<KLogBufferSize> temp;
- temp.Copy(eightBitBuf.Left(Min(eightBitBuf.Length(),KLogBufferSize)));
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()),&temp);
-#endif
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTEXECUTOR_READPCTCOMPLETE_1, "Script:\tRead %s from PCT",eightBitBuf);
TInt end=iReadBuffer.Locate(KCarriageReturn);
TInt spaceInBuffer=iDataToWrite.MaxLength()-iDataToWrite.Length();
--- a/telephonyprotocols/csdagt/script/SSCRREAD.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SSCRREAD.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +19,14 @@
@file Scrread.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "SSCRREADTraces.h"
+#endif
+
#include "SSCRREAD.H"
#include "ND_STD.H"
-#include "SLOGGER.H"
// TLinePosition definitions
@@ -117,8 +122,7 @@
@param aBufferSize is buffer size for script reader.
*/
{
- __FLOG_STMT(_LIT8(logString,"Script:\tCreating Buffer Of Size %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aBufferSize);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTREADER_CONSTRUCTL_1,"Script:\tCreating Buffer Of Size %d", aBufferSize);
iScriptBuffer=HBufC::NewL(aBufferSize);
TPtr temp=iScriptBuffer->Des();
iScript.Set(temp);
@@ -214,17 +218,13 @@
iCurrentPosition.iLineCount++;
if (iLoggingOn)
{
- TBuf<KLogBufferSize> line;
- line.Copy(activeDes.Left(Min(KLogBufferSize,iCurrentPosition.iLineLength)));
if (iSkip)
{
- __FLOG_STMT(_LIT(logString1,"Script Line #%d:\t[Skip] : %S");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString1()),iCurrentPosition.iLineCount,&line);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTREADER_GETCURRENTLINE_1, "Script Line #%d:\t[Skip] : %S", iCurrentPosition.iLineCount,activeDes);
}
else
{
- __FLOG_STMT(_LIT(logString2,"Script Line #%d:\t%S");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString2()),iCurrentPosition.iLineCount,&line);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTREADER_GETCURRENTLINE_2, "Script Line #%d:\t%S", iCurrentPosition.iLineCount,activeDes);
}
}
return KErrNone;
--- a/telephonyprotocols/csdagt/src/ND_DBACC.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DBACC.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -24,7 +24,6 @@
#include <commsdatutils.h>
using namespace CommsDat;
#include "ND_DBACC.H"
-#include "SLOGGER.H"
#include "ND_STD.H"
/**
--- a/telephonyprotocols/csdagt/src/ND_DIRCT.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DIRCT.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -23,7 +23,6 @@
#include "ND_SCR.H"
#include "ND_DBACC.H"
#include "ND_STD.H"
-#include "SLOGGER.H"
#include "ND_DIRECTSTATES.H"
CDirCtAgXSM* CDirCtAgXSM::NewL(MAgentNotify& aControllerObserver, CDialogProcessor* aDlgPrc, CCommsDbAccess& aDbAccess)
--- a/telephonyprotocols/csdagt/src/ND_DIRECTSTATES.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DIRECTSTATES.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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,11 +19,17 @@
@file Nd_directstates.cpp
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ND_DIRECTSTATESTraces.h"
+#endif
+
#include "ND_DIRCT.H"
#include "ND_SCR.H"
#include "ND_DBACC.H"
#include "ND_STD.H"
-#include "SLOGGER.H"
#include "ND_DIRECTSTATES.H"
CDirCtInit* CDirCtInit::NewL(MAgentStateMachineEnv& aSMObserver, MNetdialEnv& aNdEnv)
@@ -236,8 +242,7 @@
{
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT(logString3,"Scan Script");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),KCompletedPhaseLogString(), &logString3(), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTSCANSCRIPT_RUNL_1,"NetDial:\tCompleted Phase Scan Script with Error %d", iStatus.Int());
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdScannedScript,iStatus.Int());
@@ -247,11 +252,11 @@
iSMObserver->UpdateProgress(ECsdScannedScript,iStatus.Int());
if (!(iNdEnv->BaseEnv())->IsReconnect())
{
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedLogString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTSCANSCRIPT_RUNL_2, "NetDial:\tService Started");
}
else
{
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedReconnLogString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTSCANSCRIPT_RUNL_3,"NetDial:\tService Started On Reconnection");
}
//iSMObserver->ServiceStarted();
(iNdEnv->BaseEnv())->CompleteState(KErrNone);
@@ -431,8 +436,7 @@
{
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT(logString3,"Execute Script");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),KCompletedPhaseLogString(), &logString3(), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONNECT_RUNL_1, "NetDial:\tCompleted Phase Execute Script with Error %d", iStatus.Int());
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdFinishedConnect,iStatus.Int());
@@ -464,8 +468,7 @@
{
if (iNdEnv->UseScript())
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tExecuting Script");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONNECT_DOSTARTSTATEL_1, "NetDial:\tExecuting Script");
(iNdEnv->Script())->ExecuteL(*this);
iStatus=KRequestPending;
@@ -567,8 +570,7 @@
{
__ASSERT_DEBUG(iStatus==KErrNone,User::Invariant());
iSMObserver->UpdateProgress(ECsdConnectionOpen,KErrNone);
- __FLOG_STMT(_LIT8(logString,"NetDial:\tConnection Open");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTOPEN_RUNL_1, "NetDial:\tConnection Open");
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdConnectionOpen,KErrNone);
@@ -658,14 +660,12 @@
Complete hangup state.
*/
{
- __FLOG_STMT(_LIT(logString3,"Hang Up");)
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT8(logString2,"NetDial:\tDisconnection Error %d");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString2()), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTHANGUP_RUNL_1,"NetDial:\tCompleted Phase Hang Up with Error %d", iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTHANGUP_RUNL_2, "NetDial:\tDisconnection Error %d", iStatus.Int());
}
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTHANGUP_RUNL_3,"Hang Up");
iSMObserver->UpdateProgress(ECsdFinishedHangUp,iStatus.Int());
(iNdEnv->BaseEnv())->CompleteState(iStatus.Int());
}
@@ -751,8 +751,7 @@
Call DisconnectComplete().
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tDisconnect Complete");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTDISCONNECT_RUNL_1, "NetDial:\tDisconnect Complete");
iSMObserver->DisconnectComplete();
}
@@ -923,8 +922,7 @@
TRAPD(ret,DoStartStateL());
if (ret!=KErrNone)
{
- __FLOG_STMT(_LIT8(logString, "NetDial:\tError %d Configuring Comm Port");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()), ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_STARTSTATE_1, "NetDial:\tError %d Configuring Comm Port", ret);
JumpToRunl(ret);
}
}
@@ -955,8 +953,8 @@
Cancels active requests
*/
{
- __FLOG_STMT(_LIT8(logString, "NetDial:\tCancel Configure Comm Port");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_DOCANCEL_1,"NetDial:\tCancel Configure Comm Port");
+
(iNdEnv->Script())->CancelConfigureCommPort();
}
@@ -970,8 +968,7 @@
{
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT(logString3,"Configuring Comm Port");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),KCompletedPhaseLogString(), &logString3(), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_RUNL_1, "NetDial:\tCompleted Phase Configuring Comm Port with Error %d", iStatus.Int());
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdFinishedConnect,iStatus.Int());
@@ -988,8 +985,8 @@
@exception Leaves if GetCommConfigForDirectConnectL() leaves.
*/
{
- __FLOG_STMT(_LIT8(logString1,"NetDial:\tConfiguring Comm Port");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_DOSTARTSTATEL_1,"NetDial:\tConfiguring Comm Port");
+
(iNdEnv->NetDialDb())->GetCommConfigForDirectConnectL(iConfigPckg);
iStatus = KRequestPending;
@@ -1050,8 +1047,7 @@
Reconfigure port to allow signals to be dropped.
*/
{
- __FLOG_STMT(_LIT8(logString, "NetDial:\tReconfiguring Comm Port");)
- __FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTRECONFIGURECOMMPORT_STARTSTATE_1, "NetDial:\tReconfiguring Comm Port");
iStatus = KRequestPending;
SetActive();
// Reconfigure the Comm Port to allow the signals to be set.
@@ -1114,8 +1110,7 @@
if (!iDropping)
{
// ReConfigureAndCancelCommPort() has completed to allow us to drop the Comm Port signals.
- __FLOG_STMT(_LIT8(logString, "NetDial:\tDropping Signals");)
- __FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTRECONFIGURECOMMPORT_RUNL_1, "NetDial:\tDropping Signals");
iDropping = ETrue;
iStatus = KRequestPending;
@@ -1223,15 +1218,11 @@
// in response to its earlier Connect()). Consequently, we can't call either method with an error argument
// for a second time (otherwise NIFMAN will panic due to too many ConnectComplete() responses).
if (iStatus!=KErrNone)
- {
-#ifdef __FLOG_ACTIVE
- _LIT(logString3,"Close Data Port");
- _LIT8(logstring2,"Saved error = %d");
-#endif
- __FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+ {
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCLOSEDATAPORT_RUNL_1, "NetDial:\tCompleted Phase Close Data Port with Error %d", iStatus.Int());
if (iError != KErrNone)
{
- __FLOG_STATIC1(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC8>(logstring2()), iError);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCLOSEDATAPORT_RUNL_2,"Saved error = %d", iError);
}
else
{
--- a/telephonyprotocols/csdagt/src/ND_DLIN.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DLIN.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -22,9 +22,7 @@
#include "ND_DLIN.H"
#include "ND_ETEL.H"
#include "ND_STD.H"
-#include "SLOGGER.H"
#include "Nd_dlinStates.h"
-#include <comms-infras/eventlogger.h>
#include "ND_DBACC.H"
// Dial In state machine
--- a/telephonyprotocols/csdagt/src/ND_DLL.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DLL.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -20,10 +20,15 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ND_DLLTraces.h"
+#endif
+
#include <e32std.h>
#include <cdbcols.h>
#include "ND_STD.H"
-#include "SLOGGER.H"
#include "ND_DIRCT.H"
#include "ND_DLIN.H"
#include "ND_DLUP.H"
@@ -39,8 +44,7 @@
*/
GLDEF_C void NetDialPanic(TNetDialPanic aPanic)
{
- __FLOG_STMT(_LIT8(logString,"NetDial Panic %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aPanic);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, NETDIALPANIC_1, _"NetDial Panic %d",aPanic);
_LIT(KNetDialPanic,"NetDial");
User::Panic(KNetDialPanic,aPanic);
}
--- a/telephonyprotocols/csdagt/src/ND_DLUP.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_DLUP.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +19,12 @@
@file Nd_dlup.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ND_DLUPTraces.h"
+#endif
+
#include "ND_DLUP.H"
#include "ND_ETEL.H"
#include "ND_SCR.H"
@@ -26,7 +32,6 @@
#include <comms-infras/eventlogger.h>
#include "ND_DBACC.H"
#include "ND_STD.H"
-#include "SLOGGER.H"
#include "Nd_dlupStates.h"
#include <comms-infras/nifprvar.h>
@@ -116,8 +121,7 @@
{
case ENifToAgentEventTypePPPCallbackGranted:
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tCallback Request Granted");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPAGXSM_NOTIFICATION_1, "NetDial:\tCallback Request Granted");
return KErrNone;
}
case ENifToAgentEventTypeQueryIsDialIn:
--- a/telephonyprotocols/csdagt/src/ND_ETEL.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_ETEL.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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,10 +19,16 @@
@file Nd_etel.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ND_ETELTraces.h"
+#endif
+
#include "ND_DBACC.H"
#include "ND_STD.H"
#include "ND_ETEL.H"
-#include "SLOGGER.H"
+
/**
@internalComponent
@@ -77,8 +83,7 @@
{
CActiveScheduler::Add(this);
- __FLOG_STMT(_LIT8(logString,"NetDial:\tConnecting Etel Server");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_CONSTRUCTL_1, "NetDial:\tConnecting Etel Server");
User::LeaveIfError(iTelServer.Connect());
iState=EIdle;
iCallType=EUnknown;
@@ -92,11 +97,9 @@
Close ETel server connection.
*/
{
- __FLOG_STMT(_LIT8(logString1,"NetDial:\tClosing Call");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_DTOR_1,"NetDial:\tClosing Call");
CloseCall();
- __FLOG_STMT(_LIT8(logString2,"NetDial:\tClosing Etel Server");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_DTOR_2, "NetDial:\tClosing Etel Server");
if(iTsyLoaded)
{
iTelServer.UnloadPhoneModule(iTsyName);
@@ -133,8 +136,7 @@
@exception Leaves if GetCallParamsL() leaves.
*/
{
- __FLOG_STMT(_LIT(logString,"NetDial:\tDialling %S");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()),&iTelNum);
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_DIALL_1, "NetDial:\tDialling %S", iTelNum);
TInt ret=iDb->GetRedialAttempts(iMaxDialAttempts);
if (ret!=KErrNone)
@@ -197,8 +199,7 @@
@param aObserver a reference to observer.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tListening For Call Status Change");)
- __FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_LISTENFORSTATUSCHANGE_1, "NetDial:\tListening For Call Status Change");
__ASSERT_ALWAYS(EIdle == iState, NetDialPanic(EEtelServerNotIdle));
__ASSERT_ALWAYS(iCallOpen, NetDialPanic(EEtelCallNotOpen));
@@ -211,8 +212,7 @@
void CTelServerProcessor::CancelListenForStatusChange()
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tCancelListenForStatusChange. iState: [%d]. iStatus: [%d]");)
- __FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), logString(), iState, iStatus.Int());
+ OstTraceDefEx2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_CANCELLISTENFORSTATUSCHANGE_1, "NetDial:\tCancelListenForStatusChange. iState: [%d]. iStatus: [%d]",iState, iStatus.Int());
__ASSERT_ALWAYS(iCallOpen, NetDialPanic(EEtelCallNotOpen));
@@ -226,8 +226,7 @@
change notification
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tCall Status Changed. CallStatus %d Error: %d");)
- __FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), logString(), iCallStatus, iStatus.Int());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_HANDLESTATUSCHANGE_1, "NetDial:\tCall Status Changed. CallStatus %d Error: %d",iCallStatus, iStatus.Int());
// Ignore if subscribing to status change notification failed.
// It can be that the TSY doesn't support the feature etc.
@@ -281,8 +280,7 @@
if (!iCallOpen)
OpenNewCallL();
- __FLOG_STMT(_LIT8(logString2,"NetDial:\tWaiting For Incoming Call");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_WAITFORINCOMINGCALLL_1, "NetDial:\tWaiting For Incoming Call");
if (iCallType==ECoreCallOnly)
{
@@ -346,8 +344,7 @@
#endif
Assertions();
- __FLOG_STMT(_LIT8(logString,"NetDial:\tHanging Up Call");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_STARTHANGUP_1, "NetDial:\tHanging Up Call");
ActiveCall().HangUp(iStatus);
SetActive();
}
@@ -361,8 +358,7 @@
@exception Leaves if LoanDataPort() returns error or SetCommPortL leaves.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tLoaning Port From Etel");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETCOMMPORTL_1, "NetDial:\tLoaning Port From Etel");
User::LeaveIfError(ActiveCall().LoanDataPort(aCommPort));
iDb->SetCommPortL(aCommPort);
iLoaned=ETrue;
@@ -378,8 +374,7 @@
@exception Leaves if RecoverDataPort() returns error.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tRecovering Port To Etel");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_RETURNCOMMPORTL_1, "NetDial:\tRecovering Port To Etel");
User::LeaveIfError(ActiveCall().RecoverDataPort());
iLoaned=EFalse;
#ifndef SYMBIAN_NETWORKING_CSDAGENT_BCA_SUPPORT
@@ -393,15 +388,13 @@
If call is open, call Close() from active call object.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tClosing Call");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_CLOSECALL_1, "NetDial:\tClosing Call");
if (iLoaned)
{
TRAPD(ret,ReturnCommPortL()); // can't do anything with the error, so just trap
if (KErrNone != ret)
{
- __FLOG_STMT(_LIT8(logString2,"ReturnCommPort:\tError Occured");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_CLOSECALL_2, "ReturnCommPort:\tError Occured");
}
}
@@ -569,8 +562,7 @@
callName.Append(lineInfo.iName);
callName.Append(KDoubleColon);
- __FLOG_STMT(_LIT8(logString,"NetDial:\tOpening Call");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_OPENNEWCALLL_1, "NetDial:\tOpening Call");
iDb->CopyIspInitStringToModemL(); // will not leave if the field is blank
// Only MultimodeV1 and greater supported!
@@ -595,8 +587,7 @@
User::LeaveIfError(iTelServer.EnumeratePhones(count));
if (count<=0)
{
- __FLOG_STMT(_LIT(logString,"NetDial:\tGetPhoneInfoL(): no phones found - leaving with -1");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETPHONEINFOL_1,"NetDial:\tGetPhoneInfoL(): no phones found - leaving with -1");
User::Leave(KErrNotFound);
}
TInt i;
@@ -619,8 +610,7 @@
if (!found)
{
- __FLOG_STMT(_LIT(logString,"NetDial:\tGetPhoneInfoL(): required phone not found - leaving with -1");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETPHONEINFOL_2, "NetDial:\tGetPhoneInfoL(): required phone not found - leaving with -1");
User::Leave(KErrNotFound);
}
}
@@ -635,8 +625,7 @@
User::LeaveIfError(phone.EnumerateLines(count));
if (count <= 0)
{
- __FLOG_STMT(_LIT(logString,"NetDial:\tGetLineInfoL(): no line info available - leaving with -1");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETLINEINFOL_1,"NetDial:\tGetLineInfoL(): no line info available - leaving with -1");
User::Leave(KErrNotFound);
}
@@ -666,8 +655,7 @@
CleanupStack::PopAndDestroy(&phone);
if (!found)
{
- __FLOG_STMT(_LIT(logString,"NetDial:\tGetLineInfoL(): required line not found - leaving with -1");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSERVERPROCESSOR_GETLINEINFOL_2, "NetDial:\tGetLineInfoL(): required line not found - leaving with -1");
User::Leave(KErrNotFound);
}
}
--- a/telephonyprotocols/csdagt/src/ND_SCR.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/ND_SCR.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +19,14 @@
@file Nd_scr.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ND_SCRTraces.h"
+#endif
+
#include "ND_SCR.H"
#include "ND_STD.H"
-#include "SLOGGER.H"
#include "SSCREXEC.H"
#include "ND_DBACC.H"
@@ -319,8 +324,7 @@
@return error code for OpenPct() request.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tOpening PCT");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_OPENPCT_1, "NetDial:\tOpening PCT");
const TInt ret = iDlgPrc->OpenPct();
if (ret == KErrNone)
@@ -334,8 +338,7 @@
Call DestroyPctNotification() from dialog processor.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tRequesting Destroy PCT Notification");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_DESTROYPCTNOTIFICATION_1, "NetDial:\tRequesting Destroy PCT Notification");
iDlgPrc->DestroyPctNotification(*this);
}
@@ -348,8 +351,7 @@
@return error code for WritePct() request.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tWriting To PCT");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_WRITEPCT_1, "NetDial:\tWriting To PCT");
return iDlgPrc->WritePct(aBuffer);
}
@@ -361,8 +363,7 @@
@param aBuffer a reference for read data.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tReading From PCT");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_READPCT_1, "NetDial:\tReading From PCT");
iDlgPrc->ReadPct(*this,aBuffer);
}
@@ -375,8 +376,7 @@
{
if (iPctOpen)
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tClosing PCT");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_CLOSEPCT_1, "NetDial:\tClosing PCT");
iDlgPrc->ClosePct();
iPctOpen = EFalse;
@@ -413,8 +413,7 @@
@param aError a error code for completition.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tRead PCT Complete with Error %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aError);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS,CNETDIALSCRIPT_MDPOREADPCTCOMPLETE_1,"NetDial:\tRead PCT Complete with Error %d",aError);
iScriptExecutor->ReadPctComplete(aError);
}
void CNetDialScript::MDPODestroyPctComplete(TInt aError)
@@ -425,8 +424,7 @@
@param aError a error code for completition.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tDestroy PCT Notification Complete with Error %d");)
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aError);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSCRIPT_MDPODESTROYPCTCOMPLETE_1, "NetDial:\tDestroy PCT Notification Complete with Error %d",aError);
iScriptExecutor->DestroyPctNotificationReceived(aError);
}
--- a/telephonyprotocols/csdagt/src/Nd_Bases.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/Nd_Bases.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,8 +19,14 @@
@file Nd_bases.cpp
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "Nd_BasesTraces.h"
+#endif
+
#include "Nd_Bases.h"
-#include "SLOGGER.H"
#include <comms-infras/eventlogger.h>
#include "ND_ETEL.H"
#include "ND_DBACC.H"
@@ -87,11 +93,9 @@
*/
{
TInt len = 0;
- __FLOG_STMT(_LIT8(logString0,"Netdial:\tGetUseScriptL");)
- __FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString0);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSM_GETUSESCRIPTL_1, "Netdial:\tGetUseScriptL");
iDbAccess->GetScriptDetailsL(iUseScript, len);
- __FLOG_STMT(_LIT8(logString1,"Netdial:\tGetUseScriptL. iUseScript [%d]");)
- __FLOG_STATIC1(KNetDialLogFolder(), KNetDialLogFile(), logString1, iUseScript);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSM_GETUSESCRIPTL_2, "Netdial:\tGetUseScriptL. iUseScript [%d]",iUseScript);
}
#endif // SYMBIAN_NETWORKING_CSDAGENT_BCA_SUPPORT
TInt CNetdialSM::GetExcessData(TDes8& aBuffer)
@@ -102,8 +106,7 @@
@return KErrNotFound if script is not found.
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tGetting Excess Data");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CNETDIALSM_GETEXCESSDATA_1,"NetDial:\tGetting Excess Data");
if (iNdScript!=NULL)
return iNdScript->GetExcessData(aBuffer);
else
@@ -201,8 +204,7 @@
{
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT(logString3,"Get Login Info");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGETLOGININFO_RUNL_1,"NetDial:\tCompleted Phase 'Get Login Info' with Error %d", iStatus.Int());
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdGotLoginInfo,iStatus.Int());
@@ -212,11 +214,11 @@
if (!(iNdEnv->BaseEnv())->IsReconnect())
{
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedLogString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGETLOGININFO_RUNL_2,"NetDial:\tService Started");
}
else
{
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedReconnLogString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGETLOGININFO_RUNL_3, "NetDial:\tService Started On Reconnection");
}
iSMObserver->ServiceStarted();
(iNdEnv->BaseEnv())->CompleteState(KErrNone);
--- a/telephonyprotocols/csdagt/src/Nd_dlinStates.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/Nd_dlinStates.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +19,14 @@
@file Nd_dlinstates.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "Nd_dlinStatesTraces.h"
+#endif
+
#include "ND_DLIN.H"
#include "Nd_dlinStates.h"
-#include "SLOGGER.H"
#include <comms-infras/eventlogger.h>
#include <csdprog.h>
#include "ND_DBACC.H"
@@ -257,8 +262,7 @@
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT(logString3,"Answering");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINANSWERING_RUNL_1, "NetDial:\tCompleted Phase Answering with Error %d", iStatus.Int());
}
else
{
@@ -388,8 +392,7 @@
Call ConnectionComplete() with EConnectionOpen and iStatus.Int().
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tConnection Open");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINOPEN_RUNL_1, "NetDial:\tConnection Open");
iSMObserver->ConnectionComplete(ECsdConnectionOpen,iStatus.Int());
}
@@ -478,8 +481,7 @@
Call DisconnectComplete().
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tDisconnect Complete");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINDISCONNECT_RUNL_1, "NetDial:\tDisconnect Complete");
iSMObserver->DisconnectComplete();
}
@@ -610,8 +612,7 @@
iNdEnv->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogDataEventTypeUid);
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT(logString3,"Hanging Up");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLINHANGUP_RUNL_1, "NetDial:\tCompleted Phase Hanging Up with Error %d",iStatus.Int());
}
iSMObserver->UpdateProgress(ECsdFinishedHangUp,KErrNone);
(iNdEnv->BaseEnv())->CompleteState(iStatus.Int());
--- a/telephonyprotocols/csdagt/src/Nd_dlupStates.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/csdagt/src/Nd_dlupStates.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -20,8 +20,13 @@
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "Nd_dlupStatesTraces.h"
+#endif
+
#include "Nd_dlupStates.h"
-#include "SLOGGER.H"
#include <comms-infras/eventlogger.h>
#include <csdprog.h>
#include "ND_DBACC.H"
@@ -273,8 +278,7 @@
{
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT(logString3,"Dialling");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3() ,iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPDIALLING_RUNL_1, "NetDial:\tCompleted Phase 'Dialling' with Error %d" ,iStatus.Int());
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdFinishedDialling,iStatus.Int());
@@ -429,8 +433,7 @@
{
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT(logString3,"Scan Script");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPSCANSCRIPT_RUNL_1, "NetDial:\tCompleted Phase 'Scan Script' with Error %d", iStatus.Int());
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdScannedScript,iStatus.Int());
@@ -503,8 +506,7 @@
{
if((!aContinue)||(iStatus!=KErrNone))
{
- __FLOG_STMT(_LIT(logString,"NetDial:\tGetLoginInfo state cancelling (aContinue %d, iStatus %d)");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()), aContinue, iStatus.Int());
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPGETLOGININFO_NEXTSTATEL_1, "NetDial:\tGetLoginInfo state cancelling (aContinue %d, iStatus %d)",aContinue, iStatus.Int());
TInt err = iStatus.Int();
if (!aContinue && err == KErrNone)
@@ -645,8 +647,7 @@
{
if(iStatus!=KErrNone)
{
- __FLOG_STMT(_LIT(logString3,"Login");)
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPLOGIN_RUNL_1, _ "NetDial:\tCompleted Phase 'Login' with Error %d", iStatus.Int());
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdFinishedLogIn,iStatus.Int());
@@ -780,8 +781,7 @@
#endif
__ASSERT_DEBUG(iStatus==KErrNone,User::Invariant());
iSMObserver->UpdateProgress(ECsdConnectionOpen,KErrNone);
- __FLOG_STMT(_LIT8(logString,"NetDial:\tConnection Open");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPOPEN_RUNL_1, "NetDial:\tConnection Open");
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdConnectionOpen,KErrNone);
@@ -920,12 +920,8 @@
iNdEnv->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogDataEventTypeUid);
if(iStatus!=KErrNone)
{
-#ifdef __FLOG_ACTIVE
- _LIT(logString3,"Hang Up");
- _LIT8(logString2,"NetDial:\tDisconnection Error %d");
-#endif
- __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
- __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString2()), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPHANGUP_RUNL_1,"NetDial:\tCompleted Phase 'Hang Up' with Error %d", iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPHANGUP_RUNL_2, "NetDial:\tDisconnection Error %d", iStatus.Int());
}
else
{
@@ -1024,8 +1020,7 @@
Call DisconnectComplete().
*/
{
- __FLOG_STMT(_LIT8(logString,"NetDial:\tDisconnect Complete");)
- __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPDISCONNECT_RUNL_1, _"NetDial:\tDisconnect Complete");
iSMObserver->DisconnectComplete();
}
@@ -1079,8 +1074,7 @@
*/
{
ASSERT(iNdEnv);
- __FLOG_STMT(_LIT8(logString,"NetDial:\tOpening Data Port"));
- __FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPOPENDATAPORT_STARTSTATE_1,"NetDial:\tOpening Data Port");
iSMObserver->UpdateProgress(ECsdScanningScript,KErrNone);
TRAPD(ret,iNdEnv->SetUpScriptL());
@@ -1130,10 +1124,7 @@
{
if (iStatus!=KErrNone)
{
-#ifdef __FLOG_ACTIVE
- _LIT(logString3,"Open Data Port");
-#endif
- __FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPOPENDATAPORT_RUNL_1, "NetDial:\tCompleted Phase 'Open Data Port' with Error %d", iStatus.Int());
if (iNdEnv->Script()!=NULL)
iNdEnv->Script()->CloseScript();
iSMObserver->ConnectionComplete(ECsdScannedScript,iStatus.Int());
@@ -1193,8 +1184,7 @@
ASSERT(iNdEnv);
ASSERT (iNdEnv->Script());
- __FLOG_STMT(_LIT8(logString,"NetDial:\tClosing Data Port"));
- __FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPCLOSEDATAPORT_STARTSTATE_1, "NetDial:\tClosing Data Port");
iNdEnv->Script()->ShutdownChannel(iStatus);
iStatus = KRequestPending;
@@ -1211,9 +1201,7 @@
{
if((!aContinue) || (iError != KErrNone) || (iStatus.Int() != KErrNone))
{
- __FLOG_STMT(_LIT(logString,"NetDial:\tCloseDataPort state cancelling (iError %d, aContinue %d, iStatus %d)");)
- __FLOG_STATIC3(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()), iError, aContinue, iStatus.Int());
-
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPCLOSEDATAPORT_NEXTSTATEL_1, "NetDial:\tCloseDataPort state cancelling (iError %d, aContinue %d, iStatus %d)", iError, aContinue, iStatus.Int());
return CDlUpHangUp::NewL(*iSMObserver,*iNdEnv);
}
else
@@ -1240,14 +1228,11 @@
// to its earlier Connect()).
if (iStatus!=KErrNone)
{
-#ifdef __FLOG_ACTIVE
- _LIT(logString3,"Close Data Port");
- _LIT8(logstring2,"Saved error = %d");
-#endif
- __FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC>(KCompletedPhaseLogString()), &logString3(), iStatus.Int());
+
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPCLOSEDATAPORT_RUNL_1, "NetDial:\tCompleted Phase 'Close Data Port' with Error %d", iStatus.Int());
if (iError != KErrNone)
{
- __FLOG_STATIC1(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue<const TDesC8>(logstring2()), iError);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDLUPCLOSEDATAPORT_RUNL_2, "Saved error = %d", iError);
}
else
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/csdagt/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/csdagt/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,125 @@
+#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]_NETDIALPANIC_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCLOSEDATAPORT_RUNL_1=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCLOSEDATAPORT_RUNL_2=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONFIGURECOMMPORT_DOCANCEL_1=0x42
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONFIGURECOMMPORT_DOSTARTSTATEL_1=0x44
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONFIGURECOMMPORT_RUNL_1=0x43
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONFIGURECOMMPORT_STARTSTATE_1=0x41
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONNECT_DOSTARTSTATEL_1=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTCONNECT_RUNL_1=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTDISCONNECT_RUNL_1=0x40
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTHANGUP_RUNL_1=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTHANGUP_RUNL_2=0x3e
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTHANGUP_RUNL_3=0x3f
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTOPEN_RUNL_1=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTRECONFIGURECOMMPORT_RUNL_1=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTRECONFIGURECOMMPORT_STARTSTATE_1=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTSCANSCRIPT_RUNL_1=0x37
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTSCANSCRIPT_RUNL_2=0x38
+[TRACE]TRACE_INTERNALS[0x88]_CDIRCTSCANSCRIPT_RUNL_3=0x39
+[TRACE]TRACE_INTERNALS[0x88]_CDLINANSWERING_RUNL_1=0x68
+[TRACE]TRACE_INTERNALS[0x88]_CDLINDISCONNECT_RUNL_1=0x6a
+[TRACE]TRACE_INTERNALS[0x88]_CDLINHANGUP_RUNL_1=0x6b
+[TRACE]TRACE_INTERNALS[0x88]_CDLINOPEN_RUNL_1=0x69
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPAGXSM_NOTIFICATION_1=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPCLOSEDATAPORT_NEXTSTATEL_1=0x77
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPCLOSEDATAPORT_RUNL_1=0x78
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPCLOSEDATAPORT_RUNL_2=0x79
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPCLOSEDATAPORT_STARTSTATE_1=0x76
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPDIALLING_RUNL_1=0x6c
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPDISCONNECT_RUNL_1=0x73
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPGETLOGININFO_NEXTSTATEL_1=0x6e
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPHANGUP_RUNL_1=0x71
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPHANGUP_RUNL_2=0x72
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPLOGIN_RUNL_1=0x6f
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPOPENDATAPORT_RUNL_1=0x75
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPOPENDATAPORT_STARTSTATE_1=0x74
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPOPEN_RUNL_1=0x70
+[TRACE]TRACE_INTERNALS[0x88]_CDLUPSCANSCRIPT_RUNL_1=0x6d
+[TRACE]TRACE_INTERNALS[0x88]_CDTRCOMMAND_PARSEL_1=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CDTRCOMMAND_PARSEL_2=0x10
+[TRACE]TRACE_INTERNALS[0x88]_CDTRCOMMAND_PARSEL_3=0x11
+[TRACE]TRACE_INTERNALS[0x88]_CEXITCOMMAND_PARSEL_1=0x13
+[TRACE]TRACE_INTERNALS[0x88]_CEXITCOMMAND_PARSEL_2=0x14
+[TRACE]TRACE_INTERNALS[0x88]_CGETLOGININFO_RUNL_1=0x65
+[TRACE]TRACE_INTERNALS[0x88]_CGETLOGININFO_RUNL_2=0x66
+[TRACE]TRACE_INTERNALS[0x88]_CGETLOGININFO_RUNL_3=0x67
+[TRACE]TRACE_INTERNALS[0x88]_CGOTOCOMMAND_GOTO_1=0xc
+[TRACE]TRACE_INTERNALS[0x88]_CGOTOCOMMAND_GOTO_2=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CGOTOCOMMAND_PARSELABELL_1=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CGOTOCOMMAND_PARSEL_1=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CLOOPCOMMAND_CHECKLOOPL_1=0x9
+[TRACE]TRACE_INTERNALS[0x88]_CLOOPCOMMAND_CHECKLOOPL_2=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CLOOPCOMMAND_PARSEL_1=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CLOOPCOMMAND_PARSEL_2=0x8
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_CLOSEPCT_1=0x5f
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_DESTROYPCTNOTIFICATION_1=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_MDPODESTROYPCTCOMPLETE_1=0x61
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_MDPOREADPCTCOMPLETE_1=0x60
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_OPENPCT_1=0x5b
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_READPCT_1=0x5e
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSCRIPT_WRITEPCT_1=0x5d
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSM_GETEXCESSDATA_1=0x64
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSM_GETUSESCRIPTL_1=0x62
+[TRACE]TRACE_INTERNALS[0x88]_CNETDIALSM_GETUSESCRIPTL_2=0x63
+[TRACE]TRACE_INTERNALS[0x88]_CREADPCTCOMMAND_PARSEL_1=0x12
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_CLOSESCRIPT_1=0x32
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_COMPLETEDSCRIPT_1=0x31
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_READPCTCOMPLETE_1=0x33
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_SCANSCRIPTL_1=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_SCANSCRIPTL_2=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_SCANSCRIPTL_3=0x30
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTEXECUTOR_SETSCRIPT_1=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CANCELCREATECHANNEL_1=0x17
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CHATSTRINGMATCH_1=0x26
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CHATTIMEOUT_1=0x27
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CHATTIMEOUT_2=0x28
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CHATTIMEOUT_3=0x29
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_1=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_10=0x23
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_2=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_3=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_4=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_5=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_7=0x20
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_8=0x21
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMREADCOMPLETE_9=0x22
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMWRITECOMPLETE_1=0x24
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_COMMWRITECOMPLETE_2=0x25
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CREATECHANNEL_1=0x15
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_CREATECHANNEL_2=0x16
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_INITIALIZECOMPLETE_1=0x18
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_PRESENDPAUSECOMPLETED_1=0x2c
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_READECHO_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_READ_1=0x2a
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_SHUTDOWNCOMPLETE_1=0x19
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTIO_STOP_1=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTREADER_CONSTRUCTL_1=0x34
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTREADER_GETCURRENTLINE_1=0x35
+[TRACE]TRACE_INTERNALS[0x88]_CSCRIPTREADER_GETCURRENTLINE_2=0x36
+[TRACE]TRACE_INTERNALS[0x88]_CSENDCOMMAND_PARSEL_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CSENDCOMMAND_PARSEL_2=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CSETCOMMAND_PARSEL_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CSETCOMMAND_PARSEL_2=0x2
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_CLOSECALL_1=0x54
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_CLOSECALL_2=0x55
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_CONSTRUCTL_1=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_DIALL_1=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_DTOR_1=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_DTOR_2=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETCOMMPORTL_1=0x52
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETLINEINFOL_1=0x59
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETLINEINFOL_2=0x5a
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETPHONEINFOL_1=0x57
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_GETPHONEINFOL_2=0x58
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_HANDLESTATUSCHANGE_1=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_LISTENFORSTATUSCHANGE_1=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_OPENNEWCALLL_1=0x56
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_RETURNCOMMPORTL_1=0x53
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_STARTHANGUP_1=0x51
+[TRACE]TRACE_INTERNALS[0x88]_CTELSERVERPROCESSOR_WAITFORINCOMINGCALLL_1=0x50
+[TRACE]TRACE_INTERNALS[0x88]_CWAITCOMMAND_PARSEACTIONL_1=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CWAITCOMMAND_PARSEACTIONL_2=0x6
--- a/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/gprsumtsqosinterface/group/networking_umtsif.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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_umtsif
source \sf\os\cellularsrv\telephonyprotocols\gprsumtsqosinterface
binary \sf\os\cellularsrv\telephonyprotocols\gprsumtsqosinterface\group all
--- a/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/gprsumtsqosprt/group/networking_guqos.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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_guqos
source \sf\os\cellularsrv\telephonyprotocols\gprsumtsqosprt
binary \sf\os\cellularsrv\telephonyprotocols\gprsumtsqosprt\group all
--- a/telephonyprotocols/pdplayer/group/networking_pdp.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/group/networking_pdp.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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_pdp
source \sf\os\cellularsrv\telephonyprotocols\pdplayer
binary \sf\os\cellularsrv\telephonyprotocols\pdplayer\group all
--- a/telephonyprotocols/pdplayer/group/pdp.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/group/pdp.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -101,6 +101,7 @@
USERINCLUDE ../inc
USERINCLUDE ../umts/spudtel/inc
USERINCLUDE ../umts/spudfsm/inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/telephonyprotocols/pdplayer/src/PDPConfig.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/PDPConfig.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -20,6 +20,14 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "PDPConfigTraces.h"
+#endif
+
+#include <hash.h>
+#include <e32math.h>
#include <comms-infras/ss_log.h>
#include <in_sock.h>
#include <comms-infras/metadata.h>
@@ -31,11 +39,6 @@
using namespace ESock;
-#if defined(__CFLOG_ACTIVE)
-#define KPDPMCprTag KESockMetaConnectionTag
-_LIT8(KPDPMCprSubTag, "pdpmcpr");
-#endif
-
//
// Attribute table for provisioning structure passed to CFProtocol
//
@@ -158,7 +161,7 @@
{
aCompression |= RPacketContext::KPdpHeaderCompression;
}
- __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMADataCompression|KCDTIdWCDMAHeaderCompression [%d]"), this, aCompression));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEGPRSCOMPRESSION_1, "CGPRSProvision [this=0x%08x]::InitialiseConfigL() KCDTIdWCDMADataCompression|KCDTIdWCDMAHeaderCompression [%u]", (TUint)this, aCompression);
}
void CGPRSProvision::RetrieveGprsAnonymousAccess(RPacketContext::TAnonymousAccess& aAnonymous, ESock::CCommsDatIapView* aIapView) const
@@ -170,7 +173,7 @@
else
aAnonymous = RPacketContext::ENotRequired;
- __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMAAnonymousAccess [%d]"), this, aAnonymous));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEGPRSANONYMOUSACCESS_1, "CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMAAnonymousAccess [%d]", (TUint)this, aAnonymous);
}
void CGPRSProvision::RetrieveApnNameL(TDes8& aApnName, ESock::CCommsDatIapView* aIapView) const
@@ -187,7 +190,7 @@
{
User::Leave(getErr);
}
- __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdAPN [%S]"), this, &aApnName));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEAPNNAMEL_1, "CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdAPN [%s]", (TUint)this, aApnName);
}
void CGPRSProvision::RetrievePdpTypeL(RPacketContext::TProtocolType& aPdpType, ESock::CCommsDatIapView* aIapView) const
@@ -196,7 +199,7 @@
aIapView->GetIntL(KCDTIdWCDMPDPType | KCDTIdOutgoingGprsRecord, pdpType);
aPdpType = static_cast<RPacketContext::TProtocolType>(pdpType);
- __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMPDPType=%d"), this, aPdpType));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEPDPTYPEL_1, "CGPRSProvision [this=%08x]::InitialiseConfigL() KCDTIdWCDMPDPType=%d", (TUint)this, aPdpType);
}
void CGPRSProvision::RetrieveAuthenticationInfoL(RPacketContext::TProtocolConfigOptionV2& aProtocolConfigOption, ESock::CCommsDatIapView* aIapView)
@@ -204,7 +207,7 @@
HBufC* buf = NULL;
TInt getErr;
- __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL()"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_1, "CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL()", (TUint)this);
getErr = aIapView->GetText(KCDTIdWCDMAIfAuthName | KCDTIdOutgoingGprsRecord, buf);
if ( getErr == KErrNone )
@@ -214,9 +217,10 @@
delete buf;
buf = NULL;
- __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL() KCDTIdWCDMAIfAuthName [%S] "), this, &aProtocolConfigOption.iAuthInfo.iUsername));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_2, "CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL() KCDTIdWCDMAIfAuthName [%s] ", (TUint)this, aProtocolConfigOption.iAuthInfo.iUsername);
aProtocolConfigOption.iId = 1;
+
getErr = aIapView->GetText(KCDTIdWCDMAIfAuthPass | KCDTIdOutgoingGprsRecord, buf);
if ( getErr == KErrNone )
{
@@ -225,7 +229,7 @@
delete buf;
buf = NULL;
- __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL() KCDTIdWCDMAIfAuthPass [%S]"), this, &aProtocolConfigOption.iAuthInfo.iPassword));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_3, "CGPRSProvision [this=%08x]::RetrieveAuthenticationInfoL() KCDTIdWCDMAIfAuthPass [%S]", (TUint)this, aProtocolConfigOption.iAuthInfo.iPassword);
}
else if (getErr != KErrNotFound)
{
@@ -407,7 +411,7 @@
aIapView->GetTextL(KCDTIdTsyName, buf);
iTsyName.Copy(*buf);
- __CFLOG_VAR((KPDPMCprTag, KPDPMCprSubTag, _L8("CTSYProvision [this=%08x]::InitialiseConfigL() KCDTIdTsyName=%s"), this, &iTsyName));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTSYPROVISION_INITIALISECONFIGL_1, "CTSYProvision [this=%08x]::InitialiseConfigL() KCDTIdTsyName=%S", (TUint)this, iTsyName);
delete buf;
}
--- a/telephonyprotocols/pdplayer/src/PDPDeftSCPR.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/PDPDeftSCPR.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -20,6 +20,11 @@
@internalComponent
*/
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "PDPDeftSCPRTraces.h"
+#endif
+
#include <comms-infras/corescpractivities.h>
#include "PDPDeftSCPR.h"
#include "PDPSCPRStates.h"
@@ -28,7 +33,7 @@
#include <comms-infras/commsdebugutility.h>
#include <elements/nm_signatures.h>
-#if defined(__CFLOG_ACTIVE) || defined(SYMBIAN_TRACE_ENABLE)
+#if defined(SYMBIAN_TRACE_ENABLE)
#define KPDPSCprTag KESockSubConnectionTag
_LIT8(KPDPSCprSubTag, "pdpscpr");
#endif
@@ -277,8 +282,8 @@
iUsername.Copy(configOption->iAuthInfo.iUsername);
iPassword.Copy(configOption->iAuthInfo.iPassword);
- __CFLOG_VAR((KPDPSCprTag, KPDPSCprSubTag, _L8("CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] "), this, &iUsername));
- __CFLOG_VAR((KPDPSCprTag, KPDPSCprSubTag, _L8("CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] "), this, &iPassword));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_1, "CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] ", (TUint)this, iUsername);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_2, "CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] ", (TUint)this, iPassword);
iAuthDialog = CAuthenticationDialog::NewL();
iAuthDialog->Authenticate(*this, iUsername, iPassword);
@@ -293,9 +298,9 @@
configOption->iAuthInfo.iUsername.Copy(iUsername);
configOption->iAuthInfo.iPassword.Copy(iPassword);
-
- __CFLOG_VAR((KPDPSCprTag, KPDPSCprSubTag, _L8("CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] "), this, &configOption->iAuthInfo.iUsername));
- __CFLOG_VAR((KPDPSCprTag, KPDPSCprSubTag, _L8("CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%S] "), this, &configOption->iAuthInfo.iPassword));
+
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_1, "CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%s] ", (TUint)this, configOption->iAuthInfo.iUsername);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_2, "CPDPSubConnectionProvider [this=%08x]::AuthenticationCompleteL() KCDTIdWCDMAIfAuthName [%s] ", (TUint)this, configOption->iAuthInfo.iPassword);
}
//Send AuthenticateComplete message
--- a/telephonyprotocols/pdplayer/src/PDPSCPR.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/PDPSCPR.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -31,7 +31,7 @@
#include <comms-infras/agentscpractivities.h>
#include <comms-infras/ss_nodemessages_factory.h>
-#if defined __FLOG_ACTIVE || defined SYMBIAN_TRACE_ENABLE
+#if defined SYMBIAN_TRACE_ENABLE
#define KPDPSCprTag KESockSubConnectionTag
_LIT8(KPDPSCprSubTag, "pdpscpr");
#endif
--- a/telephonyprotocols/pdplayer/src/pdpmcpr.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdpmcpr.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -20,6 +20,13 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdpmcprTraces.h"
+#endif
+
+
#include <etelqos.h>
#include <comms-infras/agentmcpractivities.h>
#include <comms-infras/coremcpractivities.h>
@@ -160,8 +167,7 @@
void CPdpMetaConnectionProvider::ReceivedL(const TRuntimeCtxId& aSender, const TNodeId& aRecipient, TSignatureBase& aMessage)
{
- __CFLOG_VAR((KPdpMCprTag, KPdpMCprSubTag, _L8("CPdpMetaConnectionProvider [this=%08x]::ReceivedL() aMessage=%d"),
- this, aMessage.MessageId().MessageId()));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPMETACONNECTIONPROVIDER_RECEIVEDL_1, "CPdpMetaConnectionProvider [this=%08x]::ReceivedL() aMessage=%d",(TUint)this, aMessage.MessageId().MessageId());
ESOCK_DEBUG_MESSAGE_INTERCEPT(aSender, aMessage, aRecipient);
--- a/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdpmcprfactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdpmcprfactoryTraces.h"
+#endif
+
#include <etelqos.h>
#include <ecom/implementationproxy.h>
#include <comms-infras/ss_log.h>
@@ -31,13 +37,6 @@
#include "pdpmcprfactory.h"
#include "pdpmcpr.h"
-
-
-#ifdef _DEBUG
-#define KPdpMCprFactoryTag KESockMetaConnectionTag
-_LIT8(KPdpMCprFactorySubTag, "pdpmcprfactory");
-#endif
-
using namespace ESock;
//-=========================================================
@@ -47,14 +46,14 @@
//-=========================================================
CPdpMetaConnectionProviderFactory* CPdpMetaConnectionProviderFactory::NewL(TAny* aParentContainer)
{
- __CFLOG_VAR((KPdpMCprFactoryTag, KPdpMCprFactorySubTag, _L8("CPdpMetaConnectionProviderFactory ::\tNewL(%08x)"), aParentContainer));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPMETACONNECTIONPROVIDERFACTORY_NEWL_1, "CPdpMetaConnectionProviderFactory ::\tNewL(%08x)", aParentContainer);
return new (ELeave) CPdpMetaConnectionProviderFactory(TUid::Uid(CPdpMetaConnectionProviderFactory::iUid), *(reinterpret_cast<CMetaConnectionFactoryContainer*>(aParentContainer)));
}
CPdpMetaConnectionProviderFactory::CPdpMetaConnectionProviderFactory(TUid aFactoryId, CMetaConnectionFactoryContainer& aParentContainer)
: CMetaConnectionProviderFactoryBase(aFactoryId,aParentContainer)
{
- __CFLOG_VAR((KPdpMCprFactoryTag, KPdpMCprFactorySubTag, _L8("CPdpMetaConnectionProviderFactory %08x:\tCPdpMetaConnectionProviderFactory Constructor"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPMETACONNECTIONPROVIDERFACTORY_CTOR_1, "CPdpMetaConnectionProviderFactory %08x:\tCPdpMetaConnectionProviderFactory Constructor", this);
}
ESock::ACommsFactoryNodeId* CPdpMetaConnectionProviderFactory::DoCreateObjectL(ESock::TFactoryQueryBase& aQuery)
--- a/telephonyprotocols/pdplayer/src/pdpservices.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdpservices.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -18,6 +18,12 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdpservicesTraces.h"
+#endif
+
#include <comms-infras/ss_log.h>
#include <comms-infras/ss_corepractivities.h> // TODO is this needed?
#include <comms-infras/coretiermanagerstates.h> // TODO is this needed?
@@ -27,11 +33,6 @@
#include <pcktcs.h>
#include <comms-infras/es_connectionserv.h>
-#ifdef __CFLOG_ACTIVE
-#define KPDPTierMgrTag KESockMetaConnectionTag
-_LIT8(KMBMSObjectTag, "MBMSObject");
-#endif
-
using namespace Messages;
using namespace MeshMachine; // TODO is this needed?
using namespace ESock;
@@ -119,7 +120,7 @@
*/
void CMBMSServiceRequest::CancelMessage(const TInt aError)
{
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::CancelMessage(%d)"), this, aError));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_CANCELMESSAGE_1, "CMBMSServiceRequest[%08x]::CancelMessage(%d)", (TUint)this, aError);
if (iRequestType == TCFTierStatusProvider::TTierNotificationRegistration::Id())
{
iRequestOriginator.PostMessage(
@@ -197,7 +198,7 @@
*/
TInt CMBMSServiceRequest::RunError(TInt aError)
{
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::RunError(%d)"), this, aError));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNERROR_1, "CMBMSServiceRequest[%08x]::RunError(%d)", (TUint)this, aError);
// Stop the ScanEngine components
Cancel();
@@ -225,7 +226,7 @@
switch(iScanEngineState)
{
case EChecking:
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In EChecking State"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_1, "CMBMSServiceRequest[%08x]::In EChecking State", (TUint)this);
User::LeaveIfError(iMBMSEngine.GetRPacketService().GetStatus(iPsdStatus)); // get initial status
//check the query type
@@ -248,14 +249,14 @@
case EBearerAvailable:
//get MBMS bearer availability.
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In EBearerAvailable State"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_2, "CMBMSServiceRequest[%08x]::In EBearerAvailable State", (TUint)this);
iMBMSEngine.GetRPacketService().GetMbmsNetworkServiceStatus(iStatus,ETrue,iNetworkServiceStatus);
iScanEngineState = ERetrieveBearerAvailability;
SetActive();
break;
case ERetrieveBearerAvailability:
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In ERetrieveBearerAvailability State"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_3, "CMBMSServiceRequest[%08x]::In ERetrieveBearerAvailability State", (TUint)this);
//create a parameter bundle and send the results to the client.
SendResultBundleL();
@@ -303,7 +304,7 @@
case EGetCountMonitorList:
{
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In ECountActiveServiceList State"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_4, "CMBMSServiceRequest[%08x]::In ECountActiveServiceList State", (TUint)this);
iMBMSEngine.GetRPacketService().EnumerateMbmsMonitorServiceList(iStatus,iCount,iMaxCount);
SetActive();
@@ -313,7 +314,7 @@
case EGetCountServiceList:
{
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In ECountActiveServiceList State"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_5, "CMBMSServiceRequest[%08x]::In ECountActiveServiceList State", (TUint)this);
iMBMSEngine.GetRPacketService().EnumerateMbmsActiveServiceList(iStatus,iCount,iMaxCount);
SetActive();
@@ -327,14 +328,14 @@
case ENotifyService:
//notify for MBMS Services.
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In ENotifyService State"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_6, "CMBMSServiceRequest[%08x]::In ENotifyService State", (TUint)this);
iMBMSEngine.GetRPacketService().NotifyMbmsServiceAvailabilityChange(iStatus);
SetActive();
iScanEngineState = EStartMonitor;
break;
case EStartMonitor:
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In EStartMonitor State"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_7, "CMBMSServiceRequest[%08x]::In EStartMonitor State", (TUint)this);
iRetrievePcktMbms = CRetrievePcktMbmsMonitoredServices::NewL(iMBMSEngine.GetRPacketService());
iRetrievePcktMbms->Start(iStatus);
@@ -354,13 +355,13 @@
}
else if(((iStatus.Int() == KErrMbmsImpreciseServiceEntries))||((iStatus.Int() == KErrNotFound)))
{
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::RunL() KErrMbmsImpreciseServiceEntries || KErrNotFound"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_8, "CMBMSServiceRequest[%08x]::RunL() KErrMbmsImpreciseServiceEntries || KErrNotFound", (TUint)this);
CancelMessage(iStatus.Int());
iMBMSEngine.RemoveFromRequestListL(GetClientId());
}
else
{
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::RunL() ERROR: Incorrect status, Aborting"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_RUNL_9, "CMBMSServiceRequest[%08x]::RunL() ERROR: Incorrect status, Aborting", (TUint)this);
User::Leave(iStatus.Int());
}
@@ -373,7 +374,7 @@
*/
CPcktMbmsMonitoredServiceList* CMBMSServiceRequest::UpdateMonitorServiceListL()
{
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In UpdateMonitorServiceListL()"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_UPDATEMONITORSERVICELISTL_1, "CMBMSServiceRequest[%08x]::In UpdateMonitorServiceListL()", (TUint)this);
//Read the entries in the parameter bundle and pass them to Etel.
CPcktMbmsMonitoredServiceList* serviceList= CPcktMbmsMonitoredServiceList::NewL();
@@ -447,7 +448,7 @@
CConnectionServParameterBundle* returnBundle = CConnectionServParameterBundle::NewL();
CleanupStack::PushL(returnBundle);
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In PrepareMonitorResultBundleL function"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_PREPAREMONITORRESULTBUNDLEL_1, "CMBMSServiceRequest[%08x]::In PrepareMonitorResultBundleL function", (TUint)this);
//read the MBMS Service list from Etel after receiving the MBMS Service Availability Notification.
CPcktMbmsMonitoredServiceList* serviceList = iRetrievePcktMbms->RetrieveListL();
@@ -492,7 +493,7 @@
*/
CConnectionServParameterBundle* CMBMSServiceRequest::PrepareBearerResultBundleL() const
{
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In PrepareBearerResultBundleL function"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_PREPAREBEARERRESULTBUNDLEL_1, "CMBMSServiceRequest[%08x]::In PrepareBearerResultBundleL function", (TUint)this);
CConnectionServParameterBundle* returnBundle = CConnectionServParameterBundle::NewL();
CleanupStack::PushL(returnBundle);
@@ -517,7 +518,7 @@
*/
CConnectionServParameterBundle* CMBMSServiceRequest::PrepareCountBundleL() const
{
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In PrepareCountBundleL function"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_PREPARECOUNTBUNDLEL_1, "CMBMSServiceRequest[%08x]::In PrepareCountBundleL function", (TUint)this);
CConnectionServParameterBundle* returnBundle = CConnectionServParameterBundle::NewL();
CleanupStack::PushL(returnBundle);
@@ -543,7 +544,7 @@
CConnectionServParameterBundle* CMBMSServiceRequest::PrepareRemoveAllBundleL() const
{
//pass empty bundle
- __CFLOG_VAR((KPDPTierMgrTag, KMBMSObjectTag, _L8("CMBMSServiceRequest[%08x]::In PrepareRemoveAllBundleL function"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSSERVICEREQUEST_PREPAREREMOVEALLBUNDLEL_1, "CMBMSServiceRequest[%08x]::In PrepareRemoveAllBundleL function", (TUint)this);
CConnectionServParameterBundle* returnBundle = CConnectionServParameterBundle::NewL();
return returnBundle;
--- a/telephonyprotocols/pdplayer/src/pdptiermanager.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdptiermanager.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -18,6 +18,12 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdptiermanagerTraces.h"
+#endif
+
#include "pdptiermanager.h"
#include "mbmsengine.h"
#include "pdptiermanagerselector.h"
@@ -26,13 +32,12 @@
#include <comms-infras/coretiermanageractivities.h>
#include <pcktcs.h>
-#include "pdpmcpr.h"
-
#ifdef SYMBIAN_TRACE_ENABLE
#define KPDPTierMgrTag KESockMetaConnectionTag
-_LIT8(KPDPTierMgrSubTag, "pdptiermgr");
#endif
+#include "pdpmcpr.h"
+
using namespace Messages;
using namespace MeshMachine;
using namespace ESock;
@@ -170,16 +175,11 @@
iContextMonitors.Remove(monitorIndex);
}
-void CPrimaryContextsMonitor::ProcessError(
- #ifdef _DEBUG
- TInt aError
- #else //remove compilation warning in release builds
- TInt /*aError*/
- #endif
- )
+void CPrimaryContextsMonitor::ProcessError(TInt aError)
{
__ASSERT_DEBUG(aError != KErrNone, User::Invariant());
- __FLOG_STATIC1(KPDPTierMgrTag, KPDPTierMgrSubTag, _L("PDP context monitoring error: %d"), aError);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPRIMARYCONTEXTSMONITOR_PROCESSERROR_1, ("PDP context monitoring error: %d"), aError);
+ (void)aError; //needed for debug builds
}
void CPrimaryContextsMonitor::RunL()
@@ -437,7 +437,7 @@
*/
MProviderSelector* CPDPTierManager::DoCreateProviderSelectorL(const Meta::SMetaData& aSelectionPreferences)
{
- __CFLOG_VAR((KPDPTierMgrTag, KPDPTierMgrSubTag, _L8("CPdpTierManager[%08x]::DoSelectProvider()"), this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPTIERMANAGER_DOCREATEPROVIDERSELECTORL_1, "CPdpTierManager[%08x]::DoSelectProvider()", (TUint)this);
return TPdpSelectorFactory::NewSelectorL(aSelectionPreferences);
}
@@ -448,7 +448,7 @@
*/
void CPDPTierManager::ConstructL()
{
- __CFLOG_VAR((KPDPTierMgrTag, KPDPTierMgrSubTag, _L8("ConstructL::In CPDPTierManager")));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPTIERMANAGER_CONSTRUCTL_1, "ConstructL::In CPDPTierManager");
iMBMSEngine = CMBMSEngine::NewL(NodeId(), *this);
}
--- a/telephonyprotocols/pdplayer/src/pdptiermanagerfactory.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdptiermanagerfactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -18,16 +18,17 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdptiermanagerfactoryTraces.h"
+#endif
+
#include <comms-infras/ss_log.h>
#include <ecom/ecom.h>
#include "pdptiermanagerfactory.h"
#include "pdptiermanager.h"
-#ifdef __CFLOG_ACTIVE
-#define KPDPTierMgrTag KESockMetaConnectionTag
-_LIT8(KPDPTierMgrSubTag, "pdptiermgr");
-#endif
-
// ---------------- Factory Methods ----------------
/**
Creates a PDP Tier Manager Factory
@@ -37,7 +38,7 @@
*/
CPDPTierManagerFactory* CPDPTierManagerFactory::NewL(TAny* aParentContainer)
{
- __CFLOG_VAR((KPDPTierMgrTag, KPDPTierMgrSubTag, _L8("CPDPTierManagerFactory::\tNewL(%08x)"), aParentContainer));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPTIERMANAGERFACTORY_NEWL_1, "CPDPTierManagerFactory::\tNewL(%08x)", aParentContainer);
return new (ELeave) CPDPTierManagerFactory(TUid::Uid(CPDPTierManagerFactory::EUid), TUid::Uid(CPDPTierManagerFactory::EUid),*(reinterpret_cast<ESock::CTierManagerFactoryContainer*>(aParentContainer)));
}
/**
--- a/telephonyprotocols/pdplayer/src/pdptiermanagerselector.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdptiermanagerselector.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -18,6 +18,12 @@
@internalComponent
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdptiermanagerselectorTraces.h"
+#endif
+
#include "pdptiermanagerselector.h"
#include "pdptiermanagerfactory.h"
@@ -26,12 +32,7 @@
#include <commsdattypesv1_1_partner.h>
#include <comms-infras/ss_tiermanagerutils.h>
#include <es_connpref.h> //TConnIdList
-#include <es_enum_internal.h>
-
-#ifdef __CFLOG_ACTIVE
-#define KPdpTierMgrTag KESockTierTag
-_LIT8(KPdpTierMgrSubTag, "pdptiermgr");
-#endif // __CFLOG_ACTIVE
+#include <es_enum_internal.h>
using namespace ESock;
using namespace CommsDat;
@@ -77,7 +78,7 @@
if (iSelectionPrefs.IsEmpty())
{
//Implicit case on the new setup
- __CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpProviderSelector %08x::\tSelectL() Using Default AP:%d"),this,defaultAccessPoint));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_1, "CPdpProviderSelector %08x::\tSelectL() Using Default AP:%d",(TUint)this,defaultAccessPoint);
aSelectionNotify.SelectComplete(this,FindOrCreateProviderL(defaultAccessPoint));
aSelectionNotify.SelectComplete(this,NULL);
return;
@@ -88,7 +89,7 @@
{
ASSERT(iSelectionPrefs.Scope() & TSelectionPrefs::ESelectFromExisting); //This is always attach
const TConnProviderInfo& connProvInfo = static_cast<const TConnProviderInfoPref&>(prefs).Info();
- __CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpProviderSelector %08x::\tSelectL() Using TConnProviderInfoPref, AP:%d"),this,connProvInfo.iInfo[1]));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_2, "CPdpProviderSelector %08x::\tSelectL() Using TConnProviderInfoPref, AP:%d",(TUint)this,connProvInfo.iInfo[1]);
aSelectionNotify.SelectComplete(this,FindProviderL(connProvInfo.iInfo[1],(TAny*)connProvInfo.iInfo[2]));
aSelectionNotify.SelectComplete(this,NULL);
return;
@@ -97,7 +98,7 @@
if (prefs.ExtensionId() == TConnPref::EConnPrefSnap)
{
TUint accessPoint = static_cast<const TConnSnapPref&>(prefs).Snap();
- __CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpProviderSelector %08x::\tSelectL() Using TConnPrefSnap, AP:%d"),this,accessPoint));
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_3, "CPdpProviderSelector %08x::\tSelectL() Using TConnPrefSnap, AP:%d",(TUint)this,accessPoint);
aSelectionNotify.SelectComplete(this,FindOrCreateProviderL(accessPoint));
aSelectionNotify.SelectComplete(this,NULL);
return;
@@ -105,7 +106,7 @@
if (prefs.ExtensionId() == TConnPref::EConnPrefIdList)
{
- __CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpProviderSelector %08x::\tSelectL() Using TConnIdList"),this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_4, "CPdpProviderSelector %08x::\tSelectL() Using TConnIdList",(TUint)this);
const TConnIdList& list = static_cast<const TConnIdList&>(prefs);
TInt count = list.Count();
for (TInt i = 0; i < count; i++)
@@ -118,7 +119,7 @@
//In this selector we _must_ have the new preferences, otherwise it means that
//a critical, non-recoverable mitsake has occured before when this selector has been picked.
- __CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("ERROR: CPdpProviderSelector %08x::\tSelectL() Unexpected selection preferences"),this));
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPPROVIDERSELECTOR_SELECTL_5, "ERROR: CPdpProviderSelector %08x::\tSelectL() Unexpected selection preferences",(TUint)this);
User::Panic(KPdpSelectorPanic,EUnExpectedSelectionPreferences);
}
@@ -126,7 +127,7 @@
// TPdpSelectorFactory::NewSelectorL - This fn matches a selector
MProviderSelector* TPdpSelectorFactory::NewSelectorL(const Meta::SMetaData& aSelectionPreferences)
{
- __CFLOG_VAR((KPdpTierMgrTag, KPdpTierMgrSubTag, _L8("CPdpMetaCprSelectorBase::\tNewL()")));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSELECTORFACTORY_NEWSELECTORL_1, "CPdpMetaCprSelectorBase::\tNewL()");
ASSERT(aSelectionPreferences.IsTypeOf(TSelectionPrefs::TypeId()));
CMDBSession* dbs = CMDBSession::NewLC(KCDVersion1_2);
CPdpProviderSelector* self = new (ELeave) CPdpProviderSelector(aSelectionPreferences);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,662 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_INTERNALS=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_CTOR_1=0x1a9
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DOCANCEL_1=0x1b2
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DOCANCEL_2=0x1b3
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DTOR_1=0x1aa
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_1=0x1d4
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_10=0x1dd
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_11=0x1de
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_12=0x1df
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_13=0x1e0
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_14=0x1e1
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_15=0x1e2
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_16=0x1e3
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_17=0x1e4
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_18=0x1e5
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_2=0x1d5
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_3=0x1d6
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_4=0x1d7
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_5=0x1d8
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_6=0x1d9
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_7=0x1da
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_8=0x1db
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_9=0x1dc
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_1=0x1b6
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_10=0x1bf
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_11=0x1c0
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_12=0x1c1
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_13=0x1c2
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_14=0x1c3
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_15=0x1c4
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_16=0x1c5
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_17=0x1c6
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_18=0x1c7
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_19=0x1c8
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_2=0x1b7
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_20=0x1c9
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_21=0x1ca
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_22=0x1cb
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_23=0x1cc
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_24=0x1cd
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_25=0x1ce
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_26=0x1cf
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_27=0x1d0
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_28=0x1d1
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_29=0x1d2
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_3=0x1b8
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_30=0x1d3
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_4=0x1b9
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_5=0x1ba
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_6=0x1bb
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_7=0x1bc
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_8=0x1bd
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_9=0x1be
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_1=0x1b4
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_2=0x1b5
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_1=0x1ab
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_2=0x1ac
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_3=0x1ad
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_1=0x1ae
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_2=0x1af
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_3=0x1b0
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_4=0x1b1
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CANCELALLPDPNOTIFICATIONS_1=0x1f2
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CANCELPDPNOTIFICATIONS_1=0x1f1
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CREATEPDPL_1=0x1ed
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CREATEPDPL_2=0x1ee
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CTOR_1=0x1e6
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_DTOR_1=0x1e8
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_DTOR_2=0x1e9
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_FREEPDP_1=0x1ef
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_INITL_1=0x1eb
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_INITL_2=0x1ec
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_NEWL_1=0x1e7
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_STARTPDPNOTIFICATIONS_1=0x1f0
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERNOTIFIER_RUNL_1=0x1f3
+[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEAPNNAMEL_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_1=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_2=0x6
+[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEAUTHENTICATIONINFOL_3=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEGPRSANONYMOUSACCESS_1=0x2
+[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEGPRSCOMPRESSION_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CGPRSPROVISION_RETRIEVEPDPTYPEL_1=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x1f8
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x1f9
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x1fa
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1fb
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x200
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x201
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x202
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x203
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_CANCELMESSAGE_1=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPAREBEARERRESULTBUNDLEL_1=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPARECOUNTBUNDLEL_1=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPAREMONITORRESULTBUNDLEL_1=0x19
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_PREPAREREMOVEALLBUNDLEL_1=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNERROR_1=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_1=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_2=0x10
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_3=0x11
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_4=0x12
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_5=0x13
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_6=0x14
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_7=0x15
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_8=0x16
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_RUNL_9=0x17
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSSERVICEREQUEST_UPDATEMONITORSERVICELISTL_1=0x18
+[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x1f4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x1f5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x1f6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x1f7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_1=0x292
+[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATE_2=0x293
+[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_1=0x294
+[TRACE]TRACE_INTERNALS[0x88]_CPDPDEFAULTSUBCONNECTIONPROVIDER_AUTHENTICATIONCOMPLETE_2=0x295
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_1=0x118
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_2=0x119
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_1=0x112
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_2=0x113
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DELETEFSMCONTEXT_1=0x11f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DELETEFSMCONTEXT_2=0x120
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DTOR_1=0x114
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DTOR_2=0x115
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_GETFSMCONTEXT_1=0x11a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_GETFSMCONTEXT_2=0x11b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_INITL_1=0x116
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_INITL_2=0x117
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_1=0x11c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_2=0x11d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_3=0x11e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWL_1=0x110
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWL_2=0x111
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CLOSE_1=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CLOSE_2=0x30
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_1=0x27
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_2=0x28
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_1=0x29
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_2=0x2a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET10_1=0x61
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET10_2=0x62
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET11_1=0x65
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET11_2=0x66
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET1_1=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET1_2=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET2_1=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET2_2=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET3_1=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET3_2=0x50
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET4_1=0x51
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET4_2=0x52
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET5_1=0x53
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET5_2=0x54
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET6_1=0x55
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET6_2=0x56
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET7_1=0x57
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET7_2=0x58
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET8_1=0x59
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET8_2=0x5a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET9_1=0x5b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET9_2=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_1=0x31
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_2=0x32
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_NEWL_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_NEWL_2=0x2c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_OPEN_1=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_OPEN_2=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET10_1=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET10_2=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET11_1=0x5f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET11_2=0x60
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET12_1=0x63
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET12_2=0x64
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET1_1=0x35
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET1_2=0x36
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET2_1=0x37
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET2_2=0x38
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET3_1=0x39
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET3_2=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET4_1=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET4_2=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET5_1=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET5_2=0x3e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET6_1=0x3f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET6_2=0x40
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET7_1=0x41
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET7_2=0x42
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET8_1=0x43
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET8_2=0x44
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET9_1=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET9_2=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_1=0x33
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_2=0x34
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_TSYNAME_1=0x5d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_TSYNAME_2=0x5e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_1=0xfc
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_2=0xfd
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_3=0xfe
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_4=0xff
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_1=0xc0
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_2=0xc1
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_3=0xc2
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_4=0xc3
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_1=0xd4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_2=0xd5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_3=0xd6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_4=0xd7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_1=0xdc
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_2=0xdd
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_3=0xde
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_4=0xdf
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_1=0xe0
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_2=0xe1
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_3=0xe2
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_4=0xe3
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_1=0xf0
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_2=0xf1
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_3=0xf2
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_4=0xf3
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_1=0x100
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_2=0x101
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_3=0x102
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_4=0x103
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_1=0xc8
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_2=0xc9
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_3=0xca
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_4=0xcb
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_1=0xf8
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_2=0xf9
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_3=0xfa
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_4=0xfb
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_1=0xbc
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_2=0xbd
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_3=0xbe
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_4=0xbf
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_1=0xc4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_2=0xc5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_3=0xc6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_4=0xc7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_1=0xe4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_2=0xe5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_3=0xe6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_4=0xe7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_1=0xb4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_2=0xb5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_3=0xb6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_4=0xb7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_1=0xe8
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_2=0xe9
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_3=0xea
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_4=0xeb
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_1=0xb8
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_2=0xb9
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_3=0xba
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_4=0xbb
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_1=0xd8
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_2=0xd9
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_3=0xda
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_4=0xdb
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_1=0xd0
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_2=0xd1
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_3=0xd2
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_4=0xd3
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_1=0xcc
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_2=0xcd
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_3=0xce
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_4=0xcf
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_1=0xf4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_2=0xf5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_3=0xf6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_4=0xf7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_1=0xec
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_2=0xed
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_3=0xee
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_4=0xef
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_1=0x67
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_2=0x68
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_3=0x69
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_1=0x6a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_2=0x6b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_3=0x6c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_1=0xae
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_2=0xaf
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_3=0xb0
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_1=0xab
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_2=0xac
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_3=0xad
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_1=0x10a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_2=0x10b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_3=0x10c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_1=0x75
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_2=0x76
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_3=0x77
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_1=0x78
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_2=0x79
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_3=0x7a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_1=0x7b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_2=0x7c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_3=0x7d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_1=0x7e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_2=0x7f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_3=0x80
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_1=0x81
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_2=0x82
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_3=0x83
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_1=0x84
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_2=0x85
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_3=0x86
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_1=0x87
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_2=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_3=0x89
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_1=0x8a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_2=0x8b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_3=0x8c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_1=0x104
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_2=0x105
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_3=0x106
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_1=0x72
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_2=0x73
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_3=0x74
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_1=0x6d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_2=0x6e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_3=0x6f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_4=0x70
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_5=0x71
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_1=0x107
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_2=0x108
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_3=0x109
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_1=0x10d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_2=0x10e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_3=0x10f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_1=0x90
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_2=0x91
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_3=0x92
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_1=0x93
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_2=0x94
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_3=0x95
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_1=0x96
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_2=0x97
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_3=0x98
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_1=0x99
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_2=0x9a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_3=0x9b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_1=0x9c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_2=0x9d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_3=0x9e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_1=0x9f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_2=0xa0
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_3=0xa1
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_1=0xa2
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_2=0xa3
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_3=0xa4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_1=0xa5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_2=0xa6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_3=0xa7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_1=0xa8
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_2=0xa9
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_3=0xaa
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_1=0x8d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_2=0x8e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_3=0x8f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_1=0xb1
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_2=0xb2
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_3=0xb3
+[TRACE]TRACE_INTERNALS[0x88]_CPDPMETACONNECTIONPROVIDERFACTORY_CTOR_1=0xc
+[TRACE]TRACE_INTERNALS[0x88]_CPDPMETACONNECTIONPROVIDERFACTORY_NEWL_1=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CPDPMETACONNECTIONPROVIDER_RECEIVEDL_1=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_1=0x21
+[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_2=0x22
+[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_3=0x23
+[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_4=0x24
+[TRACE]TRACE_INTERNALS[0x88]_CPDPPROVIDERSELECTOR_SELECTL_5=0x25
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x1fc
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x1fd
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x1fe
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x1ff
+[TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGERFACTORY_NEWL_1=0x20
+[TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGER_CONSTRUCTL_1=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPTIERMANAGER_DOCREATEPROVIDERSELECTORL_1=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_CPRIMARYCONTEXTSMONITOR_PROCESSERROR_1=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_CTOR_1=0x204
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DOCANCEL_1=0x208
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DTOR_1=0x205
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_1=0x209
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_2=0x20a
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x20b
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_1=0x206
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_2=0x207
+[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_DOCANCEL_1=0x20f
+[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_1=0x20c
+[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_2=0x20d
+[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_3=0x20e
+[TRACE]TRACE_INTERNALS[0x88]_CTSYPROVISION_INITIALISECONFIGL_1=0x9
+[TRACE]TRACE_INTERNALS[0x88]_GETPHONEINFOL_1=0x1ea
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELALLPDPNOTIFICATIONS_1=0x291
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELALLPDPS_1=0x290
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_1=0x28e
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_2=0x28f
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDP_1=0x28b
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDP_2=0x28c
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CLOSE_1=0x284
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CREATEPDPL_1=0x285
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CREATEPDPL_2=0x286
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DELETEPDP_1=0x287
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DELETEPDP_2=0x288
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DTOR_1=0x282
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_INPUT_1=0x289
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_INPUT_2=0x28a
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_OPENL_1=0x283
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_STARTPDPNOTIFICATIONS_1=0x28d
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_1=0x278
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_2=0x279
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_3=0x27a
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_4=0x27b
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_1=0x273
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_2=0x274
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_1=0x275
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_2=0x276
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_3=0x277
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_1=0x255
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_2=0x256
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_3=0x257
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_4=0x258
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5=0x259
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_1=0x24e
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_2=0x24f
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_1=0x250
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_2=0x251
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_3=0x252
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_4=0x253
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_5=0x254
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_1=0x24a
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_2=0x24b
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_3=0x24c
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_4=0x24d
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_1=0x242
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_2=0x243
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_3=0x244
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_4=0x245
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_5=0x246
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_6=0x247
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_1=0x248
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_2=0x249
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_1=0x21a
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_2=0x21b
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_3=0x21c
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_4=0x21d
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_1=0x216
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_2=0x217
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_1=0x218
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_2=0x219
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x224
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x225
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3=0x226
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_4=0x227
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_5=0x228
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1=0x21e
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2=0x21f
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3=0x220
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4=0x221
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x222
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x223
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x22e
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x22f
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1=0x229
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2=0x22a
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3=0x22b
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x22c
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x22d
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x270
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x271
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3=0x272
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1=0x26b
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2=0x26c
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3=0x26d
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x26e
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x26f
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_1=0x260
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_2=0x261
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_1=0x25a
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_2=0x25b
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_1=0x25c
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_2=0x25d
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_3=0x25e
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_4=0x25f
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_1=0x27f
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_2=0x280
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_3=0x281
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_1=0x27c
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_1=0x27d
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_2=0x27e
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_1=0x268
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_2=0x269
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_3=0x26a
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_1=0x262
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_2=0x263
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_1=0x264
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_2=0x265
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_3=0x266
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_4=0x267
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_1=0x214
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_2=0x215
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_1=0x210
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_2=0x211
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_1=0x212
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_2=0x213
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSELECTORFACTORY_NEWSELECTORL_1=0x26
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_1=0x12a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_2=0x12b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_3=0x12c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_4=0x12d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_5=0x12e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_6=0x12f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_1=0x130
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_2=0x131
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_3=0x132
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_4=0x133
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_5=0x134
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_6=0x135
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_7=0x136
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_1=0x137
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_2=0x138
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_3=0x139
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_4=0x13a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_5=0x13b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_6=0x13c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_1=0x13d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_2=0x13e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_3=0x13f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_4=0x140
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_5=0x141
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_1=0x142
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_2=0x143
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_3=0x144
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_4=0x145
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_5=0x146
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_1=0x147
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_2=0x148
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_3=0x149
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_4=0x14a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_5=0x14b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_6=0x14c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_7=0x14d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDMBMS_INPUT_1=0x154
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDMBMS_INPUT_2=0x155
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_1=0x14e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_2=0x14f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_3=0x150
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_4=0x151
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_5=0x152
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_6=0x153
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_1=0x15d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_2=0x15e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_3=0x15f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_4=0x160
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_5=0x161
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_6=0x162
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_7=0x163
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_8=0x164
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_1=0x165
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_2=0x166
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_3=0x167
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_5=0x168
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_6=0x169
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_7=0x16a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_1=0x156
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_2=0x157
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_3=0x158
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_4=0x159
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_5=0x15a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_6=0x15b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_7=0x15c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_1=0x16b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_2=0x16c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_3=0x16d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_4=0x16e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_5=0x16f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_6=0x170
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_7=0x171
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_8=0x172
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_1=0x173
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_2=0x174
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_3=0x175
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_4=0x176
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_5=0x177
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_6=0x178
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_7=0x179
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_1=0x17a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_2=0x17b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_3=0x17c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_4=0x17d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_5=0x17e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_1=0x18c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_2=0x18d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_3=0x18e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_4=0x18f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_5=0x190
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_6=0x191
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_1=0x17f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_10=0x188
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_11=0x189
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_12=0x18a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_13=0x18b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_2=0x180
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_3=0x181
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_4=0x182
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_5=0x183
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_6=0x184
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_7=0x185
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_8=0x186
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_9=0x187
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_1=0x192
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_2=0x193
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_3=0x194
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_4=0x195
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_5=0x196
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_1=0x197
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_2=0x198
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_3=0x199
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_4=0x19a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_5=0x19b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_1=0x19c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_2=0x19d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_3=0x19e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_4=0x19f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_5=0x1a0
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_6=0x1a1
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_7=0x1a2
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_8=0x1a3
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_1=0x1a4
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_2=0x1a5
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_3=0x1a6
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_4=0x1a7
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_5=0x1a8
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_CTOR_1=0x121
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_CTOR_2=0x122
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_ETELDRIVERCANCEL_1=0x128
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_ETELDRIVERINPUT_1=0x127
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_1=0x123
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_2=0x124
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_3=0x125
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_4=0x126
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_SPUDMANNOTIFY_1=0x129
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_1=0x234
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_2=0x235
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_1=0x230
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_2=0x231
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_1=0x232
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_2=0x233
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_1=0x23f
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_2=0x240
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_3=0x241
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_1=0x236
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_2=0x237
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_3=0x238
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_4=0x239
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_5=0x23a
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_6=0x23b
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_7=0x23c
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_1=0x23d
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_2=0x23e
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/PDPSCPRFSM.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,13 @@
*/
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "PDPSCPRFSMTraces.h"
+#endif
+
#include "PDPFSM.h"
#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
#include "PDPDeftSCPR.h"
@@ -36,13 +40,15 @@
iRefCount(1),
iUmtsRelease(TPacketDataConfigBase::KConfigGPRS)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_1, ">>CPdpFsmInterface::()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_2, "<<CPdpFsmInterface::()");
}
CPdpFsmInterface::~CPdpFsmInterface()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_1, ">>CPdpFsmInterface::()");
delete iPdpFsmFactory;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_2, "<<CPdpFsmInterface::()");
}
TContextId CPdpFsmInterface::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
@@ -68,11 +74,12 @@
*/
void CPdpFsmInterface::NewL(const TName& aTsyName, TInt aUmtsRelease)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWL_1, ">>CPdpFsmInterface::NewL()");
iUmtsRelease = aUmtsRelease;
iPdpFsmFactory = CPdpFsmFactory::NewL();
iPdpFsmFactory->InitL(aTsyName, this);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWL_2, "<<CPdpFsmInterface::NewL()");
}
/** request to open the FSM
@@ -81,15 +88,16 @@
*/
void CPdpFsmInterface::Open()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Open()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_1, ">>CPdpFsmInterface::Open()");
iRefCount++;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_2, "<<CPdpFsmInterface::Open()");
}
/** closes the FSM and frees underlying resources
*/
void CPdpFsmInterface::Close()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_1, ">>CPdpFsmInterface::Close()");
ASSERT( iRefCount > 0 );
if (--iRefCount == 0 )
{
@@ -99,7 +107,9 @@
}
delete this;
}
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_2, "<<CPdpFsmInterface::Close()");
}
+
/**
@@ -115,7 +125,7 @@
{
TInt ret = KErrNone;
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_1, ">>CPdpFsmInterface::Input(aParam)");
ASSERT(iPdpFsmFactory);
@@ -171,7 +181,7 @@
{
ret = KErrBadHandle;
}
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_2, "<<CPdpFsmInterface::Input(aParam)");
return ret;
}
@@ -187,12 +197,13 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR5Requested& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
return KErrNone;
}
@@ -205,12 +216,13 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR5Negotiated& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET1_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET1_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
return KErrNone;
}
@@ -226,12 +238,13 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR99_R4Requested& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET2_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId,aContextType)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET2_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
return KErrNone;
}
@@ -244,12 +257,13 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketQoS::TQoSR99_R4Negotiated& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET3_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId,aContextType)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET3_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
return KErrNone;
}
@@ -259,12 +273,13 @@
void CPdpFsmInterface::Set(const TContextId aPdpId,MPdpFsmEventHandler& aPdpFsmEventHandler)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET4_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aPdpFsmEventHandler);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET4_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
}
/** Set context parameters
@@ -275,12 +290,13 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const TTFTInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET5_1, ">>CPdpFsmInterface::Set(TFTInfo)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET5_2, "<<CPdpFsmInterface::Set(TFTInfo)");
return KErrNone;
}
@@ -292,12 +308,13 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const TTFTOperationCode& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET6_1, ">>CPdpFsmInterface::Set(TTFTOperationCode)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET6_2, "<<CPdpFsmInterface::Set(TTFTOperationCode)");
return KErrNone;
}
@@ -309,12 +326,13 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketContext::TDataChannelV2& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET7_1, ">>CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET7_2, "<<CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
return KErrNone;
}
@@ -326,12 +344,13 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketContext::TContextStatus& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET8_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET8_2, "<<CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
return KErrNone;
}
@@ -343,12 +362,13 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TPacketDataConfigBase& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TPacketDataConfigBase)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET9_1, ">>CPdpFsmInterface::Set(TPacketDataConfigBase)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET9_2, "<<CPdpFsmInterface::Set(TPacketDataConfigBase)");
return KErrNone;
}
@@ -358,11 +378,12 @@
*/
void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET10_1, ">>CPdpFsmInterface::Set(RPacketService::TStatus)");
ASSERT(iPdpFsmFactory);
iNetworkStatus = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET10_2, "<<CPdpFsmInterface::Set(RPacketService::TStatus)");
}
@@ -376,12 +397,13 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR5Requested& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
return KErrNone;
}
@@ -395,12 +417,13 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR5Negotiated& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET1_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET1_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
return KErrNone;
}
@@ -416,12 +439,13 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR99_R4Requested& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET2_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET2_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
return KErrNone;
}
@@ -435,12 +459,13 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketQoS::TQoSR99_R4Negotiated& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET3_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET3_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
return KErrNone;
}
@@ -457,12 +482,13 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,TTFTInfo& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET4_1, ">>CPdpFsmInterface::Get(TFTInfo)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET4_2, "<<CPdpFsmInterface::Get(TFTInfo)");
return KErrNone;
}
@@ -474,12 +500,13 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,TTFTOperationCode& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET5_1, ">>CPdpFsmInterface::Get(TFTInfo)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET5_2, "<<CPdpFsmInterface::Get(TFTInfo)");
return KErrNone;
}
@@ -493,12 +520,13 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketContext::TDataChannelV2& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET6_1, ">>CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET6_2, "<<CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
return KErrNone;
}
@@ -510,12 +538,13 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TPacketDataConfigBase& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TPacketDataConfigBase)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET7_1, ">>CPdpFsmInterface::Get(TPacketDataConfigBase)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET7_2, "<<CPdpFsmInterface::Get(TPacketDataConfigBase)");
return KErrNone;
}
@@ -527,12 +556,13 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketContext::TContextStatus& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET8_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
ASSERT(iPdpFsmFactory->HaveFsmContext(aPdpId));
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET8_2, "<<CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
return KErrNone;
}
@@ -544,11 +574,12 @@
*/
void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET9_1, ">>CPdpFsmInterface::Get(RPacketService::TStatus)");
ASSERT(iPdpFsmFactory);
aParam = iNetworkStatus;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET9_2, "<<CPdpFsmInterface::Get(RPacketService::TStatus)");
}
@@ -558,10 +589,10 @@
*/
const TName& CPdpFsmInterface::TsyName(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_1, ">>CPdpFsmInterface::TsyName");
ASSERT(iPdpFsmFactory);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_2, "<<CPdpFsmInterface::TsyName");
return iPdpFsmFactory->TsyName();
}
@@ -577,10 +608,11 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketMbmsContext::TContextConfigMbmsV1& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}
@@ -592,10 +624,11 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketMbmsContext::TContextConfigMbmsV1& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET10_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET10_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}
@@ -607,10 +640,11 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TSessionOperatioInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET12_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET12_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}
@@ -623,10 +657,11 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TSessionOperatioInfo& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsm.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -17,10 +17,16 @@
//
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpdpfsmTraces.h"
+#endif
+
#include "tpdpstates.h"
#include "cpdpfsm.h"
#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
#include "eteldrivernmspace.h"
@@ -59,8 +65,8 @@
// NOTE: Both pointers are valid when called - see CPdpFsmFactory and CPdpFsmInterface.
// No other caller is expected.
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::CPdpFsm()");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CTOR_1, ">>CPdpFsm::CPdpFsm()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CTOR_2, "Pdp ID %d",iPdpId);
// save for later
iPdpId = aPdpId;
@@ -72,30 +78,33 @@
// we need a state
iState = &iPdpFsmFactory->iStateInitialised;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CTOR_3, "<<CPdpFsm::CPdpFsm()");
}
CPdpFsm::~CPdpFsm()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::~CPdpFsm()");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_DTOR_1, ">>CPdpFsm::~CPdpFsm()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_DTOR_2, "Pdp ID %d",iPdpId);
iContextConfig.Close();
iEtelDriverInput->DeletePdp(iPdpId);
iSessionInfo.iSessionIds.Close();
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_DTOR_3, "<<CPdpFsm::~CPdpFsm()");
}
TInt CPdpFsm::Input (const TInt aOperation, const TInt aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Input()");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_1, ">>CPdpFsm::Input()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_2, "Pdp ID %d",iPdpId);
-#ifdef _DEBUG // NOT DEBUGRELEASE
- SPUDFSMVERBOSE_LOG1(_L("State : %S"), &iState->iName);
-#endif
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_3, "State : %S", iState->iName);
+
- SPUDFSM_LOG3(_L("Pdp ID %d, State '%S', Operation '%S'"),iPdpId, &iState->iName, iState->LogOperation(*this, aOperation));
-
+ OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_4, "Pdp ID %d, State '%S', Operation '%S'",iPdpId, iState->iName, *iState->LogOperation(*this, aOperation));
+#endif
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_INPUT_5, "<<CPdpFsm::Input()");
return iState->Input (*this, aOperation, aParam);
}
@@ -103,20 +112,22 @@
#ifdef SYMBIAN_NETWORKING_UMTSR5
void CPdpFsm::Get(RPacketQoS::TQoSR5Requested& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSR5Req)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET_1, ">>CPdpFsm::Get(QoSR5Req)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET_2, "Pdp ID %d",iPdpId);
ASSERT(iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5);
aParam = iQosRequested.RequestedQoSR5();
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET_3, "<<CPdpFsm::Get(QoSR5Req)");
}
void CPdpFsm::Get(RPacketQoS::TQoSR5Negotiated& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSR5Neg)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET1_1, ">>CPdpFsm::Get(QoSR5Neg)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET1_2, "Pdp ID %d",iPdpId);
ASSERT(iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5);
aParam = iQosNegotiated.NegotiatedQoSR5();
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET1_3, "<<CPdpFsm::Get(QoSR5Neg)");
}
#else
@@ -124,18 +135,20 @@
void CPdpFsm::Get(RPacketQoS::TQoSR99_R4Requested& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QosReq)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET2_1, ">>CPdpFsm::Get(QosReq)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET2_2, "Pdp ID %d",iPdpId);
aParam = iQosRequested.RequestedQoSR99_R4();
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET2_3, "<<CPdpFsm::Get(QosReq)");
}
void CPdpFsm::Get(RPacketQoS::TQoSR99_R4Negotiated& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(QoSNeg)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET3_1, ">>CPdpFsm::Get(QoSNeg)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET3_2, "Pdp ID %d",iPdpId);
aParam = iQosNegotiated.NegotiatedQoSR99_R4();
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET3_3, "<<CPdpFsm::Get(QoSNeg)");
}
#endif
@@ -144,32 +157,35 @@
void CPdpFsm::Get(TTFTInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TFTInfo)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET4_1, ">>CPdpFsm::Get(TFTInfo)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET4_2, "Pdp ID %d",iPdpId);
aParam = iTFT;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET4_3, "<<CPdpFsm::Get(TFTInfo)");
}
void CPdpFsm::Get(TTFTOperationCode& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TFTOperationCode)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET5_1, ">>CPdpFsm::Get(TFTOperationCode)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET5_2, "Pdp ID %d",iPdpId);
aParam = iTFTOperationCode;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET5_3, "<<CPdpFsm::Get(TFTOperationCode)");
}
void CPdpFsm::Get(RPacketContext::TDataChannelV2& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TDataChannelV2)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET6_1, ">>CPdpFsm::Get(RPacketContext::TDataChannelV2)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET6_2, "Pdp ID %d",iPdpId);
aParam = iDataChannelV2;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET6_3, "<<CPdpFsm::Get(RPacketContext::TDataChannelV2)");
}
void CPdpFsm::Get(TPacketDataConfigBase& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(TPacketDataConfigBase)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET7_1, ">>CPdpFsm::Get(TPacketDataConfigBase)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET7_2, "Pdp ID %d",iPdpId);
TInt rel = GetContextConfigAs<TPacketDataConfigBase>().ExtensionId();
if (rel == 0)
@@ -192,32 +208,36 @@
Mem::Copy(&aParam, const_cast<TUint8*>(iContextConfig.Ptr()), sizeof(RPacketContext::TContextConfig_R5));
break;
}
- }
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET7_3, "<<CPdpFsm::Get(TPacketDataConfigBase)");
+ }
void CPdpFsm::Get(RPacketContext::TContextStatus& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketContext::TContextStatus)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET8_1, ">>CPdpFsm::Get(RPacketContext::TContextStatus)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET8_2, "Pdp ID %d",iPdpId);
aParam = iContextStatus;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET8_3, "<<CPdpFsm::Get(RPacketContext::TContextStatus)");
}
#ifdef SYMBIAN_NETWORKING_UMTSR5
void CPdpFsm::Set(const RPacketQoS::TQoSR5Requested& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSR5Req)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET_1, ">>CPdpFsm::Set(QoSR5Req)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET_2, "Pdp ID %d",iPdpId);
iQosRequested = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET_3, "<<CPdpFsm::Set(QoSR5Req)");
}
void CPdpFsm::Set(const RPacketQoS::TQoSR5Negotiated& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSR5Neg)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET1_1, ">>CPdpFsm::Set(QoSR5Neg)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET1_2, "Pdp ID %d",iPdpId);
iQosNegotiated = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET1_3, "<<CPdpFsm::Set(QoSR5Neg)");
}
#else
@@ -226,20 +246,22 @@
void CPdpFsm::Set(const RPacketQoS::TQoSR99_R4Requested& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSReq)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET2_1, ">>CPdpFsm::Set(QoSReq)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET2_2, "Pdp ID %d",iPdpId);
iQosRequested = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET2_3, "<<CPdpFsm::Set(QoSReq)");
}
void CPdpFsm::Set(const RPacketQoS::TQoSR99_R4Negotiated& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(QoSNeg)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET3_1, ">>CPdpFsm::Set(QoSNeg)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET3_2, "Pdp ID %d",iPdpId);
iQosNegotiated = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET3_3, "<<CPdpFsm::Set(QoSNeg)");
}
@@ -249,40 +271,44 @@
void CPdpFsm::Set(const TTFTInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(TFT)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET4_1, ">>CPdpFsm::Set(TFT)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET4_2, "Pdp ID %d",iPdpId);
iTFT = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET4_3, "<<CPdpFsm::Set(TFT)");
}
void CPdpFsm::Set(const TTFTOperationCode& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(TFTOperationCode)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET5_1, ">>CPdpFsm::Set(TFTOperationCode)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET5_2, "Pdp ID %d",iPdpId);
iTFTOperationCode = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET5_3, "<<CPdpFsm::Set(TFTOperationCode)");
}
void CPdpFsm::Set(const RPacketContext::TDataChannelV2& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TDataChannelV2)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET6_1, ">>CPdpFsm::Set(RPacketContext::TDataChannelV2)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET6_2, "Pdp ID %d",iPdpId);
iDataChannelV2 = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET6_3, "<<CPdpFsm::Set(RPacketContext::TDataChannelV2)");
}
void CPdpFsm::Set(const RPacketContext::TContextStatus& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TContextStatus)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET7_1, ">>CPdpFsm::Set(RPacketContext::TContextStatus)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET7_2, "Pdp ID %d",iPdpId);
iContextStatus = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET7_3, "<<CPdpFsm::Set(RPacketContext::TContextStatus)");
}
void CPdpFsm::Set(const TPacketDataConfigBase& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(RPacketContext::TContextConfigGPRS)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET8_1, ">>CPdpFsm::Set(RPacketContext::TContextConfigGPRS)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET8_2, "Pdp ID %d",iPdpId);
switch ((const_cast<TPacketDataConfigBase&>(aParam)).ExtensionId())
{
@@ -298,47 +324,52 @@
Mem::Copy(const_cast<TUint8*>(iContextConfig.Ptr()), &aParam, sizeof(RPacketContext::TContextConfig_R5));
break;
}
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET8_3, "<<CPdpFsm::Set(RPacketContext::TContextConfigGPRS)");
}
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
void CPdpFsm::Set(MPdpFsmEventHandler& aPdpFsmEventHandler)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Set(MPdpFsmEventHandler&)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET9_1, ">>CPdpFsm::Set(MPdpFsmEventHandler&)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET9_2, "Pdp ID %d",iPdpId);
if (iPdpFsmEventHandler)
{
iPdpFsmEventHandler->Event(KContextDeleteEvent, KErrAbort);
}
iPdpFsmEventHandler = &aPdpFsmEventHandler;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET9_3, "<<CPdpFsm::Set(MPdpFsmEventHandler&)");
}
#endif
void CPdpFsm::EtelInput (EtelDriver::TEtelInput aOperation)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::EtelInput");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELINPUT_1, ">>CPdpFsm::EtelInput");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELINPUT_2, "Pdp ID %d",iPdpId);
iEtelDriverInput->Input (iPdpId, aOperation);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELINPUT_3, "<<CPdpFsm::EtelInput");
}
void CPdpFsm::EtelCancel (void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::EtelCancel");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELCANCEL_1, ">>CPdpFsm::EtelCancel");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELCANCEL_2, "Pdp ID %d",iPdpId);
iEtelDriverInput->CancelPdp (iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_ETELCANCEL_3, "<<CPdpFsm::EtelCancel");
}
void CPdpFsm::SpudInput (TInt aNotification, TInt aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::SpudInput");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SPUDINPUT_1, ">>CPdpFsm::SpudInput");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SPUDINPUT_2, "Pdp ID %d",iPdpId);
#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
iPdpFsmFactory->SpudInput (iPdpId, aNotification, aParam);
#else
ASSERT(iPdpFsmEventHandler);
iPdpFsmEventHandler->Event(aNotification, aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SPUDINPUT_3, "<<CPdpFsm::SpudInput");
#endif
}
@@ -346,221 +377,245 @@
void CPdpFsm::ChangeStateToInitialised(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToInitialised");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : Initialised"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOINITIALISED_1, ">>CPdpFsm::ChangeStateToInitialised");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOINITIALISED_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOINITIALISED_3, "New State : Initialised");
iState = &iPdpFsmFactory->iStateInitialised;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOINITIALISED_4, "<<CPdpFsm::ChangeStateToInitialised");
}
void CPdpFsm::ChangeStateToOpeningPhone(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToOpeningPhone");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : OpeningPhone"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPENINGPHONE_1, ">>CPdpFsm::ChangeStateToOpeningPhone");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPENINGPHONE_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPENINGPHONE_3, "New State : OpeningPhone");
iState = &iPdpFsmFactory->iStateOpeningPhone;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPENINGPHONE_4, "<<CPdpFsm::ChangeStateToOpeningPhone");
}
void CPdpFsm::ChangeStateToCreatingPrimary(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingPrimary");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : CreatingPrimary"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGPRIMARY_1, ">>CPdpFsm::ChangeStateToCreatingPrimary");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGPRIMARY_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGPRIMARY_3, "New State : CreatingPrimary");
iState = &iPdpFsmFactory->iStateCreatingPrimary;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGPRIMARY_4, "<<CPdpFsm::ChangeStateToCreatingPrimary");
}
void CPdpFsm::ChangeStateToActivatingPrimary(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingPrimary");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : ActivatingPrimary"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_1, ">>CPdpFsm::ChangeStateToActivatingPrimary");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_3, "New State : ActivatingPrimary");
iState = &iPdpFsmFactory->iStateActivatingPrimary;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_4, "<<CPdpFsm::ChangeStateToActivatingPrimary");
}
void CPdpFsm::ChangeStateToCreatingSecondary(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingSecondary");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : CreatingSecondary"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGSECONDARY_1, ">>CPdpFsm::ChangeStateToCreatingSecondary");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGSECONDARY_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGSECONDARY_3, "New State : CreatingSecondary");
iState = &iPdpFsmFactory->iStateCreatingSecondary;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGSECONDARY_4, "<<CPdpFsm::ChangeStateToCreatingSecondary");
}
void CPdpFsm::ChangeStateToCreatedSecondary(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatedSecondary");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : CreatedSecondary"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDSECONDARY_1, ">>CPdpFsm::ChangeStateToCreatedSecondary");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDSECONDARY_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDSECONDARY_3, "New State : CreatedSecondary");
iState = &iPdpFsmFactory->iStateCreatedSecondary;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDSECONDARY_4, "<<CPdpFsm::ChangeStateToCreatedSecondary");
}
void CPdpFsm::ChangeStateToSettingTFT(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSettingTFT");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : SettingTFT"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGTFT_1, ">>CPdpFsm::ChangeStateToSettingTFT");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGTFT_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGTFT_3, "New State : SettingTFT");
iState = &iPdpFsmFactory->iStateSettingTFT;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGTFT_4, "<<CPdpFsm::ChangeStateToSettingTFT");
}
void CPdpFsm::ChangeStateToSettingQoS(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSettingQoS");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : SettingQoS"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGQOS_1, ">>CPdpFsm::ChangeStateToSettingQoS");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGQOS_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGQOS_3, "New State : SettingQoS");
iState = &iPdpFsmFactory->iStateSettingQoS;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSETTINGQOS_4, "<<CPdpFsm::ChangeStateToSettingQoS");
}
void CPdpFsm::ChangeStateToActivatingSecondary(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingSecondary");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : ActivatingSecondary"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_1, ">>CPdpFsm::ChangeStateToActivatingSecondary");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_3, "New State : ActivatingSecondary");
iState = &iPdpFsmFactory->iStateActivatingSecondary;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_4, "<<CPdpFsm::ChangeStateToActivatingSecondary");
}
void CPdpFsm::ChangeStateToOpen(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToOpen");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : Open"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPEN_1, ">>CPdpFsm::ChangeStateToOpen");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPEN_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPEN_3, "New State : Open");
iState = &iPdpFsmFactory->iStateOpen;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOOPEN_4, "<<CPdpFsm::ChangeStateToOpen");
}
void CPdpFsm::ChangeStateToChangingQoS(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToChangingQoS");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : ChangingQoS"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGQOS_1, ">>CPdpFsm::ChangeStateToChangingQoS");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGQOS_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGQOS_3, "New State : ChangingQoS");
iState = &iPdpFsmFactory->iStateChangingQoS;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGQOS_4, "<<CPdpFsm::ChangeStateToChangingQoS");
}
void CPdpFsm::ChangeStateToChangingTFT(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToChangingTFT");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : ChangingTFT"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGTFT_1, ">>CPdpFsm::ChangeStateToChangingTFT");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGTFT_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGTFT_3, "New State : ChangingTFT");
iState = &iPdpFsmFactory->iStateChangingTFT;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCHANGINGTFT_4, "<<CPdpFsm::ChangeStateToChangingTFT");
}
void CPdpFsm::ChangeStateToGettingNegQoS(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToGettingNegQoS");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : GettingNegQoS"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOGETTINGNEGQOS_1, ">>CPdpFsm::ChangeStateToGettingNegQoS");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOGETTINGNEGQOS_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOGETTINGNEGQOS_3, "New State : GettingNegQoS");
iState = &iPdpFsmFactory->iStateGettingNegQoS;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOGETTINGNEGQOS_4, "<<CPdpFsm::ChangeStateToGettingNegQoS");
}
void CPdpFsm::ChangeStateToModifingActive(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToModifingActive");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : ModifingActive"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOMODIFINGACTIVE_1, ">>CPdpFsm::ChangeStateToModifingActive");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOMODIFINGACTIVE_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOMODIFINGACTIVE_3, "New State : ModifingActive");
iState = &iPdpFsmFactory->iStateModifyingActive;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOMODIFINGACTIVE_4, "<<CPdpFsm::ChangeStateToModifingActive");
}
void CPdpFsm::ChangeStateToSuspended(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToSuspended");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : Suspended"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSUSPENDED_1, ">>CPdpFsm::ChangeStateToSuspended");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSUSPENDED_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSUSPENDED_3, "New State : Suspended");
iState = &iPdpFsmFactory->iStateSuspended;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSUSPENDED_4, "<<CPdpFsm::ChangeStateToSuspended");
}
void CPdpFsm::ChangeStateToClosing(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToClosing");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : Closing"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCLOSING_1, ">>CPdpFsm::ChangeStateToClosing");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCLOSING_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCLOSING_3, "New State : Closing");
iState = &iPdpFsmFactory->iStateClosing;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCLOSING_4, "<<CPdpFsm::ChangeStateToClosing");
}
void CPdpFsm::ChangeStateToStopping(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToStopping");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : Stopping"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSTOPPING_1, ">>CPdpFsm::ChangeStateToStopping");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSTOPPING_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSTOPPING_3, "New State : Stopping");
iState = &iPdpFsmFactory->iStateStopping;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOSTOPPING_4, "<<CPdpFsm::ChangeStateToStopping");
}
void CPdpFsm::ChangeStateToCreatingMbms(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingMbms");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : Creating"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGMBMS_1, ">>CPdpFsm::ChangeStateToCreatingMbms");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGMBMS_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGMBMS_3, "New State : Creating");
iState = &iPdpFsmFactory->iStateCreatingMbms;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATINGMBMS_4, "<<CPdpFsm::ChangeStateToCreatingMbms");
}
void CPdpFsm::ChangeStateToActivatingMbms(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToActivatingMbms");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : Activating"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGMBMS_1, ">>CPdpFsm::ChangeStateToActivatingMbms");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGMBMS_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGMBMS_3, "New State : Activating");
- iState = &iPdpFsmFactory->iStateActivatingMbms;
+ iState = &iPdpFsmFactory->iStateActivatingMbms;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOACTIVATINGMBMS_4, "<<CPdpFsm::ChangeStateToActivatingMbms");
}
void CPdpFsm::ChangeStateToCreatedMbms(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::ChangeStateToCreatingMbms");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
- SPUDFSM_LOG(_L("New State : Created"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDMBMS_1, ">>CPdpFsm::ChangeStateToCreatingMbms");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDMBMS_2, "Pdp ID %d",iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDMBMS_3, "New State : Created");
- iState = &iPdpFsmFactory->iStateCreatedMbms;
+ iState = &iPdpFsmFactory->iStateCreatedMbms;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_CHANGESTATETOCREATEDMBMS_4, "<<CPdpFsm::ChangeStateToCreatingMbms");
}
void CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET9_1, ">>CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET9_2, "Pdp ID %d",iPdpId);
aParam = iMbms;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET9_3, "<<CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
}
void CPdpFsm::Set(const RPacketMbmsContext::TContextConfigMbmsV1& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET10_1, ">>CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET10_2, "Pdp ID %d",iPdpId);
iMbms = aParam ;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET10_3, "<<CPdpFsm::Get(RPacketMbmsContext::TContextConfigMbmsV1)");
}
void CPdpFsm::Get(TSessionOperatioInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(Session)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET10_1, ">>CPdpFsm::Get(Session)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET10_2, "Pdp ID %d",iPdpId);
aParam = iSessionInfo;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_GET10_3, "<<CPdpFsm::Get(Session)");
}
void CPdpFsm::Set(const TSessionOperatioInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsm::Get(Session)");
- SPUDFSMVERBOSE_LOG1(_L("Pdp ID %d"),iPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET11_1, ">>CPdpFsm::Get(Session)");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET11_2, "Pdp ID %d",iPdpId);
iSessionInfo = aParam ;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSM_SET11_3, "<<CPdpFsm::Get(Session)");
}
void CPdpFsm::InitialiseContextConfig(TUint32 aConfigRel)
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsmfactory.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsmfactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,14 +20,20 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpdpfsmfactoryTraces.h"
+#endif
+
#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
// NewL
CPdpFsmFactory* CPdpFsmFactory::NewL ()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewL()");
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWL_1, ">>CPdpFsmFactory::NewL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWL_2, "<<CPdpFsmFactory::NewL()");
return new (ELeave) CPdpFsmFactory ();
}
@@ -64,24 +70,26 @@
iStateActivatingMbms(this),
iStateCreatedMbms(this)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::CPdpFsmFactory()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CTOR_1, ">>CPdpFsmFactory::CPdpFsmFactory()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CTOR_2, "<<CPdpFsmFactory::CPdpFsmFactory()");
}
CPdpFsmFactory::~CPdpFsmFactory()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::~CPdpFsmFactory()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DTOR_1, ">>CPdpFsmFactory::~CPdpFsmFactory()");
iContexts.DeleteAll();
iContexts.Reset();
delete iEtelDriverInput;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DTOR_2, "<<CPdpFsmFactory::~CPdpFsmFactory()");
}
void CPdpFsmFactory::InitL(const TName& aTsyName, CPdpFsmInterface * aPdpFsmInterface)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::InitL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_INITL_1, ">>CPdpFsmFactory::InitL()");
iPdpFsmInterface = aPdpFsmInterface;
@@ -92,20 +100,21 @@
iEtelDriverInput = new (ELeave) REtelDriverInput;
iEtelDriverInput->OpenL (*iPdpFsmInterface);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_INITL_2, "<<CPdpFsmFactory::InitL()");
// Only create PDP contexts if specifically requested.
}
void CPdpFsmFactory::Close (void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::Close()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CLOSE_1, ">>CPdpFsmFactory::Close()");
// in OOM conditions iEtelDriveInput may not have successfully
// been created, check here for safety.
if (iEtelDriverInput != NULL)
{
iEtelDriverInput->Close();
}
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CLOSE_2, "<<CPdpFsmFactory::Close()");
}
@@ -114,8 +123,8 @@
*/
CPdpFsm* CPdpFsmFactory::GetFsmContext (TContextId aPdpId)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::GetContext()");
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_GETFSMCONTEXT_1, ">>CPdpFsmFactory::GetContext()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_GETFSMCONTEXT_2, "<<CPdpFsmFactory::GetContext()");
return iContexts[aPdpId];
}
@@ -131,7 +140,7 @@
TContextId CPdpFsmFactory::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
#endif
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::NewFsmContext()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_1, ">>CPdpFsmFactory::NewFsmContext()");
#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
TInt ret = KErrNone;
@@ -145,6 +154,7 @@
iContexts[aPdpId] = p;
);
}
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_2, "<<CPdpFsmFactory::NewFsmContext()");
return ret;
#else
TInt i=0;
@@ -158,18 +168,19 @@
iContexts[i] = p;
iEtelDriverInput->CreatePdpL(i, aContextType);
}
- return i;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_3, "<<CPdpFsmFactory::NewFsmContext()");
+ return i;
#endif
}
TInt CPdpFsmFactory::DeleteFsmContext(TContextId aPdpId)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmFactory::DeleteFsmContext()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DELETEFSMCONTEXT_1, ">>CPdpFsmFactory::DeleteFsmContext()");
ASSERT(ContextIsValid(aPdpId));
delete iContexts[aPdpId];
iContexts[aPdpId] = NULL;
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DELETEFSMCONTEXT_2, "<<CPdpFsmFactory::DeleteFsmContext()");
return KErrNone;
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/spudfsmdebuglogger.h Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +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:
-// SpudFsm Data and Event Logger header
-//
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef SPUDFSMDEBUGLOGGER_H
-#define SPUDFSMDEBUGLOGGER_H
-
-#include "comms-infras/commsdebugutility.h"
-
-#ifdef __FLOG_ACTIVE
-
-#include <e32base.h>
-
-_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
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstate.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstate.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -22,10 +22,16 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstateTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include "cpdpfsmfactory.h"
#include "tpdpstate.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "reteldriverinput.h"
#include "PDPFSM.h"
@@ -88,17 +94,18 @@
TPdpState::TPdpState()
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
: iName()
#endif
{
- SPUDFSMVERBOSE_FNLOG("TPdpState::TPdpState()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_CTOR_1, ">>TPdpState::TPdpState()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_CTOR_2, "<<TPdpState::TPdpState()");
}
TInt TPdpState::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt /*aErrorCode*/)
{
- SPUDFSMVERBOSE_FNLOG("TPdpState::Input()");
- SPUDFSMVERBOSE_LOG1(_L("aOperation : %d"), aOperation);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_INPUT_1, ">>TPdpState::Input()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_INPUT_2, "aOperation : %d", aOperation);
if (aOperation == PdpFsm::EContextDeleted || aOperation == SpudMan::EContextDelete ||
(aOperation == PdpFsm::EContextStatusChangeNetwork && aFsm.iContextStatus == RPacketContext::EStatusDeleted))
@@ -109,25 +116,26 @@
return KErrNone;
}
- SPUDFSMVERBOSE_LOG1(_L("!!! Unhandled Operation (%S)!!!"), LogOperation (aFsm, aOperation));
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_INPUT_3, "!!! Unhandled Operation (%S)!!!", *(LogOperation (aFsm, aOperation)));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_INPUT_4, "<<TPdpState::Input()");
return KErrGeneral;
}
void TPdpState::EtelDriverInput (CPdpFsm& aFsm, EtelDriver::TEtelInput aOperation)
{
- SPUDFSMVERBOSE_LOG1(_L("EtelDriverInput : %d"), aOperation);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_ETELDRIVERINPUT_1, "EtelDriverInput : %d", aOperation);
aFsm.EtelInput (aOperation);
}
void TPdpState::EtelDriverCancel (CPdpFsm& aFsm)
{
- SPUDFSMVERBOSE_LOG(_L("EtelDriverCancel"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_ETELDRIVERCANCEL_1, "EtelDriverCancel");
aFsm.EtelCancel();
}
void TPdpState::SpudManNotify (CPdpFsm& aFsm, TInt aNotification, TInt aParam)
{
- SPUDFSMVERBOSE_LOG1(_L("SpudManNotify : %d"), aNotification);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATE_SPUDMANNOTIFY_1, "SpudManNotify : %d", aNotification);
aFsm.SpudInput (aNotification, aParam);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstate.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstate.h Fri Jun 11 14:49:29 2010 +0300
@@ -31,6 +31,7 @@
#include "pdpfsmnmspace.h"
+
class CPdpFsm;
//class REtelDriverInput;
class CPdpFsmFactory;
@@ -53,8 +54,10 @@
void SpudManNotify (CPdpFsm& aFsm, TInt aNotification, TInt aParam);
public:
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
TBuf<100> iName;
+#else
+ TBuf<1> iName;
#endif
protected:
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingmbms.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingmbms.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,16 +20,22 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstateactivatingmbmsTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "cpdpfsm.h"
TInt TPdpStateActivatingMbms::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
{
- SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingMbms::Input()");
- SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_1, ">>TPdpStateActivatingMbms::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
@@ -39,15 +45,18 @@
aFsm.Set(RPacketContext::EStatusActive);
aFsm.ChangeStateToCreatedMbms();//there is no Qos to be set
SpudManNotify (aFsm, KContextActivateEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_3, "<<TPdpStateActivatingMbms::Input()");
return KErrNone;
case PdpFsm::EPdpActivatedFailed:
- SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_4, "*** FAILURE ***");
aFsm.ChangeStateToCreatedMbms();
SpudManNotify (aFsm, KContextActivateEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_5, "<<TPdpStateActivatingMbms::Input()");
return KErrNone;
// no default
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGMBMS_INPUT_6, "<<TPdpStateActivatingMbms::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingprimary.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingprimary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,17 +20,23 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstateactivatingprimaryTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_1, ">>TPdpStateActivatingPrimary::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_2, "aOperation : %S(%d)", *LogOperation(aFsm, aOperation), aOperation);
switch (aOperation)
{
@@ -40,23 +46,27 @@
aFsm.Set(RPacketContext::EStatusActive);
aFsm.ChangeStateToOpen();
SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_3, "<<TPdpStateActivatingPrimary::Input()");
return KErrNone;
case PdpFsm::EPdpActivatedFailed:
- SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_4, "*** FAILURE ***");
aFsm.ChangeStateToClosing();
SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode);
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_5, "<<TPdpStateActivatingPrimary::Input()");
return KErrNone;
case SpudMan::ECancelContextCreate:
aFsm.ChangeStateToStopping();
EtelDriverCancel(aFsm);
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_6, "<<TPdpStateActivatingPrimary::Input()");
return KErrNone;
// no default
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGPRIMARY_INPUT_7, "<<TPdpStateActivatingPrimary::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingsecondary.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingsecondary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,16 +20,22 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstateactivatingsecondaryTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_1, ">>TPdpStateActivatingSecondary::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
@@ -40,16 +46,19 @@
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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_3, "<<TPdpStateActivatingSecondary::Input()");
return KErrNone;
case PdpFsm::EPdpActivatedFailed:
- SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_4, "*** FAILURE ***");
aFsm.ChangeStateToCreatedSecondary();
SpudManNotify (aFsm, KContextActivateEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_5, "<<TPdpStateActivatingSecondary::Input()");
return KErrNone;
// no default
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEACTIVATINGSECONDARY_INPUT_6, "<<TPdpStateActivatingSecondary::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatechangingqos.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatechangingqos.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,32 +20,41 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatechangingqosTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_1, ">>TPdpStateChangingQoS::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::EQoSSet:
aFsm.ChangeStateToOpen();
SpudManNotify (aFsm, KContextQoSSetEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_3, "<<TPdpStateChangingQoS::Input()");
return KErrNone;
case PdpFsm::EQoSSetFailed:
aFsm.ChangeStateToOpen();
SpudManNotify (aFsm, KContextQoSSetEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_4, "<<TPdpStateChangingQoS::Input()");
return KErrNone;
// no default
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGQOS_INPUT_5, "<<TPdpStateChangingQoS::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatechangingtft.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatechangingtft.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,32 +20,41 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatechangingtftTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_1, ">>TPdpStateChangingTFT::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::ETftChanged:
aFsm.ChangeStateToOpen();
SpudManNotify (aFsm, KContextTFTModifiedEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_3, "<<TPdpStateChangingTFT::Input()");
return KErrNone;
case PdpFsm::ETftChangedFailed:
aFsm.ChangeStateToOpen();
SpudManNotify (aFsm, KContextTFTModifiedEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_4, "<<TPdpStateChangingTFT::Input()");
return KErrNone;
// no default
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECHANGINGTFT_INPUT_5, "<<TPdpStateChangingTFT::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateclosing.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateclosing.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,39 +20,49 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstateclosingTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_1, "<<TPdpStateClosing::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::EContextDeleted:
aFsm.ChangeStateToInitialised();
SpudManNotify (aFsm, KContextDeleteEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_3, ">>TPdpStateClosing::Input()");
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 ****"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_4, "**** DELETE FAILURE ****");
aFsm.ChangeStateToInitialised();
SpudManNotify (aFsm, KContextDeleteEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_5, ">>TPdpStateClosing::Input()");
return KErrNone;
case SpudMan::EContextDelete:
// already doing this and don't want default action
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_6, ">>TPdpStateClosing::Input()");
return KErrInUse;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECLOSING_INPUT_7, ">>TPdpStateClosing::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatedSecondary.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatedSecondary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +20,15 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatecreatedSecondaryTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "pdpfsmnmspace.h"
#include "PDPFSM.h"
@@ -30,26 +36,30 @@
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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_1, ">>TPdpStateCreatedSecondary::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case SpudMan::EContextActivate:
aFsm.ChangeStateToActivatingSecondary();
EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_3, "<<TPdpStateCreatedSecondary::Input()");
return KErrNone;
case SpudMan::EContextQoSSet:
aFsm.ChangeStateToSettingQoS();
EtelDriverInput(aFsm, EtelDriver::ESetQoS);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_4, "<<TPdpStateCreatedSecondary::Input()");
return KErrNone;
case SpudMan::EContextTFTModify:
aFsm.ChangeStateToSettingTFT();
EtelDriverInput(aFsm, EtelDriver::ESetTft);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_5, "<<TPdpStateCreatedSecondary::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDSECONDARY_INPUT_6, "<<TPdpStateCreatedSecondary::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatedmbms.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatedmbms.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +20,15 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatecreatedmbmsTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "pdpfsmnmspace.h"
#include "PDPFSM.h"
@@ -33,8 +39,8 @@
TInt TPdpStateCreatedMbms::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
{
- SPUDFSMVERBOSE_FNLOG("TPdpStateCreatedMbms::Input()");
- SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDMBMS_INPUT_1, "TPdpStateCreatedMbms::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATEDMBMS_INPUT_2, "aOperation : %S(%d)", *LogOperation(aFsm, aOperation), aOperation);
switch (aOperation)
{
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingSecondary.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingSecondary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,40 +20,50 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatecreatingSecondaryTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_1, ">>TPdpStateCreatingSecondary::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::E2ryPdpContextCreated:
aFsm.ChangeStateToCreatedSecondary();
SpudManNotify(aFsm, KSecondaryContextCreated, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_3, "<<TPdpStateCreatingSecondary::Input()");
return KErrNone;
case PdpFsm::E2ryPdpContextCreatedFailed:
iErrorCode = aErrorCode;
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_4, "<<TPdpStateCreatingSecondary::Input()");
return KErrNone;
case PdpFsm::EContextDeletedFailed:
- SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_5, "**** DELETE FAILURE ****");
// fall through
case PdpFsm::EContextDeleted:
aFsm.ChangeStateToInitialised();
SpudManNotify(aFsm, KSecondaryContextCreated, iErrorCode);
iErrorCode = KErrNone;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_6, "<<TPdpStateCreatingSecondary::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGSECONDARY_INPUT_7, "<<TPdpStateCreatingSecondary::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingmbms.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingmbms.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,10 +20,16 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatecreatingmbmsTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include <networking/pdpdef.h>
#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "PDPFSM.h"
#include "cpdpfsm.h"
@@ -31,36 +37,41 @@
TInt TPdpStateCreatingMbms::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode)
{
- SPUDFSMVERBOSE_FNLOG("TPdpStateCreatingMbms::Input()");
- SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_1, ">>TPdpStateCreatingMbms::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::EMbmsPdpContextCreated:
EtelDriverInput(aFsm, EtelDriver::ESessionUpdate);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_3, "<<TPdpStateCreatingMbms::Input()");
return KErrNone;
case SpudMan::EMbmsParameterUpdate:
aFsm.ChangeStateToCreatedMbms();
SpudManNotify(aFsm,KMbmsContextCreated, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_4, "<<TPdpStateCreatingMbms::Input()");
return KErrNone;
case PdpFsm::EMbmsPdpContextCreatedFailed:
iErrorCode = aErrorCode;
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_5, "<<TPdpStateCreatingMbms::Input()");
return KErrNone;
case PdpFsm::EContextDeletedFailed:
- SPUDFSMVERBOSE_LOG(_L("**** DELETE FAILURE ****"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_6, "**** DELETE FAILURE ****");
// fall through
case PdpFsm::EContextDeleted:
aFsm.ChangeStateToInitialised();
SpudManNotify(aFsm, KMbmsContextCreated, iErrorCode);
iErrorCode = KErrNone;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_7, "<<TPdpStateCreatingMbms::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGMBMS_INPUT_8, "<<TPdpStateCreatingMbms::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingprimary.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatecreatingprimary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,37 +20,47 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatecreatingprimaryTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_1, ">>TPdpStateCreatingPrimary::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::E1ryPdpContextCreated:
aFsm.ChangeStateToActivatingPrimary();
EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_3, "<<TPdpStateCreatingPrimary::Input()");
return KErrNone;
case PdpFsm::E1ryPdpContextCreatedFailed:
aFsm.ChangeStateToInitialised();
SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); // or is it KContextActivateEvent?
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_5, "<<TPdpStateCreatingPrimary::Input()");
return KErrNone;
case SpudMan::ECancelContextCreate:
aFsm.ChangeStateToStopping();
EtelDriverCancel(aFsm);
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_6, "<<TPdpStateCreatingPrimary::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATECREATINGPRIMARY_INPUT_7, "<<TPdpStateCreatingPrimary::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstategettingnegqos.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstategettingnegqos.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,41 +20,51 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstategettingnegqosTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_1, ">>TPdpStateGettingNegQoS::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case SpudMan::EGetNegQoS:
EtelDriverInput(aFsm, EtelDriver::ENegQoSGet);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_3, "<<TPdpStateGettingNegQoS::Input()");
return KErrNone;
case PdpFsm::EPdpNegQoSRetrieved:
- SPUDFSMVERBOSE_LOG(_L("*** SUCCESS ***"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_4, "*** SUCCESS ***");
aFsm.ChangeStateToOpen();
SpudManNotify(aFsm, KGetNegQoSEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_5, "<<TPdpStateGettingNegQoS::Input()");
return KErrNone;
case PdpFsm::EPdpNegQoSRetrievedFailed:
- SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_6, "*** 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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_7, "<<TPdpStateGettingNegQoS::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEGETTINGNEGQOS_INPUT_8, "<<TPdpStateGettingNegQoS::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateinitialised.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateinitialised.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +20,15 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstateinitialisedTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "cpdpfsm.h"
#include "cpdpfsmfactory.h"
@@ -31,8 +37,8 @@
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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_1, ">>TPdpStateInitialised::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
@@ -50,7 +56,7 @@
aFsm.ChangeStateToCreatingPrimary();
EtelDriverInput (aFsm, EtelDriver::ECreate1ryPdpContext);
}
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_3, "<<TPdpStateInitialised::Input()");
return KErrNone;
case SpudMan::ECreateSecondaryPDPContext:
aFsm.ChangeStateToCreatingSecondary();
@@ -58,7 +64,7 @@
aFsm.iContextType = SpudMan::ESecondary;
EtelDriverInput (aFsm, EtelDriver::ECreate2ryPdpContext);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_4, "<<TPdpStateInitialised::Input()");
return KErrNone;
@@ -66,6 +72,7 @@
aFsm.ChangeStateToCreatingMbms();
aFsm.iContextType = SpudMan::EMbms;
EtelDriverInput (aFsm, EtelDriver::ECreateMbmsPdpContext);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_5, "<<TPdpStateInitialised::Input()");
return KErrNone;
// these stop the default actions which aren't of value in the Initialised state, although we
@@ -75,12 +82,14 @@
case PdpFsm::EContextStatusChangeNetwork:
if (aFsm.iContextStatus == RPacketContext::EStatusDeleted)
{
- return KErrNone;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_6, "<<TPdpStateInitialised::Input()");
+ return KErrNone;
}
break;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEINITIALISED_INPUT_7, "<<TPdpStateInitialised::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatemodifingactive.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatemodifingactive.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,30 +21,39 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatemodifingactiveTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_1, ">>TPdpStateModifyingActive::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::EPdpContextModified:
aFsm.ChangeStateToOpen();
SpudManNotify(aFsm, KContextModifyActiveEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_3, "<<TPdpStateModifyingActive::Input()");
return KErrNone;
case PdpFsm::EPdpContextModifiedFailed:
aFsm.ChangeStateToOpen();
SpudManNotify(aFsm, KContextModifyActiveEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_4, "<<TPdpStateModifyingActive::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEMODIFYINGACTIVE_INPUT_5, "<<TPdpStateModifyingActive::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopen.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopen.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,28 +20,36 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstateopenTraces.h"
+#endif
+
#include <etelpckt.h>
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_1, ">>TPdpStateOpen::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::EQoSProfileChangeNetwork:
// RPacketQoS::TQoSR99_R4Negotiated
SpudManNotify (aFsm, KContextParametersChangeEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_3, "<<TPdpStateOpen::Input()");
return KErrNone;
case PdpFsm::EConfigGPRSChangeNetwork:
// //RPacketContext::TContextConfigGPRS
SpudManNotify (aFsm, KContextParametersChangeEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_4, "<<TPdpStateOpen::Input()");
return KErrNone;
case PdpFsm::EContextStatusChangeNetwork:
if (aFsm.iContextStatus == RPacketContext::EStatusSuspended)
@@ -59,37 +67,46 @@
// no change in state - the upper layer must change the state if it needs to
SpudManNotify (aFsm, KContextParametersChangeEvent, aErrorCode);
}
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_5, "<<TPdpStateOpen::Input()");
return KErrNone;
case SpudMan::EContextDelete:
aFsm.ChangeStateToClosing();
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_6, "<<TPdpStateOpen::Input()");
return KErrNone;
case SpudMan::EContextQoSSet:
aFsm.ChangeStateToChangingQoS();
EtelDriverInput(aFsm, EtelDriver::ESetQoS);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_7, "<<TPdpStateOpen::Input()");
return KErrNone;
case SpudMan::EContextModifyActive:
aFsm.ChangeStateToModifingActive();
EtelDriverInput(aFsm, EtelDriver::EModifyActive);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_8, "<<TPdpStateOpen::Input()");
return KErrNone;
case SpudMan::EContextTFTModify:
aFsm.ChangeStateToChangingTFT();
EtelDriverInput(aFsm, EtelDriver::EChangeTft);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_9, "<<TPdpStateOpen::Input()");
return KErrNone;
case SpudMan::ESuspend: // think this is superfluous - DAN will see at review :)
aFsm.ChangeStateToSuspended();
SpudManNotify(aFsm, KContextBlockedEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_10, "<<TPdpStateOpen::Input()");
return KErrNone;
case SpudMan::EMbmsSessionUpdate:
EtelDriverInput(aFsm, EtelDriver::ESessionUpdate);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_11, "<<TPdpStateOpen::Input()");
return KErrNone;
case SpudMan::EMbmsParameterUpdate:
SpudManNotify (aFsm, KContextParametersChangeEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_12, "<<TPdpStateOpen::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPEN_INPUT_13, "<<TPdpStateOpen::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopeningphone.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateopeningphone.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +20,15 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstateopeningphoneTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#include "tpdpstates.h"
-#include "spudfsmdebuglogger.h"
#include "pdpfsmnmspace.h"
#include "cpdpfsmfactory.h"
#include "cpdpfsm.h"
@@ -30,8 +36,8 @@
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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_1, ">>TPdpStateOpeningPhone::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
@@ -40,20 +46,24 @@
aFsm.ChangeStateToCreatingPrimary();
iPdpFsmFactory->iEtelOpened = ETrue;
EtelDriverInput(aFsm, EtelDriver::ECreate1ryPdpContext);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_3, "<<TPdpStateOpeningPhone::Input()");
return KErrNone;
case PdpFsm::EPhoneOpenedFailed:
aFsm.ChangeStateToInitialised();
iPdpFsmFactory->iEtelOpened = EFalse;
SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_4, "<<TPdpStateOpeningPhone::Input()");
return KErrNone;
case SpudMan::ECancelContextCreate:
aFsm.ChangeStateToStopping();
EtelDriverCancel(aFsm);
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_5, "<<TPdpStateOpeningPhone::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATEOPENINGPHONE_INPUT_6, "<<TPdpStateOpeningPhone::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstates.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstates.h Fri Jun 11 14:49:29 2010 +0300
@@ -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,7 +24,6 @@
#define TPDPSTATES_H
#include "tpdpstate.h"
-#include "spudfsmdebuglogger.h"
class CPdpFsm;
@@ -35,7 +34,6 @@
public: \
TPdpState##state (CPdpFsmFactory * aPdpFsmFactory) \
{ \
- SPUDFSMVERBOSE_FNLOG("TPdpState" L ## #state L"::TPdpState" L ## #state L"()"); \
iName = KName##state; \
iPdpFsmFactory = aPdpFsmFactory; \
} \
@@ -49,7 +47,6 @@
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); \
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingqos.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingqos.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,30 +20,39 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatesettingqosTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_1, ">>TPdpStateSettingQoS::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::EQoSSet:
aFsm.ChangeStateToCreatedSecondary();
SpudManNotify(aFsm, KContextQoSSetEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_3, "<<TPdpStateSettingQoS::Input()");
return KErrNone;
case PdpFsm::EQoSSetFailed:
aFsm.ChangeStateToCreatedSecondary();
SpudManNotify(aFsm, KContextQoSSetEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_4, "<<TPdpStateSettingQoS::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOS_INPUT_5, "<<TPdpStateSettingQoS::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingqosprimary.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingqosprimary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -22,29 +22,31 @@
#include <networking\UmtsNifControlIf.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_1, ">>TPdpStateSettingQoSPrimary::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_2, "aOperation : %S(%d)", LogOperation(aFsm, aOperation), aOperation);
switch (aOperation)
{
case PdpFsm::EQoSSet:
aFsm.ChangeStateToActivatingPrimary();
EtelDriverInput(aFsm, EtelDriver::EActivatePdp);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_3, "<<TPdpStateSettingQoSPrimary::Input()");
return KErrNone;
case PdpFsm::EQoSSetFailed:
aFsm.ChangeStateToClosing();
SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); // or is it KContextActivateEvent?
EtelDriverInput(aFsm, EtelDriver::EContextDelete);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_4, "<<TPdpStateSettingQoSPrimary::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGQOSPRIMARY_INPUT_5, "<<TPdpStateSettingQoSPrimary::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingtft.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesettingtft.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,16 +20,22 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatesettingtftTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_1, ">>TPdpStateSettingTFT::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
@@ -52,6 +58,7 @@
}
}
SpudManNotify(aFsm, KContextTFTModifiedEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_3, "<<TPdpStateSettingTFT::Input()");
return KErrNone;
case PdpFsm::ETftSetFailed:
if (aFsm.iContextType != SpudMan::EMbms)
@@ -63,10 +70,12 @@
aFsm.ChangeStateToCreatedMbms();
}
SpudManNotify(aFsm, KContextTFTModifiedEvent, aErrorCode);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_4, "<<TPdpStateSettingTFT::Input()");
return KErrNone;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESETTINGTFT_INPUT_5, "<<TPdpStateSettingTFT::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatestopping.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatestopping.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,38 +20,48 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatestoppingTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_1, ">>TPdpStateStopping::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case PdpFsm::EContextDeleted:
aFsm.ChangeStateToInitialised();
SpudManNotify (aFsm, KPrimaryContextCreated, KErrGeneral);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_3, "<<TPdpStateStopping::Input()");
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 ***"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_4, "**** DELETE FAILURE ****");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_5, "*** DELETE FAILURE ***");
aFsm.ChangeStateToInitialised();
EtelDriverCancel (aFsm);
SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_6, "<<TPdpStateStopping::Input()");
return KErrNone;
case SpudMan::EContextDelete:
// already doing this and don't want default action
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_7, "<<TPdpStateStopping::Input()");
return KErrInUse;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESTOPPING_INPUT_8, "<<TPdpStateStopping::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesuspended.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstatesuspended.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,23 +20,30 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "tpdpstatesuspendedTraces.h"
+#endif
+
#include <networking/umtsnifcontrolif.h>
#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);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_1, ">>TPdpStateSuspended::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_2, "aOperation : %S(%d)", *(LogOperation(aFsm, aOperation)), aOperation);
switch (aOperation)
{
case SpudMan::EResume:
aFsm.ChangeStateToOpen();
SpudManNotify(aFsm, KContextUnblockedEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_3, "<<TPdpStateSuspended::Input()");
return KErrNone;
case PdpFsm::EContextStatusChangeNetwork:
if (aFsm.iContextStatus == RPacketContext::EStatusActive)
@@ -44,12 +51,14 @@
aFsm.ChangeStateToOpen();
SpudManNotify(aFsm, KContextUnblockedEvent, KErrNone);
//SpudManNotify (aFsm, KNetworkStatusEvent, KErrNone);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_4, "<<TPdpStateSuspended::Input()");
return KErrNone;
}
break;
}
// default error handling
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TPDPSTATESUSPENDED_INPUT_5, "<<TPdpStateSuspended::Input()");
return TPdpState::Input(aFsm, aOperation, aErrorCode);
}
--- a/telephonyprotocols/pdplayer/umts/spudtel/inc/ceteldrivercontext.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/inc/ceteldrivercontext.h Fri Jun 11 14:49:29 2010 +0300
@@ -110,7 +110,7 @@
inline RPacketContext::TContextStatus& ContextStatus();
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
void DumpReqProfileParameters ();
void DumpNegProfileParameters ();
#endif
--- a/telephonyprotocols/pdplayer/umts/spudtel/inc/spudteldebuglogger.h Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +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:
-// Event Logger header
-//
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#ifndef SPUDTELDEBUGLOGGER_H
-#define SPUDTELDEBUGLOGGER_H
-
-
-#include "comms-infras/commsdebugutility.h"
-
-#ifdef __FLOG_ACTIVE
-
-#include <e32base.h>
-#include <e32def.h>
-
-
-_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
-
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivercontext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivercontext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +21,15 @@
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ceteldrivercontextTraces.h"
+#endif
+
#include "ceteldrivercontext.h"
#include "ceteldriverfactory.h"
-#include "spudteldebuglogger.h"
using namespace EtelDriver;
@@ -92,12 +98,12 @@
iFilterV2(),
iFilterV2Pckg(iFilterV2)
{
- SPUDTEL_FNLOG("CEtelDriverContext::CEtelDriverContext");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_CTOR_1, "CEtelDriverContext::CEtelDriverContext");
CActiveScheduler::Add(this);
}
CEtelDriverContext::~CEtelDriverContext()
{
- SPUDTEL_FNLOG("CEtelDriverContext::~CEtelDriverContext()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DTOR_1, "CEtelDriverContext::~CEtelDriverContext()");
Cancel(); // N.B. This cancels all outstanding operations on the context, including deletion!
iContextConfig.Close();
@@ -131,12 +137,12 @@
*/
TInt CEtelDriverContext::Input (TEtelInput aOperation)
{
- SPUDTEL_FNLOG("CEtelDriverContext::Input()");
- SPUDTELVERBOSE_INFO_LOG1( _L("Operation %d"), aOperation );
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_INPUT_1, "CEtelDriverContext::Input()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_INPUT_2, "Operation %d", aOperation );
if (MEtelDriverStrategy::EFinishStep != iStrategyStep)
{
- SPUDTEL_ERROR_LOG(_L("ERROR: Pdp context is in use, return %d"), KErrInUse);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_INPUT_3, "ERROR: Pdp context is in use, return %d", KErrInUse);
// I'm still doing something
ASSERT(EFalse); // shouldn't happen
return KErrInUse;
@@ -155,7 +161,7 @@
void CEtelDriverContext::RunL()
{
- SPUDTEL_FNLOG("CEtelDriverContext::RunL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_1, "CEtelDriverContext::RunL()");
ASSERT(iStrategyId < ESentinelStrategy);
if(iStatus != KErrNone)
@@ -163,7 +169,7 @@
if(iCompletionStatus == KErrNone)
{
iCompletionStatus = iStatus;
- SPUDTEL_ERROR_LOG(_L("Last async request completed with error %d"), iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_2, "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
@@ -172,13 +178,13 @@
{
iStrategyStep = MEtelDriverStrategy::EFinishStep;
}
- SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_3, "Strategy is completed");
}
if(MEtelDriverStrategy::EFinishStep == iStrategyStep)
{
// we are done
- SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_4, "Strategy is completed");
Strategy(iStrategyId).NotifyFsm (*this, iCompletionStatus);
}
else
@@ -192,7 +198,7 @@
/** cancels last async request */
void CEtelDriverContext::DoCancel()
{
- SPUDTEL_FNLOG("CEtelDriverContext::DoCancel()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DOCANCEL_1, "CEtelDriverContext::DoCancel()");
if(IsActive())
{
@@ -200,13 +206,13 @@
Strategy(iStrategyId).CancelAsyncRequest(*this);
}
iStrategyStep = MEtelDriverStrategy::EFinishStep;
- SPUDTELVERBOSE_INFO_LOG(_L("Strategy is cancelled"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DOCANCEL_2, "Strategy is cancelled");
}
/** accessor */
const TName& CEtelDriverContext::ExistingContextName() const
{
- SPUDTEL_FNLOG("CEtelDriverContext::ExistingContextName()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_1, "CEtelDriverContext::ExistingContextName()");
for (TContextId i = 0; i < static_cast<TContextId>(iFactory.ContextCount()); i++)
{
@@ -217,7 +223,7 @@
}
// 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());
+ OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_2, "CEtelDriverContext::ExistingContextName - can't find existing context. return %S", iFactory.Context(0).Name());
ASSERT(EFalse);
return iFactory.Context(0).Name();
}
@@ -271,54 +277,54 @@
}
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_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());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_1, "Requested Profile Parameters Dump - Context Id = %d", Id());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_2, "===========================================================");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_3, "ExtensionId = %d", iQosRequested.ExtensionId());
if (iQosRequested.ExtensionId() != TPacketDataConfigBase::KConfigRel99Rel4
&& iQosRequested.ExtensionId() != TPacketDataConfigBase::KConfigRel5)
{
- SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_4, "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);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_5, "[1]iReqTrafficClass = %d", iQosRequested.RequestedQoSR99_R4().iReqTrafficClass);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_6, "[2]iMinTrafficClass = %d", iQosRequested.RequestedQoSR99_R4().iMinTrafficClass);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_7, "[3]iReqDeliveryOrderReqd = %d", iQosRequested.RequestedQoSR99_R4().iReqDeliveryOrderReqd);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_8, "[4]iMinDeliveryOrderReqd = %d", iQosRequested.RequestedQoSR99_R4().iMinDeliveryOrderReqd);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_9, "[5]iReqDeliverErroneousSDU = %d", iQosRequested.RequestedQoSR99_R4().iReqDeliverErroneousSDU);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_10, "[6]iMinDeliverErroneousSDU = %d", iQosRequested.RequestedQoSR99_R4().iMinDeliverErroneousSDU);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_11, "[7]iReqMaxSDUSize = %d", iQosRequested.RequestedQoSR99_R4().iReqMaxSDUSize);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_12, "[8]iMinAcceptableMaxSDUSize = %d", iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxSDUSize);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_13, "[9]iReqMaxRate.iUplinkRate = %d", iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iUplinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_14, "[10]iReqMaxRate.iDownlinkRate = %d", iQosRequested.RequestedQoSR99_R4().iReqMaxRate.iDownlinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_15, "[11]iMinAcceptableMaxRate.iUplinkRate = %d", iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iUplinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_16, "[12]iMinAcceptableMaxRate.iDownlinkRate = %d", iQosRequested.RequestedQoSR99_R4().iMinAcceptableMaxRate.iDownlinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_17, "[13]iReqBER = %d", iQosRequested.RequestedQoSR99_R4().iReqBER);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_18, "[14]iMaxBER = %d", iQosRequested.RequestedQoSR99_R4().iMaxBER);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_19, "[15]iReqSDUErrorRatio = %d", iQosRequested.RequestedQoSR99_R4().iReqSDUErrorRatio);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_20, "[16]iMaxSDUErrorRatio = %d", iQosRequested.RequestedQoSR99_R4().iMaxSDUErrorRatio);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_21, "[17]iReqTrafficHandlingPriority = %d", iQosRequested.RequestedQoSR99_R4().iReqTrafficHandlingPriority);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_22, "[18]iReqTrafficHandlingPriority = %d", iQosRequested.RequestedQoSR99_R4().iMinTrafficHandlingPriority);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_23, "[19]iReqTransferDelay = %d", iQosRequested.RequestedQoSR99_R4().iReqTransferDelay);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_24, "[20]iMaxTransferDelay = %d", iQosRequested.RequestedQoSR99_R4().iMaxTransferDelay);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_25, "[21]iReqGuaranteedRate.iUplinkRate = %d", iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iUplinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_26, "[22]iReqGuaranteedRate.iDownlinkRate = %d", iQosRequested.RequestedQoSR99_R4().iReqGuaranteedRate.iDownlinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_27, "[23]iMinGuaranteedRate.iUplinkRate = %d", iQosRequested.RequestedQoSR99_R4().iMinGuaranteedRate.iUplinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_28, "[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);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_29, "[25]iSignallingIndication = %d", iQosRequested.RequestedQoSR5().iSignallingIndication);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_30, "[26]iSourceStatisticsDescriptor = %d", iQosRequested.RequestedQoSR5().iSourceStatisticsDescriptor);
}
#endif
}
@@ -327,40 +333,40 @@
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());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_1, "Negotiated Profile Parameters Dump - Context Id = %d", Id());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_2, "===========================================================");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_3, "ExtensionId = %d", iQosNegotiated.ExtensionId());
if (iQosNegotiated.ExtensionId() != TPacketDataConfigBase::KConfigRel99Rel4
&& iQosNegotiated.ExtensionId() != TPacketDataConfigBase::KConfigRel5)
{
- SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_4, "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);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_5, "[2]iTrafficClass = %d", iQosNegotiated.NegotiatedQoSR99_R4().iTrafficClass);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_6, "[3]iDeliveryOrderReqd = %d", iQosNegotiated.NegotiatedQoSR99_R4().iDeliveryOrderReqd);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_7, "[4]iDeliverErroneousSDU = %d", iQosNegotiated.NegotiatedQoSR99_R4().iDeliverErroneousSDU);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_8, "[5]iMaxSDUSize = %d", iQosNegotiated.NegotiatedQoSR99_R4().iMaxSDUSize);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_9, "[6]iBER = %d", iQosNegotiated.NegotiatedQoSR99_R4().iBER);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_10, "[7]iSDUErrorRatio = %d", iQosNegotiated.NegotiatedQoSR99_R4().iSDUErrorRatio);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_11, "[8]iTrafficHandlingPriority = %d", iQosNegotiated.NegotiatedQoSR99_R4().iTrafficHandlingPriority);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_12, "[9]iTransferDelay = %d", iQosNegotiated.NegotiatedQoSR99_R4().iTransferDelay);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_13, "[10]iGuaranteedRate.iUplinkRate = %d", iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iUplinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_14, "[11]iGuaranteedRate.iDownlinkRate = %d", iQosNegotiated.NegotiatedQoSR99_R4().iGuaranteedRate.iDownlinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_15, "[12]iMaxRate.iUplinkRate = %d", iQosNegotiated.NegotiatedQoSR99_R4().iMaxRate.iUplinkRate);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_16, "[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);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_17, "[14]iSignallingIndication = %d", iQosNegotiated.NegotiatedQoSR5().iSignallingIndication);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_18, "[15]iSourceStatisticsDescriptor = %d", iQosNegotiated.NegotiatedQoSR5().iSourceStatisticsDescriptor);
}
#endif
}
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldriverfactory.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldriverfactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,12 +20,18 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ceteldriverfactoryTraces.h"
+#endif
+
#include <e32base.h>
#include <etelmm.h>
#include "cspudcontextelem.h"
#include "ceteldriverfactory.h"
-#include "spudteldebuglogger.h"
#include "PDPFSM.h"
using namespace EtelDriver;
@@ -36,7 +42,7 @@
: iPdpFsmInterface(aPdpFsmInterface),
iServiceChangeNotifier(iPacketService, iPdpFsmInterface)
{
- SPUDTELVERBOSE_INFO_LOG(_L("CEtelDriverFactory::CEtelDriverFactory()"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG,TRACE_INTERNALS, CETELDRIVERFACTORY_CTOR_1, "CEtelDriverFactory::CEtelDriverFactory()");
}
/**
@@ -44,15 +50,15 @@
*/
CEtelDriverFactory* CEtelDriverFactory::NewL (CPdpFsmInterface& aPdpFsmInterface)
{
- SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::NewL()"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_NEWL_1, "CEtelDriverFactory::NewL()");
return new (ELeave) CEtelDriverFactory (aPdpFsmInterface);
}
CEtelDriverFactory::~CEtelDriverFactory()
{
- SPUDTEL_FNLOG("CEtelDriverFactory::~CEtelDriverFactory()");
- SPUDTEL_INFO_LOG(_L("CEtelDriverFactory::~CEtelDriverFactory()"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_DTOR_1, "CEtelDriverFactory::~CEtelDriverFactory()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_DTOR_2, "CEtelDriverFactory::~CEtelDriverFactory()");
// cancel all notificators
iServiceChangeNotifier.Cancel();
@@ -91,7 +97,7 @@
{
// dev. note: leavescan reports an error in this method.
// But there is no visible ground for it.
- SPUDTEL_FNLOG("GetPhoneInfoL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, GETPHONEINFOL_1, "GetPhoneInfoL()");
TInt count;
User::LeaveIfError(aTelServer.EnumeratePhones(count));
if (count<=0)
@@ -128,8 +134,8 @@
/** initializes factory objects */
void CEtelDriverFactory::InitL()
{
- SPUDTEL_FNLOG("CEtelDriverFactory::InitL()");
- SPUDTEL_INFO_LOG(_L("Initializing Etel driver"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_INITL_1, "CEtelDriverFactory::InitL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_INITL_2, "Initializing Etel driver");
iStrategies[EOpenPhoneStrategy] = &iOpenStrategy;
iStrategies[ESetQoSStrategy] = &iSetQoSStrategy;
@@ -182,8 +188,8 @@
*/
void CEtelDriverFactory::CreatePdpL (TContextId aPdpId,SpudMan::TPdpContextType aContextType)
{
- SPUDTEL_FNLOG("CEtelDriverFactory::CreatePdpL()");
- SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CREATEPDPL_1, "CEtelDriverFactory::CreatePdpL()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CREATEPDPL_2, "pdp id : %d", aPdpId);
__ASSERT_ALWAYS((NULL == iContexts[aPdpId]), User::Panic(KTxtSpudTel, KErrArgument));
if (aContextType == SpudMan::EMbms)
@@ -204,7 +210,7 @@
void CEtelDriverFactory::FreePdp(TContextId aPdpId)
{
- SPUDTELVERBOSE_INFO_LOG1(_L("Free pdp id : %d"), aPdpId);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_FREEPDP_1, "Free pdp id : %d", aPdpId);
// In an OOM situation, this object may be cleaned up prior to establishment.
if (iContexts[aPdpId] != NULL)
{
@@ -222,7 +228,7 @@
*/
void CEtelDriverFactory::StartPdpNotifications (TContextId aPdpId)
{
- SPUDTELVERBOSE_INFO_LOG1(_L("StartPdpNotifications for pdp id : %d"), aPdpId);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_STARTPDPNOTIFICATIONS_1, "StartPdpNotifications for pdp id : %d", aPdpId);
// sanity check
ASSERT(iContexts[aPdpId]);
@@ -235,7 +241,7 @@
*/
void CEtelDriverFactory::CancelPdpNotifications (TContextId aPdpId)
{
- SPUDTELVERBOSE_INFO_LOG1(_L("CancelPdpNotifications for pdp id : %d"), aPdpId);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CANCELPDPNOTIFICATIONS_1, "CancelPdpNotifications for pdp id : %d", aPdpId);
// sanity check
ASSERT(iContexts[aPdpId]);
@@ -245,7 +251,7 @@
/** cancels notifications for all pdp contexts */
void CEtelDriverFactory::CancelAllPdpNotifications()
{
- SPUDTEL_INFO_LOG(_L("CancelAllPdpNotifications"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERFACTORY_CANCELALLPDPNOTIFICATIONS_1, "CancelAllPdpNotifications");
for(TContextId i = 0; i < static_cast<TContextId>(ContextCount()); i++)
{
CancelPdpNotifications (i);
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivernotifier.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivernotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,11 +20,17 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ceteldrivernotifierTraces.h"
+#endif
+
#include <e32def.h>
#include "ceteldrivernotifier.h"
#include "PDPFSM.h"
-#include "spudteldebuglogger.h"
/**
@@ -52,8 +58,7 @@
{
if(KErrCancel != iStatus.Int())
{
- SPUDTEL_ERROR_LOG(_L("CEtelDriverNotifier::RunL() reported an error: %d"),
- iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERNOTIFIER_RUNL_1, "CEtelDriverNotifier::RunL() reported an error: %d", iStatus.Int());
}
}
}
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,12 +20,18 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpdpconfigchangenotifierTraces.h"
+#endif
+
#include <e32base.h>
#include <pcktcs.h>
#include "cpdpconfigchangenotifier.h"
#include "PDPFSM.h"
-#include "spudteldebuglogger.h"
#include "pdpfsmnmspace.h"
/**
@@ -119,8 +125,7 @@
{
if(IsActive())
{
- SPUDTELVERBOSE_INFO_LOG(
- _L("CPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1, "CPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged");
iPacketContext.CancelAsyncRequest(EPacketContextNotifyConfigChanged);
}
}
@@ -133,15 +138,14 @@
{
if(aStatus == KErrNone)
{
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set ConfigGPRS"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "FSM set ConfigGPRS");
iPdpFsmInterface.Set(iId, GetScratchContextAs<TPacketDataConfigBase>());
- SPUDTELVERBOSE_INFO_LOG(_L("FSM input EConfigGPRSChangeNetwork"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "FSM input EConfigGPRSChangeNetwork");
iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork);
}
else
{
- SPUDTEL_ERROR_LOG(_L("CPdpConfigChangeNotifier::Notify(), error: %d"),
- aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPCONFIGCHANGENOTIFIER_NOTIFY_3, "CPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
// Not all TSYs support RPacketContext::NotifyConfigChanged so we handle
// KErrNotSupported silently (PDEF118981).
ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported));
@@ -186,8 +190,7 @@
{
if(IsActive())
{
- SPUDTELVERBOSE_INFO_LOG(
- _L("CMbmsPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1, "CMbmsPdpConfigChangeNotifier::DoCancel EPacketContextNotifyConfigChanged");
iMbmsPacketContext.CancelAsyncRequest(EPacketContextNotifyConfigChanged);
}
}
@@ -200,17 +203,16 @@
{
if(aStatus == KErrNone)
{
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set ConfigMbms"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1, "FSM set ConfigMbms");
iPdpFsmInterface.Set(iId, iConfigMbms);
- SPUDTELVERBOSE_INFO_LOG(_L("FSM input EConfigMbmsChangeNetwork"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2, "FSM input EConfigMbmsChangeNetwork");
iPdpFsmInterface.Input(iId, PdpFsm::EConfigGPRSChangeNetwork,SpudMan::EMbms);
//to be discussed...
}
else
{
- SPUDTEL_ERROR_LOG(_L("CMbmsPdpConfigChangeNotifier::Notify(), error: %d"),
- aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3, "CMbmsPdpConfigChangeNotifier::Notify(), error: %d", aStatus.Int());
// Not all TSYs support RPacketContext::NotifyConfigChanged so we handle
// KErrNotSupported silently (PDEF118981).
ASSERT((aStatus == KErrCancel) || (aStatus == KErrNotSupported));
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpstatuschangenotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,11 +20,17 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpdpstatuschangenotifierTraces.h"
+#endif
+
#include <e32base.h>
#include "cpdpstatuschangenotifier.h"
#include "PDPFSM.h"
-#include "spudteldebuglogger.h"
#include "pdpfsmnmspace.h"
#include <pcktcs.h>
@@ -65,8 +71,7 @@
{
if(IsActive())
{
- SPUDTELVERBOSE_INFO_LOG(
- _L("CPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_DOCANCEL_1, "CPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange");
iPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
}
}
@@ -79,13 +84,13 @@
{
if(aStatus == KErrNone)
{
- SPUDTELVERBOSE_INFO_LOG(_L("Notified of context status change"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "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"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
iPdpFsmInterface.Set(iId, iContextStatus);
TInt err = KErrNone;
iPacketContext.GetLastErrorCause(err); // Ignore error return code.
@@ -94,8 +99,7 @@
}
else
{
- SPUDTEL_ERROR_LOG(_L("CPdpStatusChangeNotifier::Notify(), error: %d"),
- aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPSTATUSCHANGENOTIFIER_NOTIFY_3, "CPdpStatusChangeNotifier::Notify(), error: %d", aStatus.Int());
ASSERT(aStatus == KErrCancel);
}
}
@@ -139,8 +143,7 @@
{
if(IsActive())
{
- SPUDTELVERBOSE_INFO_LOG(
- _L("CMbmsPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1, "CMbmsPdpStatusChangeNotifier::DoCancel EPacketContextNotifyStatusChange");
iMbmsPacketContext.CancelAsyncRequest(EPacketContextNotifyStatusChange);
}
}
@@ -153,13 +156,13 @@
{
if(aStatus == KErrNone)
{
- SPUDTELVERBOSE_INFO_LOG(_L("Notified of context status change"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1, "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"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2, "FSM input EContextStatusChangeNetwork");
iPdpFsmInterface.Set(iId, iContextStatus);
TInt err = KErrNone;
iMbmsPacketContext.GetLastErrorCause(err); // Ignore error return code.
@@ -168,8 +171,7 @@
}
else
{
- SPUDTEL_ERROR_LOG(_L("CMbmsPdpStatusChangeNotifier::Notify(), error: %d"),
- aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_3, "CMbmsPdpStatusChangeNotifier::Notify(), error: %d", aStatus.Int());
ASSERT(aStatus == KErrCancel);
}
}
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cqoschangenotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,8 +20,14 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cqoschangenotifierTraces.h"
+#endif
+
#include "cqoschangenotifier.h"
-#include "spudteldebuglogger.h"
#include <pcktcs.h>
@@ -40,24 +46,24 @@
iProfilePckg(iProfileBuffer)
{
- SPUDTEL_FNLOG("CQoSChangeNotifier::CQoSChangeNotifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_CTOR_1, "CQoSChangeNotifier::CQoSChangeNotifier()");
}
CQoSChangeNotifier::~CQoSChangeNotifier()
{
- SPUDTEL_FNLOG("CQoSChangeNotifier::~CQoSChangeNotifier()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_DTOR_1, "CQoSChangeNotifier::~CQoSChangeNotifier()");
Cancel();
}
/** starts notification */
void CQoSChangeNotifier::Start()
{
- SPUDTEL_FNLOG("CQoSChangeNotifier::Start()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_START_1, "CQoSChangeNotifier::Start()");
if (!IsActive())
{
iPacketQoS.NotifyProfileChanged(iStatus, iProfilePckg);
SetActive();
- SPUDTEL_FNLOG("CQoSChangeNotifier::Start(), iPacketQoS.NotifyProfileChanged()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_START_2, "CQoSChangeNotifier::Start(), iPacketQoS.NotifyProfileChanged()");
}
}
@@ -66,8 +72,7 @@
{
if (IsActive())
{
- SPUDTELVERBOSE_INFO_LOG(
- _L("CQoSChangeNotifier::DoCancel EPacketQoSNotifyProfileChanged"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_DOCANCEL_1, "CQoSChangeNotifier::DoCancel EPacketQoSNotifyProfileChanged");
iPacketQoS.CancelAsyncRequest(EPacketQoSNotifyProfileChanged);
}
}
@@ -80,7 +85,7 @@
{
if(aStatus == KErrNone)
{
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set QoSProfile"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_1, "FSM set QoSProfile");
#ifdef SYMBIAN_NETWORKING_UMTSR5
iPdpFsmInterface.Set(iId, iProfileBuffer.NegotiatedQoSR5());
@@ -92,12 +97,12 @@
#endif
// SYMBIAN_NETWORKING_UMTSR5
- SPUDTELVERBOSE_INFO_LOG(_L("FSM input EQoSProfileChangeNetwork"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_2, "FSM input EQoSProfileChangeNetwork");
iPdpFsmInterface.Input(iId, PdpFsm::EQoSProfileChangeNetwork);
}
else
{
- SPUDTEL_ERROR_LOG(_L("CQoSChangeNotifier::Notify(), error: %d"), aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CQOSCHANGENOTIFIER_NOTIFY_3, "CQoSChangeNotifier::Notify(), error: %d", aStatus.Int());
ASSERT(aStatus == KErrCancel);
}
}
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cservicechangenotifier.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cservicechangenotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,11 +20,17 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cservicechangenotifierTraces.h"
+#endif
+
#include <e32def.h>
#include "cservicechangenotifier.h"
#include "PDPFSM.h"
-#include "spudteldebuglogger.h"
#include "pdpfsmnmspace.h"
#include <pcktcs.h>
@@ -65,16 +71,15 @@
{
if(aStatus == KErrNone)
{
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set ServiceStatus"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSERVICECHANGENOTIFIER_NOTIFY_1, "FSM set ServiceStatus");
iPdpFsmInterface.Set(iServiceStatus);
- SPUDTELVERBOSE_INFO_LOG(_L("FSM input EServiceStatusChangeNetwork"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSERVICECHANGENOTIFIER_NOTIFY_2, "FSM input EServiceStatusChangeNetwork");
iPdpFsmInterface.Input(KAllContexts,
PdpFsm::EServiceStatusChangeNetwork);
}
else
{
- SPUDTEL_ERROR_LOG(_L("CServiceChangeNotifier::Notify(), error: %d"),
- aStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSERVICECHANGENOTIFIER_NOTIFY_3, "CServiceChangeNotifier::Notify(), error: %d", aStatus.Int());
ASSERT(aStatus == KErrCancel);
}
}
@@ -84,8 +89,7 @@
{
if(IsActive())
{
- SPUDTELVERBOSE_INFO_LOG(
- _L("CServiceChangeNotifier::DoCancel EPacketNotifyStatusChange"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSERVICECHANGENOTIFIER_DOCANCEL_1, "CServiceChangeNotifier::DoCancel EPacketNotifyStatusChange");
iPacketService.CancelAsyncRequest(EPacketNotifyStatusChange);
}
}
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/eteldriverstrategies.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,11 +20,17 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "eteldriverstrategiesTraces.h"
+#endif
+
#include <e32def.h>
#include "ceteldrivercontext.h"
#include "eteldriverstrategies.h"
-#include "spudteldebuglogger.h"
#include "pdpfsmnmspace.h"
#include <pcktcs.h>
@@ -40,7 +46,7 @@
*/
void TOpenStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TOpenStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_1, "TOpenStrategy::Next()");
TInt err = KErrNone;
@@ -61,7 +67,7 @@
default:
// incorrect step
- SPUDTEL_ERROR_LOG0(_L("Incorrect step"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NEXT_2, "Incorrect step");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -85,12 +91,12 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPhoneOpened"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NOTIFYFSM_1, "Notifying FSM: EPhoneOpened");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPhoneOpened);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPhoneOpenedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_NOTIFYFSM_2, "Notifying FSM: EPhoneOpenedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPhoneOpenedFailed, aCompletionStatus.Int());
}
}
@@ -105,14 +111,14 @@
{
case EInitPhoneStep:
{
- SPUDTEL_INFO_LOG(_L("Cancel Phone::InitialiseCancel"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_CANCELASYNCREQUEST_1, "Cancel Phone::InitialiseCancel");
aContext.Phone().InitialiseCancel();
break;
}
default:
// there're NO outstanding async requests
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TOpenStrategy::CancelAsyncRequest"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TOPENSTRATEGY_CANCELASYNCREQUEST_2, "ERROR: Incorrect case in TOpenStrategy::CancelAsyncRequest");
ASSERT(EFalse);
break;
}
@@ -129,7 +135,7 @@
*/
void TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_1, "TContextDeleteStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)");
TInt err = KErrNone;
@@ -235,7 +241,7 @@
default:
// incorrect step
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NEXT_2, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -262,12 +268,12 @@
if(aCompletionStatus == KErrNone)
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EContextDeleted"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NOTIFYFSM_1, "Notifying FSM: EContextDeleted");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EContextDeleted);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EContextDeletedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_NOTIFYFSM_2, "Notifying FSM: EContextDeletedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EContextDeletedFailed, aCompletionStatus.Int());
}
}
@@ -278,7 +284,7 @@
*/
void TContextDeleteStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
{
- SPUDTEL_FNLOG("TContextDeleteStrategy::CancelAsyncRequest()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_1, "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
@@ -291,21 +297,21 @@
{
case EDeactivateStep:
{
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextDeactivate"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EPacketContextDeactivate");
aContext.PacketContext().CancelAsyncRequest(EPacketContextDeactivate);
break;
}
case EDeleteContextStep:
{
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextDelete"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_3, "Cancel PacketContext::EPacketContextDelete");
aContext.PacketContext().CancelAsyncRequest(EPacketContextDelete);
break;
}
default:
// there're NO outstanding async requests
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_4, "ERROR: Incorrect case");
ASSERT(EFalse);
break;
}
@@ -322,7 +328,7 @@
*/
void TCreate1ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate1ryPdpContextStrategy::Next()");
TInt err = KErrNone;
@@ -337,7 +343,7 @@
err = aContext.PacketContext().OpenNewContext (aContext.PacketService(), aContext.Name());
if (err)
{
- SPUDTEL_ERROR_LOG(_L("PacketContextOpenNewContext returned %d"), err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2, "PacketContextOpenNewContext returned %d", err);
break;
}
@@ -364,7 +370,7 @@
err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
if (err)
{
- SPUDTEL_ERROR_LOG(_L("PacketQoS OpenNewQoS returned %d"), err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3, "PacketQoS OpenNewQoS returned %d", err);
break;
}
@@ -380,7 +386,7 @@
// SYMBIAN_NETWORKING_UMTSR5
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpReqProfileParameters ();
#endif
aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
@@ -395,7 +401,7 @@
}
default:
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -419,12 +425,12 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: E1ryPdpContextCreated");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E1ryPdpContextCreated);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreatedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: E1ryPdpContextCreatedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E1ryPdpContextCreatedFailed, aCompletionStatus.Int());
}
}
@@ -435,32 +441,32 @@
*/
void TCreate1ryPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
{
- SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::CancelAsyncRequest()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1, "TCreate1ryPdpContextStrategy::CancelAsyncRequest()");
switch(aContext.StrategyStep())
{
case ESetConfigStep:
{
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextSetConfig"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EPacketContextSetConfig");
aContext.PacketContext().CancelAsyncRequest(EPacketContextSetConfig);
break;
}
case ESetProfileParamsStep:
{
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSSetProfileParams"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3, "Cancel PacketContext::EPacketQoSSetProfileParams");
aContext.PacketQoS().CancelAsyncRequest(EPacketQoSSetProfileParams);
break;
}
case EInitialiseContextStep:
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextActivate"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_4, "Cancel PacketContext::EPacketContextActivate");
aContext.PacketContext().CancelAsyncRequest(EPacketContextActivateCancel);
break;
default:
// there're NO outstanding async requests
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_5, "ERROR: Incorrect case");
ASSERT(EFalse);
break;
}
@@ -477,7 +483,7 @@
*/
void TCreate2ryPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TCreate2ryPdpContextStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1, "TCreate2ryPdpContextStrategy::Next()");
TInt err = KErrNone;
@@ -502,7 +508,7 @@
err = aContext.PacketQoS().OpenNewQoS (aContext.PacketContext(), newName);
if (err)
{
- SPUDTEL_ERROR_LOG(_L("PacketQoS OpenNewQoS returned %d"), err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2, "PacketQoS OpenNewQoS returned %d", err);
break;
}
aContext.SetStrategyStep (EFinishStep);
@@ -510,7 +516,7 @@
}
default:
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -534,12 +540,12 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: E2ryPdpContextCreated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: E2ryPdpContextCreated");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E2ryPdpContextCreated);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: E2ryPdpContextCreatedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: E2ryPdpContextCreatedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::E2ryPdpContextCreatedFailed, aCompletionStatus.Int());
}
}
@@ -550,8 +556,8 @@
*/
void TCreate2ryPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& /*aContext*/)
{
- SPUDTEL_FNLOG("TCreate2ryPdpContextStrategy::CancelAsyncRequest()");
- SPUDTEL_ERROR_LOG0(_L("ERROR: No outstanding requests"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1, "TCreate2ryPdpContextStrategy::CancelAsyncRequest()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2, "ERROR: No outstanding requests");
}
@@ -565,7 +571,7 @@
*/
void TSetQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TSetQoSStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_1, "TSetQoSStrategy::Next()");
TInt err = KErrNone;
@@ -586,7 +592,7 @@
aContext.QosRequested() = req;
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpReqProfileParameters ();
#endif
aContext.PacketQoS().SetProfileParameters (*aStatus, aContext.QosRequestedPckg());
@@ -603,7 +609,7 @@
default:
{
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NEXT_2, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -626,12 +632,12 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EQoSSet"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NOTIFYFSM_1, "Notifying FSM: EQoSSet");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EQoSSet);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EQoSSetFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_NOTIFYFSM_2, "Notifying FSM: EQoSSetFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EQoSSetFailed, aCompletionStatus.Int());
}
}
@@ -647,13 +653,13 @@
case ESetProfileParamsStep:
{
aContext.PacketQoS().CancelAsyncRequest(EPacketQoSSetProfileParams);
- SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketQoSSetProfileParams"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketQoS::EPacketQoSSetProfileParams");
break;
}
default:
// there're NO outstanding async requests
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TSetQoSStrategy::CancelAsyncRequest"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETQOSSTRATEGY_CANCELASYNCREQUEST_2, "ERROR: Incorrect case in TSetQoSStrategy::CancelAsyncRequest");
ASSERT(EFalse);
break;
}
@@ -670,7 +676,7 @@
*/
void TSetTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TSetTftStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_1, "TSetTftStrategy::Next()");
TInt err = KErrNone;
@@ -685,9 +691,9 @@
{
case KAddFilters:
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
- SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Add Filters"), aContext.TftInfo().FilterCount());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_2, "TftOperationCode - Add Filters %d", aContext.TftInfo().FilterCount());
// Set strategy assumes that TFT has to be created on a first place
- SPUDTELVERBOSE_INFO_LOG(_L("Creating TFT..."));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_3, "Creating TFT...");
if (aContext.ContextType() != SpudMan::EMbms)
{
aContext.PacketContext().CreateNewTFT(*aStatus, aContext.TftInfo().FilterCount());
@@ -701,17 +707,17 @@
case KRemoveFilters:
err = KErrNotSupported;
- SPUDTEL_ERROR_LOG(_L("TftOperationCode - Remove is not supported in a Set strategy, return %d"), err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_4, "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);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_5, "TftOperationCode - Delete is not supported in a Set strategy, return %d", err);
break;
default:
// wrong case
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_6, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -771,7 +777,7 @@
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NEXT_7, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -794,12 +800,12 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftSet"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: ETftSet");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftSet);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftSetFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: ETftSetFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftSetFailed, aCompletionStatus.Int());
}
}
@@ -815,20 +821,20 @@
case ECreateNewTFTStep:
{
aContext.PacketQoS().CancelAsyncRequest(EPacketContextCreateNewTFT);
- SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextCreateNewTFT"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketQoS::EPacketContextCreateNewTFT");
break;
}
case EAddTftStep:
{
aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilter);
- SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextAddPacketFilter"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketQoS::EPacketContextAddPacketFilter");
break;
}
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TSetTftStrategy::CancelAsyncRequest"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TSETTFTSTRATEGY_CANCELASYNCREQUEST_3, "ERROR: Incorrect case in TSetTftStrategy::CancelAsyncRequest");
ASSERT(EFalse);
break;
}
@@ -845,7 +851,7 @@
*/
void TChangeTftStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TChangeTftStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_1, "TChangeTftStrategy::Next()");
TInt err = KErrNone;
@@ -857,18 +863,18 @@
{
case KAddFilters:
aContext.PdpFsmInterface().Get (aContext.Id(), aContext.TftInfo());
- SPUDTELVERBOSE_INFO_LOG1(_L("TftOperationCode - Add Filters"), aContext.TftInfo().FilterCount());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_2, "TftOperationCode - Add Filters %d", 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());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_3, "TftOperationCode - Remove %d Filters", aContext.TftInfo().FilterCount());
aContext.SetStrategyStep (ERemoveFirstTftStep);
break;
case KDeleteTFT:
- SPUDTELVERBOSE_INFO_LOG(_L("TftOperationCode - Delete TFT"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_4, "TftOperationCode - Delete TFT");
// delete old TFT
aContext.PacketContext().DeleteTFT(*aStatus);
aContext.SetStrategyStep (EDeleteTftStep);
@@ -877,7 +883,7 @@
default:
// wrong case
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_5, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1004,7 +1010,7 @@
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NEXT_6, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1029,12 +1035,12 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftChanged"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: ETftChanged");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftChanged);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: ETftChangedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: ETftChangedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::ETftChangedFailed, aCompletionStatus.Int());
}
}
@@ -1049,28 +1055,28 @@
{
case EDeleteTftStep:
{
- SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextDeleteTFTCancel"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketQoS::EPacketContextDeleteTFTCancel");
aContext.PacketQoS().CancelAsyncRequest(EPacketContextDeleteTFTCancel);
break;
}
case ERemoveTftStep:
{
- SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextRemovePacketFilterCancel"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketQoS::EPacketContextRemovePacketFilterCancel");
aContext.PacketQoS().CancelAsyncRequest(EPacketContextRemovePacketFilterCancel);
break;
}
case EAddTftStep:
{
- SPUDTEL_INFO_LOG(_L("Cancel PacketQoS::EPacketContextAddPacketFilter"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_3, "Cancel PacketQoS::EPacketContextAddPacketFilter");
aContext.PacketQoS().CancelAsyncRequest(EPacketContextAddPacketFilterCancel);
break;
}
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TChangeTftStrategy::CancelAsyncRequest"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_4, "ERROR: Incorrect case in TChangeTftStrategy::CancelAsyncRequest");
ASSERT(EFalse);
break;
}
@@ -1087,7 +1093,7 @@
*/
void TActivatePdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TActivatePdpStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next()");
TInt err = KErrNone;
@@ -1165,7 +1171,7 @@
if (KPrimaryContextId == aContext.Id())
{
aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpNegProfileParameters ();
#endif
aContext.SetStrategyStep (EGetProfileParamsStep);
@@ -1195,7 +1201,7 @@
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NEXT_2, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1219,26 +1225,26 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set: DataChannelV2"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_1, "FSM set: DataChannelV2");
aContext.PdpFsmInterface().Set(aContext.Id(), aContext.DataChannelV2());
#ifdef SYMBIAN_NETWORKING_UMTSR5
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_2, "FSM set: QoSR5Negotiated");
aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5());
#else
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_3, "FSM set: QoSR99_R4Negotiated");
aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4());
#endif
// SYMBIAN_NETWORKING_UMTSR5
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_4, "Notifying FSM: EPdpActivated");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivated);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivatedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_NOTIFYFSM_5, "Notifying FSM: EPdpActivatedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivatedFailed, aCompletionStatus.Int());
}
}
@@ -1254,21 +1260,21 @@
case EActivateStep:
{
aContext.PacketContext().CancelAsyncRequest(EPacketContextActivate);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextActivate"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketContext::EPacketContextActivate");
break;
}
case EGetConfigStep:
{
aContext.PacketContext().CancelAsyncRequest(EGetConfigStep);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EGetConfigStep"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EGetConfigStep");
break;
}
case EInitialiseContextStep:
{
aContext.PacketContext().CancelAsyncRequest(EPacketContextInitialiseContext);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextInitialiseContext"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_3, "Cancel PacketContext::EPacketContextInitialiseContext");
break;
}
@@ -1277,14 +1283,14 @@
if(KPrimaryContextId == aContext.Id())
{
aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_4, "Cancel PacketContext::EPacketQoSGetProfileParams");
break;
}
}
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5, "ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest");
ASSERT(EFalse);
break;
}
@@ -1300,7 +1306,7 @@
*/
void TGetNegQoSStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TGetNegQoSStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_1, "TGetNegQoSStrategy::Next()");
TInt err = KErrNone;
@@ -1309,7 +1315,7 @@
case EStartStep:
{
aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpNegProfileParameters ();
#endif
aContext.SetStrategyStep (EGetProfileParamsStep);
@@ -1324,7 +1330,7 @@
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NEXT_2, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1349,23 +1355,23 @@
if(aCompletionStatus == KErrNone)
{
#ifdef SYMBIAN_NETWORKING_UMTSR5
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NOTIFYFSM_1, "FSM set: QoSR5Negotiated");
aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5());
#else
// !SYMBIAN_NETWORKING_UMTSR5
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NOTIFYFSM_2, "FSM set: QoSR99_R4Negotiated");
aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4());
#endif
// SYMBIAN_NETWORKING_UMTSR5
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpNegQoSRetrieved"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NOTIFYFSM_3, "Notifying FSM: EPdpNegQoSRetrieved");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpNegQoSRetrieved);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpNegQoSRetrievedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_NOTIFYFSM_4, "Notifying FSM: EPdpNegQoSRetrievedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpNegQoSRetrievedFailed, aCompletionStatus.Int());
}
}
@@ -1381,13 +1387,13 @@
case EGetProfileParamsStep:
{
aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketContext::EPacketQoSGetProfileParams");
break;
}
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TGetNegQoSStrategy::CancelAsyncRequest"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_2, "ERROR: Incorrect case in TGetNegQoSStrategy::CancelAsyncRequest");
ASSERT(EFalse);
break;
}
@@ -1404,7 +1410,7 @@
*/
void TModifyActiveStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TModifyActiveStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_1, "TModifyActiveStrategy::Next()");
TInt err = KErrNone;
@@ -1429,7 +1435,7 @@
case EModifyActiveStep:
{
aContext.PacketQoS().GetProfileParameters (*aStatus, aContext.QosNegotiatedPckg());
-#ifdef _DEBUG
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
aContext.DumpNegProfileParameters ();
#endif
aContext.SetStrategyStep (EGetProfileParamsStep);
@@ -1444,7 +1450,7 @@
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NEXT_2, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1471,22 +1477,22 @@
if(aContext.ContextType() != SpudMan::EMbms)
{
#ifdef SYMBIAN_NETWORKING_UMTSR5
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR5Negotiated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NOTIFYFSM_1, "FSM set: QoSR5Negotiated");
aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR5());
#else
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set: QoSR99_R4Negotiated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NOTIFYFSM_2, "FSM set: QoSR99_R4Negotiated");
aContext.PdpFsmInterface().Set(aContext.Id(), aContext.QosNegotiated().NegotiatedQoSR99_R4());
#endif
// SYMBIAN_NETWORKING_UMTSR5
}
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpContextModified"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NOTIFYFSM_3, "Notifying FSM: EPdpContextModified");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpContextModified);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpContextModifiedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_NOTIFYFSM_4, "Notifying FSM: EPdpContextModifiedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpContextModifiedFailed, aCompletionStatus.Int());
}
}
@@ -1502,20 +1508,20 @@
case EModifyActiveStep:
{
aContext.PacketContext().CancelAsyncRequest(EPacketContextModifyActiveContext);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextModifyActiveContext"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_1, "Cancel PacketContext::EPacketContextModifyActiveContext");
break;
}
case EGetProfileParamsStep:
{
aContext.PacketContext().CancelAsyncRequest(EPacketQoSGetProfileParams);
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketQoSGetProfileParams"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EPacketQoSGetProfileParams");
break;
}
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TModifyActiveStrategy::CancelAsyncRequest"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_3, "ERROR: Incorrect case in TModifyActiveStrategy::CancelAsyncRequest");
ASSERT(EFalse);
break;
}
@@ -1538,7 +1544,7 @@
*/
void TCreateMbmsPdpContextStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TCreateMbmsPdpContextStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1, "TCreateMbmsPdpContextStrategy::Next()");
TInt err = KErrNone;
@@ -1553,7 +1559,7 @@
err = aContext.MbmsPacketContext().OpenNewContext (aContext.PacketService(), aContext.Name());
if (err)
{
- SPUDTEL_ERROR_LOG(_L("PacketContextOpenNewContext returned for MBMS %d"), err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2, "PacketContextOpenNewContext returned for MBMS %d", err);
break;
}
@@ -1577,7 +1583,7 @@
break;
default:
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1601,12 +1607,12 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EMbmsPdpContextCreated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_1, "Notifying FSM: EMbmsPdpContextCreated");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EMbmsPdpContextCreated);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: E1ryPdpContextCreatedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_2, "Notifying FSM: E1ryPdpContextCreatedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EMbmsPdpContextCreatedFailed, aCompletionStatus.Int());
}
}
@@ -1617,20 +1623,20 @@
*/
void TCreateMbmsPdpContextStrategy::CancelAsyncRequest(CEtelDriverContext& aContext)
{
- SPUDTEL_FNLOG("TCreate1ryPdpContextStrategy::CancelAsyncRequest()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1, "TCreate1ryPdpContextStrategy::CancelAsyncRequest()");
switch(aContext.StrategyStep())
{
case ESetConfigStep:
{
- SPUDTEL_INFO_LOG(_L("Cancel PacketContext::EPacketContextSetConfig"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2, "Cancel PacketContext::EPacketContextSetConfig");
aContext.PacketContext().CancelAsyncRequest(EPacketContextSetConfig);
break;
}
default:
// there're NO outstanding async requests
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3, "ERROR: Incorrect case");
ASSERT(EFalse);
break;
}
@@ -1647,7 +1653,7 @@
*/
void TActivateMbmsPdpStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TActivatePdpStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_1, "TActivatePdpStrategy::Next()");
TInt err = KErrNone;
@@ -1690,7 +1696,7 @@
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NEXT_2, "ERROR: Incorrect case");
ASSERT(EFalse);
err = KErrNotSupported;
break;
@@ -1714,16 +1720,16 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTELVERBOSE_INFO_LOG(_L("FSM set: DataChannelV2"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_1, "FSM set: DataChannelV2");
aContext.PdpFsmInterface().Set(aContext.Id(), aContext.DataChannelV2());
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivated"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_2, "Notifying FSM: EPdpActivated");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivated);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: EPdpActivatedFailed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_3, "Notifying FSM: EPdpActivatedFailed");
aContext.PdpFsmInterface().Input(aContext.Id(), PdpFsm::EPdpActivatedFailed, aCompletionStatus.Int());
}
}
@@ -1739,28 +1745,28 @@
case EActivateStep:
{
aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextActivate);
- SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EPacketContextActivate"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_1, "Cancel MbmsPacketContext::EPacketContextActivate");
break;
}
case EGetConfigStep:
{
aContext.MbmsPacketContext().CancelAsyncRequest(EGetConfigStep);
- SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EGetConfigStep"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_2, "Cancel MbmsPacketContext::EGetConfigStep");
break;
}
case EInitialiseContextStep:
{
aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextInitialiseContext);
- SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EPacketContextInitialiseContext"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_3, "Cancel MbmsPacketContext::EPacketContextInitialiseContext");
break;
}
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_4, "ERROR: Incorrect case in TActivatePdpStrategy::CancelAsyncRequest");
ASSERT(EFalse);
break;
}
@@ -1776,7 +1782,7 @@
*/
void TMbmsSessionUpdateStrategy::Next(CEtelDriverContext& aContext, TRequestStatus* aStatus)
{
- SPUDTEL_FNLOG("TMbmsSessionUpdateStrategy::Next()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NEXT_1, "TMbmsSessionUpdateStrategy::Next()");
TInt err = KErrNone;
switch(aContext.StrategyStep())
@@ -1884,12 +1890,12 @@
{
if(aCompletionStatus == KErrNone)
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: TMbmsSessionUpdateStrategy"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_1, "Notifying FSM: TMbmsSessionUpdateStrategy");
aContext.PdpFsmInterface().Input(aContext.Id(), SpudMan::EMbmsParameterUpdate);
}
else
{
- SPUDTEL_INFO_LOG(_L("Notifying FSM: TMbmsSessionUpdateStrategy"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_2, "Notifying FSM: TMbmsSessionUpdateStrategy");
aContext.PdpFsmInterface().Input(aContext.Id(), SpudMan::EMbmsParameterUpdate, aCompletionStatus.Int());
}
}
@@ -1905,20 +1911,20 @@
case EUpdateMbmsSessionList:
{
aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextSetConfig);
- SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EUpdateMbmsSessionList"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_1, "Cancel MbmsPacketContext::EUpdateMbmsSessionList");
break;
}
case EPrepareSessionList:
{
aContext.MbmsPacketContext().CancelAsyncRequest(EPacketContextSetConfig);
- SPUDTEL_INFO_LOG(_L("Cancel MbmsPacketContext::EPrepareSessionList"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_2, "Cancel MbmsPacketContext::EPrepareSessionList");
break;
}
default:
// unexpected
- SPUDTEL_ERROR_LOG0(_L("ERROR: Incorrect case in TMbmsSessionUpdateStrategy::CancelAsyncRequest"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_3, "ERROR: Incorrect case in TMbmsSessionUpdateStrategy::CancelAsyncRequest");
ASSERT(EFalse);
break;
}
--- a/telephonyprotocols/pdplayer/umts/spudtel/src/reteldriverinput.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/reteldriverinput.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,13 +20,19 @@
@internalComponent
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "reteldriverinputTraces.h"
+#endif
+
#include <e32def.h>
#include <e32std.h>
#include "ceteldriverfactory.h"
#include "ceteldrivercontext.h"
#include "reteldriverinput.h"
-#include "spudteldebuglogger.h"
using namespace EtelDriver;
@@ -38,7 +44,7 @@
REtelDriverInput::~REtelDriverInput()
{
- SPUDTEL_FNLOG("REtelDriverInput::~REtelDriverInput()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_DTOR_1, "REtelDriverInput::~REtelDriverInput()");
if (iDriverFactory)
{
@@ -53,7 +59,7 @@
*/
void REtelDriverInput::OpenL (CPdpFsmInterface& aPdpFsmInterface)
{
- SPUDTEL_FNLOG("REtelDriverInput::OpenL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_OPENL_1, "REtelDriverInput::OpenL()");
// internal check
iDriverFactory = CEtelDriverFactory::NewL(aPdpFsmInterface);
@@ -68,7 +74,7 @@
*/
void REtelDriverInput::Close()
{
- SPUDTEL_FNLOG("REtelDriverInput::Close()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CLOSE_1, "REtelDriverInput::Close()");
// cancel all outstanding requests
if (iDriverFactory)
@@ -89,8 +95,8 @@
*/
void REtelDriverInput::CreatePdpL (TContextId aPdpId,SpudMan::TPdpContextType aContextType)
{
- SPUDTEL_FNLOG("REtelDriverInput::CreatePdpL()");
- SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CREATEPDPL_1, "REtelDriverInput::CreatePdpL()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CREATEPDPL_2, "pdp id : %d", aPdpId);
ASSERT(iDriverFactory);
iDriverFactory->CreatePdpL (aPdpId,aContextType );
@@ -102,8 +108,8 @@
*/
void REtelDriverInput::DeletePdp (TContextId aPdpId)
{
- SPUDTEL_FNLOG("REtelDriverInput::DeletePdp()");
- SPUDTELVERBOSE_INFO_LOG1(_L("pdp id : %d"), aPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_DELETEPDP_1, "REtelDriverInput::DeletePdp()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_DELETEPDP_2, "pdp id : %d", aPdpId);
if(iDriverFactory)
{
@@ -118,8 +124,8 @@
*/
void REtelDriverInput::Input(TContextId aPdpId, TEtelInput aOperation)
{
- SPUDTEL_FNLOG("REtelDriverInput::Input()");
- SPUDTEL_INFO_LOG2(_L("REtelDriverInput::Input: pdp id : %d, operation %d"), aPdpId, aOperation);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_INPUT_1, "REtelDriverInput::Input()");
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_INPUT_2, "REtelDriverInput::Input: pdp id : %d, operation %d", aPdpId, aOperation);
ASSERT(iDriverFactory);
iDriverFactory->Context(aPdpId).Input(aOperation);
@@ -131,8 +137,8 @@
*/
void REtelDriverInput::CancelPdp (TContextId aPdpId)
{
- SPUDTEL_FNLOG("REtelDriverInput::CancelPdp()");
- SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdp: pdp id : %d"), aPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDP_1, "REtelDriverInput::CancelPdp()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDP_2, "REtelDriverInput::CancelPdp: pdp id : %d", aPdpId);
ASSERT(iDriverFactory);
iDriverFactory->Context(aPdpId).Cancel();
@@ -144,7 +150,7 @@
*/
void REtelDriverInput::StartPdpNotifications(TContextId aPdpId)
{
- SPUDTEL_FNLOG("REtelDriverInput::StartPdpNotifications()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_STARTPDPNOTIFICATIONS_1, "REtelDriverInput::StartPdpNotifications()");
ASSERT(iDriverFactory);
iDriverFactory->StartPdpNotifications(aPdpId);
@@ -156,8 +162,8 @@
*/
void REtelDriverInput::CancelPdpNotifications (TContextId aPdpId)
{
- SPUDTEL_FNLOG("REtelDriverInput::CancelPdpNotifications()");
- SPUDTEL_INFO_LOG1(_L("REtelDriverInput::CancelPdpNotifications: pdp id : %d"), aPdpId);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_1, "REtelDriverInput::CancelPdpNotifications()");
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_2, "REtelDriverInput::CancelPdpNotifications: pdp id : %d", aPdpId);
ASSERT(iDriverFactory);
iDriverFactory->CancelPdpNotifications (aPdpId);
@@ -166,7 +172,7 @@
/** cancels last operations for all created pdp contexts */
void REtelDriverInput::CancelAllPdps ()
{
- SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdps()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELALLPDPS_1, "REtelDriverInput::CancelAllPdps()");
ASSERT(iDriverFactory);
for(TContextId i = 0; i < static_cast<TContextId>(iDriverFactory->ContextCount()); i++)
@@ -181,7 +187,7 @@
/** cancels all notifications for all pdp contexts */
void REtelDriverInput::CancelAllPdpNotifications ()
{
- SPUDTEL_FNLOG("REtelDriverInput::CancelAllPdpNotifications()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, RETELDRIVERINPUT_CANCELALLPDPNOTIFICATIONS_1, "REtelDriverInput::CancelAllPdpNotifications()");
ASSERT(iDriverFactory);
iDriverFactory->CancelAllPdpNotifications();
--- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/group/te_UmtsGprsScpr.iby Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/group/te_UmtsGprsScpr.iby Fri Jun 11 14:49:29 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -63,6 +63,7 @@
data=EPOCROOT##epoc32\data\z\TestData\Configs\te_simtsy.ini Testdata\configs\te_simtsy.ini
data=EPOCROOT##epoc32\data\z\TestData\Configs\te_umtsgprsscpr_config.txt Testdata\configs\te_umtsgprsscpr_config.txt
data=EPOCROOT##epoc32\data\z\TestData\Configs\te_umtsgprsscpr_config2.txt Testdata\configs\te_umtsgprsscpr_config2.txt
+data=EPOCROOT##epoc32\data\z\TestData\Configs\te_umtsgprsscpr_config_noqostestnif.txt Testdata\configs\te_umtsgprsscpr_config_noqostestnif.txt
data=EPOCROOT##epoc32\data\z\TestData\Scripts\te_UmtsGprsSCPRConfig1Case1.script Testdata\scripts\te_UmtsGprsSCPRConfig1Case1.script
--- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2_noguqos.script Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig2_noguqos.script Fri Jun 11 14:49:29 2010 +0300
@@ -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,6 +20,24 @@
PRINT Run all Configuration 2 Test Cases
+
+// Ensure that the default config is present if no cleverer one has been put there already
+RUN_SCRIPT z:\testdata\scripts\exec_esock_default_to_config_1.script
+
+
+RUN_UTILS MkDir c:\simtsy\
+RUN_UTILS MkDir c:\private\
+RUN_UTILS MkDir c:\private\101F7989\
+RUN_UTILS MkDir c:\private\101F7989\esock\
+RUN_UTILS MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS MakeReadWrite c:\config.txt
+RUN_UTILS MakeReadWrite c:\loopback.ini
+RUN_UTILS DeleteFile c:\simtsy\config.txt
+RUN_UTILS DeleteFile c:\config.txt
+RUN_UTILS DeleteFile c:\loopback.ini
+RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config.txt c:\simtsy\config.txt
+RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config.txt c:\config.txt
+RUN_UTILS CopyFile z:\TestData\Configs\TE_UmtsGprsScprLoopbackCSY.ini c:\loopback.ini
RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
CED -i z:\testdata\configs\te_UmtsGprsScpr.xml ced.log
--- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig3.script Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_UmtsGprsScprConfig3.script Fri Jun 11 14:49:29 2010 +0300
@@ -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,9 +20,41 @@
PRINT Run all Configuration 3 Test Cases
+
+// Ensure that the default config is present if no cleverer one has been put there already
+RUN_SCRIPT z:\testdata\scripts\exec_esock_default_to_config_1.script
+
+RUN_UTILS MkDir c:\simtsy\
+RUN_UTILS MkDir c:\private\
+RUN_UTILS MkDir c:\private\101F7989\
+RUN_UTILS MkDir c:\private\101F7989\esock\
+RUN_UTILS MakeReadWrite c:\simtsy\config.txt
+RUN_UTILS MakeReadWrite c:\config.txt
+RUN_UTILS MakeReadWrite c:\loopback.ini
+RUN_UTILS DeleteFile c:\simtsy\config.txt
+RUN_UTILS DeleteFile c:\config.txt
+RUN_UTILS DeleteFile c:\loopback.ini
+RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config.txt c:\simtsy\config.txt
+RUN_UTILS CopyFile z:\TestData\Configs\te_umtsgprsscpr_config.txt c:\config.txt
+RUN_UTILS CopyFile z:\TestData\Configs\TE_UmtsGprsScprLoopbackCSY.ini c:\loopback.ini
+RUN_SCRIPT Z:\TestData\scripts\te_esock_test_unloadesockForced.script
+
CED -i z:\testdata\configs\te_UmtsGprsScprNoSpud.xml ced.log
+// remove ip.qos.esk and qospolicies.ini from environment, so QoS FW and GuQoS is not loaded
+RUN_UTILS MkDir C:\te_UmtsGprSscpr_temp\
+RUN_UTILS CopyFile C:\private\101f7989\ESock\qospolicies.ini C:\te_UmtsGprSscpr_temp\qospolicies.ini
+RUN_UTILS CopyFile C:\private\101f7989\ESock\ip.qos.esk C:\te_UmtsGprSscpr_temp\ip.qos.esk
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\qospolicies.ini
+RUN_UTILS MakeReadWrite c:\private\101F7989\esock\ip.qos.esk
+RUN_UTILS MakeReadWrite c:\qospolicies.ini
+RUN_UTILS DeleteFile C:\private\101f7989\ESock\qospolicies.ini
+RUN_UTILS DeleteFile C:\private\101f7989\ESock\ip.qos.esk
+RUN_UTILS DeleteFile C:\qospolicies.ini
+
+
+
START_TESTCASE NET-UMTS-UmtsGprsSCPR-0801
//! @SYMTestCaseID NET-UMTS-UmtsGprsSCPR-0801
//! @SYMTestCaseDesc Set qos on Primary without the presense of SPUD
--- a/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_cap_umtsgprsscpr_noqostestnif.script Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/Te_UmtsGprsSCPR/scripts/te_cap_umtsgprsscpr_noqostestnif.script Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -59,6 +59,8 @@
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
+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\te_umtsgprsscpr_config_noqostestnif.txt c:\simtsy\config.txt
@@ -68,6 +70,8 @@
CED -i z:\testdata\configs\te_umtsgprsscpr_captest.cfg ced.log
RUN_SCRIPT Z:\TestData\Scripts\te_Cap_UmtsGprsScprConfig1Case1.script
+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\te_umtsgprsscpr_config.txt c:\simtsy\config.txt
@@ -105,6 +109,8 @@
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
+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\te_umtsgprsscpr_config_noqostestnif.txt c:\simtsy\config.txt
@@ -114,6 +120,8 @@
CED -i z:\testdata\configs\te_umtsgprsscpr_captest.cfg ced.log
RUN_SCRIPT Z:\TestData\Scripts\te_Cap_UmtsGprsScprConfig1Case1.script
+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\te_umtsgprsscpr_config.txt c:\simtsy\config.txt
@@ -152,6 +160,8 @@
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
+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\te_umtsgprsscpr_config_noqostestnif.txt c:\simtsy\config.txt
@@ -161,6 +171,8 @@
CED -i z:\testdata\configs\te_umtsgprsscpr_captest.cfg ced.log
RUN_SCRIPT Z:\TestData\Scripts\te_Cap_UmtsGprsScprConfig1Case1.script
+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\te_umtsgprsscpr_config.txt c:\simtsy\config.txt
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/group/TE_SpudUnit.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/group/TE_SpudUnit.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -91,6 +91,8 @@
USERINCLUDE ../../../spudtel/inc
USERINCLUDE ../../../spudfsm/inc
USERINCLUDE ../../../spudfsm/src
+USERINCLUDE ../traces
+
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/inc/InputRequestListener.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/inc/InputRequestListener.h Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -162,7 +162,7 @@
};
public:
-static CInputRequestListener* NewL(TBool aUseTestPdpFsmInterface, TInt aUmtsRelease);
+static CInputRequestListener* NewL(TBool aUseTestPdpFsmInterface, TThreadId aParentThreadId, TInt aUmtsRelease);
virtual ~CInputRequestListener();
void Activate();
void RunL();
@@ -173,7 +173,7 @@
private:
CInputRequestListener(TBool aUseTestPdpFsmInterface, TInt aUmtsRelease);
- void ConstructL();
+ void ConstructL(TThreadId aParentThreadId);
void CreateEtelDriverL();
void CreatePdpFsmL();
@@ -256,7 +256,6 @@
{
public:
CInputRequestListener* iListener;
- TThreadId iThreadId;
};
/** The start-up method for the thread running the active objects */
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/ActiveSchedulerThread.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/ActiveSchedulerThread.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,14 +29,12 @@
/**
Creates and starts the active scheduler, and initializes the units under test
*/
-void ActiveSchedulerMainL(CInputRequestListener* aListener, TThreadId aParentThreadId)
+void ActiveSchedulerMainL(CInputRequestListener* aListener)
{
CActiveScheduler *sched = new(ELeave) CActiveScheduler;
CleanupStack::PushL(sched);
CActiveScheduler::Install(sched);
- aListener->iParentThread.Open(aParentThreadId);
-
__UHEAP_MARK;
CActiveScheduler::Add(aListener);
@@ -63,9 +61,8 @@
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();
+ TRequestStatus *destructedStatus = &aListener->iThreadDestructed;
+ aListener->iParentThread.RequestComplete(destructedStatus, KErrNone);
}
/**
@@ -80,7 +77,7 @@
}
TActiveSchedulerThreadParams *params = (TActiveSchedulerThreadParams*)aActiveSchedulerParams;
- TRAPD(err, ActiveSchedulerMainL(params->iListener, params->iThreadId));
+ TRAPD(err, ActiveSchedulerMainL(params->iListener));
delete cleanup;
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/CPdpFsmInterface.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,12 +19,14 @@
@file
*/
-
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cpdpfsminterfaceTraces.h"
+#endif
#include "CPdpFsmInterface.h"
#include "cpdpfsmfactory.h"
-#include "spudfsmdebuglogger.h"
//-=========================================================
// Custom methods
@@ -35,15 +37,17 @@
iUmtsRelease(TPacketDataConfigBase::KConfigGPRS)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_1, ">>CPdpFsmInterface::()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CTOR_2, "<<CPdpFsmInterface::()");
}
CPdpFsmInterface::~CPdpFsmInterface()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_1, ">>CPdpFsmInterface::()");
CPdpFsmInterface::Close();
delete iPdpFsmFactory;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_DTOR_2, "<<CPdpFsmInterface::()");
}
//-=========================================================
@@ -55,32 +59,34 @@
*/
void CPdpFsmInterface::OpenL(TName& aTsyName, TInt aUmtsRelease)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::OpenL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_1, ">>CPdpFsmInterface::OpenL()");
iUmtsRelease = aUmtsRelease;
iPdpFsmFactory = CPdpFsmFactory::NewL();
iPdpFsmFactory->InitL(aTsyName, this);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_OPEN_2, "<<CPdpFsmInterface::OpenL()");
}
/** closes the FSM and frees underlying resources
*/
void CPdpFsmInterface::Close()
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Close()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_1, ">>CPdpFsmInterface::Close()");
if (iPdpFsmFactory)
{
iPdpFsmFactory->Close();
}
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_CLOSE_2, "<<CPdpFsmInterface::Close()");
}
TContextId CPdpFsmInterface::NewFsmContextL(MPdpFsmEventHandler& aPdpFsmEventHandler,SpudMan::TPdpContextType aContextType)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::NewFsmContext()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWFSMCONTESTL_1, ">>CPdpFsmInterface::NewFsmContext()");
ASSERT(iPdpFsmFactory);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_NEWFSMCONTESTL_2, "<<CPdpFsmInterface::NewFsmContext()");
return iPdpFsmFactory->NewFsmContextL(aPdpFsmEventHandler,aContextType);
}
@@ -98,7 +104,7 @@
{
TInt ret = KErrNone;
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Input(aParam)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_1, ">>CPdpFsmInterface::Input(aParam)");
ASSERT(iPdpFsmFactory);
@@ -158,7 +164,7 @@
{
ret = KErrBadHandle;
}
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_INPUT_2, "<<CPdpFsmInterface::Input(aParam)");
return ret;
}
@@ -171,7 +177,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Requested& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -185,6 +191,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Requested)");
return KErrNone;
}
@@ -196,7 +203,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR5Negotiated& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -210,6 +217,7 @@
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_1_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR5Negotiated)");
return KErrNone;
}
@@ -225,7 +233,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Requested& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -240,6 +248,7 @@
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_2_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Requested)");
return KErrNone;
}
@@ -251,7 +260,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketQoS::TQoSR99_R4Negotiated& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_3_1, ">>CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -266,7 +275,7 @@
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_3_2, "<<CPdpFsmInterface::Set(RPacketQoS::TQoSR99_R4Negotiated)");
return KErrNone;
}
@@ -287,7 +296,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TFTInfo)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_4_1, ">>CPdpFsmInterface::Set(TFTInfo)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -301,6 +310,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_4_2, "<<CPdpFsmInterface::Set(TFTInfo)");
return KErrNone;
}
@@ -312,7 +322,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TTFTOperationCode& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(TTFTOperationCode)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_5_1, ">>CPdpFsmInterface::Set(TTFTOperationCode)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -326,6 +336,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_5_2, "<<CPdpFsmInterface::Set(TTFTOperationCode)");
return KErrNone;
}
@@ -337,7 +348,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TDataChannelV2& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_6_1, ">>CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -351,6 +362,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_6_2, "<<CPdpFsmInterface::Set(RPacketContext::TDataChannelV2)");
return KErrNone;
}
@@ -363,7 +375,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const RPacketContext::TContextStatus& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_7_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -377,6 +389,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_7_2, "<<CPdpFsmInterface::Set(RPacketContext::TContextStatus)");
return KErrNone;
}
@@ -388,7 +401,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TPacketDataConfigBase& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACESET_8_1, ">>CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -402,6 +415,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACESET_8_2, "<<CPdpFsmInterface::Set(RPacketContext::TContextConfigGPRS)");
return KErrNone;
}
@@ -411,11 +425,12 @@
*/
void CPdpFsmInterface::Set(const RPacketService::TStatus aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketService::TStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_9_1, ">>CPdpFsmInterface::Set(RPacketService::TStatus)");
ASSERT(iPdpFsmFactory);
iNetworkStatus = aParam;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_9_2, "<<CPdpFsmInterface::Set(RPacketService::TStatus)");
}
@@ -431,7 +446,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Requested& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -445,6 +460,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSR5Requested)");
return KErrNone;
}
@@ -456,7 +472,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR5Negotiated& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -470,6 +486,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_1_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR5Negotiated)");
return KErrNone;
}
@@ -484,7 +501,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Requested& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2_1, ">>CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -498,6 +515,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_2_2, "<<CPdpFsmInterface::Get(RPacketQos::TQoSRequestedR99_R4)");
return KErrNone;
}
@@ -509,7 +527,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketQoS::TQoSR99_R4Negotiated& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_3_1, ">>CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -523,6 +541,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_3_2, "<<CPdpFsmInterface::Get(RPacketQoS::TQoSR99_R4Negotiated)");
return KErrNone;
}
@@ -541,7 +560,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTInfo& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_4_1, ">>CPdpFsmInterface::Get(TFTInfo)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -555,6 +574,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_4_2, "<<CPdpFsmInterface::Get(TFTInfo)");
return KErrNone;
}
@@ -566,7 +586,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TTFTOperationCode& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(TFTInfo)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_5_1, ">>CPdpFsmInterface::Get(TFTInfo)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -580,6 +600,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_5_2, "<<CPdpFsmInterface::Get(TFTInfo)");
return KErrNone;
}
@@ -592,7 +613,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TDataChannelV2& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_6_1, ">>CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -606,6 +627,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_6_2, "<<CPdpFsmInterface::Get(RPacketContext::TDataChannelV2)");
return KErrNone;
}
@@ -617,7 +639,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TPacketDataConfigBase& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_7_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
ASSERT( aParam.ExtensionId() == TPacketDataConfigBase::KConfigGPRS ||
aParam.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4 ||
@@ -635,6 +657,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_7_2, "<<CPdpFsmInterface::Get(RPacketContext::TContextConfigGPRS)");
return KErrNone;
}
@@ -646,7 +669,7 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, RPacketContext::TContextStatus& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_8_1, ">>CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
ASSERT(iPdpFsmFactory);
ASSERT(iPdpFsmFactory->ContextIdIsValid(aPdpId));
@@ -660,6 +683,7 @@
// }
// }
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_8_2, "<CPdpFsmInterface::Get(RPacketContext::TContextStatus)");
return KErrNone;
}
@@ -671,11 +695,12 @@
*/
void CPdpFsmInterface::Get(RPacketService::TStatus& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Get(RPacketService::TStatus)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_9_1, ">>CPdpFsmInterface::Get(RPacketService::TStatus)");
ASSERT(iPdpFsmFactory);
aParam = iNetworkStatus;
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_9_2, "<<CPdpFsmInterface::Get(RPacketService::TStatus)");
}
@@ -685,10 +710,10 @@
*/
const TName& CPdpFsmInterface::TsyName(void)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::TsyName");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_1, ">>CPdpFsmInterface::TsyName");
ASSERT(iPdpFsmFactory);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_TSYNAME_2, "<<CPdpFsmInterface::TsyName");
return iPdpFsmFactory->TsyName();
}
@@ -701,10 +726,11 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId,RPacketMbmsContext::TContextConfigMbmsV1& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_10_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_10_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}
@@ -717,7 +743,7 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId,const RPacketMbmsContext::TContextConfigMbmsV1& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_10_1, "CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
@@ -735,10 +761,11 @@
*/
TInt CPdpFsmInterface::Set(TContextId aPdpId, const TSessionOperatioInfo& aParam)
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Set(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_SET_11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}
@@ -751,10 +778,11 @@
*/
TInt CPdpFsmInterface::Get(TContextId aPdpId, TSessionOperatioInfo& aParam) const
{
- SPUDFSMVERBOSE_FNLOG("CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_11_1, ">>CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
ASSERT(iPdpFsmFactory);
iPdpFsmFactory->GetFsmContext(aPdpId)->Get(aParam);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMINTERFACE_GET_11_2, "<<CPdpFsmInterface::Set(RPacketMbmsContext::TContextConfigMbmsV1)");
return KErrNone;
}
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/InputRequestListener.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/InputRequestListener.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -31,11 +31,11 @@
#include "cpdpfsmfactory.h"
#include "DefaultContextParameters.h"
-CInputRequestListener* CInputRequestListener::NewL(TBool aUseTestPdpInterface, TInt aUmtsRelease)
+CInputRequestListener* CInputRequestListener::NewL(TBool aUseTestPdpInterface, TThreadId aParentThreadId, TInt aUmtsRelease)
{
CInputRequestListener *me = new(ELeave) CInputRequestListener(aUseTestPdpInterface, aUmtsRelease);
CleanupStack::PushL(me);
- me->ConstructL();
+ me->ConstructL(aParentThreadId);
CleanupStack::Pop(me);
return me;
}
@@ -62,8 +62,10 @@
iUmtsRelease = aUmtsRelease;
}
-void CInputRequestListener::ConstructL()
- { }
+void CInputRequestListener::ConstructL(TThreadId aParentThreadId)
+ {
+ User::LeaveIfError(iParentThread.Open(aParentThreadId));
+ }
CInputRequestListener::~CInputRequestListener()
{
@@ -90,6 +92,7 @@
}
iEventHandlers.ResetAndDestroy();
+ iParentThread.Close();
}
void CInputRequestListener::DoCancel()
--- a/telephonyprotocols/pdplayer/umts/test/te_spud/src/SpudUnitTestStepBase.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/src/SpudUnitTestStepBase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -66,20 +66,19 @@
{
case KSimTsyTestNumberR5OrR99R4:
#ifdef SYMBIAN_NETWORKING_UMTSR5
- iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, TPacketDataConfigBase::KConfigRel5);
+ iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, RThread().Id(), TPacketDataConfigBase::KConfigRel5);
#else
- iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, TPacketDataConfigBase::KConfigRel99Rel4);
+ iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, RThread().Id(), TPacketDataConfigBase::KConfigRel99Rel4);
#endif
break;
default:
- iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, TPacketDataConfigBase::KConfigGPRS);
+ iListener = CInputRequestListener::NewL(iUseTestPdpFsmInterface, RThread().Id(), TPacketDataConfigBase::KConfigGPRS);
break;
}
// creating and start the thread that will run the active scheduler containing SPUD or SPUDTEL
TActiveSchedulerThreadParams params;
- params.iListener = iListener;
- params.iThreadId = RThread().Id();
+ params.iListener = iListener;
_LIT(activeSchedulerThreadName, "ActiveSchedulerThread_");
TBuf<255> buf(activeSchedulerThreadName);
buf.AppendNum(iTestNumber);
@@ -103,10 +102,8 @@
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);
+ // wait until the thread has cleaned up (don't kill the thread, it will die by itself)
+ User::WaitForRequest(iListener->iThreadDestructed);
iActiveSchedulerThread.Close();
delete iListener;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/pdplayer/umts/test/te_spud/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,618 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_INTERNALS=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_CTOR_1=0x143
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DOCANCEL_1=0x14c
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DOCANCEL_2=0x14d
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DTOR_1=0x144
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_1=0x16e
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_10=0x177
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_11=0x178
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_12=0x179
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_13=0x17a
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_14=0x17b
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_15=0x17c
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_16=0x17d
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_17=0x17e
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_18=0x17f
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_2=0x16f
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_3=0x170
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_4=0x171
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_5=0x172
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_6=0x173
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_7=0x174
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_8=0x175
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_9=0x176
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_1=0x150
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_10=0x159
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_11=0x15a
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_12=0x15b
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_13=0x15c
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_14=0x15d
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_15=0x15e
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_16=0x15f
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_17=0x160
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_18=0x161
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_19=0x162
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_2=0x151
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_20=0x163
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_21=0x164
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_22=0x165
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_23=0x166
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_24=0x167
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_25=0x168
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_26=0x169
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_27=0x16a
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_28=0x16b
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_29=0x16c
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_3=0x152
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_30=0x16d
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_4=0x153
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_5=0x154
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_6=0x155
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_7=0x156
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_8=0x157
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_9=0x158
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_1=0x14e
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_2=0x14f
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_1=0x145
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_2=0x146
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_INPUT_3=0x147
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_1=0x148
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_2=0x149
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_3=0x14a
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERCONTEXT_RUNL_4=0x14b
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CANCELALLPDPNOTIFICATIONS_1=0x18c
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CANCELPDPNOTIFICATIONS_1=0x18b
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CREATEPDPL_1=0x187
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CREATEPDPL_2=0x188
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_CTOR_1=0x180
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_DTOR_1=0x182
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_DTOR_2=0x183
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_FREEPDP_1=0x189
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_INITL_1=0x185
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_INITL_2=0x186
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_NEWL_1=0x181
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERFACTORY_STARTPDPNOTIFICATIONS_1=0x18a
+[TRACE]TRACE_INTERNALS[0x88]_CETELDRIVERNOTIFIER_RUNL_1=0x18d
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x192
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x193
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x194
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x195
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x19a
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x19b
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x19c
+[TRACE]TRACE_INTERNALS[0x88]_CMBMSPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x19d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_DOCANCEL_1=0x18e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_1=0x18f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_2=0x190
+[TRACE]TRACE_INTERNALS[0x88]_CPDPCONFIGCHANGENOTIFIER_NOTIFY_3=0x191
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_1=0xb2
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CLOSE_2=0xb3
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_1=0xac
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_CTOR_2=0xad
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DELETEFSMCONTEXT_1=0xb9
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DELETEFSMCONTEXT_2=0xba
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DTOR_1=0xae
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_DTOR_2=0xaf
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_GETFSMCONTEXT_1=0xb4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_GETFSMCONTEXT_2=0xb5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_INITL_1=0xb0
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_INITL_2=0xb1
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_1=0xb6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_2=0xb7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWFSMCONTEXTL_3=0xb8
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWL_1=0xaa
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMFACTORY_NEWL_2=0xab
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACESET_8_1=0x248
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACESET_8_2=0x249
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CLOSE_1=0x232
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CLOSE_2=0x233
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_1=0x22c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_CTOR_2=0x22d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_1=0x22e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_DTOR_2=0x22f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1=0x24c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_10_1=0x262
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_10_2=0x263
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_11_1=0x267
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_11_2=0x268
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1_1=0x24e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_1_2=0x24f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2=0x24d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2_1=0x250
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_2_2=0x251
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_3_1=0x252
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_3_2=0x253
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_4_1=0x254
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_4_2=0x255
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_5_1=0x256
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_5_2=0x257
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_6_1=0x258
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_6_2=0x259
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_7_1=0x25a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_7_2=0x25b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_8_1=0x25c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_8_2=0x25d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_9_1=0x25e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_GET_9_2=0x25f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_1=0x236
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_INPUT_2=0x237
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_NEWFSMCONTESTL_1=0x234
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_NEWFSMCONTESTL_2=0x235
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_OPEN_1=0x230
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_OPEN_2=0x231
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_1=0x238
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_10_1=0x264
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_11_1=0x265
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_11_2=0x266
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_1_1=0x23a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_1_2=0x23b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_2=0x239
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_2_1=0x23c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_2_2=0x23d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_3_1=0x23e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_3_2=0x23f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_4_1=0x240
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_4_2=0x241
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_5_1=0x242
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_5_2=0x243
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_6_1=0x244
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_6_2=0x245
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_7_1=0x246
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_7_2=0x247
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_9_1=0x24a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_SET_9_2=0x24b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_TSYNAME_1=0x260
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSMINTERFACE_TSYNAME_2=0x261
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_1=0x96
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_2=0x97
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_3=0x98
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGMBMS_4=0x99
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_1=0x5a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_2=0x5b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_3=0x5c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGPRIMARY_4=0x5d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_1=0x6e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_2=0x6f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_3=0x70
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOACTIVATINGSECONDARY_4=0x71
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_1=0x76
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_2=0x77
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_3=0x78
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGQOS_4=0x79
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_1=0x7a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_2=0x7b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_3=0x7c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCHANGINGTFT_4=0x7d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_1=0x8a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_2=0x8b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_3=0x8c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCLOSING_4=0x8d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_1=0x9a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_2=0x9b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_3=0x9c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDMBMS_4=0x9d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_1=0x62
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_2=0x63
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_3=0x64
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATEDSECONDARY_4=0x65
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_1=0x92
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_2=0x93
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_3=0x94
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGMBMS_4=0x95
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_1=0x56
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_2=0x57
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_3=0x58
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGPRIMARY_4=0x59
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_1=0x5e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_2=0x5f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_3=0x60
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOCREATINGSECONDARY_4=0x61
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_1=0x7e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_2=0x7f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_3=0x80
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOGETTINGNEGQOS_4=0x81
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_1=0x4e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_2=0x4f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_3=0x50
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOINITIALISED_4=0x51
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_1=0x82
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_2=0x83
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_3=0x84
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOMODIFINGACTIVE_4=0x85
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_1=0x52
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_2=0x53
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_3=0x54
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPENINGPHONE_4=0x55
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_1=0x72
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_2=0x73
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_3=0x74
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOOPEN_4=0x75
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_1=0x6a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_2=0x6b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_3=0x6c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGQOS_4=0x6d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_1=0x66
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_2=0x67
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_3=0x68
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSETTINGTFT_4=0x69
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_1=0x8e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_2=0x8f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_3=0x90
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSTOPPING_4=0x91
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_1=0x86
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_2=0x87
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_3=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CHANGESTATETOSUSPENDED_4=0x89
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_2=0x2
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_CTOR_3=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_1=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_2=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_DTOR_3=0x6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_1=0x48
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_2=0x49
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELCANCEL_3=0x4a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_1=0x45
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_2=0x46
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_ETELINPUT_3=0x47
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_1=0xa4
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_2=0xa5
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET10_3=0xa6
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_1=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_2=0x10
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET1_3=0x11
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_1=0x12
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_2=0x13
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET2_3=0x14
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_1=0x15
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_2=0x16
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET3_3=0x17
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_1=0x18
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_2=0x19
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET4_3=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_1=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_2=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET5_3=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_1=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_2=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET6_3=0x20
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_1=0x21
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_2=0x22
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET7_3=0x23
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_1=0x24
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_2=0x25
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET8_3=0x26
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_1=0x9e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_2=0x9f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET9_3=0xa0
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_1=0xc
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_2=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_GET_3=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_1=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_2=0x8
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_3=0x9
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_4=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_INPUT_5=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_1=0xa1
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_2=0xa2
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET10_3=0xa3
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_1=0xa7
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_2=0xa8
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET11_3=0xa9
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_1=0x2a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_2=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET1_3=0x2c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_1=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_2=0x2e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET2_3=0x2f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_1=0x30
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_2=0x31
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET3_3=0x32
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_1=0x33
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_2=0x34
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET4_3=0x35
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_1=0x36
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_2=0x37
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET5_3=0x38
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_1=0x39
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_2=0x3a
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET6_3=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_1=0x3c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_2=0x3d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET7_3=0x3e
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_1=0x3f
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_2=0x40
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET8_3=0x41
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_1=0x42
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_2=0x43
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET9_3=0x44
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_1=0x27
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_2=0x28
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SET_3=0x29
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_1=0x4b
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_2=0x4c
+[TRACE]TRACE_INTERNALS[0x88]_CPDPFSM_SPUDINPUT_3=0x4d
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_DOCANCEL_1=0x196
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_1=0x197
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_2=0x198
+[TRACE]TRACE_INTERNALS[0x88]_CPDPSTATUSCHANGENOTIFIER_NOTIFY_3=0x199
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_CTOR_1=0x19e
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DOCANCEL_1=0x1a2
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_DTOR_1=0x19f
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_1=0x1a3
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_2=0x1a4
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_NOTIFY_3=0x1a5
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_1=0x1a0
+[TRACE]TRACE_INTERNALS[0x88]_CQOSCHANGENOTIFIER_START_2=0x1a1
+[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_DOCANCEL_1=0x1a9
+[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_1=0x1a6
+[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_2=0x1a7
+[TRACE]TRACE_INTERNALS[0x88]_CSERVICECHANGENOTIFIER_NOTIFY_3=0x1a8
+[TRACE]TRACE_INTERNALS[0x88]_GETPHONEINFOL_1=0x184
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELALLPDPNOTIFICATIONS_1=0x22b
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELALLPDPS_1=0x22a
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_1=0x228
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDPNOTIFICATIONS_2=0x229
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDP_1=0x225
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CANCELPDP_2=0x226
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CLOSE_1=0x21e
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CREATEPDPL_1=0x21f
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_CREATEPDPL_2=0x220
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DELETEPDP_1=0x221
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DELETEPDP_2=0x222
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_DTOR_1=0x21c
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_INPUT_1=0x223
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_INPUT_2=0x224
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_OPENL_1=0x21d
+[TRACE]TRACE_INTERNALS[0x88]_RETELDRIVERINPUT_STARTPDPNOTIFICATIONS_1=0x227
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_1=0x212
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_2=0x213
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_3=0x214
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_CANCELASYNCREQUEST_4=0x215
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_1=0x20d
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NEXT_2=0x20e
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_1=0x20f
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_2=0x210
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEMBMSPDPSTRATEGY_NOTIFYFSM_3=0x211
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_1=0x1ef
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_2=0x1f0
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_3=0x1f1
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_4=0x1f2
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_CANCELASYNCREQUEST_5=0x1f3
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_1=0x1e8
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NEXT_2=0x1e9
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_1=0x1ea
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_2=0x1eb
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_3=0x1ec
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_4=0x1ed
+[TRACE]TRACE_INTERNALS[0x88]_TACTIVATEPDPSTRATEGY_NOTIFYFSM_5=0x1ee
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_1=0x1e4
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_2=0x1e5
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_3=0x1e6
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_CANCELASYNCREQUEST_4=0x1e7
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_1=0x1dc
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_2=0x1dd
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_3=0x1de
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_4=0x1df
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_5=0x1e0
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NEXT_6=0x1e1
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_1=0x1e2
+[TRACE]TRACE_INTERNALS[0x88]_TCHANGETFTSTRATEGY_NOTIFYFSM_2=0x1e3
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_1=0x1b4
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_2=0x1b5
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_3=0x1b6
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_CANCELASYNCREQUEST_4=0x1b7
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_1=0x1b0
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NEXT_2=0x1b1
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_1=0x1b2
+[TRACE]TRACE_INTERNALS[0x88]_TCONTEXTDELETESTRATEGY_NOTIFYFSM_2=0x1b3
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x1be
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x1bf
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3=0x1c0
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_4=0x1c1
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_5=0x1c2
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_1=0x1b8
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_2=0x1b9
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_3=0x1ba
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NEXT_4=0x1bb
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x1bc
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE1RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x1bd
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x1c8
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x1c9
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_1=0x1c3
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_2=0x1c4
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NEXT_3=0x1c5
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x1c6
+[TRACE]TRACE_INTERNALS[0x88]_TCREATE2RYPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x1c7
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_1=0x20a
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_2=0x20b
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_CANCELASYNCREQUEST_3=0x20c
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_1=0x205
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_2=0x206
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NEXT_3=0x207
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_1=0x208
+[TRACE]TRACE_INTERNALS[0x88]_TCREATEMBMSPDPCONTEXTSTRATEGY_NOTIFYFSM_2=0x209
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_1=0x1fa
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_CANCELASYNCREQUEST_2=0x1fb
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_1=0x1f4
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NEXT_2=0x1f5
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_1=0x1f6
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_2=0x1f7
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_3=0x1f8
+[TRACE]TRACE_INTERNALS[0x88]_TGETNEGQOSSTRATEGY_NOTIFYFSM_4=0x1f9
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_1=0x219
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_2=0x21a
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_CANCELASYNCREQUEST_3=0x21b
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NEXT_1=0x216
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_1=0x217
+[TRACE]TRACE_INTERNALS[0x88]_TMBMSSESSIONUPDATESTRATEGY_NOTIFYFSM_2=0x218
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_1=0x202
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_2=0x203
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_CANCELASYNCREQUEST_3=0x204
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_1=0x1fc
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NEXT_2=0x1fd
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_1=0x1fe
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_2=0x1ff
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_3=0x200
+[TRACE]TRACE_INTERNALS[0x88]_TMODIFYACTIVESTRATEGY_NOTIFYFSM_4=0x201
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_1=0x1ae
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_CANCELASYNCREQUEST_2=0x1af
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_1=0x1aa
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NEXT_2=0x1ab
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_1=0x1ac
+[TRACE]TRACE_INTERNALS[0x88]_TOPENSTRATEGY_NOTIFYFSM_2=0x1ad
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_1=0xc4
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_2=0xc5
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_3=0xc6
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_4=0xc7
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_5=0xc8
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGMBMS_INPUT_6=0xc9
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_1=0xca
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_2=0xcb
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_3=0xcc
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_4=0xcd
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_5=0xce
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_6=0xcf
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGPRIMARY_INPUT_7=0xd0
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_1=0xd1
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_2=0xd2
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_3=0xd3
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_4=0xd4
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_5=0xd5
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEACTIVATINGSECONDARY_INPUT_6=0xd6
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_1=0xd7
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_2=0xd8
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_3=0xd9
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_4=0xda
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGQOS_INPUT_5=0xdb
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_1=0xdc
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_2=0xdd
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_3=0xde
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_4=0xdf
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECHANGINGTFT_INPUT_5=0xe0
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_1=0xe1
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_2=0xe2
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_3=0xe3
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_4=0xe4
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_5=0xe5
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_6=0xe6
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECLOSING_INPUT_7=0xe7
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDMBMS_INPUT_1=0xee
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDMBMS_INPUT_2=0xef
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_1=0xe8
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_2=0xe9
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_3=0xea
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_4=0xeb
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_5=0xec
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATEDSECONDARY_INPUT_6=0xed
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_1=0xf7
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_2=0xf8
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_3=0xf9
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_4=0xfa
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_5=0xfb
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_6=0xfc
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_7=0xfd
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGMBMS_INPUT_8=0xfe
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_1=0xff
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_2=0x100
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_3=0x101
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_5=0x102
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_6=0x103
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGPRIMARY_INPUT_7=0x104
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_1=0xf0
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_2=0xf1
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_3=0xf2
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_4=0xf3
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_5=0xf4
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_6=0xf5
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATECREATINGSECONDARY_INPUT_7=0xf6
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_1=0x105
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_2=0x106
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_3=0x107
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_4=0x108
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_5=0x109
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_6=0x10a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_7=0x10b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEGETTINGNEGQOS_INPUT_8=0x10c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_1=0x10d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_2=0x10e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_3=0x10f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_4=0x110
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_5=0x111
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_6=0x112
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEINITIALISED_INPUT_7=0x113
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_1=0x114
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_2=0x115
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_3=0x116
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_4=0x117
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEMODIFYINGACTIVE_INPUT_5=0x118
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_1=0x126
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_2=0x127
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_3=0x128
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_4=0x129
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_5=0x12a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPENINGPHONE_INPUT_6=0x12b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_1=0x119
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_10=0x122
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_11=0x123
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_12=0x124
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_13=0x125
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_2=0x11a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_3=0x11b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_4=0x11c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_5=0x11d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_6=0x11e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_7=0x11f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_8=0x120
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATEOPEN_INPUT_9=0x121
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_1=0x12c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_2=0x12d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_3=0x12e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_4=0x12f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGQOS_INPUT_5=0x130
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_1=0x131
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_2=0x132
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_3=0x133
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_4=0x134
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESETTINGTFT_INPUT_5=0x135
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_1=0x136
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_2=0x137
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_3=0x138
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_4=0x139
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_5=0x13a
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_6=0x13b
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_7=0x13c
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESTOPPING_INPUT_8=0x13d
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_1=0x13e
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_2=0x13f
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_3=0x140
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_4=0x141
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATESUSPENDED_INPUT_5=0x142
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_CTOR_1=0xbb
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_CTOR_2=0xbc
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_ETELDRIVERCANCEL_1=0xc2
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_ETELDRIVERINPUT_1=0xc1
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_1=0xbd
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_2=0xbe
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_3=0xbf
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_INPUT_4=0xc0
+[TRACE]TRACE_INTERNALS[0x88]_TPDPSTATE_SPUDMANNOTIFY_1=0xc3
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_1=0x1ce
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_CANCELASYNCREQUEST_2=0x1cf
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_1=0x1ca
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NEXT_2=0x1cb
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_1=0x1cc
+[TRACE]TRACE_INTERNALS[0x88]_TSETQOSSTRATEGY_NOTIFYFSM_2=0x1cd
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_1=0x1d9
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_2=0x1da
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_CANCELASYNCREQUEST_3=0x1db
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_1=0x1d0
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_2=0x1d1
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_3=0x1d2
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_4=0x1d3
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_5=0x1d4
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_6=0x1d5
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NEXT_7=0x1d6
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_1=0x1d7
+[TRACE]TRACE_INTERNALS[0x88]_TSETTFTSTRATEGY_NOTIFYFSM_2=0x1d8
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.ini Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.ini Fri Jun 11 14:49:29 2010 +0300
@@ -159,7 +159,7 @@
QoSEventReq2Idx = 9
SubConnectionCount1 = 0
SubConnectionCount2 = 3
-PolicySelector = 1
+PolicySelector = 3
ParametersType = UmtsR99QoSAndOnTableRecord
ParametersRecordId = 1
@@ -226,13 +226,13 @@
[PrimaryQoSEventDeleteWithSecondary1330]
SimTsyTestNum = 1302
IapId = 5
-PrimaryIapId1 = 11
+DefaultIapId = 11
SecondaryActivationEvent1 = EQoSEventAddPolicy
SecondaryActivationEvent2 = EQoSEventConfirm
QoSEventReq1Idx = 0
SubConnectionCount1 = 2
SubConnectionCount2 = 3
-PolicySelector = 1
+PolicySelector = 3
ParametersType = UmtsR99QoSAndOnTableRecord
ParametersRecordId = 1
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.xml Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.xml Fri Jun 11 14:49:29 2010 +0300
@@ -848,6 +848,21 @@
<IapId>2</IapId>
<Priority>1</Priority>
</PolicySelector>
+
+ <PolicySelector operation ="add">
+ <PolicyId>3</PolicyId>
+ <SrcAddress>0.0.0.0</SrcAddress>
+ <SrcMask>255.255.255.255</SrcMask>
+ <DstAddress>192.168.1.1</DstAddress>
+ <DstMask>255.255.255.255</DstMask>
+ <SrcPort>1031</SrcPort>
+ <SrcPortMax>1031</SrcPortMax>
+ <DstPort>3461</DstPort>
+ <DstPortMax>3461</DstPortMax>
+ <ProtocolId>17</ProtocolId>
+ <IapId>11</IapId>
+ <Priority>1</Priority>
+ </PolicySelector>
</PolicySelectorTable>
</CommDB:Config>
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/TE_spudNetworkSide.script Fri Jun 11 14:49:29 2010 +0300
@@ -407,7 +407,7 @@
//! @SYMTestPriority Critical
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
-RUN_TEST_STEP 100 TE_SpudNetworkSide CSpudMultiPrimary z:\testdata\configs\te_spudNetworkSide.ini MultiPrimaryActivationOk1
+RUN_TEST_STEP 200 TE_SpudNetworkSide CSpudMultiPrimary z:\testdata\configs\te_spudNetworkSide.ini MultiPrimaryActivationOk1
DELAY 3000
RUN_TEST_STEP 100 TE_SpudNetworkSide CESockCheck z:\testdata\configs\te_spudNetworkSide.ini ESockCheck
END_TESTCASE NET-Spud-NetworkSide-0821
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/te_pdplayer_ip6.script Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/scripts/te_pdplayer_ip6.script Fri Jun 11 14:49:29 2010 +0300
@@ -132,7 +132,7 @@
//! @SYMTestPriority Critical
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
-RUN_TEST_STEP 60 te_spudnetworkside CSpudPrimaryEvent z:\testdata\configs\te_pdplayer_ip6.ini PrimaryQoSEventDelete1
+RUN_TEST_STEP 100 te_spudnetworkside CSpudPrimaryEvent z:\testdata\configs\te_pdplayer_ip6.ini PrimaryQoSEventDelete1
DELAY 3000
RUN_TEST_STEP 60 te_spudnetworkside CESockCheck z:\testdata\configs\te_pdplayer_ip6.ini ESockCheck
END_TESTCASE CBS-PDPLAYER-IP6-0005
@@ -399,7 +399,7 @@
//! @SYMTestPriority Critical
//! @SYMTestStatus Implemented
//! @SYMTestType CIT
-RUN_TEST_STEP 100 te_spudnetworkside CSpudMultiPrimary z:\testdata\configs\te_pdplayer_ip6.ini MultiPrimaryActivationOk1
+RUN_TEST_STEP 200 te_spudnetworkside CSpudMultiPrimary z:\testdata\configs\te_pdplayer_ip6.ini MultiPrimaryActivationOk1
DELAY 3000
RUN_TEST_STEP 100 te_spudnetworkside CESockCheck z:\testdata\configs\te_pdplayer_ip6.ini ESockCheck
END_TESTCASE CBS-PDPLAYER-IP6-0020
--- a/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/test/te_spudNetworkSide/src/te_spudNetworkSideSteps.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -757,7 +757,7 @@
#ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
WaitForQoSEventL(_L("SecondaryActivationEvent2"),_L("SecondaryActivationEvent2Reason"));
#else
- User::After(KTimeToStartSecondary);
+ User::After(KTimeToStartSecondary*4);
VerifySubconnectionCountL(_L("SubConnectionCount2"), iap);
#endif
}
@@ -1145,7 +1145,7 @@
}
StartPrimaryOnlyL();
-
+ User::After(KTimeToStartSecondary);
TRequestStatus progressReqSt;
iInterface.ProgressNotification(iProgressBuf, progressReqSt, static_cast<TUint>(expProgress));
@@ -1961,9 +1961,18 @@
// start a secondary context with QoS parameters connected to the same address as above
// it will use the iSocket member variable to connect to the address
+
+ TInt defaultIapID = 2;
+ //the default IapID is usually defined in commsdb with value of 2.
+ //this allows us to change the default IapID, as in R4_and_R5 test the default ID is 11.
+ if(!GetIntFromConfig(ConfigSection(), _L("DefaultIapId"), defaultIapID))
+ {
+ defaultIapID = PDPIAP;
+ }
+
#ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
User::After(10*KTimeToStartSecondary);
- VerifySubconnectionCountL(_L("SubConnectionCount1"), PDPIAP);
+ VerifySubconnectionCountL(_L("SubConnectionCount1"), defaultIapID);
#endif
InitiateSecondaryStartL();
@@ -1976,7 +1985,7 @@
WaitForQoSEventL(_L("SecondaryActivationEvent2"), _L("SecondaryActivationEvent2Reason"));
#else
User::After(KTimeToStartSecondary);
- VerifySubconnectionCountL(_L("SubConnectionCount2"), PDPIAP);
+ VerifySubconnectionCountL(_L("SubConnectionCount2"), defaultIapID);
#endif
RSocket oppositeSecondarySocket;
--- a/telephonyprotocols/psdagt/group/dummypsdagt.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/psdagt/group/dummypsdagt.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -34,8 +34,6 @@
LIBRARY euser.lib dummyetel.lib nifman.lib
-#include <comms-infras/commsdebugutility.mmh>
-
#if defined(WINS)
deffile /epoc32/release/wins/agent.def
#elif defined(GCC32)
--- a/telephonyprotocols/psdagt/group/networking_psdagt.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/psdagt/group/networking_psdagt.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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_psdagt
source \sf\os\cellularsrv\telephonyprotocols\psdagt
binary \sf\os\cellularsrv\telephonyprotocols\psdagt\group all
--- a/telephonyprotocols/psdagt/group/psdagt.iby Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/psdagt/group/psdagt.iby Fri Jun 11 14:49:29 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* 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"
@@ -23,7 +23,6 @@
#include <etel.iby>
#include <etelpckt.iby>
#include <commdb.iby>
-#include <flogger.iby>
#include <nifman.iby>
file=ABI_DIR\DEBUG_DIR\psd.agt System\Libs\psd.agt
--- a/telephonyprotocols/psdagt/group/psdagt.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/psdagt/group/psdagt.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -34,11 +34,12 @@
USERINCLUDE ../src
USERINCLUDE ../inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib etel.lib etelpckt.lib nifman.lib etelmm.lib
-#include <comms-infras/commsdebugutility.mmh>
+
#if defined(WINS)
deffile /epoc32/release/wins/agent.def
--- a/telephonyprotocols/psdagt/inc/debuglogger.h Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/**
-* 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:
-* PSD AGX Data and Event Logger header
-*
-*
-*/
-
-
-
-/**
- @file DebugLogger.h
- @internalComponent
-*/
-
-#ifndef __DEBUGLOGGER_H__
-#define __DEBUGLOGGER_H__
-
-#include "comms-infras/commsdebugutility.h"
-#include <e32base.h>
-
-/**
-@internalComponent
-*/
-_LIT8(KPsdAgxLogFile,"PSDAGX.TXT");
-_LIT8(KPsdAgxLogFolder,"PSD");
-
-
-#endif // __DEBUGLOGGER_H__
--- a/telephonyprotocols/psdagt/src/PSDAGTBase.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/psdagt/src/PSDAGTBase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,8 +19,13 @@
@file PSDAGTBase.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "PSDAGTBaseTraces.h"
+#endif
+
#include "PSDAGTBase.h"
-#include "debuglogger.h"
#include "psdagt.h"
/**
@@ -120,20 +125,16 @@
@exception Panics if connection direction is unknown.
*/
{
- __FLOG_STMT(_LIT8(logString1,"GPRS:\tCreating a new PSD state machine - %s");)
-
if (aDirection==ECommDbConnectionDirectionOutgoing)
{
- __FLOG_STMT(const TText8 direction[] = "Outbound";)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&direction);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDAGENT_CREATEAGENTSML_1,"GPRS:\tCreating a new PSD state machine - Outbound");
return CPsdOutSM::NewL(aObserver,aDlgPrc,aDb);
}
else
{
#ifndef INCOMING_NOT_SUPORTED
__ASSERT_ALWAYS(aDirection==ECommDbConnectionDirectionIncoming, PanicAgx(EPsdBadDirection));
- __FLOG_STMT(const TText8 direction[] = "Inbound";)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&direction);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDAGENT_CREATEAGENTSML_2,"GPRS:\tCreating a new PSD state machine - Inbound");
return CPsdInSM::NewL(aObserver,aDlgPrc,aDb);
#else
User::Leave(KErrNotSupported);
--- a/telephonyprotocols/psdagt/src/psdentry.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/psdagt/src/psdentry.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -19,7 +19,6 @@
*/
#include "psdagt.h"
-#include "debuglogger.h"
/**
--- a/telephonyprotocols/psdagt/src/psdstates.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/psdagt/src/psdstates.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -17,6 +17,12 @@
@file PsdStates.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "psdstatesTraces.h"
+#endif
+
#include <comms-infras/cagentsmbase.h>
#include <etelpckt.h>
#include <connectprog.h> // for circuit-switched progress enums
@@ -27,7 +33,6 @@
#include "psdagt.h"
#include "psdprog.h"
-#include "debuglogger.h"
#include <logengevents.h>
CPsdOutInit::CPsdOutInit(MAgentStateMachineEnv* aObserver,MPsdEnv* aPsdSM, MPsdCommDbAccess* aDb)
@@ -186,9 +191,8 @@
*/
{
__ASSERT_DEBUG(iSM,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tInitialising");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDINITBASE_DOSTARTSTATEL_1, "Packet Data:\tInitialising");
+
iSMObserver->PreventConnectionRetries();
//
// PSD AGX does not allow any more connection retries. It assumes that GenConn has
@@ -274,8 +278,7 @@
Complete state for the initialisation state for both incomming and outgoing connections.
*/
{
- __FLOG_STMT(_LIT8(logString2,"Packet Data:\tInitialised");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString2());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDINITBASE_RUNL_1, "Packet Data:\tInitialised");
if (iStatus!=KErrNone)
iSMObserver->ConnectionComplete(EPsdStartingConfiguration,iStatus.Int()); // correct progress?
else
@@ -324,8 +327,7 @@
{
User::Leave(KErrNotSupported);
}
- __FLOG_STMT(_LIT8(logString2,"Packet Data:\tChecked Config");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString2());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCHECKCONFIG_DOINITL_1,"Packet Data:\tChecked Config");
}
void CPsdCheckConfig::RunL()
@@ -372,8 +374,7 @@
__ASSERT_DEBUG(iSM,User::Invariant());
__ASSERT_DEBUG(iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tChecking network availability");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDNETWORKCHECK_STARTSTATE_1,"Packet Data:\tChecking network availability");
iSubState = EGettingInitialStatus;
iSM->PacketNetwork().GetNtwkRegStatus(iStatus,iRegStatus);
@@ -392,8 +393,7 @@
iRegStatus==RPacketService::ENotRegisteredNotSearching ||
iRegStatus==RPacketService::ENotRegisteredAndNotAvailable)
{
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tNo network");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDNETWORKCHECK_DONETWORKCHECK_1, "Packet Data:\tNo network");
JumpToRunl(KErrNetConNoGPRSNetwork);
return;
}
@@ -402,8 +402,7 @@
iRegStatus==RPacketService::ENotRegisteredButAvailable ||
iRegStatus==RPacketService::EUnknown)
{
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tReg status %d. Proceeding");)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iRegStatus);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDNETWORKCHECK_DONETWORKCHECK_2,"Packet Data:\tReg status %d. Proceeding",iRegStatus);
iSM->BaseEnv().CompleteState(KErrNone);
return;
@@ -488,8 +487,7 @@
{
__ASSERT_DEBUG(iSM,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tWaiting for incoming Packet request");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDWAITFORINCOMING_STARTSTATE_1,"Packet Data:\tWaiting for incoming Packet request");
iSM->PacketNetwork().NotifyContextActivationRequested(iStatus,iPdpTypeRequested,iAddressRequested);
SetActive();
@@ -507,8 +505,7 @@
if (iStatus==KErrNone)
{
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tReceived network context activation request");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDWAITFORINCOMING_RUNL_1, "Packet Data:\tReceived network context activation request");
if(iSM->Config().QueryIfIncommingConnectionAcceptable(iPdpTypeRequested,iAddressRequested) )
{
@@ -589,8 +586,7 @@
__ASSERT_DEBUG(iSM,User::Invariant());
__ASSERT_DEBUG(iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tCreating context");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATECONTEXT_STARTSTATE_1, "Packet Data:\tCreating context");
RPacketService& packetNetwork = iSM->PacketNetwork();
RPacketContext& context = iSM->Context();
@@ -617,8 +613,7 @@
__ASSERT_DEBUG(iSM,User::Invariant());
__ASSERT_DEBUG(iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tCompleted with error %d");)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATECONTEXT_RUNL_1, "Packet Data:\tCompleted with error %d",iStatus.Int());
if (iStatus==KErrNone)
{
@@ -687,8 +682,7 @@
__ASSERT_DEBUG(iSM,User::Invariant());
__ASSERT_DEBUG(iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tCreating QoS");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATEQOS_STARTSTATE_1, "Packet Data:\tCreating QoS");
RPacketContext& context = iSM->Context();
RPacketQoS& qoS = iSM->QoS();
@@ -719,8 +713,7 @@
__ASSERT_DEBUG(iSM,User::Invariant());
__ASSERT_DEBUG(iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tCompleted with error %d");)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATEQOS_RUNL_1,"Packet Data:\tCompleted with error %d",iStatus.Int());
if (iStatus==KErrNone)
{
@@ -785,8 +778,8 @@
__ASSERT_DEBUG(iSM,User::Invariant());
__ASSERT_DEBUG(iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tActivating context");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDACTIVATECONTEXT_STARTSTATE_1, "Packet Data:\tActivating context");
+
iSMObserver->UpdateProgress(EPsdStartingActivation,KErrNone);
// Check if the context is already active since in the reconnect case it may be
@@ -817,8 +810,7 @@
__ASSERT_DEBUG(iSM,User::Invariant());
__ASSERT_DEBUG(iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tCompleted with error %d");)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iStatus.Int());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDACTIVATECONTEXT_RUNL_1, "Packet Data:\tCompleted with error %d",iStatus.Int());
if( (iSubState==EActivatingContext&&(iStatus==KErrNone || iStatus==KErrNotSupported) )
||(iSubState==ELoaningCommPort&&iStatus==KErrNone) )
@@ -842,8 +834,7 @@
{
iSMObserver->UpdateProgress(EPsdFinishedActivation,KErrNone);// may want to do this when it really
// activates
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tHanding control to PPP");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDACTIVATECONTEXT_RUNL_2,"Packet Data:\tHanding control to PPP");
iSMObserver->ServiceStarted();
iSM->BaseEnv().CompleteState(KErrNone);
@@ -942,8 +933,8 @@
//stuff.
RequestStatusChange();
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tCalling ConnectionComplete");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_STARTSTATE_1, "Packet Data:\tCalling ConnectionComplete");
+
iSMObserver->Notification(EAgentToNifEventTypeModifyInitialTimer,NULL);
iSMObserver->UpdateProgress(KConnectionOpen,KErrNone); // I think NIFMAN just swallows this after
@@ -969,8 +960,7 @@
if(err != KErrNone)
{
#ifdef __FLOG_ACTIVE
- _LIT8(logString1,"CPsdOpen:\t Error in getting remote party %d.");
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),err);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_LOGACTIVE_1, "CPsdOpen:\t Error in getting remote party %d.",err);
#endif
}
iEventLoggerStarted = ETrue;
@@ -1026,16 +1016,14 @@
{
__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"PacketData:\tStatus change to %s\0");)
-
if (iStatus==KErrNone)
{
switch (iContextStatus)
{
case RPacketContext::EStatusSuspended:
{
- __FLOG_STMT(const TText8 value[] = "suspended";)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_1, "PacketData:\tStatus change to suspended");
+
iSMObserver->Notification(EAgentToNifEventTypeDisableTimers,NULL);
iSMObserver->UpdateProgress(EPsdSuspended,KErrNone);
iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_SUSPENDED, KLogPacketDataEventTypeUid);
@@ -1047,16 +1035,15 @@
// if reconnect happened then the logger is allready started and we just do an update
if (!iEventLoggerStarted)
{
- __FLOG_STMT(const TText8 value[] = "log active";)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_2, "PacketData:\tStatus change to log active");
WatchForConfigChangesL(); //those 2 functions should have been called in start state but
LogActive(); //RPacketContext was not EStatusActive at that time
}
else // the LogCallStart() has completed
{
iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_CONNECTED, KLogPacketDataEventTypeUid);
- __FLOG_STMT(const TText8 value[] = "active";)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_3, "PacketData:\tStatus change to active");
+
}
iSMObserver->Notification(EAgentToNifEventTypeEnableTimers,NULL);
iSMObserver->UpdateProgress(KConnectionOpen,KErrNone);
@@ -1065,8 +1052,7 @@
break;
case RPacketContext::EStatusDeactivating:
{
- __FLOG_STMT(const TText8 value[] = "deactivating";)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_4, "PacketData:\tStatus change to deactivating");
iSMObserver->UpdateProgress(EPsdStartingDeactivation,KErrNone);
iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTING, KLogPacketDataEventTypeUid);
RequestStatusChange();
@@ -1074,23 +1060,20 @@
break;
case RPacketContext::EStatusInactive:
{
- __FLOG_STMT(const TText8 value[] = "inactive";)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_5, "PacketData:\tStatus change to inactive");
iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogPacketDataEventTypeUid);
}
break;
case RPacketContext::EStatusDeleted:
{
- __FLOG_STMT(const TText8 value[] = "deleted";)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_6, "PacketData:\tStatus change to deleted");
iSMObserver->UpdateProgress(EPsdFinishedDeactivation,KErrNone);
iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogPacketDataEventTypeUid);
}
break;
case RPacketContext::EStatusActivating:
{
- __FLOG_STMT(const TText8 value[] = "activating";)
- __FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_7, "PacketData:\tStatus change to activating");
iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_CONNECTING, KLogPacketDataEventTypeUid);
RequestStatusChange();
}
@@ -1195,8 +1178,7 @@
{
__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tRecovering Comm Port to ETel");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDRECOVERCOMMPORT_STARTSTATE_1, "Packet Data:\tRecovering Comm Port to ETel");
iSMObserver->UpdateProgress(EPsdStartingDeactivation,KErrNone);
iSM->Context().RecoverCommPort(iStatus);
@@ -1210,8 +1192,7 @@
{
__ASSERT_DEBUG(iSM,User::Invariant());
// what can we do with errors at this stage in the game?
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tRecovered Comm Port");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDRECOVERCOMMPORT_RUNL_1, "Packet Data:\tRecovered Comm Port");
iSM->BaseEnv().CompleteState(KErrNone);
}
@@ -1279,8 +1260,7 @@
Function called by the genconn state machine framework to start the state
*/
{
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tClosing Log");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCLOSELOG_STARTSTATE_1, "Packet Data:\tClosing Log");
// We need to make sure that logging is finished before closing everything.
// forward iStatus to the logger, which will be responsible to complete iStatus when it is finished.
iStatus = KRequestPending;
@@ -1349,8 +1329,7 @@
{
__ASSERT_DEBUG(iSM,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tDeactivating Context");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDDEACTIVATION_STARTSTATE_1, "Packet Data:\tDeactivating Context");
iSM->Context().Deactivate(iStatus);
SetActive();
@@ -1363,9 +1342,8 @@
{
__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tDeactivated Context");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
-
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDDEACTIVATION_RUNL_1,"Packet Data:\tDeactivated Context");
+
iSMObserver->UpdateProgress(EPsdFinishedDeactivation,KErrNone);
iSM->BaseEnv().CompleteState(KErrNone);
@@ -1429,8 +1407,7 @@
{
__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
- __FLOG_STMT(_LIT8(logString1,"Packet Data:\tClosing down");)
- __FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCLOSURE_RUNL_1,"Packet Data:\tClosing down");
RTelServer& etel = iSM->TelServer();
RPhone& phone = iSM->Phone();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/psdagt/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/psdagt/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,34 @@
+#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
+[GROUP]TRACE_INTERNALS=0x88
+[TRACE]TRACE_INTERNALS[0x88]_CPSDACTIVATECONTEXT_RUNL_1=0x20
+[TRACE]TRACE_INTERNALS[0x88]_CPSDACTIVATECONTEXT_RUNL_2=0x1c
+[TRACE]TRACE_INTERNALS[0x88]_CPSDACTIVATECONTEXT_STARTSTATE_1=0x1b
+[TRACE]TRACE_INTERNALS[0x88]_CPSDAGENT_CREATEAGENTSML_1=0x1
+[TRACE]TRACE_INTERNALS[0x88]_CPSDAGENT_CREATEAGENTSML_2=0x2
+[TRACE]TRACE_INTERNALS[0x88]_CPSDCHECKCONFIG_DOINITL_1=0x12
+[TRACE]TRACE_INTERNALS[0x88]_CPSDCLOSELOG_STARTSTATE_1=0xd
+[TRACE]TRACE_INTERNALS[0x88]_CPSDCLOSURE_RUNL_1=0x10
+[TRACE]TRACE_INTERNALS[0x88]_CPSDCREATECONTEXT_RUNL_1=0x18
+[TRACE]TRACE_INTERNALS[0x88]_CPSDCREATECONTEXT_STARTSTATE_1=0x17
+[TRACE]TRACE_INTERNALS[0x88]_CPSDCREATEQOS_RUNL_1=0x1a
+[TRACE]TRACE_INTERNALS[0x88]_CPSDCREATEQOS_STARTSTATE_1=0x19
+[TRACE]TRACE_INTERNALS[0x88]_CPSDDEACTIVATION_RUNL_1=0xf
+[TRACE]TRACE_INTERNALS[0x88]_CPSDDEACTIVATION_STARTSTATE_1=0xe
+[TRACE]TRACE_INTERNALS[0x88]_CPSDINITBASE_DOSTARTSTATEL_1=0x3
+[TRACE]TRACE_INTERNALS[0x88]_CPSDINITBASE_RUNL_1=0x11
+[TRACE]TRACE_INTERNALS[0x88]_CPSDNETWORKCHECK_DONETWORKCHECK_1=0x14
+[TRACE]TRACE_INTERNALS[0x88]_CPSDNETWORKCHECK_DONETWORKCHECK_2=0x1f
+[TRACE]TRACE_INTERNALS[0x88]_CPSDNETWORKCHECK_STARTSTATE_1=0x13
+[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_LOGACTIVE_1=0x1e
+[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_1=0x4
+[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_2=0x5
+[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_3=0x6
+[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_4=0x7
+[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_5=0x8
+[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_6=0x9
+[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_RUNL_7=0xa
+[TRACE]TRACE_INTERNALS[0x88]_CPSDOPEN_STARTSTATE_1=0x1d
+[TRACE]TRACE_INTERNALS[0x88]_CPSDRECOVERCOMMPORT_RUNL_1=0xc
+[TRACE]TRACE_INTERNALS[0x88]_CPSDRECOVERCOMMPORT_STARTSTATE_1=0xb
+[TRACE]TRACE_INTERNALS[0x88]_CPSDWAITFORINCOMING_RUNL_1=0x16
+[TRACE]TRACE_INTERNALS[0x88]_CPSDWAITFORINCOMING_STARTSTATE_1=0x15
--- a/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/qos3gppcpr/group/networking_Qos3GPP.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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_qos3gpp
source \sf\os\cellularsrv\telephonyprotocols\qos3gppcpr
binary \sf\os\cellularsrv\telephonyprotocols\qos3gppcpr\group all
--- a/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/qosextnapi/group/networking_qosextnapi.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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_qosextnapi
source \sf\os\cellularsrv\telephonyprotocols\qosextnapi
binary \sf\os\cellularsrv\telephonyprotocols\qosextnapi\group all
--- a/telephonyprotocols/qosextnapi/group/qosextnapi.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/qosextnapi/group/qosextnapi.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -37,6 +37,7 @@
SOURCEPATH ../src
SOURCE umtsextn.cpp sblpextn.cpp imsextn.cpp
USERINCLUDE ../inc
+USERINCLUDE ../traces
#if defined(QOS_TESTING)
USERINCLUDE ..\..\..\..\unref\orphan\comgen\networking\qostesting\umtssim\inc
@@ -45,7 +46,6 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib qoslib.lib
-DEBUGLIBRARY flogger.lib
DEFFILE qosextnapi.def
--- a/telephonyprotocols/qosextnapi/inc/qosextn_log.h Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +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:
-// @file qosextn_log.h
-// Header file for qos extn API log
-//
-
-
-
-/**
- @internalComponent
-*/
-#if !defined(__LOG_H__)
-#define __LOG_H__
-
-#if !defined(_DEBUG)
-# define LOG(a)
-#else
-# define LOG(a) a
-# define _LOG
-
-#include <flogger.h>
-
-_LIT(KQoSExtnLogFolder,"qosextnapi");
-_LIT(KQoSExtnLogFile,"qosextnapi.txt");
-
-class Log
- {
-public:
- static inline void Write(const TDesC& aDes);
- static inline void Printf(TRefByValue<const TDesC> aFmt, ...);
- static inline void Printf(TRefByValue<const TDesC8> aFmt, ...);
- static inline void HexDump(const TText* aHeader, const TText* aMargin, const TUint8* aPtr, TInt aLen);
- };
-
-inline void Log::Write(const TDesC& aDes)
-{
- RFileLogger::Write(KQoSExtnLogFolder(), KQoSExtnLogFile(), EFileLoggingModeAppend, aDes);
-}
-
-
-inline void Log::Printf(TRefByValue<const TDesC> aFmt, ...)
-{
- VA_LIST list;
- VA_START(list,aFmt);
- RFileLogger::WriteFormat(KQoSExtnLogFolder(), KQoSExtnLogFile(), EFileLoggingModeAppend, aFmt, list);
-}
-
-inline void Log::Printf(TRefByValue<const TDesC8> aFmt, ...)
-{
- VA_LIST list;
- VA_START(list,aFmt);
- RFileLogger::WriteFormat(KQoSExtnLogFolder(), KQoSExtnLogFile(), EFileLoggingModeAppend, aFmt, list);
-}
-
-inline void Log::HexDump(const TText* aHeader, const TText* aMargin, const TUint8* aPtr, TInt aLen)
-{
- RFileLogger::HexDump(KQoSExtnLogFolder(), KQoSExtnLogFile(), EFileLoggingModeAppend, aHeader, aMargin, aPtr, aLen);
-}
-
-#endif // !defined(_DEBUG)
-
-#endif //__LOG_H__
-
--- a/telephonyprotocols/qosextnapi/src/imsextn.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/qosextnapi/src/imsextn.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -15,7 +15,10 @@
//
#include "imsextn.h"
-#include "qosextn_log.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "imsextnTraces.h"
+#endif
//#ifdef SYMBIAN_NETWORKING_UMTS5
@@ -132,13 +135,13 @@
{
iIms = aIms;
- LOG(Log::Printf(_L("<------------------------------------------------\n")));
- LOG(Log::Printf(_L("CImsPolicy::SetImsParameter")));
- LOG(Log::Printf(_L("\n")));
- LOG(Log::Printf(_L("IMS VALUE SUPPLIED BY CLIENT IS \n")));
- LOG(Log::Printf(_L("\n")));
- LOG(Log::Printf(_L("[IMS Signalling Indicator value is : = %d]\n"),aIms.GetIMSSigallingIndicator()));
- LOG(Log::Printf(_L("------------------------------------------------>\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");
}
--- a/telephonyprotocols/qosextnapi/src/sblpextn.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/qosextnapi/src/sblpextn.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/qosparameters.h>
// Buffer size
@@ -228,7 +233,7 @@
*iSblp = aSblp;
- LOG(
+
// following code is to create logs
TAuthorizationToken authToken;
iSblp->GetMAT (authToken);
@@ -237,22 +242,22 @@
TBuf<KAuthorizationTokenSize> 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<flowIds.Count();i++)
{
- Log::Printf(_L("Media component number : = %d]\n"),flowIds[i].iMediaComponentNumber);
- Log::Printf(_L("IP flow number : = %d]\n"),flowIds[i].iIPFlowNumber);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_7, "Media component number : = %d]\n",flowIds[i].iMediaComponentNumber);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_8, "IP flow number : = %d]\n",flowIds[i].iIPFlowNumber);
}
- Log::Printf(_L("------------------------------------------------>\n"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CSBLPPOLICY_SETSBLPPARAMETERS_9, "------------------------------------------------>\n");
flowIds.Close();
- )
+
}
--- a/telephonyprotocols/qosextnapi/src/umtsextn.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/qosextnapi/src/umtsextn.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/pfqos.h>
+
+#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;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/qosextnapi/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/qosextnapi/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,94 @@
+#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]_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
--- a/telephonyprotocols/rawipnif/group/BLD.INF Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/group/BLD.INF Fri Jun 11 14:49:29 2010 +0300
@@ -45,7 +45,7 @@
RawIPNif.mmp
#ifdef SYMBIAN_ZERO_COPY_NETWORKING
-RawIPNif2.mmp
+#include "../rawipnif2/group/bld.inf"
#endif
#endif // SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
--- a/telephonyprotocols/rawipnif/group/RawIPNif.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/group/RawIPNif.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -50,7 +50,6 @@
SOURCE Sender.cpp
SOURCE Receiver.cpp
SOURCE IPTagHeader.cpp
-SOURCE bttlog.cpp
SOURCE rawipmcpr.cpp
SOURCE rawipmcprfactory.cpp
SOURCE RawIpAgentHandler.cpp
@@ -58,6 +57,7 @@
USERINCLUDE ../inc
+USERINCLUDE ../traces
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
--- a/telephonyprotocols/rawipnif/group/RawIPNif2.mmp Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-// 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
-
-MACRO __BTT_LOGGING__
-
-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 <elements/sd_mintercept.mmh>
-
-#include <networking/packetlogger.mmh>
-
-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
--- a/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/group/networking_rawipnif.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyprotocols/rawipnif/inc/BcaController.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/BcaController.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <c32comm.h>
#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;
--- a/telephonyprotocols/rawipnif/inc/BcaIoController.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/BcaIoController.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
{
--- a/telephonyprotocols/rawipnif/inc/BinderBase.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/BinderBase.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/es_protbinder.h>
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;
};
--- a/telephonyprotocols/rawipnif/inc/IPTagHeader.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/IPTagHeader.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <nifmbuf.h>
-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);
--- a/telephonyprotocols/rawipnif/inc/IPv4Binder.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/IPv4Binder.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/nifprvar_internal.h>
#endif
-class CBttLogger;
class CIPv4Binder : public CBinderBase
{
public:
- CIPv4Binder(CRawIPFlow& aFlow, CBttLogger* aTheLogger);
+ CIPv4Binder(CRawIPFlow& aFlow);
~CIPv4Binder();
public:
--- a/telephonyprotocols/rawipnif/inc/IPv6Binder.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/IPv6Binder.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/nifprvar_internal.h>
#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;
--- a/telephonyprotocols/rawipnif/inc/RawIPFlow.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/RawIPFlow.h Fri Jun 11 14:49:29 2010 +0300
@@ -32,10 +32,8 @@
#include "BinderBase.h"
#include "BcaIoController.h"
#include "MControllerObserver.h"
-#include "bttlog.h"
#include <comms-infras/linkmessages.h> // 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;
--- a/telephonyprotocols/rawipnif/inc/RawIPFlowFactory.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/RawIPFlowFactory.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/ss_subconnflow.h>
#include <comms-infras/ss_protflow.h>
-#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
--- a/telephonyprotocols/rawipnif/inc/RawIPNifMain.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/RawIPNifMain.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/nifprvar_internal.h>
#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;
--- a/telephonyprotocols/rawipnif/inc/Receiver.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/Receiver.h Fri Jun 11 14:49:29 2010 +0300
@@ -23,16 +23,14 @@
#define RECEIVER_H
#include "BcaIoController.h"
-#include "bttlog.h"
#include "Constants.h"
#include <nifmbuf.h>
-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.
@@ -43,12 +41,11 @@
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;
--- a/telephonyprotocols/rawipnif/inc/Sender.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/inc/Sender.h Fri Jun 11 14:49:29 2010 +0300
@@ -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();
@@ -45,7 +46,6 @@
private: // Unowned data.
CBcaIoController& iObserver;
- CBttLogger* iTheLogger;
TInt iMaxPacketSize;
RBuf8 iSendBuffer;
};
--- a/telephonyprotocols/rawipnif/inc/bttlog.h Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +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 <comms-infras/commsdebugutility.h>
-
-#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__
-#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)
-#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<const TDesC8> 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__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/rawipnif2/group/RawIPNif2.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <elements/sd_mintercept.mmh>
+
+#include <networking/packetlogger.mmh>
+
+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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/rawipnif2/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyprotocols/rawipnif/rawipnif2/inc/BcaController.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/BcaController.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
{
--- a/telephonyprotocols/rawipnif/rawipnif2/inc/BinderBase.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/BinderBase.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/bca2.h>
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
--- a/telephonyprotocols/rawipnif/rawipnif2/inc/IPTagHeader.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/IPTagHeader.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/commsbufchain.h>
-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<KIPTagHeaderLength> iHeaderByte; // Owned
};
--- a/telephonyprotocols/rawipnif/rawipnif2/inc/IPv4Binder.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/IPv4Binder.h Fri Jun 11 14:49:29 2010 +0300
@@ -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:
--- a/telephonyprotocols/rawipnif/rawipnif2/inc/IPv6Binder.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/IPv6Binder.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <eui_addr.h>
-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;
--- a/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2Flow.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2Flow.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/ss_flowbinders.h>
#include <comms-infras/ss_subconnflow.h>
#include "BinderBase.h"
-#include "bttlog.h"
#include <comms-infras/linkmessages.h> // 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;
--- a/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2FlowFactory.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/inc/RawIP2FlowFactory.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/ss_subconnflow.h>
#include <comms-infras/ss_protflow.h>
-#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
--- a/telephonyprotocols/rawipnif/rawipnif2/inc/bttlog.h Thu May 27 14:05:07 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +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 <comms-infras/commsdebugutility.h>
-
-#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__
-#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)
-#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<const TDesC8> 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__
--- a/telephonyprotocols/rawipnif/rawipnif2/src/BcaController.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/BcaController.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32uid.h>
#include <nifmbuf.h>
#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<CBCAProvision*>(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);
}
--- a/telephonyprotocols/rawipnif/rawipnif2/src/BinderBase.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/BinderBase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <nifmbuf.h>
#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.
--- a/telephonyprotocols/rawipnif/rawipnif2/src/IPTagHeader.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPTagHeader.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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)
{
--- a/telephonyprotocols/rawipnif/rawipnif2/src/IPv4Binder.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPv4Binder.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelpckt.h>
#include <in_iface.h>
#include "RawIP2Flow.h"
@@ -30,14 +36,12 @@
#include <networking/umtsnifcontrolif.h>
#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<TBinderConfig4>(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<RMBufChain&>(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<RMBufChain&>(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<RMBufChain&>(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__
--- a/telephonyprotocols/rawipnif/rawipnif2/src/IPv6Binder.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/IPv6Binder.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelpckt.h>
#include <in_iface.h>
#include "RawIP2Flow.h"
@@ -33,15 +39,12 @@
#include <networking/umtsnifcontrolif.h>
#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<RMBufChain&>(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<RMBufChain&>(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<RMBufChain&>(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__
--- a/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2Flow.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2Flow.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <f32file.h>
#include <nifman.h>
#include <nifmbuf.h>
@@ -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<KModemNameLen> 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<KLogTextLen> 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<TNodeId>(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<const CIPConfig*>(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;
}
--- a/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2FlowFactory.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/rawipnif2/src/RawIP2FlowFactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<const TDefaultFlowFactoryQuery&>(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);
--- a/telephonyprotocols/rawipnif/rawipnif2/src/bttlog.cpp Thu May 27 14:05:07 2010 +0300
+++ /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 <e32svr.h>
-#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<KLogBufferSize> 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<KLogBufferSize> 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<const TDesC8> 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<KLogBufferSize> 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__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/rawipnif2/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/rawipnif2/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyprotocols/rawipnif/src/BcaController.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/BcaController.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32uid.h>
#include <nifmbuf.h>
#include <es_ini.h>
@@ -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("<<CSender::Send -> 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, "<<CSender::Send -> 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::Send - return StopSending/ContinueSending"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SEND_10, "<<CBcaController::Send - return StopSending/ContinueSending");
return IsSendQueueFull() ? KStopSending : KContinueSending;
}
@@ -257,8 +263,8 @@
* protocol indicating that is available to send more packets.
*/
{
- _LOG_L1C1(_L8("CBcaController::SendComplete"));
- _LOG_L2C1(_L8(" set State to EIdle"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SENDCOMPLETE_1, "CBcaController::SendComplete");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SENDCOMPLETE_2, " set State to EIdle");
iSendState = EIdle;
@@ -273,8 +279,7 @@
* @return The Flow control state
*/
{
- _LOG_L1C3(_L8("CBcaController::IsTxPossible (contextActive %d, flowcontrol %d)"),
- iTxContextActive, iTxFlowControl);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_ISTXPOSSIBLE_1, "CBcaController::IsTxPossible (contextActive %d, flowcontrol %d)", iTxContextActive, iTxFlowControl);
if(iTxContextActive && (iTxFlowControl == EFlowControlOff))
return ETrue;
@@ -289,7 +294,7 @@
* @param aPdu a data packet
*/
{
- _LOG_L1C1(_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("<<CBcaController::Process couldn't create MBuf [ret=%d]"), ret);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_PROCESS_2, "<<CBcaController::Process couldn't create MBuf [ret=%d]", ret);
return;
}
else
@@ -316,7 +321,7 @@
GetObserver().Process(packet, protocolCode);
}
- _LOG_L1C1(_L8("<<CBcaController::Process"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_PROCESS_3, "<<CBcaController::Process");
}
void CBcaController::ResumeSending()
@@ -325,7 +330,7 @@
* process more packets.
*/
{
- _LOG_L1C1(_L8("CBcaIoController::ResumeSending"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_RESUMESENDING_1, "CBcaIoController::ResumeSending");
// If there are still some packets in the queue to be sent, then carry
// on sending them.
@@ -335,11 +340,11 @@
if(!IsSendQueueEmpty())
{
RMBufChain tmpPdu;
- _LOG_L1C1(_L8(" Packet removed from queue to send"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_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, CBCACONTROLLER_RESUMESENDING_3, " set State to ESending");
iSendState = ESending;
BcaSend(tmpPdu);
@@ -358,7 +363,7 @@
/**
* Used to specify the type of the IP header.
*/
- _LOG_L1C1(_L8("CBcaController::SetType"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCACONTROLLER_SETTYPE_1, "CBcaController::SetType");
iIPTagHeader->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));
}
--- a/telephonyprotocols/rawipnif/src/BcaIoController.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/BcaIoController.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -19,6 +19,12 @@
@file BcaIoController.cpp
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "BcaIoControllerTraces.h"
+#endif
+
#include <e32uid.h>
#include <nifmbuf.h>
#include <e32svr.h>
@@ -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, "<<CBcaIoController::Send");
// Check if flow is shutting down
if (iSendState == EShuttingDown)
{
- _LOG_L2C1(_L8(" ERROR: Nif is shutting down"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_2, " ERROR: Nif is shutting down");
// when the flow is destroyed the memory for this packet will be
// cleaned up - just tell the layers above to stop sending.
@@ -200,8 +203,8 @@
// add it to our queue
if ((aPdu.Length() - aPdu.First()->Length()) > iMaxTxPacketSize)
{
- _LOG_L2C1(_L8("Packet is too large - discarding"));
- _LOG_L1C1(_L8("<<CSender::Send -> 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, "<<CSender::Send -> 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("<<CBcaIoController::Send - return ContinueSending"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_5, "<<CBcaIoController::Send - return ContinueSending");
return ESock::MLowerDataSender::ESendAccepted;
}
@@ -222,7 +225,7 @@
// Transmit is off for this flow - we must have received a block
// message from our control. append this message to the queue
// and tell the layer above it to kindly stop sending.
- _LOG_L1C1(_L8(" Sender blocked, appending packet to queue"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_6, " Sender blocked, appending packet to queue");
AppendToSendQueue(aPdu);
@@ -232,12 +235,12 @@
if (IsSendQueueFull())
{
- _LOG_L2C1(_L8("<<CBcaIoController::Send - return StopSending"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_7, "<<CBcaIoController::Send - return StopSending");
return ESock::MLowerDataSender::ESendBlocked;
}
else
{
- _LOG_L2C1(_L8("<<CBcaIoController::Send - return ContinueSending"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_8, "<<CBcaIoController::Send - return ContinueSending");
return ESock::MLowerDataSender::ESendAccepted;
}
}
@@ -249,12 +252,12 @@
// If this happens, it means that TCP/IP has sent us an IP packet
// while we're still sending the previous one.
{
- _LOG_L1C1(_L8(" Sender busy, appending packet to queue"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_9, " Sender busy, appending packet to queue");
AppendToSendQueue(aPdu);
if (IsSendQueueFull())
{
- _LOG_L2C1(_L8("<<CBcaIoController::Send - return StopSending"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_10, "<<CBcaIoController::Send - return StopSending");
return ESock::MLowerDataSender::ESendBlocked;
}
}
@@ -265,7 +268,7 @@
// packets that might have been queued onto the send queue.
// Update module state
- _LOG_L2C1(_L8(" set State to ESending"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_11, " set State to ESending");
iSendState = ESending;
iSender->Send(aPdu);
@@ -275,7 +278,7 @@
// otherwise, block this flow until we have room for the next
// packet
- _LOG_L2C1(_L8("<<CBcaIoController::Send - return ContinueSending"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SEND_12, "<<CBcaIoController::Send - return ContinueSending");
return ESock::MLowerDataSender::ESendAccepted;
}
@@ -286,12 +289,12 @@
* to process more packets.
*/
{
- _LOG_L1C1(_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::SendComplete"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SENDCOMPLETE_4, "<<CBcaIoController::SendComplete");
}
@@ -349,7 +352,7 @@
* Flow is being unblocked this will resume sending.
*/
{
- _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("<<CBcaIoController::ResumeSending"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_RESUMESENDING_4, "<<CBcaIoController::ResumeSending");
}
#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
@@ -407,7 +410,7 @@
/**
* Used to specify the type of the IP header.
*/
- _LOG_L1C1(_L8("CBcaController::SetType"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CBCAIOCONTROLLER_SETTYPE_1, "CBcaController::SetType");
iIPTagHeader->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);
}
--- a/telephonyprotocols/rawipnif/src/BinderBase.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/BinderBase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <nifmbuf.h>
#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.
--- a/telephonyprotocols/rawipnif/src/IPTagHeader.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/IPTagHeader.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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)
{
--- a/telephonyprotocols/rawipnif/src/IPv4Binder.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/IPv4Binder.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -20,6 +20,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "IPv4BinderTraces.h"
+#endif
+
#include <etelpckt.h>
#include <in_iface.h>
#include "RawIPFlow.h"
@@ -32,8 +38,6 @@
#include <networking/umtsnifcontrolif.h>
#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<TBinderConfig4>(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__
--- a/telephonyprotocols/rawipnif/src/IPv6Binder.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/IPv6Binder.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -20,6 +20,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "IPv6BinderTraces.h"
+#endif
+
#include <etelpckt.h>
#include <in_iface.h>
#include "RawIPFlow.h"
@@ -33,8 +39,6 @@
#include <networking/umtsnifcontrolif.h>
#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__
--- a/telephonyprotocols/rawipnif/src/RawIPFlow.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/RawIPFlow.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -21,6 +21,12 @@
@file
*/
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "RawIPFlowTraces.h"
+#endif
+
#include <f32file.h>
#include <nifman.h>
#include <nifmbuf.h>
@@ -40,21 +46,19 @@
using namespace MeshMachine;
using namespace ESock;
-#ifdef __FLOG_ACTIVE
+#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG)
//These variables are used only if flog is active.
_LIT8(KTcpDumpFirstTag,"TcpDump");
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
@@ -120,7 +122,7 @@
InitialiseL(MControllerObserver::EStart, KErrNone);
//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<KModemNameLen> modemName;
@@ -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<KLogTextLen> 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<TNodeId>(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
--- a/telephonyprotocols/rawipnif/src/RawIPFlowFactory.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/RawIPFlowFactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<const TDefaultFlowFactoryQuery&>(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);
--- a/telephonyprotocols/rawipnif/src/Receiver.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/Receiver.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <es_ini.h>
@@ -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);
}
@@ -82,15 +85,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 +115,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 +132,7 @@
SetActive();
iRMBufPacket.Pack();
-
+
#ifdef RAWIP_HEADER_APPENDED_TO_PACKETS
TUint16 protocolCode = iObserver.RemoveHeader(iRMBufPacket);
#else
@@ -145,7 +147,7 @@
TInt CReceiver::RunError(TInt aError)
{
- _LOG_L2C1(_L8("WARNING! CReceiver::RunError Read failed"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_RUNERROR_1, "WARNING! CReceiver::RunError Read failed");
iObserver.Stop(aError);
return KErrNone;
}
@@ -155,7 +157,7 @@
* Cancel active request
*/
{
- _LOG_L1C1(_L8("CReceiver::DoCancel"));
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVER_DOCANCEL_1, "CReceiver::DoCancel");
(iObserver.Bca())->CancelRead();
}
@@ -166,7 +168,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);
--- a/telephonyprotocols/rawipnif/src/Sender.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/Sender.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <es_ini.h>
-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);
}
@@ -82,27 +85,27 @@
* 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 +115,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 +125,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 +138,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 +151,5 @@
aPdu.Free();
(iObserver.Bca())->Write(iStatus, iSendBuffer);
-
SetActive();
}
-
--- a/telephonyprotocols/rawipnif/src/bttlog.cpp Thu May 27 14:05:07 2010 +0300
+++ /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 <e32svr.h>
-#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<KLogBufferSize> 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<KLogBufferSize> 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<const TDesC8> 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<KLogBufferSize> 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__
--- a/telephonyprotocols/rawipnif/src/rawipmcpr.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/rawipmcpr.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -20,6 +20,11 @@
@internalComponent
*/
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "rawipmcprTraces.h"
+#endif
+
#include <comms-infras/ss_log.h>
#include "rawipmcpr.h"
#include <comms-infras/linkprovision.h>
@@ -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);
--- a/telephonyprotocols/rawipnif/src/rawipmcprfactory.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/src/rawipmcprfactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/ss_log.h>
@@ -27,10 +32,6 @@
#include <comms-infras/ss_msgintercept.h>
-#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<CMetaConnectionFactoryContainer*>(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)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/rawipnif/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyprotocols/rawipnif/version1/group/networking_rawipnif.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/rawipnif/version1/group/networking_rawipnif.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyprotocols/secondarypdpcontextumtsdriver/group/networking_spud.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/BWINS/TE_SPUDUNITU.DEF Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,4 @@
+EXPORTS
+ ?NewServer@@YAHXZ @ 1 NONAME ; int NewServer(void)
+ ?NewPdpFsmInterfaceL@@YAPAVRPdpFsmInterface@@XZ @ 2 NONAME ; class RPdpFsmInterface * NewPdpFsmInterfaceL(void)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.iby Fri Jun 11 14:49:29 2010 +0300
@@ -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__
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/group/TE_SpudUnit.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CPdpFsmInterface.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/mpdpfsminterface.h>
+#include "RSpudManInterface.h"
+#include <etelpckt.h>
+
+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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/CompareContextParameters.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#include <etelpckt.h>
+
+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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/DefaultContextParameters.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#include <etelpckt.h>
+
+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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/InputRequestListener.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
+#include <networking/umtsnifcontrolif.h>
+
+#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
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/PdpFsmInterfaceTest.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudManInterfaceTest.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/mspudmaninterface.h>
+
+// 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
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestServer.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testexecuteserverbase.h>
+#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
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/inc/SpudUnitTestStep.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <c32comm.h>
+#include <networking/umtsnifcontrolif.h>
+#include <testexecutestepbase.h>
+
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/scripts/TE_SpudUnitTest.script Fri Jun 11 14:49:29 2010 +0300
@@ -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
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/ActiveSchedulerThread.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <in_iface.h>
+#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;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CPdpFsmInterface.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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();
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/CompareContextParameters.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<const RPacketQoS::TQoSR99_R4Requested&>(aFirst),
+ static_cast<const RPacketQoS::TQoSR99_R4Requested&>(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;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/DefaultContextParameters.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<RPacketContext::TProtocolType>(1);
+ aParam.iAccessPointName.Copy(apn);
+ aParam.iPdpAddress.Copy(protocolAddress);
+ aParam.iPdpCompression = 1;
+ aParam.iAnonymousAccessReqd = static_cast<RPacketContext::TAnonymousAccess>(1);
+ aParam.iUseEdge = ETrue;
+ aParam.iProtocolConfigOption.iAuthInfo.iProtocol = static_cast<RPacketContext::TAuthProtocol>(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<RPacketQoS::TTrafficClass>(2);
+ aQosRequested.iMinTrafficClass = static_cast<RPacketQoS::TTrafficClass>(2);
+ aQosRequested.iReqDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(2);
+ aQosRequested.iMinDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(2);
+ aQosRequested.iReqDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(2);
+ aQosRequested.iMinDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(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<RPacketQoS::TBitErrorRatio>(2);
+ aQosRequested.iMaxBER = static_cast<RPacketQoS::TBitErrorRatio>(2);
+ aQosRequested.iReqSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(2);
+ aQosRequested.iMaxSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(2);
+ aQosRequested.iReqTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(2);
+ aQosRequested.iMinTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(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<RPacketQoS::TTrafficClass>(1);
+ aQosRequested.iMinTrafficClass = static_cast<RPacketQoS::TTrafficClass>(1);
+ aQosRequested.iReqDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(1);
+ aQosRequested.iMinDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(1);
+ aQosRequested.iReqDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(1);
+ aQosRequested.iMinDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(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<RPacketQoS::TBitErrorRatio>(1);
+ aQosRequested.iMaxBER = static_cast<RPacketQoS::TBitErrorRatio>(1);
+ aQosRequested.iReqSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(1);
+ aQosRequested.iMaxSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(1);
+ aQosRequested.iReqTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(1);
+ aQosRequested.iMinTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(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<RPacketQoS::TTrafficClass>(1);
+ aQosNegotiated.iDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(1);
+ aQosNegotiated.iDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(1);
+ aQosNegotiated.iMaxSDUSize = 1;
+ aQosNegotiated.iBER = static_cast<RPacketQoS::TBitErrorRatio>(1);
+ aQosNegotiated.iSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(1);
+ aQosNegotiated.iTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(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<RPacketQoS::TTrafficClass>(2);
+ aQosNegotiated.iDeliveryOrderReqd = static_cast<RPacketQoS::TDeliveryOrder>(2);
+ aQosNegotiated.iDeliverErroneousSDU = static_cast<RPacketQoS::TErroneousSDUDelivery>(2);
+ aQosNegotiated.iMaxSDUSize = 2;
+ aQosNegotiated.iBER = static_cast<RPacketQoS::TBitErrorRatio>(2);
+ aQosNegotiated.iSDUErrorRatio = static_cast<RPacketQoS::TSDUErrorRatio>(2);
+ aQosNegotiated.iTrafficHandlingPriority = static_cast<RPacketQoS::TTrafficHandlingPriority>(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;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/InputRequestListener.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <in_iface.h>
+#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;
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/PdpFsmInterfaceTest.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelpckt.h>
+
+
+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*/}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudFsmUnitTestStep.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
+#include <testexecutelog.h>
+
+#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();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudManInterfaceTest.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelpckt.h>
+
+
+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*/}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudTelUnitTestStep.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
+#include <testexecutelog.h>
+
+#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();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestServer.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/src/SpudUnitTestStepBase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32property.h>
+#include <c32comm.h>
+#include <e32def.h>
+#include <e32std.h>
+
+#include <in_iface.h>
+#include <simtsy.h>
+
+#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);
+ }
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/Test/te_spud/testdata/Spud_config.txt Fri Jun 11 14:49:29 2010 +0300
@@ -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 <iContextName>, <iDuration>, <iStatus>
+# 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 <iContextName>, <iDuration>, <iStatus>
+# 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.iby Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/group/UmtsGprsSCPR.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/group/networking_UmtsGprsSCPR.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/group/networking_umtsgprsscpr.history.xml Fri Jun 11 14:49:29 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="Connection Provider Plugin">
+ <purpose>
+ </purpose>
+</relnotes>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/inc/MPdpFsmInterface.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelmm.h>
+#include <etelqos.h>
+#include <etelpckt.h>
+
+#include <networking/umtsnifcontrolif.h>
+#include <networking/mspudmaninterface.h>
+
+/** 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/inc/MSpudManInterface.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#include <in_iface.h>
+
+/**
+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
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/inc/PdpFsmRequest.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/inc/RSpudManInterface.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/mspudmaninterface.h>
+#include <comms-infras/commsdebugutility.h>
+
+
+/**
+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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_defaultSubconnProv.inl Fri Jun 11 14:49:29 2010 +0300
@@ -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;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ss_subconnprov.h>
+#include <comms-infras/commsdebugutility.h>
+
+#include <cs_subconparams.h>
+#include <cs_subconevents.h>
+
+#include "PDPFSM.h"
+#include <networking/qos3gpp_subconparams.h>
+
+
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProv.inl Fri Jun 11 14:49:29 2010 +0300
@@ -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;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/inc/UmtsGprs_subconnProvFactory.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ss_subconnprov.h>
+#include <comms-infras/nifif.h>
+#include <networking/mspudmaninterface.h>
+
+// 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/inc/PDPFSM.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/mpdpfsminterface.h>
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/inc/pdpfsmnmspace.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelqos.h>
+
+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<TPacketDataConfigBase&>(iNegotiatedBuffer)).ExtensionId();
+ }
+
+
+inline const RPacketQoS::TQoSR99_R4Negotiated& TNegotiatedProfileBuffer::NegotiatedQoSR99_R4()
+ {
+ return reinterpret_cast<RPacketQoS::TQoSR99_R4Negotiated&>(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<TPacketDataConfigBase&>(iRequestedBuffer)).ExtensionId();
+ }
+
+
+inline const RPacketQoS::TQoSR99_R4Requested& TRequestedProfileBuffer::RequestedQoSR99_R4()
+ {
+ return reinterpret_cast<RPacketQoS::TQoSR99_R4Requested&>(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<TNegotiatedProfileBuffer> TNegotiatedProfileBufferPckg;
+typedef TPckg<TRequestedProfileBuffer> TRequestedProfileBufferPckg;
+
+
+#endif
+// PDPFSMNMSPACE_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPFSM.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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();
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/PDPSCPRFSM.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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();
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsm.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+#include <etelmm.h>
+#include <etelqos.h>
+#include <networking/umtsnifcontrolif.h>
+#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
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/cpdpfsmfactory.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+
+#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<CPdpFsm*, KMaxPdpContexts> 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/spudfsmdebuglogger.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+
+_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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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;
+ }
+
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstate.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingprimary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateactivatingsecondary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingqos.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatechangingtft.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateclosing.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatedSecondary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingSecondary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatecreatingprimary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstategettingnegqos.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+ }
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateinitialised.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatemodifingactive.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopen.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelpckt.h>
+#include <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstateopeningphone.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstates.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqos.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingqosprimary.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking\UmtsNifControlIf.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesettingtft.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatestopping.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudfsm/src/tpdpstatesuspended.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/umtsnifcontrolif.h>
+#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);
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivercontext.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+#include <etelmm.h>
+#include <etelqos.h>
+#include <networking/umtsnifcontrolif.h>
+
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldriverfactory.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+#include <etelmm.h>
+#include <etelpckt.h>
+
+#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<MEtelDriverStrategy*, EtelDriver::ESentinelStrategy> iStrategies;
+ /** map of input to strategy id */
+ // Dev. note: we might have more Strategies then Inputs
+ TFixedArray<EtelDriver::TEtelDriverStrategy, EtelDriver::ESentinelInput> iInputToStrategyMap;
+
+
+ /** array of pdp contexts and notifiers
+ Dev. note: primary and secondary contexts could be in arbitrary slots
+ */
+ TFixedArray<CSpudContextElem*, KMaxPdpContexts> 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/ceteldrivernotifier.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+
+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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpconfigchangenotifier.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+#include <etelpckt.h>
+#include <networking/umtsnifcontrolif.h>
+
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cpdpstatuschangenotifier.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+#include <etelpckt.h>
+
+#include <networking/umtsnifcontrolif.h>
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cqoschangenotifier.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cservicechangenotifier.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+#include <etelpckt.h>
+
+#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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/cspudcontextelem.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldrivernmspace.h Fri Jun 11 14:49:29 2010 +0300
@@ -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<RPacketQoS::TQoSR99_R4Requested> TQoSR99_R4RequestedPckg;
+ typedef TPckg<RPacketQoS::TQoSR99_R4Negotiated> TQoSR99_R4NegotiatedPckg;
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ typedef TPckg<RPacketQoS::TQoSR5Requested> TQoSR5RequestedPckg;
+ typedef TPckg<RPacketQoS::TQoSR5Negotiated> TQoSR5NegotiatedPckg;
+#endif
+// SYMBIAN_NETWORKING_UMTSR5
+
+ typedef TPckg<RPacketContext::TContextConfigGPRS> TContextConfigGPRSPckg;
+ typedef TPckg<RPacketContext::TPacketFilterV2> TPacketFilterV2Pckg;
+
+
+_LIT(KTxtSpudTel, "SPUDTEL");
+
+} // namespace EtelDriver
+
+
+#endif // ETELDRIVERNMSPACE_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/eteldriverstrategies.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/meteldriverstrategy.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/reteldriverinput.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
+#include <e32std.h>
+#include <networking/umtsnifcontrolif.h> // 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/inc/spudteldebuglogger.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+#include <e32def.h>
+
+
+_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
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivercontext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<TContextId>(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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldriverfactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+#include <etelmm.h>
+
+#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<KCommsDbSvrMaxFieldLength> 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<TContextId>(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);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/ceteldrivernotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
+
+#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());
+ }
+ }
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpconfigchangenotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+#include <pcktcs.h>
+
+#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));
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cpdpstatuschangenotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
+
+#include "cpdpstatuschangenotifier.h"
+#include "PDPFSM.h"
+#include "spudteldebuglogger.h"
+#include "pdpfsmnmspace.h"
+
+#include <pcktcs.h>
+
+
+/**
+@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);
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cqoschangenotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <pcktcs.h>
+
+
+/** 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);
+ }
+ }
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cservicechangenotifier.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
+
+#include "cservicechangenotifier.h"
+#include "PDPFSM.h"
+#include "spudteldebuglogger.h"
+#include "pdpfsmnmspace.h"
+
+#include <pcktcs.h>
+
+/** 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);
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/cspudcontextelem.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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();
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/eteldriverstrategies.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
+
+#include "ceteldrivercontext.h"
+#include "eteldriverstrategies.h"
+#include "spudteldebuglogger.h"
+#include "pdpfsmnmspace.h"
+
+#include <pcktcs.h>
+
+
+//
+// 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;
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/spudtel/src/reteldriverinput.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
+#include <e32std.h>
+
+#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<TContextId>(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);
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/src/1020D45E.rss Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ecom/registryinfo.rh>
+
+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 = "";
+ }
+ };
+ }
+ };
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/src/PdpFsmRequest.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/src/RSpudManInterface.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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);
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/src/UmtsGprs_defaultSubconnProv.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <commsdattypesv1_1.h>
+#include <ss_connsettings.h>
+
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+#include <ip_subconparams.h>
+#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<CSubConImsExtParamSet*>
+ (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<CNifIfBase**>(const_cast<TUint8*>(aOption.Ptr()));
+ ASSERT(nif != NULL);
+ TPckg<MPdpFsmInterface*> pdpfsm(iPdpFsm);
+ return nif->Control(KSOLInterface, KInitialisePdpFsm, pdpfsm);
+ }
+
+ return CUmtsGprsSubConnProvd::Control(aOptionLevel, aOptionName, aOption);
+ }
+
+
+CPdpFsmInterface& CUmtsGprsDefaultSubConnProvd::GetPdpFsmInterface()
+ {
+ return *iPdpFsm;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProv.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <cs_subconevents.h>
+#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<CSubConNotificationEvent*>(aEvent);
+ delete ptr;
+ }
+
+void SubconParamSetCleanupFunction(TAny* aEvent)
+ {
+ CSubConParameterSet* ptr = static_cast<CSubConParameterSet*>(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<CSubConParameterBundle&>(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<CSubConQosR5ParamSet*>(family->FindExtensionSet(
+ STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR5ParamsType), CSubConParameterFamily::ERequested));
+
+ extAcceptableR5 = static_cast<CSubConQosR5ParamSet*>(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<CSubConQosR99ParamSet*>(family->FindExtensionSet(
+ STypeId::CreateSTypeId(KSubCon3GPPExtParamsFactoryUid,KSubConQosR99ParamsType), CSubConParameterFamily::ERequested));
+
+ extAcceptableR99 = static_cast<CSubConQosR99ParamSet*>(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<CSubConQosGenericParamSet*>(family->GetGenericSet(CSubConParameterFamily::ERequested));
+ CSubConQosGenericParamSet* genericAcceptable =
+ static_cast<CSubConQosGenericParamSet*>(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<RPacketQoS::TQoSR99_R4Requested*>(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<RPacketQoS::TQoSR99_R4Negotiated*>(aNetworkQoS)), aGranted);
+
+
+
+ switch (iParameterRelease)
+ {
+#ifdef SYMBIAN_NETWORKING_UMTSR5
+ case KParameterRel5:
+ // Control client sent us an R5 qos request
+ MapQosEtelToR5SetL ((static_cast<RPacketQoS::TQoSR5Negotiated*>(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<RPacketQoS::TQoSR5Negotiated*>(aNetworkQoS)), aGranted);
+#endif
+ MapQosEtelToR99SetL ((static_cast<RPacketQoS::TQoSR99_R4Negotiated*>(aNetworkQoS)), aGranted);
+ break;
+
+ case KParameterRel4Rel99:
+ // Control client sent us an R4/R99 qos request
+ MapQosEtelToR99SetL ((static_cast<RPacketQoS::TQoSR99_R4Negotiated*>(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;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyprotocols/umtsgprsscpr/src/UmtsGprs_subconnProvFactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <networking/qos3gpp_subconparams.h>
+#include "UmtsGprs_defaultSubconnProv.h"
+#include <implementationproxy.h>
+
+/**
+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<CSubConnectionFactoryContainer*>(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;
+ }
+
--- a/telephonyserver/etelmultimode/group/telephony_etelmm.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelmultimode/group/telephony_etelmm.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelpacketdata/group/telephony_etelpckt.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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 <f32file.h>
#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--;
}
--- a/telephonyserver/etelserverandcore/SETEL/ET_MAN.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_MAN.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32svr.h>
#include <f32file.h>
#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)
--- a/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_PHONE.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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<CReqEntry> 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();
}
}
--- a/telephonyserver/etelserverandcore/SETEL/ET_SES.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_SES.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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;i<count;i++)
{
@@ -130,14 +135,14 @@
}
}
}
- LOGTEXT("Delete iObjectIx");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_DTOR_2, "Delete iObjectIx");
delete iObjectIx;
}
if (iTsyModulesIx)
{
- LOGTEXT("Delete TsyModulesIx");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_DTOR_3, "Delete TsyModulesIx");
delete iTsyModulesIx;
}
UnsetPriorityClient();
@@ -162,7 +167,7 @@
// Handle messages for this session
//
{
- LOGTEXT2("CTelSession::Service Called, IPC: %d", aMessage.Function());
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CTELSESSION_SERVICEL_1, "CTelSession::Service Called, IPC: %d", aMessage.Function());
iMessage=aMessage;
@@ -813,7 +818,7 @@
TRAP(res,(newObject=iPhoneManager->OpenPhoneFromFactoryL(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
--- a/telephonyserver/etelserverandcore/SETEL/ET_SSTD.H Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_SSTD.H Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserver/etelserverandcore/SETEL/ET_SVR.CPP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_SVR.CPP Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32svr.h>
#include "ET_SSTD.H"
#include <e32cmn.h>
@@ -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);
--- a/telephonyserver/etelserverandcore/group/ETEL.MMP Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/group/ETEL.MMP Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/group/telephony_etel-config.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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.
--- a/telephonyserver/etelserverandcore/group/telephony_etel.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/group/telephony_etel.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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_etel
source \sf\os\cellularsrv\telephonyserver\etelserverandcore\bwins
@@ -27,6 +11,7 @@
source \sf\os\cellularsrv\telephonyserver\etelserverandcore\INC
source \sf\os\cellularsrv\telephonyserver\etelserverandcore\SETEL
source \sf\os\cellularsrv\telephonyserver\etelserverandcore\TETEL
+source \sf\os\cellularsrv\telephonyserver\etelserverandcore\traces
binary \sf\os\cellularsrv\telephonyserver\etelserverandcore\group all
exports \sf\os\cellularsrv\telephonyserver\etelserverandcore\group
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserver/etelserverandcore/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserver/etelserverandcore/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelsimtoolkit/group/telephony_etelsat.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/buildgroups/g_group_with_dispatcher/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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"
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/buildgroups/g_group_without_dispatcher/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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"
+
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/buildgroups/g_group_without_dispatcher/ctsy.iby Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsysystemstateplugin.iby>
+
+#endif
--- a/telephonyserverplugins/common_tsy/commontsy/group/commontsy.mmh Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/group/commontsy.mmh Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/commsdebugutility.mmh>
-
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmstorage/cmmphonebookstoretsy.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmstorage/cmmphonebookstoretsy.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <mpbutil.h>
#include <ctsy/rmmcustomapi.h>
#include "cmmgsmphonestorageprivateutility.h"
-#include <ctsy/tflogger.h>
#include "MmTsy_timeoutdefs.h"
// FORWARD DECLARATIONS
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmcalltsy.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmcalltsy.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <et_phone.h>
#include <etelmm.h>
#include "MmTsy_timeoutdefs.h"
-#include <ctsy/tflogger.h>
// FORWARD DECLARATIONS
class CMmPhoneTsy;
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmconferencecalltsy.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmconferencecalltsy.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelmm.h>
#include <et_phone.h>
#include "MmTsy_timeoutdefs.h"
-#include <ctsy/tflogger.h>
#include "cmmcalltsy.h"
// FORWARD DECLARATIONS
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmlinetsy.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmlinetsy.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <et_tsy.h>
#include <et_phone.h>
#include <etelmm.h>
-#include <ctsy/tflogger.h>
// FORWARD DECLARATIONS
class CMmPhoneTsy;
--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/serviceapi/mmtsy_defaults.h>
-#include <ctsy/tflogger.h>
#include "CMmPrivateUtility.h"
#include <ctsy/serviceapi/ctsydomainpskeys.h>
#include <ctsy/serviceapi/mctsysatservice.h>
--- a/telephonyserverplugins/common_tsy/commontsy/inc/tflogger.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/tflogger.h Fri Jun 11 14:49:29 2010 +0300
@@ -31,6 +31,7 @@
// UDEB BUILD:
#define TF_LOGGING_METHOD 3 // 0 = No logging,
// 1 = Flogger,
+ // 2 = RDebug
// 3 = CommsDebug
#endif
@@ -46,6 +47,10 @@
_LIT(KTfLogFolder,"TF");
_LIT(KTfLogFile,"TFLOG.TXT");
+#elif TF_LOGGING_METHOD == 2 // RDebug
+
+#include <e32svr.h>
+
#elif TF_LOGGING_METHOD == 3 // CommsDebug
#include <comms-infras/commsdebugutility.h>
@@ -72,6 +77,15 @@
#define TFLOGSTRING4(AAA,BBB,CCC,DDD) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,TRefByValue<const TDesC>(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)
+
+
#elif TF_LOGGING_METHOD == 3 // CommsDebug
_LIT8(KTSYSubSystem, "tsy");
#ifdef TF_SAT_LOGGING
@@ -96,7 +110,7 @@
#endif // TF_LOGGING_METHOD
-#if TF_LOGGING_METHOD == 1
+#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.
@@ -116,7 +130,7 @@
#define TF_ASSERT(x)
#define TF_ASSERT_NOT_REACHED()
-#endif // TF_LOGGING_METHOD == 1
+#endif // TF_LOGGING_METHOD == 1 || TF_LOGGING_METHOD == 2
#endif // __TFLOGGER_H__
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomSecurityTsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomSecurityTsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include "cmmphonegsmwcdmaext.h"
#include <ctsy/serviceapi/mmtsy_ipcdefs.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
@@ -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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#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<TUint32> 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<TUint32> 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<TUint32> 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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmPacketTsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
+
+#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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/pluginapi/cmmdatapackage.h>
-#include <ctsy/tflogger.h>
// ======== 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 <iReadViagHomeZoneCacheRequests.Count() ; i++ )
{
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_4, "TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
TReadViagHomeZoneCacheRequest* req =
iReadViagHomeZoneCacheRequests[ i ];
@@ -655,13 +660,13 @@
// caching aborted
delete iCurrentlyRetrievedCache;
iCurrentlyRetrievedCache = NULL;
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:There was a problem reading cache values from SIM, error=%d", aError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_5, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:There was a problem reading cache values from SIM, error=%d", aError);
//iViagHomeZoneCacheReady = ETrue;
-TFLOGSTRING("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL: Caching completed unsuccessfully!");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_6, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL: Caching completed unsuccessfully!");
for (TInt i = 0; i < iReadViagHomeZoneCacheRequests.Count(); i++)
{
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_7, "TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
TReadViagHomeZoneCacheRequest* req =
iReadViagHomeZoneCacheRequests[i];
iMmCustomTsy->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<RMmCustomAPI::TSimCbTopic>* 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.
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSimLockTsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSimLockTsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
// ======== 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.
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmWimTsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmWimTsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/rmmcustomapi.h>
-#include <ctsy/tflogger.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
// ======== 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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxCompletion.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#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.
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxExt.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmFaxExt.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include "cmmfaxext.h"
#include "cmmphonetsy.h"
#include "cmmlinelist.h"
@@ -32,7 +31,7 @@
CMmCallTsy* aMmCall ) // call that owns this object
: iMmCall( reinterpret_cast<CMmFaxCallTsy*>( 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();
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmTsyFax.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/CMmTsyFax.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmfax/cmmfaxextinterface.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmfax/cmmfaxextinterface.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include "CMmFaxExtInterface.h"
#ifdef FAX_IS_SUPPORTED
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <featureuids.h>
#include "cmmphonetsy.h"
@@ -23,7 +29,6 @@
#include "cmmconferencecallgsmwcdmaext.h"
#include <ctsy/pluginapi/cmmdatapackage.h>
#include "cmmmessagemanagerbase.h"
-#include <ctsy/tflogger.h>
#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<RMobileCall::TMobileCallParamsV2Pckg*>(
const_cast<TDesC8*>( 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<RMobileCall::TMobileCallParamsV7Pckg*>(
const_cast<TDesC8*>( 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<TDesC8*>(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<RMobileCall::TMobileCallParamsV7> 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<RMobileCall::TMobileCallParamsV7> 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(
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaextwithdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaextwithdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmconferencecallgsmwcdmaext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmconferencecallgsmwcdmaext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
}
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmphonegsmwcdmaext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmphonegsmwcdmaext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelmm.h>
#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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontextlist.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontextlist.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 "CmmpacketcontexttsyTraces.h"
+#endif
+
#include "Cmmpacketcontexttsy.h"
#include "Cmmpacketcontextlist.h"
#include "cmmpacketservicegsmwcdmaext.h"
#include "CMmPacketTsy.h"
-#include <ctsy/tflogger.h>
#include "MmTsy_timeoutdefs.h"
#include "MmTsy_numberOfSlots.h"
@@ -38,7 +43,7 @@
const TDes& aName,
const TUint8 aProxyId )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::NewL. Context name:%S", &aName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NEWL_1, "TSY: CMmPacketContextTsy::NewL. Context name:%S", aName );
CMmPacketContextTsy* packetContext = new ( ELeave ) CMmPacketContextTsy();
@@ -61,7 +66,7 @@
CMmPacketContextTsy::~CMmPacketContextTsy()
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::~CMmPacketContextTsy. Context name: %S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DTOR_1, "TSY: CMmPacketContextTsy::~CMmPacketContextTsy. Context name: %S", iContextName );
if( iMmPacketService )
{
@@ -159,7 +164,7 @@
const TInt aIpc,
const TDataPackage& aPackage )
{
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, &iContextName );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_EXTFUNC_1, "TSY: CMmPacketContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, iContextName );
TInt ret( KErrNone );
TInt trapError( KErrNone );
@@ -217,8 +222,7 @@
const TInt aIpc,
const TDataPackage& aPackage )
{
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::DoExtFuncL. IPC: %d Handle:%d",
- aIpc, aTsyReqHandle );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DOEXTFUNCL_1, "TSY: CMmPacketContextTsy::DoExtFuncL. IPC: %d Handle:%d",aIpc, aTsyReqHandle );
TInt ret( KErrNotSupported );
@@ -384,7 +388,7 @@
CTelObject::TReqMode CMmPacketContextTsy::ReqModeL(
const TInt aIpc )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::ReqModeL. IPC: %d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REQMODEL_1, "TSY: CMmPacketContextTsy::ReqModeL. IPC: %d", aIpc );
CTelObject::TReqMode reqMode( 0 );
TBool doLeave( EFalse );
@@ -527,8 +531,7 @@
break;
}
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d",
- aIpc, numberOfSlots );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NUMBEROFSLOTSL_1, "TSY: CMmPacketContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d",aIpc, numberOfSlots );
return numberOfSlots;
@@ -550,8 +553,7 @@
const TInt aIpc,
const TTsyReqHandle aTsyReqHandle )
{
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::CancelService. IPC: %d Handle:%d",
- aIpc, aTsyReqHandle );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_CANCELSERVICE_1, "TSY: CMmPacketContextTsy::CancelService. IPC: %d Handle:%d",aIpc, aTsyReqHandle );
TInt ret( KErrNone );
TTsyReqHandle reqHandle( NULL );
@@ -675,7 +677,7 @@
TInt CMmPacketContextTsy::RegisterNotification(
const TInt aIpc )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::RegisterNotification. IPC: %d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REGISTERNOTIFICATION_1, "TSY: CMmPacketContextTsy::RegisterNotification. IPC: %d", aIpc );
TInt ret( KErrNone );
@@ -717,7 +719,7 @@
TInt CMmPacketContextTsy::DeregisterNotification(
const TInt aIpc )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::DeregisterNotification. IPC: %d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DEREGISTERNOTIFICATION_1, "TSY: CMmPacketContextTsy::DeregisterNotification. IPC: %d", aIpc );
TInt ret( KErrNone );
@@ -754,12 +756,12 @@
CTelObject* CMmPacketContextTsy::OpenNewObjectL(
TDes& aNewName )
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::OpenNewObjectL." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_1, "TSY: CMmPacketContextTsy::OpenNewObjectL." );
// Each context can have only one QoS
if ( NULL != iQoSProfile )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectL. Leaves with: %d", KErrAlreadyExists );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_2, "TSY: CMmPacketContextTsy::OpenNewObjectL. Leaves with: %d", KErrAlreadyExists );
User::Leave( KErrAlreadyExists );
}
@@ -771,7 +773,7 @@
iQoSProfileName.Copy( iContextName );
aNewName.Copy( iQoSProfileName );
}
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectL. aNewName: %S", &aNewName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_3, "TSY: CMmPacketContextTsy::OpenNewObjectL. aNewName: %S", aNewName );
return iQoSProfile;
}
@@ -787,11 +789,11 @@
CTelObject* CMmPacketContextTsy::OpenNewObjectByNameL(
const TDesC& aName )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. aName: %S", &aName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. aName: %S", aName );
if ( aName != iQoSProfileName )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_2, "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
User::Leave( KErrNotFound );
}
@@ -806,7 +808,7 @@
//
TInt CMmPacketContextTsy::InitialiseContextL(RPacketContext::TDataChannelV2* aDataChannel )
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::InitialiseContextL." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_INITIALISECONTEXTL_1, "TSY: CMmPacketContextTsy::InitialiseContextL." );
TInt ret( KErrNone );
@@ -830,7 +832,7 @@
//
void CMmPacketContextTsy::CompleteInitialiseContext(const TInt aResult )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteInitialiseContext. Error: %d", aResult );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEINITIALISECONTEXT_1, "TSY: CMmPacketContextTsy::CompleteInitialiseContext. Error: %d", aResult );
// Reset the req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -857,7 +859,7 @@
//
TInt CMmPacketContextTsy::ActivateL()
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::ActivateL. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_ACTIVATEL_1, "TSY: CMmPacketContextTsy::ActivateL. Context name:%S", iContextName );
TInt ret( KErrGprsServicesNotAllowed );
@@ -885,7 +887,7 @@
void CMmPacketContextTsy::CompleteActivate(
const TInt aResult )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteActivate. Error: %d", aResult );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEACTIVATE_1, "TSY: CMmPacketContextTsy::CompleteActivate. Error: %d", aResult );
// Reset the req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodePacketContextActivate );
@@ -906,7 +908,7 @@
//
TInt CMmPacketContextTsy::DeactivateL()
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::DeactivateL. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DEACTIVATEL_1, "TSY: CMmPacketContextTsy::DeactivateL. Context name:%S", iContextName );
TInt ret( KErrNone );
// Call Deactivate
@@ -930,7 +932,7 @@
void CMmPacketContextTsy::CompleteDeactivate(
const TInt aResult )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteDeactivate. Error: %d", aResult );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEDEACTIVATE_1, "TSY: CMmPacketContextTsy::CompleteDeactivate. Error: %d", aResult );
// Reset the req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodePacketContextDeactivate );
@@ -954,7 +956,7 @@
//
TInt CMmPacketContextTsy::DeleteL()
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::DeleteL. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DELETEL_1, "TSY: CMmPacketContextTsy::DeleteL. Context name:%S", iContextName );
TInt ret( KErrNone );
@@ -979,7 +981,7 @@
void CMmPacketContextTsy::CompleteDelete(
const TInt aResult )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteDelete. Error: %d", aResult );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEDELETE_1, "TSY: CMmPacketContextTsy::CompleteDelete. Error: %d", aResult );
// Reset the req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodePacketContextDelete );
@@ -1001,7 +1003,7 @@
const TTsyReqHandle aTsyReqHandle,
TPacketDataConfigBase* const aConfig )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::GetConfig. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETCONFIG_1, "TSY: CMmPacketContextTsy::GetConfig. Context name:%S", iContextName );
// Get config
TInt ret = iMmPacketContextGsmWcdmaExt->GetConfig( aConfig );
@@ -1022,8 +1024,7 @@
const TTsyReqHandle aTsyReqHandle,
TUint* const aRate )
{
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetConnectionSpeed. Context name: %S Connection Speed:%d bps",
- &iContextName, iConnectionSpeed );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETCONNECTIONSPEED_1, "TSY: CMmPacketContextTsy::GetConnectionSpeed. Context name: %S Connection Speed:%u bps",iContextName, iConnectionSpeed );
// Get current connection speed rate
*aRate = iConnectionSpeed;
@@ -1044,7 +1045,7 @@
const TTsyReqHandle aTsyReqHandle,
RPacketContext::TDataVolume* const aVolume )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::GetDataVolumeTransferredL. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETDATAVOLUMETRANSFERREDL_1, "TSY: CMmPacketContextTsy::GetDataVolumeTransferredL. Context name:%S", iContextName );
TInt ret( KErrNone );
@@ -1081,7 +1082,7 @@
void CMmPacketContextTsy::CompleteGetDataVolumeTransferred(
const TInt aResult )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteGetDataVolumeTransferred. Error: %d", aResult );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEGETDATAVOLUMETRANSFERRED_1, "TSY: CMmPacketContextTsy::CompleteGetDataVolumeTransferred. Error: %d", aResult );
// Reset the req handle. Returns the deleted req handle
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1114,8 +1115,7 @@
const TTsyReqHandle aTsyReqHandle,
TInt* const aError )
{
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d",
- &iContextName, iLastErrorCause );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETLASTERRORCAUSE_1, "TSY: CMmPacketContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d",iContextName, iLastErrorCause );
*aError = iLastErrorCause;
CMmPacketContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
@@ -1145,8 +1145,7 @@
aQoSProfile->Zero();
}
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetProfileName. Context name: %S QoS Profile Name: %S",
- &iContextName, aQoSProfile );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETPROFILENAME_1, "TSY: CMmPacketContextTsy::GetProfileName. Context name: %S QoS Profile Name: %S",iContextName, *aQoSProfile );
CMmPacketContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
return KErrNone;
@@ -1162,8 +1161,7 @@
const TTsyReqHandle aTsyReqHandle,
RPacketContext::TContextStatus* const aContextStatus )
{
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetStatus. Context name: %S Context Status:%d",
- &iContextName, iContextStatus );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETSTATUS_1, "TSY: CMmPacketContextTsy::GetStatus. Context name: %S Context Status:%d",iContextName, iContextStatus );
*aContextStatus = iContextStatus;
CMmPacketContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
@@ -1179,7 +1177,7 @@
TInt CMmPacketContextTsy::NotifyConfigChanged(
TPacketDataConfigBase* const aConfig )
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::NotifyConfigChanged." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYCONFIGCHANGED_1, "TSY: CMmPacketContextTsy::NotifyConfigChanged." );
// Call NotifyConfigChanged from extension
TInt ret = iMmPacketContextGsmWcdmaExt->NotifyConfigChanged( *aConfig );
@@ -1214,8 +1212,7 @@
//
void CMmPacketContextTsy::CompleteNotifyConfigChanged()
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteNotifyConfigChanged. Context name:%S",
- &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONFIGCHANGED_1, "TSY: CMmPacketContextTsy::CompleteNotifyConfigChanged. Context name:%S",iContextName );
// Get and reset req handle for R97/98 config notify
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1255,7 +1252,7 @@
TInt CMmPacketContextTsy::NotifyConnectionSpeedChange(
TUint* const aRate )
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::NotifyConnectionSpeedChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONSPEEDCHANGE_1, "TSY: CMmPacketContextTsy::NotifyConnectionSpeedChange." );
// Store pointer
iRetNotifyConnectionSpeed = aRate;
@@ -1278,8 +1275,7 @@
if ( iNotifyConnectionSpeed != iConnectionSpeed )
{
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::CompleteNotifyConnectionSpeedChange. Context name:%S Connection Speed:%d bps",
- &iContextName, iConnectionSpeed );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONSPEEDCHANGE_1, "TSY: CMmPacketContextTsy::CompleteNotifyConnectionSpeedChange. Context name:%S Connection Speed:%u bps",iContextName, iConnectionSpeed );
// Store the connection speed internally
iNotifyConnectionSpeed = iConnectionSpeed;
@@ -1309,7 +1305,7 @@
TInt CMmPacketContextTsy::NotifyStatusChange(
RPacketContext::TContextStatus* const aContextStatus )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::NotifyStatusChange. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYSTATUSCHANGE_1, "TSY: CMmPacketContextTsy::NotifyStatusChange. Context name:%S", iContextName );
iRetNotifyStatus = aContextStatus;
iReqHandleType = EMultimodePacketContextNotifyStatusChange;
@@ -1329,8 +1325,7 @@
if ( aContextStatus != iContextStatus )
{
iContextStatus = aContextStatus;
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::CompleteNotifyStatusChange. Context name: %S Context status:%d",
- &iContextName, iContextStatus );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmPacketContextTsy::CompleteNotifyStatusChange. Context name: %S Context status:%d",iContextName, iContextStatus );
if ( RPacketContext::EStatusActive == iContextStatus ||
RPacketContext::EStatusInactive == iContextStatus ||
@@ -1369,7 +1364,7 @@
TInt CMmPacketContextTsy::SetConfigL(
TPacketDataConfigBase* const aConfig )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::SetConfigL. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_SETCONFIGL_1, "TSY: CMmPacketContextTsy::SetConfigL. Context name:%S", iContextName );
// Call SetConfigL
TInt ret = iMmPacketContextGsmWcdmaExt->SetConfigL( aConfig );
@@ -1393,7 +1388,7 @@
const TInt aError,
TBool aIsAddMediaAuthorizationCalled )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteSetConfig. Error: %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETESETCONFIG_1, "TSY: CMmPacketContextTsy::CompleteSetConfig. Error: %d", aError );
TTsyReqHandle reqHandle( EMultimodePacketContextReqHandleUnknown );
//if context exists eg. its name length is bigger than zero
@@ -1482,7 +1477,7 @@
RPacketContext::TDataVolume dataVolume )
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::SetDataVolume" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_SETDATAVOLUME_1, "TSY: CMmPacketContextTsy::SetDataVolume" );
if ( dataVolume.iBytesSent < iDataVolume.iBytesSent )
{
@@ -1516,8 +1511,7 @@
iLastErrorCause = aErrorCause;
}
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::SetLastErrorCause. aErrorCause: %d iLastErrorCause:%d",
- aErrorCause, iLastErrorCause );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_SETLASTERRORCAUSE_1, "TSY: CMmPacketContextTsy::SetLastErrorCause. aErrorCause: %d iLastErrorCause:%d", aErrorCause, iLastErrorCause );
}
@@ -1540,8 +1534,7 @@
//
void CMmPacketContextTsy::ContextSuspended()
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::ContextSuspended. Context status before suspending: %d",
- iContextStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_CONTEXTSUSPENDED_1, "TSY: CMmPacketContextTsy::ContextSuspended. Context status before suspending: %d",iContextStatus );
if ( ( RPacketContext::EStatusActivating == iContextStatus ) ||
( RPacketContext::EStatusActive == iContextStatus ) ||
@@ -1569,8 +1562,7 @@
iContextStatusBeforeSuspending = RPacketContext::EStatusUnknown;
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::ContextResumed. Context status when resumed: %d",
- iContextStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_CONTEXTRESUMED_1, "TSY: CMmPacketContextTsy::ContextResumed. Context status when resumed: %d",iContextStatus );
}
@@ -1604,7 +1596,7 @@
//
void CMmPacketContextTsy::RemoveQoS()
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::RemoveQoS." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REMOVEQOS_1, "TSY: CMmPacketContextTsy::RemoveQoS." );
iQoSProfile = NULL;
iQoSProfileName.Zero();
@@ -1620,8 +1612,7 @@
const TTsyReqHandle aTsyReqHandle,
const TInt aError )
{
-TFLOGSTRING3( "TSY: CMmPacketContextTsy::ReqCompleted. Handle:%d Error:%d",
- aTsyReqHandle, aError );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REQCOMPLETED_1, "TSY: CMmPacketContextTsy::ReqCompleted. Handle:%d Error:%d", aTsyReqHandle, aError );
// Set last error cause
if ( KErrNone != aError )
@@ -1787,7 +1778,7 @@
void CMmPacketContextTsy::ResetDialUpContext()
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::ResetDialUpContext." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_RESETDIALUPCONTEXT_1, "TSY: CMmPacketContextTsy::ResetDialUpContext." );
iDataVolume.iOverflowCounterSent = 0;
iDataVolume.iBytesSent = 0;
@@ -1823,7 +1814,7 @@
const TTsyReqHandle aTsyReqHandle,
TDes8* const aPacketFilter )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::AddPacketFilterL. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_ADDPACKETFILTERL_1, "TSY: CMmPacketContextTsy::AddPacketFilterL. Context name:%S", iContextName );
TInt ret( KErrGeneral );
@@ -1865,7 +1856,7 @@
const TTsyReqHandle aTsyReqHandle,
TInt *aID )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REMOVEPACKETFILTER_1, "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID );
TInt ret( KErrArgument );
@@ -1890,7 +1881,7 @@
//
TInt CMmPacketContextTsy::ModifyActiveContextL()
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::ModifyActiveContextL. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_MODIFYACTIVECONTEXTL_1, "TSY: CMmPacketContextTsy::ModifyActiveContextL. Context name:%S", iContextName );
TInt ret( KErrNotReady );
@@ -1919,7 +1910,7 @@
void CMmPacketContextTsy::CompleteModifyActiveContext(
const TInt aResult )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteModifyActiveContext. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEMODIFYACTIVECONTEXT_1, "TSY: CMmPacketContextTsy::CompleteModifyActiveContext. Context name:%S", iContextName );
TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
EMultimodePacketContextModifyActiveContext );
@@ -2118,7 +2109,7 @@
const TTsyReqHandle aTsyReqHandle,
TConnectionInfoBase* const aInfo )
{
-TFLOGSTRING2( "TSY: CMmPacketContextTsy::GetConnectionInfo. Context name:%S", &iContextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETCONNECTIONINFO_1, "TSY: CMmPacketContextTsy::GetConnectionInfo. Context name:%S", iContextName );
// Get config
TInt ret = FillConnectionInfo( aInfo );
@@ -2138,7 +2129,7 @@
TInt CMmPacketContextTsy::NotifyConnectionInfoChange(
TConnectionInfoBase* const aInfo )
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::NotifyConnectionInfoChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONINFOCHANGE_1, "TSY: CMmPacketContextTsy::NotifyConnectionInfoChange." );
// Store pointer
iRetNotifyConnectionInfo = aInfo;
@@ -2157,7 +2148,7 @@
void CMmPacketContextTsy::CompleteNotifyConnectionInfoChange(
TConnectionInfoBase* const aInfo )
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::CompleteNotifyConnectionInfoChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONINFOCHANGE_1, "TSY: CMmPacketContextTsy::CompleteNotifyConnectionInfoChange." );
if ( NULL != aInfo &&
TConnectionInfoBase::KConnectionInfoV1 == aInfo->ExtensionId() )
@@ -2206,7 +2197,7 @@
TInt CMmPacketContextTsy::FillConnectionInfo(
TConnectionInfoBase* const aInfo )
{
-TFLOGSTRING( "TSY: CMmPacketContextTsy::FillConnectionInfo" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_FILLCONNECTIONINFO_1, "TSY: CMmPacketContextTsy::FillConnectionInfo" );
TInt ret = KErrNone;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketqostsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 );
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include <ctsy/serviceapi/mmtsy_defaults.h>
#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 );
@@ -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 )
{
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontextlist.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontextlist.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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++ )
{
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmscontexttsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#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;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmsmonitoredlist.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmmbmsmonitoredlist.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <pcktlist.h>
#include "mbmstypes.h"
#include "cmmmbmsmonitoredlist.h"
-#include <ctsy/tflogger.h>
// ============================ MEMBER FUNCTIONS ===============================
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <in_sock.h>
#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 =
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaextwithdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontextgsmwcdmaextwithdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 )
{
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontexttsywithdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketcontexttsywithdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 )
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketqosgsmwcdmaext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketqosgsmwcdmaext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<TPacketDataConfigBase>* profileCapsPckg =
@@ -129,7 +135,7 @@
TPckg<TPacketDataConfigBase>* profilePckg =
( TPckg<TPacketDataConfigBase>* ) 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<RPacketQoS::TQoSR5Negotiated >* gprsProfilePckg =
( TPckg<RPacketQoS::TQoSR5Negotiated >* ) 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<RPacketQoS::TQoSR5Requested >* gprsProfilePckg =
( TPckg<RPacketQoS::TQoSR5Requested >* ) 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 )
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketservicegsmwcdmaext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/cmmpacketservicegsmwcdmaext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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)
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmbroadcasttsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <mmlist.h>
#include <etelmm.h>
#include "cmmbroadcasttsy.h"
@@ -25,7 +31,6 @@
#include "MmTsy_numberOfSlots.h"
#include "cmmtsyreqhandlestore.h"
#include <ctsy/pluginapi/cmmdatapackage.h>
-#include <ctsy/tflogger.h>
#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;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsgsmext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsgsmext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32std.h> // error values
#include <mmlist.h>
#include "cmmsmsgsmext.h"
-#include <ctsy/tflogger.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
#include "cmmphonetsy.h"
#include <ctsy/serviceapi/cmmsmsutility.h>
@@ -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<CListReadAllAttempt>* 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();
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmssendrequest.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmssendrequest.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
// ======== MEMBER FUNCTIONS ========
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmsstoragetsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelmm.h>
#include "cmmsmsstoragetsy.h"
#include "cmmphonetsy.h"
@@ -23,7 +29,6 @@
#include "cmmsmsextinterface.h"
#include "MmTsy_numberOfSlots.h"
#include <ctsy/pluginapi/cmmdatapackage.h>
-#include <ctsy/tflogger.h>
// ======== 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<TSmsMsg>( 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
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmsmstsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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
{
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmsms/cmmussdtsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelmm.h>
#include <mmlist.h>
#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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmenstoretsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 )
{
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmonstoretsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 )
{
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include <ctsy/rmmcustomapi.h>
#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: <Delete entry from cache>
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();
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsywithdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsywithdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/serviceapi/mmtsy_ipcdefs.h>
@@ -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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CMmMessageRouterProxy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<CBase*>( pbStore );
static_cast<CMmPhoneBookStoreTsy*>( 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<CMmPhoneTsy*>( 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;
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/CTsyDelegates.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/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%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++ )
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/ChargingStatusObserver.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/ChargingStatusObserver.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
// ======== 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 )
{
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmcalltsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <featmgr/featurecontrol.h>
#include <featureuids.h>
@@ -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<RMobileCall::TMobileCallInfoV3Pckg*>( 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<RMobileCall::TMobileCallInfoV7Pckg*>( 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<RMobileCall::TMobileCallInfoV8Pckg*>( 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;
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmconferencecalltsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<CMmCallGsmWcdmaExt*>(
@@ -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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatacalltsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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);
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatalinetsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdatalinetsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<CCallDataPackage*>(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 );
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelmmcs.h>
-#include <ctsy/tflogger.h>
// 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;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsywithdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmdtmftsywithdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
/**
* 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(
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxcalltsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 );
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxlinetsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmfaxlinetsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
// ======== 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;
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinelist.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinelist.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 ] )
{
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmlinetsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
#include <et_struct.h>
@@ -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);
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmmessagemanagerbase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#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;
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmnettsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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(
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelmm.h>
@@ -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<RMobilePhone::KIMSISize> 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 )
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsywithdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmphonetsywithdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<RMobilePhone::TMobilePhoneLockSetting* >
( 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;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsywithdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsecuritytsywithdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsupplservtsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmsupplservtsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
// 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<TUint16>( *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<RMobilePhone::TMobilePhoneMessageWaitingV1Pckg*>( 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<RMobilePhone::TMobilePhoneSendSSRequestV3>* ssDataPckg =
reinterpret_cast<TPckg<RMobilePhone::TMobilePhoneSendSSRequestV3>*>
@@ -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;
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicecalltsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicecalltsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <featmgr/featurecontrol.h>
@@ -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<RMobileCall::TMobileCallInfoV3Pckg*>( 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<RMobileCall::TMobileCallInfoV7Pckg*>( 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<RMobileCall::TMobileCallInfoV8Pckg*>( 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<CMmVoiceLineTsy*>( 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;
}
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
}
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CMmCommonStaticUtility.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelmm.h>
#include <etelmmerr.h>
#include <exterror.h>
#include <ctsy/serviceapi/gsmerror.h>
#include "CMmCommonStaticUtility.h"
-#include <ctsy/tflogger.h>
#include <in_sock.h>
// ======== 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;
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimer.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimer.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#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(),
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimerStore.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/CResponseTimerStore.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#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.");
}
}
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmutility/cmmtsyreqhandlestore.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32std.h>
#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 );
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/commontsy/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/commontsy/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/common_tsy/group/bld.inf Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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 @@
PRJ_EXPORTS
-
#ifndef CTSY_G_BUILD_WITHOUT_DISPATCHER
//Exported headers used in the Dispatcher component
PRJ_EXPORTS
--- a/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/group/telephony_commontsy.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/common_tsy/phonetsy/group/phonetsy.mmh Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/phonetsy/group/phonetsy.mmh Fri Jun 11 14:49:29 2010 +0300
@@ -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,12 +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 <comms-infras/commsdebugutility.mmh>
-
// End of file
--- a/telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/phonetsy/src/cmmphonefactorytsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cmmphonefactorytsyTraces.h"
+#endif
+
#include <featmgr/featurecontrol.h>
#include <featureuids.h>
@@ -75,7 +81,7 @@
//
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;
@@ -86,15 +92,15 @@
TInt err = featureControl.Open();
if (err != KErrNone)
{
-TFLOGSTRING("CMmPhoneFactoryTsy::NewPhoneL - failed to connect to FeatMgr");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_2, "CMmPhoneFactoryTsy::NewPhoneL - failed to connect to FeatMgr");
}
else if (featureControl.FeatureSupported(NFeature::KCsVideoTelephony) == KFeatureSupported)
{
-TFLOGSTRING("TSY: __CS_VIDEO_TELEPHONY -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)
{
-TFLOGSTRING("TSY: __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE -flag is on");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_4, "TSY: __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE -flag is on");
}
featureControl.Close();
@@ -112,7 +118,7 @@
CleanupStack::PushL( messageManager );
// LTSY Plug-in API successfully created
-TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - Starting to open LicenceeTSY");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_5, "TSY: CMmPhoneFactoryTsy::NewL - Starting to open LicenceeTSY");
// get TSY message manager callback object
MmMessageManagerCallback* callBack =
@@ -137,7 +143,7 @@
User::LeaveIfNull( iMessageRouter );
// Licencee Tsy successfully created
-TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - LicenceeTSY successfully opened");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_6, "TSY: CMmPhoneFactoryTsy::NewL - LicenceeTSY successfully opened");
// set the pointer to the message router object
messageManager->SetMessageRouter( iMessageRouter );
@@ -145,13 +151,13 @@
// 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");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_7, "TSY: CMmPhoneFactoryTsy::NewL - Starting to open CommonTSY");
iPhoneTsy = CMmPhoneTsy::NewL(
messageManager, this, iLtsyFactory );
if ( iPhoneTsy )
{
-TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewL - CommonTSY successfully opened");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWPHONEL_8, "TSY: CMmPhoneFactoryTsy::NewL - CommonTSY successfully opened");
messageManager->SetPhoneTsy( iPhoneTsy );
}
}
@@ -287,7 +293,7 @@
if ( KErrNone == aName.CompareF( KSatToolkit ) )
{
-TFLOGSTRING("TSY: CMmPhoneFactoryTsy::NewSimAtk - Starting to open SimAtkTSY");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_NEWSIMATK_1, "TSY: CMmPhoneFactoryTsy::NewSimAtk - Starting to open SimAtkTSY");
if( iLtsyFactory )
{
@@ -329,7 +335,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());
@@ -363,7 +369,7 @@
uid3_int = KLicenseeTsyUID3;
}
- TFLOGSTRING3("TSY: CMmPhoneFactoryTsy::LoadLibraryL - Loading Dll=%S, UID3=0x%x", &dllname, uid3_int);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEFACTORYTSY_LOADLIBRARYL_1, "TSY: CMmPhoneFactoryTsy::LoadLibraryL - Loading Dll=%S, UID3=0x%8X", dllname, (TUint)uid3_int);
TUidType uid(KNullUid, KNullUid, TUid::Uid(uid3_int));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/phonetsy/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/phonetsy/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/common_tsy/systemstateplugin/group/ctsysystemstateplugin.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/systemstateplugin/group/ctsysystemstateplugin.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/commsdebugutility.mmh>
-
--- a/telephonyserverplugins/common_tsy/systemstateplugin/src/ctsysystemstateplugin.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/systemstateplugin/src/ctsysystemstateplugin.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
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)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/systemstateplugin/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/systemstateplugin/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/group/component_test.pkg Fri Jun 11 14:49:29 2010 +0300
@@ -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"
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/bld.inf Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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"
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/mockltsy.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/group/mockltsy.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/commsdebugutility.mmh>
-
UNPAGED
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/Cmmcustommesshandlergsmext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/Cmmcustommesshandlergsmext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
#include <ctsy/serviceapi/mmtsy_ipcdefs.h>
#include <ctsy/pluginapi/mmmessagemanagercallback.h>
@@ -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");
}
// ---------------------------------------------------------------------------
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmmcustomstubext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmmcustomstubext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/pluginapi/mmmessagemanagercallback.h>
//#include "Telephony.h"
-#include <ctsy/tflogger.h>
#include "cmmcustomstubext.h"
#include <ctsy/pluginapi/cmmdatapackage.h>
#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;
}
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockcallmesshandler.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockcallmesshandler.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include "MmTsy_Csd_Defs.h"
#include "cmmmessagerouter.h"
#include <ctsy/pluginapi/mmmessagemanagercallback.h>
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktcontextmesshandler.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktcontextmesshandler.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelpckt.h>
#include "cmockpcktcontextmesshandler.h"
-#include <ctsy/tflogger.h>
#include <pcktcs.h>
#include <ctsy/pluginapi/mmmessagemanagercallback.h>
#include "cmockltsyengine.h"
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktqosmesshandler.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktqosmesshandler.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/tflogger.h>
#include <pcktcs.h>
#include <ctsy/pluginapi/mmmessagemanagercallback.h>
#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<TPacketDataConfigBase>* profilePckg = ( TPckg<TPacketDataConfigBase>* ) 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());
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktservicemesshandler.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockpcktservicemesshandler.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/pluginapi/mmmessagemanagercallback.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
-#include <ctsy/tflogger.h>
#include <pcktcs.h>
#include "cmockltsyengine.h"
#include "tmockltsydata.h"
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockphonebookstoremesshandler.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmockphonebookstoremesshandler.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/pluginapi/mmmessagemanagercallback.h>
#include <ctsy/pluginapi/cmmdatapackage.h>
#include <ctsy/serviceapi/mmtsy_ipcdefs.h>
-#include <ctsy/tflogger.h>
#include "cmmmessagerouter.h"
#include "cmockltsyengine.h"
#include "tmockltsydata.h"
--- a/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmocksmsmesshandler.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/src/cmocksmsmesshandler.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/pluginapi/mmmessagemanagercallback.h>
#include "cmocksmsmesshandler.h"
#include <ctsy/serviceapi/mmtsy_ipcdefs.h>
-#include "etelmm.h"
-#include <ctsy/tflogger.h>
+#include "etelmm.h"
#include "cmockltsyengine.h"
#include "tmockltsydata.h"
#include <ctsy/serviceapi/cmmsmsutility.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/common_tsy/test/component/mockltsy/mockltsy/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/ctsydispatchlayer/exportinc/ltsylogger.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/exportinc/ltsylogger.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32base.h>
-#ifdef _DEBUG
+#ifdef OST_TRACE_COMPILER_IN_USE
-#include <comms-infras/commsdebugutility.h>
_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!
--- a/telephonyserverplugins/ctsydispatchlayer/group/ctsydispatcher.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/group/ctsydispatcher.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/commsdebugutility.mmh>
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
--- a/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/group/telephony_dispatcher.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/ctsydispatchlayer/src/ccallcontroldispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/ccallcontroldispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchcallcontrolinterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/ccallcontrolmultipartydispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/ccallcontrolmultipartydispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchcallcontrolmultipartyinterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/ccellbroadcastdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/ccellbroadcastdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchcellbroadcastinterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/cctsydispatchercallback.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cctsydispatchercallback.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelsat.h>
#include <in_sock.h>
#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));
--- a/telephonyserverplugins/ctsydispatchlayer/src/cmessagerouter.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cmessagerouter.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32def.h>
#include <satcs.h>
#include <pcktcs.h>
@@ -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()
--- a/telephonyserverplugins/ctsydispatchlayer/src/cpacketservicesdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cpacketservicesdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchpacketservicesinterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchphonebookinterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookendispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookendispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchphonebookeninterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/cphonebookondispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonebookondispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchphonebookoninterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/cphonedispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/cphonedispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchphoneinterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/csatdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csatdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelsat.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/csecuritydispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csecuritydispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/rmmcustomapi.h>
#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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/csimdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csimdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchsiminterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/csmsdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csmsdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/serviceapi/cmmsmsutility.h>
#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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/csupplementaryservicesdispatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/csupplementaryservicesdispatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/mltsydispatchsupplementaryservicesinterface.h>
@@ -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)
--- a/telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/src/ltsylogger.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/ltsylogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "ltsyloggerTraces.h"
+#endif
-#ifdef _DEBUG
-#include <e32debug.h>
-#include <comms-infras/commsdebugutility.h>
+#include <ctsy/ltsy/ltsylogger.h>
+//#include <e32debug.h>
+
+#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<const TDesC8> aFmt, ...)
@@ -52,7 +56,9 @@
line.Append(iFnName);
line.Append(' ');
line.Append(aFmt);
- RFileLogger::WriteFormat(KTsySubSystem, iLayer, line, list);
+ TBuf8<KLineLength> 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<const TDesC16> aFmt, ...)
@@ -69,7 +75,9 @@
line.Insert(0,_L(">>"));
line.Append(' ');
line.Append(aFmt);
- RFileLogger::WriteFormat(KTsySubSystem, iLayer, line, list);
+ TBuf<KLineLength> 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<const TDesC16> /*aFmt*/, ...){};
EXPORT_C TLogEntryExit::~TLogEntryExit() {};
-#endif // #ifdef _DEBUG
+#endif // #ifdef OST_TRACE_COMPILER_IN_USE
--- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/group/ltsyskeleton.mmh Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/group/ltsyskeleton.mmh Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/commsdebugutility.mmh>
macro LTSY
macro DEBUG_ALLOC // Define to add logging of object allocation
--- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/inc/ltsymacros.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/inc/ltsymacros.h Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/cltsyreceivethreadeventstatehandler.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/cltsyreceivethreadeventstatehandler.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/ltsylogger.h>
#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
//
--- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/creceivethreadmanager.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/creceivethreadmanager.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/ltsy/ltsylogger.h>
@@ -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());
}
--- a/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/group/mockltsy_under_ctsydispatch.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/group/mockltsy_under_ctsydispatch.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/ctsydispatchlayer/test/mockltsy_under_ctsydispatch/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/ctsydispatchlayer/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/ctsydispatchlayer/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/licenseetsystub/group/licenseetsystub.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/group/licenseetsy.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/inc/tflogger.h Thu May 27 14:05:07 2010 +0300
+++ /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 <flogger.h>
-_LIT(KTfLogFolder,"TF");
-_LIT(KTfLogFile,"TFLOG.TXT");
-
-#elif TF_LOGGING_METHOD == 2 // RDebug
-
-#include <e32svr.h>
-
-#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<const TDesC>(tempLogDes()),BBB); } while (0)
-#define TFLOGSTRING3(AAA,BBB,CCC) /*lint --e{717}, --e{1534} */ do { _LIT(tempLogDes,AAA); RFileLogger::WriteFormat(KTfLogFolder(),KTfLogFile(),EFileLoggingModeAppend,TRefByValue<const TDesC>(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<const TDesC>(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<sizeof(tempX8)> tempX; \
- tempX.Copy(TPtrC8(tempX8)); const TUint8 tempF8[] = __FILE__; TBuf<sizeof(tempF8)> 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<sizeof(tempF8)> 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
--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmcustomstubext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmcustomstubext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/pluginapi/cmmdatapackage.h>
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;
}
--- a/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmmockmesshandler.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/src/cmmmockmesshandler.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <pcktcs.h>
#include <ctsy/rmmcustomapi.h>
@@ -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 );
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/licenseetsystub/licensee_tsy_stub/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/multimodetsy/group/telephony_mmtsy.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/simatktsy/group/commonsimatktsy.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/group/commonsimatktsy.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/commsdebugutility.mmh>
-
START WINS
BASEADDRESS 0x65000000
END
--- a/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/group/commonsimatktsy.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/simatktsy/group/cstktsyutility.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/group/cstktsyutility.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <comms-infras/commsdebugutility.mmh>
-
UNPAGED
SMPSAFE
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyCallControlRequest.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyCallControlRequest.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TCallControlV2Pckg*>(
@@ -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" );
}
}
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyCloseChannel.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TCloseChannelV2Pckg*>(
@@ -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<TUint8>(
aAdditionalInfo[i] ) );
}
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyDisplayText.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyDisplayText.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TDisplayTextV2Pckg*>(
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 );
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetChannelStatus.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetChannelStatus.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TGetChannelStatusV2Pckg*>(
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<RSat::KAdditionalInfoMaxSize> 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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetInkey.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetInkey.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TGetInkeyV2Pckg*>(
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
{
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyGetInput.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyGetInput.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TGetInputV1Pckg*>(
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<RSat::TGetInputRspV1Pckg*>( 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<KGetInputStringMaxSize> 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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyLanguageNotification.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLanguageNotification.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::
TLanguageNotificationV2Pckg*>( 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 );
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TLaunchBrowserV2Pckg*>(
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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyLocalInfo.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLocalInfo.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TLocalInfoV3Pckg*>(
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<RSat::KAdditionalInfoMaxSize> 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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyMoSmControlRequest.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyMoSmControlRequest.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TMoSmControlV1Pckg*>(
@@ -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 <= (
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyMoreTime.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyMoreTime.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyOpenChannel.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyOpenChannel.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TOpenChannelBaseV2Pckg*>(
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<TUint8>( 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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyPlayTone.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPlayTone.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TPlayToneV2Pckg*>(
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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyPollInterval.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPollInterval.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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;
}
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyPollingOff.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyPollingOff.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<TUint8>(
aAdditionalInfo[0] ) );
break;
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyReceiveData.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyReceiveData.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TReceiveDataV2Pckg*>(
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 );
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyRefresh.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyRefresh.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TRefreshV2Pckg*>(
@@ -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<RSat::TRefreshV2Pckg*>(
@@ -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<RSat::TRefreshRspV1Pckg*>( 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<RSat::TRefreshRspV1Pckg*>( 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<RSat::KAdditionalInfoMaxSize> 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");
}
}
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySelectItem.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySelectItem.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TSelectItemV2Pckg*>(
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.
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendData.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendData.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TSendDataV2Pckg*>(
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<RSat::KAdditionalInfoMaxSize> 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");
}
}
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendDtmf.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendDtmf.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TSendDtmfV1Pckg*>(
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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendSm.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendSm.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TSendSmV1Pckg*>(
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<TUint8>( rspV1.iGeneralResult ) );
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYSENDSM_TERMINALRESPONSEL_2, "CSAT::CSatNotifySendSm::TerminalResponseL: GeneralResult: %d", static_cast<TUint8>( 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<TUint8>( 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;
}
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendSs.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendSs.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TSendSsV1Pckg*>(
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<RSat::KAdditionalInfoMaxSize> 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;
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySendUssd.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySendUssd.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TSendUssdV1Pckg*>(
@@ -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<RSat::KAdditionalInfoMaxSize> 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<RSat::KStringMaxSize> 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;
}
}
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpCall.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpCall.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TSetUpCallV1Pckg*>(
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;
}
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpEventList.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpEventList.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TSetUpEventListV1Pckg*>(
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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpIdleModeText.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpIdleModeText.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::
TSetUpIdleModeTextV1Pckg*>( 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 );
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySetUpMenu.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySetUpMenu.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::TSetUpMenuV2Pckg*>(
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
--- a/telephonyserverplugins/simatktsy/src/CSatNotifySimSessionEnd.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifySimSessionEnd.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 );
}
}
--- a/telephonyserverplugins/simatktsy/src/CSatNotifyTimerMgmt.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatNotifyTimerMgmt.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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
--- a/telephonyserverplugins/simatktsy/src/CSatTsyReqHandleStore.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CSatTsyReqHandleStore.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
}
--- a/telephonyserverplugins/simatktsy/src/CTsyDelegates.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/CTsyDelegates.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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++ )
--- a/telephonyserverplugins/simatktsy/src/TSatEventList.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/TSatEventList.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
}
--- a/telephonyserverplugins/simatktsy/src/cmmmessagemanagerbase.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/cmmmessagemanagerbase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/pluginapi/mmessagerouter.h>
@@ -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
--- a/telephonyserverplugins/simatktsy/src/csatcctsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatcctsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<KMaxUssdStringLengthInBytes> 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;
--- a/telephonyserverplugins/simatktsy/src/csatdatadownloadtsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatdatadownloadtsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // Etel SAT IPC definitions
#include <etelmm.h> // 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<KCbsMsgMaxLength> 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<KAddrMaxLength> smsScAddress;
TBuf8<RMobileSmsMessaging::KGsmTpduSize> 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<KTpduMaxSize> 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<KMaxFilePath> 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;
--- a/telephonyserverplugins/simatktsy/src/csateventdownloadtsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csateventdownloadtsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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;
--- a/telephonyserverplugins/simatktsy/src/csaticontsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csaticontsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // ETel Ipcs
#include "cmmmessagemanagerbase.h" // Message manager class for forwarding req.
//#include <TSatIconInfo.h> // 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
--- a/telephonyserverplugins/simatktsy/src/csatmessagerouterproxy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatmessagerouterproxy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h>
// 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<CSatDataPackage*>(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.!!!");
}
}
--- a/telephonyserverplugins/simatktsy/src/csatnotificationstsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csatnotificationstsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h> // 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<RSat::KAdditionalInfoMaxSize> 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;
--- a/telephonyserverplugins/simatktsy/src/csattimer.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csattimer.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<TTimer>( 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;
--- a/telephonyserverplugins/simatktsy/src/csattsy.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csattsy.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <etelsat.h> // Etel SAT API
#include <satcs.h> // 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;
--- a/telephonyserverplugins/simatktsy/src/csattsyfactory.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/src/csattsyfactory.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simatktsy/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simatktsy/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/simatktsy/utility/src/cbertlv.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/utility/src/cbertlv.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 );
--- a/telephonyserverplugins/simatktsy/utility/src/ctlv.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/utility/src/ctlv.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
}
}
--- a/telephonyserverplugins/simatktsy/utility/src/tsatutility.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/utility/src/tsatutility.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <ctsy/serviceapi/cmmsmsutility.h> // 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<KMaxUssdStringLengthInBytes> 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;
--- a/telephonyserverplugins/simatktsy/utility/src/ttlv.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simatktsy/utility/src/ttlv.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<TUint8>( 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
--- a/telephonyserverplugins/simtsy/group/bld.inf Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/simtsy/group/simtsy.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/group/simtsy.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/group/telephony_simtsy.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyserverplugins/simtsy/inc/Simlog.h Thu May 27 14:05:07 2010 +0300
+++ /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 <comms-infras/commsdebugutility.h>
-#include <etelmm.h>
-#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_
-
-
--- a/telephonyserverplugins/simtsy/src/CSimBatteryCharger.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimBatteryCharger.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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<TBatteryChargerInfo>(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<RMobilePhone::TMobilePhoneBatteryInfoV1>* batteryInfoPckg = (TPckg<RMobilePhone::TMobilePhoneBatteryInfoV1>*)aInfo;
RMobilePhone::TMobilePhoneBatteryInfoV1& batteryInfo = (*batteryInfoPckg)();
@@ -208,7 +214,7 @@
batteryInfo.iChargeLevel=iCurrentBatteryCharger;
batteryInfo.iStatus = iCurrentStatus;
- LOGMISC3("<<CSimBatteryCharger::GetBatteryInfo with level=%d and status=%d",iCurrentBatteryCharger,iCurrentStatus);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_GETBATTERYINFO_2, "<<CSimBatteryCharger::GetBatteryInfo with level=%d and status=%d",iCurrentBatteryCharger,iCurrentStatus);
iPhone->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<RMobilePhone::TMobilePhoneBatteryInfoV1>* batteryInfoPckg=(TPckg<RMobilePhone::TMobilePhoneBatteryInfoV1>*)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("<<CSimBatteryCharger::NotifyBatteryInfoChange with level=%d and status=%d",iCurrentBatteryCharger,iCurrentStatus);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMBATTERYCHARGER_TIMERCALLBACK_1, "<<CSimBatteryCharger::NotifyBatteryInfoChange with level=%d and status=%d",iCurrentBatteryCharger,iCurrentStatus);
iPhone->ReqCompleted(iBatteryChargerNotificationReqHandle,iCurrentErr);
}
iTimer->Start(iBatteryChargerInfo->At(iBatteryChargerIndex).iDuration,this);
--- a/telephonyserverplugins/simtsy/src/CSimCall.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimCall.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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::NotifyHookChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGE_2, "<<CSimCall::NotifyHookChange");
return KErrNone;
}
@@ -306,13 +311,13 @@
* @return KErrNone
*/
{
- 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::NotifyHookChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYHOOKCHANGECANCEL_2, "<<CSimCall::NotifyHookChangeCancel");
return KErrNone;
}
@@ -328,13 +333,13 @@
* @return KErrNone
*/
{
- 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::NotifyMobileCallStatusChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGE_2, "<<CSimCall::NotifyMobileCallStatusChange");
return KErrNone;
}
@@ -347,13 +352,13 @@
* @return KErrNone
*/
{
- 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::NotifyMobileCallStatusChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYMOBILECALLSTATUSCHANGECANCEL_2, "<<CSimCall::NotifyMobileCallStatusChangeCancel");
return KErrNone;
}
@@ -370,13 +375,13 @@
* @return KErrNone
*/
{
- 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::NotifyStatusChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGE_2, "<<CSimCall::NotifyStatusChange");
return KErrNone;
}
@@ -389,13 +394,13 @@
* @return KErrNone
*/
{
- 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("<<CSimCall::NotifyStatusChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYSTATUSCHANGECANCEL_2, "<<CSimCall::NotifyStatusChangeCancel");
return KErrNone;
}
@@ -475,7 +480,7 @@
mobileCallInfo.iStatus=iState;
mobileCallInfo.iCallName.Copy(iName);
mobileCallInfo.iLineName.Copy(iLine->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::GetStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETSTATUS_2, "<<CSimCall::GetStatus");
return KErrNone;
}
@@ -535,10 +540,10 @@
* @return KErrNone
*/
{
- LOGCALL1(">>CSimCall::GetMobileCallStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETMOBILECALLSTATUS_1, ">>CSimCall::GetMobileCallStatus");
*aCallStatus=iState;
ReqCompleted(aTsyReqHandle,KErrNone);
- LOGCALL1("<<CSimCall::GetMobileCallStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETMOBILECALLSTATUS_2, "<<CSimCall::GetMobileCallStatus");
return KErrNone;
}
@@ -577,12 +582,12 @@
* Not supported in this version of the Simulator TSY
*/
{
- LOGCALL1(">>CSimCall::GetCallDuration");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETCALLDURATION_1, ">>CSimCall::GetCallDuration");
iCallDurationHandler->GetDuration(aTime);
ReqCompleted(aTsyReqHandle,KErrNone);
- LOGCALL1("<<CSimCall::GetCallDuration");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_GETCALLDURATION_2, "<<CSimCall::GetCallDuration");
return KErrNone;
}
@@ -660,7 +665,7 @@
* @return Error indication if change of state is successful or not
*/
{
- LOGCALL3(">>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::ChangeState exit %d",iState);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_CHANGESTATEL_2, "<<CSimCall::ChangeState exit %d",iState);
return KErrNone;
}
@@ -744,7 +749,7 @@
Update notifiers of other voice call when it gets swapped
*/
{
- 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::UpdateNotifiers exit %d",iState);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_UPDATENOTIFIERS_2, "<<CSimCall::UpdateNotifiers exit %d",iState);
}
TInt CSimCall::ActionEvent(TCallEvent /*aEvent*/, TInt /*aStatus*/)
@@ -1006,7 +1011,7 @@
* @return KErrNone
*/
{
- LOGCALL1(">>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::NotifyRemotePartyInfoChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGE_2, "<<CSimCall::NotifyRemotePartyInfoChange");
return KErrNone;
}
@@ -1039,12 +1044,12 @@
* @return KErrNone
*/
{
- 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("<<CSimCall::NotifyRemotePartyInfoChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMCALL_NOTIFYREMOTEPARTYINFOCHANGECANCEL_2, "<<CSimCall::NotifyRemotePartyInfoChangeCancel");
return KErrNone;
}
--- a/telephonyserverplugins/simtsy/src/CSimCallBarring.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimCallBarring.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 "CSimCallBarringTraces.h"
+#endif
+
#include <testconfigfileparser.h>
#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<CListReadAllAttempt>(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;i<count;i++)
{
@@ -94,20 +100,20 @@
ret=CTestConfig::GetElement(item->Value(),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; i<iGetCBStatus->Count(); ++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;
}
--- a/telephonyserverplugins/simtsy/src/CSimCallForwarding.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimCallForwarding.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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<TIdentityServiceStatus>(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;i<count;i++)
@@ -205,34 +211,34 @@
ret=CTestConfig::GetElement(item->Value(),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; i<iGetCFStatus->Count(); ++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;
}
--- a/telephonyserverplugins/simtsy/src/CSimCallWaiting.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimCallWaiting.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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<CListReadAllAttempt>(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;i<count;i++)
{
@@ -92,14 +97,14 @@
ret=CTestConfig::GetElement(item->Value(),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; i<iGetCWStatus->Count(); ++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;
}
--- a/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimContextHelper.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<TUint8*>(additionalParamDataBuffer.Ptr()),
--- a/telephonyserverplugins/simtsy/src/CSimDataCall.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimDataCall.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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::Dial");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIAL_2, "<<CSimDataCall::Dial");
return KErrNone;
}
@@ -687,7 +693,7 @@
* @return KErrNone if successfully cancelled
*/
{
- 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::DialCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIALCANCEL_3, "<<CSimDataCall::DialCancel");
return KErrNone;
}
@@ -731,7 +737,7 @@
* @return KErrNone
*/
{
- 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::AnswerIncomingCall");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALL_2, "<<CSimDataCall::AnswerIncomingCall");
return ret;
}
@@ -766,14 +772,14 @@
* @return KErrNone if successfully cancelled
*/
{
- 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::AnswerIncomingCallCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_2, "<<CSimDataCall::AnswerIncomingCallCancel");
return KErrNone;
}
@@ -797,12 +803,12 @@
* @return KErrNone
*/
{
- 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::HangUp");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUP_2, "<<CSimDataCall::HangUp");
return KErrNone;
}
@@ -814,7 +820,7 @@
* @return KErrNone if successfully cancelled
*/
{
- 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::HangUpCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUPCANCEL_3, "<<CSimDataCall::HangUpCancel");
return KErrNone;
}
@@ -1001,7 +1007,7 @@
switch(aEvent)
{
case ECallEventDial:
- 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::TimerCallBack");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_TIMERCALLBACK_2, "<<CSimDataCall::TimerCallBack");
}
TInt CSimDataCall::ProcessAnswerIncomingCallL()
@@ -1166,14 +1172,14 @@
* call object must be assigned to receive the details of the next incoming call.
*/
{
- 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::ProcessAnswerIncomingCall");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_2, "<<CSimDataCall::ProcessAnswerIncomingCall");
return ret;
}
@@ -1185,13 +1191,13 @@
* call object must be assigned to be the next remotely hung up call.
*/
{
- 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("<<CSimDataCall::ProcessRemoteHangupL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSREMOTEHANGUPL_2, "<<CSimDataCall::ProcessRemoteHangupL");
return ret;
}
--- a/telephonyserverplugins/simtsy/src/CSimDataLine.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimDataLine.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -13,9 +13,15 @@
// Description:
//
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimDataLineTraces.h"
+#endif
+
#include "CSimPhone.h"
#include "CSimDataCall.h"
-#include "Simlog.h"
#include "et_struct.h"
_LIT(KCommonCallName,"DataCall%d"); // < Data call name template.
@@ -108,7 +114,7 @@
* @leave Leaves if name given does not match the required name
*/
{
- LOGDATA1(">>CSimDataLine::OpenNewObjectByNameL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATALINE_OPENNEWOBJECTBYNAMEL_1, ">>CSimDataLine::OpenNewObjectByNameL");
TInt i;
for(i=0;i<iCalls->Count();i++)
{
@@ -118,7 +124,7 @@
return iCalls->At(i);
}
}
- LOGDATA1("<<CSimDataLine::OpenNewObjectByNameL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATALINE_OPENNEWOBJECTBYNAMEL_2, "<<CSimDataLine::OpenNewObjectByNameL");
User::Leave(KErrNotFound);
return NULL;
}
@@ -147,7 +153,7 @@
HandleNewCallAddedNotification(aNewName);
}
iNameOfLastCallAdded.Copy(aNewName);
- LOGDATA2(">>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;
}
--- a/telephonyserverplugins/simtsy/src/CSimDtmf.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimDtmf.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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(iDtmfStringIndex<iDtmfData->Length())
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(iDtmfStringIndex<iDtmfData->Length())
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;
--- a/telephonyserverplugins/simtsy/src/CSimIncomingContextManager.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimIncomingContextManager.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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;
}
--- a/telephonyserverplugins/simtsy/src/CSimIndicator.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimIndicator.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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<TPhoneIndicatorsInfo>(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<TUint32>* indicPckg=(TPckg<TUint32>*)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<TUint32>* indicPckg=(TPckg<TUint32>*)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);
}
}
--- a/telephonyserverplugins/simtsy/src/CSimLine.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimLine.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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::ConstructL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CONSTRUCTL_2, "<<CSimLine::ConstructL");
}
CSimLine::~CSimLine()
@@ -150,11 +156,11 @@
switch (aIpc)
{
case EMobileLineNotifyMobileLineStatusChange:
- LOGLINE1("CLineMobile: Registered with the default number of slots");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NUMBEROFSLOTSL_1, "CLineMobile: Registered with the default number of slots");
return KDefaultNumberOfSlots;
default:
- LOGLINE1("CSimLine::NumberOfSlotsL: No match for IPC, defering to base function");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NUMBEROFSLOTSL_2, "CSimLine::NumberOfSlotsL: No match for IPC, defering to base function");
break;
}
return CLineBase::NumberOfSlotsL(aIpc);
@@ -198,11 +204,11 @@
* @return KErrNone
*/
{
- 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::NotifyIncomingCall");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALL_2, "<<CSimLine::NotifyIncomingCall");
return KErrNone;
}
@@ -215,14 +221,14 @@
* @return KErrNone
*/
{
- 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::NotifyIncomingCallCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYINCOMINGCALLCANCEL_2, "<<CSimLine::NotifyIncomingCallCancel");
return KErrNone;
}
@@ -236,11 +242,11 @@
* @return KErrNone
*/
{
- 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::NotifyHookChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGE_2, "<<CSimLine::NotifyHookChange");
return KErrNone;
}
@@ -253,13 +259,13 @@
* @return KErrNone
*/
{
- 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::NotifyHookChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYHOOKCHANGECANCEL_2, "<<CSimLine::NotifyHookChangeCancel");
return KErrNone;
}
@@ -274,11 +280,11 @@
* @return KErrNone
*/
{
- 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::NotifyMobileLineStatusChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGE_2, "<<CSimLine::NotifyMobileLineStatusChange");
return KErrNone;
}
@@ -291,13 +297,13 @@
* @return KErrNone
*/
{
- 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::NotifyMobileLineStatusChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYMOBILELINESTATUSCHANGECANCEL_2, "<<CSimLine::NotifyMobileLineStatusChangeCancel");
return KErrNone;
}
@@ -311,11 +317,11 @@
* @return KErrNone
*/
{
- 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::NotifyStatusChange");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGE_2, "<<CSimLine::NotifyStatusChange");
return KErrNone;
}
@@ -328,13 +334,13 @@
* @return KErrNone
*/
{
- 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::NotifyStatusChangeCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYSTATUSCHANGECANCEL_2, "<<CSimLine::NotifyStatusChangeCancel");
return KErrNone;
}
@@ -348,11 +354,11 @@
* @return KErrNone
*/
{
- 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::NotifyCallAdded");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDED_2, "<<CSimLine::NotifyCallAdded");
return KErrNone;
}
@@ -365,13 +371,13 @@
* @return KErrNone
*/
{
- 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::NotifyCallAddedCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_NOTIFYCALLADDEDCANCEL_2, "<<CSimLine::NotifyCallAddedCancel");
return KErrNone;
}
@@ -381,7 +387,7 @@
* Process a potential "New Call Added Notification" completion.
*/
{
- 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::HandleNewCallAddedNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_HANDLENEWCALLADDEDNOTIFICATION_2, "<<CSimLine::HandleNewCallAddedNotification");
}
TInt CSimLine::GetCaps(const TTsyReqHandle aTsyReqHandle, RLine::TCaps* aCaps)
@@ -449,7 +455,7 @@
* @return 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::GetInfo");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETINFO_2, "<<CSimLine::GetInfo");
return KErrNone;
}
@@ -504,10 +510,10 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::GetStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETSTATUS_1, ">>CSimLine::GetStatus");
*aLineStatus=GetCoreLineStatus();
ReqCompleted(aTsyReqHandle,KErrNone);
- LOGLINE1("<<CSimLine::GetStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETSTATUS_2, "<<CSimLine::GetStatus");
return KErrNone;
}
@@ -521,10 +527,10 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::GetMobileLineStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETMOBILELINESTATUS_1, ">>CSimLine::GetMobileLineStatus");
*aLineStatus=iState;
ReqCompleted(aTsyReqHandle,KErrNone);
- LOGLINE1("<<CSimLine::GetMobileLineStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETMOBILELINESTATUS_2, "<<CSimLine::GetMobileLineStatus");
return KErrNone;
}
@@ -538,10 +544,10 @@
* @return KErrNone
*/
{
- LOGLINE1(">>CSimLine::GetHookStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETHOOKSTATUS_1, ">>CSimLine::GetHookStatus");
*aHookStatus=iHookState;
ReqCompleted(aTsyReqHandle,KErrNone);
- LOGLINE1("<<CSimLine::GetHookStatus");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_GETHOOKSTATUS_2, "<<CSimLine::GetHookStatus");
return KErrNone;
}
@@ -552,7 +558,7 @@
* @return CTestConfig a pointer to the configuration file data section
*/
{
- 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<count;i++)
{
- LOGLINE3(">>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<count;i++)
{
- LOGLINE3(">>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<count;i++)
{
- LOGLINE3(">>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<count;i++)
{
- LOGLINE3(">>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;i<iCalls->Count();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::ChangeState");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_CHANGESTATEL_8, "<<CSimLine::ChangeState");
return KErrNone;
}
@@ -738,12 +744,12 @@
@param aProperty The property key representing the notification.
*/
{
- 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::SimPSEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SIMPSEVENT_2, "<<CSimLine::SimPSEvent");
}
TInt CSimLine::SetAutoAnswerCallObject(CSimCall* aCallObject)
@@ -756,7 +762,7 @@
* @return KErrNone if successful
*/
{
- 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::SetAnswerCallObject");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETAUTOANSWERCALLOBJECT_2, "<<CSimLine::SetAnswerCallObject");
return KErrNone;
}
@@ -782,7 +788,7 @@
* @param aCallObject pointer to the call object
*/
{
- 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::ProcessIncomingCallEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSINCOMINGCALLEVENT_2, "<<CSimLine::ProcessIncomingCallEvent");
}
TInt CSimLine::SetRemoteHangupCallObject(CSimCall* aCallObject)
@@ -824,7 +830,7 @@
* @return KErrNone if successful
*/
{
- 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::SetRemoteHangupCallObject");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_SETREMOTEHANGUPCALLOBJECT_2, "<<CSimLine::SetRemoteHangupCallObject");
return KErrNone;
}
@@ -845,7 +851,7 @@
* @param aCallObject pointer to the call 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::ProcessRemoteHangupEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSREMOTEHANGUPEVENT_4, "<<CSimLine::ProcessRemoteHangupEvent");
}
void CSimLine::CallDestructor(CSimCall* aCall)
@@ -915,13 +921,13 @@
*/
void CSimLine::ProcessNotifyIncomingCallEvent()
{
- 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("<<CSimLine::ProcessNotifyIncomingCallEvent");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMLINE_PROCESSNOTIFYINCOMINGCALLEVENT_2, "<<CSimLine::ProcessNotifyIncomingCallEvent");
}
--- a/telephonyserverplugins/simtsy/src/CSimMbmsPacketContext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimMbmsPacketContext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -19,7 +19,13 @@
@file
*/
-#include "Simlog.h"
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimMbmsPacketContextTraces.h"
+#endif
+
#include "CSimPhone.h"
#include "CSimMbmsPacketContext.h"
#include "CSimPacketQoS.h"
@@ -55,7 +61,7 @@
* @param aContextName name for this packet context
*/
{
- LOGPACKET1("CSimMbmsPacketContext: Entered constructor");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CTOR_1, "CSimMbmsPacketContext: Entered constructor");
iNotifyConfigMBMS.iNotifyPending = EFalse;
iNotifyStatusChange.iNotifyPending = EFalse;
}
@@ -68,7 +74,7 @@
* @leave Leaves no memory or any data member does not construct for any reason.
*/
{
- LOGPACKET1("CSimMbmsPacketContext: Entered constructL function");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CONSTRUCTL_1, "CSimMbmsPacketContext: Entered constructL function");
CSimPacketContext::ConstructL();
iMbmsSetConfigTimer = CSimTimer::NewL(iPhone);
@@ -199,7 +205,7 @@
*
*/
{
- LOGPACKET1("CSimMbmsPacketContext: Entered destructor");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DTOR_1, "CSimMbmsPacketContext: Entered destructor");
if (iMbmsSetConfigTimer != NULL)
{
@@ -257,7 +263,7 @@
* @ return NULL.
*/
{
- LOGPACKET1("Unexpected call to CSimMbmsPacketContext: OpenNewObjectByName");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_OPENNEWOBJECTBYNAMEL_1, "Unexpected call to CSimMbmsPacketContext: OpenNewObjectByName");
User::Leave(KErrNotSupported);
return NULL;
}
@@ -272,7 +278,7 @@
* @leave Leaves if out of memory.
*/
{
- LOGPACKET1("Unexpected call to CSimMbmsPacketContext: OpenNewObjectL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_OPENNEWOBJECTL_1, "Unexpected call to CSimMbmsPacketContext: OpenNewObjectL");
User::Leave(KErrNotSupported);
return NULL;
}
@@ -287,7 +293,7 @@
* @leave Leaves if not supported by this tsy
*/
{
- LOGPACKET1("CSimMbmsPacketContext: ReqModeL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REQMODEL_1, "CSimMbmsPacketContext: ReqModeL");
CTelObject::TReqMode ret=0;
switch (aIpc)
{
@@ -310,8 +316,8 @@
ret=KReqModeMultipleCompletionEnabled | KReqModeRePostImmediately;
break;
default:
- LOGPACKET1("CSimMbmsPacketContext: ReqModeL error, unknown IPC");
- LOGPACKET1("CSimMbmsPacketContext: ReqModeL sending the request to CSimPacketContext");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REQMODEL_2, "CSimMbmsPacketContext: ReqModeL error, unknown IPC");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REQMODEL_3, "CSimMbmsPacketContext: ReqModeL sending the request to CSimPacketContext");
ret = CSimPacketContext::ReqModeL(aIpc);
break;
}
@@ -330,18 +336,18 @@
* @return err KErrNone if fine
*/
{
- LOGPACKET1("CSimMbmsPacketContext: RegisterNotification called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_1, "CSimMbmsPacketContext: RegisterNotification called");
switch (aIpc)
{
case EPacketContextNotifyConfigChanged:
case EPacketContextNotifyStatusChange:
case EPacketContextNotifyDataTransferred:
- LOGPACKET1("CSimMbmsPacketContext: RegisterNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_2, "CSimMbmsPacketContext: RegisterNotification");
return KErrNone;
default:
// Unknown or invalid IPC
- LOGPACKET1("CSimMbmsPacketContext: Register error, unknown IPC");
- LOGPACKET1("CSimMbmsPacketContext: Register sending the request to CSimPacketContext");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_3, "CSimMbmsPacketContext: Register error, unknown IPC");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_REGISTERNOTIFICATION_4, "CSimMbmsPacketContext: Register sending the request to CSimPacketContext");
return CSimPacketContext::RegisterNotification(aIpc);
}
}
@@ -359,18 +365,18 @@
* @return err KErrNone if fine
*/
{
- LOGPACKET1("CSimMbmsPacketContext: DeregisterNotification called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_1, "CSimMbmsPacketContext: DeregisterNotification called");
switch (aIpc)
{
case EPacketContextNotifyConfigChanged:
case EPacketContextNotifyStatusChange:
case EPacketContextNotifyDataTransferred:
- LOGPACKET1("CSimMbmsPacketContext: DeregisterNotification");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_2, "CSimMbmsPacketContext: DeregisterNotification");
return KErrNone;
default:
// Unknown or invalid IPC
- LOGPACKET1("CSimMbmsPacketContext: Deregister error, unknown IPC");
- LOGPACKET1("CSimMbmsPacketContext: Deregister sending the request to CSimPacketContext");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_3, "CSimMbmsPacketContext: Deregister error, unknown IPC");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_DEREGISTERNOTIFICATION_4, "CSimMbmsPacketContext: Deregister sending the request to CSimPacketContext");
return CSimPacketContext::DeregisterNotification(aIpc);
}
}
@@ -385,20 +391,20 @@
* @return err KErrNone if fine
*/
{
- LOGPACKET1("CSimMbmsPacketContext: NumberOfSlotsL called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_1, "CSimMbmsPacketContext: NumberOfSlotsL called");
TInt numberOfSlots=1;
switch (aIpc)
{
case EPacketContextNotifyConfigChanged:
case EPacketContextNotifyStatusChange:
case EPacketContextNotifyDataTransferred:
- LOGPACKET1("CSimMbmsPacketContext: Registered with 5 slots");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_2, "CSimMbmsPacketContext: Registered with 5 slots");
numberOfSlots=5;
break;
default:
// Unknown or invalid IPC
- LOGPACKET1("CSimMbmsPacketContext: Number of Slots error, unknown IPC");
- LOGPACKET1("CSimMbmsPacketContext: Number of Slots: sending the request to CSimPacketContext");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_3, "CSimMbmsPacketContext: Number of Slots error, unknown IPC");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_NUMBEROFSLOTSL_4, "CSimMbmsPacketContext: Number of Slots: sending the request to CSimPacketContext");
return CSimPacketContext::NumberOfSlotsL(aIpc);
}
return numberOfSlots;
@@ -425,7 +431,7 @@
ReqCompleted(aTsyReqHandle,KErrNotReady);
return KErrNone;
}
- LOGPACKET1("CSimMbmsPacketContext: ExtFunc Called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_EXTFUNC_1, "CSimMbmsPacketContext: ExtFunc Called");
TAny* dataPtr=aPackage.Ptr1();
TAny* dataPtr2=aPackage.Ptr2();
@@ -444,7 +450,7 @@
//<permitted at any one time
if(iIsActive)
{
- LOGPACKET1("Trying to activate an already activated context");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_EXTFUNC_2, "Trying to activate an already activated context");
ReqCompleted(aTsyReqHandle,KErrEtelCallAlreadyActive);
return KErrNone;
}
@@ -492,8 +498,8 @@
return GetMbmsSessionsPhase2(aTsyReqHandle,
REINTERPRET_CAST(TClientId*, dataPtr), aPackage.Des2n());
default:
- LOGPACKET1("CSimMbmsPacketContext: ExtFunc Unknown IPC");
- LOGPACKET1("CSimMbmsPacketContext: sending the request to CSimPacketContext::ExtFunc Unknown IPC");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_EXTFUNC_3, "CSimMbmsPacketContext: ExtFunc Unknown IPC");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_EXTFUNC_4, "CSimMbmsPacketContext: sending the request to CSimPacketContext::ExtFunc Unknown IPC");
return CSimPacketContext::ExtFunc(aTsyReqHandle,aIpc,aPackage);
}
}
@@ -509,7 +515,7 @@
* @return err KErrNone if request completes ok
*/
{
- LOGPACKET1("CSimMbmsPacketContext: - CancelService called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CANCELSERVICE_1, "CSimMbmsPacketContext: - CancelService called");
switch (aIpc)
{
@@ -533,8 +539,8 @@
case EPacketGetMbmsSessionListPhase2:
return GetMbmsSessionsCancel(aTsyReqHandle);
default:
- LOGPACKET1("CSimMbmsPacketContext: - CancelService unknown IPC called");
- LOGPACKET1("CSimMbmsPacketContext: sending the request to CSimPacketContext::ExtFunc Unknown IPC");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CANCELSERVICE_2, "CSimMbmsPacketContext: - CancelService unknown IPC called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CANCELSERVICE_3, "CSimMbmsPacketContext: sending the request to CSimPacketContext::ExtFunc Unknown IPC");
return CSimPacketContext::CancelService(aIpc,aTsyReqHandle);
}
}
@@ -546,11 +552,11 @@
* param - aId indicates which Timer Event has occured.
*/
{
- LOGPACKET1("CSimMbmsPacketContext: - TimerCallBack(TInt aId) called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_1, "CSimMbmsPacketContext: - TimerCallBack(TInt aId) called");
switch(aId)
{
case ETimerIdMbmsPcktContextSetConfig:
- LOGPACKET1("CSimMbmsPacketContext: - TimerCallBack SetConfig called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_2, "CSimMbmsPacketContext: - TimerCallBack SetConfig called");
if(iSetConfigValues.iErrorValue == KErrNone)
{
iMbmsContextConfigParamsIndex = iSetConfigValues.iIndex ;
@@ -558,7 +564,7 @@
ReqCompleted(iSetConfigRequestHandle,iSetConfigValues.iErrorValue);
break;
case ETimerIdMbmsUpdateSessionId:
- LOGPACKET1("CSimMbmsPacketContext: - TimerCallBack UpdateSessionID called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_3, "CSimMbmsPacketContext: - TimerCallBack UpdateSessionID called");
if(iUpdateSessionHandle != NULL)
{
ReqCompleted(iUpdateSessionHandle,KErrNone);
@@ -572,14 +578,14 @@
break;
default:
{
- LOGPACKET1(">>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("<<Unexpected iCurrentEvent @ TimerCallBack");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_11, "CSimMbmsPacketContext::TimerCallBack");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_TIMERCALLBACK_12, "<<Unexpected iCurrentEvent @ TimerCallBack");
break;
}
}
@@ -665,7 +671,7 @@
* @return TName Name of the MBMS context
*/
{
- LOGPACKET1("CSimMbmsPacketContext::ContextName called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CONTEXTNAME_1, "CSimMbmsPacketContext::ContextName called");
return iContextName;
}
@@ -676,7 +682,7 @@
* @return CTestConfigSection pointer to the configuration file section
*/
{
- LOGPACKET1("CSimMbmsPacketContext::CfgFile called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CFGFILE_1, "CSimMbmsPacketContext::CfgFile called");
return iPacketService->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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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;
@@ -1141,7 +1147,7 @@
* @return KErrNone
*/
{
- LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_1, "CSimMbmsPacketContext::UpdateMbmsSessionList called");
TInt error=KErrNone;
iUpdateSessionHandle = aTsyReqHandle;
@@ -1151,7 +1157,7 @@
switch(*aAction)
{
case SIMTSY_PACKET_MBMS_ADD_ENTRIES:
- LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList Action: ADD ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_2, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: ADD ");
// TRAP can contain multiple statments
TRAP(error,iSessionIdList->AppendL(*aSessionId);
@@ -1168,7 +1174,7 @@
break;
case SIMTSY_PACKET_MBMS_REM_ENTRIES:
- LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_3, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE ");
iSessionIdList->Find(*aSessionId,key,position);
if(position != -1)
{
@@ -1189,7 +1195,7 @@
break;
case SIMTSY_PACKET_MBMS_REM_ALL_ENTRIES:
- LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE_ALL ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_4, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: REMOVE_ALL ");
iNumOfSessionId=0;
//iSessionIdList->At(0) = iNumOfSessionId;
TRAP(error, iSessionIdList->InsertL(0,iNumOfSessionId));
@@ -1202,7 +1208,7 @@
break;
default:
- LOGPACKET1("CSimMbmsPacketContext::UpdateMbmsSessionList Action: Default ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_UPDATEMBMSSESSIONLIST_5, "CSimMbmsPacketContext::UpdateMbmsSessionList Action: Default ");
ReqCompleted(aTsyReqHandle,KErrNotFound);
break;
}
@@ -1217,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 )
{
@@ -1300,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;
@@ -1326,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);
@@ -1375,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; i<iMbmsSessionList->Count(); ++i)
@@ -1406,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;
@@ -1434,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)
@@ -1483,7 +1489,7 @@
ReqCompleted(iNotifyStatusChange.iNotifyHandle,KErrNone);
}
- LOGPACKET1("<<CSimMbmsPacketContext::ChangeState Completed");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CHANGESTATE_2, "<<CSimMbmsPacketContext::ChangeState Completed");
return KErrNone;
}
@@ -1498,14 +1504,14 @@
* @return value represents the error state caused by the attempted state machine jump.
*/
{
- LOGPACKET1("<<CSimMbmsPacketContext::ActionEvent Completed");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_1, "<<CSimMbmsPacketContext::ActionEvent Completed");
TInt ret=KErrNone;
__ASSERT_ALWAYS(iState!=RPacketContext::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal));
switch(aEvent)
{
case EMbmsContextEventActivate:
- LOGPACKET1("CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventActivate]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_2, "CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventActivate]");
if(iState==RPacketContext::EStatusInactive)
{
iCurrentEvent=EMbmsContextEventActivate;
@@ -1519,7 +1525,7 @@
break;
case EMbmsContextEventDeactivate:
- LOGPACKET1("CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventDeactivate]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_3, "CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventDeactivate]");
if(iState==RPacketContext::EStatusActive || iState==RPacketContext::EStatusActivating)
{
iCurrentEvent=EMbmsContextEventDeactivate;
@@ -1533,7 +1539,7 @@
break;
case EMbmsContextEventDelete:
- LOGPACKET1("CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventDelete]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_4, "CSimMbmsPacketContext::ActionEvent = [EMbmsContextEventDelete]");
iDeleted = ETrue;
if(iState==RPacketContext::EStatusInactive)
{
@@ -1544,7 +1550,7 @@
ReqCompleted(iDeleteRequestHandle, KErrInUse);
break;
default:
- LOGPACKET1("CSimMbmsPacketContext::ActionEvent = [Default Case]");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_ACTIONEVENT_5, "CSimMbmsPacketContext::ActionEvent = [Default Case]");
break;
}
return ret;
@@ -1559,7 +1565,7 @@
* @return RPacketService::TStatus The packet service status conversion
*/
{
- LOGPACKET1("CSimMbmsPacketContext::ConvertToPacketServiceStatus called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_CONVERTTOPACKETSERVICESTATUS_1, "CSimMbmsPacketContext::ConvertToPacketServiceStatus called");
RPacketService::TStatus serviceStatus;
switch (aNewState)
{
@@ -1589,7 +1595,7 @@
* synchronous call scenario
*/
{
- LOGPACKET1("CSimMbmsPacketContext::RandTime called");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMMBMSPACKETCONTEXT_RANDTIME_1, "CSimMbmsPacketContext::RandTime called");
TInt ranT= Math::Random()%4;
return(ranT);
}
--- a/telephonyserverplugins/simtsy/src/CSimNetworkStatus.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimNetworkStatus.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,12 +20,18 @@
@file
*/
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimNetworkStatusTraces.h"
+#endif
+
#include <e32property.h>
#include <testconfigfileparser.h>
#include <sacls.h>
#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<RMobilePhone::TDisplayRequirements>(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<RMobilePhone::TMobilePhoneNetworkInfoV1*>(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<RMobilePhone::TMobilePhoneNetworkInfoV2*>(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<RMobilePhone::TMobilePhoneNetworkInfoV5*>(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<RMobilePhone::TMobilePhoneNetworkInfoV8*>(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<RMobilePhone::TEtel3rdPartyMobileNetworkInfoV1*>(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<RMobilePhone::TMobilePhoneNetworkInfoV1*>(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<RMobilePhone::TMobilePhoneNetworkInfoV2*>(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<RMobilePhone::TMobilePhoneNetworkInfoV5*>(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<RMobilePhone::TMobilePhoneNetworkInfoV8*>(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);
}
--- a/telephonyserverplugins/simtsy/src/CSimNtRas.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimNtRas.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<KTxMaxRetries)
AttemptConnect();
--- a/telephonyserverplugins/simtsy/src/CSimONStore.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimONStore.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 "CSimONStoreTraces.h"
+#endif
+
#include "CSimONStore.h"
#include "CSimPhone.h"
-#include "Simlog.h"
#include <testconfigfileparser.h>
//
@@ -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 = <store name>, <slot number>, <telephone number>, <alphatag>"
*/
{
- 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();
}
--- a/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPacketContext.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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<TSetConfigData>(1);
iNotifyContextConfigChangeArray = new (ELeave) CArrayFixFlat<TNotifyContextConfigChangeData>(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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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::TimerCallBack");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_TIMERCALLBACK_3, "<<CSimPacketContext::TimerCallBack");
iTFTChangeBool = EFalse;
break;
}
@@ -2680,7 +2685,7 @@
* @return Error indication if change of state is successful or not
*/
{
- LOGPACKET2(">>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::ChangeState");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETCONTEXT_CHANGESTATE_2, "<<CSimPacketContext::ChangeState");
return KErrNone;
}
@@ -2751,7 +2756,7 @@
switch(aEvent)
{
case EContextEventActivate:
- 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;
}
--- a/telephonyserverplugins/simtsy/src/CSimPacketQoS.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPacketQoS.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <pcktcs.h>
#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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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;
--- a/telephonyserverplugins/simtsy/src/CSimPacketService.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPacketService.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <pcktcs.h>
#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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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<RPacketContext::TContextConfigGPRS>* contextConfigGPRSPckg = (TPckg<RPacketContext::TContextConfigGPRS>*)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<TPacketDataConfigBase>* configBase = (TPckg<TPacketDataConfigBase>*)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::TimerCallBack");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_TIMERCALLBACK_2, "<<CSimPacketService::TimerCallBack");
}
void CSimPacketService::TimerCallBackDeactivate()
@@ -2918,7 +2924,7 @@
}
else
{ // Error. Some sort of stange request. Hopefully impossible.
- LOGPACKET1("CSimPacketService::SimPSEvent property mismatch.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_SIMPSEVENT_1, "CSimPacketService::SimPSEvent property mismatch.");
SimPanic(EFailedToSetProperty);
}
@@ -3014,7 +3020,7 @@
* @return Error indication if change of state is successful or not
*/
{
- LOGPACKET2(">>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::ChangeState");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPACKETSERVICE_CHANGESTATE_2, "<<CSimPacketService::ChangeState");
return KErrNone;
}
@@ -3088,7 +3094,7 @@
switch(aEvent)
{
case EPacketEventAttach:
- 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; i<iMbmsServicesList->Count(); ++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;
--- a/telephonyserverplugins/simtsy/src/CSimPhBkStore.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhBkStore.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
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 = <store name>, <slot number>, <telephone number>, <alphatag>"
*/
{
- 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();
}
--- a/telephonyserverplugins/simtsy/src/CSimPhBkUsimStore.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhBkUsimStore.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
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 = <store name>, <slot number>, <telephone number>, <alphatag>"
*/
{
- 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<TPhBkStoreEntry>(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<TPhBkUSimGroup>(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<TPhBkUSimEmail>(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();
}
--- a/telephonyserverplugins/simtsy/src/CSimPhone.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhone.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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;i<count;i++)
{
@@ -606,27 +612,27 @@
ret=CTestConfig::GetElement(item->Value(),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;i<count;i++)
{
@@ -656,63 +662,63 @@
ret=CTestConfig::GetElement(item->Value(),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");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPHONE_VALIDATECHANGESTATE_2, "<<CSimPhone::ValidateChangeState");
return KErrGeneral;
}
@@ -2310,7 +2316,7 @@
* @return Error indicates whether the change of state is successful or not
*/
{
- 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();
}
--- a/telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneIMSAuth.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#include <etelmmerr.h>
#include "CSimPhone.h"
-#include "Simlog.h"
//
// CSimPhoneIMSAuth
@@ -60,10 +66,10 @@
{
iTimer=CSimTimer::NewL(iPhone);
iGetAuthorizationData = new CArrayPtrFlat<CListReadAllAttempt>(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;
}
--- a/telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
--- a/telephonyserverplugins/simtsy/src/CSimPhoneSecurity.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneSecurity.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
@@ -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;
}
--- a/telephonyserverplugins/simtsy/src/CSimPhoneSmartCardApp.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneSmartCardApp.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#include <etelmmerr.h>
#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<RMobilePhone::TScFileInfoV5Pckg*>(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<TSmartCardApplication>(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;index<count;index++)
{
item=CfgFile()->Item(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;index<count;index++)
{
@@ -1598,7 +1604,7 @@
ret=CTestConfig::GetElement(item->Value(),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<TSmartCardFile>(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;
}
--- a/telephonyserverplugins/simtsy/src/CSimPhoneUSimApp.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPhoneUSimApp.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
/**
@@ -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<RMobilePhone::TUSimApplicationInfoV2>(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;i<count;i++)
{
@@ -88,7 +94,7 @@
ret=CTestConfig::GetElement(item->Value(),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;i<count;i++)
{
@@ -127,7 +133,7 @@
ret=CTestConfig::GetElement(item->Value(),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();
}
--- a/telephonyserverplugins/simtsy/src/CSimPubSub.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimPubSub.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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("<<CSimPubSub::NewL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMPUBSUB_NEWL_2, "<<CSimPubSub::NewL");
return pubsub;
}
--- a/telephonyserverplugins/simtsy/src/CSimReduceTimers.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimReduceTimers.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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,7 +21,13 @@
*/
-#include "Simlog.h"
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimReduceTimersTraces.h"
+#endif
+
#include "CSimReduceTimers.h"
@@ -84,26 +90,26 @@
if (aProperty == iPSProperty && // Condition for correct property
(aStatus == ETimerIdAllTimers)) // and correct value for signal
{
- LOGMISC1(">>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);
}
}
--- a/telephonyserverplugins/simtsy/src/CSimSat.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimSat.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h>
@@ -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<TSatInfo>(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("<<CSimSat::TimerCallBack");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_TIMERCALLBACK_2, "<<CSimSat::TimerCallBack");
}
@@ -3375,7 +3381,7 @@
TInt CSimSat::ConfigL(unsigned int aCmd)
{
- LOGMISC1("CSimSat: Entered ConfigL()");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSAT_CONFIGL_1, "CSimSat: Entered ConfigL()");
TInt dcs,terRsp,src,UICCRsp,lastEnv,duration,type,frameId,frmLayout,defFrmLayout,frameSeparator;
TInt immRsp,dispPrio,clrScr,utranQlfr,infoType,brType,location,destn,alphaIDSts;
@@ -3438,7 +3444,7 @@
ret=CTestConfig::GetElement(item->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;
}
--- a/telephonyserverplugins/simtsy/src/CSimSerComm.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimSerComm.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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;
}
--- a/telephonyserverplugins/simtsy/src/CSimSignalStrength.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimSignalStrength.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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<TSignalStrengthInfo>(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<TInt32>* ssPckg=(TPckg<TInt32>*)aPckg1;
TInt32& ss=(*ssPckg)();
TPckg<TInt8>* ssbPckg=(TPckg<TInt8>*)aPckg2;
@@ -230,7 +236,7 @@
ss=iCurrentLevel;
ssb=iCurrentBar;
- LOGSS3("<<CSimSignalStrength::GetSignalStrength with level=%d dB and bar=%d",iCurrentLevel,iCurrentBar);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_GETSIGNALSTRENGTH_2, "<<CSimSignalStrength::GetSignalStrength with level=%d dB and bar=%d",(TInt)iCurrentLevel,(TInt)iCurrentBar);
iPhone->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<TInt32>* ssPckg=(TPckg<TInt32>*)aPckg1;
TInt32& ss=(*ssPckg)();
TPckg<TInt8>* ssbPckg=(TPckg<TInt8>*)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("<<CSimSignalStrength::NotifySignalStrengthChange with level=%d dB and bar=%d",iCurrentLevel,iCurrentBar);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_TIMERCALLBACK_1, "<<CSimSignalStrength::NotifySignalStrengthChange with level=%d dB and bar=%d",(TInt)iCurrentLevel,(TInt)iCurrentBar);
iPhone->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("<<CSimSignalStrength::NotifySignalStrengthChange with level=%d dB and bar=%d",iCurrentLevel,iCurrentBar);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSIGNALSTRENGTH_PUBSUBCALLBACK_2, "<<CSimSignalStrength::NotifySignalStrengthChange with level=%d dB and bar=%d",(TInt)iCurrentLevel,(TInt)iCurrentBar);
iPhone->ReqCompleted(iSSChangeNotificationReqHandle,iCurrentError);
}
}
--- a/telephonyserverplugins/simtsy/src/CSimSmsStore.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimSmsStore.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <mmlist.h>
#include <mmretrieve.h>
#include <testconfigfileparser.h>
#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<CListReadAllAttempt>(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 = <store name>, <slot number>, <entry status>, <pdu>"
*/
{
- 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();
}
--- a/telephonyserverplugins/simtsy/src/CSimUsimR6.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimUsimR6.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <e32property.h>
#include <testconfigfileparser.h>
#include <sacls.h>
#include <e32math.h>
#include "CSimPhone.h"
-#include "Simlog.h"
#include "CSimPubSubChange.h"
#include "CSimTsyMode.h"
#include <etelmmerr.h>
@@ -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<RMobilePhone::TMobilePhoneVoicemailIdsV8>(KUsimGranularity);
iMessageWaiting=new(ELeave) CArrayFixFlat<RMobilePhone::TMobilePhoneMessageWaitingV8>(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("<<CSimUsimR6::TimerCallBack - Exited ");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_TIMERCALLBACK_1, "<<CSimUsimR6::TimerCallBack - Exited ");
}
}
@@ -1818,7 +1824,7 @@
* @param aTsyReqHandle handle to the request
*/
{
- LOGCALL1("CSimPhone::GetPreferredNetworksCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMUSIMR6_GETPREFERREDWLANSIDSCANCEL_1, "CSimPhone::GetPreferredNetworksCancel");
iPhone->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; i<iGetPreferredNetworks->Count(); ++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;
}
--- a/telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimVoiceCall.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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::Dial request from Etel 3rd Party client.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_2, "<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
}
}
iDialRequestHandle=aTsyReqHandle;
TInt ret;
ret = ActionEvent(ECallEventDial,KErrNone);
- LOGVOICE1("<<CSimVoiceCall::Dial");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIAL_3, "<<CSimVoiceCall::Dial");
return ret;
}
@@ -311,7 +317,7 @@
* @return KErrNone if successfully cancelled
*/
{
- 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::DialCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALCANCEL_2, "<<CSimVoiceCall::DialCancel");
return KErrNone;
}
@@ -356,7 +362,7 @@
* @return KErrNone
*/
{
- 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::Dial request from Etel 3rd Party client.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_2, "<<CSimVoiceCall::Dial request from Etel 3rd Party client.");
}
}
iDialRequestHandle=aTsyReqHandle;
TInt ret;
ret = ActionEvent(ECallEventDial,KErrNone);
- LOGVOICE1("<<CSimVoiceCall::DialISV");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISV_3, "<<CSimVoiceCall::DialISV");
return ret;
}
@@ -387,7 +393,7 @@
* @return KErrNone if successfully cancelled
*/
{
- 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::DialISVCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_DIALISVCANCEL_2, "<<CSimVoiceCall::DialISVCancel");
return KErrNone;
}
@@ -433,7 +439,7 @@
* @return KErrNone
*/
{
- LOGVOICE3(">>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::AnswerIncomingCall request from Etel 3rd Party client.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_2, "<<CSimVoiceCall::AnswerIncomingCall request from Etel 3rd Party client.");
}
}
@@ -470,7 +476,7 @@
if(ret==KErrNone)
ret = ActionEvent(ECallEventAnswerIncoming,KErrNone);
}
- LOGVOICE3("<<CSimVoiceCall::AnswerIncomingCall 0x%08x, state %d exit",this,iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALL_3, "<<CSimVoiceCall::AnswerIncomingCall 0x%08x, state %d exit",(TUint)this,iState);
return ret;
}
@@ -482,14 +488,14 @@
* @return KErrNone if successfully cancelled
*/
{
- 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::AnswerIncomingCallCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLCANCEL_2, "<<CSimVoiceCall::AnswerIncomingCallCancel");
return KErrNone;
}
@@ -504,7 +510,7 @@
* @return KErrNone
*/
{
- LOGVOICE3(">>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::AnswerIncomingCallISV request from Etel 3rd Party client.");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_2, "<<CSimVoiceCall::AnswerIncomingCallISV request from Etel 3rd Party client.");
}
}
@@ -543,7 +549,7 @@
ret = ActionEvent(ECallEventAnswerIncoming,KErrNone);
}
}
- LOGVOICE3("<<CSimVoiceCall::AnswerIncomingCallISV 0x%08x, state %d exit",this,iState);
+ OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVL_3, "<<CSimVoiceCall::AnswerIncomingCallISV 0x%08x, state %d exit",(TUint)this,iState);
return ret;
}
@@ -555,14 +561,14 @@
* @return KErrNone if successfully cancelled
*/
{
- 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::AnswerIncomingCallISVCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_ANSWERINCOMINGCALLISVCANCEL_2, "<<CSimVoiceCall::AnswerIncomingCallISVCancel");
return KErrNone;
}
@@ -586,12 +592,12 @@
* @return KErrNone
*/
{
- 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::HangUp");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUP_2, "<<CSimVoiceCall::HangUp");
return KErrNone;
}
@@ -603,7 +609,7 @@
* @return KErrNone if successfully cancelled
*/
{
- 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::HangUpCancel");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_HANGUPCANCEL_2, "<<CSimVoiceCall::HangUpCancel");
return KErrNone;
}
@@ -855,12 +861,12 @@
TInt ret=KErrNone;
__ASSERT_ALWAYS(iState!=RMobileCall::EStatusUnknown,SimPanic(ECallStatusUnknownIllegal));
__ASSERT_ALWAYS(aEvent!=ECallEventNtRasConnected,SimPanic(ECallEventIllegal));
- LOGVOICE3(">>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::TimerCallBack");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_TIMERCALLBACK_2, "<<CSimVoiceCall::TimerCallBack");
}
TInt CSimVoiceCall::ProcessAnswerIncomingCallL()
@@ -1029,14 +1035,14 @@
* call object must be assigned to receive the details of the next incoming call.
*/
{
- LOGVOICE3(">>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::ProcessAnswerIncomingCall");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSANSWERINCOMINGCALLL_2, "<<CSimVoiceCall::ProcessAnswerIncomingCall");
return ret;
}
@@ -1048,13 +1054,13 @@
* call object must be assigned to receive the next remote hangup request.
*/
{
- LOGVOICE3(">>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("<<CSimVoiceCall::ProcessRemoteHangupL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICECALL_PROCESSREMOTEHANGUPL_2, "<<CSimVoiceCall::ProcessRemoteHangupL");
return ret;
}
--- a/telephonyserverplugins/simtsy/src/CSimVoiceLine.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/CSimVoiceLine.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -13,9 +13,15 @@
// Description:
//
+
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CSimVoiceLineTraces.h"
+#endif
+
#include "CSimPhone.h"
#include "CSimVoiceCall.h"
-#include "Simlog.h"
#include "et_struct.h"
_LIT(KCommonCallName,"VoiceCall%d"); // < Voice call name template.
@@ -108,13 +114,13 @@
* @leave Leaves if name given does not match the required name
*/
{
- 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<count;i++)
{
- LOGVOICE2(">>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::OpenNewObjectByNameL");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMVOICELINE_OPENNEWOBJECTBYNAMEL_3, "<<CSimVoiceLine::OpenNewObjectByNameL");
User::Leave(KErrNotFound);
return NULL;
}
@@ -150,7 +156,7 @@
{
HandleNewCallAddedNotification(aNewName);
}
- LOGVOICE2(">>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;
}
--- a/telephonyserverplugins/simtsy/src/csimsmartcardauth.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/csimsmartcardauth.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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<RMobilePhone::TSmartCardAuthenticateDataV6Pckg*>(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
--- a/telephonyserverplugins/simtsy/src/csimsmartcardeap.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/csimsmartcardeap.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
#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<CTestConfigItem*>(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<RMobileSmartCardEap::TEapUserIdentityV6Pckg*>(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<RMobileSmartCardEap::TEapKeyV6Pckg*>(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)
{
--- a/telephonyserverplugins/simtsy/src/csimsmsmess.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/src/csimsmsmess.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <testconfigfileparser.h>
-#include "Simlog.h"
#include <etelmm.h>
#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<KMaxName> name;
name.Copy(aName); // Do simple 16 bit to 8 bit conversion
for(TInt i=0;i<iSmsStores->Count();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 = iSmsRxCnt<iSmsRxParameterListGsm->Count();
@@ -1639,9 +1647,9 @@
{
if((iConstraints.Count()==0) || (iConstraintRxCnt<iConstraints[iCurrentConstraint].iRxCnt)) // If there are no constraints, or there are constraints and they're not exhausted.
{
- LOGSMS1(">>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("<<StoreSmsList,Exit function");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STORESMSPLIST_1, "<<StoreSmsList,Exit function");
return KErrNone;
}
else
- LOGSMS1("<<StoreSmsList,Exit function");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMSMSMESSAGING_STORESMSPLIST_2, "<<StoreSmsList,Exit function");
return KErrInUse;
}
@@ -2069,7 +2077,7 @@
*
*/
{
- LOGSMS3(">>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<KTextWidth> 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;
--- a/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimTestStepBase.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimTestStepBase.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <satcs.h>
#include "Te_SimConstants.h"
-#include "Simlog.h"
class CTestConfig;
--- a/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimUSimRel6Test.h Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/simtsy/test/Te_Sim/Te_SimUSimRel6Test.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <f32file.h>
class CTestConfig;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyserverplugins/simtsy/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyutils/dial/group/telephony_dial.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/dial/group/telephony_dial.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/etel3rdpartyapi/Group/telephony_etel3rdparty.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchersUnit.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/Test/TE_TelWatchers/TE_TelWatchersUnit.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/telephonywatchers/Test/group/bld.inf Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/telephonywatchers/Test/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/telephonywatchers/Test/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyutils/telephonywatchers/group/BLD.INF Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/BLD.INF Fri Jun 11 14:49:29 2010 +0300
@@ -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"
@@ -28,29 +28,4 @@
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
+#include "../Test/group/bld.inf"
\ No newline at end of file
--- a/telephonyutils/telephonywatchers/group/TelWatcher.iby Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/TelWatcher.iby Fri Jun 11 14:49:29 2010 +0300
@@ -18,7 +18,6 @@
#ifndef __TELWATCHER_IBY__
#define __TELWATCHER_IBY__
-#include <watcher.iby>
#include <etel.iby>
REM Telephony Watchers...
--- a/telephonyutils/telephonywatchers/group/indicatorwatcher.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/indicatorwatcher.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/signalstrengthwatcher.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyutils/telephonywatchers/group/telephony_watchers.mrp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/telephony_watchers.mrp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyutils/telephonywatchers/group/telwatcherbase.mmp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/group/telwatcherbase.mmp Fri Jun 11 14:49:29 2010 +0300
@@ -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
--- a/telephonyutils/telephonywatchers/inc/watcherlog.h Thu May 27 14:05:07 2010 +0300
+++ /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 <comms-infras/commsdebugutility.h>
-
-#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__
-
--- a/telephonyutils/telephonywatchers/src/indicatorwatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/src/indicatorwatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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));
}
}
--- a/telephonyutils/telephonywatchers/src/signalstrengthwatcher.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/src/signalstrengthwatcher.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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();
}
--- a/telephonyutils/telephonywatchers/src/watcherbase.cpp Thu May 27 14:05:07 2010 +0300
+++ b/telephonyutils/telephonywatchers/src/watcherbase.cpp Fri Jun 11 14:49:29 2010 +0300
@@ -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 <commsdattypesv1_1.h>
@@ -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<phoneCount; i++)
@@ -457,29 +455,22 @@
error = ETel().GetTsyName(i, matchTsyName);
if (error < KErrNone)
{
- LOGCOMMON2("PhoneWatcher : Getting TSY name failed (%d)", error);
+ OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEWATCHER_CONNECTTOPHONE_4, "PhoneWatcher : Getting TSY name failed (%d)", error);
return error;
}
-#ifdef _WATCHER_LOGGING_ENABLED
- TBuf8<256> 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;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/telephonywatchers/traces/OstTraceDefinitions.h Fri Jun 11 14:49:29 2010 +0300
@@ -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 <opensystemtrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/telephonyutils/telephonywatchers/traces/fixed_id.definitions Fri Jun 11 14:49:29 2010 +0300
@@ -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