diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-14 19:56:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-14 19:56:09 -0400 |
| commit | 6f4001315af2f818bfc656df81e138d1434d1fc2 (patch) | |
| tree | d5ec9d0a2c49bfa7e6dc144faa59f45588480742 /include | |
| parent | 23b93e33adde0a8313388eda7c78d1d0786e3c92 (diff) | |
| parent | e3e5825d0143c2b24583d256ef111ae9344382a2 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Assorted bugfixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/usb.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/usb.h b/include/usb.h index 420a30e49f..bcad552f85 100644 --- a/include/usb.h +++ b/include/usb.h @@ -184,7 +184,7 @@ int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, int submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer, int transfer_len, struct devrequest *setup); int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, - int transfer_len, int interval); + int transfer_len, int interval, bool nonblock); #if defined CONFIG_USB_EHCI_HCD || defined CONFIG_USB_MUSB_HOST \ || CONFIG_IS_ENABLED(DM_USB) @@ -261,8 +261,8 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe, void *data, unsigned short size, int timeout); int usb_bulk_msg(struct usb_device *dev, unsigned int pipe, void *data, int len, int *actual_length, int timeout); -int usb_submit_int_msg(struct usb_device *dev, unsigned long pipe, - void *buffer, int transfer_len, int interval); +int usb_int_msg(struct usb_device *dev, unsigned long pipe, + void *buffer, int transfer_len, int interval, bool nonblock); int usb_disable_asynch(int disable); int usb_maxpacket(struct usb_device *dev, unsigned long pipe); int usb_get_configuration_no(struct usb_device *dev, int cfgno, @@ -708,7 +708,7 @@ struct dm_usb_ops { */ int (*interrupt)(struct udevice *bus, struct usb_device *udev, unsigned long pipe, void *buffer, int length, - int interval); + int interval, bool nonblock); /** * create_int_queue() - Create and queue interrupt packets @@ -1029,7 +1029,8 @@ int usb_emul_bulk(struct udevice *emul, struct usb_device *udev, * @return 0 if OK, -ve on error */ int usb_emul_int(struct udevice *emul, struct usb_device *udev, - unsigned long pipe, void *buffer, int length, int interval); + unsigned long pipe, void *buffer, int length, int interval, + bool nonblock); /** * usb_emul_find() - Find an emulator for a particular device |