[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/23] cirrus_vga: prefix vga_ioport_{read, write} w
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 02/23] cirrus_vga: prefix vga_ioport_{read, write} with cirrus |
Date: |
Mon, 31 Aug 2009 16:07:12 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
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);
--
1.6.2.5
- [Qemu-devel] [PATCH 00/23] VGA cleanup, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 01/23] vga: remove useless cast from void *, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 02/23] cirrus_vga: prefix vga_ioport_{read, write} with cirrus,
Juan Quintela <=
- [Qemu-devel] [PATCH 03/23] vga: export vga_ioport_{read,write}, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 04/23] vga: split vga_{load, save} into pci and common parts, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 05/23] vga: split pci bits into vga-pci.c, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 06/23] vga: split isa bits inco vga-isa.c, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 07/23] vga: export vga_mem_{read,write}, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 08/23] vga: split vga-isa-mm.o, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 09/23] vga and cirrus_vga: create vga_ioport_invalid() and use it everywhere, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 10/23] cirrus_vga: Add a VGACommonState local var to cirrus_vga_ioport_{read, write}, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 11/23] vga: change tabs to spaces, Juan Quintela, 2009/08/31
- [Qemu-devel] [PATCH 13/23] vga and cirrus_vga: substitute switch for equivalent assigntment, Juan Quintela, 2009/08/31