diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-05-14 22:35:08 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-05-14 22:35:08 +0100 |
| commit | fe7e8758d0abfb6953b5e4f5a1af17ea1598a2bb (patch) | |
| tree | 9d38d14611581f6902436e66fd92dab79ef13b5c /hw/armv7m.c | |
| parent | 0027b06d0ef6450a52f96827d303865d7333b196 (diff) | |
ARM GIC qdev conversion
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/armv7m.c')
| -rw-r--r-- | hw/armv7m.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/hw/armv7m.c b/hw/armv7m.c index 1d5619c0dd..6be9940bcd 100644 --- a/hw/armv7m.c +++ b/hw/armv7m.c @@ -7,7 +7,7 @@ * This code is licenced under the GPL. */ -#include "hw.h" +#include "sysbus.h" #include "arm-misc.h" #include "sysemu.h" @@ -140,11 +140,15 @@ qemu_irq *armv7m_init(int flash_size, int sram_size, const char *kernel_filename, const char *cpu_model) { CPUState *env; - qemu_irq *pic; + DeviceState *nvic; + /* FIXME: make this local state. */ + static qemu_irq pic[64]; + qemu_irq *cpu_pic; uint32_t pc; int image_size; uint64_t entry; uint64_t lowaddr; + int i; flash_size *= 1024; sram_size *= 1024; @@ -176,7 +180,14 @@ qemu_irq *armv7m_init(int flash_size, int sram_size, qemu_ram_alloc(sram_size) | IO_MEM_RAM); armv7m_bitband_init(); - pic = armv7m_nvic_init(env); + nvic = qdev_create(NULL, "armv7m_nvic"); + qdev_set_prop_ptr(nvic, "cpu", env); + qdev_init(nvic); + cpu_pic = arm_pic_init_cpu(env); + sysbus_connect_irq(sysbus_from_qdev(nvic), 0, cpu_pic[ARM_PIC_CPU_IRQ]); + for (i = 0; i < 64; i++) { + pic[i] = qdev_get_irq_sink(nvic, i); + } image_size = load_elf(kernel_filename, 0, &entry, &lowaddr, NULL); if (image_size < 0) { |