Changeset 4c28d17 in mainline

Timestamp:

2011-04-09T00:28:56Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9ff5ff82

Parents:

f1be95c8

Message:

OHCI scheduling

Location:

uspace/drv

Files:

• ohci/hc.c (modified) (2 diffs)
• uhci-hcd/hc.c (modified) (1 diff)

uspace/drv/ohci/hc.c

@@ -132 +132 @@
                 return rh_request(&instance->rh, batch);
         }
-        /* TODO: implement */
-        return ENOTSUP;
+        transfer_list_add_batch(
+            instance->transfers[batch->transfer_type], batch);
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -145 +146 @@
 
         usb_log_info("OHCI interrupt: %x.\n", status);
+
+        LIST_INITIALIZE(done);
+        transfer_list_remove_finished(&instance->transfers_interrupt, &done);
+        transfer_list_remove_finished(&instance->transfers_isochronous, &done);
+        transfer_list_remove_finished(&instance->transfers_control, &done);
+        transfer_list_remove_finished(&instance->transfers_bulk, &done);
+
+        while (!list_empty(&done)) {
+                link_t *item = done.next;
+                list_remove(item);
+                usb_transfer_batch_t *batch =
+                    list_get_instance(item, usb_transfer_batch_t, link);
+                usb_transfer_batch_finish(batch);
+        }
 
         /* TODO: Check for further interrupt causes */

uspace/drv/uhci-hcd/hc.c

@@ -240 +240 @@
         usb_log_debug("Initialized device manager.\n");
 
-        ret =
-            usb_endpoint_manager_init(&instance->ep_manager,
-                BANDWIDTH_AVAILABLE_USB11);
+        ret = usb_endpoint_manager_init(&instance->ep_manager,
+            BANDWIDTH_AVAILABLE_USB11);
         assert(ret == EOK);