[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/23] cirrus_vga: make cirrus_read_hidden_dac() ret
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 12/23] cirrus_vga: make cirrus_read_hidden_dac() return its result |
Date: |
Mon, 31 Aug 2009 16:07:22 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/cirrus_vga.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index b8a3ea2..b2b6e85 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -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) {
- *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)
@@ -2695,7 +2695,7 @@ static uint32_t cirrus_vga_ioport_read(void *opaque,
uint32_t addr)
#endif
break;
case 0x3c6:
- cirrus_read_hidden_dac(c, &val);
+ val = cirrus_read_hidden_dac(c);
break;
case 0x3c7:
val = s->dac_state;
--
1.6.2.5
- [Qemu-devel] [PATCH 03/23] vga: export vga_ioport_{read,write}, (continued)
- [Qemu-devel] [PATCH 03/23] vga: export vga_ioport_{read,write}, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 04/23] vga: split vga_{load, save} into pci and common parts, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 05/23] vga: split pci bits into vga-pci.c, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 06/23] vga: split isa bits inco vga-isa.c, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 07/23] vga: export vga_mem_{read,write}, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 08/23] vga: split vga-isa-mm.o, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 09/23] vga and cirrus_vga: create vga_ioport_invalid() and use it everywhere, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 10/23] cirrus_vga: Add a VGACommonState local var to cirrus_vga_ioport_{read, write}, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 11/23] vga: change tabs to spaces, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 13/23] vga and cirrus_vga: substitute switch for equivalent assigntment, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 12/23] cirrus_vga: make cirrus_read_hidden_dac() return its result,
Juan Quintela <=
- [Qemu-devel] [PATCH 15/23] cirrus_vga: rename cirrus_hook_read_sr() cirrus_vga_read_sr(), Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 14/23] vga: Rename last VGAState occurrences to VGACommonState, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 16/23] cirrus_vga: rename cirrus_hook_write_sr() cirrus_vga_write_sr(), Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 18/23] cirrus_vga: rename cirrus_hook_write_palette() cirrus_vga_write_palette(), Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 17/23] cirrus_vga: rename cirrus_hook_read_palette() cirrus_vga_read_palette(), Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 20/23] cirrus_vga: rename cirrus_hook_write_gr() cirrus_vga_write_gr(), Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 19/23] cirrus_vga: rename cirrus_hook_read_gr() cirrus_vga_read_gr(), Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 21/23] cirrus_vga: rename cirrus_hook_read_cr() cirrus_vga_read_cr(), Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 23/23] cirrus_vga: CIRRUS_HOOK_* is not used anymore, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 22/23] cirrus_vga: rename cirrus_hook_write_cr() cirrus_vga_write_cr(), Juan Quintela, 2009/08/31