aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m68k
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-m68k')
-rw-r--r--include/asm-m68k/amigaints.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-m68k/amigaints.h b/include/asm-m68k/amigaints.h
index 576f5d1b5706..7c8713468fd2 100644
--- a/include/asm-m68k/amigaints.h
+++ b/include/asm-m68k/amigaints.h
@@ -37,8 +37,8 @@
37#define IRQ_AMIGA_SOFT (IRQ_USER+2) 37#define IRQ_AMIGA_SOFT (IRQ_USER+2)
38 38
39/* interrupts from external hardware */ 39/* interrupts from external hardware */
40#define IRQ_AMIGA_PORTS (IRQ_USER+3) 40#define IRQ_AMIGA_PORTS IRQ_AUTO_2
41#define IRQ_AMIGA_EXTER (IRQ_USER+13) 41#define IRQ_AMIGA_EXTER IRQ_AUTO_6
42 42
43/* copper interrupt */ 43/* copper interrupt */
44#define IRQ_AMIGA_COPPER (IRQ_USER+4) 44#define IRQ_AMIGA_COPPER (IRQ_USER+4)
@@ -88,9 +88,6 @@
88#define IF_DSKBLK 0x0002 /* diskblock DMA finished */ 88#define IF_DSKBLK 0x0002 /* diskblock DMA finished */
89#define IF_TBE 0x0001 /* serial transmit buffer empty interrupt */ 89#define IF_TBE 0x0001 /* serial transmit buffer empty interrupt */
90 90
91extern void amiga_do_irq(int irq, struct pt_regs *fp);
92extern void amiga_do_irq_list(int irq, struct pt_regs *fp);
93
94/* CIA interrupt control register bits */ 91/* CIA interrupt control register bits */
95 92
96#define CIA_ICR_TA 0x01 93#define CIA_ICR_TA 0x01
@@ -107,6 +104,7 @@ extern void amiga_do_irq_list(int irq, struct pt_regs *fp);
107 104
108extern struct ciabase ciaa_base, ciab_base; 105extern struct ciabase ciaa_base, ciab_base;
109 106
107extern void cia_init_IRQ(struct ciabase *base);
110extern unsigned char cia_set_irq(struct ciabase *base, unsigned char mask); 108extern unsigned char cia_set_irq(struct ciabase *base, unsigned char mask);
111extern unsigned char cia_able_irq(struct ciabase *base, unsigned char mask); 109extern unsigned char cia_able_irq(struct ciabase *base, unsigned char mask);
112 110