summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2009-05-21 14:54:00 +0000
committerFrank Gevaerts <frank@gevaerts.be>2009-05-21 14:54:00 +0000
commitacc0f799d575f8a19f6c7e1244118ec0f0adf9e6 (patch)
tree84a6506e5997cf95442b70b0270a12eac5f17a3b
parent68e512f8d3ed857cc5cbbbdbcfc2df498d5e969d (diff)
downloadrockbox-acc0f799d575f8a19f6c7e1244118ec0f0adf9e6.tar.gz
rockbox-acc0f799d575f8a19f6c7e1244118ec0f0adf9e6.zip
Re-order usb init a bit, so software and hardware usb are the same. This fixes FS#9957
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21016 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/apps/main.c b/apps/main.c
index 642ec5be08..1ff4032f6e 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -139,10 +139,6 @@ static void app_main(void)
139 viewportmanager_set_statusbar(VP_SB_ALLSCREENS); 139 viewportmanager_set_statusbar(VP_SB_ALLSCREENS);
140 add_event(GUI_EVENT_STATUSBAR_TOGGLE, false, 140 add_event(GUI_EVENT_STATUSBAR_TOGGLE, false,
141 viewportmanager_statusbar_changed); 141 viewportmanager_statusbar_changed);
142#ifdef HAVE_USBSTACK
143 /* All threads should be created and public queues registered by now */
144 usb_start_monitoring();
145#endif
146 root_menu(); 142 root_menu();
147} 143}
148 144
@@ -459,7 +455,7 @@ static void init(void)
459 eeprom_settings_init(); 455 eeprom_settings_init();
460#endif 456#endif
461 457
462#ifndef HAVE_USBSTACK 458#if !defined(HAVE_USBSTACK) || defined(USE_ROCKBOX_USB)
463 usb_start_monitoring(); 459 usb_start_monitoring();
464 while (usb_detect() == USB_INSERTED) 460 while (usb_detect() == USB_INSERTED)
465 { 461 {