FCL/sf/mw/usbservices: comparison usbengines/usbotgwatcher/src/cusbotgstateobserver.cpp

equal deleted inserted replaced

-:7e15987c4500
+:8c311f9acc5e
 /*
 * Copyright (c) 2008-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:  Implementation
 *
 */
 #include "cusbotgstateobserver.h"
 #include "definitions.h"
 #include "debug.h"
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbOtgStateObserver::ConstructL()
 {
+LOG_FUNC
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOtgStateObserver::ConstructL" ) );
 User::LeaveIfError(iOtgState.Attach(KUidUsbManCategory,
 KUsbOtgStateProperty));
 }
 //
 // ---------------------------------------------------------------------------
 //
 CUsbOtgStateObserver* CUsbOtgStateObserver::NewL()
 {
+LOG_FUNC
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOtgStateObserver::NewL" ) );
 CUsbOtgStateObserver* self = new (ELeave) CUsbOtgStateObserver();
 CleanupStack::PushL(self);
 self->ConstructL();
 CleanupStack::Pop(self);
 //
 // ---------------------------------------------------------------------------
 //
 CUsbOtgStateObserver::~CUsbOtgStateObserver()
 {
+LOG_FUNC
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOtgStateObserver::~CUsbOtgStateObserver" ) );
 Cancel();
 iOtgState.Close();
 //
 // ---------------------------------------------------------------------------
 //
 TUsbOtgState CUsbOtgStateObserver::OtgState()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOtgStateObserver::OtgState" ) );
 TInt val(0);
 TInt err = iOtgState.Get(val);
 if (KErrNone != err)
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOtgStateObserver::StOtgState CanNotGetOtgStateProperty" ) );
+LOG("CanNotGetOtgStateProperty" );
-Panic(ECanNotGetOtgStateProperty);
+Panic( ECanNotGetOtgStateProperty);
 }
-FTRACE( FPrint(_L( "[USBOTGWATCHER]\tCUsbOtgStateObserver::OtgState = %d" ), val ));
 return (TUsbOtgState) val;
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
-void CUsbOtgStateObserver::SubscribeL(MUsbOtgStateObserver* aObserver)
+void CUsbOtgStateObserver::SubscribeL(MUsbOtgStateObserver& aObserver)
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::SubscribeL" ) );
+LOG_FUNC
-User::LeaveIfError(iObservers.Append(aObserver));
+// check if the same observer already exist in a list
+if (KErrNotFound != iObservers.Find(&aObserver))
+{
+LOG( "Observer already exists"  );
+Panic( EObserverAlreadyExists);
+return;
+}
+iObservers.AppendL(&aObserver);
 if (KFirst == iObservers.Count()) // first item
 {
 iOtgState.Subscribe(iStatus);
 SetActive();
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
-void CUsbOtgStateObserver::UnsubscribeL(MUsbOtgStateObserver* aObserver)
+void CUsbOtgStateObserver::UnsubscribeL(MUsbOtgStateObserver& aObserver)
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::UnsubscribeL" ) );
+LOG_FUNC
-if (0 == iObservers.Count()) // no items
+TInt i(iObservers.Find(&aObserver));
-{
+if (KErrNotFound == i)
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOtgStateObserver::UnsubscribeL No observers" ) );
+{
-return;
+LOG("Observer not found");
-}
+Panic( ECanNotFindOtgStateObserver);
+return;
-TInt i(0);
+}
-while (i < iObservers.Count() && aObserver != iObservers[i])
-++i;
+iObservers.Remove(i);
-if (aObserver == iObservers[i]) // found
+if (0 == iObservers.Count()) // no observers anymore
-{
-iObservers.Remove(i);
-}
-else
-{
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::UnsubscribeL CanNotFindOtgStateObserver" ) );
-Panic(ECanNotFindOtgStateObserver);
-}
-if (0 == iObservers.Count()) // no items
 {
 // cancel pending request
 Cancel();
 }
 }
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbOtgStateObserver::RunL()
 {
-FTRACE( FPrint(_L( "[USBOTGWATCHER]\tCUsbOtgStateObserver::RunL iStatus = %d" ), iStatus.Int()));
+LOG_FUNC
+LOG1( "iStatus = %d" , iStatus.Int());
 // if error occured, tell to Observers
-if(KErrNone != iStatus.Int())
+if (KErrNone != iStatus.Int())
 {
 for (TInt i(0); i < iObservers.Count(); ++i)
 {
 iObservers[i]->OtgStateErrorL(iStatus.Int());
 }
 return;
 }
 // re-issue request first
 iOtgState.Subscribe(iStatus);
 SetActive();
 // then process property change
 switch (state)
 {
 case EUsbOtgStateReset:
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::RunL OTGState == RESET" ) );
+LOG("OTGState == RESET" );
 break;
 }
 case EUsbOtgStateAIdle:
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::RunL OTGState == AIdle" ) );
+LOG("OTGState == AIdle" );
 for (TInt i(0); i < iObservers.Count(); ++i)
 {
 iObservers[i]->AIdleL();
 }
 break;
 }
 case EUsbOtgStateAHost:
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::RunL OTGState == AHost" ) );
+LOG( "OTGState == AHost");
 for (TInt i(0); i < iObservers.Count(); ++i)
 {
 iObservers[i]->AHostL();
 }
 break;
 }
 case EUsbOtgStateAPeripheral:
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::RunL OTGState == APeripheral" ) );
+LOG("OTGState == APeripheral" );
 for (TInt i(0); i < iObservers.Count(); ++i)
 {
 iObservers[i]->APeripheralL();
 }
 break;
 }
 case EUsbOtgStateAVbusError:
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::RunL OTGState == AVBusError" ) );
+LOG("OTGState == AVBusError" );
 for (TInt i(0); i < iObservers.Count(); ++i)
 {
 iObservers[i]->AVBusErrorL();
 }
 break;
 }
 case EUsbOtgStateBIdle:
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::RunL OTGState == BIdle" ) );
+LOG( "OTGState == BIdle" );
 for (TInt i(0); i < iObservers.Count(); ++i)
 {
 iObservers[i]->BIdleL();
 }
 break;
 }
 case EUsbOtgStateBPeripheral:
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::RunL OTGState == BPeripheral" ) );
+LOG("OTGState == BPeripheral" );
 for (TInt i(0); i < iObservers.Count(); ++i)
 {
 iObservers[i]->BPeripheralL();
 }
 break;
 }
 case EUsbOtgStateBHost:
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::RunL OTGState == BHost" ) );
+LOG("OTGState == BHost" );
 for (TInt i(0); i < iObservers.Count(); ++i)
 {
 iObservers[i]->BHostL();
 }
 break;
 }
 default:
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbOTGStateObserver::RunL WrongOtgState" ) );
+LOG("WrongOtgState" );
-Panic(EWrongOtgState);
+Panic( EWrongOtgState);
 }
 }
 }
 //
 // ---------------------------------------------------------------------------
 //
 TInt CUsbOtgStateObserver::RunError(TInt aError)
 {
+LOG_FUNC
-FTRACE( FPrint(_L( "[USBOTGWATCHER]\tCUsbOtgStateObserver::RunError aError = %d" ), aError));
+LOG1( "aError = %d" , aError);
 // try to continue
 return KErrNone;
 }

changeset 25	8c311f9acc5e
parent 3	47c263f7e521
child 26	0ae0f29418cd