aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc_newworld.c
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2009-12-18 23:37:27 +0100
committerAurelien Jarno <aurelien@aurel32.net>2009-12-19 16:04:52 +0100
commitb4b784fe98549ff0b9d07eb5a797dfd665423fe2 (patch)
tree71bbb130200333c7f22033151a228e3af8ba4ad2 /hw/ppc_newworld.c
parentd14ed2548c3163cdb316eb4da36cd7a6a8975da4 (diff)
downloadqemu-b4b784fe98549ff0b9d07eb5a797dfd665423fe2.zip
qemu-b4b784fe98549ff0b9d07eb5a797dfd665423fe2.tar.gz
qemu-b4b784fe98549ff0b9d07eb5a797dfd665423fe2.tar.bz2
target-ppc: Use interrupts for escc
When using the escc with Linux, we need interrupts. So instead of creating a dummy device, let's just map them to the openpic we have anyways. This makes Linux on PPC64 with console=ttyPZ0 work. Obviously, this change needs to be reflected in openbios. Patch for that follows this one. Please update the binary then. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/ppc_newworld.c')
-rw-r--r--hw/ppc_newworld.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index b29a7bc..a09f096 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -108,7 +108,6 @@ static void ppc_core99_init (ram_addr_t ram_size,
MacIONVRAMState *nvr;
int nvram_mem_index;
int vga_bios_size, bios_size;
- qemu_irq *dummy_irq;
int pic_mem_index, dbdma_mem_index, cuda_mem_index, escc_mem_index;
int ppc_boot_device;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
@@ -318,10 +317,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
/* init basic PC hardware */
pci_vga_init(pci_bus, vga_bios_offset, vga_bios_size);
- /* XXX: suppress that */
- dummy_irq = i8259_init(NULL);
-
- escc_mem_index = escc_init(0x80013000, dummy_irq[4], dummy_irq[5],
+ escc_mem_index = escc_init(0x80013000, pic[0x25], pic[0x24],
serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);
for(i = 0; i < nb_nics; i++)