mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- improved config interface labels for the optional plugin control

Browse Source 
- documentation updates
This commit is contained in:
Volker Ruppert 2009-02-22 17:05:40 +00:00
parent 790eec83ca
commit 29f5a696fc
5 changed files with 78 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bochs/.bochsrc
View File

@ -526,7 +526,7 @@ parport1: enabled=1, file="parport.out"
#=======================================================================
# VGA_UPDATE_INTERVAL:
# Video memory is scanned for updates and screen updated every so many
# virtual seconds. The default is 40000, about 25Hz. Keep in mind that
# virtual seconds. The default is 50000, about 20Hz. Keep in mind that
# you must tweak the 'cpu: ips=N' directive to be as close to the number
# of emulated instructions-per-second your workstation can do, for this
# to be accurate.
@ -567,17 +567,16 @@ keyboard_paste_delay: 100000
#=======================================================================
# MOUSE:
# This option prevents Bochs from creating mouse "events" unless a mouse
# is enabled. The hardware emulation itself is not disabled by this.
# You can turn the mouse on by setting enabled to 1, or turn it off by
# setting enabled to 0. Unless you have a particular reason for enabling
# the mouse by default, it is recommended that you leave it off.
# You can also toggle the mouse usage at runtime (control key + middle
# mouse button on X11, SDL, wxWidgets and Win32).
# The Bochs gui creates mouse "events" unless the 'enabled' option is
# set to 0. The hardware emulation itself is not disabled by this.
# Unless you have a particular reason for enabling the mouse by default,
# it is recommended that you leave it off. You can also toggle the mouse
# usage at runtime (control key + middle mouse button on X11, SDL,
# wxWidgets and Win32).
# With the mouse type option you can select the type of mouse to emulate.
# The default value is 'ps2'. The other choices are 'imps2' (wheel mouse
# on PS/2), 'serial', 'serial_wheel' and 'serial_msys' (one com port requires
# setting 'mode=mouse'). To connect a mouse to an USB port, see the 'usb1'
# setting 'mode=mouse'). To connect a mouse to an USB port, see the 'usb_uhci'
# option (requires PCI and USB support).
#
# Examples:
@ -715,7 +714,7 @@ keyboard_mapping: enabled=0, map=
i440fxsupport: enabled=1
#=======================================================================
# USB1:
# USB_UHCI:
# This option controls the presence of the USB root hub which is a part
# of the i440FX PCI chipset. With the portX option you can connect devices
# to the hub (currently supported: 'mouse', 'tablet', 'keypad' and 'disk').
@ -726,8 +725,8 @@ i440fxsupport: enabled=1
# To connect a flat image as an USB hardisk you can use the 'disk' device with
# the path to the image separated with a colon (see below).
#=======================================================================
#usb1: enabled=1
#usb1: enabled=1, port1=mouse, port2=disk:usbdisk.img
#usb_uhci: enabled=1
#usb_uhci: enabled=1, port1=mouse, port2=disk:usbdisk.img
#=======================================================================
# CMOSIMAGE:

7
bochs/CHANGES
View File

@ -60,6 +60,9 @@ Detailed change log :
- I/O Devices
- Added user plugin support
- remaining devices converted to plugins: pit, ioapic, iodebug
- added bochsrc option to control the presence of optional plugin
devices without a separate option
- Hard drive / cdrom
- PACKET-DMA feature now supported by all ATAPI commands
- ATAPI command 0x1A added (based on the Qemu implementation)
@ -71,8 +74,8 @@ Detailed change log :
- keyboard
- added keyboard controller commands 0xCA and 0xCB
- USB
- initial USB OHCI support written by Ben Lunt (Win98 detects
the controller, connecting devices not implemented yet)
- initial USB OHCI support written by Ben Lunt (Win98SE can use
the USB mouse connected to OHCI)
- VGA
- VBE video memory increased to 16 MB
- I/O APIC

