diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-04-30 18:30:38 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-04-30 18:35:05 +0100 |
| commit | 1dcea8e82b1d7795e6719a8ac8762993fc1ed4b3 (patch) | |
| tree | b034cdf9788c9afb9fc859618eab93d68371230e /hw/cirrus_vga.c | |
| parent | 0ecdb16ef01ffbff7e5c88872e885c9f6c6e89c7 (diff) | |
Remove vga LFB accessor hacks.
These are redundant now that we remap the LFB ram area.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/cirrus_vga.c')
| -rw-r--r-- | hw/cirrus_vga.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 114681e7de..df98f8526f 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -279,7 +279,6 @@ typedef struct CirrusVGAState { int last_hw_cursor_y_start; int last_hw_cursor_y_end; int real_vram_size; /* XXX: suppress that */ - CPUWriteMemoryFunc **cirrus_linear_write; int device_id; int bustype; } CirrusVGAState; @@ -2677,15 +2676,9 @@ static void cirrus_update_memory_access(CirrusVGAState *s) mode = s->gr[0x05] & 0x7; if (mode < 4 || mode > 5 || ((s->gr[0x0B] & 0x4) == 0)) { map_linear_vram(s); - s->cirrus_linear_write[0] = cirrus_linear_mem_writeb; - s->cirrus_linear_write[1] = cirrus_linear_mem_writew; - s->cirrus_linear_write[2] = cirrus_linear_mem_writel; } else { generic_io: unmap_linear_vram(s); - s->cirrus_linear_write[0] = cirrus_linear_writeb; - s->cirrus_linear_write[1] = cirrus_linear_writew; - s->cirrus_linear_write[2] = cirrus_linear_writel; } } } @@ -3243,7 +3236,6 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci) /* I/O handler for LFB */ s->cirrus_linear_io_addr = cpu_register_io_memory(0, cirrus_linear_read, cirrus_linear_write, s); - s->cirrus_linear_write = cpu_get_io_memory_write(s->cirrus_linear_io_addr); /* I/O handler for LFB */ s->cirrus_linear_bitblt_io_addr = |