From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9nMw-0006lb-Ne for qemu-devel@nongnu.org; Sat, 01 Feb 2014 22:05:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W9nMp-0003LE-7l for qemu-devel@nongnu.org; Sat, 01 Feb 2014 22:05:14 -0500 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]:34889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W9nMo-0003IT-W7 for qemu-devel@nongnu.org; Sat, 01 Feb 2014 22:05:07 -0500 Received: by mail-pa0-f47.google.com with SMTP id kp14so5843091pab.34 for ; Sat, 01 Feb 2014 19:05:06 -0800 (PST) Received: from localhost (ec2-54-206-39-244.ap-southeast-2.compute.amazonaws.com. [54.206.39.244]) by mx.google.com with ESMTPSA id z10sm107645302pas.6.2014.02.01.19.05.05 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 01 Feb 2014 19:05:05 -0800 (PST) From: edgar.iglesias@gmail.com Date: Sun, 2 Feb 2014 03:04:50 +0000 Message-Id: <1391310292-18008-5-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1391310292-18008-1-git-send-email-edgar.iglesias@gmail.com> References: <1391310292-18008-1-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH 4/6] axis-dev88: Connect the PIC upstream IRQs directly to the CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- 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