proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-07 11:28:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

slavio_misc: convert aux1 to memory API

Browse Source 
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:57 +01:00 committed by Avi Kivity
parent cd64a524fa
commit cccd43c544
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

@ -41,6 +41,7 @@ typedef struct MiscState {
MemoryRegion mdm_iomem; MemoryRegion mdm_iomem;
MemoryRegion led_iomem; MemoryRegion led_iomem;
MemoryRegion sysctrl_iomem; MemoryRegion sysctrl_iomem;
MemoryRegion aux1_iomem;
qemu_irq irq; qemu_irq irq;
qemu_irq fdc_tc; qemu_irq fdc_tc;
uint32_t dummy; uint32_t dummy;
@ -197,7 +198,7 @@ static const MemoryRegionOps slavio_mdm_mem_ops = {
}; };
static void slavio_aux1_mem_writeb(void *opaque, target_phys_addr_t addr, static void slavio_aux1_mem_writeb(void *opaque, target_phys_addr_t addr,
uint32_t val) uint64_t val, unsigned size)
{ {
MiscState *s = opaque; MiscState *s = opaque;
@ -213,7 +214,8 @@ static void slavio_aux1_mem_writeb(void *opaque, target_phys_addr_t addr,
s->aux1 = val & 0xff; s->aux1 = val & 0xff;
} }
static uint32_t slavio_aux1_mem_readb(void *opaque, target_phys_addr_t addr) static uint64_t slavio_aux1_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;
@ -223,16 +225,14 @@ static uint32_t slavio_aux1_mem_readb(void *opaque, target_phys_addr_t addr)
return ret; return ret;
} }
static CPUReadMemoryFunc * const slavio_aux1_mem_read[3] = { static const MemoryRegionOps slavio_aux1_mem_ops = {
slavio_aux1_mem_readb, .read = slavio_aux1_mem_readb,
NULL, .write = slavio_aux1_mem_writeb,
NULL, .endianness = DEVICE_NATIVE_ENDIAN,
}; .valid = {
.min_access_size = 1,
static CPUWriteMemoryFunc * const slavio_aux1_mem_write[3] = { .max_access_size = 1,
slavio_aux1_mem_writeb, },
NULL,
NULL,
}; };
static void slavio_aux2_mem_writeb(void *opaque, target_phys_addr_t addr, static void slavio_aux2_mem_writeb(void *opaque, target_phys_addr_t addr,
@ -455,10 +455,9 @@ static int slavio_misc_init1(SysBusDevice *dev)
sysbus_init_mmio_region(dev, &s->sysctrl_iomem); sysbus_init_mmio_region(dev, &s->sysctrl_iomem);
/* AUX 1 (Misc System Functions) */ /* AUX 1 (Misc System Functions) */
io = cpu_register_io_memory(slavio_aux1_mem_read, memory_region_init_io(&s->aux1_iomem, &slavio_aux1_mem_ops, s,
slavio_aux1_mem_write, s, "misc-system-functions", MISC_SIZE);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->aux1_iomem);
sysbus_init_mmio(dev, MISC_SIZE, io);
/* AUX 2 (Software Powerdown Control) */ /* AUX 2 (Software Powerdown Control) */
io = cpu_register_io_memory(slavio_aux2_mem_read, io = cpu_register_io_memory(slavio_aux2_mem_read,