aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2012-09-08 16:40:56 +0200
committerAurelien Jarno <aurelien@aurel32.net>2012-10-06 18:48:37 +0200
commit6405c86412719a0ccd1a09b81baf0b78e8a4ae6b (patch)
tree62c44de497536608c5fd17f1fb0476ac84e4f29f
parenta1e472119aa2efa88a2a24b1aa50e45ea8cc8f31 (diff)
vga: rename isa_vga_init() to isa_std_vga_init()
This better explains what is this function about. Adjust all callers. Cc: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--hw/mips_r4k.c2
-rw-r--r--hw/pc.c2
-rw-r--r--hw/pc.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 967a76e53..2115f7f3d 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -281,7 +281,7 @@ void mips_r4k_init (ram_addr_t ram_size,
}
}
- isa_vga_init(isa_bus);
+ isa_std_vga_init(isa_bus);
if (nd_table[0].used)
isa_ne2000_init(isa_bus, 0x300, 9, &nd_table[0]);
diff --git a/hw/pc.c b/hw/pc.c
index 33fee622d..78805f625 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1016,7 +1016,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
if (pci_bus) {
dev = pci_std_vga_init(pci_bus);
} else {
- dev = isa_vga_init(isa_bus);
+ dev = isa_std_vga_init(isa_bus);
}
}
diff --git a/hw/pc.h b/hw/pc.h
index e4db0715b..77c38d609 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -176,7 +176,7 @@ enum vga_retrace_method {
extern enum vga_retrace_method vga_retrace_method;
-static inline DeviceState *isa_vga_init(ISABus *bus)
+static inline DeviceState *isa_std_vga_init(ISABus *bus)
{
ISADevice *dev;