gwj / at91sam9263 · Commits

Commit 0aff66b5c8bbe89cb61df75e0511af2c1802a593

Authored by pbrook
1 parent 2e5d83bb

Update USB documentation. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1941 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 32 additions and 27 deletions
qemu-doc.texi
  View file @0aff66b
... ... @@ -309,8 +309,7 @@ USB options:
309 309 Enable the USB driver (will be the default soon)
310 310  
311 311 @item -usbdevice devname
312   -Add the USB device @var{devname}. See the monitor command
313   -@code{usb_add} to have more information.
  312 +Add the USB device @var{devname}. @xref{usb_devices}.
314 313 @end table
315 314  
316 315 Network options:
... ... @@ -783,10 +782,8 @@ Reset the system.
783 782  
784 783 @item usb_add devname
785 784  
786   -Plug the USB device devname to the QEMU virtual USB hub. @var{devname}
787   -is either a virtual device name (for example @code{mouse}) or a host
788   -USB device identifier. Host USB device identifiers have the following
789   -syntax: @code{host:bus.addr} or @code{host:vendor_id:product_id}.
  785 +Add the USB device @var{devname}. For details of available devices see
  786 +@ref{usb_devices}
790 787  
791 788 @item usb_del devname
792 789  
... ... @@ -1105,31 +1102,39 @@ Lawton for the plex86 Project (@url{www.plex86.org}).
1105 1102 @node pcsys_usb
1106 1103 @section USB emulation
1107 1104  
1108   -QEMU emulates a PCI UHCI USB controller and a 8 port USB hub connected
1109   -to it. You can virtually plug to the hub virtual USB devices or real
1110   -host USB devices (experimental, works only on Linux hosts).
  1105 +QEMU emulates a PCI UHCI USB controller. You can virtually plug
  1106 +virtual USB devices or real host USB devices (experimental, works only
  1107 +on Linux hosts). Qemu will automatically create and connect virtual USB hubs
  1108 +as neccessary to connect multiple USB devices.
1111 1109  
1112   -@subsection Using virtual USB devices
1113   -
1114   -A virtual USB mouse device is available for testing in QEMU.
1115   -
1116   -You can try it with the following monitor commands:
1117   -
1118   -@example
1119   -# add the mouse device
1120   -(qemu) usb_add mouse
1121   -
1122   -# show the virtual USB devices plugged on the QEMU Virtual USB hub
1123   -(qemu) info usb
1124   - Device 0.3, speed 12 Mb/s
  1110 +@menu
  1111 +* usb_devices::
  1112 +* host_usb_devices::
  1113 +@end menu
  1114 +@node usb_devices
  1115 +@subsection Connecting USB devices
1125 1116  
1126   -# after some time you can try to remove the mouse
1127   -(qemu) usb_del 0.3
1128   -@end example
  1117 +USB devices can be connected with the @option{-usbdevice} commandline option
  1118 +or the @code{usb_add} monitor command. Available devices are:
1129 1119  
1130   -The option @option{-usbdevice} is similar to the monitor command
1131   -@code{usb_add}.
  1120 +@table @var
  1121 +@item @code{mouse}
  1122 +Virtual Mouse. This will override the PS/2 mouse emulation when activated.
  1123 +@item @code{tablet}
  1124 +Pointer device that uses abolsute coordinates (like a touchscreen).
  1125 +This means qemu is able to report the mouse position without having
  1126 +to grab the mouse. Also overrides the PS/2 mouse emulation when activated.
  1127 +@item @code{disk:file}
  1128 +Mass storage device based on @var{file} (@pxref{disk_images})
  1129 +@item @code{host:bus.addr}
  1130 +Pass through the host device identified by @var{bus.addr}
  1131 +(Linux only)
  1132 +@item @code{host:vendor_id:product_id}
  1133 +Pass through the host device identified by @var{vendor_id:product_id}
  1134 +(Linux only)
  1135 +@end table
1132 1136  
  1137 +@node host_usb_devices
1133 1138 @subsection Using host USB devices on a Linux host
1134 1139  
1135 1140 WARNING: this is an experimental feature. QEMU will slow down when
... ...