[src/trunk]: src/sys Kwality control:

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/895ce2c55c7c
branches:  trunk
changeset: 494114:895ce2c55c7c
user:      cgd <cgd%NetBSD.org@localhost>
date:      Sun Jul 02 04:40:33 2000 +0000

description:
Kwality control:
* put #includes of opt headers and headers to get protos used by
  net/netisr_dispatch.h in net/netisr.h (if !defined(_LOCORE)) (rather than
  in netisr_dispatch.h itself, and potentially nowhere, respectively).
* require netisr.h to be included before netisr_dispatch.h.
* minor additional cleanup of both netisr.h and netisr_dispatch.h.
* clean up uses to remove now-unnecessary header file inclusions, and
  local prototypes of the fns.
* convert netisr dispatch implementations which didn't use
  netisr_dispatch.h (pc532) to use it.

diffstat:

 sys/arch/alpha/alpha/interrupt.c |  53 +------------------------
 sys/arch/amiga/amiga/machdep.c   |  50 +----------------------
 sys/arch/arm26/arm26/softintr.c  |  28 +------------
 sys/arch/arm32/arm32/intr.c      |  49 +-----------------------
 sys/arch/atari/atari/machdep.c   |  38 +------------------
 sys/arch/bebox/bebox/machdep.c   |   6 +--
 sys/arch/evbsh3/evbsh3/shb.c     |  23 +----------
 sys/arch/hp300/hp300/intr.c      |  21 +---------
 sys/arch/i386/isa/icu.s          |   9 +---
 sys/arch/luna68k/luna68k/isr.c   |  25 +----------
 sys/arch/mac68k/mac68k/intr.c    |  21 +---------
 sys/arch/mac68k/mac68k/machdep.c |   4 +-
 sys/arch/macppc/macppc/machdep.c |  23 +----------
 sys/arch/mips/mips/trap.c        |  52 +------------------------
 sys/arch/mmeye/mmeye/shb.c       |  23 +----------
 sys/arch/mvme68k/mvme68k/isr.c   |  30 +-------------
 sys/arch/news68k/news68k/isr.c   |  27 +------------
 sys/arch/next68k/next68k/isr.c   |  21 +---------
 sys/arch/ofppc/ofppc/machdep.c   |   7 +--
 sys/arch/pc532/pc532/machdep.c   |  82 ++++-----------------------------------
 sys/arch/prep/prep/machdep.c     |  50 +-----------------------
 sys/arch/sparc/sparc/intr.c      |  37 +-----------------
 sys/arch/sparc64/sparc64/intr.c  |  41 +-------------------
 sys/arch/sun3/sun3/isr.c         |  29 +-------------
 sys/arch/vax/vax/genassym.cf     |  16 +-------
 sys/arch/vax/vax/intvec.s        |  10 +---
 sys/arch/vax/vax/machdep.c       |  24 +-----------
 sys/arch/x68k/x68k/machdep.c     |  20 +---------
 sys/net/netisr.h                 |  75 +++++++++++++++++++++++++++++++++--
 sys/net/netisr_dispatch.h        |  20 +++++----
 30 files changed, 129 insertions(+), 785 deletions(-)

diffs (truncated from 1595 to 300 lines):

diff -r 42c2f8e36e4e -r 895ce2c55c7c sys/arch/alpha/alpha/interrupt.c
--- a/sys/arch/alpha/alpha/interrupt.c  Sun Jul 02 02:15:34 2000 +0000
+++ b/sys/arch/alpha/alpha/interrupt.c  Sun Jul 02 04:40:33 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.49 2000/06/29 09:02:54 mrg Exp $ */
+/* $NetBSD: interrupt.c,v 1.50 2000/07/02 04:40:33 cgd Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -70,16 +70,9 @@
 
 #include "opt_multiprocessor.h"
 
-#include "opt_inet.h"    
-#include "opt_atalk.h"
-#include "opt_ccitt.h"   
-#include "opt_iso.h"
-#include "opt_ns.h"
-#include "opt_natm.h" 
-
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.49 2000/06/29 09:02:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.50 2000/07/02 04:40:33 cgd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,49 +84,7 @@
 #include <machine/cpuvar.h>
 
 /* XXX Network interrupts should be converted to new softintrs */
