Changeset 3c4663e in mainline


Ignore:
Timestamp:
2012-12-22T23:25:44Z (11 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
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usbhost/include/usb/host/hcd.h

    r1affef2f r3c4663e  
    8282}
    8383
    84 int hcd_send_batch(
    85     hcd_t *hcd, ddf_fun_t *fun, usb_target_t target, usb_direction_t direction,
     84int hcd_send_batch(hcd_t *hcd, usb_target_t target, usb_direction_t direction,
    8685    void *data, size_t size, uint64_t setup_data,
    8786    usbhc_iface_transfer_in_callback_t in,

  • uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

    r1affef2f r3c4663e  
    6767         */
    6868        size_t setup_size;
    69         /** Host controller function, passed to callback function */
    70         ddf_fun_t *fun;
    7169
    7270        /** Actually used portion of the buffer
    … …  
    103101    usbhc_iface_transfer_in_callback_t func_in,
    104102    usbhc_iface_transfer_out_callback_t func_out,
    105     void *arg,
    106     ddf_fun_t *fun
     103    void *arg
    107104);
    108105void usb_transfer_batch_destroy(const usb_transfer_batch_t *instance);

  • uspace/lib/usbhost/src/hcd.c

    r1affef2f r3c4663e  
    9696 */
    9797int hcd_send_batch(
    98     hcd_t *hcd, ddf_fun_t *fun, usb_target_t target, usb_direction_t direction,
     98    hcd_t *hcd, usb_target_t target, usb_direction_t direction,
    9999    void *data, size_t size, uint64_t setup_data,
    100100    usbhc_iface_transfer_in_callback_t in,
    … …  
    149149
    150150        usb_transfer_batch_t *batch = usb_transfer_batch_create(
    151             ep, data, size, setup_data, in, out, arg, fun);
     151            ep, data, size, setup_data, in, out, arg);
    152152        if (!batch) {
    153153                return ENOMEM;

  • uspace/lib/usbhost/src/iface.c

    r1affef2f r3c4663e  
    231231    void *arg)
    232232{
    233         return hcd_send_batch(fun_to_hcd(fun), fun, target, USB_DIRECTION_IN,
     233        return hcd_send_batch(fun_to_hcd(fun), target, USB_DIRECTION_IN,
    234234            data, size, setup_data, callback, NULL, arg, "READ");
    235235}
    … …  
    249249    usbhc_iface_transfer_out_callback_t callback, void *arg)
    250250{
    251         return hcd_send_batch(fun_to_hcd(fun), fun, target, USB_DIRECTION_OUT,
     251        return hcd_send_batch(fun_to_hcd(fun), target, USB_DIRECTION_OUT,
    252252            (uint8_t*)data, size, setup_data, NULL, callback, arg, "WRITE");
    253253}

  • uspace/lib/usbhost/src/usb_transfer_batch.c

    r1affef2f r3c4663e  
    6161    usbhc_iface_transfer_in_callback_t func_in,
    6262    usbhc_iface_transfer_out_callback_t func_out,
    63     void *arg,
    64     ddf_fun_t *fun
     63    void *arg
    6564    )
    6665{
    … …  
    7978                instance->buffer_size = buffer_size;
    8079                instance->setup_size = 0;
    81                 instance->fun = fun;
    8280                instance->transfered_size = 0;
    8381                instance->error = EOK;
Note: See TracChangeset for help on using the changeset viewer.