Changes in uspace/drv/bus/usb/ehci/ehci_rh.c [8d2dd7f2:5fd9c30] 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 = {{
-                .address = batch->ep->address,
-                .endpoint = batch->ep->endpoint,
-        }};
+        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) {
@@ -160 +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;
@@ -183 +179 @@
             instance, batch);
         if (batch) {
-                const usb_target_t target = {{
-                        .address = batch->ep->address,
-                        .endpoint = batch->ep->endpoint,
-                }};
+                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;