grlib, irqmp: get rid of the old-style create function
Suggested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: KONRAD Frederic <frederic.konrad@adacore.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
parent
bd30132cd8
commit
ea005daec3
|
@ -3,7 +3,7 @@
|
||||||
*
|
*
|
||||||
* (Multiprocessor and extended interrupt not supported)
|
* (Multiprocessor and extended interrupt not supported)
|
||||||
*
|
*
|
||||||
* Copyright (c) 2010-2011 AdaCore
|
* Copyright (c) 2010-2019 AdaCore
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
@ -47,7 +47,6 @@
|
||||||
#define FORCE_OFFSET 0x80
|
#define FORCE_OFFSET 0x80
|
||||||
#define EXTENDED_OFFSET 0xC0
|
#define EXTENDED_OFFSET 0xC0
|
||||||
|
|
||||||
#define TYPE_GRLIB_IRQMP "grlib,irqmp"
|
|
||||||
#define GRLIB_IRQMP(obj) OBJECT_CHECK(IRQMP, (obj), TYPE_GRLIB_IRQMP)
|
#define GRLIB_IRQMP(obj) OBJECT_CHECK(IRQMP, (obj), TYPE_GRLIB_IRQMP)
|
||||||
|
|
||||||
typedef struct IRQMPState IRQMPState;
|
typedef struct IRQMPState IRQMPState;
|
||||||
|
|
|
@ -47,6 +47,8 @@
|
||||||
|
|
||||||
#define MAX_PILS 16
|
#define MAX_PILS 16
|
||||||
|
|
||||||
|
#define LEON3_IRQMP_OFFSET (0x80000200)
|
||||||
|
|
||||||
typedef struct ResetData {
|
typedef struct ResetData {
|
||||||
SPARCCPU *cpu;
|
SPARCCPU *cpu;
|
||||||
uint32_t entry; /* save kernel entry in case of reset */
|
uint32_t entry; /* save kernel entry in case of reset */
|
||||||
|
@ -121,6 +123,7 @@ static void leon3_generic_hw_init(MachineState *machine)
|
||||||
int bios_size;
|
int bios_size;
|
||||||
int prom_size;
|
int prom_size;
|
||||||
ResetData *reset_info;
|
ResetData *reset_info;
|
||||||
|
DeviceState *dev;
|
||||||
|
|
||||||
/* Init CPU */
|
/* Init CPU */
|
||||||
cpu = SPARC_CPU(cpu_create(machine->cpu_type));
|
cpu = SPARC_CPU(cpu_create(machine->cpu_type));
|
||||||
|
@ -135,9 +138,14 @@ static void leon3_generic_hw_init(MachineState *machine)
|
||||||
qemu_register_reset(main_cpu_reset, reset_info);
|
qemu_register_reset(main_cpu_reset, reset_info);
|
||||||
|
|
||||||
/* Allocate IRQ manager */
|
/* Allocate IRQ manager */
|
||||||
grlib_irqmp_create(0x80000200, env, &cpu_irqs, MAX_PILS, &leon3_set_pil_in);
|
dev = qdev_create(NULL, TYPE_GRLIB_IRQMP);
|
||||||
|
qdev_prop_set_ptr(dev, "set_pil_in", leon3_set_pil_in);
|
||||||
|
qdev_prop_set_ptr(dev, "set_pil_in_opaque", env);
|
||||||
|
qdev_init_nofail(dev);
|
||||||
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, LEON3_IRQMP_OFFSET);
|
||||||
|
env->irq_manager = dev;
|
||||||
env->qemu_irq_ack = leon3_irq_manager;
|
env->qemu_irq_ack = leon3_irq_manager;
|
||||||
|
cpu_irqs = qemu_allocate_irqs(grlib_irqmp_set_irq, dev, MAX_PILS);
|
||||||
|
|
||||||
/* Allocate RAM */
|
/* Allocate RAM */
|
||||||
if (ram_size > 1 * GiB) {
|
if (ram_size > 1 * GiB) {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* QEMU GRLIB Components
|
* QEMU GRLIB Components
|
||||||
*
|
*
|
||||||
* Copyright (c) 2010-2011 AdaCore
|
* Copyright (c) 2010-2019 AdaCore
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
@ -33,6 +33,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* IRQMP */
|
/* IRQMP */
|
||||||
|
#define TYPE_GRLIB_IRQMP "grlib,irqmp"
|
||||||
|
|
||||||
typedef void (*set_pil_in_fn) (void *opaque, uint32_t pil_in);
|
typedef void (*set_pil_in_fn) (void *opaque, uint32_t pil_in);
|
||||||
|
|
||||||
|
@ -40,34 +41,6 @@ void grlib_irqmp_set_irq(void *opaque, int irq, int level);
|
||||||
|
|
||||||
void grlib_irqmp_ack(DeviceState *dev, int intno);
|
void grlib_irqmp_ack(DeviceState *dev, int intno);
|
||||||
|
|
||||||
static inline
|
|
||||||
DeviceState *grlib_irqmp_create(hwaddr base,
|
|
||||||
CPUSPARCState *env,
|
|
||||||
qemu_irq **cpu_irqs,
|
|
||||||
uint32_t nr_irqs,
|
|
||||||
set_pil_in_fn set_pil_in)
|
|
||||||
{
|
|
||||||
DeviceState *dev;
|
|
||||||
|
|
||||||
assert(cpu_irqs != NULL);
|
|
||||||
|
|
||||||
dev = qdev_create(NULL, "grlib,irqmp");
|
|
||||||
qdev_prop_set_ptr(dev, "set_pil_in", set_pil_in);
|
|
||||||
qdev_prop_set_ptr(dev, "set_pil_in_opaque", env);
|
|
||||||
|
|
||||||
qdev_init_nofail(dev);
|
|
||||||
|
|
||||||
env->irq_manager = dev;
|
|
||||||
|
|
||||||
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
|
|
||||||
|
|
||||||
*cpu_irqs = qemu_allocate_irqs(grlib_irqmp_set_irq,
|
|
||||||
dev,
|
|
||||||
nr_irqs);
|
|
||||||
|
|
||||||
return dev;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* GPTimer */
|
/* GPTimer */
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
|
|
Loading…
Reference in New Issue