Changeset 79d2987 in mainline for uspace/drv/uhci-hcd/uhci.h

Timestamp:

2011-02-11T17:16:36Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4e8e1f5

Parents:

25971d2 (diff), 608afb9 (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 development/ changes

File:

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

uspace/drv/uhci-hcd/uhci.h

@@ -37 +37 @@
 
 #include <fibril.h>
+#include <fibril_synch.h>
+#include <adt/list.h>
 
 #include <usb/addrkeep.h>
@@ -42 +44 @@
 
 #include "transfer_list.h"
+#include "tracker.h"
 
 typedef struct uhci_regs {
@@ -68 +71 @@
 } regs_t;
 
-#define TRANSFER_QUEUES 4
 #define UHCI_FRAME_LIST_COUNT 1024
 #define UHCI_CLEANER_TIMEOUT 10000
-#define UHCI_DEBUGER_TIMEOUT 500000
+#define UHCI_DEBUGER_TIMEOUT 5000000
 
 typedef struct uhci {
@@ -78 +80 @@
 
         link_pointer_t *frame_list;
+
+        link_t tracker_list;
+        fibril_mutex_t tracker_list_mutex;
 
         transfer_list_t transfers_bulk_full;
@@ -108 +113 @@
   void *arg );
 
+int uhci_schedule(uhci_t *instance, tracker_t *tracker);
+
 static inline uhci_t * dev_to_uhci(device_t *dev)
         { return (uhci_t*)dev->driver_data; }