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

equal deleted inserted replaced

-:7068aba64af5
+:a15c582fbf97
 /*
 * 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
 *
-*/
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Implementation
+*
+*/
 #include "cusbstate.h"
 #include "panic.h"
 #include "debug.h"
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
-CUsbState::CUsbState(CUsbOtgWatcher* aWatcher) :
+CUsbState::CUsbState(CUsbOtgWatcher& aWatcher) :
 iWatcher(aWatcher)
 {
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
-CUsbState* CUsbState::NewL(CUsbOtgWatcher* aWatcher)
-{
-CUsbState* self = new (ELeave) CUsbState(aWatcher);
-CleanupStack::PushL(self);
-self->ConstructL();
-CleanupStack::Pop(self);
-return self;
-}
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
 void CUsbState::ConstructL()
 {
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
-TUsbStateIds CUsbState::Id()
-{
-Panic(EIdForNotDefinedStateRequested);
-return EUsbStateHostUndefined;
-}
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
 void CUsbState::JustAdvancedToThisStateL()
 {
+iWatcher.PrintStateToLog();
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CUsbState::ChangeStateL(TUsbStateIds aNewStateId)
 {
-iWatcher->ChangeStateL(aNewStateId);
+iWatcher.ChangeStateL(aNewStateId);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::ChangeHostStateL(TUsbStateIds aNewStateId)
 {
-iWatcher->ChangeHostStateL(aNewStateId);
+iWatcher.ChangeHostStateL(aNewStateId);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::HandleL(TInt aWhat, TUsbStateIds aWhereToHandle)
 {
-FTRACE( FPrint(_L( "[USBOTGWATCHER]\tCUsbState::HandleL aWhat = %d aWhere = %d" ), aWhat, aWhereToHandle));
+LOG_FUNC
-iWatcher->HandleHostProblemL(aWhat, aWhereToHandle);
+LOG2( "aWhat = %d aWhere = %d" , aWhat, aWhereToHandle);
+iWatcher.HandleHostProblemL(aWhat, aWhereToHandle);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::IdPinOffL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::IdPinOffL" ) );
+LOG_FUNC
 Panic(EIdPinOffNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::IdPinOnL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::IdPinOnL" ) );
+LOG_FUNC
 Panic(EIdPinOnNotExpected);
 }
 // From VBus observer
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::VBusDownL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::VBusDownL" ) );
+LOG_FUNC
 Panic(EVBusDownNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::VBusUpL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::VBusUpL" ) );
+LOG_FUNC
 Panic(EVBusUpNotExpected);
 }
 // From OTG state observer
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::AIdleL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::AIdleL" ) );
+LOG_FUNC
 Panic(EAIdleNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::AHostL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::AHostL" ) );
+LOG_FUNC
 Panic(EAHostNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::APeripheralL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::APeripheralL" ) );
+LOG_FUNC
 Panic(EAPeripheralNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::AVBusErrorL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::AVBusErrorL" ) );
+LOG_FUNC
 Panic(EAVBusErrorNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::BIdleL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::BIdleL" ) );
+LOG_FUNC
 Panic(EBIdleNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::BPeripheralL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::BPeripheralL" ) );
+LOG_FUNC
 Panic(EBPeripheralNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::BHostL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::BHostL" ) );
+LOG_FUNC
 Panic(EBHostNotExpected);
 }
 // From bus activity observer
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::BusIdleL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::BusIdleL" ) );
+LOG_FUNC
 Panic(EBusIdleNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::BusActiveL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::BusActiveL" ) );
+LOG_FUNC
 Panic(EBusActiveNotExpected);
 }
 // From Host Event notification observer
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::DeviceAttachedL(TDeviceEventInformation)
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::DeviceAttachedL" ) );
+LOG_FUNC
 Panic(EDeviceAttachedNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::DeviceDetachedL(TDeviceEventInformation)
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::DeviceDetachedL" ) );
+LOG_FUNC
 Panic(EDeviceDetachedNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::DriverLoadSuccessL(TDeviceEventInformation)
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::DriverLoadSuccessL" ) );
+LOG_FUNC
 Panic(EDriverLoadSuccessNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::DriverLoadPartialSuccessL(TDeviceEventInformation)
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::DriverLoadPartialSuccessL" ) );
+LOG_FUNC
 Panic(EDriverLoadPartialSuccessNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::DriverLoadFailureL(TDeviceEventInformation)
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::DriverLoadFailureL" ) );
+LOG_FUNC
 Panic(EDriverLoadFailureNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::BadHubPositionL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::BadHubPositionL" ) );
+LOG_FUNC
 Panic(EBadHubPositionNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::VBusErrorL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::VBusErrorL" ) );
+LOG_FUNC
 Panic(EVBusErrorNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::MessageNotificationReceivedL(TInt)
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::MessageNotificationReceivedL" ) );
+LOG_FUNC
 Panic(EMessageNotificationNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::SrpReceivedL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::SrpReceivedL" ) );
+LOG_FUNC
 Panic(ESrpNotExpected);
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CUsbState::SessionRequestedL()
 {
-FLOG( _L( "[USBOTGWATCHER]\tCUsbState::SessionRequestedL" ) );
+LOG_FUNC
 Panic(ESessionRequestNotExpected);
 }

branch	RCL_3
changeset 20	a15c582fbf97
parent 13	7068aba64af5
child 21	ff9df6630274