Changeset 5fd9c30 in mainline for uspace/drv/bus/usb/ehci/ehci_rh.c

Timestamp:

2017-10-21T20:52:56Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

766043c

Parents:

74b852b

Message:

usbhost refactoring: let transfer_batch be initialized by bus

Currently makes older HCs fail, work in progress.

File:

• uspace/drv/bus/usb/ehci/ehci_rh.c (modified) (3 diffs)

uspace/drv/bus/usb/ehci/ehci_rh.c

@@ -146 +146 @@
         const usb_target_t target = batch->ep->target;
         batch->error = virthub_base_request(&instance->base, target,
-            usb_transfer_batch_direction(batch), (void*)batch->setup_buffer,
+            batch->dir, (void*) batch->setup.buffer,
             batch->buffer, batch->buffer_size, &batch->transfered_size);
         if (batch->error == ENAK) {
@@ -157 +157 @@
                 instance->unfinished_interrupt_transfer = batch;
         } else {
-                usb_transfer_batch_finish(batch, NULL);
-                usb_transfer_batch_destroy(batch);
                 usb_log_debug("RH(%p): BATCH(%p) virtual request complete: %s",
                     instance, batch, str_error(batch->error));
+                usb_transfer_batch_finish(batch);
         }
         return EOK;
@@ -182 +181 @@
                 const usb_target_t target = batch->ep->target;
                 batch->error = virthub_base_request(&instance->base, target,
-                    usb_transfer_batch_direction(batch),
-                    (void*)batch->setup_buffer,
+                    batch->dir, (void*) batch->setup.buffer,
                     batch->buffer, batch->buffer_size, &batch->transfered_size);
-                usb_transfer_batch_finish(batch, NULL);
-                usb_transfer_batch_destroy(batch);
+                usb_transfer_batch_finish(batch);
         }
         return EOK;