Changeset 8f68913f in mainline

Timestamp:

2012-12-20T11:48:32Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

d9b2c73

Parents:

21be46a

Message:

libusbhost, libdrv, vhc: Drop ddf_fun_t argument to callback functions.

It was never used.
If ddf_fun_t is needed is should be passed in arg instead.

Location:

uspace

Files:

• drv/bus/usb/vhc/transfer.c (modified) (1 diff)
• lib/drv/generic/remote_usbhc.c (modified) (2 diffs)
• lib/drv/include/usbhc_iface.h (modified) (1 diff)
• lib/usbhost/src/usb_transfer_batch.c (modified) (2 diffs)

uspace/drv/bus/usb/vhc/transfer.c

@@ -206 +206 @@
 
         if (transfer->direction == USB_DIRECTION_IN) {
-                transfer->callback_in(transfer->ddf_fun, outcome,
+                transfer->callback_in(outcome,
                     data_transfer_size, transfer->callback_arg);
         } else {
                 assert(transfer->direction == USB_DIRECTION_OUT);
-                transfer->callback_out(transfer->ddf_fun, outcome,
-                    transfer->callback_arg);
+                transfer->callback_out(outcome, transfer->callback_arg);
         }
 

uspace/lib/drv/generic/remote_usbhc.c

@@ -463 +463 @@
 }
 
-static void callback_out(ddf_fun_t *fun,
-    int outcome, void *arg)
+static void callback_out(int outcome, void *arg)
 {
         async_transaction_t *trans = arg;
@@ -473 +472 @@
 }
 
-static void callback_in(ddf_fun_t *fun,
-    int outcome, size_t actual_size, void *arg)
+static void callback_in(int outcome, size_t actual_size, void *arg)
 {
         async_transaction_t *trans = (async_transaction_t *)arg;

uspace/lib/drv/include/usbhc_iface.h

@@ -58 +58 @@
 
 /** Callback for outgoing transfer. */
-typedef void (*usbhc_iface_transfer_out_callback_t)(ddf_fun_t *, int, void *);
+typedef void (*usbhc_iface_transfer_out_callback_t)(int, void *);
 
 /** Callback for incoming transfer. */
-typedef void (*usbhc_iface_transfer_in_callback_t)(ddf_fun_t *,
-    int, size_t, void *);
+typedef void (*usbhc_iface_transfer_in_callback_t)(int, size_t, void *);
 
 /** USB host controller communication interface. */

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -141 +141 @@
                             instance->setup_buffer);
                 }
-                instance->callback_out(instance->fun, error, instance->arg);
+                instance->callback_out(error, instance->arg);
         }
 
@@ -150 +150 @@
                         memcpy(instance->buffer, data, safe_size);
                 }
-                instance->callback_in(instance->fun, error,
-                    safe_size, instance->arg);
+                instance->callback_in(error, safe_size, instance->arg);
         }
 }