diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-09-18 01:15:29 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-09-18 01:15:29 +0000 |
| commit | aef445bd7e46d2d47701a03c5478da34b3d53c4c (patch) | |
| tree | 0f9a7993dad66b412e857a25f6cd56f3313e7a37 /hw/ppc_chrp.c | |
| parent | 6787f5fae0fb9e3923b8c316780645c3e1d81df2 (diff) | |
Merge common ISA access routines.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2159 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_chrp.c')
| -rw-r--r-- | hw/ppc_chrp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c index 94707690ed..7599eab915 100644 --- a/hw/ppc_chrp.c +++ b/hw/ppc_chrp.c @@ -305,7 +305,7 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, SetIRQFunc *set_irq; void *pic; m48t59_t *nvram; - int PPC_io_memory, unin_memory; + int unin_memory; int linux_boot, i; unsigned long bios_offset, vga_bios_offset; uint32_t kernel_base, kernel_size, initrd_base, initrd_size; @@ -417,9 +417,8 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, isa_mem_base = 0x80000000; /* Register 2 MB of ISA IO space */ - PPC_io_memory = cpu_register_io_memory(0, PPC_io_read, PPC_io_write, NULL); - cpu_register_physical_memory(0xfe000000, 0x00200000, PPC_io_memory); - + isa_mmio_init(0xfe000000, 0x00200000); + /* init basic PC hardware */ pic = heathrow_pic_init(&heathrow_pic_mem_index); set_irq = heathrow_pic_set_irq; @@ -463,8 +462,7 @@ static void ppc_chrp_init(int ram_size, int vga_ram_size, int boot_device, isa_mem_base = 0x80000000; /* Register 8 MB of ISA IO space */ - PPC_io_memory = cpu_register_io_memory(0, PPC_io_read, PPC_io_write, NULL); - cpu_register_physical_memory(0xF2000000, 0x00800000, PPC_io_memory); + isa_mmio_init(0xf2000000, 0x00800000); /* UniN init */ unin_memory = cpu_register_io_memory(0, unin_read, unin_write, NULL); |