Changes in uspace/drv/bus/usb/vhc/transfer.c [58563585:a5b3de6] in mainline

File:

• uspace/drv/bus/usb/vhc/transfer.c (modified) (11 diffs)

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->target.endpoint != 0) {
                 return false;
         }
@@ -43 +44 @@
                 return false;
         }
-        if (usb_transfer_batch_direction(transfer->batch) != USB_DIRECTION_OUT) {
-                return false;
-        }
-        const usb_device_request_setup_packet_t *setup =
-            (void*)transfer->batch->setup_buffer;
+        if (transfer->batch->dir != USB_DIRECTION_OUT) {
+                return false;
+        }
+        const usb_device_request_setup_packet_t *setup
+                = &transfer->batch->setup.packet;
         if (setup->request_type != 0) {
                 return false;
@@ -62 +63 @@
 {
         int rc;
-        
-        const usb_direction_t dir = usb_transfer_batch_direction(batch);
+
+        const usb_direction_t dir = batch->dir;
 
         if (batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
                 if (dir == USB_DIRECTION_IN) {
                         rc = usbvirt_control_read(dev,
-                            batch->setup_buffer, batch->setup_size,
+                            batch->setup.buffer, USB_SETUP_PACKET_SIZE,
                             batch->buffer, batch->buffer_size,
                             actual_data_size);
@@ -74 +75 @@
                         assert(dir == USB_DIRECTION_OUT);
                         rc = usbvirt_control_write(dev,
-                            batch->setup_buffer, batch->setup_size,
+                            batch->setup.buffer, USB_SETUP_PACKET_SIZE,
                             batch->buffer, batch->buffer_size);
                 }
@@ -99 +100 @@
         int rc;
 
-        const usb_direction_t dir = usb_transfer_batch_direction(batch);
+        const usb_direction_t dir = batch->dir;
 
         if (batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
                 if (dir == USB_DIRECTION_IN) {
                         rc = usbvirt_ipc_send_control_read(sess,
-                            batch->setup_buffer, batch->setup_size,
+                            batch->setup.buffer, USB_SETUP_PACKET_SIZE,
                             batch->buffer, batch->buffer_size,
                             actual_data_size);
@@ -110 +111 @@
                         assert(dir == USB_DIRECTION_OUT);
                         rc = usbvirt_ipc_send_control_write(sess,
-                            batch->setup_buffer, batch->setup_size,
+                            batch->setup.buffer, USB_SETUP_PACKET_SIZE,
                             batch->buffer, batch->buffer_size);
                 }
@@ -148 +149 @@
         assert(transfer);
         assert(transfer->batch);
-        usb_transfer_batch_finish_error(transfer->batch, NULL,
-            data_transfer_size, outcome);
-        usb_transfer_batch_destroy(transfer->batch);
+        transfer->batch->error = outcome;
+        transfer->batch->transfered_size = data_transfer_size;
+        usb_transfer_batch_finish(transfer->batch);
         free(transfer);
 }
@@ -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->target.address) {
                         if (!targets) {
                                 list_append(&transfer->link, &dev->transfer_queue);
@@ -234 +236 @@
                         if (is_set_address_transfer(transfer)) {
                                 usb_device_request_setup_packet_t *setup =
-                                    (void*) transfer->batch->setup_buffer;
+                                    (void*) transfer->batch->setup.buffer;
                                 dev->address = setup->value;
                                 usb_log_debug2("Address changed to %d\n",