ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats 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; CirrusVGAState *s = opaque;
int val, index; int val, index;
/* check port range access depending on color/monochrome mode */ if (vga_ioport_invalid(&s->vga, addr)) {
if ((addr >= 0x3b0 && addr <= 0x3bf && (s->vga.msr & MSR_COLOR_EMULATION))
|| (addr >= 0x3d0 && addr <= 0x3df
&& !(s->vga.msr & MSR_COLOR_EMULATION))) {
val = 0xff; val = 0xff;
} else { } else {
switch (addr) { switch (addr) {
@ -2768,11 +2765,9 @@ static void cirrus_vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
int index; int index;
/* check port range access depending on color/monochrome mode */ /* check port range access depending on color/monochrome mode */
if ((addr >= 0x3b0 && addr <= 0x3bf && (s->vga.msr & MSR_COLOR_EMULATION)) if (vga_ioport_invalid(&s->vga, addr)) {
|| (addr >= 0x3d0 && addr <= 0x3df
&& !(s->vga.msr & MSR_COLOR_EMULATION)))
return; return;
}
#ifdef DEBUG_VGA #ifdef DEBUG_VGA
printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val); printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val);
#endif #endif

20
hw/vga.c
View File

@ -284,14 +284,23 @@ static uint8_t vga_dumb_retrace(VGAState *s)
return s->st01 ^ (ST01_V_RETRACE | ST01_DISP_ENABLE); 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) uint32_t vga_ioport_read(void *opaque, uint32_t addr)
{ {
VGACommonState *s = opaque; VGACommonState *s = opaque;
int val, index; int val, index;
/* check port range access depending on color/monochrome mode */ if (vga_ioport_invalid(s, addr)) {
if ((addr >= 0x3b0 && addr <= 0x3bf && (s->msr & MSR_COLOR_EMULATION)) ||
(addr >= 0x3d0 && addr <= 0x3df && !(s->msr & MSR_COLOR_EMULATION))) {
val = 0xff; val = 0xff;
} else { } else {
switch(addr) { switch(addr) {
@ -383,10 +392,9 @@ void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
int index; int index;
/* check port range access depending on color/monochrome mode */ /* check port range access depending on color/monochrome mode */
if ((addr >= 0x3b0 && addr <= 0x3bf && (s->msr & MSR_COLOR_EMULATION)) || if (vga_ioport_invalid(s, addr)) {
(addr >= 0x3d0 && addr <= 0x3df && !(s->msr & MSR_COLOR_EMULATION)))
return; return;
}
#ifdef DEBUG_VGA #ifdef DEBUG_VGA
printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val); printf("VGA: write addr=0x%04x data=0x%02x\n", addr, val);
#endif #endif

2
hw/vga_int.h
View File

@ -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 color0, unsigned int color1,
unsigned int color_xor); unsigned int color_xor);
int vga_ioport_invalid(VGACommonState *s, uint32_t addr);
extern const uint8_t sr_mask[8]; extern const uint8_t sr_mask[8];
extern const uint8_t gr_mask[16]; extern const uint8_t gr_mask[16];