diff options
| author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-04 01:16:04 +0000 |
|---|---|---|
| committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-04 01:16:04 +0000 |
| commit | 74e9115560fbdd6342f3e1a42ced6bd76b227f82 (patch) | |
| tree | 7a195c7564b403f937d683ae58b6f30b84343412 /hw/ppc_chrp.c | |
| parent | f3e3285dcdcf84aa3f19ae888a914660922ad5f7 (diff) | |
| download | qemu-74e9115560fbdd6342f3e1a42ced6bd76b227f82.zip qemu-74e9115560fbdd6342f3e1a42ced6bd76b227f82.tar.gz qemu-74e9115560fbdd6342f3e1a42ced6bd76b227f82.tar.bz2 | |
Fix PowerMac NVRAM device.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3521 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_chrp.c')
| -rw-r--r-- | hw/ppc_chrp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c index daa99d5..387da50 100644 --- a/hw/ppc_chrp.c +++ b/hw/ppc_chrp.c @@ -264,7 +264,7 @@ static void ppc_core99_init (int ram_size, int vga_ram_size, dbdma_init(&dbdma_mem_index); macio_init(pci_bus, 0x0022, 0, pic_mem_index, dbdma_mem_index, - cuda_mem_index, -1, 2, ide_mem_index); + cuda_mem_index, NULL, 2, ide_mem_index); if (usb_enabled) { usb_ohci_init_pci(pci_bus, 3, -1); @@ -274,9 +274,9 @@ static void ppc_core99_init (int ram_size, int vga_ram_size, graphic_depth = 15; #if 0 /* XXX: this is ugly but needed for now, or OHW won't boot */ /* The NewWorld NVRAM is not located in the MacIO device */ - nvr = macio_nvram_init(&nvram_mem_index); + nvr = macio_nvram_init(&nvram_mem_index, 0x2000); pmac_format_nvram_partition(nvr, 0x2000); - cpu_register_physical_memory(0xFFF04000, 0x20000, nvram_mem_index); + macio_nvram_map(nvr, 0xFFF04000); nvram.opaque = nvr; nvram.read_fn = &macio_nvram_read; nvram.write_fn = &macio_nvram_write; |