motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-19 08:02:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

slavio_intctl: convert master interrupt controller 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:59 +01:00 • committed by Avi Kivity
parent 40ce02fcd1
commit 13c89a1125
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
hw/slavio_intctl.c
View file

@ -54,6 +54,7 @@ typedef struct SLAVIO_CPUINTCTLState {
typedef struct SLAVIO_INTCTLState { typedef struct SLAVIO_INTCTLState {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
#ifdef DEBUG_IRQ_COUNT #ifdef DEBUG_IRQ_COUNT
uint64_t irq_count[32]; uint64_t irq_count[32];
#endif #endif
@ -134,7 +135,8 @@ static CPUWriteMemoryFunc * const slavio_intctl_mem_write[3] = {
}; };
// master system interrupt controller // master system interrupt controller
static uint32_t slavio_intctlm_mem_readl(void *opaque, target_phys_addr_t addr) static uint64_t slavio_intctlm_mem_readl(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
SLAVIO_INTCTLState *s = opaque; SLAVIO_INTCTLState *s = opaque;
uint32_t saddr, ret; uint32_t saddr, ret;
@ -160,7 +162,7 @@ static uint32_t slavio_intctlm_mem_readl(void *opaque, target_phys_addr_t addr)
} }
static void slavio_intctlm_mem_writel(void *opaque, target_phys_addr_t addr, static void slavio_intctlm_mem_writel(void *opaque, target_phys_addr_t addr,
uint32_t val) uint64_t val, unsigned size)
{ {
SLAVIO_INTCTLState *s = opaque; SLAVIO_INTCTLState *s = opaque;
uint32_t saddr; uint32_t saddr;
@ -192,16 +194,14 @@ static void slavio_intctlm_mem_writel(void *opaque, target_phys_addr_t addr,
} }
} }
static CPUReadMemoryFunc * const slavio_intctlm_mem_read[3] = { static const MemoryRegionOps slavio_intctlm_mem_ops = {
NULL, .read = slavio_intctlm_mem_readl,
NULL, .write = slavio_intctlm_mem_writel,
slavio_intctlm_mem_readl, .endianness = DEVICE_NATIVE_ENDIAN,
}; .valid = {
.min_access_size = 4,
static CPUWriteMemoryFunc * const slavio_intctlm_mem_write[3] = { .max_access_size = 4,
NULL, },
NULL,
slavio_intctlm_mem_writel,
}; };
void slavio_pic_info(Monitor *mon, DeviceState *dev) void slavio_pic_info(Monitor *mon, DeviceState *dev)
@ -426,10 +426,9 @@ static int slavio_intctl_init1(SysBusDevice *dev)
unsigned int i, j; unsigned int i, j;
qdev_init_gpio_in(&dev->qdev, slavio_set_irq_all, 32 + MAX_CPUS); qdev_init_gpio_in(&dev->qdev, slavio_set_irq_all, 32 + MAX_CPUS);
io_memory = cpu_register_io_memory(slavio_intctlm_mem_read, memory_region_init_io(&s->iomem, &slavio_intctlm_mem_ops, s,
slavio_intctlm_mem_write, s, "master-interrupt-controller", INTCTLM_SIZE);
DEVICE_NATIVE_ENDIAN); sysbus_init_mmio_region(dev, &s->iomem);
sysbus_init_mmio(dev, INTCTLM_SIZE, io_memory);
for (i = 0; i < MAX_CPUS; i++) { for (i = 0; i < MAX_CPUS; i++) {
for (j = 0; j < MAX_PILS; j++) { for (j = 0; j < MAX_PILS; j++) {