Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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.
Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/usbhid/include/usb/hid/hidparser.h

    ra0a9cc2 r2b3dd78  
    4848 */
    4949errno_t usb_hid_parse_report(const usb_hid_report_t *report, const uint8_t *data,
    50                 size_t size, uint8_t *report_id);
     50    size_t size, uint8_t *report_id);
    5151
    5252/*
    5353 * Output report parser functions
    5454 */
    55 uint8_t *usb_hid_report_output(usb_hid_report_t *report, size_t *size, 
    56                 uint8_t report_id);
     55uint8_t *usb_hid_report_output(usb_hid_report_t *report, size_t *size,
     56    uint8_t report_id);
    5757
    5858void usb_hid_report_output_free(uint8_t *output);
    5959
    6060size_t usb_hid_report_size(usb_hid_report_t *report, uint8_t report_id,
    61                 usb_hid_report_type_t type);
     61    usb_hid_report_type_t type);
    6262
    6363size_t usb_hid_report_byte_size(usb_hid_report_t *report, uint8_t report_id,
    64                 usb_hid_report_type_t type);
     64    usb_hid_report_type_t type);
    6565
    6666
    67 errno_t usb_hid_report_output_translate(usb_hid_report_t *report, 
    68                 uint8_t report_id, uint8_t *buffer, size_t size);
     67errno_t usb_hid_report_output_translate(usb_hid_report_t *report,
     68    uint8_t report_id, uint8_t *buffer, size_t size);
    6969
    7070
     
    7373 */
    7474usb_hid_report_field_t *usb_hid_report_get_sibling(usb_hid_report_t *report,
    75                 usb_hid_report_field_t *field, usb_hid_report_path_t *path,
    76                 int flags, usb_hid_report_type_t type);
     75    usb_hid_report_field_t *field, usb_hid_report_path_t *path,
     76    int flags, usb_hid_report_type_t type);
    7777
    78 uint8_t usb_hid_get_next_report_id(usb_hid_report_t *report, 
    79                 uint8_t report_id, usb_hid_report_type_t type);
     78uint8_t usb_hid_get_next_report_id(usb_hid_report_t *report,
     79    uint8_t report_id, usb_hid_report_type_t type);
    8080
    8181#endif
Note: See TracChangeset for help on using the changeset viewer.