Changeset 41ef5b9 in mainline for uspace/drv/uhci-hcd/uhci_hc.c

Timestamp:

2011-03-21T17:16:10Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d0c40b

Parents:

fd9f6e4c (diff), 434ef65 (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.

Message:

merge from usb/development

File:

• uspace/drv/uhci-hcd/uhci_hc.c (modified) (3 diffs)

uspace/drv/uhci-hcd/uhci_hc.c

@@ -121 +121 @@
                     fibril_create(uhci_hc_interrupt_emulator, instance);
                 fibril_add_ready(instance->cleaner);
+        } else {
+                /* TODO: enable interrupts here */
         }
 
@@ -234 +236 @@
 
         /* Init device keeper*/
-        device_keeper_init(&instance->device_manager);
+        usb_device_keeper_init(&instance->device_manager);
         usb_log_debug("Initialized device manager.\n");
 
@@ -316 +318 @@
  * Checks for bandwidth availability and appends the batch to the proper queue.
  */
-int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch)
+int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch)
 {
         assert(instance);