diff -r 7e15987c4500 -r 7068aba64af5 usbengines/usbotgwatcher/src/cusbstatehostainitiatebase.cpp --- a/usbengines/usbotgwatcher/src/cusbstatehostainitiatebase.cpp Tue Feb 02 00:52:37 2010 +0200 +++ b/usbengines/usbotgwatcher/src/cusbstatehostainitiatebase.cpp Fri Feb 19 23:50:33 2010 +0200 @@ -93,7 +93,7 @@ case EDeviceAttachmentTimer: { FLOG( _L( "[USBOTGWATCHER]\tCUsbStateHostAInitiateBase::TimerElapsedL - AttachmentTimer" ) ); - HandleL(EUsbWatcherErrDandlingCable); + HandleL(EUsbWatcherErrDandlingCable, EUsbStateHostHandle); break; } default: @@ -177,7 +177,8 @@ // OTG device supports both hnp and srp if(hnpSupported && srpSupported) { - HandleL(EUsbWatcherConnectedToOTG); + + HandleL(EUsbWatcherConnectedToOTG, EUsbStateHostHandle); return; } @@ -189,13 +190,13 @@ case KErrBadPower: { FLOG( _L( "[USBOTGWATCHER]\tCUsbStateHostAInitiateBase::DeviceAttachedL TooMuchPower" ) ); - HandleL(EUsbWatcherErrDeviceRequiresTooMuchPowerOnEnumeration); + HandleL(EUsbWatcherErrDeviceRequiresTooMuchPowerOnEnumeration, EUsbStateHostDelayHandle); break; } default: { FLOG( _L( "[USBOTGWATCHER]\tCUsbStateHostAInitiateBase::DeviceAttachedL AttachmentError" ) ); - HandleL(EUsbWatcherErrUnsupportedDevice); + HandleL(EUsbWatcherErrUnsupportedDevice, EUsbStateHostHandle); break; } @@ -243,7 +244,7 @@ /* if (KErrNone != iUsbPersonalitySwitch->SwitchPersonalityL(aDei.iDeviceId, KUsbPersonalityIdMS )) {*/ - HandleL(EUsbWatcherErrDriversNotFound); + HandleL(EUsbWatcherErrDriversNotFound, EUsbStateHostDelayHandle); // } } @@ -260,7 +261,7 @@ if (KErrNone != err) { FLOG( _L( "[USBOTGWATCHER]\tCUsbStateHostAInitiateBase::SrpReceivedL BusRespondSrp error" ) ); - iWatcher->HandleHostProblemL(EUsbWatcherErrorInConnection); + iWatcher->HandleHostProblemL(EUsbWatcherErrorInConnection, EUsbStateHostHandle); } } } @@ -288,7 +289,7 @@ if (KErrNotFound == aData) { // no supported or needed personality/ies in the peripheral - HandleL(EUsbWatcherErrDriversNotFound); + HandleL(EUsbWatcherErrDriversNotFound, EUsbStateHostDelayHandle); } break; } @@ -306,7 +307,7 @@ case ERequestFailed: { FLOG( _L( "[USBOTGWATCHER]\tCUsbStateHostAInitiateBase::UsbPersonalitySwitchStateChangedL ERequestFailed" ) ); - HandleL(EUsbWatcherErrDriversNotFound); + HandleL(EUsbWatcherErrDriversNotFound, EUsbStateHostDelayHandle); break; } default: