Commit FS#8379 by Andree Buschmann. Disables much of the remaining unneeded hardware on PP50xx targets (Ipods, Sansa, H10s, etc) resulting in a large savings in power and consequent increase in battery life. Results vary from target to target and from codec to codec, but we now approach the OF runtime on several PP devices. For now, leave base CPU clock at 30MHz, although further savings is possible with some codecs if clock is reduced. Additionally, fix battery capacity on c200 and use my measurements to improve runtime estimation for Sandisk targets.

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

3 files changed, 20 insertions, 11 deletions

diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h
index 53ff97326a..a0bb1aeb2c 100644
--- a/firmware/export/config-c200.h
+++ b/firmware/export/config-c200.h
@@ -113,9 +113,9 @@
 /* define this if you have a flash memory storage */
 #define HAVE_FLASH_STORAGE
 
-#define BATTERY_CAPACITY_DEFAULT 750    /* default battery capacity */
-#define BATTERY_CAPACITY_MIN 750        /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 750        /* max. capacity selectable */
+#define BATTERY_CAPACITY_DEFAULT 530    /* default battery capacity */
+#define BATTERY_CAPACITY_MIN 530        /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 530        /* max. capacity selectable */
 #define BATTERY_CAPACITY_INC 0          /* capacity increment */
 #define BATTERY_TYPES_COUNT  1          /* only one type */
 
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h
index 0666b5af37..56e14b3741 100644
--- a/firmware/export/powermgmt.h
+++ b/firmware/export/powermgmt.h
@@ -105,22 +105,26 @@ extern int trickle_sec;          /* trickle charge: How many seconds per minute
 # define CURRENT_BACKLIGHT  23  /* FIXME: This needs to be measured, copied from H100 */
 # define CURRENT_RECORD    110  /* additional current while recording */
 #elif defined(IPOD_NANO)        /* iPOD Nano */
-# define CURRENT_NORMAL     35  /* 8.5-9.0h playback out of 300mAh battery from IpodRuntime */
+# define CURRENT_NORMAL     32  /* MP3: ~9h playback out of 300mAh battery */
 # define CURRENT_BACKLIGHT  20  /* FIXME: this needs adjusting */
 #if defined(HAVE_RECORDING)
 # define CURRENT_RECORD     35  /* FIXME: this needs adjusting */
 #endif
 #elif defined(IPOD_VIDEO)       /* iPOD Video */
-# define CURRENT_NORMAL     42  /* 9.5h out of 400mAh battery (30GB) or 14h out of 600mAh (60GB) from IpodRuntime */
+# define CURRENT_NORMAL     35  /* MP3: ~11h out of 400mAh battery (30GB) or ~17h out of 600mAh (60GB) */
 # define CURRENT_BACKLIGHT  20  /* FIXME: this needs adjusting */
 #if defined(HAVE_RECORDING)
 # define CURRENT_RECORD     35  /* FIXME: this needs adjusting */
 #endif
-#elif defined(SANSA_E200)    /* Sandisk players */
-# define CURRENT_NORMAL     50  /* Toni's measurements in spring 2007 suggests 50 ma during normal operation */
-# define CURRENT_BACKLIGHT  20  /* seems like a reasonible value for now */
-# define CURRENT_RECORD     35  /* FIXME: this needs adjusting */
-#else /* Not iriver H1x0, H3x0, nor Archos Ondio, nor iPODVideo, nor Sansas */
+#elif defined(SANSA_E200)    /* Sandisk E200v1  */
+# define CURRENT_NORMAL     45  /* Mike's measurements in Jan 2008  */
+# define CURRENT_BACKLIGHT  40  /* Screen is about 20, blue LEDs are another 20, so 40 if both */
+# define CURRENT_RECORD     40  /* flash player, so this is just unboosted current*/
+#elif defined(SANSA_C200)    /* Sandisk C200v1 */
+# define CURRENT_NORMAL     45  /* Should be nearly identical to E200 */
+# define CURRENT_BACKLIGHT  40  /* Screen is about 20, blue LEDs are another 20, so 40 if both */
+# define CURRENT_RECORD     40  /* flash player, so this is just unboosted current*/
+#else /* Not iriver H1x0, H3x0, nor Archos Ondio, nor iPod nano/Video, nor Sansas */
 # define CURRENT_NORMAL    145  /* usual current in mA when using the AJB including some disk/backlight/... activity */
 # define CURRENT_BACKLIGHT  30  /* additional current when backlight always on */
 #if defined(HAVE_RECORDING)
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index 845c89c616..0dcd7b362d 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -132,7 +132,9 @@
 #define DEV_EN       (*(volatile unsigned long *)(0x6000600c))
 #define DEV_EN2      (*(volatile unsigned long *)(0x60006010))
 
+#define DEV_EXTCLOCKS   0x00000002
 #define DEV_SYSTEM      0x00000004
+#define DEV_USB0        0x00000008
 #define DEV_SER0        0x00000040
 #define DEV_SER1        0x00000080
 #define DEV_I2S         0x00000800
@@ -140,7 +142,8 @@
 #define DEV_ATA         0x00004000
 #define DEV_OPTO        0x00010000
 #define DEV_PIEZO       0x00010000
-#define DEV_USB         0x00400000
+#define DEV_PWM         0x00020000
+#define DEV_USB1        0x00400000
 #define DEV_FIREWIRE    0x00800000
 #define DEV_IDE0        0x02000000
 #define DEV_LCD         0x04000000
@@ -332,6 +335,8 @@
 #define XMB_NOR_CFG      (*(volatile unsigned long *)(0x70000038))
 #define XMB_RAM_CFG      (*(volatile unsigned long *)(0x7000003c))
 
+#define INIT_BUTTONS     0x00040000
+#define INIT_PLL         0x40000000
 #define INIT_USB         0x80000000
 
 /* 32 bit GPO port */