mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cirrus_vga: rename cirrus_hook_write_palette() cirrus_vga_write_palette()

Browse Source 
Simplify the logic to do everything inside the function

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:28 +02:00 committed by Anthony Liguori
parent 5deaeee32f
commit 86948bb104
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/cirrus_vga.c
View File

@ -1436,19 +1436,20 @@ static int cirrus_vga_read_palette(CirrusVGAState * s)
return val; return val;
} }
static int cirrus_hook_write_palette(CirrusVGAState * s, int reg_value) static void cirrus_vga_write_palette(CirrusVGAState * s, int reg_value)
{ {
if (!(s->vga.sr[0x12] & CIRRUS_CURSOR_HIDDENPEL))
return CIRRUS_HOOK_NOT_HANDLED;
s->vga.dac_cache[s->vga.dac_sub_index] = reg_value; s->vga.dac_cache[s->vga.dac_sub_index] = reg_value;
if (++s->vga.dac_sub_index == 3) { if (++s->vga.dac_sub_index == 3) {
memcpy(&s->cirrus_hidden_palette[(s->vga.dac_write_index & 0x0f) * 3], if ((s->vga.sr[0x12] & CIRRUS_CURSOR_HIDDENPEL)) {
s->vga.dac_cache, 3); memcpy(&s->cirrus_hidden_palette[(s->vga.dac_write_index & 0x0f) * 3],
s->vga.dac_cache, 3);
} else {
memcpy(&s->vga.palette[s->vga.dac_write_index * 3], s->vga.dac_cache, 3);
}
/* XXX update cursor */ /* XXX update cursor */
s->vga.dac_sub_index = 0; s->vga.dac_sub_index = 0;
s->vga.dac_write_index++; s->vga.dac_write_index++;
} }
return CIRRUS_HOOK_HANDLED;
} }
/*************************************** /***************************************
@ -2824,15 +2825,8 @@ static void cirrus_vga_ioport_write(void *opaque, uint32_t addr, uint32_t val)
s->dac_state = 0; s->dac_state = 0;
break; break;
case 0x3c9: case 0x3c9:
if (cirrus_hook_write_palette(c, val)) cirrus_vga_write_palette(c, val);
break; break;
s->dac_cache[s->dac_sub_index] = val;
if (++s->dac_sub_index == 3) {
memcpy(&s->palette[s->dac_write_index * 3], s->dac_cache, 3);
s->dac_sub_index = 0;
s->dac_write_index++;
}
break;
case 0x3ce: case 0x3ce:
s->gr_index = val; s->gr_index = val;
break; break;