diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-07 23:38:59 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-07 23:38:59 +0000 |
| commit | 4d7ca41e8aa606b503d380c8e8fa6f52dacf7e63 (patch) | |
| tree | 5e1523c39dd5bb56e03faf8cfd78e636b650ff20 /hw | |
| parent | 6231868b110365d0d870c2f4974bfba26ccb86a9 (diff) | |
target-ppc: Switch ppc_oldworld.c to G3 beige
The G3 B&W is a new world machine. The machine currently implemented is
actually closer to a G3 beige.
Also swith the MacIO from Paddigton (new world) to Heathrow (old world).
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6228 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ppc_oldworld.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 9318be4d10..1d5e9d67f1 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -1,5 +1,5 @@ /* - * QEMU OldWorld PowerMac (currently ~G3 B&W) hardware System Emulator + * QEMU OldWorld PowerMac (currently ~G3 Beige) hardware System Emulator * * Copyright (c) 2004-2007 Fabrice Bellard * Copyright (c) 2007 Jocelyn Mayer @@ -355,7 +355,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, dbdma_init(&dbdma_mem_index); - macio_init(pci_bus, 0x0017, 1, pic_mem_index, dbdma_mem_index, + macio_init(pci_bus, 0x0010, 1, pic_mem_index, dbdma_mem_index, cuda_mem_index, nvr, 2, ide_mem_index); if (usb_enabled) { @@ -388,7 +388,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, } QEMUMachine heathrow_machine = { - .name = "g3bw", + .name = "g3beige", .desc = "Heathrow based PowerMAC", .init = ppc_heathrow_init, .ram_require = BIOS_SIZE + VGA_BIOS_SIZE + VGA_RAM_SIZE, |