Changeset 00aece0 in mainline for uspace/drv/bus/usb/uhci/transfer_list.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/drv/bus/usb/uhci/transfer_list.h (modified) (3 diffs)

uspace/drv/bus/usb/uhci/transfer_list.h

@@ -36 +36 @@
 
 #include <fibril_synch.h>
-#include <usb/host/batch.h>
 
 #include "hw_struct/queue_head.h"
-
+#include "uhci_batch.h"
 /** Structure maintaining both hw queue and software list
  * of currently executed transfers
@@ -46 +45 @@
         /** Guard against multiple add/remove races */
         fibril_mutex_t guard;
-        /** UHCI hw structure represeting this queue */
+        /** UHCI hw structure representing this queue */
         qh_t *queue_head;
         /** Assigned name, for nicer debug output */
@@ -58 +57 @@
 void transfer_list_set_next(transfer_list_t *instance, transfer_list_t *next);
 void transfer_list_add_batch(
-    transfer_list_t *instance, usb_transfer_batch_t *batch);
+    transfer_list_t *instance, uhci_transfer_batch_t *batch);
 void transfer_list_remove_finished(transfer_list_t *instance, list_t *done);
 void transfer_list_abort_all(transfer_list_t *instance);