From 25a18cbd27d1556aafe268d48bffbb3c883de081 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 31 Aug 2009 16:07:19 +0200 Subject: vga and cirrus_vga: create vga_ioport_invalid() and use it everywhere Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- hw/cirrus_vga.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'hw/cirrus_vga.c') diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 5f57107..7e63399 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2661,10 +2661,7 @@ static uint32_t cirrus_vga_ioport_read(void *opaque, uint32_t addr) CirrusVGAState *s = opaque; int val, index; - /* check port range access depending on color/monochrome mode */ - if ((addr >= 0x3b0 && addr <= 0x3bf && (s->vga.msr & MSR_COLOR_EMULATION)) - || (addr >= 0x3d0 && addr <= 0x3df - && !(s->vga.msr & MSR_COLOR_EMULATION))) { + if (vga_ioport_invalid(&s->vga, addr)) { val = 0xff; } else { switch (addr) { @@ -2768,11 +2765,9 @@ static void cirrus_vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) int index; /* check port range access depending on color/monochrome mode */ - if ((addr >= 0x3b0 && addr <= 0x3bf && (s->vga.msr & MSR_COLOR_EMULATION)) - || (addr >= 0x3d0 && addr <= 0x3df - && !(s->vga.msr & MSR_COLOR_EMULATION))) + if (vga_ioport_invalid(&s->vga, addr)) { return; - + } #ifdef DEBUG_VGA printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val); #endif -- cgit v1.1