Changeset 5f5321ee in mainline for uspace/drv/bus/usb/ehci/hc.c

Timestamp:

2014-01-24T16:12:32Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

763dbcb

Parents:

dc44023

Message:

ehci: Implement endpoint list enqueue

File:

• uspace/drv/bus/usb/ehci/hc.c (modified) (2 diffs)

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

@@ -198 +198 @@
 {
         assert(instance);
-        /* TODO: implement*/
+        //TODO: stop the hw
+#if 0
+        endpoint_list_fini(&instance->async_list);
+        endpoint_list_fini(&instance->int_list);
+        return_page(instance->periodic_list_base);
+#endif
 };
 
 void hc_enqueue_endpoint(hc_t *instance, const endpoint_t *ep)
 {
+        assert(instance);
+        assert(ep);
+        ehci_endpoint_t *ehci_ep = ehci_endpoint_get(ep);
+        switch (ep->transfer_type)
+        {
+        case USB_TRANSFER_CONTROL:
+                endpoint_list_prepend_ep(&instance->async_list, ehci_ep);
+                break;
+        case USB_TRANSFER_BULK:
+                endpoint_list_append_ep(&instance->async_list, ehci_ep);
+                break;
+        case USB_TRANSFER_INTERRUPT:
+                endpoint_list_append_ep(&instance->int_list, ehci_ep);
+                break;
+        case USB_TRANSFER_ISOCHRONOUS:
+                /* NOT SUPPORTED */
+                break;
+        }
 }
 
@@ -343 +366 @@
 {
         assert(instance);
+        int ret = endpoint_list_init(&instance->async_list, "ASYNC");
+        if (ret != EOK) {
+                usb_log_error("Failed to setup ASYNC list: %s", str_error(ret));
+                return ret;
+        }
+
+        ret = endpoint_list_init(&instance->int_list, "INT");
+        if (ret != EOK) {
+                usb_log_error("Failed to setup INT list: %s", str_error(ret));
+                endpoint_list_fini(&instance->async_list);
+                return ret;
+        }
 
         /* Take 1024 periodic list heads, we ignore low mem options */
         instance->periodic_list_base = get_page();
-        if (!instance->periodic_list_base)
+        if (!instance->periodic_list_base) {
+                usb_log_error("Failed to get ISO schedule page.");
+                endpoint_list_fini(&instance->async_list);
+                endpoint_list_fini(&instance->int_list);
                 return ENOMEM;
+        }
         for (unsigned i = 0;
             i < PAGE_SIZE/sizeof(instance->periodic_list_base[0]); ++i)
         {
                 /* Disable everything for now */
-                instance->periodic_list_base[i] = LINK_POINTER_TERM;
+                instance->periodic_list_base[i] =
+                    LINK_POINTER_QH(instance->int_list.list_head_pa);
         }
         return EOK;