[prev in list] [next in list] [prev in thread] [next in thread]
List: bochs-cvs
Subject: [Bochs-cvs] [13277] trunk/bochs
From: vruppert--- via Bochs-cvs <bochs-cvs () lists ! sourceforge ! net>
Date: 2017-08-18 15:19:30
Message-ID: 1503069570.954844.21964 () sfp-scm-6 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 13277
Author: vruppert
Date: 2017-08-18 15:19:30 +0000 (Fri, 18 Aug 2017)
Log Message:
-----------
Removed Voodoo realtime option. Since the gui screen update timing is now
controlled by the 'vga' option and Voodoo2 CMDFIFO thread has the best
performance with realtime mode disabled, this option is now obsolete.
Modified Paths:
--------------
trunk/bochs/.bochsrc
trunk/bochs/PARAM_TREE.txt
trunk/bochs/doc/docbook/user/user.dbk
trunk/bochs/doc/man/bochsrc.5
trunk/bochs/iodev/display/voodoo.cc
trunk/bochs/iodev/display/voodoo.h
Modified: trunk/bochs/.bochsrc
===================================================================
--- trunk/bochs/.bochsrc 2017-08-17 19:15:02 UTC (rev 13276)
+++ trunk/bochs/.bochsrc 2017-08-18 15:19:30 UTC (rev 13277)
@@ -433,12 +433,11 @@
# VOODOO:
# This defines the Voodoo Graphics emulation (experimental). Currently
# supported models are 'voodoo1' and 'voodoo2'. The Voodoo2 support is not yet
-# complete, but almost usable. The 'realtime' option controls the behaviour of
-# the timer used for the vertical retrace emulation. The gui screen update
-# timing is controlled by the related 'vga' options.
+# complete, but almost usable. The gui screen update timing is controlled by
+# the related 'vga' options.
#
# Examples:
-# voodoo: enabled=1, model=voodoo1, realtime=1
+# voodoo: enabled=1, model=voodoo2
#=======================================================================
#voodoo: enabled=1, model=voodoo1
Modified: trunk/bochs/PARAM_TREE.txt
===================================================================
--- trunk/bochs/PARAM_TREE.txt 2017-08-17 19:15:02 UTC (rev 13276)
+++ trunk/bochs/PARAM_TREE.txt 2017-08-18 15:19:30 UTC (rev 13277)
@@ -133,7 +133,6 @@
voodoo
enabled
model
- realtime
keyboard_mouse
keyboard
Modified: trunk/bochs/doc/docbook/user/user.dbk
===================================================================
--- trunk/bochs/doc/docbook/user/user.dbk 2017-08-17 19:15:02 UTC (rev 13276)
+++ trunk/bochs/doc/docbook/user/user.dbk 2017-08-18 15:19:30 UTC (rev 13277)
@@ -3828,13 +3828,12 @@
<para>
Example:
<screen>
- voodoo: enabled=1, model=voodoo1, realtime=1
+ voodoo: enabled=1, model=voodoo1
</screen>
This defines the Voodoo Graphics emulation (experimental). Currently
supported models are 'voodoo1' and 'voodoo2'. The Voodoo2 support is
-not yet complete, but almost usable. The 'realtime' option controls the
-behaviour of the timer used for the vertical retrace emulation. The gui
-screen update timing is controlled by the related 'vga' options.
+not yet complete, but almost usable. The gui screen update timing is
+controlled by the related 'vga' options.
</para>
</section>
Modified: trunk/bochs/doc/man/bochsrc.5
===================================================================
--- trunk/bochs/doc/man/bochsrc.5 2017-08-17 19:15:02 UTC (rev 13276)
+++ trunk/bochs/doc/man/bochsrc.5 2017-08-18 15:19:30 UTC (rev 13277)
@@ -1,5 +1,5 @@
.\"Document Author: Timothy R. Butler - tbutler@uninetsolutions.com"
-.TH bochsrc 5 "21 May 2017" "bochsrc" "The Bochs Project"
+.TH bochsrc 5 "18 Aug 2017" "bochsrc" "The Bochs Project"
.\"SKIP_SECTION"
.SH NAME
bochsrc \- Configuration file for Bochs.
@@ -483,12 +483,11 @@
.I "voodoo:"
This defines the Voodoo Graphics emulation (experimental). Currently
supported models are 'voodoo1' and 'voodoo2'. The Voodoo2 support is not
-yet complete, but almost usable. The 'realtime' option controls the behaviour
-of the timer used for the vertical retrace emulation. The gui screen update
-timing is controlled by the related 'vga' options.
+yet complete, but almost usable. The gui screen update timing is controlled
+by the related 'vga' options.
Example:
- voodoo: enabled=1, model=voodoo1, realtime=1
+ voodoo: enabled=1, model=voodoo1
.TP
.I "keyboard:"
Modified: trunk/bochs/iodev/display/voodoo.cc
===================================================================
--- trunk/bochs/iodev/display/voodoo.cc 2017-08-17 19:15:02 UTC (rev 13276)
+++ trunk/bochs/iodev/display/voodoo.cc 2017-08-18 15:19:30 UTC (rev 13277)
@@ -109,11 +109,6 @@
"Selects the Voodoo model to emulate.",
voodoo_model_list,
VOODOO_1, VOODOO_1);
- new bx_param_bool_c(menu,
- "realtime",
- "Voodoo timer realtime",
- "If enabled, the Voodoo timer is based on realtime",
- 1);
enabled->set_dependent_list(menu->clone());
}
@@ -223,7 +218,6 @@
DEV_register_pci_handlers(this, &BX_VOODOO_THIS s.devfunc, BX_PLUGIN_VOODOO,
"Experimental 3dfx Voodoo Graphics (SST-1/2)");
- BX_VOODOO_THIS s.vdraw.realtime = SIM->get_param_bool("realtime", base)->get();
if (BX_VOODOO_THIS s.mode_change_timer_id == BX_NULL_TIMER_HANDLE) {
BX_VOODOO_THIS s.mode_change_timer_id = bx_virt_timer.register_timer(this, \
mode_change_timer_handler, 1000, 0, 0, 0, "voodoo_mode_change");
@@ -230,7 +224,7 @@
}
if (BX_VOODOO_THIS s.vertical_timer_id == BX_NULL_TIMER_HANDLE) {
BX_VOODOO_THIS s.vertical_timer_id = bx_virt_timer.register_timer(this, \
vertical_timer_handler,
- 50000, 1, 0, BX_VOODOO_THIS s.vdraw.realtime, "vertical_timer");
+ 50000, 1, 0, 0, "vertical_timer");
}
BX_VOODOO_THIS s.vdraw.clock_enabled = 1;
BX_VOODOO_THIS s.vdraw.output_on = 0;
@@ -496,7 +490,7 @@
if (BX_VOODOO_THIS s.vdraw.override_on) {
// force update
v->fbi.video_changed = 1;
- BX_VOODOO_THIS s.vdraw.frame_start = bx_virt_timer.time_usec(BX_VOODOO_THIS \
s.vdraw.realtime); + BX_VOODOO_THIS s.vdraw.frame_start = \
bx_virt_timer.time_usec(0); BX_VOODOO_THIS update_timing();
DEV_vga_set_override(1, BX_VOODOO_THIS_PTR);
}
@@ -605,7 +599,7 @@
{
UNUSED(this_ptr);
- BX_VOODOO_THIS s.vdraw.frame_start = bx_virt_timer.time_usec(BX_VOODOO_THIS \
s.vdraw.realtime); + BX_VOODOO_THIS s.vdraw.frame_start = \
bx_virt_timer.time_usec(0);
if (v->fbi.cmdfifo[0].cmd_ready) {
cmdfifo_set_event();
@@ -701,7 +695,7 @@
Bit32u bx_voodoo_c::get_retrace(bx_bool hv)
{
- Bit64u time_in_frame = bx_virt_timer.time_usec(BX_VOODOO_THIS s.vdraw.realtime) - \
BX_VOODOO_THIS s.vdraw.frame_start; + Bit64u time_in_frame = \
bx_virt_timer.time_usec(0) - BX_VOODOO_THIS s.vdraw.frame_start; if (time_in_frame \
>= BX_VOODOO_THIS s.vdraw.vsync_usec) { return 0;
} else {
Modified: trunk/bochs/iodev/display/voodoo.h
===================================================================
--- trunk/bochs/iodev/display/voodoo.h 2017-08-17 19:15:02 UTC (rev 13276)
+++ trunk/bochs/iodev/display/voodoo.h 2017-08-18 15:19:30 UTC (rev 13277)
@@ -40,7 +40,6 @@
bx_bool override_on;
bx_bool screen_update_pending;
bx_bool gui_update_pending;
- bx_bool realtime;
} vdraw;
int mode_change_timer_id;
int vertical_timer_id;
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic