summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/usb-fw-pp502x.c
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-02-20 22:54:26 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-02-20 22:54:26 +0000
commit07427592a928ab3d164fbcca842399af6d5ca7ef (patch)
treeeb7b1b748f8ac9ea28ce357290bc5992f5e2403f /firmware/target/arm/usb-fw-pp502x.c
parent6af732d17aa1eb882e3c52242b2bf7f2fcccc752 (diff)
downloadrockbox-07427592a928ab3d164fbcca842399af6d5ca7ef.tar.gz
rockbox-07427592a928ab3d164fbcca842399af6d5ca7ef.zip
Major USB stack improvements. It now works at nearly the maximum speed for a full speed connection, and does seem stable.
Still not enabled by default, #define USE_ROCKBOX_USB is still required to enable it. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16360 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/usb-fw-pp502x.c')
-rw-r--r--firmware/target/arm/usb-fw-pp502x.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index 46a5b9942f..4ac515ba1c 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -34,6 +34,7 @@ void usb_init_device(void)
{
/* enable usb module */
outl(inl(0x7000002C) | 0x3000000, 0x7000002C);
+
DEV_EN |= DEV_USB0;
DEV_EN |= DEV_USB1;
@@ -46,6 +47,7 @@ void usb_init_device(void)
#if CONFIG_CPU == PP5020
DEV_INIT2 |= INIT_USB;
#endif
+
while ((inl(0x70000028) & 0x80) == 0);
outl(inl(0x70000028) | 0x2, 0x70000028);
udelay(0x186A0);
@@ -68,9 +70,8 @@ void usb_init_device(void)
void usb_enable(bool on)
{
if (on) {
-#ifdef USE_ROCKBOX_USB
usb_core_init();
-#else
+#if !defined(USE_ROCKBOX_USB)
/* until we have native mass-storage mode, we want to reboot on
usb host connect */
#if defined(IRIVER_H10) || defined (IRIVER_H10_5GB)