-#include <sys/socket.h>
 #include <net/netisr.h>
-#include <net/if.h>
-
-#ifdef INET
-#include <net/route.h> 
-#include <netinet/in.h>
-#include <netinet/ip_var.h>
-#include "arp.h"
-#if NARP > 0
-#include <netinet/if_inarp.h>
-#endif
-#endif
-#ifdef INET6
-# ifndef INET
-#  include <netinet/in.h>
-# endif
-#include <netinet/ip6.h> 
-#include <netinet6/ip6_var.h>
-#endif
-#ifdef NS
-#include <netns/ns_var.h>
-#endif
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/clnp.h>
-#endif
-#ifdef CCITT
-#include <netccitt/x25.h>
-#include <netccitt/pk.h>
-#include <netccitt/pk_extern.h>
-#endif
-#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>
-#include <net/if_ppp.h>
-#endif
 
 #include <uvm/uvm_extern.h>
 
diff -r 42c2f8e36e4e -r 895ce2c55c7c sys/arch/amiga/amiga/machdep.c
--- a/sys/arch/amiga/amiga/machdep.c    Sun Jul 02 02:15:34 2000 +0000
+++ b/sys/arch/amiga/amiga/machdep.c    Sun Jul 02 04:40:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.154 2000/06/29 08:44:03 mrg Exp $        */
+/*     $NetBSD: machdep.c,v 1.155 2000/07/02 04:40:34 cgd Exp $        */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,11 +43,6 @@
  */
 
 #include "opt_ddb.h"
-#include "opt_inet.h"
-#include "opt_atalk.h"
-#include "opt_ccitt.h"
-#include "opt_iso.h"
-#include "opt_ns.h"
 #include "opt_compat_netbsd.h"
 
 #include <sys/param.h>
@@ -74,7 +69,9 @@
 #include <sys/syscallargs.h>
 #include <sys/core.h>
 #include <sys/kcore.h>
+
 #include <net/netisr.h>
+#undef PS      /* XXX netccitt/pk.h conflict with machine/reg.h? */
 
 #define        MAXMEM  64*1024 /* XXX - from cmap.h */
 #include <uvm/uvm_extern.h>
@@ -103,47 +100,6 @@
 
 #include "fd.h"
 #include "ser.h"
-#include "arp.h"
-#include "ppp.h"
-
-#include <net/netisr.h>
-#include <net/if.h>
-
-#ifdef INET
-#include <netinet/in.h>
-#if NARP > 0
-#include <netinet/if_inarp.h>
-#endif
-#include <netinet/ip_var.h>
-#endif 
-#ifdef INET6
-# ifndef INET
-#  include <netinet/in.h>
-# endif
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#endif
-#ifdef CCITT 
-#undef PS      /* XXX namespace collision */
-#include <netccitt/x25.h>
-#include <netccitt/pk.h>
-#include <netccitt/pk_extern.h>
-#undef PS      /* XXX namespace collision */
-#endif 
-#ifdef NS
-#include <netns/ns_var.h>
-#endif
-#ifdef ISO
-#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>
-#endif
 
 /* prototypes */
 void identifycpu __P((void));
