--- a/usbengines/usbotgwatcher/src/cusbindicatornotifier.cpp Fri Feb 19 23:50:32 2010 +0200
+++ b/usbengines/usbotgwatcher/src/cusbindicatornotifier.cpp Fri Mar 12 15:48:40 2010 +0200
@@ -1,20 +1,19 @@
/*
-* Copyright (c) 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: Blink/show Usb indicator notifier implementation
+ * Copyright (c) 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: Blink/show Usb indicator notifier implementation
+ *
+ */
#include <AknSmallIndicator.h>
#include <avkon.hrh>
@@ -33,11 +32,13 @@
// Two-phased constructor.
// -----------------------------------------------------------------------------
//
-CUsbIndicatorNotifier* CUsbIndicatorNotifier::NewL(CUsbNotifManager* aNotifManager, CUsbOtgWatcher* aOtgWatcher)
+CUsbIndicatorNotifier* CUsbIndicatorNotifier::NewL(
+ CUsbNotifManager& aNotifManager, CUsbOtgWatcher& aOtgWatcher)
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::NewL" ));
+ LOG_FUNC
- CUsbIndicatorNotifier* self = new (ELeave) CUsbIndicatorNotifier(aNotifManager, aOtgWatcher);
+ CUsbIndicatorNotifier* self = new (ELeave) CUsbIndicatorNotifier(
+ aNotifManager, aOtgWatcher);
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop(self);
@@ -50,32 +51,30 @@
//
CUsbIndicatorNotifier::~CUsbIndicatorNotifier()
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::~CUsbIndicatorNotifier" ) );
-
+ LOG_FUNC
+
Close();
delete iIconBlinkingTimer;
-
- // Unsubscribe from VBus change notifications
- if(iOtgWatcher)
+
+ if (iOtgWatcher.VBusObserver())
{
- if(iOtgWatcher->VBusObserver())
- {
- TRAP_IGNORE(iOtgWatcher->VBusObserver()->UnsubscribeL(*this));
- }
-
- // Unsubscribe from otg watcher states change notifications
- TRAP_IGNORE(iOtgWatcher->UnsubscribeL(*this));
+ TRAP_IGNORE(iOtgWatcher.VBusObserver()->UnsubscribeL(*this));
}
+
+ // Unsubscribe from otg watcher states change notifications
+ TRAP_IGNORE(iOtgWatcher.UnsubscribeL(*this));
}
// ---------------------------------------------------------------------------
// C++ constructor
// ---------------------------------------------------------------------------
//
-CUsbIndicatorNotifier::CUsbIndicatorNotifier(CUsbNotifManager* aNotifManager, CUsbOtgWatcher* aOtgWatcher) :
- CUsbNotifier(aNotifManager, KUsbUiNotifOtgIndicator, NULL), iOtgWatcher(aOtgWatcher)
+CUsbIndicatorNotifier::CUsbIndicatorNotifier(CUsbNotifManager& aNotifManager,
+ CUsbOtgWatcher& aOtgWatcher) :
+ CUsbNotifier(aNotifManager, KUsbUiNotifOtgIndicator, NULL), iOtgWatcher(
+ aOtgWatcher)
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::CUsbIndicatorNotifier" ) );
+ LOG_FUNC
//To be changed to EAknIndicatorStateAnimate and remove iIconBlinkingTimer
//when AVKON implements animation form of usb indicator.
@@ -88,16 +87,16 @@
//
void CUsbIndicatorNotifier::ConstructL()
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::ConstructL" ) );
-
+ LOG_FUNC
+
// Subscribe for VBus change notifications
- iOtgWatcher->VBusObserver()->SubscribeL(*this);
-
+ iOtgWatcher.VBusObserver()->SubscribeL(*this);
+
// Subscribe for otg watcher states change notifications
- iOtgWatcher->SubscribeL(*this);
+ iOtgWatcher.SubscribeL(*this);
- iIconBlinkingTimer = CUsbTimer::NewL(this, EIconBlinkingTimer);
-
+ iIconBlinkingTimer = CUsbTimer::NewL(*this, EIconBlinkingTimer);
+
// check here for condition to set usb indicator
SetIndicatorL();
@@ -111,11 +110,15 @@
//
void CUsbIndicatorNotifier::ShowStaticL(TBool aVisible)
{
- FTRACE( FPrint (_L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::ShowStaticL, aVisible=%d" ), aVisible));
+ LOG_FUNC
+
+ LOG1("aVisible = %d" , aVisible);
iIconBlinkingTimer->Cancel();
- SetIndicatorStateL(aVisible ? EAknIndicatorStateOn : EAknIndicatorStateOff);
+ SetIndicatorStateL(aVisible
+ ? EAknIndicatorStateOn
+ : EAknIndicatorStateOff);
}
// ---------------------------------------------------------------------------
@@ -124,7 +127,7 @@
//
void CUsbIndicatorNotifier::BlinkL()
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::BlinkL" ));
+ LOG_FUNC
// Will be canceled if active in After()
iIconBlinkingTimer->After(0);
@@ -136,8 +139,8 @@
//
void CUsbIndicatorNotifier::ShowL()
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::ShowL" ) );
-
+ LOG_FUNC
+
ShowStaticL(ETrue);
}
@@ -147,8 +150,8 @@
//
void CUsbIndicatorNotifier::Close()
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::Close" ) );
-
+ LOG_FUNC
+
iIconBlinkingTimer->Cancel();
TRAP_IGNORE( ShowStaticL(EFalse) );
}
@@ -163,10 +166,14 @@
{
case EIconBlinkingTimer:
{
- SetIndicatorStateL(iIndicatorState ? EAknIndicatorStateOn : EAknIndicatorStateOff);
+ SetIndicatorStateL(iIndicatorState
+ ? EAknIndicatorStateOn
+ : EAknIndicatorStateOff);
- iIndicatorState = (iIndicatorState == EAknIndicatorStateOn
- ? EAknIndicatorStateOff : EAknIndicatorStateOn);
+ iIndicatorState
+ = (iIndicatorState == EAknIndicatorStateOn
+ ? EAknIndicatorStateOff
+ : EAknIndicatorStateOn);
// Will be canceled if active in After()
iIconBlinkingTimer->After(KUsbIndicatorBlinkingInterval);
@@ -174,8 +181,7 @@
}
default:
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::TimerElapsedL - Unknown timer" ) );
-
+ LOG1("Unknown timer id = %d", aTimerId)
Panic(EWrongTimerId);
}
}
@@ -187,11 +193,13 @@
//
void CUsbIndicatorNotifier::SetIndicatorStateL(const TInt aState)
{
- FTRACE( FPrint (_L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::SetIndicatorStateL - aState=%d" ), aState));
+
+ LOG1( "USB indicator State = %d" , aState);
- CAknSmallIndicator* indicator = CAknSmallIndicator::NewLC(TUid::Uid(EAknIndicatorUSBConnection));
- indicator->SetIndicatorStateL( aState );
- CleanupStack::PopAndDestroy( indicator ); //indicator
+ CAknSmallIndicator* indicator = CAknSmallIndicator::NewLC(TUid::Uid(
+ EAknIndicatorUSBConnection));
+ indicator->SetIndicatorStateL(aState);
+ CleanupStack::PopAndDestroy(indicator); //indicator
}
// ---------------------------------------------------------------------------
@@ -200,7 +208,6 @@
//
void CUsbIndicatorNotifier::OtgWatcherStateChangedL(TUsbStateIds aState)
{
- FTRACE( FPrint (_L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::OtgWatcherStateChangedL - aState=%d" ), aState));
SetIndicatorL();
}
@@ -210,7 +217,6 @@
//
void CUsbIndicatorNotifier::VBusDownL()
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::VBusDownL" ) );
SetIndicatorL();
}
@@ -220,7 +226,6 @@
//
void CUsbIndicatorNotifier::VBusUpL()
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::VBusUpL" ) );
SetIndicatorL();
}
@@ -230,8 +235,7 @@
//
void CUsbIndicatorNotifier::VBusObserverErrorL(TInt aError)
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::VBusObserverErrorL" ) );
- // do not care
+ // do nothing
}
// ---------------------------------------------------------------------------
@@ -240,24 +244,22 @@
//
void CUsbIndicatorNotifier::SetIndicatorL()
{
- FLOG( _L( "[USBOTGWATCHER]\tCUsbIndicatorNotifier::SetIndicatorL" ) );
-
- if (!(iOtgWatcher->IsDeviceA()))
+ if (!(iOtgWatcher.IsDeviceA()))
{
// if B, than other party (usbwatcher) takes care of usb indicator
// in combined usbwatcher (if role swap allowed) one class has to manage usb indicator
return;
}
-
+
// if VBus Up and we are host -> show indicator
- if ((iOtgWatcher->VBusObserver()->VBus() == CUsbVBusObserver::EVBusUp) &&
- (iOtgWatcher->CurrentHostState()->Id() == EUsbStateHostAHost))
+ if ((iOtgWatcher.VBusObserver()->VBus() == CUsbVBusObserver::EVBusUp)
+ && (iOtgWatcher.CurrentHostState()->Id() == EUsbStateHostAHost))
{
ShowStaticL(ETrue);
}
// if VBus up and we are not host -> Blink indicator
- else if((iOtgWatcher->VBusObserver()->VBus() == CUsbVBusObserver::EVBusUp) &&
- (iOtgWatcher->CurrentHostState()->Id() != EUsbStateHostAHost))
+ else if ((iOtgWatcher.VBusObserver()->VBus() == CUsbVBusObserver::EVBusUp)
+ && (iOtgWatcher.CurrentHostState()->Id() != EUsbStateHostAHost))
{
BlinkL();
}