diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-02 17:07:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-02 17:07:21 +0100 |
| commit | 82ea61c6da4daa81d8614297391b8087e806ded9 (patch) | |
| tree | 5e5bcd8610952ca6b11e0af70d8d011563321167 /include/hw/usb.h | |
| parent | 1673e89e93e08cbfee7c9b552008e5b39469ad0e (diff) | |
| parent | 7bafd8889ea3599285a8fcb1262d50e52d941c0e (diff) | |
| download | qemu-82ea61c6da4daa81d8614297391b8087e806ded9.zip qemu-82ea61c6da4daa81d8614297391b8087e806ded9.tar.gz qemu-82ea61c6da4daa81d8614297391b8087e806ded9.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-8' into staging
qtest: improve ehci/uhci test
usb: misc fixes, mostly for usb3/xhci
# gpg: Signature made Mon 02 Jun 2014 15:40:34 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-usb-8:
xhci: order superspeed ports first
xhci: make port reset trace point more verbose
usb: add usb_pick_speed
usb-host: add HAVE_STREAMS define
usb-host: allow attaching usb3 devices to ehci
usb: improve ehci/uhci test
usb: move ehci register defines to header file
usb: add uhci port status reserved bit
usb: move uhci register defines to header file
qtest: fix qpci_config_writel
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/usb.h')
| -rw-r--r-- | include/hw/usb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/usb.h b/include/hw/usb.h index 1919bdc..8bcab48 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -458,6 +458,7 @@ void usb_ep_combine_input_packets(USBEndpoint *ep); void usb_combined_input_packet_complete(USBDevice *dev, USBPacket *p); void usb_combined_packet_cancel(USBDevice *dev, USBPacket *p); +void usb_pick_speed(USBPort *port); void usb_attach(USBPort *port); void usb_detach(USBPort *port); void usb_port_reset(USBPort *port); |