]> xenbits.xensource.com Git - qemu-xen-4.1-testing.git/commitdiff
cirrusfb: proper "Attribute Controller Toggle Readback" register behaviour vga-reverse-merge
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
Thu, 8 May 2008 12:21:27 +0000 (12:21 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 23 May 2008 17:13:17 +0000 (18:13 +0100)
(Marcelo Tosatti)

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

hw/cirrus_vga.c

index aaad7ea44887a96a853bbe84536f117c46ffb4d4..c23fc8923e1df00914c6c934a079e94547d3216e 100644 (file)
@@ -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];