First step of powermanagement rework: * Move target specific stuff into target tree, starting with battery voltage tables and voltage reading. (This revealed some incorrect percent_to_voltage_charging mappings). * Voltage reading on 1st gen ipods is now correct. * Clean up obsolete config #defines.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14375 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 8 insertions, 17 deletions

diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index 0f2da5360a..b792f6f5dc 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -8,9 +8,6 @@
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 5
 
-/* For battery type (30GB by default, undefine here to use 60/80GB model) */
-#define CONFIG_BATTERY_IPOD_VIDEO_30GB
-
 /* define this if you have recording possibility */
 #define HAVE_RECORDING
 
@@ -81,22 +78,16 @@
 
 /* Type of mobile power */
 #if (MEM==32)  /* this is the 30GB-model */
-#       define CONFIG_BATTERY BATT_LIION400
-#       define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity for the 30GB model */
-#       define BATTERY_CAPACITY_MIN     300 /* min. capacity selectable */
-#       define BATTERY_CAPACITY_MAX       800 /* max. capacity selectable */
-#       define BATTERY_CAPACITY_INC        50 /* capacity increment */
-#       define BATTERY_TYPES_COUNT          1 /* only one type */
-#       define BATTERY_SCALE_FACTOR    5865
+# define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity for the 30GB model */
+# define BATTERY_CAPACITY_MIN     300 /* min. capacity selectable */
+# define BATTERY_CAPACITY_MAX     800 /* max. capacity selectable */
 #else          /* these are the 60/80GB-models */
-#       define CONFIG_BATTERY BATT_LIION400 /* FIXME: we assume to have same discharge behaviour as 30GB iPOD */
-#       define BATTERY_CAPACITY_DEFAULT 600 /* default battery capacity for the 60/80GB model */
-#       define BATTERY_CAPACITY_MIN     500 /* min. capacity selectable */
-#       define BATTERY_CAPACITY_MAX    1000 /* max. capacity selectable */
-#       define BATTERY_CAPACITY_INC      50 /* capacity increment */
-#       define BATTERY_TYPES_COUNT        1 /* only one type */
-#       define BATTERY_SCALE_FACTOR    5865
+# define BATTERY_CAPACITY_DEFAULT 600 /* default battery capacity for the 60/80GB model */
+# define BATTERY_CAPACITY_MIN     500 /* min. capacity selectable */
+# define BATTERY_CAPACITY_MAX    1000 /* max. capacity selectable */
 #endif
+#define BATTERY_CAPACITY_INC       50 /* capacity increment */
+#define BATTERY_TYPES_COUNT         1 /* only one type */
 
 /* Hardware controlled charging with monitoring */
 #define CONFIG_CHARGING CHARGING_MONITOR