- 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.
Signed-off-by: Jason Thorpe <thorpej@me.com>
---
hw/alpha/Kconfig | 1 +
hw/alpha/alpha_sys.h | 2 +-
hw/alpha/dp264.c | 36 ++++++++++++++++++++++++++++++------
hw/alpha/typhoon.c | 19 ++++---------------
4 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig
index 15c59ff264..e907a052c3 100644
--- a/hw/alpha/Kconfig
+++ b/hw/alpha/Kconfig
@@ -4,6 +4,7 @@ config DP264
imply TEST_DEVICES
imply E1000_PCI
select I82374
+ select I82378
select I8254
select I8259
select IDE_CMD646