In commit 482f7bf86b43af9f, I mistakenly inverted the logic
I intended for ar_flip_flop. I intended to allow the GMODE_BLANK
case as soon as any palette register was modified.
Also include minor tweak to documentation about how to list
multiple hacks on the command line.
Signed-off-by: Matthew Ogilvie <mmogilvi_q...@miniinfo.net>
---
hw/vga.c | 5 +++--
qemu-options.hx | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/vga.c b/hw/vga.c
index a65fc26..fb08dc0 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1904,9 +1904,10 @@ static void vga_update_display(void *opaque)
} else {
full_update = 0;
if (!(s->ar_index & 0x20) &&
- /* extra CGA compatibility hacks (not in standard VGA */
+ /* extra CGA compatibility hacks (not in standard VGA) */
(!(vga_cga_hacks & VGA_CGA_HACK_PALETTE_BLANKING) ||
- (s->ar_index != 0 && s->ar_flip_flop))) {
+ s->ar_index != 0 ||
+ !s->ar_flip_flop)) {
graphic_mode = GMODE_BLANK;
} else {
graphic_mode = s->gr[VGA_GFX_MISC] & VGA_GR06_GRAPHICS_MODE;
diff --git a/qemu-options.hx b/qemu-options.hx
index 2a6d829..b28e853 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -975,7 +975,7 @@ Valid optional properties are
@item retrace=dumb|precise
Select dumb (default) or precise VGA retrace logic, useful for some
DOS games/demos.
-@item cga_hacks=@var{hack1}[+@var{hack2},[...]]
+@item cga_hacks=@var{hack1}[+@var{hack2}[+...]]
Enable various extra CGA compatibility hacks for programs that are
trying to directly set CGA modes without BIOS assistance nor
real knowledge of EGA/VGA. These might only work with -vga std.
--
1.7.10.2.484.gcd07cc5
