diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-02-01 20:31:40 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-17 09:58:22 -0600 |
| commit | 319ba9f52737fc79de5c2c6abd059933398b72d5 (patch) | |
| tree | 4a75cc9962156d27d4b17955b4cbac19bb211ab1 /hw/mips_r4k.c | |
| parent | b1277b03d46b2aeb22f0829aaa1c0f5fe6dd38fe (diff) | |
| download | focaccia-qemu-319ba9f52737fc79de5c2c6abd059933398b72d5.tar.gz focaccia-qemu-319ba9f52737fc79de5c2c6abd059933398b72d5.zip | |
i8254: Pass alternative IRQ output object on initialization
HPET legacy emulation will require control over the PIT IRQ output. To enable this, add support for an alternative IRQ output object to the PIT factory function. If the isa_irq number is < 0, this object will be used. This also removes the IRQ number property from the PIT class as we now use a generic GPIO output pin that is connected by the factory function. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/mips_r4k.c')
| -rw-r--r-- | hw/mips_r4k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 1b3ec2dc58..83401f0648 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -270,7 +270,7 @@ void mips_r4k_init (ram_addr_t ram_size, isa_mmio_init(0x14000000, 0x00010000); isa_mem_base = 0x10000000; - pit = pit_init(isa_bus, 0x40, 0); + pit = pit_init(isa_bus, 0x40, 0, NULL); for(i = 0; i < MAX_SERIAL_PORTS; i++) { if (serial_hds[i]) { |