[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/14] slavio_misc: convert diagnostic to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 03/14] slavio_misc: convert diagnostic to memory API |
Date: |
Tue, 15 Nov 2011 12:13:53 +0100 |
Signed-off-by: Benoit Canet <address@hidden>
---
hw/slavio_misc.c | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c
index 7b98f11..60a115d 100644
--- a/hw/slavio_misc.c
+++ b/hw/slavio_misc.c
@@ -37,6 +37,7 @@
typedef struct MiscState {
SysBusDevice busdev;
MemoryRegion cfg_iomem;
+ MemoryRegion diag_iomem;
qemu_irq irq;
qemu_irq fdc_tc;
uint32_t dummy;
@@ -133,7 +134,7 @@ static const MemoryRegionOps slavio_cfg_mem_ops = {
};
static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr,
- uint32_t val)
+ uint64_t val, unsigned size)
{
MiscState *s = opaque;
@@ -141,7 +142,8 @@ static void slavio_diag_mem_writeb(void *opaque,
target_phys_addr_t addr,
s->diag = val & 0xff;
}
-static uint32_t slavio_diag_mem_readb(void *opaque, target_phys_addr_t addr)
+static uint64_t slavio_diag_mem_readb(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
MiscState *s = opaque;
uint32_t ret = 0;
@@ -151,16 +153,14 @@ static uint32_t slavio_diag_mem_readb(void *opaque,
target_phys_addr_t addr)
return ret;
}
-static CPUReadMemoryFunc * const slavio_diag_mem_read[3] = {
- slavio_diag_mem_readb,
- NULL,
- NULL,
-};
-
-static CPUWriteMemoryFunc * const slavio_diag_mem_write[3] = {
- slavio_diag_mem_writeb,
- NULL,
- NULL,
+static const MemoryRegionOps slavio_diag_mem_ops = {
+ .read = slavio_diag_mem_readb,
+ .write = slavio_diag_mem_writeb,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .valid = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
};
static void slavio_mdm_mem_writeb(void *opaque, target_phys_addr_t addr,
@@ -433,10 +433,9 @@ static int slavio_misc_init1(SysBusDevice *dev)
sysbus_init_mmio_region(dev, &s->cfg_iomem);
/* Diagnostics */
- io = cpu_register_io_memory(slavio_diag_mem_read,
- slavio_diag_mem_write, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, MISC_SIZE, io);
+ memory_region_init_io(&s->diag_iomem, &slavio_diag_mem_ops, s,
+ "diagnostic", MISC_SIZE);
+ sysbus_init_mmio_region(dev, &s->diag_iomem);
/* Modem control */
io = cpu_register_io_memory(slavio_mdm_mem_read,
--
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, 2011/11/15
- [Qemu-devel] [PATCH 03/14] slavio_misc: convert diagnostic to memory API,
Benoît Canet <=
- [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
- [Qemu-devel] [PATCH 11/14] sun4c_intctl: convert to memory API, Benoît Canet, 2011/11/15