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

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)