mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 17:53:56 -06:00
Fix PowerMac NVRAM device.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3521 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
f3e3285dcd
commit
74e9115560
5 changed files with 33 additions and 16 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue