[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] milkymist-hpdmc: convert to memory API
From: |
Michael Walle |
Subject: |
[Qemu-devel] [PATCH 2/9] milkymist-hpdmc: convert to memory API |
Date: |
Wed, 31 Aug 2011 16:48:40 +0200 |
Signed-off-by: Michael Walle <address@hidden>
---
hw/milkymist-hpdmc.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/hw/milkymist-hpdmc.c b/hw/milkymist-hpdmc.c
index c0962fb..17c840f 100644
--- a/hw/milkymist-hpdmc.c
+++ b/hw/milkymist-hpdmc.c
@@ -42,12 +42,14 @@ enum {
struct MilkymistHpdmcState {
SysBusDevice busdev;
+ MemoryRegion regs_region;
uint32_t regs[R_MAX];
};
typedef struct MilkymistHpdmcState MilkymistHpdmcState;
-static uint32_t hpdmc_read(void *opaque, target_phys_addr_t addr)
+static uint64_t hpdmc_read(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
MilkymistHpdmcState *s = opaque;
uint32_t r = 0;
@@ -72,7 +74,8 @@ static uint32_t hpdmc_read(void *opaque, target_phys_addr_t
addr)
return r;
}
-static void hpdmc_write(void *opaque, target_phys_addr_t addr, uint32_t value)
+static void hpdmc_write(void *opaque, target_phys_addr_t addr, uint64_t value,
+ unsigned size)
{
MilkymistHpdmcState *s = opaque;
@@ -96,16 +99,14 @@ static void hpdmc_write(void *opaque, target_phys_addr_t
addr, uint32_t value)
}
}
-static CPUReadMemoryFunc * const hpdmc_read_fn[] = {
- NULL,
- NULL,
- &hpdmc_read,
-};
-
-static CPUWriteMemoryFunc * const hpdmc_write_fn[] = {
- NULL,
- NULL,
- &hpdmc_write,
+static const MemoryRegionOps hpdmc_mmio_ops = {
+ .read = hpdmc_read,
+ .write = hpdmc_write,
+ .valid = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ },
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static void milkymist_hpdmc_reset(DeviceState *d)
@@ -125,11 +126,10 @@ static void milkymist_hpdmc_reset(DeviceState *d)
static int milkymist_hpdmc_init(SysBusDevice *dev)
{
MilkymistHpdmcState *s = FROM_SYSBUS(typeof(*s), dev);
- int hpdmc_regs;
- hpdmc_regs = cpu_register_io_memory(hpdmc_read_fn, hpdmc_write_fn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, R_MAX * 4, hpdmc_regs);
+ memory_region_init_io(&s->regs_region, &hpdmc_mmio_ops, s,
+ "milkymist-hpdmc", R_MAX * 4);
+ sysbus_init_mmio_region(dev, &s->regs_region);
return 0;
}
--
1.7.2.5
- [Qemu-devel] [PATCH 0/9] Memory API conversion for milkymist models, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 1/9] milkymist-ac97: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 3/9] milkymist-memcard: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 4/9] milkymist-pfpu: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 2/9] milkymist-hpdmc: convert to memory API,
Michael Walle <=
- [Qemu-devel] [PATCH 6/9] milkymist-tmu2: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 5/9] milkymist-sysctl: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 9/9] milkymist-{minimac2, softusb}: rename memory names, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 7/9] milkymist-uart: convert to memory API, Michael Walle, 2011/08/31
- [Qemu-devel] [PATCH 8/9] milkymist-vgafb: convert to memory API, Michael Walle, 2011/08/31
- Re: [Qemu-devel] [PATCH 0/9] Memory API conversion for milkymist models, Avi Kivity, 2011/08/31