Changeset 9efad54 in mainline for uspace/lib/usb/include/usb/descriptor.h

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/usb/include/usb/descriptor.h (modified) (3 diffs)

uspace/lib/usb/include/usb/descriptor.h

@@ -200 +200 @@
         /** Endpoint address together with data flow direction. */
         uint8_t endpoint_address;
+#define USB_ED_GET_EP(ed)       ((ed).endpoint_address & 0xf)
+#define USB_ED_GET_DIR(ed)      (!(((ed).endpoint_address >> 7) & 0x1))
+
         /** Endpoint attributes.
          * Includes transfer type (usb_transfer_type_t).
          */
         uint8_t attributes;
+#define USB_ED_GET_TRANSFER_TYPE(ed)    ((ed).attributes & 0x3)
         /** Maximum packet size.
          * Lower 10 bits represent the actuall size
@@ -209 +213 @@
          * HS INT and ISO transfers. */
         uint16_t max_packet_size;
-
-#define ED_MPS_PACKET_SIZE_MASK  0x3ff
-#define ED_MPS_PACKET_SIZE_GET(value) \
-        ((value) & ED_MPS_PACKET_SIZE_MASK)
-#define ED_MPS_TRANS_OPPORTUNITIES_GET(value) \
-        ((((value) >> 10) & 0x3) + 1)
-
+#define USB_ED_GET_MPS(ed) \
+        (uint16_usb2host((ed).max_packet_size) & 0x7ff)
+#define USB_ED_GET_ADD_OPPS(ed) \
+        ((uint16_usb2host((ed).max_packet_size) >> 11) & 0x3)
         /** Polling interval in milliseconds.
          * Ignored for bulk and control endpoints.
@@ -246 +247 @@
          */
         uint8_t attributes;
-#define SS_COMPANION_MAX_STREAMS(attributes) \
-        (attributes & 0x1f)
-#define SS_COMPANION_MULT(attributes) \
-        (attributes & 0x3)
+#define USB_SSC_MAX_STREAMS(sscd) ((sscd).attributes & 0x1f)
+#define USB_SSC_MULT(sscd) ((sscd).attributes & 0x3)
         /** The total number of bytes this endpoint will transfer
          * every service interval (SI).