diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-31 16:07:12 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-09-09 14:55:10 -0500 |
| commit | 0ceac75b8c6d3fd6bd15e7c6a4a1cc330003869a (patch) | |
| tree | ffe85fd3a2780bb53b7720ce911211028777fc6e /hw/cirrus_vga.c | |
| parent | 1a5ab757120bbb528442b08d3abc7a2b7d401578 (diff) | |
| download | qemu-0ceac75b8c6d3fd6bd15e7c6a4a1cc330003869a.zip qemu-0ceac75b8c6d3fd6bd15e7c6a4a1cc330003869a.tar.gz qemu-0ceac75b8c6d3fd6bd15e7c6a4a1cc330003869a.tar.bz2 | |
cirrus_vga: prefix vga_ioport_{read, write} with cirrus
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/cirrus_vga.c')
| -rw-r--r-- | hw/cirrus_vga.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 991d1da..5f57107 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2656,7 +2656,7 @@ static void cirrus_update_memory_access(CirrusVGAState *s) /* I/O ports */ -static uint32_t vga_ioport_read(void *opaque, uint32_t addr) +static uint32_t cirrus_vga_ioport_read(void *opaque, uint32_t addr) { CirrusVGAState *s = opaque; int val, index; @@ -2762,7 +2762,7 @@ static uint32_t vga_ioport_read(void *opaque, uint32_t addr) return val; } -static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) +static void cirrus_vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) { CirrusVGAState *s = opaque; int index; @@ -2926,7 +2926,7 @@ static uint32_t cirrus_mmio_readb(void *opaque, target_phys_addr_t addr) if (addr >= 0x100) { return cirrus_mmio_blt_read(s, addr - 0x100); } else { - return vga_ioport_read(s, addr + 0x3c0); + return cirrus_vga_ioport_read(s, addr + 0x3c0); } } @@ -2970,7 +2970,7 @@ static void cirrus_mmio_writeb(void *opaque, target_phys_addr_t addr, if (addr >= 0x100) { cirrus_mmio_blt_write(s, addr - 0x100, val); } else { - vga_ioport_write(s, addr + 0x3c0, val); + cirrus_vga_ioport_write(s, addr + 0x3c0, val); } } @@ -3198,19 +3198,19 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci) s->bustype = CIRRUS_BUSTYPE_ISA; } - register_ioport_write(0x3c0, 16, 1, vga_ioport_write, s); + register_ioport_write(0x3c0, 16, 1, cirrus_vga_ioport_write, s); - register_ioport_write(0x3b4, 2, 1, vga_ioport_write, s); - register_ioport_write(0x3d4, 2, 1, vga_ioport_write, s); - register_ioport_write(0x3ba, 1, 1, vga_ioport_write, s); - register_ioport_write(0x3da, 1, 1, vga_ioport_write, s); + register_ioport_write(0x3b4, 2, 1, cirrus_vga_ioport_write, s); + register_ioport_write(0x3d4, 2, 1, cirrus_vga_ioport_write, s); + register_ioport_write(0x3ba, 1, 1, cirrus_vga_ioport_write, s); + register_ioport_write(0x3da, 1, 1, cirrus_vga_ioport_write, s); - register_ioport_read(0x3c0, 16, 1, vga_ioport_read, s); + register_ioport_read(0x3c0, 16, 1, cirrus_vga_ioport_read, s); - register_ioport_read(0x3b4, 2, 1, vga_ioport_read, s); - register_ioport_read(0x3d4, 2, 1, vga_ioport_read, s); - register_ioport_read(0x3ba, 1, 1, vga_ioport_read, s); - register_ioport_read(0x3da, 1, 1, vga_ioport_read, s); + register_ioport_read(0x3b4, 2, 1, cirrus_vga_ioport_read, s); + register_ioport_read(0x3d4, 2, 1, cirrus_vga_ioport_read, s); + register_ioport_read(0x3ba, 1, 1, cirrus_vga_ioport_read, s); + register_ioport_read(0x3da, 1, 1, cirrus_vga_ioport_read, s); s->vga.vga_io_memory = cpu_register_io_memory(cirrus_vga_mem_read, cirrus_vga_mem_write, s); |