Changeset df6ded8 in mainline for uspace/drv/bus/usb/ohci/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/ohci/endpoint_list.c (modified) (8 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2018 Ondrej Hlavaty
  * All rights reserved.
  *
@@ -57 +58 @@
         instance->list_head = malloc32(sizeof(ed_t));
         if (!instance->list_head) {
-                usb_log_error("Failed to allocate list head.\n");
+                usb_log_error("Failed to allocate list head.");
                 return ENOMEM;
         }
         instance->list_head_pa = addr_to_phys(instance->list_head);
-        usb_log_debug2("Transfer list %s setup with ED: %p(0x%0" PRIx32 ")).\n",
+        usb_log_debug2("Transfer list %s setup with ED: %p(0x%0" PRIx32 ")).",
             name, instance->list_head, instance->list_head_pa);
 
@@ -96 +97 @@
         assert(instance);
         assert(ep);
-        usb_log_debug2("Queue %s: Adding endpoint(%p).\n", instance->name, ep);
+        usb_log_debug2("Queue %s: Adding endpoint(%p).", instance->name, ep);
 
         fibril_mutex_lock(&instance->guard);
@@ -108 +109 @@
                 /* There are active EDs, get the last one */
                 ohci_endpoint_t *last = list_get_instance(
-                    list_last(&instance->endpoint_list), ohci_endpoint_t, link);
+                    list_last(&instance->endpoint_list), ohci_endpoint_t, eplist_link);
                 last_ed = last->ed;
         }
@@ -122 +123 @@
 
         /* Add to the sw list */
-        list_append(&ep->link, &instance->endpoint_list);
+        list_append(&ep->eplist_link, &instance->endpoint_list);
 
         ohci_endpoint_t *first = list_get_instance(
-            list_first(&instance->endpoint_list), ohci_endpoint_t, link);
-        usb_log_debug("HCD EP(%p) added to list %s, first is %p(%p).\n",
+            list_first(&instance->endpoint_list), ohci_endpoint_t, eplist_link);
+        usb_log_debug("HCD EP(%p) added to list %s, first is %p(%p).",
                 ep, instance->name, first, first->ed);
         if (last_ed == instance->list_head) {
-                usb_log_debug2("%s head ED(%p-0x%0" PRIx32 "): %x:%x:%x:%x.\n",
+                usb_log_debug2("%s head ED(%p-0x%0" PRIx32 "): %x:%x:%x:%x.",
                     instance->name, last_ed, instance->list_head_pa,
                     last_ed->status, last_ed->td_tail, last_ed->td_head,
@@ -151 +152 @@
         fibril_mutex_lock(&instance->guard);
 
-        usb_log_debug2("Queue %s: removing endpoint(%p).\n", instance->name, ep);
+        usb_log_debug2("Queue %s: removing endpoint(%p).", instance->name, ep);
 
         const char *qpos = NULL;
         ed_t *prev_ed;
         /* 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_ed = instance->list_head;
@@ -162 +163 @@
         } else {
                 ohci_endpoint_t *prev =
-                    list_get_instance(ep->link.prev, ohci_endpoint_t, link);
+                    list_get_instance(ep->eplist_link.prev, ohci_endpoint_t, eplist_link);
                 prev_ed = prev->ed;
                 qpos = "NOT FIRST";
@@ -171 +172 @@
         write_barrier();
 
-        usb_log_debug("HCD EP(%p) removed (%s) from %s, next %x.\n",
+        usb_log_debug("HCD EP(%p) removed (%s) from %s, next %x.",
             ep, qpos, instance->name, ep->ed->next);
 
         /* Remove from the endpoint list */
-        list_remove(&ep->link);
+        list_remove(&ep->eplist_link);
         fibril_mutex_unlock(&instance->guard);
 }