Changeset 19f0048 in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2018-02-01T02:13:34Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

17d34a8

Parents:

53fdf8c

Message:

xhci: reinitialize in case of HC error

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (3 diffs)

uspace/drv/bus/usb/xhci/rh.c

@@ -113 +113 @@
         xhci_sw_ring_init(&rh->event_ring, rh->max_ports);
 
-        joinable_fibril_start(rh->event_worker);
-
         return EOK;
 }
@@ -290 +288 @@
 }
 
-void xhci_rh_startup(xhci_rh_t *rh)
-{
+void xhci_rh_start(xhci_rh_t *rh)
+{
+        xhci_sw_ring_restart(&rh->event_ring);
+        joinable_fibril_start(rh->event_worker);
+
         /* The reset changed status of all ports, and SW originated reason does
          * not cause an interrupt.
@@ -311 +312 @@
 }
 
+/**
+ * Disconnect all devices on all ports. On contrary to ordinary disconnect, this
+ * function waits until the disconnection routine is over.
+ */
+void xhci_rh_stop(xhci_rh_t *rh)
+{
+        xhci_sw_ring_stop(&rh->event_ring);
+        joinable_fibril_join(rh->event_worker);
+
+        for (uint8_t i = 0; i < rh->max_ports; ++i) {
+                rh_port_t * const port = &rh->ports[i];
+                usb_port_disabled(&port->base, &rh_remove_device);
+                usb_port_fini(&port->base);
+        }
+}
+
 static int rh_worker(void *arg)
 {