[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/14] sun4m_iommu: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 13/14] sun4m_iommu: convert to memory API |
Date: |
Tue, 15 Nov 2011 12:14:03 +0100 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/sun4m_iommu.c | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/hw/sun4m_iommu.c b/hw/sun4m_iommu.c
index 6eeadfa..86d135a 100644
--- a/hw/sun4m_iommu.c
+++ b/hw/sun4m_iommu.c
@@ -128,13 +128,15 @@
typedef struct IOMMUState {
SysBusDevice busdev;
+ MemoryRegion iomem;
uint32_t regs[IOMMU_NREGS];
target_phys_addr_t iostart;
qemu_irq irq;
uint32_t version;
} IOMMUState;
-static uint32_t iommu_mem_readl(void *opaque, target_phys_addr_t addr)
+static uint64_t iommu_mem_readl(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
IOMMUState *s = opaque;
target_phys_addr_t saddr;
@@ -156,7 +158,7 @@ static uint32_t iommu_mem_readl(void *opaque,
target_phys_addr_t addr)
}
static void iommu_mem_writel(void *opaque, target_phys_addr_t addr,
- uint32_t val)
+ uint64_t val, unsigned size)
{
IOMMUState *s = opaque;
target_phys_addr_t saddr;
@@ -237,16 +239,14 @@ static void iommu_mem_writel(void *opaque,
target_phys_addr_t addr,
}
}
-static CPUReadMemoryFunc * const iommu_mem_read[3] = {
- NULL,
- NULL,
- iommu_mem_readl,
-};
-
-static CPUWriteMemoryFunc * const iommu_mem_write[3] = {
- NULL,
- NULL,
- iommu_mem_writel,
+static const MemoryRegionOps iommu_mem_ops = {
+ .read = iommu_mem_readl,
+ .write = iommu_mem_writel,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .impl = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ },
};
static uint32_t iommu_page_get_flags(IOMMUState *s, target_phys_addr_t addr)
@@ -347,13 +347,12 @@ static void iommu_reset(DeviceState *d)
static int iommu_init1(SysBusDevice *dev)
{
IOMMUState *s = FROM_SYSBUS(IOMMUState, dev);
- int io;
sysbus_init_irq(dev, &s->irq);
- io = cpu_register_io_memory(iommu_mem_read, iommu_mem_write, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, IOMMU_NREGS * sizeof(uint32_t), io);
+ memory_region_init_io(&s->iomem, &iommu_mem_ops, s,
+ "iommu", IOMMU_NREGS * sizeof(uint32_t));
+ sysbus_init_mmio_region(dev, &s->iomem);
return 0;
}
--
1.7.5.4
- [Qemu-devel] [PATCH 01/14] slavio_misc: convert apc to memory API, (continued)
- [Qemu-devel] [PATCH 01/14] slavio_misc: convert apc to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 03/14] slavio_misc: convert diagnostic to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 02/14] slavio_misc: convert configuration to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 06/14] slavio_misc: convert system control to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 07/14] slavio_misc: convert aux1 to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 04/14] slavio_misc: convert modem to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 09/14] slavio_intctl: convert master interrupt controller to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 10/14] slavio_intctl: convert slaves interrupt controllers to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 05/14] slavio_misc: convert leds to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 08/14] slavio_misc: convert aux2 to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 13/14] sun4m_iommu: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 11/14] sun4c_intctl: convert to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 12/14] slavio_timer: convert to memory API, Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 14/14] esp: Fix memory API conversion, Benoît Canet, 2011/11/15
- Re: [Qemu-devel] [PATCH 00/14] Convert Sun devices to memory API., Avi Kivity, 2011/11/15