diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-05 07:09:19 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-07-05 07:09:19 +0000 |
commit | 72550d94b6688fa2b00bcf5fb759a1b9adfcad34 (patch) | |
tree | c0bc4ae2e931f11286ca376b56eca7d1087864b0 /firmware | |
parent | 073406a9c6be8b6f96c6a575ac2439815654da68 (diff) | |
download | rockbox-72550d94b6688fa2b00bcf5fb759a1b9adfcad34.tar.gz rockbox-72550d94b6688fa2b00bcf5fb759a1b9adfcad34.zip |
More accurate runtime estimate calculation for iriver (still not very
accurate with other than 128k mp3 files).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7021 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/powermgmt.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index e32867a188..e4c7d65d45 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h | |||
@@ -92,18 +92,22 @@ extern charge_state_type charge_state; | |||
92 | #endif /* defined(HAVE_CHARGE_CTRL) || (CONFIG_BATTERY == BATT_LIION2200) */ | 92 | #endif /* defined(HAVE_CHARGE_CTRL) || (CONFIG_BATTERY == BATT_LIION2200) */ |
93 | 93 | ||
94 | #ifdef HAVE_MMC /* Values for Ondio */ | 94 | #ifdef HAVE_MMC /* Values for Ondio */ |
95 | #define CURRENT_NORMAL 95 /* average, nearly proportional to 1/U */ | 95 | # define CURRENT_NORMAL 95 /* average, nearly proportional to 1/U */ |
96 | #define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ | 96 | # define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ |
97 | #define CURRENT_BACKLIGHT 0 /* no backlight */ | 97 | # define CURRENT_BACKLIGHT 0 /* no backlight */ |
98 | #else /* Values for HD based jukeboxes */ | 98 | #else /* Values for HD based jukeboxes */ |
99 | #define CURRENT_NORMAL 145 /* usual current in mA when using the AJB including some disk/backlight/... activity */ | 99 | # ifdef IRIVER_H100 |
100 | #define CURRENT_USB 500 /* usual current in mA in USB mode */ | 100 | # define CURRENT_NORMAL 80 |
101 | #define CURRENT_BACKLIGHT 30 /* additional current when backlight is always on */ | 101 | # else |
102 | 102 | # define CURRENT_NORMAL 145 /* usual current in mA when using the AJB including some disk/backlight/... activity */ | |
103 | #define CURRENT_MIN_CHG 70 /* minimum charge current */ | 103 | # endif /* not IRIVER_H100 */ |
104 | #define MIN_CHG_V 8500 /* at 8.5v charger voltage get CURRENT_MIN_CHG */ | 104 | # define CURRENT_USB 500 /* usual current in mA in USB mode */ |
105 | #define CURRENT_MAX_CHG 350 /* maximum charging current */ | 105 | # define CURRENT_BACKLIGHT 30 /* additional current when backlight is always on */ |
106 | #define MAX_CHG_V 10250 /* anything over 10.25v gives CURRENT_MAX_CHG */ | 106 | |
107 | # define CURRENT_MIN_CHG 70 /* minimum charge current */ | ||
108 | # define MIN_CHG_V 8500 /* at 8.5v charger voltage get CURRENT_MIN_CHG */ | ||
109 | # define CURRENT_MAX_CHG 350 /* maximum charging current */ | ||
110 | # define MAX_CHG_V 10250 /* anything over 10.25v gives CURRENT_MAX_CHG */ | ||
107 | #endif /* HAVE_MMC */ | 111 | #endif /* HAVE_MMC */ |
108 | 112 | ||
109 | extern unsigned int bat; /* filtered battery voltage, centivolts */ | 113 | extern unsigned int bat; /* filtered battery voltage, centivolts */ |