aboutsummaryrefslogtreecommitdiffstats
path: root/src/usb-uhci.c
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2009-10-17 23:53:32 -0400
committerKevin O'Connor <kevin@koconnor.net>2009-10-17 23:53:32 -0400
commit1c46a548f26cd28d478ae793e42bc1a82a977939 (patch)
tree04d3a295f4773e5169ea44a4e34329823bd95383 /src/usb-uhci.c
parent2f442fd566d683253cf23560867a34243c185550 (diff)
downloadseabios-1c46a548f26cd28d478ae793e42bc1a82a977939.tar.gz
Expand USB OHCI support.
Get UHCI support to point where it works with (a modified) qemu.
Diffstat (limited to 'src/usb-uhci.c')
-rw-r--r--src/usb-uhci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/usb-uhci.c b/src/usb-uhci.c
index 4d3df452..5829069c 100644
--- a/src/usb-uhci.c
+++ b/src/usb-uhci.c
@@ -12,7 +12,6 @@
#include "pci_regs.h" // PCI_BASE_ADDRESS_4
#include "usb.h" // struct usb_s
#include "farptr.h" // GET_FLATPTR
-#include "biosvar.h" // GET_GLOBAL
static void
reset_uhci(struct usb_s *cntl)
@@ -98,7 +97,7 @@ check_ports(struct usb_s *cntl)
outw(USBPORTSC_PR, cntl->uhci.iobase + USBPORTSC1);
if (port2 & USBPORTSC_CCS)
outw(USBPORTSC_PR, cntl->uhci.iobase + USBPORTSC2);
- mdelay(10);
+ mdelay(50);
outw(0, cntl->uhci.iobase + USBPORTSC1);
outw(0, cntl->uhci.iobase + USBPORTSC2);
mdelay(10);
@@ -174,7 +173,7 @@ uhci_control(u32 endp, int dir, const void *cmd, int cmdsize
, void *data, int datasize)
{
if (! CONFIG_USB_UHCI)
- return 0;
+ return -1;
dprintf(5, "uhci_control %x\n", endp);
struct usb_s *cntl = endp2cntl(endp);