[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] lm32_sys: convert to memory API
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 06/11] lm32_sys: convert to memory API |
Date: |
Tue, 22 Nov 2011 15:23:23 +0100 |
Signed-off-by: Benoît Canet <address@hidden>
---
hw/lm32_sys.c | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/hw/lm32_sys.c b/hw/lm32_sys.c
index e5ff962..320b333 100644
--- a/hw/lm32_sys.c
+++ b/hw/lm32_sys.c
@@ -35,6 +35,7 @@
#include "qemu-error.h"
#include "sysemu.h"
#include "qemu-log.h"
+#include "exec-memory.h"
enum {
R_CTRL = 0,
@@ -47,6 +48,7 @@ enum {
struct LM32SysState {
SysBusDevice busdev;
+ MemoryRegion iomem;
uint32_t base;
uint32_t regs[R_MAX];
uint8_t testname[MAX_TESTNAME_LEN];
@@ -89,16 +91,12 @@ static void sys_write(void *opaque, target_phys_addr_t
addr, uint32_t value)
}
}
-static CPUReadMemoryFunc * const sys_read_fn[] = {
- NULL,
- NULL,
- NULL,
-};
-
-static CPUWriteMemoryFunc * const sys_write_fn[] = {
- NULL,
- NULL,
- &sys_write,
+static const MemoryRegionOps sys_ops = {
+ .old_mmio = {
+ .read = { NULL, NULL, NULL, },
+ .write = { NULL, NULL, sys_write, },
+ },
+ .endianness = DEVICE_NATIVE_ENDIAN,
};
static void sys_reset(DeviceState *d)
@@ -115,11 +113,9 @@ static void sys_reset(DeviceState *d)
static int lm32_sys_init(SysBusDevice *dev)
{
LM32SysState *s = FROM_SYSBUS(typeof(*s), dev);
- int sys_regs;
- sys_regs = cpu_register_io_memory(sys_read_fn, sys_write_fn, s,
- DEVICE_NATIVE_ENDIAN);
- sysbus_init_mmio(dev, R_MAX * 4, sys_regs);
+ memory_region_init_io(&s->iomem, &sys_ops , s, "sys", R_MAX * 4);
+ sysbus_init_mmio_region(dev, &s->iomem);
/* Note: This device is not created in the board initialization,
* instead it has to be added with the -device parameter. Therefore,
--
1.7.7.3
- [Qemu-devel] [PATCH 01/11] mcf5206: convert to memory API, (continued)
- [Qemu-devel] [PATCH 01/11] mcf5206: convert to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 02/11] mcf_uart: convert to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 04/11] mcf_intc: convert to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 03/11] mcf_fec: convert to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 09/11] bonito: convert south bridge pci config to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 07/11] bonito: convert north bridge register mapping to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 10/11] bonito: convert ldma to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 05/11] lm32_uart: convert to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 06/11] lm32_sys: convert to memory API,
Benoît Canet <=
- [Qemu-devel] [PATCH 11/11] bonito: convert cop to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 08/11] bonito: convert north bridge pci config to memory API, Benoît Canet, 2011/11/22