20
bochs/config.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: config.cc,v 1.157 2009-02-22 10:44:49 vruppert Exp $
// $Id: config.cc,v 1.158 2009-02-22 17:05:40 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -1668,24 +1668,24 @@ void bx_init_options()
// optional plugin control
menu = new bx_list_c(misc, "plugin_ctrl", "Optional Plugin Control", 9);
menu->get_options()->set(bx_list_c::SHOW_PARENT | bx_list_c::USE_BOX_TITLE);
new bx_param_bool_c(menu, "unmapped", "unmapped", "", 1);
new bx_param_bool_c(menu, "biosdev", "biosdev", "", 1);
new bx_param_bool_c(menu, "speaker", "speaker", "", 1);
new bx_param_bool_c(menu, "extfpuirq", "extfpuirq", "", 1);
new bx_param_bool_c(menu, "unmapped", "Enable 'unmapped'", "", 1);
new bx_param_bool_c(menu, "biosdev", "Enable 'biosdev'", "", 1);
new bx_param_bool_c(menu, "speaker", "Enable 'speaker'", "", 1);
new bx_param_bool_c(menu, "extfpuirq", "Enable 'extfpuirq'", "", 1);
#if BX_SUPPORT_GAMEPORT
new bx_param_bool_c(menu, "gameport", "gameport", "", 1);
new bx_param_bool_c(menu, "gameport", "Enable 'gameport'", "", 1);
#endif
#if BX_SUPPORT_IODEBUG
new bx_param_bool_c(menu, "iodebug", "iodebug", "", 1);
new bx_param_bool_c(menu, "iodebug", "Enable 'iodebug'", "", 1);
#endif
#if BX_SUPPORT_PCI
new bx_param_bool_c(menu, "pci_ide", "pci_ide", "", 1);
new bx_param_bool_c(menu, "pci_ide", "Enable 'pci_ide'", "", 1);
#endif
#if BX_SUPPORT_ACPI
new bx_param_bool_c(menu, "acpi", "acpi", "", 1);
new bx_param_bool_c(menu, "acpi", "Enable 'acpi'", "", 1);
#endif
#if BX_SUPPORT_APIC
new bx_param_bool_c(menu, "ioapic", "ioapic", "", 1);
new bx_param_bool_c(menu, "ioapic", "Enable 'ioapic'", "", 1);
#endif
#if BX_PLUGINS

34
bochs/doc/docbook/user/user.dbk
View File

@ -1,7 +1,7 @@
<!--
================================================================
doc/docbook/user/user.dbk
$Id: user.dbk,v 1.249 2009-02-08 09:05:52 vruppert Exp $
$Id: user.dbk,v 1.250 2009-02-22 17:05:40 vruppert Exp $
This is the top level file for the Bochs Users Manual.
================================================================
@ -3807,7 +3807,7 @@ are in the usual "property=value" format.
<para>
Examples:
<screen>
vga_update_interval: 40000 # default
vga_update_interval: 50000 # default
vga_update_interval: 250000
</screen>
Video memory is scanned for updates and screen updated every so many virtual
@ -3903,11 +3903,10 @@ Examples:
mouse: enabled=1, type=serial
mouse: enabled=0
</screen>
This option prevents Bochs from creating mouse "events" unless a mouse is
enabled. The hardware emulation itself is not disabled by this. You can
turn the mouse on by setting enabled to 1, or turn it off by setting
enabled to 0. Unless you have a particular reason for enabling the mouse
by default, it is recommended that you leave it off. You can also toggle the
The Bochs gui creates mouse "events" unless the 'enabled' option is
set to 0. The hardware emulation itself is not disabled by this.
Unless you have a particular reason for enabling the mouse by default,
it is recommended that you leave it off. You can also toggle the
mouse usage at runtime (see <link linkend="headerbar">headerbar</link>).
</para>
<para>
@ -3915,7 +3914,7 @@ mouse usage at runtime (see <link linkend="headerbar">headerbar</link>).
The default value is 'ps2'. The other choices are 'imps2' (wheel mouse
on PS/2), 'serial', 'serial_wheel' and 'serial_msys' (one com port requires
setting 'mode=mouse', see <link linkend="bochsopt-com">com option</link>).
To connect a mouse to an USB port, see the <link linkend="bochsopt-usb1">usb1 option</link>
To connect a mouse to an USB port, see the <link linkend="bochsopt-usb_uhci">usb_uhci option</link>
(requires PCI and USB support).
</para>
</section>
@ -3973,12 +3972,12 @@ located in the <constant>bochs/host/linux/pcidev/</constant> directory.
</para>
</section>
<section id="bochsopt-usb1"><title>usb1</title>
<section id="bochsopt-usb_uhci"><title>usb_uhci</title>
<para>
Examples:
<screen>
usb1: enabled=1, port1=mouse, port2=keypad
usb1: enabled=1, port1=tablet, port2=disk:usbdisk.img
usb_uhci: enabled=1, port1=mouse, port2=keypad
usb_uhci: enabled=1, port1=tablet, port2=disk:usbdisk.img
</screen>
This option controls the presence of the USB root hub which is a part of the
i440FX PCI chipset.
@ -4226,6 +4225,19 @@ the image is the source for the initial time.
</para>
</section>
<section><title>plugin_ctrl</title>
<para>
Example:
<screen>
plugin_ctrl: biosdev=0, speaker=0
</screen>
Controls the presence of optional plugins without a separate option.
By default all existing plugins are enabled. These plugins are currently
supported: 'acpi', 'biosdev', 'extfpuirq', 'gameport', 'iodebug',
'pci_ide', 'speaker' and 'unmapped'.
</para>
</section>
<section><title>magic_break</title>
<para>
Example:

