From 3f2076daf5d8de88632a8336950a26047e0ca665 Mon Sep 17 00:00:00 2001
From: Eivind Eklund <eivind@FreeBSD.org>
Date: Sat, 31 Jan 1998 07:23:16 +0000
Subject: [PATCH] Make the debug options new-style.

This also zaps a DPT option from lint; it wasn't referenced from
anywhere.
---
 sys/amd64/amd64/fpu.c           |  3 ++-
 sys/amd64/isa/npx.c             |  3 ++-
 sys/conf/NOTES                  |  6 +-----
 sys/conf/options                | 18 +++++++++++++++++-
 sys/dev/ppbus/ppb_1284.c        |  5 ++++-
 sys/dev/si/si.c                 |  3 ++-
 sys/fs/nullfs/null_subr.c       |  4 +++-
 sys/fs/nullfs/null_vfsops.c     |  4 +++-
 sys/fs/nullfs/null_vnops.c      |  6 ++++--
 sys/i386/conf/LINT              |  6 +-----
 sys/i386/conf/NOTES             |  6 +-----
 sys/i386/isa/labpc.c            |  1 +
 sys/i386/isa/npx.c              |  3 ++-
 sys/i386/isa/si.c               |  3 ++-
 sys/kern/kern_lockf.c           |  4 +++-
 sys/kern/vfs_cluster.c          |  4 +++-
 sys/miscfs/nullfs/null_subr.c   |  4 +++-
 sys/miscfs/nullfs/null_vfsops.c |  4 +++-
 sys/miscfs/nullfs/null_vnops.c  |  6 ++++--
 sys/net/if_ethersubr.c          |  4 ++--
 sys/netatalk/aarp.c             |  6 ++++--
 sys/pc98/pc98/npx.c             |  3 ++-
 22 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 0885b862fa01..c6f2b097ce26 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,12 +32,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.53 1997/10/28 11:43:54 bde Exp $
+ *	$Id: npx.c,v 1.54 1997/11/18 11:32:31 bde Exp $
  */
 
 #include "npx.h"
 #if NNPX > 0
 
+#include "opt_debug_npx.h"
 #include "opt_math_emulate.h"
 
 #include <sys/param.h>
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index 0885b862fa01..c6f2b097ce26 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,12 +32,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.53 1997/10/28 11:43:54 bde Exp $
+ *	$Id: npx.c,v 1.54 1997/11/18 11:32:31 bde Exp $
  */
 
 #include "npx.h"
 #if NNPX > 0
 
+#include "opt_debug_npx.h"
 #include "opt_math_emulate.h"
 
 #include <sys/param.h>
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 40cac7c139a3..e2fcc035b462 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.397 1998/01/30 11:32:34 phk Exp $
+#	$Id: LINT,v 1.398 1998/01/31 03:33:51 eivind Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1439,9 +1439,6 @@ options		SPX_HACK
 #                           will NOT shrink.  To restrict the number of queue
 #                           slots to exactly what the DPT can hold at one time,
 #                           enable this option.
-#   DPT_TRACK_CCB_STATES    Enabling thos option will try to enforce strict 
-#                           sanity checking in the queue management.  Rarely,
-#                           if ever, needed.
 #   DPT_MEASURE_PERFORMANCE Enables a set of (semi)invasive metrics. Various
 #                           instruments are enabled.  Assumed to be enabled by
 #                           /usr/sbin/dpt_* tools.
@@ -1465,7 +1462,6 @@ controller      dpt0
 # DPT options
 options DPT_VERIFY_HINTR
 options DPT_RESTRICTED_FREELIST
-options DPT_TRACK_CCB_STATES
 options DPT_MEASURE_PERFORMANCE
 options DPT_FREELIST_IS_STACK
 options DPT_HANDLE_TIMEOUTS
diff --git a/sys/conf/options b/sys/conf/options
index bb869034269b..3092f0f9ce3f 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.51 1998/01/30 11:32:09 phk Exp $
+#	$Id: options,v 1.52 1998/01/31 05:00:11 eivind Exp $
 
 # Format:
 # Option name	filename
@@ -151,3 +151,19 @@ DPT_HANDLE_TIMEOUTS     opt_dpt.h
 DPT_TIMEOUT_FACTOR      opt_dpt.h
 DPT_INTR_DELAY		opt_dpt.h
 DPT_LOST_IRQ		opt_dpt.h
+
+# Misc debug flags.  Most of these should probably be replaced with
+# 'DEBUG', and then let people recompile just the interesting modules
+# with 'make CC="cc -DDEBUG'.
+CLUSTERDEBUG		opt_debug_cluster.h
+DEBUG_1284		opt_debug_1284.h
+LOCKF_DEBUG		opt_debug_lockf.h
+LOUTB			opt_debug_outb.h
+NPX_DEBUG		opt_debug_npx.h
+NETATALKDEBUG		opt_atalk.h
+NULLFS_DIAGNOSTIC	opt_debug_nullfs.h
+SI_DEBUG		opt_debug_si.h
+
+
+# This cause changes all over the kernel
+SIMPLELOCK_DEBUG	opt_global.h
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 2abbecdc083c..d1ab1c583731 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -23,9 +23,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_1284.c,v 1.1 1997/08/16 14:05:32 msmith Exp $
+ *	$Id: ppb_1284.c,v 1.2 1997/09/01 00:51:44 bde Exp $
  *
  */
