haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

etrax-pic: Convert to MemoryRegion

Browse source 
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Edgar E. Iglesias 2011-08-11 13:47:44 +02:00 committed by Avi Kivity
parent 3917149d96
commit 5dd25f368c
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
hw/etraxfs_pic.c
View file

@ -39,6 +39,7 @@
struct etrax_pic struct etrax_pic
{ {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion mmio;
void *interrupt_vector; void *interrupt_vector;
qemu_irq parent_irq; qemu_irq parent_irq;
qemu_irq parent_nmi; qemu_irq parent_nmi;
@ -77,7 +78,8 @@ static void pic_update(struct etrax_pic *fs)
qemu_set_irq(fs->parent_irq, !!vector); qemu_set_irq(fs->parent_irq, !!vector);
} }
static uint32_t pic_readl (void *opaque, target_phys_addr_t addr) static uint64_t
pic_read(void *opaque, target_phys_addr_t addr, unsigned int size)
{ {
struct etrax_pic *fs = opaque; struct etrax_pic *fs = opaque;
uint32_t rval; uint32_t rval;
@ -87,8 +89,8 @@ static uint32_t pic_readl (void *opaque, target_phys_addr_t addr)
return rval; return rval;
} }
static void static void pic_write(void *opaque, target_phys_addr_t addr,
pic_writel (void *opaque, target_phys_addr_t addr, uint32_t value) uint64_t value, unsigned int size)
{ {
struct etrax_pic *fs = opaque; struct etrax_pic *fs = opaque;
D(printf("%s addr=%x val=%x\n", __func__, addr, value)); D(printf("%s addr=%x val=%x\n", __func__, addr, value));
@ -99,14 +101,14 @@ pic_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
} }
} }
static CPUReadMemoryFunc * const pic_read[] = { static const MemoryRegionOps pic_ops = {
NULL, NULL, .read = pic_read,
&pic_readl, .write = pic_write,
}; .endianness = DEVICE_NATIVE_ENDIAN,
.valid = {
static CPUWriteMemoryFunc * const pic_write[] = { .min_access_size = 4,
NULL, NULL, .max_access_size = 4
&pic_writel, }
}; };
static void nmi_handler(void *opaque, int irq, int level) static void nmi_handler(void *opaque, int irq, int level)
@ -139,15 +141,13 @@ static void irq_handler(void *opaque, int irq, int level)
static int etraxfs_pic_init(SysBusDevice *dev) static int etraxfs_pic_init(SysBusDevice *dev)
{ {
struct etrax_pic *s = FROM_SYSBUS(typeof (*s), dev); struct etrax_pic *s = FROM_SYSBUS(typeof (*s), dev);
int intr_vect_regs;
qdev_init_gpio_in(&dev->qdev, irq_handler, 32); qdev_init_gpio_in(&dev->qdev, irq_handler, 32);
sysbus_init_irq(dev, &s->parent_irq); sysbus_init_irq(dev, &s->parent_irq);
sysbus_init_irq(dev, &s->parent_nmi); sysbus_init_irq(dev, &s->parent_nmi);
intr_vect_regs = cpu_register_io_memory(pic_read, pic_write, s, memory_region_init_io(&s->mmio, &pic_ops, s, "etraxfs-pic", R_MAX * 4);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->mmio);
sysbus_init_mmio(dev, R_MAX * 4, intr_vect_regs);
return 0; return 0;
} }