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

Revert r23599 and r23600 and fix the early usb problem at the root. The the viewportmanager and custom statusbar was initialized too late.

Browse source 
Now, call it earlier and remove parts of it that caused the need to call it later. Removing that is OK since it's done again on settings loading.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23603 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-11-10 20:13:24 +00:00
parent 422fcbe35d
commit c5b4482ee2
5 changed files with 31 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

25
apps/main.c
View file

@ -142,7 +142,8 @@ int main(void)
list_init();
#endif
tree_gui_init();
viewportmanager_init();
/* Keep the order of this 3
* Must be done before any code uses the multi-screen API */
#ifdef HAVE_USBSTACK
/* All threads should be created and public queues registered by now */
usb_start_monitoring();
@ -318,13 +319,16 @@ static void init(void)
#ifdef DEBUG
debug_init();
#endif
/* Must be done before any code uses the multi-screen API */
/* Keep the order of this 3 (viewportmanager handles statusbars)
* Must be done before any code uses the multi-screen API */
gui_syncstatusbar_init(&statusbars);
sb_skin_init();
viewportmanager_init();
gui_sync_wps_init();
storage_init();
settings_reset();
settings_load(SETTINGS_ALL);
gui_sync_wps_init();
sb_skin_init();
settings_apply(true);
init_dircache(true);
init_dircache(false);
@ -443,8 +447,13 @@ static void init(void)
radio_init();
#endif
/* Must be done before any code uses the multi-screen API */
/* Keep the order of this 3 (viewportmanager handles statusbars)
* Must be done before any code uses the multi-screen API */
gui_syncstatusbar_init(&statusbars);
sb_skin_init();
viewportmanager_init();
gui_sync_wps_init();
#if CONFIG_CHARGING && (CONFIG_CPU == SH7034)
/* charger_inserted() can't be used here because power_thread()
@ -496,7 +505,7 @@ static void init(void)
(mmc_remove_request() == SYS_HOTSWAP_EXTRACTED))
#endif
{
gui_usb_screen_run(true);
gui_usb_screen_run();
mounted = true; /* mounting done @ end of USB mode */
}
#ifdef HAVE_USB_POWER
@ -521,7 +530,7 @@ static void init(void)
lcd_update();
while(button_get(true) != SYS_USB_CONNECTED) {};
gui_usb_screen_run(true);
gui_usb_screen_run();
system_reboot();
}
}
@ -551,8 +560,6 @@ static void init(void)
#endif
}
gui_sync_wps_init();
sb_skin_init();
settings_apply(true);
init_dircache(false);
#ifdef HAVE_TAGCACHE