[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 4/6] axis-dev88: Connect the PIC upstream IRQs d
From: |
Peter Crosthwaite |
Subject: |
Re: [Qemu-devel] [PATCH 4/6] axis-dev88: Connect the PIC upstream IRQs directly to the CPU |
Date: |
Mon, 3 Feb 2014 09:54:31 +1000 |
On Sun, Feb 2, 2014 at 1:04 PM, <address@hidden> wrote:
> From: "Edgar E. Iglesias" <address@hidden>
>
> Signed-off-by: Edgar E. Iglesias <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
> ---
> hw/cris/axis_dev88.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
> index 5524088..645e45c 100644
> --- a/hw/cris/axis_dev88.c
> +++ b/hw/cris/axis_dev88.c
> @@ -254,7 +254,7 @@ void axisdev88_init(QEMUMachineInitArgs *args)
> DeviceState *dev;
> SysBusDevice *s;
> DriveInfo *nand;
> - qemu_irq irq[30], nmi[2], *cpu_irq;
> + qemu_irq irq[30], nmi[2];
> void *etraxfs_dmac;
> struct etraxfs_dma_client *dma_eth;
> int i;
> @@ -296,15 +296,14 @@ void axisdev88_init(QEMUMachineInitArgs *args)
> &gpio_state.iomem);
>
>
> - cpu_irq = cris_pic_init_cpu(env);
> dev = qdev_create(NULL, "etraxfs,pic");
> /* FIXME: Is there a proper way to signal vectors to the CPU core? */
> qdev_prop_set_ptr(dev, "interrupt_vector", &env->interrupt_vector);
> qdev_init_nofail(dev);
> s = SYS_BUS_DEVICE(dev);
> sysbus_mmio_map(s, 0, 0x3001c000);
> - sysbus_connect_irq(s, 0, cpu_irq[0]);
> - sysbus_connect_irq(s, 1, cpu_irq[1]);
> + sysbus_connect_irq(s, 0, qdev_get_gpio_in(DEVICE(cpu), CRIS_CPU_IRQ));
> + sysbus_connect_irq(s, 1, qdev_get_gpio_in(DEVICE(cpu), CRIS_CPU_NMI));
> for (i = 0; i < 30; i++) {
> irq[i] = qdev_get_gpio_in(dev, i);
> }
> --
> 1.8.3.2
>
>
- [Qemu-devel] [PATCH 0/6] CRIS queue, edgar . iglesias, 2014/02/01
- [Qemu-devel] [PATCH 1/6] cris: Add a CRISv32 default "any" CPU for user mode emulation, edgar . iglesias, 2014/02/01
- [Qemu-devel] [PATCH 2/6] cris: Abort when a v10 takes interrupts while in a delayslot, edgar . iglesias, 2014/02/01
- [Qemu-devel] [PATCH 3/6] cris: Add interrupt signals to the CPU device, edgar . iglesias, 2014/02/01
- [Qemu-devel] [PATCH 4/6] axis-dev88: Connect the PIC upstream IRQs directly to the CPU, edgar . iglesias, 2014/02/01
- Re: [Qemu-devel] [PATCH 4/6] axis-dev88: Connect the PIC upstream IRQs directly to the CPU,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH 6/6] linux-user: Fix trampoline code for CRIS, edgar . iglesias, 2014/02/01
- [Qemu-devel] [PATCH 5/6] cris: Remove the CRIS PIC glue, edgar . iglesias, 2014/02/01