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

Timestamp:

2011-02-23T10:28:21Z (13 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.c (modified) (5 diffs)

uspace/drv/uhci-hcd/batch.c

@@ -51 +51 @@
 
 
-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,
@@ -128 +128 @@
         instance->buffer_size = size;
         instance->setup_size = setup_size;
-        instance->dev = dev;
+        instance->fun = fun;
         instance->arg = arg;
         instance->speed = speed;
@@ -291 +291 @@
             err, instance->transfered_size);
 
-        instance->callback_in(instance->dev,
+        instance->callback_in(instance->fun,
             err, instance->transfered_size,
             instance->arg);
@@ -303 +303 @@
         int err = instance->error;
         usb_log_info("Callback OUT(%d): %d.\n", instance->transfer_type, err);
-        instance->callback_out(instance->dev,
+        instance->callback_out(instance->fun,
             err, instance->arg);
 }
@@ -334 +334 @@
 {
         assert(instance);
-        uhci_t *hc = dev_to_uhci(instance->dev);
+        uhci_t *hc = fun_to_uhci(instance->fun);
         assert(hc);
         return uhci_schedule(hc, instance);