summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-07 22:54:14 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2004-11-07 22:54:14 +0000
commit9bb34eac8b89f624776ce6604c22d7c3097a1e24 (patch)
tree31d37f4524d84039ac06a652dec4244f4e00bfd7
parent85571bc7415c3fa9390f5edc3720ec7975219a68 (diff)
downloadqemu-9bb34eac8b89f624776ce6604c22d7c3097a1e24.tar.gz
CRTC register write protection fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1126 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--hw/cirrus_vga.c2
-rw-r--r--pc-bios/vgabios-cirrus.binbin30852 -> 30868 bytes
-rw-r--r--pc-bios/vgabios.binbin29673 -> 31533 bytes
3 files changed, 1 insertions, 1 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 9d80515196..7c34c57899 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2689,7 +2689,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
printf("vga: write CR%x = 0x%02x\n", s->cr_index, val);
#endif
/* handle CR0-7 protection */
- if ((s->cr[11] & 0x80) && s->cr_index <= 7) {
+ if ((s->cr[0x11] & 0x80) && s->cr_index <= 7) {
/* can always write bit 4 of CR7 */
if (s->cr_index == 7)
s->cr[7] = (s->cr[7] & ~0x10) | (val & 0x10);
diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin
index 58572b6438..4e3c829545 100644
--- a/pc-bios/vgabios-cirrus.bin
+++ b/pc-bios/vgabios-cirrus.bin
Binary files differ
diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin
index 88e99f6cb1..ed31b12b13 100644
--- a/pc-bios/vgabios.bin
+++ b/pc-bios/vgabios.bin
Binary files differ