diff -r 630d2f34d719 -r 07a122eea281 telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivercontext.cpp --- a/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivercontext.cpp Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/spudtel/src/ceteldrivercontext.cpp Wed Sep 01 12:40:21 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). +// 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" @@ -21,15 +21,9 @@ */ - - -#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; @@ -98,12 +92,12 @@ iFilterV2(), iFilterV2Pckg(iFilterV2) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_CTOR_1, "CEtelDriverContext::CEtelDriverContext"); + SPUDTEL_FNLOG("CEtelDriverContext::CEtelDriverContext"); CActiveScheduler::Add(this); } CEtelDriverContext::~CEtelDriverContext() { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DTOR_1, "CEtelDriverContext::~CEtelDriverContext()"); + SPUDTEL_FNLOG("CEtelDriverContext::~CEtelDriverContext()"); Cancel(); // N.B. This cancels all outstanding operations on the context, including deletion! iContextConfig.Close(); @@ -137,12 +131,12 @@ */ TInt CEtelDriverContext::Input (TEtelInput 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 ); + SPUDTEL_FNLOG("CEtelDriverContext::Input()"); + SPUDTELVERBOSE_INFO_LOG1( _L("Operation %d"), aOperation ); if (MEtelDriverStrategy::EFinishStep != iStrategyStep) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_INPUT_3, "ERROR: Pdp context is in use, return %d", KErrInUse); + 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; @@ -161,7 +155,7 @@ void CEtelDriverContext::RunL() { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_1, "CEtelDriverContext::RunL()"); + SPUDTEL_FNLOG("CEtelDriverContext::RunL()"); ASSERT(iStrategyId < ESentinelStrategy); if(iStatus != KErrNone) @@ -169,7 +163,7 @@ if(iCompletionStatus == KErrNone) { iCompletionStatus = iStatus; - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_2, "Last async request completed with error %d", iStatus.Int()); + 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 @@ -178,13 +172,13 @@ { iStrategyStep = MEtelDriverStrategy::EFinishStep; } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_3, "Strategy is completed"); + SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed")); } if(MEtelDriverStrategy::EFinishStep == iStrategyStep) { // we are done - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_RUNL_4, "Strategy is completed"); + SPUDTELVERBOSE_INFO_LOG(_L("Strategy is completed")); Strategy(iStrategyId).NotifyFsm (*this, iCompletionStatus); } else @@ -198,7 +192,7 @@ /** cancels last async request */ void CEtelDriverContext::DoCancel() { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DOCANCEL_1, "CEtelDriverContext::DoCancel()"); + SPUDTEL_FNLOG("CEtelDriverContext::DoCancel()"); if(IsActive()) { @@ -206,13 +200,13 @@ Strategy(iStrategyId).CancelAsyncRequest(*this); } iStrategyStep = MEtelDriverStrategy::EFinishStep; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DOCANCEL_2, "Strategy is cancelled"); + SPUDTELVERBOSE_INFO_LOG(_L("Strategy is cancelled")); } /** accessor */ const TName& CEtelDriverContext::ExistingContextName() const { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_1, "CEtelDriverContext::ExistingContextName()"); + SPUDTEL_FNLOG("CEtelDriverContext::ExistingContextName()"); for (TContextId i = 0; i < static_cast(iFactory.ContextCount()); i++) { @@ -223,7 +217,7 @@ } // Unacceptable situation: we didn't create a single context yet - OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_EXISTINGCONTEXTNAME_2, "CEtelDriverContext::ExistingContextName - can't find existing context. return %S", iFactory.Context(0).Name()); + SPUDTEL_ERROR_LOG(_L("CEtelDriverContext::ExistingContextName - can't find existing context. return %S"), &iFactory.Context(0).Name()); ASSERT(EFalse); return iFactory.Context(0).Name(); } @@ -277,54 +271,54 @@ } -#if (OST_TRACE_CATEGORY & OST_TRACE_CATEGORY_DEBUG) +#ifdef _DEBUG void CEtelDriverContext::DumpReqProfileParameters () { - 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()); + 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) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPREQPROFILEPARAMETERS_4, "Invalid/Unsupported ExtensionId"); + SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId")); return; } if (iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4 || iQosRequested.ExtensionId() == TPacketDataConfigBase::KConfigRel5) { - 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); + 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) { - 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); + SPUDTEL_INFO_LOG1( _L("[25]iSignallingIndication = %d"), iQosRequested.RequestedQoSR5().iSignallingIndication); + SPUDTEL_INFO_LOG1( _L("[26]iSourceStatisticsDescriptor = %d"), iQosRequested.RequestedQoSR5().iSourceStatisticsDescriptor); } #endif } @@ -333,40 +327,40 @@ void CEtelDriverContext::DumpNegProfileParameters () { - 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()); + 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) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CETELDRIVERCONTEXT_DUMPNEGPROFILEPARAMETERS_4, "Invalid/Unsupported ExtensionId"); + SPUDTEL_INFO_LOG( _L("Invalid/Unsupported ExtensionId")); return; } if (iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel99Rel4 || iQosNegotiated.ExtensionId() == TPacketDataConfigBase::KConfigRel5) { - 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); + 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) { - 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); + SPUDTEL_INFO_LOG1( _L("[14]iSignallingIndication = %d"), iQosNegotiated.NegotiatedQoSR5().iSignallingIndication); + SPUDTEL_INFO_LOG1( _L("[15]iSourceStatisticsDescriptor = %d"), iQosNegotiated.NegotiatedQoSR5().iSourceStatisticsDescriptor); } #endif }