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

slavio_misc: convert aux2 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:58 +01:00 committed by Avi Kivity
parent cccd43c544
commit 40ce02fcd1
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/slavio_misc.c
View File

@ -42,6 +42,7 @@ typedef struct MiscState {
MemoryRegion led_iomem; MemoryRegion led_iomem;
MemoryRegion sysctrl_iomem; MemoryRegion sysctrl_iomem;
MemoryRegion aux1_iomem; MemoryRegion aux1_iomem;
MemoryRegion aux2_iomem;
qemu_irq irq; qemu_irq irq;
qemu_irq fdc_tc; qemu_irq fdc_tc;
uint32_t dummy; uint32_t dummy;
@ -236,7 +237,7 @@ static const MemoryRegionOps slavio_aux1_mem_ops = {
}; };
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,
uint32_t val) uint64_t val, unsigned size)
{ {
MiscState *s = opaque; MiscState *s = opaque;
@ -251,7 +252,8 @@ static void slavio_aux2_mem_writeb(void *opaque, target_phys_addr_t addr,
slavio_misc_update_irq(s); slavio_misc_update_irq(s);
} }
static uint32_t slavio_aux2_mem_readb(void *opaque, target_phys_addr_t addr) static uint64_t slavio_aux2_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;
@ -261,16 +263,14 @@ static uint32_t slavio_aux2_mem_readb(void *opaque, target_phys_addr_t addr)
return ret; return ret;
} }
static CPUReadMemoryFunc * const slavio_aux2_mem_read[3] = { static const MemoryRegionOps slavio_aux2_mem_ops = {
slavio_aux2_mem_readb, .read = slavio_aux2_mem_readb,
NULL, .write = slavio_aux2_mem_writeb,
NULL, .endianness = DEVICE_NATIVE_ENDIAN,
}; .valid = {
.min_access_size = 1,
static CPUWriteMemoryFunc * const slavio_aux2_mem_write[3] = { .max_access_size = 1,
slavio_aux2_mem_writeb, },
NULL,
NULL,
}; };
static void apc_mem_writeb(void *opaque, target_phys_addr_t addr, static void apc_mem_writeb(void *opaque, target_phys_addr_t addr,
@ -421,7 +421,6 @@ static int apc_init1(SysBusDevice *dev)
static int slavio_misc_init1(SysBusDevice *dev) static int slavio_misc_init1(SysBusDevice *dev)
{ {
MiscState *s = FROM_SYSBUS(MiscState, dev); MiscState *s = FROM_SYSBUS(MiscState, dev);
int io;
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
sysbus_init_irq(dev, &s->fdc_tc); sysbus_init_irq(dev, &s->fdc_tc);
@ -460,10 +459,9 @@ static int slavio_misc_init1(SysBusDevice *dev)
sysbus_init_mmio_region(dev, &s->aux1_iomem); sysbus_init_mmio_region(dev, &s->aux1_iomem);
/* AUX 2 (Software Powerdown Control) */ /* AUX 2 (Software Powerdown Control) */
io = cpu_register_io_memory(slavio_aux2_mem_read, memory_region_init_io(&s->aux2_iomem, &slavio_aux2_mem_ops, s,
slavio_aux2_mem_write, s, "software-powerdown-control", MISC_SIZE);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->aux2_iomem);
sysbus_init_mmio(dev, MISC_SIZE, io);
qdev_init_gpio_in(&dev->qdev, slavio_set_power_fail, 1); qdev_init_gpio_in(&dev->qdev, slavio_set_power_fail, 1);