[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/25] milkymist-tmu2: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 22/25] milkymist-tmu2: convert to memory API |
Date: |
Sun, 2 Oct 2011 16:26:53 +0200 |
From: Michael Walle <address@hidden>
Signed-off-by: Michael Walle <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/milkymist-tmu2.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/hw/milkymist-tmu2.c b/hw/milkymist-tmu2.c
index 953d42f..aad0ed0 100644
--- a/hw/milkymist-tmu2.c
+++ b/hw/milkymist-tmu2.c
@@ -77,6 +77,7 @@ struct vertex {
struct MilkymistTMU2State {
SysBusDevice busdev;
+ MemoryRegion regs_region;
CharDriverState *chr;
qemu_irq irq;
@@ -309,7 +310,8 @@ static void tmu2_start(MilkymistTMU2State *s)
qemu_irq_pulse(s->irq);
}
-static uint32_t tmu2_read(void *opaque, target_phys_addr_t addr)
+static uint64_t tmu2_read(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
MilkymistTMU2State *s = opaque;
uint32_t r = 0;
@@ -370,7 +372,8 @@ static void tmu2_check_registers(MilkymistTMU2State *s)
}
}
-static void tmu2_write(void *opaque, target_phys_addr_t addr, uint32_t value)
+static void tmu2_write(void *opaque, target_phys_addr_t addr, uint64_t value,
+ unsigned size)
{
MilkymistTMU2State *s = opaque;
@@ -414,16 +417,14 @@ static void tmu2_write(void *opaque, target_phys_addr_t
addr, uint32_t value)
tmu2_check_registers(s);
}
-static CPUReadMemoryFunc * const tmu2_read_fn[] = {
- NULL,
- NULL,
- &tmu2_read,
-};
-
-static CPUWriteMemoryFunc * const tmu2_write_fn[] = {
- NULL,
- NULL,
- &tmu2_write,
+static const MemoryRegionOps tmu2_mmio_ops = {
+ .read = tmu2_read,
+ .write = tmu2_write,
+ .valid = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ },
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static void milkymist_tmu2_reset(DeviceState *d)
@@ -439,7 +440,6 @@ static void milkymist_tmu2_reset(DeviceState *d)
static int milkymist_tmu2_init(SysBusDevice *dev)
{
MilkymistTMU2State *s = FROM_SYSBUS(typeof(*s), dev);
- int tmu2_regs;
if (tmu2_glx_init(s)) {
return 1;
@@ -447,9 +447,9 @@ static int milkymist_tmu2_init(SysBusDevice *dev)
sysbus_init_irq(dev, &s->irq);
- tmu2_regs = cpu_register_io_memory(tmu2_read_fn, tmu2_write_fn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, R_MAX * 4, tmu2_regs);
+ memory_region_init_io(&s->regs_region, &tmu2_mmio_ops, s,
+ "milkymist-tmu2", R_MAX * 4);
+ sysbus_init_mmio_region(dev, &s->regs_region);
return 0;
}
--
1.7.6.3
- [Qemu-devel] [PATCH 05/25] etrax-eth: Convert to MemoryRegion, (continued)
- [Qemu-devel] [PATCH 05/25] etrax-eth: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 19/25] milkymist-memcard: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 24/25] milkymist-vgafb: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 23/25] milkymist-uart: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 07/25] serial: Use enum device_endian in serial_mm_init parameter, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 18/25] milkymist-hpdmc: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 11/25] ppc440: Pass in address_space_mem to ppc440ep_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 12/25] pxa: Pass in address_space to pxa{255, 270}_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 06/25] serial: Convert serial_mm_init to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 03/25] etrax-timer: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 22/25] milkymist-tmu2: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH 17/25] milkymist-ac97: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 14/25] sun4u: Pass address_space_mem to sun4uv_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 13/25] sm501: Pass address_space_mem to sm501_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 04/25] etrax-dma: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 09/25] serial: Add MemoryRegion parameter to serial_mm_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 16/25] openpic: Memory API conversion for mpic, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 21/25] milkymist-sysctl: convert to memory API, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 20/25] milkymist-pfpu: convert to memory API, Avi Kivity, 2011/10/02
- Re: [Qemu-devel] [PULL 00/25] Memory API conversion, batch 10, Avi Kivity, 2011/10/09