Changeset 3c4663e in mainline for uspace/lib/usbhost/src

Timestamp:

2012-12-22T23:25:44Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d8cdf39e

Parents:

1affef2f

Message:

libusbhost: Drop ddf_fun argument.

Location:

uspace/lib/usbhost/src

Files:

• hcd.c (modified) (2 diffs)
• iface.c (modified) (2 diffs)
• usb_transfer_batch.c (modified) (2 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -96 +96 @@
  */
 int hcd_send_batch(
-    hcd_t *hcd, ddf_fun_t *fun, usb_target_t target, usb_direction_t direction,
+    hcd_t *hcd, usb_target_t target, usb_direction_t direction,
     void *data, size_t size, uint64_t setup_data,
     usbhc_iface_transfer_in_callback_t in,
@@ -149 +149 @@
 
         usb_transfer_batch_t *batch = usb_transfer_batch_create(
-            ep, data, size, setup_data, in, out, arg, fun);
+            ep, data, size, setup_data, in, out, arg);
         if (!batch) {
                 return ENOMEM;

uspace/lib/usbhost/src/iface.c

@@ -231 +231 @@
     void *arg)
 {
-        return hcd_send_batch(fun_to_hcd(fun), fun, target, USB_DIRECTION_IN,
+        return hcd_send_batch(fun_to_hcd(fun), target, USB_DIRECTION_IN,
             data, size, setup_data, callback, NULL, arg, "READ");
 }
@@ -249 +249 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        return hcd_send_batch(fun_to_hcd(fun), fun, target, USB_DIRECTION_OUT,
+        return hcd_send_batch(fun_to_hcd(fun), target, USB_DIRECTION_OUT,
             (uint8_t*)data, size, setup_data, NULL, callback, arg, "WRITE");
 }

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -61 +61 @@
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out,
-    void *arg,
-    ddf_fun_t *fun
+    void *arg
     )
 {
@@ -79 +78 @@
                 instance->buffer_size = buffer_size;
                 instance->setup_size = 0;
-                instance->fun = fun;
                 instance->transfered_size = 0;
                 instance->error = EOK;