Changeset 3b5d1535 in mainline for uspace/drv/uhci-hcd/batch.h

Timestamp:

2011-02-23T10:28:21Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

eb48f61

Parents:

e936e8e (diff), eb1a2f4 (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 mainline changes

File:

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

uspace/drv/uhci-hcd/batch.h

@@ -68 +68 @@
         size_t transfered_size;
         int error;
-        device_t *dev;
+        ddf_fun_t *fun;
         queue_head_t *qh;
         transfer_descriptor_t *tds;
@@ -74 +74 @@
 } batch_t;
 
-batch_t * batch_get(device_t *dev, usb_target_t target,
+batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
     usb_transfer_type_t transfer_type, size_t max_packet_size,
     dev_speed_t speed, char *buffer, size_t size,