diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyprotocols/secondarypdpcontextumtsdriver/inc/tpdpstates.h --- a/telephonyprotocols/secondarypdpcontextumtsdriver/inc/tpdpstates.h Mon May 03 13:37:20 2010 +0300 +++ b/telephonyprotocols/secondarypdpcontextumtsdriver/inc/tpdpstates.h Thu May 06 15:10:38 2010 +0100 @@ -1,79 +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) - - -#endif // TPDPSTATES_H +// 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) + + +#endif // TPDPSTATES_H