[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/23] cirrus_vga: rename cirrus_hook_read_cr() cirr
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 21/23] cirrus_vga: rename cirrus_hook_read_cr() cirrus_vga_read_cr() |
Date: |
Mon, 31 Aug 2009 16:07:31 +0200 |
Simplify the logic to do everything inside the function. Return 0xff if index
is out of range independetly of DEBUG_CIRRUS
Signed-off-by: Juan Quintela <address@hidden>
---
hw/cirrus_vga.c | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 759da4a..86ab127 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -1583,8 +1583,7 @@ cirrus_vga_write_gr(CirrusVGAState * s, unsigned
reg_index, int reg_value)
*
***************************************/
-static int
-cirrus_hook_read_cr(CirrusVGAState * s, unsigned reg_index, int *reg_value)
+static int cirrus_vga_read_cr(CirrusVGAState * s, unsigned reg_index)
{
switch (reg_index) {
case 0x00: // Standard VGA
@@ -1612,10 +1611,9 @@ cirrus_hook_read_cr(CirrusVGAState * s, unsigned
reg_index, int *reg_value)
case 0x16: // Standard VGA
case 0x17: // Standard VGA
case 0x18: // Standard VGA
- return CIRRUS_HOOK_NOT_HANDLED;
+ return s->vga.cr[s->vga.cr_index];
case 0x24: // Attribute Controller Toggle Readback (R)
- *reg_value = (s->vga.ar_flip_flop << 7);
- break;
+ return (s->vga.ar_flip_flop << 7);
case 0x19: // Interlace End
case 0x1a: // Miscellaneous Control
case 0x1b: // Extended Display Control
@@ -1624,20 +1622,16 @@ cirrus_hook_read_cr(CirrusVGAState * s, unsigned
reg_index, int *reg_value)
case 0x22: // Graphics Data Latches Readback (R)
case 0x25: // Part Status
case 0x27: // Part ID (R)
- *reg_value = s->vga.cr[reg_index];
- break;
+ return s->vga.cr[s->vga.cr_index];
case 0x26: // Attribute Controller Index Readback (R)
- *reg_value = s->vga.ar_index & 0x3f;
+ return s->vga.ar_index & 0x3f;
break;
default:
#ifdef DEBUG_CIRRUS
printf("cirrus: inport cr_index %02x\n", reg_index);
- *reg_value = 0xff;
#endif
- break;
+ return 0xff;
}
-
- return CIRRUS_HOOK_HANDLED;
}
static int
@@ -2719,9 +2713,7 @@ static uint32_t cirrus_vga_ioport_read(void *opaque,
uint32_t addr)
break;
case 0x3b5:
case 0x3d5:
- if (cirrus_hook_read_cr(c, s->cr_index, &val))
- break;
- val = s->cr[s->cr_index];
+ val = cirrus_vga_read_cr(c, s->cr_index);
#ifdef DEBUG_VGA_REG
printf("vga: read CR%x = 0x%02x\n", s->cr_index, val);
#endif
--
1.6.2.5
- [Qemu-devel] [PATCH 11/23] vga: change tabs to spaces, (continued)
- [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, 2009/08/31
- [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 <=
- [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