len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-14 23:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix usb detection for usb stack

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14621 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Christian Gmeiner 2007-09-05 15:52:49 +00:00
parent bc35acffd9
commit 1a8f7c51b3
1 changed files with 40 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

88
firmware/target/arm/usb-fw-pp502x.c
View file

@ -35,49 +35,49 @@
void usb_init_device(void) void usb_init_device(void)
{ {
int r0; int r0;
outl(inl(0x70000084) | 0x200, 0x70000084); outl(inl(0x70000084) | 0x200, 0x70000084);
outl(inl(0x7000002C) | 0x3000000, 0x7000002C); outl(inl(0x7000002C) | 0x3000000, 0x7000002C);
DEV_EN |= DEV_USB; DEV_EN |= DEV_USB;
DEV_RS |= DEV_USB; /* reset usb start */ DEV_RS |= DEV_USB; /* reset usb start */
DEV_RS &=~DEV_USB;/* reset usb end */ DEV_RS &=~DEV_USB;/* reset usb end */
DEV_INIT |= INIT_USB; DEV_INIT |= INIT_USB;
while ((inl(0x70000028) & 0x80) == 0); while ((inl(0x70000028) & 0x80) == 0);
UDC_PORTSC1 |= PORTSCX_PORT_RESET; UDC_PORTSC1 |= PORTSCX_PORT_RESET;
while ((UDC_PORTSC1 & PORTSCX_PORT_RESET) != 0); while ((UDC_PORTSC1 & PORTSCX_PORT_RESET) != 0);
UDC_OTGSC |= 0x5F000000; UDC_OTGSC |= 0x5F000000;
if( (UDC_OTGSC & 0x100) == 0) { if( (UDC_OTGSC & 0x100) == 0) {
UDC_USBMODE &=~ USB_MODE_CTRL_MODE_HOST; UDC_USBMODE &=~ USB_MODE_CTRL_MODE_HOST;
UDC_USBMODE |= USB_MODE_CTRL_MODE_DEVICE; UDC_USBMODE |= USB_MODE_CTRL_MODE_DEVICE;
outl(inl(0x70000028) | 0x4000, 0x70000028); outl(inl(0x70000028) | 0x4000, 0x70000028);
outl(inl(0x70000028) | 0x2, 0x70000028); outl(inl(0x70000028) | 0x2, 0x70000028);
} else { } else {
UDC_USBMODE |= USB_MODE_CTRL_MODE_DEVICE; UDC_USBMODE |= USB_MODE_CTRL_MODE_DEVICE;
outl(inl(0x70000028) &~0x4000, 0x70000028); outl(inl(0x70000028) &~0x4000, 0x70000028);
outl(inl(0x70000028) | 0x2, 0x70000028); outl(inl(0x70000028) | 0x2, 0x70000028);
} }
UDC_USBCMD |= USB_CMD_CTRL_RESET; UDC_USBCMD |= USB_CMD_CTRL_RESET;
while((UDC_USBCMD & USB_CMD_CTRL_RESET) != 0); while((UDC_USBCMD & USB_CMD_CTRL_RESET) != 0);
r0 = UDC_PORTSC1; r0 = UDC_PORTSC1;
/* Note from IPL source (referring to next 5 lines of code: /* Note from IPL source (referring to next 5 lines of code:
THIS NEEDS TO BE CHANGED ONCE THERE IS KERNEL USB */ THIS NEEDS TO BE CHANGED ONCE THERE IS KERNEL USB */
DEV_INIT |= INIT_USB; DEV_INIT |= INIT_USB;
DEV_EN |= DEV_USB; DEV_EN |= DEV_USB;
while ((inl(0x70000028) & 0x80) == 0); while ((inl(0x70000028) & 0x80) == 0);
outl(inl(0x70000028) | 0x2, 0x70000028); outl(inl(0x70000028) | 0x2, 0x70000028);
udelay(0x186A0);
#ifndef HAVE_USBSTACK udelay(0x186A0);
#ifndef HAVE_USBSTACK
dr_controller_setup(); dr_controller_setup();
#endif #endif
@ -93,7 +93,7 @@ void usb_enable(bool on)
{ {
#ifdef HAVE_USBSTACK #ifdef HAVE_USBSTACK
(void)on; (void)on;
#else #else
/* This device specific code will eventually give way to proper USB /* This device specific code will eventually give way to proper USB
handling, which should be the same for all PP502x targets. */ handling, which should be the same for all PP502x targets. */
if (on) if (on)
@ -149,14 +149,8 @@ int usb_detect(void)
status = usbstatus2 ? USB_INSERTED : USB_POWERED; status = usbstatus2 ? USB_INSERTED : USB_POWERED;
#ifndef HAVE_USBSTACK #ifndef HAVE_USBSTACK
dr_controller_stop(); dr_controller_stop();
#endif #else
usb_stack_stop();
#ifdef HAVE_USBSTACK
/* TODO: Move this call - it shouldn't be done in this function */
if (status == USB_INSERTED)
{
usb_stack_start();
}
#endif #endif
} }
return status; return status;
@ -186,10 +180,6 @@ int usb_detect(void)
if (!usbstatus1) if (!usbstatus1)
{ /* We have just been disconnected */ { /* We have just been disconnected */
status = USB_EXTRACTED; status = USB_EXTRACTED;
#ifdef HAVE_USBSTACK
/* TODO: Move this call - it shouldn't be done in this function */
usb_stack_stop();
#endif
return status; return status;
} }
@ -208,8 +198,10 @@ int usb_detect(void)
/* Run the USB controller for long enough to detect if we're connected /* Run the USB controller for long enough to detect if we're connected
to a computer, then stop it again. */ to a computer, then stop it again. */
#ifndef HAVE_USBSTACK #ifndef HAVE_USBSTACK
dr_controller_run(); dr_controller_run();
#else
usb_stack_start();
#endif #endif
/* Wait for 50 ticks (500ms) before deciding there is no computer /* Wait for 50 ticks (500ms) before deciding there is no computer