SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove vga LFB accessor hacks.

Browse Source 
These are redundant now that we remap the LFB ram area.

Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Paul Brook 2009-04-30 18:30:38 +01:00
parent 0ecdb16ef0
commit 1dcea8e82b
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/cirrus_vga.c
View File

@ -279,7 +279,6 @@ typedef struct CirrusVGAState {
int last_hw_cursor_y_start; int last_hw_cursor_y_start;
int last_hw_cursor_y_end; int last_hw_cursor_y_end;
int real_vram_size; /* XXX: suppress that */ int real_vram_size; /* XXX: suppress that */
CPUWriteMemoryFunc **cirrus_linear_write;
int device_id; int device_id;
int bustype; int bustype;
} CirrusVGAState; } CirrusVGAState;
@ -2677,15 +2676,9 @@ static void cirrus_update_memory_access(CirrusVGAState *s)
mode = s->gr[0x05] & 0x7; mode = s->gr[0x05] & 0x7;
if (mode < 4 || mode > 5 || ((s->gr[0x0B] & 0x4) == 0)) { if (mode < 4 || mode > 5 || ((s->gr[0x0B] & 0x4) == 0)) {
map_linear_vram(s); 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 { } else {
generic_io: generic_io:
unmap_linear_vram(s); 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 */ /* I/O handler for LFB */
s->cirrus_linear_io_addr = s->cirrus_linear_io_addr =
cpu_register_io_memory(0, cirrus_linear_read, cirrus_linear_write, s); 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 */ /* I/O handler for LFB */
s->cirrus_linear_bitblt_io_addr = s->cirrus_linear_bitblt_io_addr =