From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qAh-0002Q3-Di for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:27:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T4qAZ-0004KD-Ng for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:27:19 -0400 Received: from qmta03.emeryville.ca.mail.comcast.net ([76.96.30.32]:36292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4qAZ-0004K5-HW for qemu-devel@nongnu.org; Fri, 24 Aug 2012 05:27:11 -0400 From: Matthew Ogilvie Date: Fri, 24 Aug 2012 03:13:55 -0600 Message-Id: <1345799636-9115-3-git-send-email-mmogilvi_qemu@miniinfo.net> In-Reply-To: <1345799636-9115-1-git-send-email-mmogilvi_qemu@miniinfo.net> References: <503714B0.1020404@web.de> <1345799636-9115-1-git-send-email-mmogilvi_qemu@miniinfo.net> Subject: [Qemu-devel] [PATCH 2/3] vga cga_hack=palette_blanking: narrower conditions for hack List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jan Kiszka , Matthew Ogilvie 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 --- 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