Changeset 97ab321 in mainline for uspace/drv/uhci-hcd/batch.h

Timestamp:

2011-04-07T09:53:12Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d41f301

Parents:

c4e0b47 (diff), 41c1f7b (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/batch.h (modified) (2 diffs)

uspace/drv/uhci-hcd/batch.h

@@ -35 +35 @@
 #define DRV_UHCI_BATCH_H
 
-#include <adt/list.h>
-
 #include <usbhc_iface.h>
 #include <usb/usb.h>
 #include <usb/host/device_keeper.h>
+#include <usb/host/endpoint.h>
 #include <usb/host/batch.h>
 
@@ -57 +56 @@
     usbhc_iface_transfer_out_callback_t func_out,
                 void *arg,
-                usb_device_keeper_t *manager
+                endpoint_t *ep
                 );