[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/12] isa: implement isa_address_space() as a me
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v2 03/12] isa: implement isa_address_space() as a method of ISA bus |
Date: |
Tue, 20 Sep 2011 07:24:01 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/isa-bridge.c | 6 ++++++
hw/isa-bus.c | 13 ++++++++++++-
hw/isa.h | 1 +
3 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/hw/isa-bridge.c b/hw/isa-bridge.c
index 49fa033..bb2d8b0 100644
--- a/hw/isa-bridge.c
+++ b/hw/isa-bridge.c
@@ -42,9 +42,15 @@ static qemu_irq isabus_bridge_get_irq(ISABus *bus, int
isairq)
return s->irqs[isairq];
}
+static MemoryRegion *isabus_bridge_get_address_space(ISABus *bus)
+{
+ return get_system_memory();
+}
+
static ISABusOps isabus_bridge_ops = {
.set_irqs = isabus_bridge_set_irqs,
.get_irq = isabus_bridge_get_irq,
+ .get_address_space = isabus_bridge_get_address_space,
};
static int isabus_bridge_init(SysBusDevice *dev)
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 27cffb3..b492486 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -49,9 +49,15 @@ static qemu_irq isa_bus_default_get_irq(ISABus *bus, int
isairq)
return isa_bus_default_irqs[isairq];
}
+static MemoryRegion *isa_bus_default_get_address_space(ISABus *bus)
+{
+ return get_system_memory();
+}
+
static ISABusOps isa_bus_default_ops = {
.set_irqs = isa_bus_default_set_irqs,
.get_irq = isa_bus_default_get_irq,
+ .get_address_space = isa_bus_default_get_address_space,
};
ISABus *isa_bus_bridge_init(DeviceState *dev)
@@ -215,6 +221,11 @@ static char *isabus_get_fw_dev_path(DeviceState *dev)
MemoryRegion *isa_address_space(ISADevice *dev)
{
- return get_system_memory();
+ ISABus *bus = FROM_QBUS(ISABus, qdev_get_parent_bus(&dev->qdev));
+
+ if (!bus->ops->get_address_space) {
+ hw_error("Tried to get isa address space on invalid isa bus.");
+ }
+ return bus->ops->get_address_space(bus);
}
diff --git a/hw/isa.h b/hw/isa.h
index 129f129..22a2783 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -35,6 +35,7 @@ struct ISABus {
struct ISABusOps {
void (*set_irqs)(ISABus *bus, qemu_irq *irqs);
qemu_irq (*get_irq)(ISABus *bus, int isairq);
+ MemoryRegion *(*get_address_space)(ISABus *bus);
};
ISABus *isa_bus_bridge_init(DeviceState *dev);
--
1.7.5.4
- [Qemu-devel] [PATCH v2 00/12] ISA bus improvements, Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 01/12] isa: rename isa_bus_new to isa_bus_bridge_init, Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 03/12] isa: implement isa_address_space() as a method of ISA bus,
Hervé Poussineau <=
- [Qemu-devel] [PATCH v2 02/12] isa: rework ISA bus internals, and add ISA bus ops structure, Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 04/12] audio: give ISA bus to sound cards, instead of PIC, Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 05/12] pc: improve bus implementation of PIIX3 bridge, Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 06/12] fulong2e: move pic initialization + ISA bus creation to south bridge, Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 07/12] sun4u: improve bus implementation of EBus bridge, Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 08/12] malta: improve bus implementation of PIIX4 bridge, Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 09/12] isa: remove unused parameter to isa_bus_bridge_init(), Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 10/12] isa: give bus to isa_create() methods, Hervé Poussineau, 2011/09/20
- [Qemu-devel] [PATCH v2 11/12] isa: give bus to isa_get_irq() and isa_bus_irqs(), Hervé Poussineau, 2011/09/20