uhci: Repeatedly poll for device detect for 100ms.

According to the USB2 specification, a device may take up to 100ms
(USB_TIME_SIGATT) after port power stabilizes to be detected.  So,
continually recheck for a device connection event.

Technically, the uhci root hub ports are always powered up, but it's
not possible to know how long the machine has been on, so it's better
to be safe here.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/hw/usb-uhci.c b/src/hw/usb-uhci.c
index 9d7ef6aa33600325cecbb12ac497dbe4c7c750b8..406af908baf2ec34db0927c064ed2d0d5452f8f6 100644 (file)
--- a/src/hw/usb-uhci.c
+++ b/src/hw/usb-uhci.c
@@ -44,10 +44,17 @@ uhci_hub_detect(struct usbhub_s *hub, u32 port)
     struct usb_uhci_s *cntl = container_of(hub->cntl, struct usb_uhci_s, usb);
     u16 ioport = cntl->iobase + USBPORTSC1 + port * 2;
 
-    u16 status = inw(ioport);
-    if (!(status & USBPORTSC_CCS))
-        // No device
-        return -1;
+    u32 end = timer_calc(USB_TIME_SIGATT);
+    for (;;) {
+        u16 status = inw(ioport);
+        if (status & USBPORTSC_CCS)
+            // Device connected.
+            break;
+        if (timer_check(end))
+            // No device found.
+            return -1;
+        msleep(5);
+    }
 
     // XXX - if just powered up, need to wait for USB_TIME_ATTDB?