[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 07/16] sun4u: improve bus implementation of EBus
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 07/16] sun4u: improve bus implementation of EBus bridge |
Date: |
Sun, 2 Oct 2011 18:10:19 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/sun4u.c | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/hw/sun4u.c b/hw/sun4u.c
index cdf15ff..d8b8054 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -38,6 +38,7 @@
#include "loader.h"
#include "elf.h"
#include "blockdev.h"
+#include "exec-memory.h"
//#define DEBUG_IRQ
//#define DEBUG_EBUS
@@ -93,6 +94,8 @@ struct hwdef {
typedef struct EbusState {
PCIDevice pci_dev;
+ ISABus bus;
+ qemu_irq *isa_irq;
MemoryRegion bar0;
MemoryRegion bar1;
} EbusState;
@@ -536,20 +539,42 @@ static void dummy_isa_irq_handler(void *opaque, int n,
int level)
static void
pci_ebus_init(PCIBus *bus, int devfn)
{
- qemu_irq *isa_irq;
-
pci_create_simple(bus, devfn, "ebus");
- isa_irq = qemu_allocate_irqs(dummy_isa_irq_handler, NULL, 16);
- isa_bus_irqs(isa_irq);
}
+static qemu_irq pci_ebus_get_irq(ISABus *bus, int isairq)
+{
+ EbusState *s = container_of(bus, EbusState, bus);
+ if (isairq < 0 || isairq >= 16) {
+ hw_error("isa irq %d invalid", isairq);
+ }
+ return s->isa_irq[isairq];
+}
+
+static MemoryRegion *pci_ebus_get_io_space(ISABus *bus)
+{
+ EbusState *s = container_of(bus, EbusState, bus);
+ return pci_address_space_io(&s->pci_dev);
+}
+
+static MemoryRegion *pci_ebus_get_memory_space(ISABus *bus)
+{
+ return get_system_memory();
+}
+
+static ISABusOps pci_ebus_ops = {
+ .get_irq = pci_ebus_get_irq,
+ .get_io_space = pci_ebus_get_io_space,
+ .get_memory_space = pci_ebus_get_memory_space,
+};
+
static int
pci_ebus_init1(PCIDevice *pci_dev)
{
EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev);
- isa_bus_bridge_init(&pci_dev->qdev, pci_address_space_io(pci_dev));
-
+ isa_bus_new(&s->bus, &pci_ebus_ops, &pci_dev->qdev);
+ s->isa_irq = qemu_allocate_irqs(dummy_isa_irq_handler, NULL, 16);
pci_dev->config[0x04] = 0x06; // command = bus master, pci mem
pci_dev->config[0x05] = 0x00;
pci_dev->config[0x06] = 0xa0; // status = fast back-to-back, 66MHz, no
error
--
1.7.6.3
- [Qemu-devel] [PATCH v3 00/16] ISA bus improvements, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 01/16] isa: rename isa_bus_new to isa_bus_bridge_init, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 03/16] isa: correctly implement isa_address_space(), by calling a bus-specific function, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 02/16] isa: rework ISA bus internals, and add ISA bus ops structure, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 04/16] audio: give ISA bus to sound cards, instead of PIC, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 05/16] pc: improve bus implementation of PIIX3 bridge, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 06/16] fulong2e: improve bus implementation of vt82c bridge, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 07/16] sun4u: improve bus implementation of EBus bridge,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v3 08/16] malta: improve bus implementation of PIIX4 bridge, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 09/16] isa: remove unused parameter to isa_bus_bridge_init(), Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 12/16] isa: give bus to isa_get_irq() and isa_bus_irqs(), Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 13/16] isa: use bus given in parameter to get/set irqs on specified ISA bus, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 15/16] isa: remove useless test in isa_register_ioport(), Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 16/16] isa: remove limitation of only one ISA bus, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 14/16] i8259: add ad-hock variables to please future changes in isa_register_ioport(), Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 10/16] isa: give bus to isa_create() and isa_try_create() methods, Hervé Poussineau, 2011/10/02
- [Qemu-devel] [PATCH v3 11/16] isa: use bus given in parameter to create device on specified ISA bus, Hervé Poussineau, 2011/10/02