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

cirrus_vga: make cirrus_read_hidden_dac() return its result 

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:22 +02:00 committed by Anthony Liguori
parent e9b43ea36a
commit 957c9db562
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/cirrus_vga.c
View File

@ -1399,13 +1399,13 @@ cirrus_hook_write_sr(CirrusVGAState * s, unsigned reg_index, int reg_value)
* *
***************************************/ ***************************************/
static void cirrus_read_hidden_dac(CirrusVGAState * s, int *reg_value) static int cirrus_read_hidden_dac(CirrusVGAState * s)
{ {
*reg_value = 0xff;
if (++s->cirrus_hidden_dac_lockindex == 5) { if (++s->cirrus_hidden_dac_lockindex == 5) {
*reg_value = s->cirrus_hidden_dac_data; s->cirrus_hidden_dac_lockindex = 0;
s->cirrus_hidden_dac_lockindex = 0; return s->cirrus_hidden_dac_data;
} }
return 0xff;
} }
static void cirrus_write_hidden_dac(CirrusVGAState * s, int reg_value) static void cirrus_write_hidden_dac(CirrusVGAState * s, int reg_value)
@ -2695,7 +2695,7 @@ static uint32_t cirrus_vga_ioport_read(void *opaque, uint32_t addr)
#endif #endif
break; break;
case 0x3c6: case 0x3c6:
cirrus_read_hidden_dac(c, &val); val = cirrus_read_hidden_dac(c);
break; break;
case 0x3c7: case 0x3c7:
val = s->dac_state; val = s->dac_state;