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

Timestamp:

2018-02-28T16:37:50Z (7 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/endpoint_list.c (modified) (7 diffs)

uspace/drv/bus/usb/ehci/endpoint_list.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2014 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -54 +55 @@
         assert(instance);
         instance->name = name;
-        instance->list_head = malloc32(sizeof(qh_t));
-        if (!instance->list_head) {
+        if (dma_buffer_alloc(&instance->dma_buffer, sizeof(qh_t))) {
                 usb_log_error("EPL(%p-%s): Failed to allocate list head.",
                     instance, name);
                 return ENOMEM;
         }
+        instance->list_head = instance->dma_buffer.virt;
         qh_init(instance->list_head, NULL);
 
@@ -95 +96 @@
 {
         assert(instance);
+        assert(instance->list_head);
         assert(ep);
         assert(ep->qh);
-        usb_log_debug2("EPL(%p-%s): Append endpoint(%p).\n",
+        usb_log_debug2("EPL(%p-%s): Append endpoint(%p).",
             instance, instance->name, ep);
 
@@ -124 +126 @@
         write_barrier();
         /* Add to the sw list */
-        list_append(&ep->link, &instance->endpoint_list);
+        list_append(&ep->eplist_link, &instance->endpoint_list);
 
         ehci_endpoint_t *first = ehci_endpoint_list_instance(
             list_first(&instance->endpoint_list));
-        usb_log_debug("EPL(%p-%s): EP(%p) added to list, first is %p(%p).\n",
+        usb_log_debug("EPL(%p-%s): EP(%p) added to list, first is %p(%p).",
             instance, instance->name, ep, first, first->qh);
         if (last_qh == instance->list_head) {
-                usb_log_debug2("EPL(%p-%s): head EP(%p-%"PRIxn"): %x:%x.\n",
+                usb_log_debug2("EPL(%p-%s): head EP(%p-%"PRIxn"): %x:%x.",
                     instance, instance->name, last_qh,
                     addr_to_phys(instance->list_head),
@@ -153 +155 @@
         fibril_mutex_lock(&instance->guard);
 
-        usb_log_debug2("EPL(%p-%s): removing EP(%p).\n",
+        usb_log_debug2("EPL(%p-%s): removing EP(%p).",
             instance, instance->name, ep);
 
@@ -159 +161 @@
         qh_t *prev_qh;
         /* Remove from the hardware queue */
-        if (list_first(&instance->endpoint_list) == &ep->link) {
+        if (list_first(&instance->endpoint_list) == &ep->eplist_link) {
                 /* I'm the first one here */
                 prev_qh = instance->list_head;
                 qpos = "FIRST";
         } else {
-                prev_qh = ehci_endpoint_list_instance(ep->link.prev)->qh;
+                prev_qh = ehci_endpoint_list_instance(ep->eplist_link.prev)->qh;
                 qpos = "NOT FIRST";
         }
@@ -172 +174 @@
         write_barrier();
 
-        usb_log_debug("EPL(%p-%s): EP(%p) removed (%s), horizontal %x.\n",
+        usb_log_debug("EPL(%p-%s): EP(%p) removed (%s), horizontal %x.",
             instance, instance->name,  ep, qpos, ep->qh->horizontal);
 
         /* Remove from the endpoint list */
-        list_remove(&ep->link);
+        list_remove(&ep->eplist_link);
         fibril_mutex_unlock(&instance->guard);
 }