--- a/usbmgmt/usbmgr/usbman/chargingplugin/public/usbbatterycharging.h	Mon Sep 06 11:27:08 2010 +0800
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/public/usbbatterycharging.h	Thu Sep 16 12:03:29 2010 +0800
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -27,21 +27,10 @@
 // UID used for central respository
 const TUid KUsbBatteryChargingCentralRepositoryUid = {0x10208DD7};	// UID3 for usbbatterychargingplugin
 
-const TUid KPropertyUidUsbBatteryChargingCategory = {0x101fe1db};
-const TUint KPropertyUidUsbBatteryChargingAvailableCurrent = 1; // current negotiated
-const TUint KPropertyUidUsbBatteryChargingChargingCurrent = 2; // current for charging (i.e. depends on user setting)
-
-const TUint KUsbBatteryChargingKeyEnabledUserSetting = 1;
-const TUint KUsbBatteryChargingKeyNumberOfCurrentValues = 2;
+const TUint KUsbBatteryChargingKeyNumberOfCurrentValues = 1;
 
 const TUint KUsbBatteryChargingCurrentValuesOffset = 0x1000;
 
-enum TUsbBatteryChargingUserSetting
-	{
-	EUsbBatteryChargingUserSettingDisabled = 0,
-	EUsbBatteryChargingUserSettingEnabled,
-	};
-
 enum TUsbIdPinState
     {
     EUsbBatteryChargingIdPinBRole = 0,