Changes in uspace/drv/bus/usb/ehci/ehci_rh.c [5fd9c30:8d2dd7f2] in mainline

File:

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

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

@@ -144 +144 @@
         assert(instance);
         assert(batch);
-        const usb_target_t target = batch->ep->target;
+        const usb_target_t target = {{
+                .address = batch->ep->address,
+                .endpoint = batch->ep->endpoint,
+        }};
         batch->error = virthub_base_request(&instance->base, target,
-            batch->dir, (void*) batch->setup.buffer,
+            usb_transfer_batch_direction(batch), (void*)batch->setup_buffer,
             batch->buffer, batch->buffer_size, &batch->transfered_size);
         if (batch->error == ENAK) {
@@ -157 +160 @@
                 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;
@@ -179 +183 @@
             instance, batch);
         if (batch) {
-                const usb_target_t target = batch->ep->target;
+                const usb_target_t target = {{
+                        .address = batch->ep->address,
+                        .endpoint = batch->ep->endpoint,
+                }};
                 batch->error = virthub_base_request(&instance->base, target,
-                    batch->dir, (void*) batch->setup.buffer,
+                    usb_transfer_batch_direction(batch),
+                    (void*)batch->setup_buffer,
                     batch->buffer, batch->buffer_size, &batch->transfered_size);
-                usb_transfer_batch_finish(batch);
+                usb_transfer_batch_finish(batch, NULL);
+                usb_transfer_batch_destroy(batch);
         }
         return EOK;