diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp --- a/telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp Mon May 03 13:37:20 2010 +0300 +++ b/telephonyserverplugins/simtsy/src/CSimPhoneInitialise.cpp Thu May 06 15:10:38 2010 +0100 @@ -1,89 +1,89 @@ -// 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: -// CSimOta.cpp -// Implements the OTA manipulation code. -// -// - -/** - @file -*/ - -#include "Simlog.h" -#include "utils.h" -#include "CSimPhone.h" -#include -#include "etelmmerr.h" - -CSimPhoneInitialise* CSimPhoneInitialise::NewL(CSimPhone* aPhone) - { - CSimPhoneInitialise *me = new(ELeave) CSimPhoneInitialise(aPhone); - CleanupStack::PushL(me); - me->ConstructL(); - CleanupStack::Pop(me); - return me; - } - -CSimPhoneInitialise::CSimPhoneInitialise(CSimPhone* aPhone) : iPhone(aPhone) - {} - -void CSimPhoneInitialise::ConstructL() - { - iInitialiseDelayTimer = CSimTimer::NewL(iPhone); - ReadDelayFromConfig(); - } - -CSimPhoneInitialise::~CSimPhoneInitialise() - { - if (iInitialiseDelayTimer) - { - iInitialiseDelayTimer->Cancel(); - } - delete iInitialiseDelayTimer; - } - -void CSimPhoneInitialise::ReadDelayFromConfig() - { - const CTestConfigItem* item = iPhone->CfgFile()->Item(KPhoneInitialiseDelay); - if(!item) - return; - - TInt phoneInitialiseDelay; - TInt ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, phoneInitialiseDelay); - if (ret == KErrNone) - { - iPhoneInitialiseDelay = phoneInitialiseDelay; - } - } - -void CSimPhoneInitialise::Start(const TTsyReqHandle aHandle) - { - iPhoneInitialiseHandle = aHandle; - iInitialiseDelayTimer->Start(iPhoneInitialiseDelay, this); - } - -void CSimPhoneInitialise::Cancel() - { - iInitialiseDelayTimer->Cancel(); - if (iPhoneInitialiseHandle) - { - iPhone->ReqCompleted(iPhoneInitialiseHandle, KErrCancel); - } - iPhoneInitialiseHandle = NULL; - } - -void CSimPhoneInitialise::TimerCallBack(TInt /*aId*/) - { - iPhone->ReqCompleted(iPhoneInitialiseHandle, KErrNone); - } +// 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: +// CSimOta.cpp +// Implements the OTA manipulation code. +// +// + +/** + @file +*/ + +#include "Simlog.h" +#include "utils.h" +#include "CSimPhone.h" +#include +#include "etelmmerr.h" + +CSimPhoneInitialise* CSimPhoneInitialise::NewL(CSimPhone* aPhone) + { + CSimPhoneInitialise *me = new(ELeave) CSimPhoneInitialise(aPhone); + CleanupStack::PushL(me); + me->ConstructL(); + CleanupStack::Pop(me); + return me; + } + +CSimPhoneInitialise::CSimPhoneInitialise(CSimPhone* aPhone) : iPhone(aPhone) + {} + +void CSimPhoneInitialise::ConstructL() + { + iInitialiseDelayTimer = CSimTimer::NewL(iPhone); + ReadDelayFromConfig(); + } + +CSimPhoneInitialise::~CSimPhoneInitialise() + { + if (iInitialiseDelayTimer) + { + iInitialiseDelayTimer->Cancel(); + } + delete iInitialiseDelayTimer; + } + +void CSimPhoneInitialise::ReadDelayFromConfig() + { + const CTestConfigItem* item = iPhone->CfgFile()->Item(KPhoneInitialiseDelay); + if(!item) + return; + + TInt phoneInitialiseDelay; + TInt ret = CTestConfig::GetElement(item->Value(), KStdDelimiter, 0, phoneInitialiseDelay); + if (ret == KErrNone) + { + iPhoneInitialiseDelay = phoneInitialiseDelay; + } + } + +void CSimPhoneInitialise::Start(const TTsyReqHandle aHandle) + { + iPhoneInitialiseHandle = aHandle; + iInitialiseDelayTimer->Start(iPhoneInitialiseDelay, this); + } + +void CSimPhoneInitialise::Cancel() + { + iInitialiseDelayTimer->Cancel(); + if (iPhoneInitialiseHandle) + { + iPhone->ReqCompleted(iPhoneInitialiseHandle, KErrCancel); + } + iPhoneInitialiseHandle = NULL; + } + +void CSimPhoneInitialise::TimerCallBack(TInt /*aId*/) + { + iPhone->ReqCompleted(iPhoneInitialiseHandle, KErrNone); + }