[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/14] slavio_misc: convert apc to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 01/14] slavio_misc: convert apc to memory API |
Date: |
Tue, 15 Nov 2011 12:13:51 +0100 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/slavio_misc.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index 1f5a2d7..7d427f7 100644
--- a/hw/slavio_misc.c
+++ b/hw/slavio_misc.c
@@ -48,6 +48,7 @@ typedef struct MiscState {
typedef struct APCState {
SysBusDevice busdev;
+ MemoryRegion iomem;
qemu_irq cpu_halt;
} APCState;
@@ -270,7 +271,8 @@ static CPUWriteMemoryFunc * const slavio_aux2_mem_write[3]
= {
NULL,
};
-static void apc_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
+static void apc_mem_writeb(void *opaque, target_phys_addr_t addr,
+ uint64_t val, unsigned size)
{
APCState *s = opaque;
@@ -278,7 +280,8 @@ static void apc_mem_writeb(void *opaque, target_phys_addr_t
addr, uint32_t val)
qemu_irq_raise(s->cpu_halt);
}
-static uint32_t apc_mem_readb(void *opaque, target_phys_addr_t addr)
+static uint64_t apc_mem_readb(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
uint32_t ret = 0;
@@ -286,16 +289,14 @@ static uint32_t apc_mem_readb(void *opaque,
target_phys_addr_t addr)
return ret;
}
-static CPUReadMemoryFunc * const apc_mem_read[3] = {
- apc_mem_readb,
- NULL,
- NULL,
-};
-
-static CPUWriteMemoryFunc * const apc_mem_write[3] = {
- apc_mem_writeb,
- NULL,
- NULL,
+static const MemoryRegionOps apc_mem_ops = {
+ .read = apc_mem_readb,
+ .write = apc_mem_writeb,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .valid = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ }
};
static uint32_t slavio_sysctrl_mem_readl(void *opaque, target_phys_addr_t addr)
@@ -407,14 +408,13 @@ static const VMStateDescription vmstate_misc = {
static int apc_init1(SysBusDevice *dev)
{
APCState *s = FROM_SYSBUS(APCState, dev);
- int io;
sysbus_init_irq(dev, &s->cpu_halt);
/* Power management (APC) XXX: not a Slavio device */
- io = cpu_register_io_memory(apc_mem_read, apc_mem_write, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, MISC_SIZE, io);
+ memory_region_init_io(&s->iomem, &apc_mem_ops, s,
+ "apc", MISC_SIZE);
+ sysbus_init_mmio_region(dev, &s->iomem);
return 0;
}
--
1.7.5.4
- [Qemu-devel] [PATCH 00/14] Convert Sun devices to memory API., Benoît Canet, 2011/11/15
- [Qemu-devel] [PATCH 01/14] slavio_misc: convert apc to memory API,
Benoît Canet <=
- [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, 2011/11/15