diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-06 08:02:14 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-07-06 08:02:14 +0000 |
| commit | a3b5edea3991a5af513f92dd86991d7b1a561a54 (patch) | |
| tree | f051a33605fa9c2bde1756be0816999893544828 /sys/arch/hp300/dev/dcm.c | |
| parent | a66e6c132dfc5477c6359bf03ab2bd43b9779756 (diff) | |
Sync with changes from NetBSD, up to 970705.
This includes all of the new frodo drivers, from Michael Smith, hacked up
by Jason R. Thorpe; other changes, mostly configuration and/or m68k
abstraction related, from Thorpe. A few others of my own.
This compiles and runs, have not yet tested Domain kbd or apci ports.
Diffstat (limited to 'sys/arch/hp300/dev/dcm.c')
| -rw-r--r-- | sys/arch/hp300/dev/dcm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c index 62a4541ec14..2fbb9f50691 100644 --- a/sys/arch/hp300/dev/dcm.c +++ b/sys/arch/hp300/dev/dcm.c @@ -1,5 +1,5 @@ -/* $OpenBSD: dcm.c,v 1.8 1997/04/16 11:55:59 downsj Exp $ */ -/* $NetBSD: dcm.c,v 1.39 1997/04/14 02:33:17 thorpej Exp $ */ +/* $OpenBSD: dcm.c,v 1.9 1997/07/06 08:01:47 downsj Exp $ */ +/* $NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Jason R. Thorpe. All rights reserved. @@ -354,7 +354,7 @@ dcmattach(parent, self, aux) sc->sc_flags |= DCM_ACTIVE; /* Establish the interrupt handler. */ - (void) intr_establish(dcmintr, sc, ipl, IPL_TTY); + (void) dio_intr_establish(dcmintr, sc, ipl, IPL_TTY); if (dcmistype == DIS_TIMER) dcmsetischeme(brd, DIS_RESET|DIS_TIMER); @@ -776,7 +776,7 @@ dcmreadbuf(sc, port) dsp->rints++; #endif tp = sc->sc_tty[port]; - if (tp == NULL || (tp->t_state & TS_ISOPEN) == 0) + if (tp == NULL) return; if ((tp->t_state & TS_ISOPEN) == 0) { |