diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingprimary.cpp --- a/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingprimary.cpp Mon May 03 13:37:20 2010 +0300 +++ b/telephonyprotocols/pdplayer/umts/spudfsm/src/tpdpstateactivatingprimary.cpp Thu May 06 15:10:38 2010 +0100 @@ -1,63 +1,63 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). -// All rights reserved. -// This component and the accompanying materials are made available -// under the terms of "Eclipse Public License v1.0" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Activating primary state -// -// - -/** - @file - @internalComponent -*/ - -#include -#include "tpdpstates.h" -#include "spudfsmdebuglogger.h" -#include "pdpfsmnmspace.h" -#include "cpdpfsm.h" -#include "PDPFSM.h" - -TInt TPdpStateActivatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) -{ - SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingPrimary::Input()"); - SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); - - switch (aOperation) - { - case PdpFsm::EPdpActivated: - // GuQoS assumes the primary context becomes active when created, so the context status - // must be updated before sending the event - aFsm.Set(RPacketContext::EStatusActive); - aFsm.ChangeStateToOpen(); - SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone); - return KErrNone; - case PdpFsm::EPdpActivatedFailed: - SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***")); - aFsm.ChangeStateToClosing(); - - SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); - EtelDriverInput(aFsm, EtelDriver::EContextDelete); - return KErrNone; - case SpudMan::ECancelContextCreate: - aFsm.ChangeStateToStopping(); - EtelDriverCancel(aFsm); - EtelDriverInput(aFsm, EtelDriver::EContextDelete); - return KErrNone; - // no default - } - - // default error handling - return TPdpState::Input(aFsm, aOperation, aErrorCode); -} - - +// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// Activating primary state +// +// + +/** + @file + @internalComponent +*/ + +#include +#include "tpdpstates.h" +#include "spudfsmdebuglogger.h" +#include "pdpfsmnmspace.h" +#include "cpdpfsm.h" +#include "PDPFSM.h" + +TInt TPdpStateActivatingPrimary::Input (CPdpFsm& aFsm, const TInt aOperation, const TInt aErrorCode) +{ + SPUDFSMVERBOSE_FNLOG("TPdpStateActivatingPrimary::Input()"); + SPUDFSMVERBOSE_LOG2(_L("aOperation : %S(%d)"), LogOperation(aFsm, aOperation), aOperation); + + switch (aOperation) + { + case PdpFsm::EPdpActivated: + // GuQoS assumes the primary context becomes active when created, so the context status + // must be updated before sending the event + aFsm.Set(RPacketContext::EStatusActive); + aFsm.ChangeStateToOpen(); + SpudManNotify (aFsm, KPrimaryContextCreated, KErrNone); + return KErrNone; + case PdpFsm::EPdpActivatedFailed: + SPUDFSMVERBOSE_LOG(_L("*** FAILURE ***")); + aFsm.ChangeStateToClosing(); + + SpudManNotify (aFsm, KPrimaryContextCreated, aErrorCode); + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + case SpudMan::ECancelContextCreate: + aFsm.ChangeStateToStopping(); + EtelDriverCancel(aFsm); + EtelDriverInput(aFsm, EtelDriver::EContextDelete); + return KErrNone; + // no default + } + + // default error handling + return TPdpState::Input(aFsm, aOperation, aErrorCode); +} + +