DDC: changed the "off" case to Bochs default name "disabled" and updated docs.

This commit is contained in:
Volker Ruppert 2020-03-22 12:31:34 +00:00
parent e23a930864
commit ed223c6499
6 changed files with 25 additions and 12 deletions

View File

@ -428,9 +428,9 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
#
# DDC
# This parameter defines the behaviour of the DDC emulation that returns
# the monitor EDID data. The default value is 'builtin' (use valus for
# 'Bochs Screen'). Other choices are 'off' (feature disabled) and 'file'
# (read monitor EDID from file, name separated with a colon).
# the monitor EDID data. By default the 'builtin' values for 'Bochs Screen'
# are used. Other choices are 'disabled' (no DDC emulation) and 'file'
# (read monitor EDID from file / path name separated with a colon).
# Examples:
# vga: extension=cirrus, update_freq=10, ddc=builtin
#=======================================================================

View File

@ -996,17 +996,17 @@ void bx_init_options()
display->set_options(display->SHOW_PARENT);
static const char *ddc_mode_list[] = {
"off",
"disabled",
"builtin",
"file",
NULL
};
bx_param_enum_c *ddc_mode = new bx_param_enum_c(display,
"ddc_mode", "DDC emulatiion mode",
"ddc_mode", "DDC emulation mode",
"Select DDC emulation mode",
ddc_mode_list,
BX_DDC_MODE_BUILTIN,
BX_DDC_MODE_OFF);
BX_DDC_MODE_DISABLED);
path = new bx_param_filename_c(display,
"ddc_file",
"DDC definition file",

View File

@ -3831,7 +3831,7 @@ in the simulation, that can be retrieved by the boot loader
<para>
Examples:
<screen>
vga: extension=cirrus, update_freq=10, realtime=1
vga: extension=cirrus, update_freq=10, realtime=1, ddc=file:monitor.bin
vga: extension=vbe
</screen>
This defines parameters related to the VGA display
@ -3858,6 +3858,12 @@ appropriately, setting this to 0 and "clock: sync=none" may improve the
responsiveness of the guest GUI when the guest is otherwise idle. The default
value is 1.
</para>
<para>
The parameter 'ddc' defines the behaviour of the DDC emulation that returns
the monitor EDID data. By default the 'builtin' values for 'Bochs Screen'
are used. Other choices are 'disabled' (no DDC emulation) and 'file'
(read monitor EDID from file / path name separated with a colon).
</para>
</section>
<section>

View File

@ -1,5 +1,5 @@
.\"Document Author: Timothy R. Butler - tbutler@uninetsolutions.com"
.TH bochsrc 5 "12 Mar 2020" "bochsrc" "The Bochs Project"
.TH bochsrc 5 "22 Mar 2020" "bochsrc" "The Bochs Project"
.\"SKIP_SECTION"
.SH NAME
bochsrc \- Configuration file for Bochs.
@ -479,9 +479,16 @@ is driven by the cpu and depends on the ips setting. If the host is slow
to 0 and "clock: sync=none" may improve the responsiveness of the guest
GUI when the guest is otherwise idle.
ddc:
This parameter defines the behaviour of the DDC emulation that returns
the monitor EDID data. By default the 'builtin' values for 'Bochs Screen'
are used. Other choices are 'disabled' (no DDC emulation) and 'file'
(read monitor EDID from file / path name separated with a colon).
Examples:
vga: extension=none, update_freq=10, realtime=0
vga: extension=cirrus, update_freq=30
vga: extension=none, update_freq=10, realtime=0, ddc=disabled
vga: extension=cirrus, update_freq=30, ddc=file:monitor.bin
vga: extension=vbe
.TP

View File

@ -486,7 +486,7 @@ enum {
};
enum {
BX_DDC_MODE_OFF,
BX_DDC_MODE_DISABLED,
BX_DDC_MODE_BUILTIN,
BX_DDC_MODE_FILE
};

View File

@ -210,7 +210,7 @@ void bx_ddc_c::write(bx_bool dck, bx_bool dda)
bx_bool dck_change = 0;
bx_bool dda_change = 0;
if (s.ddc_mode == BX_DDC_MODE_OFF)
if (s.ddc_mode == BX_DDC_MODE_DISABLED)
return;
if ((dck != s.DCKhost) || (dda != s.DDAhost)) {