summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev/atari5380.c
diff options
context:
space:
mode:
authorleo <leo@NetBSD.org>1996-11-17 13:38:03 +0000
committerleo <leo@NetBSD.org>1996-11-17 13:38:03 +0000
commit643abfa1465da8363768afda444dad52e0eef10e (patch)
treed7f2a4f85a6c23f48eb657863e38451eb654217f /sys/arch/atari/dev/atari5380.c
parenta5d68d8e590d7f3b83adf8a11ebba091b0fcaf52 (diff)
Make splbio really splbio. All holes now seem to be plugged. At least
on the Hades & TT030.
Diffstat (limited to 'sys/arch/atari/dev/atari5380.c')
-rw-r--r--sys/arch/atari/dev/atari5380.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/sys/arch/atari/dev/atari5380.c b/sys/arch/atari/dev/atari5380.c
index dff94dc1a2f..175512e27e2 100644
--- a/sys/arch/atari/dev/atari5380.c
+++ b/sys/arch/atari/dev/atari5380.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atari5380.c,v 1.20 1996/10/13 04:10:50 christos Exp $ */
+/* $NetBSD: atari5380.c,v 1.21 1996/11/17 13:38:03 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -85,16 +85,6 @@
*/
#include <atari/dev/ncr5380var.h>
-
-/*
- * This is crap, but because the interrupts now run at MFP spl-level (6),
- * splbio() is not enough at some places. The code should be checked to
- * find out where splhigh() is needed and where splbio() should be used.
- * Now that I use this interrupt sceme, the spl values are fake!
- */
-#undef splbio()
-#define splbio() splhigh()
-
/*
* The atari specific driver options
*/
@@ -317,6 +307,12 @@ scsi_tt_clr_ipend(void)
if (machineid & ATARI_TT)
single_inst_bclr_b(MFP2->mf_iprb, IB_SCDM);
single_inst_bclr_b(MFP2->mf_ipra, IA_SCSI);
+
+ /*
+ * Remove interrupts already scheduled.
+ */
+ rem_sicallback((si_farg)ncr_ctrl_intr);
+ rem_sicallback((si_farg)ncr_dma_intr);
}
static void