diff -r 0ffee699d6c7 -r 878846f7623e usbengines/usbotgwatcher/src/cusbstatehosthandledropping.cpp --- a/usbengines/usbotgwatcher/src/cusbstatehosthandledropping.cpp Fri Apr 23 23:57:55 2010 +0300 +++ b/usbengines/usbotgwatcher/src/cusbstatehosthandledropping.cpp Sat Apr 24 00:13:51 2010 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (c) 2008 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" @@ -18,7 +18,9 @@ #include #include +#include "cusbotgwatcher.h" #include "cusbstatehosthandledropping.h" + #ifndef STIF #include "cusbnotifmanager.h" #else @@ -160,7 +162,8 @@ // no break here } - // no break statement for following cases + // no break statement for following cases + case EUsbWatcherNoMemory: case EUsbWatcherIdPinError: case EUsbWatcherVBusObserverError: case EUsbWatcherHostEventNotificationError: @@ -178,7 +181,7 @@ default: { LOG1("Unexpected situation to be handled iWhat = %d" , iWhat ); - Panic( EUnexpectedSituationToHandle); + PANIC( EUnexpectedSituationToHandle); break; } @@ -253,6 +256,13 @@ EUsbOtgErrorInConnection, this); break; } + case EUsbWatcherNoMemory: + { + LOG("EUsbWatcherNoMemory" ); + iWatcher.NotifManager()->ShowNotifierL(KUsbUiNotifOtgError, + EUsbOtgErrorNoMemory, this); + break; + } case EUsbWatcherCanNotStartUsbServices: { LOG("EUsbWatcherCanNotStartUsbServices" ); @@ -277,7 +287,7 @@ default: { LOG1("Unexpected situation to be handled iWhat = %d", iWhat ); - Panic( EUnexpectedSituationToHandle); + PANIC( EUnexpectedSituationToHandle); break; } } @@ -309,6 +319,16 @@ // // --------------------------------------------------------------------------- // +void CUsbStateHostHandleDropping::AVBusErrorL() + { + LOG_FUNC + iWatcher.Usb().BusClearError(); + } + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// void CUsbStateHostHandleDropping::DeviceAttachedL( TDeviceEventInformation aDevEventInfo) { @@ -380,3 +400,13 @@ } } + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +void CUsbStateHostHandleDropping::VBusErrorL() + { + LOG_FUNC + iWatcher.Usb().BusClearError(); + }