diff options
| author | Jason Thorpe <thorpej@me.com> | 2021-06-16 07:15:38 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-06-28 07:27:32 -0700 |
| commit | 5ec4f1d348e164355ff0e50486d537973e517e19 (patch) | |
| tree | d31395b01a950ecec791a51f6fadf1a15c274257 /hw/alpha/alpha_sys.h | |
| parent | 387a1dcb351be6a6ec4e27d36173df2de1017bcc (diff) | |
| download | qemu-5ec4f1d348e164355ff0e50486d537973e517e19.zip qemu-5ec4f1d348e164355ff0e50486d537973e517e19.tar.gz qemu-5ec4f1d348e164355ff0e50486d537973e517e19.tar.bz2 | |
hw/alpha: Provide a PCI-ISA bridge device node
- Move initialization of the ISA bus from typhoon_init() to clipper_init();
this apsect of device topology is really associated with the individual
model, not the core logic chipset. typhoon_init() now returns the IRQ
to use for the output of the ISA PIC.
- In clipper_init(), instantiate an i82378 instance, and connect its
PIC output to the ISA IRQ input provided by typhoon_init(). Remove
the explicit instantiations of i8254 and i82374, as these devices
are subsumed by the i82378.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Thorpe <thorpej@me.com>
Message-Id: <20210616141538.25436-1-thorpej@me.com>
[rth: Remove direct dependencies on i82374, i8254, i8259.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/alpha/alpha_sys.h')
| -rw-r--r-- | hw/alpha/alpha_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/alpha/alpha_sys.h b/hw/alpha/alpha_sys.h index 4835b3d..2263e82 100644 --- a/hw/alpha/alpha_sys.h +++ b/hw/alpha/alpha_sys.h @@ -10,7 +10,7 @@ #include "hw/intc/i8259.h" -PCIBus *typhoon_init(MemoryRegion *, ISABus **, qemu_irq *, AlphaCPU *[4], +PCIBus *typhoon_init(MemoryRegion *, qemu_irq *, qemu_irq *, AlphaCPU *[4], pci_map_irq_fn, uint8_t devfn_min); /* alpha_pci.c. */ |