Remove 'holes' from the interrupt map.
---
boards/milkymist-one/rtl/system.v | 4 +---
software/include/hw/interrupts.h | 30 +++++++++++++++---------------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/boards/milkymist-one/rtl/system.v
b/boards/milkymist-one/rtl/system.v
index ae95ffe..0338b30 100644
--- a/boards/milkymist-one/rtl/system.v
+++ b/boards/milkymist-one/rtl/system.v
@@ -738,10 +738,9 @@ wire ir_irq;
wire usb_irq;
wire [31:0] cpu_interrupt;
-assign cpu_interrupt = {14'd0,
+assign cpu_interrupt = {16'd0,
usb_irq,
ir_irq,
- 1'b0,
midi_irq,
videoin_irq,
ethernettx_irq,
@@ -755,7 +754,6 @@ assign cpu_interrupt = {14'd0,
timer1_irq,
timer0_irq,
gpio_irq,
- 1'b0,
uart_irq
};
diff --git a/software/include/hw/interrupts.h b/software/include/hw/interrupts.h
index 8daeffe..9e6a778 100644
--- a/software/include/hw/interrupts.h
+++ b/software/include/hw/interrupts.h
@@ -19,20 +19,20 @@
#define __HW_INTERRUPTS_H
#define IRQ_UART (0x00000001) /* 0 */
-#define IRQ_GPIO (0x00000004) /* 2 */
-#define IRQ_TIMER0 (0x00000008) /* 3 */
-#define IRQ_TIMER1 (0x00000010) /* 4 */
-#define IRQ_AC97CRREQUEST (0x00000020) /* 5 */
-#define IRQ_AC97CRREPLY (0x00000040) /* 6 */
-#define IRQ_AC97DMAR (0x00000080) /* 7 */
-#define IRQ_AC97DMAW (0x00000100) /* 8 */
-#define IRQ_PFPU (0x00000200) /* 9 */
-#define IRQ_TMU (0x00000400) /* 10 */
-#define IRQ_ETHRX (0x00000800) /* 11 */
-#define IRQ_ETHTX (0x00001000) /* 12 */
-#define IRQ_VIDEOIN (0x00002000) /* 13 */
-#define IRQ_MIDI (0x00004000) /* 14 */
-#define IRQ_IR (0x00010000) /* 16 */
-#define IRQ_USB (0x00020000) /* 17 */
+#define IRQ_GPIO (0x00000002) /* 1 */
+#define IRQ_TIMER0 (0x00000004) /* 2 */
+#define IRQ_TIMER1 (0x00000008) /* 3 */
+#define IRQ_AC97CRREQUEST (0x00000010) /* 4 */
+#define IRQ_AC97CRREPLY (0x00000020) /* 5 */
+#define IRQ_AC97DMAR (0x00000040) /* 6 */
+#define IRQ_AC97DMAW (0x00000080) /* 7 */
+#define IRQ_PFPU (0x00000100) /* 8 */
+#define IRQ_TMU (0x00000200) /* 9 */
+#define IRQ_ETHRX (0x00000400) /* 10 */
+#define IRQ_ETHTX (0x00000800) /* 11 */
+#define IRQ_VIDEOIN (0x00001000) /* 12 */
+#define IRQ_MIDI (0x00002000) /* 13 */
+#define IRQ_IR (0x00004000) /* 14 */
+#define IRQ_USB (0x00008000) /* 15 */
#endif /* __HW_INTERRUPTS_H */
--
1.7.2.5
_______________________________________________
http://lists.milkymist.org/listinfo.cgi/devel-milkymist.org
IRC: #milkymist@Freenode