+
+#include "opt_debug_1284.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 2ade5e12b88c..31404aaba536 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.63 1997/12/16 17:40:03 eivind Exp $
+ *	$Id: si.c,v 1.64 1998/01/24 02:54:24 eivind Exp $
  */
 
 #ifndef lint
@@ -40,6 +40,7 @@ static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,199
 #endif	/* not lint */
 
 #include "opt_compat.h"
+#include "opt_debug_si.h"
 #include "opt_devfs.h"
 
 #include <sys/param.h>
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index fa63dea97981..64ed7e6eb2d8 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -35,9 +35,11 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $Id: null_subr.c,v 1.12 1997/08/27 08:44:43 kato Exp $
+ * $Id: null_subr.c,v 1.13 1997/08/28 00:44:43 kato Exp $
  */
 
+#include "opt_debug_nullfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index b9d3650d242a..7ffb40dadbbf 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.20 1997/10/12 20:24:50 phk Exp $
+ * $Id: null_vfsops.c,v 1.21 1998/01/01 08:28:05 bde Exp $
  */
 
 /*
@@ -44,6 +44,8 @@
  * (See null_vnops.c for a description of what this does.)
  */
 
+#include "opt_debug_nullfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index e254787b84fc..9575487490ec 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: null_vnops.c,v 1.24 1997/10/15 10:04:31 phk Exp $
+ *	$Id: null_vnops.c,v 1.25 1997/10/21 21:01:34 roberto Exp $
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $Id: null_vnops.c,v 1.24 1997/10/15 10:04:31 phk Exp $
+ * $Id: null_vnops.c,v 1.25 1997/10/21 21:01:34 roberto Exp $
  */
 
 /*
@@ -174,6 +174,8 @@
  *
  */
 
+#include "opt_debug_nullfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 40cac7c139a3..e2fcc035b462 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.397 1998/01/30 11:32:34 phk Exp $
+#	$Id: LINT,v 1.398 1998/01/31 03:33:51 eivind Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1439,9 +1439,6 @@ options		SPX_HACK
 #                           will NOT shrink.  To restrict the number of queue
 #                           slots to exactly what the DPT can hold at one time,
 #                           enable this option.
-#   DPT_TRACK_CCB_STATES    Enabling thos option will try to enforce strict 
-#                           sanity checking in the queue management.  Rarely,
-#                           if ever, needed.
 #   DPT_MEASURE_PERFORMANCE Enables a set of (semi)invasive metrics. Various
 #                           instruments are enabled.  Assumed to be enabled by
 #                           /usr/sbin/dpt_* tools.
@@ -1465,7 +1462,6 @@ controller      dpt0
 # DPT options
 options DPT_VERIFY_HINTR
 options DPT_RESTRICTED_FREELIST
-options DPT_TRACK_CCB_STATES
 options DPT_MEASURE_PERFORMANCE
 options DPT_FREELIST_IS_STACK
 options DPT_HANDLE_TIMEOUTS
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 40cac7c139a3..e2fcc035b462 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.397 1998/01/30 11:32:34 phk Exp $
+#	$Id: LINT,v 1.398 1998/01/31 03:33:51 eivind Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1439,9 +1439,6 @@ options		SPX_HACK
 #                           will NOT shrink.  To restrict the number of queue
 #                           slots to exactly what the DPT can hold at one time,
 #                           enable this option.
-#   DPT_TRACK_CCB_STATES    Enabling thos option will try to enforce strict 
-#                           sanity checking in the queue management.  Rarely,
-#                           if ever, needed.
 #   DPT_MEASURE_PERFORMANCE Enables a set of (semi)invasive metrics. Various
 #                           instruments are enabled.  Assumed to be enabled by
 #                           /usr/sbin/dpt_* tools.
@@ -1465,7 +1462,6 @@ controller      dpt0
 # DPT options
 options DPT_VERIFY_HINTR
 options DPT_RESTRICTED_FREELIST
-options DPT_TRACK_CCB_STATES
 options DPT_MEASURE_PERFORMANCE
 options DPT_FREELIST_IS_STACK
 options DPT_HANDLE_TIMEOUTS
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 728611895171..7f2743c43b0b 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -40,6 +40,7 @@
  */
 
 #include "labpc.h"
+#include "opt_debug_outb.h"
 #include "opt_devfs.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 0885b862fa01..c6f2b097ce26 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,12 +32,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.53 1997/10/28 11:43:54 bde Exp $
+ *	$Id: npx.c,v 1.54 1997/11/18 11:32:31 bde Exp $
  */
 
 #include "npx.h"
 #if NNPX > 0
 
