Changes in uspace/drv/ohci/endpoint_list.c [d736fe38:4125b7d] in mainline

File:

• uspace/drv/ohci/endpoint_list.c (modified) (7 diffs)

uspace/drv/ohci/endpoint_list.c

@@ -34 +34 @@
 #include <errno.h>
 #include <usb/debug.h>
-#include <arch/barrier.h>
 
 #include "endpoint_list.h"
@@ -44 +43 @@
  * @return Error code
  *
- * Allocates memory for internal ed_t structure.
+ * Allocates memory for internal qh_t structure.
  */
 int endpoint_list_init(endpoint_list_t *instance, const char *name)
@@ -69 +68 @@
  * @param[in] instance List to lead.
  * @param[in] next List to append.
- *
- * Does not check whether this replaces an existing list.
+ * @return Error code
+ *
+ * Does not check whether this replaces an existing list .
  */
 void endpoint_list_set_next(endpoint_list_t *instance, endpoint_list_t *next)
@@ -79 +79 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Add endpoint to the list and queue.
- *
- * @param[in] instance List to use.
- * @param[in] endpoint Endpoint to add.
+/** Submit transfer endpoint to the list and queue.
+ *
+ * @param[in] instance List to use.
+ * @param[in] endpoint Transfer endpoint to submit.
+ * @return Error code
  *
  * The endpoint is added to the end of the list and queue.
@@ -98 +99 @@
         /* Add to the hardware queue. */
         if (list_empty(&instance->endpoint_list)) {
-                /* There are no active EDs */
+                /* There is nothing scheduled */
                 last_ed = instance->list_head;
         } else {
-                /* There are active EDs, get the last one */
+                /* There is something scheduled */
                 hcd_endpoint_t *last = list_get_instance(
                     instance->endpoint_list.prev, hcd_endpoint_t, link);
-                assert(last);
                 last_ed = last->ed;
         }
-        /* Keep link */
+        /* keep link */
         hcd_ep->ed->next = last_ed->next;
-        /* Make sure ED is written to the memory */
-        write_barrier();
-
-        /* Add ed to the hw queue */
         ed_append_ed(last_ed, hcd_ep->ed);
-        /* Make sure ED is updated */
-        write_barrier();
-
-        /* Add to the sw list */
+
+        asm volatile ("": : :"memory");
+
+        /* Add to the driver list */
         list_append(&hcd_ep->link, &instance->endpoint_list);
 
@@ -133 +129 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Remove endpoint from the list and queue.
- *
- * @param[in] instance List to use.
- * @param[in] endpoint Endpoint to remove.
+#if 0
+/** Create list for finished endpoints.
+ *
+ * @param[in] instance List to use.
+ * @param[in] done list to fill
+ */
+void endpoint_list_remove_finished(endpoint_list_t *instance, link_t *done)
+{
+        assert(instance);
+        assert(done);
+
+        fibril_mutex_lock(&instance->guard);
+        usb_log_debug2("Checking list %s for completed endpointes(%d).\n",
+            instance->name, list_count(&instance->endpoint_list));
+        link_t *current = instance->endpoint_list.next;
+        while (current != &instance->endpoint_list) {
+                link_t *next = current->next;
+                hcd_endpoint_t *endpoint =
+                    list_get_instance(current, hcd_endpoint_t, link);
+
+                if (endpoint_is_complete(endpoint)) {
+                        /* Save for post-processing */
+                        endpoint_list_remove_endpoint(instance, endpoint);
+                        list_append(current, done);
+                }
+                current = next;
+        }
+        fibril_mutex_unlock(&instance->guard);
+}
+/*----------------------------------------------------------------------------*/
+/** Walk the list and abort all endpointes.
+ *
+ * @param[in] instance List to use.
+ */
+void endpoint_list_abort_all(endpoint_list_t *instance)
+{
+        fibril_mutex_lock(&instance->guard);
+        while (!list_empty(&instance->endpoint_list)) {
+                link_t *current = instance->endpoint_list.next;
+                hcd_endpoint_t *endpoint =
+                    list_get_instance(current, hcd_endpoint_t, link);
+                endpoint_list_remove_endpoint(instance, endpoint);
+                hcd_endpoint_finish_error(endpoint, EIO);
+        }
+        fibril_mutex_unlock(&instance->guard);
+}
+#endif
+/*----------------------------------------------------------------------------*/
+/** Remove a transfer endpoint from the list and queue.
+ *
+ * @param[in] instance List to use.
+ * @param[in] endpoint Transfer endpoint to remove.
+ * @return Error code
+ *
+ * Does not lock the transfer list, caller is responsible for that.
  */
 void endpoint_list_remove_ep(endpoint_list_t *instance, hcd_endpoint_t *hcd_ep)
@@ -165 +212 @@
         assert((prev_ed->next & ED_NEXT_PTR_MASK) == addr_to_phys(hcd_ep->ed));
         prev_ed->next = hcd_ep->ed->next;
-        /* Make sure ED is updated */
-        write_barrier();
-
+
+        asm volatile ("": : :"memory");
         usb_log_debug("HCD EP(%p) removed (%s) from %s, next %x.\n",
             hcd_ep, qpos, instance->name, hcd_ep->ed->next);