diff options
| author | Dave Chapman <dave@dchapman.com> | 2007-02-17 01:32:39 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2007-02-17 01:32:39 +0000 |
| commit | 139fb1af20621e233f8f33cd1d984cb79231b7d4 (patch) | |
| tree | bcb781747c6e1984cd5d637b3d064ca236218c44 | |
| parent | 620c62e262170063adccc57a58d4edd6b637f4bf (diff) | |
| download | rockbox-139fb1af20621e233f8f33cd1d984cb79231b7d4.zip rockbox-139fb1af20621e233f8f33cd1d984cb79231b7d4.tar.gz rockbox-139fb1af20621e233f8f33cd1d984cb79231b7d4.tar.bz2 rockbox-139fb1af20621e233f8f33cd1d984cb79231b7d4.tar.xz | |
Move dr_controller_setup() to usb_init_device() and add a call to dr_controller_stop() if we detect USB disconnection. This seems to improve reliability when connecting to Mac OS X - Rockbox previously killed its USB stack since the introduction of the new USB detection code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12342 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/usb-pp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/firmware/target/arm/usb-pp.c b/firmware/target/arm/usb-pp.c index 042fb5b..d69c6e6 100644 --- a/firmware/target/arm/usb-pp.c +++ b/firmware/target/arm/usb-pp.c @@ -85,6 +85,9 @@ void usb_init_device(void) outl(inl(0x70000028) | 0x2, 0x70000028); udelay(0x186A0); + + + dr_controller_setup(); } void usb_enable(bool on) @@ -138,9 +141,11 @@ bool usb_detect(void) usbstatus1 = (UDC_OTGSC & 0x800) ? true : false; if ((usbstatus1 == true) && (prev_usbstatus1 == false)) { - dr_controller_setup(); dr_controller_run(); + } else if ((usbstatus1 == false) && (prev_usbstatus1 == true)) { + dr_controller_stop(); } + prev_usbstatus1 = usbstatus1; usbstatus2 = (UDC_PORTSC1 & PORTSCX_CURRENT_CONNECT_STATUS) ? true : false; |