summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-02-22 17:08:23 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-02-22 17:08:23 +0000
commitfcd6cf24a2c7e3279aae528d72862429b173ea55 (patch)
treed072c4d855258de3946412ee0adca14c296b4947
parent6bd2eb067f0e4cecfbdedb5073640d12e6e86ef7 (diff)
downloadrockbox-fcd6cf24a2c7e3279aae528d72862429b173ea55.zip
rockbox-fcd6cf24a2c7e3279aae528d72862429b173ea55.tar.gz
rockbox-fcd6cf24a2c7e3279aae528d72862429b173ea55.tar.bz2
rockbox-fcd6cf24a2c7e3279aae528d72862429b173ea55.tar.xz
Make high speed work. Does not fix any other bugs yet, so still be careful about pressing buttons while connecting, or making screenshots.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16366 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/usb-drv-pp502x.c4
-rw-r--r--firmware/target/arm/usb-fw-pp502x.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/firmware/target/arm/usb-drv-pp502x.c b/firmware/target/arm/usb-drv-pp502x.c
index 2d51ce5..c1e2945 100644
--- a/firmware/target/arm/usb-drv-pp502x.c
+++ b/firmware/target/arm/usb-drv-pp502x.c
@@ -361,10 +361,6 @@ void usb_drv_init(void)
REG_USBMODE = USBMODE_CTRL_MODE_DEVICE;
- /* Force device to full speed */
- /* See 32.9.5.9.2 */
- REG_PORTSC1 |= PORTSCX_PORT_FORCE_FULL_SPEED;
-
td_array = (struct transfer_descriptor*)UNCACHED_ADDR(&_td_array);
qh_array = (struct queue_head*)UNCACHED_ADDR(&_qh_array);
init_control_queue_heads();
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index 4ac515b..bc0c339 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -188,7 +188,9 @@ int usb_detect(void)
} else {
/* if USB is detected, re-enable the USB-devices, otherwise make sure it's disabled */
DEV_EN |= DEV_USB0;
+ DEV_RS &=~DEV_USB0;
DEV_EN |= DEV_USB1;
+ DEV_RS &=~DEV_USB1;
#if CONFIG_CPU == PP5020
DEV_INIT2 |= INIT_USB;
#endif