From 29f5a696fcfbc970a2fd4115a138b0268d089dfc Mon Sep 17 00:00:00 2001 From: Volker Ruppert Date: Sun, 22 Feb 2009 17:05:40 +0000 Subject: [PATCH] - improved config interface labels for the optional plugin control - documentation updates --- bochs/.bochsrc | 23 ++++++++-------- bochs/CHANGES | 7 +++-- bochs/config.cc | 20 +++++++------- bochs/doc/docbook/user/user.dbk | 34 +++++++++++++++-------- bochs/doc/man/bochsrc.5 | 48 ++++++++++++++++++++------------- 5 files changed, 78 insertions(+), 54 deletions(-) diff --git a/bochs/.bochsrc b/bochs/.bochsrc index 013ae1332..7a563bf4e 100644 --- a/bochs/.bochsrc +++ b/bochs/.bochsrc @@ -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: diff --git a/bochs/CHANGES b/bochs/CHANGES index 53ab2cdef..136512431 100644 --- a/bochs/CHANGES +++ b/bochs/CHANGES @@ -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 diff --git a/bochs/config.cc b/bochs/config.cc index 9bc337b9d..40654d6e9 100755 --- a/bochs/config.cc +++ b/bochs/config.cc @@ -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 diff --git a/bochs/doc/docbook/user/user.dbk b/bochs/doc/docbook/user/user.dbk index 19ed3683c..c9f0a1f87 100644 --- a/bochs/doc/docbook/user/user.dbk +++ b/bochs/doc/docbook/user/user.dbk @@ -1,7 +1,7 @@