gwj / at91sam9263 · Commits

Commit 4d7ca41e8aa606b503d380c8e8fa6f52dacf7e63

Authored by aurel32
1 parent 6231868b

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
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
hw/ppc_oldworld.c
  View file @4d7ca41
1 /* 1 /*
2 - * QEMU OldWorld PowerMac (currently ~G3 B&W) hardware System Emulator 2 + * QEMU OldWorld PowerMac (currently ~G3 Beige) hardware System Emulator
3 * 3 *
4 * Copyright (c) 2004-2007 Fabrice Bellard 4 * Copyright (c) 2004-2007 Fabrice Bellard
5 * Copyright (c) 2007 Jocelyn Mayer 5 * Copyright (c) 2007 Jocelyn Mayer
@@ -355,7 +355,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, @@ -355,7 +355,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,
355 355
356 dbdma_init(&dbdma_mem_index); 356 dbdma_init(&dbdma_mem_index);
357 357
358 - macio_init(pci_bus, 0x0017, 1, pic_mem_index, dbdma_mem_index, 358 + macio_init(pci_bus, 0x0010, 1, pic_mem_index, dbdma_mem_index,
359 cuda_mem_index, nvr, 2, ide_mem_index); 359 cuda_mem_index, nvr, 2, ide_mem_index);
360 360
361 if (usb_enabled) { 361 if (usb_enabled) {
@@ -388,7 +388,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, @@ -388,7 +388,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,
388 } 388 }
389 389
390 QEMUMachine heathrow_machine = { 390 QEMUMachine heathrow_machine = {
391 - .name = "g3bw", 391 + .name = "g3beige",
392 .desc = "Heathrow based PowerMAC", 392 .desc = "Heathrow based PowerMAC",
393 .init = ppc_heathrow_init, 393 .init = ppc_heathrow_init,
394 .ram_require = BIOS_SIZE + VGA_BIOS_SIZE + VGA_RAM_SIZE, 394 .ram_require = BIOS_SIZE + VGA_BIOS_SIZE + VGA_RAM_SIZE,