diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2003-07-18 21:58:28 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2003-07-18 21:58:28 +0000 |
commit | 020352c266544cc4a7a546c656e5cbdb49ac0e3d (patch) | |
tree | 710663120dd5e837a75ae055564ec751338dc261 /apps | |
parent | f4b677eb3ccd75a5609a764c79f6dda20973f4d5 (diff) | |
download | rockbox-020352c266544cc4a7a546c656e5cbdb49ac0e3d.tar.gz rockbox-020352c266544cc4a7a546c656e5cbdb49ac0e3d.zip |
call power_init() before the charging screen may open, thus before ata_init(). No settings loaded yet, I hope this is not harmful.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3845 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/main.c b/apps/main.c index c01e2d84e8..80f2d54539 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -136,6 +136,8 @@ void init(void) | |||
136 | 136 | ||
137 | button_init(); | 137 | button_init(); |
138 | 138 | ||
139 | power_init(); /* moved up from below mpeg_init, hope that's not harmful */ | ||
140 | |||
139 | if (coldstart && charger_inserted()) | 141 | if (coldstart && charger_inserted()) |
140 | { | 142 | { |
141 | rc = charging_screen(); /* display a "charging" screen */ | 143 | rc = charging_screen(); /* display a "charging" screen */ |
@@ -201,8 +203,6 @@ void init(void) | |||
201 | global_settings.avc, | 203 | global_settings.avc, |
202 | global_settings.channel_config ); | 204 | global_settings.channel_config ); |
203 | 205 | ||
204 | power_init(); | ||
205 | |||
206 | if (coldstart && !usb_detect()) | 206 | if (coldstart && !usb_detect()) |
207 | { /* when starting from flash, this time _we_ have to yield */ | 207 | { /* when starting from flash, this time _we_ have to yield */ |
208 | int fd; | 208 | int fd; |