Changeset df6ded8 in mainline for uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

Timestamp:

2018-02-28T16:37:50Z (6 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

File:

• uspace/drv/bus/usb/ehci/hw_struct/queue_head.c (modified) (4 diffs)

uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2013 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -37 +38 @@
 #include <mem.h>
 #include <macros.h>
+#include <usb/host/bus.h>
 
 #include "mem_access.h"
@@ -63 +65 @@
                 return;
         }
-        assert(ep->speed < ARRAY_SIZE(speed));
+        assert(ep->device->speed < ARRAY_SIZE(speed));
         EHCI_MEM32_WR(instance->ep_char,
-            QH_EP_CHAR_ADDR_SET(ep->address) |
+            QH_EP_CHAR_ADDR_SET(ep->device->address) |
             QH_EP_CHAR_EP_SET(ep->endpoint) |
-            speed[ep->speed] |
-            QH_EP_CHAR_MAX_LENGTH_SET(ep->max_packet_size)
-        );
+            speed[ep->device->speed] |
+            QH_EP_CHAR_MAX_LENGTH_SET(ep->max_packet_size));
         if (ep->transfer_type == USB_TRANSFER_CONTROL) {
-                if (ep->speed != USB_SPEED_HIGH)
+                if (ep->device->speed != USB_SPEED_HIGH)
                         EHCI_MEM32_SET(instance->ep_char, QH_EP_CHAR_C_FLAG);
                 /* Let BULK and INT use queue head managed toggle,
@@ -78 +79 @@
         }
         uint32_t ep_cap = QH_EP_CAP_C_MASK_SET(3 << 2) |
-                    QH_EP_CAP_MULTI_SET(ep->packets);
-        if (ep->speed != USB_SPEED_HIGH) {
+            QH_EP_CAP_MULTI_SET(ep->packets_per_uframe);
+        if (usb_speed_is_11(ep->device->speed)) {
+                assert(ep->device->tt.dev != NULL);
                 ep_cap |=
-                    QH_EP_CAP_TT_PORT_SET(ep->tt.port) |
-                    QH_EP_CAP_TT_ADDR_SET(ep->tt.address);
+                    QH_EP_CAP_TT_PORT_SET(ep->device->tt.port) |
+                    QH_EP_CAP_TT_ADDR_SET(ep->device->tt.dev->address);
         }
         if (ep->transfer_type == USB_TRANSFER_INTERRUPT) {