diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mips64/mips64/interrupt.c | 53 | ||||
| -rw-r--r-- | sys/arch/sgi/localbus/macebus.c | 57 |
2 files changed, 8 insertions, 102 deletions
diff --git a/sys/arch/mips64/mips64/interrupt.c b/sys/arch/mips64/mips64/interrupt.c index b2d3ba6ae87..53874d132d7 100644 --- a/sys/arch/mips64/mips64/interrupt.c +++ b/sys/arch/mips64/mips64/interrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interrupt.c,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: interrupt.c,v 1.3 2004/08/10 08:07:35 mickey Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -488,55 +488,8 @@ static volatile int processing; int isr = netisr; netisr = 0; ipending &= ~SINT_NETMASK; -#ifdef INET -#include "ether.h" - if (NETHER > 0 && isr & (1 << NETISR_ARP)) { - arpintr(); - } - - if (isr & (1 << NETISR_IP)) { - ipintr(); - } -#endif -#ifdef INET6 - if (isr & (1 << NETISR_IPV6)) { - ip6intr(); - } -#endif -#ifdef NETATALK - if (isr & (1 << NETISR_ATALK)) { - atintr(); - } -#endif -#ifdef IMP - if (isr & (1 << NETISR_IMP)) { - impintr(); - } -#endif -#ifdef NS - if (isr & (1 << NETISR_NS)) { - nsintr(); - } -#endif -#ifdef ISO - if (isr & (1 << NETISR_ISO)) { - clnlintr(); - } -#endif -#ifdef CCITT - if (isr & (1 << NETISR_CCITT)) { - ccittintr(); - } -#endif -#include "ppp.h" - if (NPPP > 0 && isr & (1 << NETISR_PPP)) { - pppintr(); - } - -#include "bridge.h" - if (NBRIDGE > 0 && isr & (1 << NETISR_BRIDGE)) { - bridgeintr(); - } +#define DONETISR(b,f) if (isr & (1 << (b))) f(); +#include <net/netisr_dispatch.h> } #ifdef NOTYET diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c index 2b53c663699..69d7cc26ff4 100644 --- a/sys/arch/sgi/localbus/macebus.c +++ b/sys/arch/sgi/localbus/macebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.c,v 1.2 2004/08/10 07:48:45 mickey Exp $ */ +/* $OpenBSD: macebus.c,v 1.3 2004/08/10 08:07:35 mickey Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -653,55 +653,8 @@ static volatile int processing; int isr = netisr; netisr = 0; ipending &= ~SINT_NETMASK; -#ifdef INET -#include "ether.h" - if (NETHER > 0 && isr & (1 << NETISR_ARP)) { - arpintr(); - } - - if (isr & (1 << NETISR_IP)) { - ipintr(); - } -#endif -#ifdef INET6 - if(isr & (1 << NETISR_IPV6)) { - ip6intr(); - } -#endif -#ifdef NETATALK - if (isr & (1 << NETISR_ATALK)) { - atintr(); - } -#endif -#ifdef IMP - if (isr & (1 << NETISR_IMP)) { - impintr(); - } -#endif -#ifdef NS - if (isr & (1 << NETISR_NS)) { - nsintr(); - } -#endif -#ifdef ISO - if (isr & (1 << NETISR_ISO)) { - clnlintr(); - } -#endif -#ifdef CCITT - if (isr & (1 << NETISR_CCITT)) { - ccittintr(); - } -#endif -#include "ppp.h" - if (NPPP > 0 && isr & (1 << NETISR_PPP)) { - pppintr(); - } - -#include "bridge.h" - if (NBRIDGE > 0 && isr & (1 << NETISR_BRIDGE)) { - bridgeintr(); - } +#define DONETISR(b,f) if (isr & (1 << (b))) f(); +#include <net/netisr_dispatch.h> } #ifdef NOTYET @@ -760,9 +713,9 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) } } } - if (catched) { + + if (catched) return CR_INT_0; - } return 0; /* Non found here */ } |