From e0443987e783ea4b10e5876c767416a012fe2e5c Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Wed, 2 Apr 1997 21:48:55 +0000
Subject: [PATCH] Add netatalk netisr

---
 sys/arch/alpha/alpha/machdep.c        |  8 +++++++-
 sys/arch/amiga/amiga/machdep.c        | 11 ++++++++++-
 sys/arch/arm32/arm32/irqhandler.c     |  9 ++++++++-
 sys/arch/arm32/iomd/iomd_irqhandler.c |  9 ++++++++-
 sys/arch/atari/atari/machdep.c        | 11 ++++++++++-
 sys/arch/hp300/hp300/isr.c            |  9 ++++++++-
 6 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index e29f12b4a4cf..9e06814f054f 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.69 1997/03/27 21:01:20 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.70 1997/04/02 21:48:55 christos Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -100,6 +100,9 @@
 #ifdef NATM
 #include <netnatm/natm.h>
 #endif
+#ifdef NETATALK
+#include <netatalk/at_extern.h>
+#endif
 #include "ppp.h"
 #if NPPP > 0
 #include <net/ppp_defs.h>
@@ -1433,6 +1436,9 @@ netintr()
 	DONETISR(NETISR_ARP, arpintr());
 	DONETISR(NETISR_IP, ipintr());
 #endif
+#ifdef NETATALK
+	DONETISR(NETISR_ATALK, atintr());
+#endif
 #ifdef NS
 	DONETISR(NETISR_NS, nsintr());
 #endif
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index efb964325f35..0fc676b1a25b 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.87 1997/03/30 10:38:51 is Exp $	*/
+/*	$NetBSD: machdep.c,v 1.88 1997/04/02 21:50:57 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -125,6 +125,9 @@
 #include <netiso/iso.h>
 #include <netiso/clnp.h>
 #endif
+#ifdef NETATALK
+#include <netatalk/at_extern.h>
+#endif
 #if NPPP > 0
 #include <net/ppp_defs.h>
 #include <net/if_ppp.h>
@@ -1343,6 +1346,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/arm32/arm32/irqhandler.c b/sys/arch/arm32/arm32/irqhandler.c
index 8709cbc8f91a..1e75d6db6fb0 100644
--- a/sys/arch/arm32/arm32/irqhandler.c
+++ b/sys/arch/arm32/arm32/irqhandler.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irqhandler.c,v 1.13 1997/01/06 02:30:21 mark Exp $ */
+/* $NetBSD: irqhandler.c,v 1.14 1997/04/02 21:52:19 christos Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -90,6 +90,7 @@ extern void set_spl_masks	__P((void));
 
 extern void arpintr	__P((void));
 extern void ipintr	__P((void));
+extern void atintr	__P((void));
 extern void pppintr	__P((void));
 extern void plipintr	__P((void));
 
@@ -632,6 +633,12 @@ dosoftints()
 			ipintr();
 		}
 #endif
+#ifdef NETATALK
+		if (netisr & (1 << NETISR_ATALK)) {
+			atomic_clear_bit(&netisr, (1 << NETISR_ATALK));
+			atintr();
+		}
+#endif
 #ifdef NS
 		if (netisr & (1 << NETISR_NS)) {
 			atomic_clear_bit(&netisr, (1 << NETISR_NS));
diff --git a/sys/arch/arm32/iomd/iomd_irqhandler.c b/sys/arch/arm32/iomd/iomd_irqhandler.c
index 61cd51f736b6..a29161746b51 100644
--- a/sys/arch/arm32/iomd/iomd_irqhandler.c
+++ b/sys/arch/arm32/iomd/iomd_irqhandler.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_irqhandler.c,v 1.13 1997/01/06 02:30:21 mark Exp $ */
+/* $NetBSD: iomd_irqhandler.c,v 1.14 1997/04/02 21:52:19 christos Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -90,6 +90,7 @@ extern void set_spl_masks	__P((void));
 
 extern void arpintr	__P((void));
 extern void ipintr	__P((void));
+extern void atintr	__P((void));
 extern void pppintr	__P((void));
 extern void plipintr	__P((void));
 
@@ -632,6 +633,12 @@ dosoftints()
 			ipintr();
 		}
 #endif
+#ifdef NETATALK
+		if (netisr & (1 << NETISR_ATALK)) {
+			atomic_clear_bit(&netisr, (1 << NETISR_ATALK));
+			atintr();
+		}
+#endif
 #ifdef NS
 		if (netisr & (1 << NETISR_NS)) {
 			atomic_clear_bit(&netisr, (1 << NETISR_NS));
diff --git a/sys/arch/atari/atari/machdep.c b/sys/arch/atari/atari/machdep.c
index 85dc6959e232..6ef893e4e18a 100644
--- a/sys/arch/atari/atari/machdep.c
+++ b/sys/arch/atari/atari/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.43 1997/03/27 21:01:27 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.44 1997/04/02 21:54:17 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -837,6 +837,9 @@ void	pppintr __P((void));
 #ifdef INET
 void	ipintr __P((void));
 #endif
+#ifdef NETATALK
+void	atintr __P((void));
+#endif
 #if NARP > 0
 void	arpintr __P((void));
 #endif
@@ -862,6 +865,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/hp300/hp300/isr.c b/sys/arch/hp300/hp300/isr.c
index 97c64569457f..5008c521661c 100644
--- a/sys/arch/hp300/hp300/isr.c
+++ b/sys/arch/hp300/hp300/isr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isr.c,v 1.6 1997/04/01 03:12:18 scottr Exp $	*/
+/*	$NetBSD: isr.c,v 1.7 1997/04/02 21:58:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -291,6 +291,7 @@ isrdispatch(evec)
  */
 void	netintr __P((void));
 void	arpintr __P((void));
+void	atintr __P((void));
 void	ipintr __P((void));
 void	nsintr __P((void));
 void	clnintr __P((void));
@@ -310,6 +311,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);