diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2002-04-28 15:15:33 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2002-04-28 15:15:33 +0000 |
commit | 2d3e356666ed15077c646db498b8315e158ec3bf (patch) | |
tree | ab1e56127f5861da4d660dfe3be5e818ef08a9dd /sys/arch | |
parent | 35fe7f301d3484823babdb4d3b077abe173057fa (diff) |
Use netisr_dispatch
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/hp300/hp300/intr.c | 63 |
1 files changed, 10 insertions, 53 deletions
diff --git a/sys/arch/hp300/hp300/intr.c b/sys/arch/hp300/hp300/intr.c index 5c70bbbf601..de231a2fb47 100644 --- a/sys/arch/hp300/hp300/intr.c +++ b/sys/arch/hp300/hp300/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.10 2002/03/14 01:26:30 millert Exp $ */ +/* $OpenBSD: intr.c,v 1.11 2002/04/28 15:15:32 miod Exp $ */ /* $NetBSD: intr.c,v 1.5 1998/02/16 20:58:30 thorpej Exp $ */ /*- @@ -286,56 +286,13 @@ intr_dispatch(evec) void netintr() { -#ifdef INET - if (netisr & (1 << NETISR_ARP)) { - netisr &= ~(1 << NETISR_ARP); - arpintr(); - } - if (netisr & (1 << NETISR_IP)) { - netisr &= ~(1 << NETISR_IP); - ipintr(); - } -#endif -#ifdef INET6 - if (netisr & (1 << NETISR_IPV6)) { - netisr &= ~(1 << NETISR_IPV6); - ip6intr(); - } -#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); - nsintr(); - } -#endif -#ifdef ISO - if (netisr & (1 << NETISR_ISO)) { - netisr &= ~(1 << NETISR_ISO); - clnlintr(); - } -#endif -#ifdef CCITT - if (netisr & (1 << NETISR_CCITT)) { - netisr &= ~(1 << NETISR_CCITT); - ccittintr(); - } -#endif -#if NPPP > 0 - if (netisr & (1 << NETISR_PPP)) { - netisr &= ~(1 << NETISR_PPP); - pppintr(); - } -#endif -#if NBRIDGE > 0 - if (netisr & (1 << NETISR_BRIDGE)) { - netisr &= ~(1 << NETISR_BRIDGE); - bridgeintr(); - } -#endif +#define DONETISR(bit, fn) \ + do { \ + if (netisr & (1 << (bit))) { \ + netisr &= ~(1 << (bit)); \ + (fn)(); \ + } \ + } while (0) +#include <net/netisr_dispatch.h> +#undef DONETISR } |