Changeset df6ded8 in mainline for uspace/drv/bus/usb/ehci/hw_struct/transfer_descriptor.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/transfer_descriptor.c (modified) (5 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2014 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -39 +40 @@
 
 #include <usb/usb.h>
-#include <usb/host/utils/malloc32.h>
 
 #include "mem_access.h"
@@ -70 +70 @@
 };
 
+#include <usb/debug.h>
+
 /**
  * Initialize EHCI TD.
  * @param instance TD structure to initialize.
- * @param next Next TD in ED list.
+ * @param next_phys Next TD in ED list.
  * @param direction Used to determine PID, BOTH means setup PID.
  * @param buffer Pointer to the first byte of transferred data.
@@ -80 +82 @@
  *        any other value means that ED toggle will be used.
  */
-void td_init(td_t *instance, const td_t *next,
-    usb_direction_t direction, const void *buffer, size_t size, int toggle,
-    bool ioc)
+void td_init(td_t *instance, uintptr_t next_phys, uintptr_t buffer,
+    usb_direction_t direction, size_t size, int toggle, bool ioc)
 {
         assert(instance);
@@ -98 +99 @@
         }
 
-        if (buffer != NULL) {
+        if (buffer != 0) {
                 assert(size != 0);
                 for (unsigned i = 0; (i < ARRAY_SIZE(instance->buffer_pointer))
                     && size; ++i) {
-                        const uintptr_t page =
-                            (addr_to_phys(buffer) & TD_BUFFER_POINTER_MASK);
-                        const size_t offset =
-                            ((uintptr_t)buffer & TD_BUFFER_POINTER_OFFSET_MASK);
+                        const uintptr_t offset = buffer & TD_BUFFER_POINTER_OFFSET_MASK;
                         assert(offset == 0 || i == 0);
-                        size -= min((4096 - offset), size);
-                        buffer += min((4096 - offset), size);
-                        EHCI_MEM32_WR(instance->buffer_pointer[i],
-                            page | offset);
+                        const size_t this_size = min(size, 4096 - offset);
+                        EHCI_MEM32_WR(instance->buffer_pointer[i], buffer);
+                        size -= this_size;
+                        buffer += this_size;
                 }
         }
 
-        EHCI_MEM32_WR(instance->next, next ?
-            LINK_POINTER_TD(addr_to_phys(next)) : LINK_POINTER_TERM);
+        EHCI_MEM32_WR(instance->next, next_phys ?
+            LINK_POINTER_TD(next_phys) : LINK_POINTER_TERM);
 
         EHCI_MEM32_WR(instance->alternate, LINK_POINTER_TERM);