Ignore:
Timestamp:
2017-11-14T12:24:42Z (6 years ago)
Author:
Aearsis <Hlavaty.Ondrej@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6cad776
Parents:
887c9de (diff), d2d142a (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.
git-author:
Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)
git-committer:
Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)
Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/usbhost/include/usb/host/hcd.h

    r887c9de rf9d0a86  
    4646#include <stddef.h>
    4747#include <stdint.h>
     48#include <usbhc_iface.h>
    4849
    4950typedef struct hcd hcd_t;
     
    110111extern int hcd_send_batch(hcd_t *, device_t *, usb_target_t,
    111112    usb_direction_t direction, char *, size_t, uint64_t,
    112     usb_transfer_batch_callback_t, void *, const char *);
     113    usbhc_iface_transfer_callback_t, void *, const char *);
    113114
    114115extern ssize_t hcd_send_batch_sync(hcd_t *, device_t *, usb_target_t,
Note: See TracChangeset for help on using the changeset viewer.