devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Moved the power_init() call to main(), removed unfinished inits for the H300

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7964 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2005-11-18 14:55:51 +00:00
parent bd0d12c43e
commit e16ebf1a50
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/main.c
View file

@ -186,7 +186,9 @@ void init(void)
buffer_init(); buffer_init();
settings_reset(); settings_reset();
power_init();
lcd_init(); lcd_init();
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
lcd_remote_init(); lcd_remote_init();
@ -205,7 +207,10 @@ void init(void)
#endif #endif
#endif #endif
#ifndef IRIVER_H300_SERIES
/* Not yet done on H300 */
i2c_init(); i2c_init();
#endif
#ifdef HAVE_RTC #ifdef HAVE_RTC
rtc_init(); rtc_init();
@ -214,8 +219,10 @@ void init(void)
adc_init(); adc_init();
#ifndef IRIVER_H300_SERIES
usb_init(); usb_init();
#endif
backlight_init(); backlight_init();
button_init(); button_init();
@ -258,6 +265,7 @@ void init(void)
panicf("ata: %d", rc); panicf("ata: %d", rc);
} }
#ifndef IRIVER_H300_SERIES
usb_start_monitoring(); usb_start_monitoring();
while (usb_detect()) while (usb_detect())
{ /* enter USB mode early, before trying to mount */ { /* enter USB mode early, before trying to mount */
@ -274,7 +282,7 @@ void init(void)
break; break;
#endif #endif
} }
#endif
if (!mounted) if (!mounted)
{ {
rc = disk_mount_all(); rc = disk_mount_all();

2
firmware/powermgmt.c
View file

@ -873,8 +873,6 @@ static void power_thread(void)
void powermgmt_init(void) void powermgmt_init(void)
{ {
power_init();
/* init history to 0 */ /* init history to 0 */
memset(power_history, 0x00, sizeof(power_history)); memset(power_history, 0x00, sizeof(power_history));