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

Timestamp:

2017-10-24T11:06:32Z (8 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/bus.c (modified) (1 diff)

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

@@ -165 +165 @@
 }
 
-static int register_endpoint(bus_t *bus_base, endpoint_t *ep)
+static int register_endpoint(bus_t *bus_base, endpoint_t *ep, const usb_endpoint_desc_t *desc)
 {
         xhci_bus_t *bus = bus_to_xhci_bus(bus_base);
         assert(bus);
 
-        usb_log_info("Endpoint(%d:%d) registered to XHCI bus.", ep->target.address, ep->target.endpoint);
+        assert(ep->device);
+
+        /* Extract USB2-related information from endpoint_desc */
+        ep->target = (usb_target_t) {{
+                .address = ep->device->address,
+                .endpoint = desc->endpoint_no,
+        }};
+        ep->direction = desc->direction;
+        ep->transfer_type = desc->transfer_type;
+        ep->max_packet_size = desc->max_packet_size;
+        ep->packets = desc->packets;
 
         xhci_device_t *xhci_dev = xhci_device_get(ep->device);
         xhci_endpoint_t *xhci_ep = xhci_endpoint_get(ep);
+
+        xhci_ep->max_streams = desc->usb3.max_streams;
+        xhci_ep->max_burst = desc->usb3.max_burst;
+        // TODO add this property to usb_endpoint_desc_t and fetch it from ss companion desc
+        xhci_ep->mult = 0;
+
+        usb_log_info("Endpoint(%d:%d) registered to XHCI bus.", ep->target.address, ep->target.endpoint);
         return xhci_device_add_endpoint(xhci_dev, xhci_ep);
 }