summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2008-02-11 14:26:25 +0000
committerBjörn Stenberg <bjorn@haxx.se>2008-02-11 14:26:25 +0000
commit2f7cffa204eaa2675b0c6782462b19f4f09bff12 (patch)
tree54ffb4cada2c8db9d0feb4c31efc02cb3ab18a1d /bootloader
parent9811fc9abf6c3b2bb9500a99c14a64ee29641b09 (diff)
downloadrockbox-2f7cffa204eaa2675b0c6782462b19f4f09bff12.tar.gz
rockbox-2f7cffa204eaa2675b0c6782462b19f4f09bff12.tar.bz2
rockbox-2f7cffa204eaa2675b0c6782462b19f4f09bff12.zip
Major USB fixes by Frank Gevaerts. Still disabled in builds, #define USE_ROCKBOX_USB to test.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16279 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/main-pp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index 74c66233c0..5af6e57fff 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -465,6 +465,7 @@ void* main(void)
btn = button_read_device();
#if defined(SANSA_E200) || defined(SANSA_C200)
+#if !defined(USE_ROCKBOX_USB)
usb_init();
while (usb_drv_powered() && usb_retry < 5 && !usb)
{
@@ -474,6 +475,7 @@ void* main(void)
}
if (usb)
btn |= BOOTLOADER_BOOT_OF;
+#endif /* USE_ROCKBOX_USB */
#endif
/* Enable bootloader messages if any button is pressed */
if (btn)