diff -r b982c3e940f3 -r 70d75957b98f telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsmfactory.cpp --- a/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsmfactory.cpp Tue Sep 14 17:55:14 2010 +0100 +++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/cpdpfsmfactory.cpp Thu Sep 23 14:44:40 2010 +0100 @@ -32,8 +32,7 @@ // NewL CPdpFsmFactory* 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::CPdpFsmFactory()"); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CTOR_2, "<>CPdpFsmFactory::~CPdpFsmFactory()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DTOR_1, " Destructor"); iContexts.DeleteAll(); iContexts.Reset(); delete iEtelDriverInput; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DTOR_2, "<>CPdpFsmFactory::InitL()"); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_INITL_1, " Tsy Name [%S]", aTsyName); 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); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_INITL_2, "<>CPdpFsmFactory::Close()"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_CLOSE_1, " 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::GetContext()"); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_GETFSMCONTEXT_2, "<>CPdpFsmFactory::NewFsmContext()"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_1, " for context type [%d]", aContextType); #ifndef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY TInt ret = KErrNone; @@ -168,19 +160,19 @@ iContexts[i] = p; iEtelDriverInput->CreatePdpL(i, aContextType); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_NEWFSMCONTEXTL_3, "<>CPdpFsmFactory::DeleteFsmContext()"); ASSERT(ContextIsValid(aPdpId)); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DELETEFSMCONTEXT_1, " for context name [%S]", iContexts[aPdpId]->GetDataChannelV2().iChannelId); delete iContexts[aPdpId]; iContexts[aPdpId] = NULL; - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPFSMFACTORY_DELETEFSMCONTEXT_2, "<