gwj / at91sam9263 · Commits

Commit 1dcea8e82b1d7795e6719a8ac8762993fc1ed4b3

Authored by Paul Brook
1 parent 0ecdb16e

Remove vga LFB accessor hacks. 

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

Signed-off-by: Paul Brook <paul@codesourcery.com>
Inline Side-by-side
Showing 1 changed file with 0 additions and 8 deletions
hw/cirrus_vga.c
  View file @1dcea8e
... ... @@ -279,7 +279,6 @@ typedef struct CirrusVGAState {
279 279 int last_hw_cursor_y_start;
280 280 int last_hw_cursor_y_end;
281 281 int real_vram_size; /* XXX: suppress that */
282   - CPUWriteMemoryFunc **cirrus_linear_write;
283 282 int device_id;
284 283 int bustype;
285 284 } CirrusVGAState;
... ... @@ -2677,15 +2676,9 @@ static void cirrus_update_memory_access(CirrusVGAState *s)
2677 2676 mode = s->gr[0x05] & 0x7;
2678 2677 if (mode < 4 || mode > 5 || ((s->gr[0x0B] & 0x4) == 0)) {
2679 2678 map_linear_vram(s);
2680   - s->cirrus_linear_write[0] = cirrus_linear_mem_writeb;
2681   - s->cirrus_linear_write[1] = cirrus_linear_mem_writew;
2682   - s->cirrus_linear_write[2] = cirrus_linear_mem_writel;
2683 2679 } else {
2684 2680 generic_io:
2685 2681 unmap_linear_vram(s);
2686   - s->cirrus_linear_write[0] = cirrus_linear_writeb;
2687   - s->cirrus_linear_write[1] = cirrus_linear_writew;
2688   - s->cirrus_linear_write[2] = cirrus_linear_writel;
2689 2682 }
2690 2683 }
2691 2684 }
... ... @@ -3243,7 +3236,6 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)
3243 3236 /* I/O handler for LFB */
3244 3237 s->cirrus_linear_io_addr =
3245 3238 cpu_register_io_memory(0, cirrus_linear_read, cirrus_linear_write, s);
3246   - s->cirrus_linear_write = cpu_get_io_memory_write(s->cirrus_linear_io_addr);
3247 3239  
3248 3240 /* I/O handler for LFB */
3249 3241 s->cirrus_linear_bitblt_io_addr =
... ...