Changeset a5b3de6 in mainline for uspace/drv/bus/usb/vhc/transfer.c

Timestamp:

2017-10-25T11:55:15Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2b35478

Parents:

c3d926f

Message:

usbhost endpoint: removed target

The reasons for having usb_target_t inside endpoint have been dismissed. Enpoint is not a target of a transaction, so this was just misleading.

File:

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

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

@@ -38 +38 @@
 static bool is_set_address_transfer(vhc_transfer_t *transfer)
 {
-        if (transfer->batch->ep->target.endpoint != 0) {
+        if (transfer->batch->target.endpoint != 0) {
                 return false;
         }
@@ -81 +81 @@
                 if (dir == USB_DIRECTION_IN) {
                         rc = usbvirt_data_in(dev, batch->ep->transfer_type,
-                            batch->ep->target.endpoint,
+                            batch->ep->endpoint,
                             batch->buffer, batch->buffer_size,
                             actual_data_size);
@@ -87 +87 @@
                         assert(dir == USB_DIRECTION_OUT);
                         rc = usbvirt_data_out(dev, batch->ep->transfer_type,
-                            batch->ep->target.endpoint,
+                            batch->ep->endpoint,
                             batch->buffer, batch->buffer_size);
                 }
@@ -116 +116 @@
         } else {
                 if (dir == USB_DIRECTION_IN) {
-                        rc = usbvirt_ipc_send_data_in(sess, batch->ep->target.endpoint,
+                        rc = usbvirt_ipc_send_data_in(sess, batch->ep->endpoint,
                             batch->ep->transfer_type,
                             batch->buffer, batch->buffer_size,
@@ -122 +122 @@
                 } else {
                         assert(dir == USB_DIRECTION_OUT);
-                        rc = usbvirt_ipc_send_data_out(sess, batch->ep->target.endpoint,
+                        rc = usbvirt_ipc_send_data_out(sess, batch->ep->endpoint,
                             batch->ep->transfer_type,
                             batch->buffer, batch->buffer_size);
@@ -184 +184 @@
         list_foreach(vhc->devices, link, vhc_virtdev_t, dev) {
                 fibril_mutex_lock(&dev->guard);
-                if (dev->address == transfer->batch->ep->target.address) {
+                if (dev->address == transfer->batch->target.address) {
                         if (!targets) {
                                 list_append(&transfer->link, &dev->transfer_queue);