Changeset 56db65d in mainline for uspace/drv/bus/usb/xhci/rh.c

Timestamp:

2017-10-24T11:06:32Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

0206d35

Parents:

894f58c

Message:

usbhost: provide usb_endpoint_desc_t to bus when registering endpoint

This finishes the path of arbitrary information fetched from device all the way down to registering the endpoint in the bus.

File:

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

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

@@ -90 +90 @@
 }
 
+/* FIXME Are these really static? Older HCs fetch it from descriptor. */
+/* FIXME Add USB3 options, if applicable. */
+static const usb_endpoint_desc_t ep0_desc = {
+        .endpoint_no = 0,
+        .direction = USB_DIRECTION_BOTH,
+        .transfer_type = USB_TRANSFER_CONTROL,
+        .max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE,
+        .packets = 1,
+};
+
 // TODO: This currently assumes the device is attached to rh directly.
 //       Also, we should consider moving a lot of functionailty to xhci bus
@@ -112 +122 @@
 
         xhci_endpoint_t *ep0 = xhci_endpoint_get(ep0_base);
-        /* FIXME: Sync this with xhci_device_add_endpoint. */
-        ep0->max_streams = 0;
-        ep0->max_burst = 0;
-        ep0->mult = 0;
 
         if ((err = xhci_endpoint_alloc_transfer_ds(ep0)))
@@ -144 +150 @@
         fibril_mutex_unlock(&dev->guard);
 
-        // XXX: Going around bus, duplicating code
         ep0_base->device = dev;
-        ep0_base->target.address = dev->address;
-        ep0_base->target.endpoint = 0;
-        ep0_base->direction = USB_DIRECTION_BOTH;
-        ep0_base->transfer_type = USB_TRANSFER_CONTROL;
-        ep0_base->max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE;
-        ep0_base->packets = 1;
-        ep0_base->bandwidth = CTRL_PIPE_MIN_PACKET_SIZE;
-
-        bus_register_endpoint(&rh->hc->bus.base, ep0_base);
+
+        bus_register_endpoint(&rh->hc->bus.base, ep0_base, &ep0_desc);
 
         if (!rh->devices[dev->port - 1]) {