Changeset c0e4b5b2 in mainline

Timestamp:

2017-10-13T09:38:32Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

5995383c

Parents:

741bcdeb

Message:

usbhost refactoring: vhc

Now, please, review.

Location:

uspace/drv/bus/usb/vhc

Files:

• main.c (modified) (2 diffs)
• transfer.c (modified) (8 diffs)
• vhcd.h (modified) (2 diffs)

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

@@ -89 +89 @@
 
         /* Initialize generic structures */
-        ret = hcd_ddf_setup_hc(dev, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
+        ret = hcd_ddf_setup_hc(dev);
         if (ret != EOK) {
                 usb_log_error("Failed to init HCD structures: %s.\n",
@@ -98 +97 @@
         }
 
-        hcd_set_implementation(dev_to_hcd(dev), data, &vhc_hc_ops);
+        hcd_set_implementation(dev_to_hcd(dev), data, &vhc_hc_ops, &data->bus.base);
 
         /* Add virtual hub device */

uspace/drv/bus/usb/vhc/transfer.c

@@ -31 +31 @@
 #include <usb/debug.h>
 #include <usbvirt/device.h>
+#include <usb/host/bandwidth.h>
 #include <usbvirt/ipc.h>
 #include "vhcd.h"
@@ -37 +38 @@
 static bool is_set_address_transfer(vhc_transfer_t *transfer)
 {
-        if (transfer->batch->ep->endpoint != 0) {
+        if (transfer->batch->ep->target.endpoint != 0) {
                 return false;
         }
@@ -80 +81 @@
                 if (dir == USB_DIRECTION_IN) {
                         rc = usbvirt_data_in(dev, batch->ep->transfer_type,
-                            batch->ep->endpoint,
+                            batch->ep->target.endpoint,
                             batch->buffer, batch->buffer_size,
                             actual_data_size);
@@ -86 +87 @@
                         assert(dir == USB_DIRECTION_OUT);
                         rc = usbvirt_data_out(dev, batch->ep->transfer_type,
-                            batch->ep->endpoint,
+                            batch->ep->target.endpoint,
                             batch->buffer, batch->buffer_size);
                 }
@@ -115 +116 @@
         } else {
                 if (dir == USB_DIRECTION_IN) {
-                        rc = usbvirt_ipc_send_data_in(sess, batch->ep->endpoint,
+                        rc = usbvirt_ipc_send_data_in(sess, batch->ep->target.endpoint,
                             batch->ep->transfer_type,
                             batch->buffer, batch->buffer_size,
@@ -121 +122 @@
                 } else {
                         assert(dir == USB_DIRECTION_OUT);
-                        rc = usbvirt_ipc_send_data_out(sess, batch->ep->endpoint,
+                        rc = usbvirt_ipc_send_data_out(sess, batch->ep->target.endpoint,
                             batch->ep->transfer_type,
                             batch->buffer, batch->buffer_size);
@@ -159 +160 @@
         list_initialize(&instance->devices);
         fibril_mutex_initialize(&instance->guard);
+        usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
         instance->magic = 0xDEADBEEF;
         return virthub_init(&instance->hub, "root hub");
@@ -182 +184 @@
         list_foreach(vhc->devices, link, vhc_virtdev_t, dev) {
                 fibril_mutex_lock(&dev->guard);
-                if (dev->address == transfer->batch->ep->address) {
+                if (dev->address == transfer->batch->ep->target.address) {
                         if (!targets) {
                                 list_append(&transfer->link, &dev->transfer_queue);

uspace/drv/bus/usb/vhc/vhcd.h

@@ -42 +42 @@
 
 #include <usb/host/hcd.h>
+#include <usb/host/usb2_bus.h>
 
 #define NAME "vhc"
@@ -60 +61 @@
         fibril_mutex_t guard;
         usbvirt_device_t hub;
+        usb2_bus_t bus;
 } vhc_data_t;