Changeset 50ba203 in mainline for uspace/drv/uhci-hcd/uhci.h

Timestamp:

2011-02-20T15:46:48Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6bb83c7

Parents:

d81ef61c (diff), 0c00dac (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 with usb/development

File:

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

uspace/drv/uhci-hcd/uhci.h

@@ -44 +44 @@
 
 #include "transfer_list.h"
-#include "tracker.h"
+#include "batch.h"
 
 typedef struct uhci_regs {
@@ -81 +81 @@
         link_pointer_t *frame_list;
 
-        link_t tracker_list;
-        fibril_mutex_t tracker_list_mutex;
+        link_t batch_list;
+        fibril_mutex_t batch_list_mutex;
 
         transfer_list_t transfers_bulk_full;
@@ -113 +113 @@
   void *arg );
 
-int uhci_schedule(uhci_t *instance, tracker_t *tracker);
+int uhci_schedule(uhci_t *instance, batch_t *batch);
 
 static inline uhci_t * dev_to_uhci(device_t *dev)