[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/11] xilinx_axidma: (un)reversed irq initialisa
From: |
Peter A. G. Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v2 10/11] xilinx_axidma: (un)reversed irq initialisation |
Date: |
Wed, 13 Jun 2012 14:46:50 +1000 |
The axidma irq orders are reversed in both the device model and the instantion.
Undid both reversal (for no net change). Also needs to be reversed for
consistency with Xilinx tools IRQ listing.
Signed-off-by: Peter A. G. Crosthwaite <address@hidden>
---
hw/xilinx.h | 4 ++--
hw/xilinx_axidma.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/xilinx.h b/hw/xilinx.h
index 52fce01..8f915b4 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -81,8 +81,8 @@ xilinx_axiethernetdma_create(void *dmach,
qdev_init_nofail(dev);
sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
- sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq2);
- sysbus_connect_irq(sysbus_from_qdev(dev), 1, irq);
+ sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
+ sysbus_connect_irq(sysbus_from_qdev(dev), 1, irq2);
return dev;
}
diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index 85dfcbf..59373b5 100644
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -463,8 +463,8 @@ static int xilinx_axidma_init(SysBusDevice *dev)
struct XilinxAXIDMA *s = FROM_SYSBUS(typeof(*s), dev);
int i;
- sysbus_init_irq(dev, &s->streams[1].irq);
sysbus_init_irq(dev, &s->streams[0].irq);
+ sysbus_init_irq(dev, &s->streams[1].irq);
if (!s->dmach) {
hw_error("Unconnected DMA channel.\n");
--
1.7.3.2
- [Qemu-devel] [PATCH v2 05/11] xilinx_intc: changed device name, (continued)
- [Qemu-devel] [PATCH v2 05/11] xilinx_intc: changed device name, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 06/11] xilinx_ethlite: tweaked naming of ping-pong props, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 07/11] xilinx_ethlite: changed device name, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 09/11] xilinx_axienet: changed device name, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 11/11] xilinx_axidma: changed device name, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 08/11] xilinx_axienet: droped the c_ on parameters, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 10/11] xilinx_axidma: (un)reversed irq initialisation,
Peter A. G. Crosthwaite <=
- Re: [Qemu-devel] [PATCH v2 00/11] Xilinx Devs: refactored device and property names, Edgar E. Iglesias, 2012/06/15