--- a/usbmgmt/usbmgr/usbman/chargingplugin/public/chargingstates.h	Fri Sep 17 08:40:15 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/public/chargingstates.h	Mon Oct 04 03:06:48 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 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"
@@ -28,19 +28,20 @@
     {
     friend class CUsbBatteryChargingPlugin;
     
-protected:  // from MUsbBatteryChargingPluginInterface
+protected:  
+	// from MUsbBatteryChargingPluginInterface
     // from MUsbDeviceNotify
     virtual void UsbServiceStateChange (TInt aLastError,
         TUsbServiceState aOldState, TUsbServiceState aNewState);
     virtual void UsbDeviceStateChange (TInt aLastError,
         TUsbDeviceState aOldState, TUsbDeviceState aNewState);
 
-    // from MUsbChargingRepositoryObserver
-    virtual void HandleRepositoryValueChangedL (const TUid& aRepository,
-        TUint aId, TInt aVal);
-    
     // from MUsbChargingDeviceStateTimerObserver
     virtual void DeviceStateTimeout();
+#ifdef SYMBIAN_USB_BATTERYCHARGING_V1_1	
+    virtual void UsbChargingPortType(TUint aPortType);
+	virtual void PeerDeviceMaxPower(TUint aCurrent);
+#endif
 
 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV          // For host OTG enabled charging plug-in    
     // from MOtgPropertiesObserver
@@ -56,6 +57,8 @@
     CUsbBatteryChargingPlugin& iParent; // Charging state machine. Not Owned
     };
 
+
+
 class TUsbBatteryChargingPluginStateIdle : public TUsbBatteryChargingPluginStateBase
     {
 public:
@@ -67,6 +70,8 @@
         TInt aLastError, TUsbDeviceState aOldState, TUsbDeviceState aNewState);
     };
 
+
+
 class TUsbBatteryChargingPluginStateNoValidCurrent : public TUsbBatteryChargingPluginStateBase
     {
 public:
@@ -74,6 +79,8 @@
             CUsbBatteryChargingPlugin& aParentStateMachine);
     };
 
+
+
 class TUsbBatteryChargingPluginStateCurrentNegotiating : public TUsbBatteryChargingPluginStateBase
     {
 public:
@@ -86,16 +93,8 @@
     void DeviceStateTimeout();
     };
 
-class TUsbBatteryChargingPluginStateCharging : public TUsbBatteryChargingPluginStateBase
-    {
-public:
-    TUsbBatteryChargingPluginStateCharging(
-            CUsbBatteryChargingPlugin& aParentStateMachine);
-    
-private:
-    void UsbDeviceStateChange(TInt aLastError, TUsbDeviceState aOldState, 
-            TUsbDeviceState aNewState);
-    };
+
+
 
 class TUsbBatteryChargingPluginStateIdleNegotiated : public TUsbBatteryChargingPluginStateBase
     {
@@ -108,31 +107,16 @@
             TUsbDeviceState aNewState);
     };
 
-class TUsbBatteryChargingPluginStateUserDisabled : public TUsbBatteryChargingPluginStateBase
-    {
-public:
-    TUsbBatteryChargingPluginStateUserDisabled(
-            CUsbBatteryChargingPlugin& aParentStateMachine);
-    
-private:
-    void UsbDeviceStateChange(TInt aLastError, TUsbDeviceState aOldState, 
-            TUsbDeviceState aNewState);
-    
-    // from MUsbChargingRepositoryObserver
-    void HandleRepositoryValueChangedL (const TUid& aRepository, 
-            TUint aId, TInt aVal);
-    
-#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV          // For host OTG enabled charging plug-in     
-    void MpsoIdPinStateChanged(TInt aValue);
-#endif
-    void MpsoVBusStateChanged(TInt aNewState);
-    };
 
 class TUsbBatteryChargingPluginStateBEndedCableNotPresent : public TUsbBatteryChargingPluginStateBase
     {
 public:
     TUsbBatteryChargingPluginStateBEndedCableNotPresent(
             CUsbBatteryChargingPlugin& aParentStateMachine);
+#ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV   	
+private:
+	void MpsoIdPinStateChanged(TInt aValue);
+#endif	
     };
 
 #endif // CHARGINGSTATES_H