diff options
| -rw-r--r-- | sys/arch/amiga/amiga/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/atari/atari/machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/isa/icu.s | 5 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/pc532/pc532/intr.c | 5 | ||||
| -rw-r--r-- | sys/arch/pmax/pmax/trap.c | 6 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/intr.c | 4 | ||||
| -rw-r--r-- | sys/arch/sun3/sun3/isr.c | 7 | ||||
| -rw-r--r-- | sys/arch/vax/vax/machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/wgrisc/wgrisc/trap.c | 10 |
12 files changed, 70 insertions, 9 deletions
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c index 14aae8284aa..d5040d59697 100644 --- a/sys/arch/amiga/amiga/machdep.c +++ b/sys/arch/amiga/amiga/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.23 1997/03/26 18:30:50 niklas Exp $ */ +/* $OpenBSD: machdep.c,v 1.24 1997/07/23 06:58:17 denny Exp $ */ /* $NetBSD: machdep.c,v 1.82 1996/12/17 07:32:54 is Exp $ */ /* @@ -1111,6 +1111,12 @@ netintr() ipintr(); } #endif +#ifdef NETATALK + if (netisr & (1 << NETISR_ATALK)) { + netisr &= ~(1 << NETISR_ATALK); + atintr(); + } +#endif #ifdef NS if (netisr & (1 << NETISR_NS)) { netisr &= ~(1 << NETISR_NS); diff --git a/sys/arch/atari/atari/machdep.c b/sys/arch/atari/atari/machdep.c index c6ce1d2e091..6693c6ac4cc 100644 --- a/sys/arch/atari/atari/machdep.c +++ b/sys/arch/atari/atari/machdep.c @@ -1087,6 +1087,12 @@ netintr() ipintr(); } #endif +#ifdef NETATALK + if (netisr & (1 << NETISR_ATALK)) { + netisr &= ~(1 << NETISR_ATALK); + atintr(); + } +#endif #ifdef NS if (netisr & (1 << NETISR_NS)) { netisr &= ~(1 << NETISR_NS); diff --git a/sys/arch/i386/isa/icu.s b/sys/arch/i386/isa/icu.s index e6a46d28ef1..555d758e42f 100644 --- a/sys/arch/i386/isa/icu.s +++ b/sys/arch/i386/isa/icu.s @@ -1,4 +1,4 @@ -/* $OpenBSD: icu.s,v 1.8 1996/08/16 02:54:02 deraadt Exp $ */ +/* $OpenBSD: icu.s,v 1.9 1997/07/23 06:58:34 denny Exp $ */ /* $NetBSD: icu.s,v 1.45 1996/01/07 03:59:34 mycroft Exp $ */ /*- @@ -157,6 +157,9 @@ IDTVEC(softnet) #endif DONET(NETISR_IP, _ipintr) #endif +#ifdef NETATALK + DONET(NETISR_ATALK, _atintr) +#endif #ifdef IMP DONET(NETISR_IMP, _impintr) #endif diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c index 71395910905..1d1063e6b0d 100644 --- a/sys/arch/mvme68k/mvme68k/machdep.c +++ b/sys/arch/mvme68k/mvme68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.21 1997/03/31 00:24:14 downsj Exp $ */ +/* $OpenBSD: machdep.c,v 1.22 1997/07/23 06:58:21 denny Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -835,6 +835,12 @@ netintr() ipintr(); } #endif +#ifdef NETATALK + if (netisr & (1 << NETISR_ATALK)) { + netisr &= ~(1 << NETISR_ATALK); + atintr(); + } +#endif #ifdef NS if (netisr & (1 << NETISR_NS)) { netisr &= ~(1 << NETISR_NS); diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c index ac680b25615..0632901a493 100644 --- a/sys/arch/mvme88k/mvme88k/machdep.c +++ b/sys/arch/mvme88k/mvme88k/machdep.c @@ -1450,6 +1450,12 @@ netintr() ipintr(); } #endif +#ifdef NETATALK + if (netisr & (1 << NETISR_ATALK)) { + netisr &= ~(1 << NETISR_ATALK); + atintr(); + } +#endif #ifdef NS if (netisr & (1 << NETISR_NS)) { netisr &= ~(1 << NETISR_NS); diff --git a/sys/arch/pc532/pc532/intr.c b/sys/arch/pc532/pc532/intr.c index 172fc88c2e8..0f95204b7bf 100644 --- a/sys/arch/pc532/pc532/intr.c +++ b/sys/arch/pc532/pc532/intr.c @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: intr.c,v 1.2 1995/10/26 01:11:53 deraadt Exp $ + * $Id: intr.c,v 1.3 1997/07/23 06:58:24 denny Exp $ */ #define DEFINE_SPLX @@ -177,6 +177,9 @@ softnet() #endif if (isr & (1 << NETISR_IP)) ipintr(); #endif +#ifdef NETATALK + if (isr & (1 << NETISR_ATALK)) atintr(); +#endif #ifdef IMP if (isr & (1 << NETISR_IMP)) impintr(); #endif diff --git a/sys/arch/pmax/pmax/trap.c b/sys/arch/pmax/pmax/trap.c index 88ba03e83dc..78d7b0f2709 100644 --- a/sys/arch/pmax/pmax/trap.c +++ b/sys/arch/pmax/pmax/trap.c @@ -1058,6 +1058,12 @@ interrupt(statusReg, causeReg, pc /* XXX what, args */ ) ipintr(); } #endif +#ifdef NETATALK + if (netisr & (1 << NETISR_ATALK)) { + netisr &= ~(1 << NETISR_ATALK); + atintr(); + } +#endif #ifdef NS if (netisr & (1 << NETISR_NS)) { netisr &= ~(1 << NETISR_NS); diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c index 2fb52d23ba7..71bc14dafb3 100644 --- a/sys/arch/powerpc/powerpc/machdep.c +++ b/sys/arch/powerpc/powerpc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.7 1997/02/27 23:40:19 rahnds Exp $ */ +/* $OpenBSD: machdep.c,v 1.8 1997/07/23 06:58:27 denny Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -691,6 +691,10 @@ softnet() if (isr & (1 << NETISR_IP)) ipintr(); #endif +#ifdef NETATALK + if (isr & (1 << NETISR_ATALK)) + atintr(); +#endif #ifdef IMP if (isr & (1 << NETISR_IMP)) impintr(); diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c index 5173b00616f..7e6b8cdf1d3 100644 --- a/sys/arch/sparc/sparc/intr.c +++ b/sys/arch/sparc/sparc/intr.c @@ -145,6 +145,10 @@ soft01intr(fp) if (n & (1 << NETISR_IP)) ipintr(); #endif +#ifdef NETATALK + if (n & (1 << NETISR_ATALK)) + atintr(); +#endif #ifdef NS if (n & (1 << NETISR_NS)) nsintr(); diff --git a/sys/arch/sun3/sun3/isr.c b/sys/arch/sun3/sun3/isr.c index 3ed655c7aee..15f7256006a 100644 --- a/sys/arch/sun3/sun3/isr.c +++ b/sys/arch/sun3/sun3/isr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isr.c,v 1.6 1997/01/16 04:04:24 kstailey Exp $ */ +/* $OpenBSD: isr.c,v 1.7 1997/07/23 06:58:30 denny Exp $ */ /* $NetBSD: isr.c,v 1.25 1996/11/20 18:57:32 gwr Exp $ */ /*- @@ -100,6 +100,7 @@ isr_add_custom(level, handler) */ void arpintr __P((void)); void ipintr __P((void)); +void atintr __P((void)); void nsintr __P((void)); void clnlintr __P((void)); void ccittintr __P((void)); @@ -123,6 +124,10 @@ netintr() if (n & (1 << NETISR_IP)) ipintr(); #endif +#ifdef NETATALK + if (n & (1 << NETISR_ATALK)) + atintr(); +#endif #ifdef NS if (n & (1 << NETISR_NS)) nsintr(); diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index 415489370df..9904d58fcbc 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.12 1997/05/28 23:27:33 niklas Exp $ */ +/* $OpenBSD: machdep.c,v 1.13 1997/07/23 06:58:31 denny Exp $ */ /* $NetBSD: machdep.c,v 1.35 1997/01/11 11:31:26 ragge Exp $ */ /* @@ -647,6 +647,12 @@ netintr() ipintr(); } #endif +#ifdef NETATALK + if (netisr & (1 << NETISR_ATALK)) { + netisr &= ~(1 << NETISR_ATALK); + atintr(); + } +#endif #ifdef NS if (netisr & (1 << NETISR_NS)) { netisr &= ~(1 << NETISR_NS); diff --git a/sys/arch/wgrisc/wgrisc/trap.c b/sys/arch/wgrisc/wgrisc/trap.c index ce22ad2e05b..c10a122e0dd 100644 --- a/sys/arch/wgrisc/wgrisc/trap.c +++ b/sys/arch/wgrisc/wgrisc/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.1 1997/02/06 16:02:46 pefo Exp $ */ +/* $OpenBSD: trap.c,v 1.2 1997/07/23 06:58:33 denny Exp $ */ /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -39,7 +39,7 @@ * from: Utah Hdr: trap.c 1.32 91/04/06 * * from: @(#)trap.c 8.5 (Berkeley) 1/11/94 - * $Id: trap.c,v 1.1 1997/02/06 16:02:46 pefo Exp $ + * $Id: trap.c,v 1.2 1997/07/23 06:58:33 denny Exp $ */ #include <sys/param.h> @@ -1010,6 +1010,12 @@ interrupt(statusReg, causeReg, pc, what, args) ipintr(); } #endif +#ifdef NETATALK + if (netisr & (1 << NETISR_ATALK)) { + netisr &= ~(1 << NETISR_ATALK); + atintr(); + } +#endif #ifdef NS if (netisr & (1 << NETISR_NS)) { netisr &= ~(1 << NETISR_NS); |