david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grlib_irqmp: convert to memory API

Browse Source 
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-11-14 14:23:17 +02:00
parent cde844fa76
commit 847b52c107
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/grlib_irqmp.c
View File

@ -49,6 +49,7 @@ typedef struct IRQMPState IRQMPState;
typedef struct IRQMP { typedef struct IRQMP {
SysBusDevice busdev; SysBusDevice busdev;
MemoryRegion iomem;
void *set_pil_in; void *set_pil_in;
void *set_pil_in_opaque; void *set_pil_in_opaque;
@ -161,7 +162,8 @@ void grlib_irqmp_set_irq(void *opaque, int irq, int level)
} }
} }
static uint32_t grlib_irqmp_readl(void *opaque, target_phys_addr_t addr) static uint64_t grlib_irqmp_read(void *opaque, target_phys_addr_t addr,
unsigned size)
{ {
IRQMP *irqmp = opaque; IRQMP *irqmp = opaque;
IRQMPState *state; IRQMPState *state;
@ -224,8 +226,8 @@ static uint32_t grlib_irqmp_readl(void *opaque, target_phys_addr_t addr)
return 0; return 0;
} }
static void static void grlib_irqmp_write(void *opaque, target_phys_addr_t addr,
grlib_irqmp_writel(void *opaque, target_phys_addr_t addr, uint32_t value) uint64_t value, unsigned size)
{ {
IRQMP *irqmp = opaque; IRQMP *irqmp = opaque;
IRQMPState *state; IRQMPState *state;
@ -311,12 +313,14 @@ grlib_irqmp_writel(void *opaque, target_phys_addr_t addr, uint32_t value)
trace_grlib_irqmp_writel_unknown(addr, value); trace_grlib_irqmp_writel_unknown(addr, value);
} }
static CPUReadMemoryFunc * const grlib_irqmp_read[] = { static const MemoryRegionOps grlib_irqmp_ops = {
NULL, NULL, &grlib_irqmp_readl, .read = grlib_irqmp_read,
}; .write = grlib_irqmp_write,
.endianness = DEVICE_NATIVE_ENDIAN,
static CPUWriteMemoryFunc * const grlib_irqmp_write[] = { .valid = {
NULL, NULL, &grlib_irqmp_writel, .min_access_size = 4,
.max_access_size = 4,
},
}; };
static void grlib_irqmp_reset(DeviceState *d) static void grlib_irqmp_reset(DeviceState *d)
@ -332,7 +336,6 @@ static void grlib_irqmp_reset(DeviceState *d)
static int grlib_irqmp_init(SysBusDevice *dev) static int grlib_irqmp_init(SysBusDevice *dev)
{ {
IRQMP *irqmp = FROM_SYSBUS(typeof(*irqmp), dev); IRQMP *irqmp = FROM_SYSBUS(typeof(*irqmp), dev);
int irqmp_regs;
assert(irqmp != NULL); assert(irqmp != NULL);
@ -341,17 +344,12 @@ static int grlib_irqmp_init(SysBusDevice *dev)
return -1; return -1;
} }
irqmp_regs = cpu_register_io_memory(grlib_irqmp_read, memory_region_init_io(&irqmp->iomem, &grlib_irqmp_ops, irqmp,
grlib_irqmp_write, "irqmp", IRQMP_REG_SIZE);
irqmp, DEVICE_NATIVE_ENDIAN);
irqmp->state = g_malloc0(sizeof *irqmp->state); irqmp->state = g_malloc0(sizeof *irqmp->state);
if (irqmp_regs < 0) { sysbus_init_mmio_region(dev, &irqmp->iomem);
return -1;
}
sysbus_init_mmio(dev, IRQMP_REG_SIZE, irqmp_regs);
return 0; return 0;
} }