diff options
Diffstat (limited to 'arch/m68k/mac')
-rw-r--r-- | arch/m68k/mac/baboon.c | 2 | ||||
-rw-r--r-- | arch/m68k/mac/oss.c | 6 | ||||
-rw-r--r-- | arch/m68k/mac/psc.c | 2 | ||||
-rw-r--r-- | arch/m68k/mac/via.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c index a1c7ec706741..303a3b56c51c 100644 --- a/arch/m68k/mac/baboon.c +++ b/arch/m68k/mac/baboon.c | |||
@@ -81,9 +81,9 @@ irqreturn_t baboon_irq(int irq, void *dev_id) | |||
81 | for (i = 0, irq_bit = 1 ; i < 3 ; i++, irq_bit <<= 1) { | 81 | for (i = 0, irq_bit = 1 ; i < 3 ; i++, irq_bit <<= 1) { |
82 | if (events & irq_bit/* & baboon_active*/) { | 82 | if (events & irq_bit/* & baboon_active*/) { |
83 | baboon_active &= ~irq_bit; | 83 | baboon_active &= ~irq_bit; |
84 | baboon->mb_ifr &= ~irq_bit; | ||
84 | m68k_handle_int(IRQ_BABOON_0 + i); | 85 | m68k_handle_int(IRQ_BABOON_0 + i); |
85 | baboon_active |= irq_bit; | 86 | baboon_active |= irq_bit; |
86 | baboon->mb_ifr &= ~irq_bit; | ||
87 | } | 87 | } |
88 | } | 88 | } |
89 | #if 0 | 89 | #if 0 |
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c index 63690819565a..603d5cb72891 100644 --- a/arch/m68k/mac/oss.c +++ b/arch/m68k/mac/oss.c | |||
@@ -109,12 +109,12 @@ irqreturn_t oss_irq(int irq, void *dev_id) | |||
109 | /* FIXME: how do you clear a pending IRQ? */ | 109 | /* FIXME: how do you clear a pending IRQ? */ |
110 | 110 | ||
111 | if (events & OSS_IP_SOUND) { | 111 | if (events & OSS_IP_SOUND) { |
112 | /* FIXME: call sound handler */ | ||
113 | oss->irq_pending &= ~OSS_IP_SOUND; | 112 | oss->irq_pending &= ~OSS_IP_SOUND; |
113 | /* FIXME: call sound handler */ | ||
114 | } else if (events & OSS_IP_SCSI) { | 114 | } else if (events & OSS_IP_SCSI) { |
115 | oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED; | 115 | oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED; |
116 | m68k_handle_int(IRQ_MAC_SCSI); | ||
117 | oss->irq_pending &= ~OSS_IP_SCSI; | 116 | oss->irq_pending &= ~OSS_IP_SCSI; |
117 | m68k_handle_int(IRQ_MAC_SCSI); | ||
118 | oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI; | 118 | oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI; |
119 | } else { | 119 | } else { |
120 | /* FIXME: error check here? */ | 120 | /* FIXME: error check here? */ |
@@ -146,8 +146,8 @@ irqreturn_t oss_nubus_irq(int irq, void *dev_id) | |||
146 | for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) { | 146 | for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) { |
147 | if (events & irq_bit) { | 147 | if (events & irq_bit) { |
148 | oss->irq_level[i] = OSS_IRQLEV_DISABLED; | 148 | oss->irq_level[i] = OSS_IRQLEV_DISABLED; |
149 | m68k_handle_int(NUBUS_SOURCE_BASE + i); | ||
150 | oss->irq_pending &= ~irq_bit; | 149 | oss->irq_pending &= ~irq_bit; |
150 | m68k_handle_int(NUBUS_SOURCE_BASE + i); | ||
151 | oss->irq_level[i] = OSS_IRQLEV_NUBUS; | 151 | oss->irq_level[i] = OSS_IRQLEV_NUBUS; |
152 | } | 152 | } |
153 | } | 153 | } |
diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index 15378a5878c9..401147985a96 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c | |||
@@ -149,8 +149,8 @@ irqreturn_t psc_irq(int irq, void *dev_id) | |||
149 | for (i = 0, irq_bit = 1 ; i < 4 ; i++, irq_bit <<= 1) { | 149 | for (i = 0, irq_bit = 1 ; i < 4 ; i++, irq_bit <<= 1) { |
150 | if (events & irq_bit) { | 150 | if (events & irq_bit) { |
151 | psc_write_byte(pIER, irq_bit); | 151 | psc_write_byte(pIER, irq_bit); |
152 | m68k_handle_int(base_irq + i); | ||
153 | psc_write_byte(pIFR, irq_bit); | 152 | psc_write_byte(pIFR, irq_bit); |
153 | m68k_handle_int(base_irq + i); | ||
154 | psc_write_byte(pIER, irq_bit | 0x80); | 154 | psc_write_byte(pIER, irq_bit | 0x80); |
155 | } | 155 | } |
156 | } | 156 | } |
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index 2be7b9cc5b32..21b03180d9f4 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c | |||
@@ -430,8 +430,8 @@ irqreturn_t via1_irq(int irq, void *dev_id) | |||
430 | for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1) | 430 | for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1) |
431 | if (events & irq_bit) { | 431 | if (events & irq_bit) { |
432 | via1[vIER] = irq_bit; | 432 | via1[vIER] = irq_bit; |
433 | m68k_handle_int(VIA1_SOURCE_BASE + i); | ||
434 | via1[vIFR] = irq_bit; | 433 | via1[vIFR] = irq_bit; |
434 | m68k_handle_int(VIA1_SOURCE_BASE + i); | ||
435 | via1[vIER] = irq_bit | 0x80; | 435 | via1[vIER] = irq_bit | 0x80; |
436 | } | 436 | } |
437 | 437 | ||