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

Timestamp:

2017-10-12T16:06:37Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

f9d787c

Parents:

d0db4a0

Message:

WIP usbhost refactoring: uhci converted

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (1 diff)
• hc.h (modified) (2 diffs)
• main.c (modified) (5 diffs)
• uhci_batch.c (modified) (2 diffs)
• uhci_rh.c (modified) (1 diff)

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

@@ -442 +442 @@
         assert(batch);
 
-        if (batch->ep->address == uhci_rh_get_address(&instance->rh))
+        if (batch->ep->target.address == uhci_rh_get_address(&instance->rh))
                 return uhci_rh_schedule(&instance->rh, batch);
 

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

@@ -43 +43 @@
 #include <ddi.h>
 #include <usb/host/hcd.h>
+#include <usb/host/usb2_bus.h>
 #include <usb/host/usb_transfer_batch.h>
 
@@ -100 +101 @@
 typedef struct hc {
         uhci_rh_t rh;
+        usb2_bus_t bus;
         /** Addresses of I/O registers */
         uhci_regs_t *registers;

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"
@@ -57 +58 @@
 static const ddf_hc_driver_t uhci_hc_driver = {
         .claim = disable_legacy,
-        .hc_speed = USB_SPEED_FULL,
         .irq_code_gen = uhci_hc_gen_irq_code,
         .init = uhci_driver_init,
@@ -72 +72 @@
 static int uhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res)
 {
+        int err;
+
         assert(hcd);
         assert(hcd_get_driver_data(hcd) == NULL);
@@ -79 +81 @@
                 return ENOMEM;
 
-        const int ret = hc_init(instance, res);
-        if (ret == EOK) {
-                hcd_set_implementation(hcd, instance, &uhci_hc_driver.ops);
-        } else {
-                free(instance);
-        }
-        return ret;
+        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;
+
+        hcd_set_implementation(hcd, instance, &uhci_hc_driver.ops, &instance->bus.base);
+
+        return EOK;
+
+err:
+        free(instance);
+        return err;
 }
 
@@ -105 +113 @@
                 hc_fini(hc);
 
-        hcd_set_implementation(hcd, NULL, NULL);
+        hcd_set_implementation(hcd, NULL, NULL, NULL);
         free(hc);
 }

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

@@ -228 +228 @@
             uhci_batch->usb_batch->ep->speed == USB_SPEED_LOW;
         const size_t mps = uhci_batch->usb_batch->ep->max_packet_size;
-        const usb_target_t target = {{
-            uhci_batch->usb_batch->ep->address,
-            uhci_batch->usb_batch->ep->endpoint }};
+        const usb_target_t target = uhci_batch->usb_batch->ep->target;
 
         int toggle = endpoint_toggle_get(uhci_batch->usb_batch->ep);
@@ -293 +291 @@
             uhci_batch->usb_batch->ep->speed == USB_SPEED_LOW;
         const size_t mps = uhci_batch->usb_batch->ep->max_packet_size;
-        const usb_target_t target = {{
-            uhci_batch->usb_batch->ep->address,
-            uhci_batch->usb_batch->ep->endpoint }};
+        const usb_target_t target = uhci_batch->usb_batch->ep->target;
 
         /* setup stage */

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

@@ -103 +103 @@
         assert(batch);
 
-        const usb_target_t target = {{
-                .address = batch->ep->address,
-                .endpoint = batch->ep->endpoint
-        }};
+        const usb_target_t target = batch->ep->target;
         do {
                 batch->error = virthub_base_request(&instance->base, target,