motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 10:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vga and cirrus_vga: create vga_ioport_invalid() and use it everywhere

Browse source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-08-31 16:07:19 +02:00 • committed by Anthony Liguori
parent 79b97bf2e7
commit 25a18cbd27
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/cirrus_vga.c
View file

@ -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