Changeset 327f147 in mainline for uspace/lib/usbhost/src/usb_transfer_batch.c

Timestamp:

2017-10-23T19:03:37Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

b724494

Parents:

e160bfe8

Message:

usbhost: change parameters of methods

Pass (device_t, usb_target_t) to read and write, which finally allows to drop hash tables and access device right away. Then, all callbacks to complete transfer now uses usb_transfer_batch. This requires libdrv to include libusbhost, but it is not linked against it - it is there only to share definition of usb_transfer_batch_t.

File:

• uspace/lib/usbhost/src/usb_transfer_batch.c (modified) (1 diff)

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -133 +133 @@
 }
 
-
-struct old_handler_wrapper_data {
-        usbhc_iface_transfer_in_callback_t in_callback;
-        usbhc_iface_transfer_out_callback_t out_callback;
-        void *arg;
-};
-
-static int old_handler_wrapper(usb_transfer_batch_t *batch)
-{
-        struct old_handler_wrapper_data *data = batch->on_complete_data;
-
-        assert(data);
-
-        if (data->out_callback)
-                data->out_callback(batch->error, data->arg);
-
-        if (data->in_callback)
-                data->in_callback(batch->error, batch->transfered_size, data->arg);
-
-        free(data);
-        return EOK;
-}
-
-void usb_transfer_batch_set_old_handlers(usb_transfer_batch_t *batch,
-        usbhc_iface_transfer_in_callback_t in_callback,
-        usbhc_iface_transfer_out_callback_t out_callback,
-        void *arg)
-{
-        struct old_handler_wrapper_data *data = malloc(sizeof(*data));
-
-        assert((!in_callback) != (!out_callback));
-
-        data->in_callback = in_callback;
-        data->out_callback = out_callback;
-        data->arg = arg;
-
-        batch->on_complete = old_handler_wrapper;
-        batch->on_complete_data = data;
-}
 /**
  * @}