diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-03-10 19:11:37 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-03-10 19:11:37 +0000 |
commit | 6f05899f429e2138c89182251c4c4a8872369dda (patch) | |
tree | 6831f8439643954cd9bd368da124874dbcaa81bc /apps | |
parent | bc0f0cfb3baf154bbf0cdbda1f3b94c0955fd94c (diff) | |
download | rockbox-6f05899f429e2138c89182251c4c4a8872369dda.tar.gz rockbox-6f05899f429e2138c89182251c4c4a8872369dda.zip |
don't do early usb detection on device with software stack. This doesn't work properly when booting while the device is plugged in to a power-only USB cable, and on sansa the microSD slot doesn't work here.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16611 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 15dd1bcef9..598597520f 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -450,6 +450,7 @@ static void init(void) | |||
450 | #endif | 450 | #endif |
451 | 451 | ||
452 | usb_start_monitoring(); | 452 | usb_start_monitoring(); |
453 | #ifndef HAVE_USBSTACK | ||
453 | while (usb_detect() == USB_INSERTED) | 454 | while (usb_detect() == USB_INSERTED) |
454 | { | 455 | { |
455 | #ifdef HAVE_EEPROM_SETTINGS | 456 | #ifdef HAVE_EEPROM_SETTINGS |
@@ -463,15 +464,14 @@ static void init(void) | |||
463 | #endif | 464 | #endif |
464 | { | 465 | { |
465 | usb_screen(); | 466 | usb_screen(); |
466 | #ifndef HAVE_USBSTACK | ||
467 | mounted = true; /* mounting done @ end of USB mode */ | 467 | mounted = true; /* mounting done @ end of USB mode */ |
468 | #endif | ||
469 | } | 468 | } |
470 | #ifdef HAVE_USB_POWER | 469 | #ifdef HAVE_USB_POWER |
471 | if (usb_powered()) /* avoid deadlock */ | 470 | if (usb_powered()) /* avoid deadlock */ |
472 | break; | 471 | break; |
473 | #endif | 472 | #endif |
474 | } | 473 | } |
474 | #endif | ||
475 | 475 | ||
476 | if (!mounted) | 476 | if (!mounted) |
477 | { | 477 | { |