提交 5deaeee3 编写于 作者: J Juan Quintela 提交者: Anthony Liguori

cirrus_vga: rename cirrus_hook_read_palette() cirrus_vga_read_palette()

Simplify the logic to do everything inside the function
Signed-off-by: NJuan Quintela <quintela@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 31c63201
......@@ -1419,18 +1419,21 @@ static void cirrus_write_hidden_dac(CirrusVGAState * s, int reg_value)
*
***************************************/
static int cirrus_hook_read_palette(CirrusVGAState * s, int *reg_value)
static int cirrus_vga_read_palette(CirrusVGAState * s)
{
if (!(s->vga.sr[0x12] & CIRRUS_CURSOR_HIDDENPEL))
return CIRRUS_HOOK_NOT_HANDLED;
*reg_value =
s->cirrus_hidden_palette[(s->vga.dac_read_index & 0x0f) * 3 +
int val;
if ((s->vga.sr[0x12] & CIRRUS_CURSOR_HIDDENPEL)) {
val = s->cirrus_hidden_palette[(s->vga.dac_read_index & 0x0f) * 3 +
s->vga.dac_sub_index];
} else {
val = s->vga.palette[s->vga.dac_read_index * 3 + s->vga.dac_sub_index];
}
if (++s->vga.dac_sub_index == 3) {
s->vga.dac_sub_index = 0;
s->vga.dac_read_index++;
}
return CIRRUS_HOOK_HANDLED;
return val;
}
static int cirrus_hook_write_palette(CirrusVGAState * s, int reg_value)
......@@ -2698,13 +2701,7 @@ static uint32_t cirrus_vga_ioport_read(void *opaque, uint32_t addr)
c->cirrus_hidden_dac_lockindex = 0;
break;
case 0x3c9:
if (cirrus_hook_read_palette(c, &val))
break;
val = s->palette[s->dac_read_index * 3 + s->dac_sub_index];
if (++s->dac_sub_index == 3) {
s->dac_sub_index = 0;
s->dac_read_index++;
}
val = cirrus_vga_read_palette(c);
break;
case 0x3ca:
val = s->fcr;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册