diff options
| author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-28 23:42:18 +0000 |
|---|---|---|
| committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-10-28 23:42:18 +0000 |
| commit | 3cbee15b9a6be17645e908bf7706d582c3e17156 (patch) | |
| tree | b89a5f1cfea3fdb8e95325108afc229a3ec3fa9e /hw/ppc_prep.c | |
| parent | 897b4c6c4e63afebdd41de0f1a19e17ab1f4c2b8 (diff) | |
* sort the PowerPC target object files
* make PowerPC NVRAM accessors generic to be able to use a MacIO NVRAM
instead of the M48T59 one
* split PowerMac targets code:
- move all PowerMac related definitions and prototypes into hw/ppc_mac.h
- add hw/mac_dbdma.c, hw/mac_nvram.c and macio.c
which implements shared PowerMac devices
- define the g3bw machine in a new hw/ppc_oldworld.c file
* Fix the g3bw target:
- fix the Grackle host PCI device
- connect the Heathrow PIC to the PowerPC 6xx bus pins
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3475 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/ppc_prep.c')
| -rw-r--r-- | hw/ppc_prep.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 7cb92c77f..966617fe4 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -527,7 +527,8 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, { CPUState *env, *envs[MAX_CPUS]; char buf[1024]; - m48t59_t *nvram; + nvram_t nvram; + m48t59_t *m48t59; int PPC_io_memory; int linux_boot, i, nb_nics1, bios_size; unsigned long bios_offset; @@ -678,13 +679,16 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, usb_ohci_init_pci(pci_bus, 3, -1); } - nvram = m48t59_init(i8259[8], 0, 0x0074, NVRAM_SIZE, 59); - if (nvram == NULL) + m48t59 = m48t59_init(i8259[8], 0, 0x0074, NVRAM_SIZE, 59); + if (m48t59 == NULL) return; - sysctrl->nvram = nvram; + sysctrl->nvram = m48t59; /* Initialise NVRAM */ - PPC_NVRAM_set_params(nvram, NVRAM_SIZE, "PREP", ram_size, boot_device, + nvram.opaque = m48t59; + nvram.read_fn = &m48t59_read; + nvram.write_fn = &m48t59_write; + PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "PREP", ram_size, boot_device, kernel_base, kernel_size, kernel_cmdline, initrd_base, initrd_size, |