diff options
| -rw-r--r-- | hw/cirrus_vga.c | 11 | ||||
| -rw-r--r-- | hw/vga.c | 20 | ||||
| -rw-r--r-- | hw/vga_int.h | 2 |
3 files changed, 19 insertions, 14 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 5f5710701c..7e63399bd8 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 @@ -284,14 +284,23 @@ static uint8_t vga_dumb_retrace(VGAState *s) return s->st01 ^ (ST01_V_RETRACE | ST01_DISP_ENABLE); } +int vga_ioport_invalid(VGACommonState *s, uint32_t addr) +{ + if (s->msr & MSR_COLOR_EMULATION) { + /* Color */ + return (addr >= 0x3b0 && addr <= 0x3bf); + } else { + /* Monochrome */ + return (addr >= 0x3d0 && addr <= 0x3df); + } +} + uint32_t vga_ioport_read(void *opaque, uint32_t addr) { VGACommonState *s = opaque; int val, index; - /* check port range access depending on color/monochrome mode */ - if ((addr >= 0x3b0 && addr <= 0x3bf && (s->msr & MSR_COLOR_EMULATION)) || - (addr >= 0x3d0 && addr <= 0x3df && !(s->msr & MSR_COLOR_EMULATION))) { + if (vga_ioport_invalid(s, addr)) { val = 0xff; } else { switch(addr) { @@ -383,10 +392,9 @@ void 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->msr & MSR_COLOR_EMULATION)) || - (addr >= 0x3d0 && addr <= 0x3df && !(s->msr & MSR_COLOR_EMULATION))) + if (vga_ioport_invalid(s, addr)) { return; - + } #ifdef DEBUG_VGA printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val); #endif diff --git a/hw/vga_int.h b/hw/vga_int.h index 9ff205d861..c162c07103 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -214,6 +214,8 @@ void vga_draw_cursor_line_32(uint8_t *d1, const uint8_t *src1, unsigned int color0, unsigned int color1, unsigned int color_xor); +int vga_ioport_invalid(VGACommonState *s, uint32_t addr); + extern const uint8_t sr_mask[8]; extern const uint8_t gr_mask[16]; |