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

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/uhci

Files:

• hc.c (modified) (2 diffs)
• main.c (modified) (2 diffs)

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

@@ -50 +50 @@
 #include <usb/usb.h>
 #include <usb/host/utils/malloc32.h>
+#include <usb/host/bandwidth.h>
 
 #include "uhci_batch.h"
@@ -320 +321 @@
 int hc_init_mem_structures(hc_t *instance)
 {
-        assert(instance);
+        int err;
+        assert(instance);
+
+        if ((err = usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11)))
+                return err;
 
         /* Init USB frame list page */

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

@@ -45 +45 @@
 #include <usb/debug.h>
 #include <usb/host/ddf_helpers.h>
-#include <usb/host/bandwidth.h>
 
 #include "hc.h"
@@ -82 +81 @@
 
         if ((err = hc_init(instance, res)) != EOK)
-                goto err;
-
-        if ((err = usb2_bus_init(&instance->bus, hcd, BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11)))
                 goto err;