diff -r 42c2f8e36e4e -r 895ce2c55c7c sys/arch/arm26/arm26/softintr.c
--- a/sys/arch/arm26/arm26/softintr.c   Sun Jul 02 02:15:34 2000 +0000
+++ b/sys/arch/arm26/arm26/softintr.c   Sun Jul 02 04:40:33 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: softintr.c,v 1.4 2000/07/01 21:52:05 bjh21 Exp $ */
+/* $NetBSD: softintr.c,v 1.5 2000/07/02 04:40:35 cgd Exp $ */
 
 /*
  * Copyright (c) 1999 Ben Harris.
@@ -38,7 +38,7 @@
 
 #include <sys/param.h>
 
-__RCSID("$NetBSD: softintr.c,v 1.4 2000/07/01 21:52:05 bjh21 Exp $");
+__RCSID("$NetBSD: softintr.c,v 1.5 2000/07/02 04:40:35 cgd Exp $");
 
 #include <sys/malloc.h>
 #include <sys/queue.h>
@@ -160,30 +160,6 @@
        softclock();
 }
 
-/*
- * XXX The following includes are to avoid implicit function declarations in
- * netisr_dispatch.h.
- */
-
-#include <sys/mbuf.h>          /* needed by in.h */
-#include <sys/socket.h>                /* needed by if.h */
-#include <net/if.h>            /* needed by if_inarp.h */
-#include <netinet/in.h>                /* needed by if_inarp.h */
-#include <netinet/if_inarp.h>  /* for arpintr */
-#include <netinet/ip_var.h>    /* for ipintr */
-#include <netinet/ip6.h>       /* needed by ip6_var.h> */
-#include <netinet6/ip6_var.h>  /* for ip6intr */
-#include <netatalk/at_extern.h>        /* for atintr */
-#include <netns/ns_var.h>      /* for nsintr */
-#include <netiso/iso.h>                /* needed by clnp.h */
-#include <netiso/clnp.h>       /* for clnlintr */
-#include <netccitt/x25.h>      /* needed by pk_extern.h */
-#include <netccitt/pk.h>       /* needed by pk_extern.h */
-#include <netccitt/pk_extern.h>        /* for ccittintr */
-#include <netnatm/natm.h>      /* for natmintr */
-#include <net/ppp_defs.h>      /* needed by if_ppp.h */
-#include <net/if_ppp.h>                /* for pppintr */
-
 static void
 dosoftnet(void *arg)
 {
diff -r 42c2f8e36e4e -r 895ce2c55c7c sys/arch/arm32/arm32/intr.c
--- a/sys/arch/arm32/arm32/intr.c       Sun Jul 02 02:15:34 2000 +0000
+++ b/sys/arch/arm32/arm32/intr.c       Sun Jul 02 04:40:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.19 2000/06/29 08:52:58 mrg Exp $    */
+/*     $NetBSD: intr.c,v 1.20 2000/07/02 04:40:35 cgd Exp $    */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -35,19 +35,12 @@
  * Soft interrupt and other generic interrupt functions.
  */
 
-#include "opt_inet.h"
-#include "opt_atalk.h"
-#include "opt_ccitt.h"
-#include "opt_iso.h"
-#include "opt_ns.h"
-#include "opt_natm.h"
 #include "opt_irqstats.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
 #include <sys/malloc.h>
-#include <sys/socket.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -55,46 +48,6 @@
 #include <machine/cpu.h>
 
 #include <net/netisr.h>
-#include <net/if.h>
-
-#ifdef INET
-#include <netinet/in.h>
-#include "arp.h"
-#if NARP > 0
-#include <netinet/if_inarp.h>
-#endif /* NARP > 0 */
-#include <netinet/ip_var.h>
-#endif         /* INET */
-#ifdef INET6
-# ifndef INET
-#  include <netinet/in.h>
-# endif
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#endif /* INET6 */
-#ifdef NS
-#include <netns/ns_var.h>
-#endif /* NS */
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/clnp.h>
-#endif /* ISO */
-#ifdef CCITT
-#include <netccitt/x25.h>
-#include <netccitt/pk.h>
-#include <netccitt/pk_extern.h>
-#endif /* CCITT */
-#ifdef NATM
-#include <netnatm/natm.h>
-#endif /* NATM */
-#ifdef NETATALK
-#include <netatalk/at_extern.h>
-#endif /* NETATALK */
-#include "ppp.h"
-#if NPPP > 0
-#include <net/ppp_defs.h>
-#include <net/if_ppp.h>
-#endif /* NPPP > 0 */
 
 u_int soft_interrupts = 0;
 
diff -r 42c2f8e36e4e -r 895ce2c55c7c sys/arch/atari/atari/machdep.c
--- a/sys/arch/atari/atari/machdep.c    Sun Jul 02 02:15:34 2000 +0000
+++ b/sys/arch/atari/atari/machdep.c    Sun Jul 02 04:40:33 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.97 2000/06/29 08:28:23 mrg Exp $ */
+/*     $NetBSD: machdep.c,v 1.98 2000/07/02 04:40:35 cgd Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,10 +43,6 @@
  */
 
 #include "opt_ddb.h"
-#include "opt_atalk.h"
-#include "opt_inet.h"
-#include "opt_iso.h"
-#include "opt_ns.h"
 #include "opt_compat_netbsd.h"