ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slavio_misc: convert configuration to memory API 

Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Benoît Canet 2011-11-15 12:13:52 +01:00 committed by Avi Kivity
parent 9c48dee672
commit dd703aae47
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/slavio_misc.c
View File

@ -36,6 +36,7 @@
typedef struct MiscState { typedef struct MiscState {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion cfg_iomem;
qemu_irq irq; qemu_irq irq;
qemu_irq fdc_tc; qemu_irq fdc_tc;
uint32_t dummy; uint32_t dummy;
@ -101,7 +102,7 @@ static void slavio_set_power_fail(void *opaque, int irq, int power_failing)
} }
static void slavio_cfg_mem_writeb(void *opaque, target_phys_addr_t addr, static void slavio_cfg_mem_writeb(void *opaque, target_phys_addr_t addr,
uint32_t val) uint64_t val, unsigned size)
{ {
MiscState *s = opaque; MiscState *s = opaque;
@ -110,7 +111,8 @@ static void slavio_cfg_mem_writeb(void *opaque, target_phys_addr_t addr,
slavio_misc_update_irq(s); slavio_misc_update_irq(s);
} }
static uint32_t slavio_cfg_mem_readb(void *opaque, target_phys_addr_t addr) static uint64_t slavio_cfg_mem_readb(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
MiscState *s = opaque; MiscState *s = opaque;
uint32_t ret = 0; uint32_t ret = 0;
@ -120,16 +122,14 @@ static uint32_t slavio_cfg_mem_readb(void *opaque, target_phys_addr_t addr)
return ret; return ret;
} }
static CPUReadMemoryFunc * const slavio_cfg_mem_read[3] = { static const MemoryRegionOps slavio_cfg_mem_ops = {
slavio_cfg_mem_readb, .read = slavio_cfg_mem_readb,
NULL, .write = slavio_cfg_mem_writeb,
NULL, .endianness = DEVICE_NATIVE_ENDIAN,
}; .valid = {
.min_access_size = 1,
static CPUWriteMemoryFunc * const slavio_cfg_mem_write[3] = { .max_access_size = 1,
slavio_cfg_mem_writeb, },
NULL,
NULL,
}; };
static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr, static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr,
@ -428,10 +428,9 @@ static int slavio_misc_init1(SysBusDevice *dev)
/* 8 bit registers */ /* 8 bit registers */
/* Slavio control */ /* Slavio control */
io = cpu_register_io_memory(slavio_cfg_mem_read, memory_region_init_io(&s->cfg_iomem, &slavio_cfg_mem_ops, s,
slavio_cfg_mem_write, s, "configuration", MISC_SIZE);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->cfg_iomem);
sysbus_init_mmio(dev, MISC_SIZE, io);
/* Diagnostics */ /* Diagnostics */
io = cpu_register_io_memory(slavio_diag_mem_read, io = cpu_register_io_memory(slavio_diag_mem_read,