From 74e9115560fbdd6342f3e1a42ced6bd76b227f82 Mon Sep 17 00:00:00 2001
From: j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 4 Nov 2007 01:16:04 +0000
Subject: Fix PowerMac NVRAM device.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3521 c046a42c-6fe2-441c-8c8c-71466251a162
---
 hw/macio.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'hw/macio.c')

diff --git a/hw/macio.c b/hw/macio.c
index 82e3e9afec..5a5db47738 100644
--- a/hw/macio.c
+++ b/hw/macio.c
@@ -31,7 +31,7 @@ struct macio_state_t {
     int pic_mem_index;
     int dbdma_mem_index;
     int cuda_mem_index;
-    int nvram_mem_index;
+    void *nvram;
     int nb_ide;
     int ide_mem_index[4];
 };
@@ -68,14 +68,12 @@ static void macio_map (PCIDevice *pci_dev, int region_num,
                                          macio_state->ide_mem_index[i]);
         }
     }
-    if (macio_state->nvram_mem_index >= 0) {
-        cpu_register_physical_memory(addr + 0x60000, 0x20000,
-                                     macio_state->nvram_mem_index);
-    }
+    if (macio_state->nvram != NULL)
+        macio_nvram_map(macio_state->nvram, addr + 0x60000);
 }
 
 void macio_init (PCIBus *bus, int device_id, int is_oldworld, int pic_mem_index,
-                 int dbdma_mem_index, int cuda_mem_index, int nvram_mem_index,
+                 int dbdma_mem_index, int cuda_mem_index, void *nvram,
                  int nb_ide, int *ide_mem_index)
 {
     PCIDevice *d;
@@ -90,7 +88,7 @@ void macio_init (PCIBus *bus, int device_id, int is_oldworld, int pic_mem_index,
     macio_state->pic_mem_index = pic_mem_index;
     macio_state->dbdma_mem_index = dbdma_mem_index;
     macio_state->cuda_mem_index = cuda_mem_index;
-    macio_state->nvram_mem_index = nvram_mem_index;
+    macio_state->nvram = nvram;
     if (nb_ide > 4)
         nb_ide = 4;
     macio_state->nb_ide = nb_ide;
-- 
cgit v1.2.1