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/request.h

    ra0a9cc2 r2b3dd78  
    4747    usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size);
    4848
    49 errno_t usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no, 
     49errno_t usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
    5050    usb_hid_protocol_t protocol);
    5151
    5252errno_t usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration);
    5353
    54 errno_t usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no, 
    55     usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size, 
     54errno_t usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no,
     55    usb_hid_report_type_t type, uint8_t *buffer, size_t buf_size,
    5656    size_t *actual_size);
    5757
    58 errno_t usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no, 
     58errno_t usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no,
    5959    usb_hid_protocol_t *protocol);
    6060
Note: See TracChangeset for help on using the changeset viewer.