summaryrefslogtreecommitdiff
path: root/sys/arch/mvme88k/dev/dart.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-04-30 16:40:43 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-04-30 16:40:43 +0000
commit7331829dd0bd858508d90252fd5c8d461deec63f (patch)
treec7a0f7dd8612edc3a6115957dd86fbf5a6e16dc1 /sys/arch/mvme88k/dev/dart.c
parent491325f87ee141d099ba13705b22232e6fad4194 (diff)
Remove disabled code which would disable all interrupts rather than switch
to spltty for processing.
Diffstat (limited to 'sys/arch/mvme88k/dev/dart.c')
-rw-r--r--sys/arch/mvme88k/dev/dart.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c
index a28a56fd86d..f3424c9ac24 100644
--- a/sys/arch/mvme88k/dev/dart.c
+++ b/sys/arch/mvme88k/dev/dart.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dart.c,v 1.42 2004/11/13 14:47:35 miod Exp $ */
+/* $OpenBSD: dart.c,v 1.43 2005/04/30 16:40:42 miod Exp $ */
/*
* Mach Operating System
@@ -1184,9 +1184,6 @@ dartcnputc(dev, c)
{
union dartreg *addr;
union dart_pt_io *ptaddr;
-#if 0
- m88k_psr_type psr;
-#endif
int s;
int port;
@@ -1200,11 +1197,7 @@ dartcnputc(dev, c)
ptaddr = (union dart_pt_io *) addr + ((dev & 1) ? 1 : 0);
#endif
-#if 1
s = spltty();
-#else
- psr = disable_interrupts_return_psr();
-#endif
/* Assume first port initialized if we get here. */
/* Assume the bug initializes the port */
@@ -1228,11 +1221,7 @@ dartcnputc(dev, c)
DELAY_CR;
ptaddr->write.wr_cr = dart_sv_reg.sv_cr[0];
-#if 1
splx(s);
-#else
- set_psr(psr);
-#endif
}
int
@@ -1245,17 +1234,9 @@ dartcngetc(dev)
u_char c; /* received character */
int s;
int port;
-#if 1
-#else
- m88k_psr_type psr;
-#endif
port = DART_PORT(dev);
-#if 1
s = spltty();
-#else
- psr = disable_interrupts_return_psr();
-#endif
addr = (union dartreg *) DART_BASE;
#if 1
ptaddr = (union dart_pt_io *) addr + (port * 0x20);
@@ -1293,10 +1274,6 @@ dartcngetc(dev)
}
}
}
-#if 1
splx(s);
-#else
- set_psr(psr);
-#endif
return (int)c;
}