Changeset 9efad54 in mainline for uspace/lib/usbhost/src/usb2_bus.c

Timestamp:

2018-01-06T21:15:48Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

56257ba

Parents:

c901632

Message:

usb: move endpoint descriptor parsing to HC

This better separates responsibilities. Now the device driver does not
care about the contents of an endpoint descriptor, and HC can parse the
values according to device's actual speed.

Currently, it is device driver's responsibility to fetch endpoint
descriptors, map them and register pipes - sending the endpoint
descriptor back to HC. HC then parses it, and fills the pipe
description, which then sends back to device driver. We shall probably
fetch the endpoint descriptor from inside the HC (also fixing the USB
spec violation of communication with EP0).

File:

• uspace/lib/usbhost/src/usb2_bus.c (modified) (5 diffs)

uspace/lib/usbhost/src/usb2_bus.c

@@ -186 +186 @@
 }
 
-static const usb_endpoint_desc_t usb2_default_control_ep = {
-        .endpoint_no = 0,
-        .transfer_type = USB_TRANSFER_CONTROL,
-        .direction = USB_DIRECTION_BOTH,
-        .max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE,
-        .packets = 1,
-};
-
-
 static const usb_target_t usb2_default_target = {{
         .address = USB_ADDRESS_DEFAULT,
@@ -221 +212 @@
         usb_log_debug("Device(%d): Adding default target (0:0)", address);
 
+        usb_endpoint_descriptors_t ep0_desc = {
+            .endpoint.max_packet_size = CTRL_PIPE_MIN_PACKET_SIZE,
+        };
         endpoint_t *default_ep;
-        err = bus_endpoint_add(dev, &usb2_default_control_ep, &default_ep);
+        err = bus_endpoint_add(dev, &ep0_desc, &default_ep);
         if (err != EOK) {
                 usb_log_error("Device(%d): Failed to add default target: %s.",
@@ -229 +223 @@
         }
 
-        uint16_t max_packet_size;
-        if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, &bus->base, dev)))
+        if ((err = hcd_get_ep0_max_packet_size(&ep0_desc.endpoint.max_packet_size, &bus->base, dev)))
                 goto err_address;
 
@@ -254 +247 @@
         dev->address = address;
 
-        const usb_endpoint_desc_t control_ep = {
-                .endpoint_no = 0,
-                .transfer_type = USB_TRANSFER_CONTROL,
-                .direction = USB_DIRECTION_BOTH,
-                .max_packet_size = max_packet_size,
-                .packets = 1,
-        };
-
         /* Register EP on the new address */
         usb_log_debug("Device(%d): Registering control EP.", address);
-        err = bus_endpoint_add(dev, &control_ep, NULL);
+        err = bus_endpoint_add(dev, &ep0_desc, NULL);
         if (err != EOK) {
                 usb_log_error("Device(%d): Failed to register EP0: %s",
@@ -352 +337 @@
 }
 
-static endpoint_t *usb2_bus_create_ep(device_t *dev, const usb_endpoint_desc_t *desc)
+static endpoint_t *usb2_bus_create_ep(device_t *dev, const usb_endpoint_descriptors_t *desc)
 {
         endpoint_t *ep = malloc(sizeof(endpoint_t));