Changeset 8c877b2 in mainline for uspace/drv/uhci-hcd/uhci.h

Timestamp:

2011-03-04T13:05:35Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d49728c

Parents:

dff940f8 (diff), 9a422574 (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) (2 diffs)

uspace/drv/uhci-hcd/uhci.h ¶

@@ -41 +41 @@
 #include <ddi.h>
 
-#include <usb/addrkeep.h>
 #include <usbhc_iface.h>
 
+#include "batch.h"
 #include "transfer_list.h"
-#include "batch.h"
+#include "utils/device_keeper.h"
 
 typedef struct uhci_regs {
@@ -82 +82 @@
 
 typedef struct uhci {
-        usb_address_keeping_t address_manager;
+        device_keeper_t device_manager;
+
         volatile regs_t *registers;