48
bochs/doc/man/bochsrc.5
View File

@ -1,5 +1,5 @@
.\"Document Author: Timothy R. Butler - tbutler@uninetsolutions.com"
.TH bochsrc 5 "19 July 2008" "bochsrc" "The Bochs Project"
.TH bochsrc 5 "22 Febrary 2009" "bochsrc" "The Bochs Project"
.\"SKIP_SECTION"
.SH NAME
bochsrc \- Configuration file for Bochs.
@ -583,8 +583,8 @@ one line in the actual bochsrc file.
.I "vga_update_interval:"
Video memory is scanned for updates and screen updated
every so many virtual seconds. The default value is
40000, about 25Hz. Keep in mind that you must tweak
the 'cpu: ips=N' directive to be as close to the number of
50000, about 20Hz. Keep in mind that you must tweak
the 'cpu: ips=N' directive to be as close to the number of
emulated instructions-per-second your workstation can
do, for this to be accurate.
@ -643,19 +643,16 @@ Example:
.TP
.I "mouse:"
This option prevents Bochs from creating mouse "events"
unless a mouse is enabled. The hardware emulation itself
is not disabled by this. You can turn the mouse on by
setting enabled to 1, or turn it off by setting enabled
to 0. Unless you have a particular reason for enabling
the mouse by default, it is recommended that you leave
it off. You can also toggle the mouse usage at runtime
(control key + middle mouse button).
The Bochs gui creates mouse "events" unless the 'enabled' option is
set to 0. The hardware emulation itself is not disabled by this.
Unless you have a particular reason for enabling the mouse by default,
it is recommended that you leave it off. You can also toggle the mouse
usage at runtime (control key + middle mouse button).
With the mouse type option you can select the type of mouse to emulate.
The default value is 'ps2'. The other choices are 'imps2' (wheel mouse
on PS/2), 'serial', 'serial_wheel' (one com port requires setting 'mode=mouse')
and 'usb' (3-button mouse - one of the USB ports must be connected with
the 'mouse' device - requires PCI and USB support).
on PS/2), 'serial', 'serial_wheel' and 'serial_msys' (one com port requires
setting 'mode=mouse'). To connect a mouse to an USB port, see the 'usb_uhci'
option (requires PCI and USB support).
Examples:
mouse: enabled=0
@ -807,15 +804,28 @@ Example:
cmosimage: file=cmos.img, rtc_init=time0
.TP
.I "usb1:"
.I "usb_uhci:"
This option controls the presence of the USB root hub which is a part
of the i440FX PCI chipset. With the portX option you can connect devices
to the hub (currently supported: 'mouse' and 'keypad'). If you connect
the mouse to one of the ports and use the mouse option 'type=usb' you'll
have a 3-button USB mouse.
to the hub (currently supported: 'mouse', 'tablet', 'keypad' and 'disk').
If you connect the mouse or tablet to one of the ports, Bochs forwards the
mouse movement data to the USB device instead of the selected mouse type.
When connecting the keypad to one of the ports, Bochs forwards the input of
the numeric keypad to the USB device instead of the PS/2 keyboard.
To connect a flat image as an USB hardisk you can use the 'disk' device with
the path to the image separated with a colon (see below).
Example:
usb1: enabled=1, port1=mouse, port2=keypad
usb_uhci: enabled=1, port1=mouse, port2=disk:usbdisk.img
.TP
.I "plugin_ctrl:"
Controls the presence of optional plugins without a separate option.
By default all existing plugins are enabled. These plugins are currently
supported: 'acpi', 'biosdev', 'extfpuirq', 'gameport', 'iodebug', 'pci_ide', 'speaker' and 'unmapped'.
Example:
plugin_ctrl: biosdev=0, speaker=0
.\"SKIP_SECTION"
.SH LICENSE