diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-08-21 18:00:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-08-21 18:00:27 +0100 |
| commit | 78ee443e52907ec540e3e40edbf8456a3b0ec14b (patch) | |
| tree | e037142144a143c2bcba725f6207ab6dcca35597 /docs | |
| parent | 13b7b188501d419a7d63c016e00065bcc693b7d4 (diff) | |
| parent | 15aa757d0523b9d6fb26ea1e5c967ba0619dce0a (diff) | |
| download | qemu-78ee443e52907ec540e3e40edbf8456a3b0ec14b.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180821-pull-request' into staging
usb: mtp write support, bugfixes.
# gpg: Signature made Tue 21 Aug 2018 10:11:36 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20180821-pull-request:
dev-mtp: rename x-root to rootdir
dev-mtp: Add support for > 4GB file transfers
dev-mtp: retry write for incomplete transfers
dev-mtp: fix buffer allocation for writing file contents
dev-mtp: add support for canceling transaction
ohci: Clear the interrupt counter for erroneous transfers
docs/usb2.txt: ehci has six ports
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/usb2.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/usb2.txt b/docs/usb2.txt index f63c8d9465..172614d3a7 100644 --- a/docs/usb2.txt +++ b/docs/usb2.txt @@ -94,8 +94,8 @@ physical port addressing First you can (for all USB devices) specify the physical port where the device will show up in the guest. This can be done using the -"port" property. UHCI has two root ports (1,2). EHCI has four root -ports (1-4), the emulated (1.1) USB hub has eight ports. +"port" property. UHCI has two root ports (1,2). EHCI has six root +ports (1-6), the emulated (1.1) USB hub has eight ports. Plugging a tablet into UHCI port 1 works like this: |