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

slavio_misc: convert diagnostic 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:53 +01:00 committed by Avi Kivity
parent dd703aae47
commit 96891e593e
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

@ -37,6 +37,7 @@
typedef struct MiscState { typedef struct MiscState {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion cfg_iomem; MemoryRegion cfg_iomem;
MemoryRegion diag_iomem;
qemu_irq irq; qemu_irq irq;
qemu_irq fdc_tc; qemu_irq fdc_tc;
uint32_t dummy; 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, static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr,
uint32_t val) uint64_t val, unsigned size)
{ {
MiscState *s = opaque; MiscState *s = opaque;
@ -141,7 +142,8 @@ static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr,
s->diag = val & 0xff; 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; MiscState *s = opaque;
uint32_t ret = 0; uint32_t ret = 0;
@ -151,16 +153,14 @@ static uint32_t slavio_diag_mem_readb(void *opaque, target_phys_addr_t addr)
return ret; return ret;
} }
static CPUReadMemoryFunc * const slavio_diag_mem_read[3] = { static const MemoryRegionOps slavio_diag_mem_ops = {
slavio_diag_mem_readb, .read = slavio_diag_mem_readb,
NULL, .write = slavio_diag_mem_writeb,
NULL, .endianness = DEVICE_NATIVE_ENDIAN,
}; .valid = {
.min_access_size = 1,
static CPUWriteMemoryFunc * const slavio_diag_mem_write[3] = { .max_access_size = 1,
slavio_diag_mem_writeb, },
NULL,
NULL,
}; };
static void slavio_mdm_mem_writeb(void *opaque, target_phys_addr_t addr, 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); sysbus_init_mmio_region(dev, &s->cfg_iomem);
/* Diagnostics */ /* Diagnostics */
io = cpu_register_io_memory(slavio_diag_mem_read, memory_region_init_io(&s->diag_iomem, &slavio_diag_mem_ops, s,
slavio_diag_mem_write, s, "diagnostic", MISC_SIZE);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->diag_iomem);
sysbus_init_mmio(dev, MISC_SIZE, io);
/* Modem control */ /* Modem control */
io = cpu_register_io_memory(slavio_mdm_mem_read, io = cpu_register_io_memory(slavio_mdm_mem_read,