summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/usb-fw-pp502x.c
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 /firmware/target/arm/usb-fw-pp502x.c
parent9811fc9abf6c3b2bb9500a99c14a64ee29641b09 (diff)
downloadrockbox-2f7cffa204eaa2675b0c6782462b19f4f09bff12.tar.gz
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 'firmware/target/arm/usb-fw-pp502x.c')
-rw-r--r--firmware/target/arm/usb-fw-pp502x.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index 0813ae1c59..5b71fbd847 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -68,6 +68,9 @@ void usb_init_device(void)
void usb_enable(bool on)
{
if (on) {
+#ifdef USE_ROCKBOX_USB
+ usb_core_init();
+#else
/* until we have native mass-storage mode, we want to reboot on
usb host connect */
#if defined(IRIVER_H10) || defined (IRIVER_H10_5GB)
@@ -89,6 +92,7 @@ void usb_enable(bool on)
system_reboot(); /* Reboot */
}
+#endif /* USE_ROCKBOX_USB */
}
else
usb_core_exit();
@@ -195,9 +199,9 @@ int usb_detect(void)
return status;
}
- /* Wait up to 50 ticks (500ms) before deciding there is no computer
+ /* Wait up to 100 ticks (1s) before deciding there is no computer
attached. */
- countdown = 50;
+ countdown = 100;
return status;
}