move vga_io_address to VGA State (Glauber Costa)
It'll be reused later by the vga optimization. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5791 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
4efe27556d
commit
b4fbd8798a
@ -3117,7 +3117,7 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id)
|
||||
|
||||
static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)
|
||||
{
|
||||
int vga_io_memory, i;
|
||||
int i;
|
||||
static int inited;
|
||||
|
||||
if (!inited) {
|
||||
@ -3156,10 +3156,10 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)
|
||||
register_ioport_read(0x3ba, 1, 1, vga_ioport_read, s);
|
||||
register_ioport_read(0x3da, 1, 1, vga_ioport_read, s);
|
||||
|
||||
vga_io_memory = cpu_register_io_memory(0, cirrus_vga_mem_read,
|
||||
s->vga_io_memory = cpu_register_io_memory(0, cirrus_vga_mem_read,
|
||||
cirrus_vga_mem_write, s);
|
||||
cpu_register_physical_memory(isa_mem_base + 0x000a0000, 0x20000,
|
||||
vga_io_memory);
|
||||
s->vga_io_memory);
|
||||
|
||||
s->sr[0x06] = 0x0f;
|
||||
if (device_id == CIRRUS_ID_CLGD5446) {
|
||||
|
@ -129,6 +129,7 @@ typedef void (* vga_update_retrace_info_fn)(struct VGAState *s);
|
||||
int dac_8bit; \
|
||||
uint8_t palette[768]; \
|
||||
int32_t bank_offset; \
|
||||
int vga_io_memory; \
|
||||
int (*get_bpp)(struct VGAState *s); \
|
||||
void (*get_offsets)(struct VGAState *s, \
|
||||
uint32_t *pline_offset, \
|
||||
|
Loading…
Reference in New Issue
Block a user