+#include "opt_debug_npx.h"
 #include "opt_math_emulate.h"
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 2ade5e12b88c..31404aaba536 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.63 1997/12/16 17:40:03 eivind Exp $
+ *	$Id: si.c,v 1.64 1998/01/24 02:54:24 eivind Exp $
  */
 
 #ifndef lint
@@ -40,6 +40,7 @@ static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,199
 #endif	/* not lint */
 
 #include "opt_compat.h"
+#include "opt_debug_si.h"
 #include "opt_devfs.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 9b764e42519e..06fdb92b0d4c 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -34,9 +34,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lockf.c	8.3 (Berkeley) 1/6/94
- * $Id: kern_lockf.c,v 1.16 1997/10/12 20:23:49 phk Exp $
+ * $Id: kern_lockf.c,v 1.17 1997/12/05 19:55:38 bde Exp $
  */
 
+#include "opt_debug_lockf.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index 407d33d8af85..70f1765aed22 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,9 +33,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.50 1998/01/06 05:16:01 dyson Exp $
+ * $Id: vfs_cluster.c,v 1.51 1998/01/24 02:01:21 dyson Exp $
  */
 
+#include "opt_debug_cluster.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index fa63dea97981..64ed7e6eb2d8 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -35,9 +35,11 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $Id: null_subr.c,v 1.12 1997/08/27 08:44:43 kato Exp $
+ * $Id: null_subr.c,v 1.13 1997/08/28 00:44:43 kato Exp $
  */
 
+#include "opt_debug_nullfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index b9d3650d242a..7ffb40dadbbf 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.20 1997/10/12 20:24:50 phk Exp $
+ * $Id: null_vfsops.c,v 1.21 1998/01/01 08:28:05 bde Exp $
  */
 
 /*
@@ -44,6 +44,8 @@
  * (See null_vnops.c for a description of what this does.)
  */
 
+#include "opt_debug_nullfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index e254787b84fc..9575487490ec 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: null_vnops.c,v 1.24 1997/10/15 10:04:31 phk Exp $
+ *	$Id: null_vnops.c,v 1.25 1997/10/21 21:01:34 roberto Exp $
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $Id: null_vnops.c,v 1.24 1997/10/15 10:04:31 phk Exp $
+ * $Id: null_vnops.c,v 1.25 1997/10/21 21:01:34 roberto Exp $
  */
 
 /*
@@ -174,6 +174,8 @@
  *
  */
 
+#include "opt_debug_nullfs.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 4d7a6987580c..e78773dc1920 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ethersubr.c,v 1.42 1998/01/08 23:41:23 eivind Exp $
+ * $Id: if_ethersubr.c,v 1.43 1998/01/09 00:51:53 eivind Exp $
  */
 
 #include "opt_atalk.h"
@@ -232,7 +232,7 @@ ether_output(ifp, m0, dst, rt0)
 #ifdef NETATALKDEBUG
                 	extern char *prsockaddr(struct sockaddr *);
                 	printf("aarpresolv: failed for %s\n", prsockaddr(dst));
-#endif NETATALKDEBUG
+#endif /* NETATALKDEBUG */
                 	return (0);
         	}
 
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index ea853683d207..63e4d89edcb7 100644
--- a/sys/netatalk/aarp.c
+++ b/sys/netatalk/aarp.c
@@ -3,6 +3,8 @@
  * All Rights Reserved.
  */
 
+#include "opt_atalk.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -184,7 +186,7 @@ aarpwhohas( struct arpcom *ac, struct sockaddr_at *sat )
     printf("aarp: sending request for %u.%u\n",
 	   ntohs(AA_SAT( aa )->sat_addr.s_net),
 	   AA_SAT( aa )->sat_addr.s_node);
-#endif NETATALKDEBUG
+#endif /* NETATALKDEBUG */
 
     sa.sa_len = sizeof( struct sockaddr );
     sa.sa_family = AF_UNSPEC;
@@ -592,7 +594,7 @@ aarpprobe( void *arg )
     printf("aarp: sending probe for %u.%u\n",
 	   ntohs(AA_SAT( aa )->sat_addr.s_net),
 	   AA_SAT( aa )->sat_addr.s_node);
-#endif NETATALKDEBUG
+#endif /* NETATALKDEBUG */
 
     sa.sa_len = sizeof( struct sockaddr );
     sa.sa_family = AF_UNSPEC;
diff --git a/sys/pc98/pc98/npx.c b/sys/pc98/pc98/npx.c
index c266587dde31..a9404d0b6dbd 100644
--- a/sys/pc98/pc98/npx.c
+++ b/sys/pc98/pc98/npx.c
@@ -32,12 +32,13 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.28 1997/10/28 14:30:47 kato Exp $
+ *	$Id: npx.c,v 1.29 1997/11/19 11:36:24 kato Exp $
  */
 
 #include "npx.h"
 #if NNPX > 0
 
+#include "opt_debug_npx.h"
 #include "opt_math_emulate.h"
 
 #include <sys/param.h>