Ignore:
Timestamp:
2018-01-31T12:02:00Z (7 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/hidpath.h

    ra0a9cc2 r2b3dd78  
    8383        /** Usage page of report item. Zero when usage page can be changed. */
    8484        uint32_t usage_page;
    85         /** Usage of report item. Zero when usage can be changed. */   
     85        /** Usage of report item. Zero when usage can be changed. */
    8686        uint32_t usage;
    8787
     
    119119
    120120errno_t usb_hid_report_path_set_report_id(usb_hid_report_path_t *usage_path,
    121                 uint8_t report_id);
     121    uint8_t report_id);
    122122
    123 errno_t usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path, 
    124                 int32_t usage_page, int32_t usage);
     123errno_t usb_hid_report_path_append_item(usb_hid_report_path_t *usage_path,
     124    int32_t usage_page, int32_t usage);
    125125
    126126void usb_hid_report_remove_last_item(usb_hid_report_path_t *usage_path);
     
    128128void usb_hid_report_null_last_item(usb_hid_report_path_t *usage_path);
    129129
    130 void usb_hid_report_set_last_item(usb_hid_report_path_t *usage_path, 
    131                 int32_t tag, int32_t data);
     130void usb_hid_report_set_last_item(usb_hid_report_path_t *usage_path,
     131    int32_t tag, int32_t data);
    132132
    133133int usb_hid_report_compare_usage_path(usb_hid_report_path_t *report_path,
    134                 usb_hid_report_path_t *path, int flags);
     134    usb_hid_report_path_t *path, int flags);
    135135
    136136usb_hid_report_path_t *usb_hid_report_path_clone(
    137                 usb_hid_report_path_t *usage_path);
     137    usb_hid_report_path_t *usage_path);
    138138
    139139void usb_hid_print_usage_path(usb_hid_report_path_t *path);
Note: See TracChangeset for help on using the changeset viewer.