Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

m68k: reverse Mac IRQ damage

Browse source 
Reverse the last of a monumental brown-paper-bag commit that went into the 2.3
kernel.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Finn Thain 2007-05-01 22:32:55 +02:00 committed by Linus Torvalds
parent 2964db0f59
commit 647b804c82
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/m68k/mac/baboon.c
View file

@ -81,9 +81,9 @@ irqreturn_t baboon_irq(int irq, void *dev_id)
for (i = 0, irq_bit = 1 ; i < 3 ; i++, irq_bit <<= 1) { for (i = 0, irq_bit = 1 ; i < 3 ; i++, irq_bit <<= 1) {
if (events & irq_bit/* & baboon_active*/) { if (events & irq_bit/* & baboon_active*/) {
baboon_active &= ~irq_bit; baboon_active &= ~irq_bit;
baboon->mb_ifr &= ~irq_bit;
m68k_handle_int(IRQ_BABOON_0 + i); m68k_handle_int(IRQ_BABOON_0 + i);
baboon_active |= irq_bit; baboon_active |= irq_bit;
baboon->mb_ifr &= ~irq_bit;
} }
} }
#if 0 #if 0

6
arch/m68k/mac/oss.c
View file

@ -109,12 +109,12 @@ irqreturn_t oss_irq(int irq, void *dev_id)
/* FIXME: how do you clear a pending IRQ? */ /* FIXME: how do you clear a pending IRQ? */
if (events & OSS_IP_SOUND) { if (events & OSS_IP_SOUND) {
/* FIXME: call sound handler */
oss->irq_pending &= ~OSS_IP_SOUND; oss->irq_pending &= ~OSS_IP_SOUND;
/* FIXME: call sound handler */
} else if (events & OSS_IP_SCSI) { } else if (events & OSS_IP_SCSI) {
oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED; oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED;
m68k_handle_int(IRQ_MAC_SCSI);
oss->irq_pending &= ~OSS_IP_SCSI; oss->irq_pending &= ~OSS_IP_SCSI;
m68k_handle_int(IRQ_MAC_SCSI);
oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI; oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI;
} else { } else {
/* FIXME: error check here? */ /* FIXME: error check here? */
@ -146,8 +146,8 @@ irqreturn_t oss_nubus_irq(int irq, void *dev_id)
for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) { for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) {
if (events & irq_bit) { if (events & irq_bit) {
oss->irq_level[i] = OSS_IRQLEV_DISABLED; oss->irq_level[i] = OSS_IRQLEV_DISABLED;
m68k_handle_int(NUBUS_SOURCE_BASE + i);
oss->irq_pending &= ~irq_bit; oss->irq_pending &= ~irq_bit;
m68k_handle_int(NUBUS_SOURCE_BASE + i);
oss->irq_level[i] = OSS_IRQLEV_NUBUS; oss->irq_level[i] = OSS_IRQLEV_NUBUS;
} }
} }

2
arch/m68k/mac/psc.c
View file

@ -149,8 +149,8 @@ irqreturn_t psc_irq(int irq, void *dev_id)
for (i = 0, irq_bit = 1 ; i < 4 ; i++, irq_bit <<= 1) { for (i = 0, irq_bit = 1 ; i < 4 ; i++, irq_bit <<= 1) {
if (events & irq_bit) { if (events & irq_bit) {
psc_write_byte(pIER, irq_bit); psc_write_byte(pIER, irq_bit);
m68k_handle_int(base_irq + i);
psc_write_byte(pIFR, irq_bit); psc_write_byte(pIFR, irq_bit);
m68k_handle_int(base_irq + i);
psc_write_byte(pIER, irq_bit | 0x80); psc_write_byte(pIER, irq_bit | 0x80);
} }
} }

2
arch/m68k/mac/via.c
View file

@ -430,8 +430,8 @@ irqreturn_t via1_irq(int irq, void *dev_id)
for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1) for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1)
if (events & irq_bit) { if (events & irq_bit) {
via1[vIER] = irq_bit; via1[vIER] = irq_bit;
m68k_handle_int(VIA1_SOURCE_BASE + i);
via1[vIFR] = irq_bit; via1[vIFR] = irq_bit;
m68k_handle_int(VIA1_SOURCE_BASE + i);
via1[vIER] = irq_bit | 0x80; via1[vIER] = irq_bit | 0x80;
} }