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

Timestamp:

2011-03-21T17:16:10Z (13 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.h (modified) (3 diffs)

uspace/drv/uhci-hcd/uhci_hc.h

@@ -42 +42 @@
 
 #include <usbhc_iface.h>
+#include <usb/host/device_keeper.h>
 
 #include "batch.h"
 #include "transfer_list.h"
-#include "utils/device_keeper.h"
 
 typedef struct uhci_regs {
@@ -83 +83 @@
 
 typedef struct uhci_hc {
-        device_keeper_t device_manager;
+        usb_device_keeper_t device_manager;
 
         regs_t *registers;
@@ -109 +109 @@
     void *regs, size_t reg_size, bool interupts);
 
-int uhci_hc_schedule(uhci_hc_t *instance, batch_t *batch);
+int uhci_hc_schedule(uhci_hc_t *instance, usb_transfer_batch_t *batch);
 
 void uhci_hc_interrupt(uhci_hc_t *instance, uint16_t status);