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

1 files changed, 6 insertions, 1 deletions

diff --git a/firmware/target/arm/usb-pp.c b/firmware/target/arm/usb-pp.c
index 042fb5bda5..d69c6e6c9c 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;