Changeset df6ded8 in mainline for uspace/lib/usb/src

Timestamp:

2018-02-28T16:37:50Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

Location:

uspace/lib/usb/src

Files:

• dma_buffer.c (added)
• dump.c (modified) (4 diffs)
• port.c (added)
• usb.c (modified) (2 diffs)

uspace/lib/usb/src/dump.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Vojtech Horky
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -61 +62 @@
 static void usb_dump_descriptor_endpoint(FILE *, const char *, const char *,
     const uint8_t *, size_t);
+static void usb_dump_descriptor_superspeed_endpoint_companion(FILE *, const char *, const char *,
+    const uint8_t *, size_t);
 static void usb_dump_descriptor_hid(FILE *, const char *, const char *,
     const uint8_t *, size_t);
@@ -75 +78 @@
         { USB_DESCTYPE_INTERFACE, usb_dump_descriptor_interface },
         { USB_DESCTYPE_ENDPOINT, usb_dump_descriptor_endpoint },
+        { USB_DESCTYPE_SSPEED_EP_COMPANION, usb_dump_descriptor_superspeed_endpoint_companion },
         { USB_DESCTYPE_HID, usb_dump_descriptor_hid },
         { USB_DESCTYPE_HUB, usb_dump_descriptor_hub },
@@ -238 +242 @@
         PRINTLINE("wMaxPacketSize = %d", d->max_packet_size);
         PRINTLINE("bInterval = %dms", d->poll_interval);
+}
+
+static void usb_dump_descriptor_superspeed_endpoint_companion(FILE *output,
+    const char *line_prefix, const char *line_suffix,
+    const uint8_t *descriptor, size_t descriptor_length)
+{
+        usb_superspeed_endpoint_companion_descriptor_t *d
+           = (usb_superspeed_endpoint_companion_descriptor_t *) descriptor;
+        if (descriptor_length < sizeof(*d)) {
+                return;
+        }
+
+        PRINTLINE("bLength = %u", d->length);
+        PRINTLINE("bDescriptorType = 0x%02X", d->descriptor_type);
+        PRINTLINE("bMaxBurst = %u", d->max_burst);
+        PRINTLINE("bmAttributes = %d", d->attributes);
+        PRINTLINE("wBytesPerInterval = %u", d->bytes_per_interval);
 }
 

uspace/lib/usb/src/usb.c

@@ -44 +44 @@
         [USB_SPEED_FULL] = "full",
         [USB_SPEED_HIGH] = "high",
+        [USB_SPEED_SUPER] = "super",
 };
 
@@ -118 +119 @@
 }
 
-/** Check setup packet data for signs of toggle reset.
- *
- * @param[in] requst Setup requst data.
- *
- * @retval -1 No endpoints need reset.
- * @retval 0 All endpoints need reset.
- * @retval >0 Specified endpoint needs reset.
- *
- */
-int usb_request_needs_toggle_reset(
-    const usb_device_request_setup_packet_t *request)
-{
-        assert(request);
-        switch (request->request)
-        {
-        /* Clear Feature ENPOINT_STALL */
-        case USB_DEVREQ_CLEAR_FEATURE: /*resets only cleared ep */
-                /* 0x2 ( HOST to device | STANDART | TO ENPOINT) */
-                if ((request->request_type == 0x2) &&
-                    (request->value == USB_FEATURE_ENDPOINT_HALT))
-                        return uint16_usb2host(request->index);
-                break;
-        case USB_DEVREQ_SET_CONFIGURATION:
-        case USB_DEVREQ_SET_INTERFACE:
-                /* Recipient must be device, this resets all endpoints,
-                 * In fact there should be no endpoints but EP 0 registered
-                 * as different interfaces use different endpoints,
-                 * unless you're changing configuration or alternative
-                 * interface of an already setup device. */
-                if (!(request->request_type & SETUP_REQUEST_TYPE_DEVICE_TO_HOST))
-                        return 0;
-                break;
-        default:
-                break;
-        }
-        return -1;
-}
-
 /**
  * @}