[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 24/25] milkymist-vgafb: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 24/25] milkymist-vgafb: convert to memory API |
Date: |
Sun, 2 Oct 2011 16:26:55 +0200 |
From: Michael Walle <address@hidden>
Signed-off-by: Michael Walle <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
hw/milkymist-vgafb.c | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/hw/milkymist-vgafb.c b/hw/milkymist-vgafb.c
index 2e55e42..be81abd 100644
--- a/hw/milkymist-vgafb.c
+++ b/hw/milkymist-vgafb.c
@@ -64,6 +64,7 @@ enum {
struct MilkymistVgafbState {
SysBusDevice busdev;
+ MemoryRegion regs_region;
DisplayState *ds;
int invalidate;
@@ -153,7 +154,8 @@ static void vgafb_resize(MilkymistVgafbState *s)
s->invalidate = 1;
}
-static uint32_t vgafb_read(void *opaque, target_phys_addr_t addr)
+static uint64_t vgafb_read(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
MilkymistVgafbState *s = opaque;
uint32_t r = 0;
@@ -189,8 +191,8 @@ static uint32_t vgafb_read(void *opaque, target_phys_addr_t
addr)
return r;
}
-static void
-vgafb_write(void *opaque, target_phys_addr_t addr, uint32_t value)
+static void vgafb_write(void *opaque, target_phys_addr_t addr, uint64_t value,
+ unsigned size)
{
MilkymistVgafbState *s = opaque;
@@ -238,16 +240,14 @@ static uint32_t vgafb_read(void *opaque,
target_phys_addr_t addr)
}
}
-static CPUReadMemoryFunc * const vgafb_read_fn[] = {
- NULL,
- NULL,
- &vgafb_read
-};
-
-static CPUWriteMemoryFunc * const vgafb_write_fn[] = {
- NULL,
- NULL,
- &vgafb_write
+static const MemoryRegionOps vgafb_mmio_ops = {
+ .read = vgafb_read,
+ .write = vgafb_write,
+ .valid = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ },
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static void milkymist_vgafb_reset(DeviceState *d)
@@ -269,11 +269,10 @@ static void milkymist_vgafb_reset(DeviceState *d)
static int milkymist_vgafb_init(SysBusDevice *dev)
{
MilkymistVgafbState *s = FROM_SYSBUS(typeof(*s), dev);
- int vgafb_regs;
- vgafb_regs = cpu_register_io_memory(vgafb_read_fn, vgafb_write_fn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, R_MAX * 4, vgafb_regs);
+ memory_region_init_io(&s->regs_region, &vgafb_mmio_ops, s,
+ "milkymist-vgafb", R_MAX * 4);
+ sysbus_init_mmio_region(dev, &s->regs_region);
s->ds = graphic_console_init(vgafb_update_display,
vgafb_invalidate_display,
--
1.7.6.3
- [Qemu-devel] [PULL 00/25] Memory API conversion, batch 10, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 01/25] etrax-pic: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 02/25] etrax-ser: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 15/25] hw/smc91c111: Convert to MemoryRegion, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 10/25] ppc405: Pass in address_space_mem to ppc405{cr, ep}_init, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 25/25] milkymist-{minimac2, softusb}: rename memory names, Avi Kivity, 2011/10/02
- [Qemu-devel] [PATCH 08/25] serial: Remove ioregister parameter from serial_mm_init, Avi Kivity, 2011/10/02
- [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 <=
- [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, 2011/10/02
- [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