From: aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Thu, 8 May 2008 12:21:27 +0000 (+0000)
Subject: cirrusfb: proper "Attribute Controller Toggle Readback" register behaviour
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fvga-reverse-merge;p=qemu-xen-3.3-testing.git

cirrusfb: proper "Attribute Controller Toggle Readback" register behaviour

(Marcelo Tosatti)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4386 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index aaad7ea4..c23fc892 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -1646,13 +1646,15 @@ cirrus_hook_read_cr(CirrusVGAState * s, unsigned reg_index, int *reg_value)
     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];