diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-18 14:55:51 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-18 14:55:51 +0000 |
commit | e16ebf1a50b9692e93f44633138903418ef93526 (patch) | |
tree | 3f55d96658b38cc3d74f6231f71238562d3bd507 | |
parent | bd0d12c43e8e4d8f5732b4651f714551f08d8a5c (diff) | |
download | rockbox-e16ebf1a50b9692e93f44633138903418ef93526.tar.gz rockbox-e16ebf1a50b9692e93f44633138903418ef93526.zip |
Moved the power_init() call to main(), removed unfinished inits for the H300
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7964 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/main.c | 14 | ||||
-rw-r--r-- | firmware/powermgmt.c | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/apps/main.c b/apps/main.c index d84aa25d0f..43ce9f48b6 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -186,7 +186,9 @@ void init(void) | |||
186 | buffer_init(); | 186 | buffer_init(); |
187 | 187 | ||
188 | settings_reset(); | 188 | settings_reset(); |
189 | 189 | ||
190 | power_init(); | ||
191 | |||
190 | lcd_init(); | 192 | lcd_init(); |
191 | #ifdef HAVE_REMOTE_LCD | 193 | #ifdef HAVE_REMOTE_LCD |
192 | lcd_remote_init(); | 194 | lcd_remote_init(); |
@@ -205,7 +207,10 @@ void init(void) | |||
205 | #endif | 207 | #endif |
206 | #endif | 208 | #endif |
207 | 209 | ||
210 | #ifndef IRIVER_H300_SERIES | ||
211 | /* Not yet done on H300 */ | ||
208 | i2c_init(); | 212 | i2c_init(); |
213 | #endif | ||
209 | 214 | ||
210 | #ifdef HAVE_RTC | 215 | #ifdef HAVE_RTC |
211 | rtc_init(); | 216 | rtc_init(); |
@@ -214,8 +219,10 @@ void init(void) | |||
214 | 219 | ||
215 | adc_init(); | 220 | adc_init(); |
216 | 221 | ||
222 | #ifndef IRIVER_H300_SERIES | ||
217 | usb_init(); | 223 | usb_init(); |
218 | 224 | #endif | |
225 | |||
219 | backlight_init(); | 226 | backlight_init(); |
220 | 227 | ||
221 | button_init(); | 228 | button_init(); |
@@ -258,6 +265,7 @@ void init(void) | |||
258 | panicf("ata: %d", rc); | 265 | panicf("ata: %d", rc); |
259 | } | 266 | } |
260 | 267 | ||
268 | #ifndef IRIVER_H300_SERIES | ||
261 | usb_start_monitoring(); | 269 | usb_start_monitoring(); |
262 | while (usb_detect()) | 270 | while (usb_detect()) |
263 | { /* enter USB mode early, before trying to mount */ | 271 | { /* enter USB mode early, before trying to mount */ |
@@ -274,7 +282,7 @@ void init(void) | |||
274 | break; | 282 | break; |
275 | #endif | 283 | #endif |
276 | } | 284 | } |
277 | 285 | #endif | |
278 | if (!mounted) | 286 | if (!mounted) |
279 | { | 287 | { |
280 | rc = disk_mount_all(); | 288 | rc = disk_mount_all(); |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 6d6aba523e..dd2fc9ffd8 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -873,8 +873,6 @@ static void power_thread(void) | |||
873 | 873 | ||
874 | void powermgmt_init(void) | 874 | void powermgmt_init(void) |
875 | { | 875 | { |
876 | power_init(); | ||
877 | |||
878 | /* init history to 0 */ | 876 | /* init history to 0 */ |
879 | memset(power_history, 0x00, sizeof(power_history)); | 877 | memset(power_history, 0x00, sizeof(power_history)); |
880 | 878 | ||