From: Alexander Graf Date: Fri, 18 Dec 2009 22:37:27 +0000 (+0100) Subject: target-ppc: Use interrupts for escc X-Git-Tag: v0.13.0-rc0~1869 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4b784fe98549ff0b9d07eb5a797dfd665423fe2;p=thirdparty%2Fqemu.git 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 Signed-off-by: Aurelien Jarno --- diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index b29a7bc103a..a09f096ba32 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++)