Changeset e6b9182 in mainline for uspace/drv/bus/usb/xhci

Timestamp:

2017-10-13T08:49:29Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

741bcdeb

Parents:

0a5833d7

Message:

WIP usbhost refactoring: ohci completed

Along with that we noticed hcd_t in bus_t is superfluous and it complicates initialization (and breaks isolation), so we removed it. Also, type of the toggle has changed to bool in the functions.

Location:

uspace/drv/bus/usb/xhci

Files:

• bus.c (modified) (2 diffs)
• bus.h (modified) (1 diff)
• hc.c (modified) (2 diffs)
• main.c (modified) (2 diffs)

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

@@ -171 +171 @@
 
 /* Endpoint ops, optional (have generic fallback) */
-static int endpoint_get_toggle(endpoint_t *ep)
-{
-        // TODO: Implement me!
-        return ENOTSUP;
-}
-
-static void endpoint_set_toggle(endpoint_t *ep, unsigned toggle)
+static bool endpoint_get_toggle(endpoint_t *ep)
+{
+        // TODO: Implement me!
+        return ENOTSUP;
+}
+
+static void endpoint_set_toggle(endpoint_t *ep, bool toggle)
 {
         // TODO: Implement me!
@@ -227 +227 @@
 };
 
-int xhci_bus_init(xhci_bus_t *bus, hcd_t *hcd)
-{
-        assert(bus);
-
-        bus_init(&bus->base, hcd);
+int xhci_bus_init(xhci_bus_t *bus)
+{
+        assert(bus);
+
+        bus_init(&bus->base);
 
         if (!hash_table_create(&bus->endpoints, 0, 0, &endpoint_ht_ops)) {

uspace/drv/bus/usb/xhci/bus.h

@@ -52 +52 @@
          */
 
-        hash_table_t endpoints;
+        hash_table_t endpoints;
 } xhci_bus_t;
 
-int xhci_bus_init(xhci_bus_t *, hcd_t *);
+int xhci_bus_init(xhci_bus_t *);
 void xhci_bus_fini(xhci_bus_t *);
 

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

@@ -216 +216 @@
                 goto err_cmd;
 
-        return EOK;
-
+        if ((err = xhci_bus_init(&hc->bus)))
+                goto err_rh;
+
+
+        return EOK;
+
+err_rh:
+        xhci_rh_fini(&hc->rh);
 err_cmd:
         xhci_fini_commands(hc);
@@ -610 +616 @@
 void hc_fini(xhci_hc_t *hc)
 {
+        xhci_bus_fini(&hc->bus);
         xhci_trb_ring_fini(&hc->command_ring);
         xhci_event_ring_fini(&hc->event_ring);

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

@@ -81 +81 @@
                 goto err;
 
-        if ((err = xhci_bus_init(&hc->bus, hcd)))
-                goto err;
-
         if ((err = hc_init_memory(hc)))
                 goto err;
@@ -151 +148 @@
         hc_fini(hc);
 
-        // FIXME: Probably move init/fini of XHCI bus into HC.
-        xhci_bus_fini(&hc->bus);
-
         free(hc);
 }