diff options
| -rw-r--r-- | hw/mac_nvram.c | 12 | ||||
| -rw-r--r-- | hw/ppc_chrp.c | 2 | ||||
| -rw-r--r-- | hw/ppc_mac.h | 3 | ||||
| -rw-r--r-- | hw/ppc_oldworld.c | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/hw/mac_nvram.c b/hw/mac_nvram.c index 3d3e557297..ae4d4bbf46 100644 --- a/hw/mac_nvram.c +++ b/hw/mac_nvram.c @@ -40,6 +40,7 @@ do { printf("NVR: " fmt , ##args); } while (0) struct MacIONVRAMState { target_phys_addr_t size; int mem_index; + unsigned int it_shift; uint8_t *data; }; @@ -75,7 +76,7 @@ static void macio_nvram_writeb (void *opaque, { MacIONVRAMState *s = opaque; - addr = (addr >> 4) & (s->size - 1); + addr = (addr >> s->it_shift) & (s->size - 1); s->data[addr] = value; NVR_DPRINTF("writeb addr %04x val %x\n", (int)addr, value); } @@ -85,7 +86,7 @@ static uint32_t macio_nvram_readb (void *opaque, target_phys_addr_t addr) MacIONVRAMState *s = opaque; uint32_t value; - addr = (addr >> 4) & (s->size - 1); + addr = (addr >> s->it_shift) & (s->size - 1); value = s->data[addr]; NVR_DPRINTF("readb addr %04x val %x\n", (int)addr, value); @@ -127,13 +128,15 @@ static void macio_nvram_reset(void *opaque) { } -MacIONVRAMState *macio_nvram_init (int *mem_index, target_phys_addr_t size) +MacIONVRAMState *macio_nvram_init (int *mem_index, target_phys_addr_t size, + unsigned int it_shift) { MacIONVRAMState *s; s = qemu_mallocz(sizeof(MacIONVRAMState)); s->data = qemu_mallocz(size); s->size = size; + s->it_shift = it_shift; s->mem_index = cpu_register_io_memory(0, nvram_read, nvram_write, s); *mem_index = s->mem_index; @@ -150,7 +153,8 @@ void macio_nvram_map (void *opaque, target_phys_addr_t mem_base) MacIONVRAMState *s; s = opaque; - cpu_register_physical_memory(mem_base, s->size << 4, s->mem_index); + cpu_register_physical_memory(mem_base, s->size << s->it_shift, + s->mem_index); } /* Set up a system OpenBIOS NVRAM partition */ diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c index b7a25137a2..1379847219 100644 --- a/hw/ppc_chrp.c +++ b/hw/ppc_chrp.c @@ -328,7 +328,7 @@ static void ppc_core99_init (ram_addr_t 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, 0x2000); + nvr = macio_nvram_init(&nvram_mem_index, 0x2000, 1); pmac_format_nvram_partition(nvr, 0x2000); macio_nvram_map(nvr, 0xFFF04000); nvram.opaque = nvr; diff --git a/hw/ppc_mac.h b/hw/ppc_mac.h index 1fe5c5714a..5851a5eea8 100644 --- a/hw/ppc_mac.h +++ b/hw/ppc_mac.h @@ -64,7 +64,8 @@ PCIBus *pci_pmac_init(qemu_irq *pic); /* Mac NVRAM */ typedef struct MacIONVRAMState MacIONVRAMState; -MacIONVRAMState *macio_nvram_init (int *mem_index, target_phys_addr_t size); +MacIONVRAMState *macio_nvram_init (int *mem_index, target_phys_addr_t size, + unsigned int it_shift); void macio_nvram_map (void *opaque, target_phys_addr_t mem_base); void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len); uint32_t macio_nvram_read (void *opaque, uint32_t addr); diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 1583c91162..a6dfc3529e 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -357,7 +357,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, adb_kbd_init(&adb_bus); adb_mouse_init(&adb_bus); - nvr = macio_nvram_init(&nvram_mem_index, 0x2000); + nvr = macio_nvram_init(&nvram_mem_index, 0x2000, 4); pmac_format_nvram_partition(nvr, 0x2000); macio_init(pci_bus, PCI_DEVICE_ID_APPLE_343S1201, 1, pic_mem_index, |