diff -r 7e15987c4500 -r 7068aba64af5 usbengines/usbotgwatcher/inc/cusbotgwatcher.h
--- a/usbengines/usbotgwatcher/inc/cusbotgwatcher.h	Tue Feb 02 00:52:37 2010 +0200
+++ b/usbengines/usbotgwatcher/inc/cusbotgwatcher.h	Fri Feb 19 23:50:33 2010 +0200
@@ -349,25 +349,25 @@
     /**
      * @return Handle state 
      */
-    CUsbStateHostHandle* HostHandle() const;
+    CUsbStateHostHandle* HostHandle(TUsbStateIds aStateId) const;
 
     /**
      * Handles problems in host functioning
      * @param aWhatKindOf problem Id to be handled
      */
-    void HandleHostProblemL(TInt aWhatKindOf);
+    void HandleHostProblemL(TInt aWhatKindOf, TUsbStateIds aInState);
     
     /**
      * Add observer to USb Otg state machine
      * @param aObserver Observer
      */
-    void SubscribeL(MUsbOtgWatcherStateObserver* aObserver);
+    void SubscribeL(MUsbOtgWatcherStateObserver& aObserver);
 
     /**
      * Remove observer from UsbOtg state observer
      * @param aObserver Observer
      */
-    void UnsubscribeL(MUsbOtgWatcherStateObserver* aObserver);
+    void UnsubscribeL(MUsbOtgWatcherStateObserver& aObserver);
 
     /**
      * Used for test purposes