[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 07/23] 40p: Add a PCI to ISA bridge (i82378)
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC 07/23] 40p: Add a PCI to ISA bridge (i82378) |
Date: |
Tue, 14 Jun 2011 04:37:41 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
Don't create an ISA bus at machine level, the i82378 does that.
Cc: Markus Armbruster <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ppc_prep.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 50cb6c7..27e1d14 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -775,8 +775,10 @@ static void ibm_40p_init(ram_addr_t ram_size,
char *filename;
int bios_size;
ram_addr_t ram_offset, bios_offset;
+ qemu_irq *cpu_exit_irq;
DeviceState *dev;
PCIBus *pci_bus;
+ PCIDevice *pci;
// IBM E15 graphic adapter (S3 Vision864)
// PowerPC 601
@@ -823,7 +825,12 @@ static void ibm_40p_init(ram_addr_t ram_size,
/* PCI host */
dev = sysbus_create_simple("prep-pci", 0x80800000, NULL);
pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci");
- (void)pci_bus;
+
+ /* PCI -> ISA bridge */
+ pci = pci_create_simple(pci_bus, PCI_DEVFN(1, 0), "i82378");
+ cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1);
+ qdev_connect_gpio_out(&pci->qdev, 0, env->irq_inputs[PPC6xx_INPUT_INT]);
+ qdev_connect_gpio_out(&pci->qdev, 1, *cpu_exit_irq);
}
static QEMUMachine prep_machine = {
--
1.7.5.3
- [Qemu-devel] [RFC 00/23] PReP 40P emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH RFC 01/23] prep: Refactor CPU initialization, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 02/23] prep: qdev'ify PCI, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 03/23] prep: Prepare emulation of an IBM RS/6000 6015 / 7020 (40p), Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 04/23] 40p: Add PCI host, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 05/23] prep: Add i82374 DMA emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 06/23] prep: Add i82378 PCI-to-ISA bridge emulation, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC 07/23] 40p: Add a PCI to ISA bridge (i82378),
Andreas Färber <=
- [Qemu-devel] [PATCH v5 08/23] qdev: Add support for property type bool, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 09/23] qdev: Add helpers for reading properties, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 10/23] isa: Provide enable and disable callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 11/23] isa: Allow to un-assign I/O ports, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 12/23] isa: Allow to un-associate an IRQ, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 13/23] parallel: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 14/23] serial: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [PATCH v5 15/23] fdc: Parametrize ISA base, IRQ and DMA, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 16/23] fdc: Implement ISA state callbacks, Andreas Färber, 2011/06/13
- [Qemu-devel] [RFC v5 17/23] ide: Allow to discard I/O ports, Andreas Färber, 2011/06/13