Changeset 86650db in mainline

Timestamp:

2018-01-05T22:47:26Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

3f42eab

Parents:

9e5b162

Message:

usbdev refactoring: isolate standard descriptor parsing

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)),
+        };
+
+        /* TODO Extract USB2-related information */
+        ep_desc->usb2 = (usb2_endpoint_desc_t) { 0 };
+
+        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.
  *
@@ -176 +214 @@
          * Get endpoint characteristics.
          */
-
-        /* Actual endpoint number is in bits 0..3 */
-        const usb_endpoint_t ep_no = endpoint_desc->endpoint_address & 0x0F;
+        usb_endpoint_desc_t ep_desc;
+        parse_endpoint_descriptors(&ep_desc, endpoint_desc, companion_desc);
 
         const usb_endpoint_description_t description = {
-                /* Endpoint direction is set by bit 7 */
-                .direction = (endpoint_desc->endpoint_address & 128)
-                    ? USB_DIRECTION_IN : USB_DIRECTION_OUT,
-                /* Transfer type is in bits 0..2 and
-                 * the enum values corresponds 1:1 */
-                .transfer_type = endpoint_desc->attributes & 3,
+                .direction = ep_desc.direction,
+                .transfer_type = ep_desc.transfer_type,
 
                 /* Get interface characteristics. */
@@ -206 +239 @@
         if (ep_mapping->present) {
                 return EEXIST;
-        }
-
-        usb_endpoint_desc_t ep_desc = {
-                .endpoint_no = ep_no,
-                .transfer_type = description.transfer_type,
-                .direction = description.direction,
-                // 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)),
-        };
-
-        /* TODO Extract USB2-related information */
-        ep_desc.usb2 = (usb2_endpoint_desc_t) { 0 };
-
-        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),
-                };
         }