From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ju57x-0003OG-3l
	for qemu-devel@nongnu.org; Thu, 08 May 2008 08:21:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ju57w-0003Nl-7V
	for qemu-devel@nongnu.org; Thu, 08 May 2008 08:21:36 -0400
Received: from [199.232.76.173] (port=56061 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ju57w-0003Ni-0X
	for qemu-devel@nongnu.org; Thu, 08 May 2008 08:21:36 -0400
Received: from savannah.gnu.org ([199.232.41.3]:42372 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <aurelien@aurel32.net>)
	id 1Ju57v-0007lz-SG
	for qemu-devel@nongnu.org; Thu, 08 May 2008 08:21:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <aurelien@aurel32.net>) id 1Ju57t-0002y5-3E
	for qemu-devel@nongnu.org; Thu, 08 May 2008 12:21:33 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1Ju57q-0002xr-Vv
	for qemu-devel@nongnu.org; Thu, 08 May 2008 12:21:31 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1Ju57q-0002xr-Vv@cvs.savannah.gnu.org>
Date: Thu, 08 May 2008 12:21:31 +0000
Subject: [Qemu-devel] [4386] cirrusfb: proper "Attribute Controller Toggle
 Readback" register behaviour
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4386
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4386
Author:   aurel32
Date:     2008-05-08 12:21:27 +0000 (Thu, 08 May 2008)

Log Message:
-----------
cirrusfb: proper "Attribute Controller Toggle Readback" register behaviour

(Marcelo Tosatti)

Modified Paths:
--------------
    trunk/hw/cirrus_vga.c

Modified: trunk/hw/cirrus_vga.c
===================================================================
--- trunk/hw/cirrus_vga.c	2008-05-07 23:22:46 UTC (rev 4385)
+++ trunk/hw/cirrus_vga.c	2008-05-08 12:21:27 UTC (rev 4386)
@@ -1626,13 +1626,15 @@
     case 0x17:			// Standard VGA
     case 0x18:			// Standard VGA
 	return CIRRUS_HOOK_NOT_HANDLED;
+    case 0x24:			// Attribute Controller Toggle Readback (R)
+        *reg_value = (s->ar_flip_flop << 7);
+        break;
     case 0x19:			// Interlace End
     case 0x1a:			// Miscellaneous Control
     case 0x1b:			// Extended Display Control
     case 0x1c:			// Sync Adjust and Genlock
     case 0x1d:			// Overlay Extended Control
     case 0x22:			// Graphics Data Latches Readback (R)
-    case 0x24:			// Attribute Controller Toggle Readback (R)
     case 0x25:			// Part Status
     case 0x27:			// Part ID (R)
 	*reg_value = s->cr[reg_index];