diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-17 08:10:22 +0200 |
| commit | cde6a62a9d994087ff2d42239c1f370f98122c1c (patch) | |
| tree | 27e568c63bf8022621ad102d4e01b7be5f5f2299 /include | |
| parent | b4e30bb8b73c9702d3283e1b514d672978b6951d (diff) | |
| parent | 222e8d085efddb442c318824e5b027fd4e59594a (diff) | |
| download | barebox-cde6a62a9d994087ff2d42239c1f370f98122c1c.tar.gz barebox-cde6a62a9d994087ff2d42239c1f370f98122c1c.tar.xz | |
Merge branch 'for-next/layerscape'
Diffstat (limited to 'include')
| -rw-r--r-- | include/usb/ch9.h | 2 | ||||
| -rw-r--r-- | include/usb/composite.h | 3 | ||||
| -rw-r--r-- | include/usb/gadget.h | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/usb/ch9.h b/include/usb/ch9.h index 89d83e0d09..85f3e64cac 100644 --- a/include/usb/ch9.h +++ b/include/usb/ch9.h @@ -234,6 +234,8 @@ struct usb_ctrlrequest { #define USB_DT_PIPE_USAGE 0x24 /* From the USB 3.0 spec */ #define USB_DT_SS_ENDPOINT_COMP 0x30 +/* From the USB 3.1 spec */ +#define USB_DT_SSP_ISOC_ENDPOINT_COMP 0x31 /* Conventional codes for class-specific descriptors. The convention is * defined in the USB "Common Class" Spec (3.11). Individual class specs diff --git a/include/usb/composite.h b/include/usb/composite.h index f30568a54f..ec9abe7447 100644 --- a/include/usb/composite.h +++ b/include/usb/composite.h @@ -395,6 +395,9 @@ struct usb_composite_dev { spinlock_t lock; int in_reset_config; + + /* public: */ + unsigned int setup_pending:1; }; extern int usb_string_id(struct usb_composite_dev *c); diff --git a/include/usb/gadget.h b/include/usb/gadget.h index 80418a9cd4..afa11b2d9d 100644 --- a/include/usb/gadget.h +++ b/include/usb/gadget.h @@ -1018,6 +1018,10 @@ extern void usb_gadget_set_state(struct usb_gadget *gadget, /*-------------------------------------------------------------------------*/ +/* utility to tell udc core that the bus reset occurs */ +extern void usb_gadget_udc_reset(struct usb_gadget *gadget, + struct usb_gadget_driver *driver); + /* utility wrapping a simple endpoint selection policy */ extern struct usb_ep *usb_ep_autoconfig(struct usb_gadget *, |