--- a/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyprotocols/pdplayer/umts/spudtel/src/cpdpconfigchangenotifier.cpp Tue Aug 31 16:23:08 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));