summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2007-08-27 18:21:05 +0000
committerDave Chapman <dave@dchapman.com>2007-08-27 18:21:05 +0000
commit9551ae92a5d1e44825e435a0b2cfce1b5d7bfa34 (patch)
tree9795d2276bb813af4fdb1689b7a5eaf6fe93a1b6 /firmware/drivers
parent3075e3bafd63480c5ca1476c1150e5da7c77a756 (diff)
Repair the USB detection on ipods and H10s which was broken by commit 14470. The intention is that when the experimental HAVE_USBSTACK is not defined, the old (pre-14470) code is run.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14481 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/usb/arcotg_udc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/firmware/drivers/usb/arcotg_udc.c b/firmware/drivers/usb/arcotg_udc.c
index d39dbc39df..c4ae6f8d64 100644
--- a/firmware/drivers/usb/arcotg_udc.c
+++ b/firmware/drivers/usb/arcotg_udc.c
@@ -33,6 +33,7 @@
****************************************************************************/
#include "arcotg_udc.h"
#include "logf.h"
+#include "errno.h"
static int timeout;
@@ -52,7 +53,7 @@ int dr_controller_setup(void)
#endif
/* Stop and reset the usb controller */
- UDC_USBCMD &= ~USB_CMD_RUN_STOP;
+ UDC_USBCMD &= ~USB_CMD_RUN;
UDC_USBCMD |= USB_CMD_CTRL_RESET;
@@ -102,7 +103,7 @@ void dr_controller_run(void)
UDC_USBMODE |= USB_MODE_CTRL_MODE_DEVICE;
/* Set controller to Run */
- UDC_USBCMD |= USB_CMD_RUN_STOP;
+ UDC_USBCMD |= USB_CMD_RUN;
return;
}
@@ -131,5 +132,5 @@ void dr_controller_stop(void)
udc->stopped = 1;
#endif
/* Set controller to Stop */
- UDC_USBCMD &= ~USB_CMD_RUN_STOP;
+ UDC_USBCMD &= ~USB_CMD_RUN;
}