[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 27/38] isa-mmio: concert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 27/38] isa-mmio: concert to memory API |
Date: |
Wed, 3 Aug 2011 14:55:57 +0300 |
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/isa.h | 2 ++
hw/isa_mmio.c | 30 +++++++++++++++---------------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/hw/isa.h b/hw/isa.h
index d2b6126..f1f2181 100644
--- a/hw/isa.h
+++ b/hw/isa.h
@@ -4,6 +4,7 @@
/* ISA bus */
#include "ioport.h"
+#include "memory.h"
#include "qdev.h"
typedef struct ISABus ISABus;
@@ -37,6 +38,7 @@ ISADevice *isa_create_simple(const char *name);
extern target_phys_addr_t isa_mem_base;
+void isa_mmio_setup(MemoryRegion *mr, target_phys_addr_t size);
void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size);
/* dma.c */
diff --git a/hw/isa_mmio.c b/hw/isa_mmio.c
index ca957fb..600225f 100644
--- a/hw/isa_mmio.c
+++ b/hw/isa_mmio.c
@@ -58,25 +58,25 @@ static uint32_t isa_mmio_readl(void *opaque,
target_phys_addr_t addr)
return cpu_inl(addr & IOPORTS_MASK);
}
-static CPUWriteMemoryFunc * const isa_mmio_write[] = {
- &isa_mmio_writeb,
- &isa_mmio_writew,
- &isa_mmio_writel,
+static const MemoryRegionOps isa_mmio_ops = {
+ .old_mmio = {
+ .write = { isa_mmio_writeb, isa_mmio_writew, isa_mmio_writel },
+ .read = { isa_mmio_readb, isa_mmio_readw, isa_mmio_readl, },
+ },
+ .endianness = DEVICE_LITTLE_ENDIAN,
};
-static CPUReadMemoryFunc * const isa_mmio_read[] = {
- &isa_mmio_readb,
- &isa_mmio_readw,
- &isa_mmio_readl,
-};
+void isa_mmio_setup(MemoryRegion *mr, target_phys_addr_t size)
+{
+ memory_region_init_io(mr, &isa_mmio_ops, NULL, "isa-mmio", size);
+}
+
+#include "exec-memory.h"
void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size)
{
- int isa_mmio_iomemtype;
+ MemoryRegion *mr = qemu_malloc(sizeof(*mr));
- isa_mmio_iomemtype = cpu_register_io_memory(isa_mmio_read,
- isa_mmio_write,
- NULL,
- DEVICE_LITTLE_ENDIAN);
- cpu_register_physical_memory(base, size, isa_mmio_iomemtype);
+ isa_mmio_setup(mr, size);
+ memory_region_add_subregion(get_system_memory(), base, mr);
}
--
1.7.5.3
- [Qemu-devel] [PATCH v2 12/38] rtl8139: convert to memory API, (continued)
- [Qemu-devel] [PATCH v2 12/38] rtl8139: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 11/38] pci: allow I/O BARs to be registered with pci_register_bar_region(), Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 26/38] i6300esb: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 21/38] intel-hda: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 17/38] ide: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 37/38] pci: rename pci_register_bar_region() to pci_register_bar(), Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 16/38] es1370: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 32/38] msix: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 24/38] ne2000: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 35/38] pci: remove pci_register_bar(), Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 27/38] isa-mmio: concert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH v2 23/38] ppc: convert to memory API, Avi Kivity, 2011/08/03
- [Qemu-devel] [PATCH v2 28/38] sun4u: convert to memory API, Avi Kivity, 2011/08/03