Changeset 41924f30 in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-12T14:07:27Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

a5976973

Parents:

7e74911

Message:

WIP usbhost refactoring

This commit replaces callbacks with more systematic virtual-like inheritance-like solution. Currently breaks build of HelenOS, but both xhci and usbhost are buildable. More refactoring follows…

File:

• uspace/drv/bus/usb/xhci/rh.c (modified) (2 diffs)

uspace/drv/bus/usb/xhci/rh.c

@@ -266 +266 @@
         assert(rh);
         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(&rh->base, target,
             usb_transfer_batch_direction(batch), (void*)batch->setup_buffer,
@@ -294 +291 @@
         rh->unfinished_interrupt_transfer = NULL;
         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(&rh->base, target,
                     usb_transfer_batch_direction(batch),