Changeset 9efad54 in mainline for uspace/lib/usbdev/src/pipesinit.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/usbdev/src/pipesinit.c (modified) (3 diffs)

uspace/lib/usbdev/src/pipesinit.c

@@ -156 +156 @@
 }
 
-static void parse_endpoint_descriptors(usb_endpoint_desc_t *ep_desc,
-    usb_standard_endpoint_descriptor_t *endpoint_desc,
-    usb_superspeed_endpoint_companion_descriptor_t *companion_desc)
-{
-        *ep_desc = (usb_endpoint_desc_t) {
-                /* Actual endpoint number is in bits 0..3 */
-                .endpoint_no = endpoint_desc->endpoint_address & 0x0F,
-                /* Transfer type is in bits 0..2 and
-                 * the enum values corresponds 1:1 */
-                .transfer_type = endpoint_desc->attributes & 3,
-                /* Endpoint direction is set by bit 7 */
-                .direction = (endpoint_desc->endpoint_address & 128)
-                    ? USB_DIRECTION_IN : USB_DIRECTION_OUT,
-                // FIXME: USB2 max_packet_size is limited to 1023 bytes, 1024+ doesn't work for USB3
-                // See 4.14.2.1.1 of XHCI specification -> possibly refactor into one somehow-named field
-                .max_packet_size
-                        = ED_MPS_PACKET_SIZE_GET(uint16_usb2host(endpoint_desc->max_packet_size)),
-                .interval = endpoint_desc->poll_interval,
-                // FIXME: USB2 packets and USB3 max_burst are probably the same thing
-                .packets = ED_MPS_TRANS_OPPORTUNITIES_GET(uint16_usb2host(endpoint_desc->max_packet_size)),
-        };
-
-        if (companion_desc) {
-                ep_desc->usb3 = (usb3_endpoint_desc_t) {
-                        .max_burst = companion_desc->max_burst,
-                        .max_streams
-                                = SS_COMPANION_MAX_STREAMS(companion_desc->attributes),
-                        .bytes_per_interval
-                                = companion_desc->bytes_per_interval,
-                        .mult = SS_COMPANION_MULT(companion_desc->attributes),
-                };
-        }
-}
-
-
 /** Process endpoint descriptor.
  *
@@ -211 +176 @@
          * Get endpoint characteristics.
          */
-        usb_endpoint_desc_t ep_desc;
-        parse_endpoint_descriptors(&ep_desc, endpoint_desc, companion_desc);
-
         const usb_endpoint_description_t description = {
-                .direction = ep_desc.direction,
-                .transfer_type = ep_desc.transfer_type,
+                .transfer_type = USB_ED_GET_TRANSFER_TYPE(*endpoint_desc),
+                .direction = USB_ED_GET_DIR(*endpoint_desc),
 
                 /* Get interface characteristics. */
@@ -238 +200 @@
         }
 
-        int err = usb_pipe_initialize(&ep_mapping->pipe, bus_session, &ep_desc);
+        int err = usb_pipe_initialize(&ep_mapping->pipe, bus_session, description.transfer_type);
         if (err)
                 return err;