Update for the KDB framework:

o  Rename WITNESS_DDB to WITNESS_KDB. In the new world order KDB is the
   acronym to use for debugging related code. The DDB option is used
   to enable the DDB debugger backend only.
o  Likewise, rename DDB_TRACE to KDB_TRACE, rename DDB_UNATTENDED to
   KDB_UNATTENDED and rename SC_HISTORY_DDBKEY to SC_HISTORY_KDBKEY.
o  Remove DDB_NOKLDSYM. The new DDB backend supports pre-linker symbol
   lookups as well as KLD symbol lookups at the same time.
o  Remove GDB_REMOTE_CHAT. The GDB protocol hacks to allow this are
   FreeBSD specific. At the same time, the GDB protocol has packets
   for console output.

2 files changed, 29 insertions, 43 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index fd1b42a..d35508a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -198,14 +198,14 @@ options 	MUTEX_WAKE_ALL
 #	  used to hold active lock queues.
 # WITNESS enables the witness code which detects deadlocks and cycles
 #         during locking operations.
-# WITNESS_DDB causes the witness code to drop into the kernel debugger if
+# WITNESS_KDB causes the witness code to drop into the kernel debugger if
 #	  a lock hierarchy violation occurs or if locks are held when going to
 #	  sleep.
 # WITNESS_SKIPSPIN disables the witness checks on spin mutexes.
 options 	FULL_PREEMPTION
 options 	MUTEX_DEBUG
 options 	WITNESS
-options 	WITNESS_DDB
+options 	WITNESS_KDB
 options 	WITNESS_SKIPSPIN
 
 # MUTEX_PROFILING - Profiling mutual exclusion locks (mutexes).  See
@@ -247,44 +247,37 @@ options 	SYSVMSG
 # DEBUGGING OPTIONS
 
 #
-# Enable the kernel debugger.
+# Compile with kernel debugger related code.
 #
-options 	DDB
+options 	KDB
 
 #
-# Use direct symbol lookup routines for ddb instead of the kernel linker
-# ones, so that symbols (mostly) work before the kernel linker has been
-# initialized.  This is not the default because it breaks ddb's lookup of
-# symbols in loaded modules.
+# Print a stack trace of the current thread on the console for a panic.
 #
-#!options 	DDB_NOKLDSYM
+options 	KDB_TRACE
 
 #
-# Print the numerical value of symbols in addition to the symbolic
-# representation.
+# Don't enter the debugger for a panic. Intended for unattended operation
+# where you may want to enter the debugger from the console, but still want
+# the machine to recover from a panic.
 #
-options 	DDB_NUMSYM
+options 	KDB_UNATTENDED
 
 #
-# Print a stack trace of the current thread out on the console for a panic.
+# Enable the ddb debugger backend.
 #
-options 	DDB_TRACE
+options 	DDB
 
 #
-# Don't drop into DDB for a panic. Intended for unattended operation
-# where you may want to drop to DDB from the console, but still want
-# the machine to recover from a panic
+# Print the numerical value of symbols in addition to the symbolic
+# representation.
 #
-options 	DDB_UNATTENDED
+options 	DDB_NUMSYM
 
 #
-# If using GDB remote mode to debug the kernel, there's a non-standard
-# extension to the remote protocol that can be used to use the serial
-# port as both the debugging port and the system console.  It's non-
-# standard and you're on your own if you enable it.  See also the
-# "remotechat" variables in the FreeBSD specific version of gdb.
+# Enable the remote gdb debugger backend.
 #
-options 	GDB_REMOTE_CHAT
+options 	GDB
 
 #
 # KTRACE enables the system-call tracing facility ktrace(2).  To be more
@@ -1194,7 +1187,7 @@ options 	MAXCONS=16		# number of virtual consoles
 options 	SC_ALT_MOUSE_IMAGE	# simplified mouse cursor in text mode
 options 	SC_DFLT_FONT		# compile font in
 makeoptions	SC_DFLT_FONT=cp850
-options 	SC_DISABLE_DDBKEY	# disable `debug' key
+options 	SC_DISABLE_KDBKEY	# disable `debug' key
 options 	SC_DISABLE_REBOOT	# disable reboot key sequence
 options 	SC_HISTORY_SIZE=200	# number of history buffer lines
 options 	SC_MOUSE_CHAR=0x3	# char code for text mode mouse cursor
diff --git a/sys/conf/options b/sys/conf/options
index 7867e08..042a025 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -30,15 +30,6 @@
 # If filename is missing, the default is
 # opt_<name-of-option-in-lower-case>.h
 
-# XXX temporary
-GDB
-KDB			opt_global.h
-KDB_TRACE		opt_kdb.h
-KDB_UNATTENDED		opt_kdb.h
-WITNESS_KDB		opt_witness.h
-SC_DISABLE_KDBKEY	opt_syscons.h
-
-
 AAC_DEBUG		opt_aac.h
 AHC_ALLOW_MEMIO		opt_aic7xxx.h
 AHC_TMODE_ENABLE	opt_aic7xxx.h
@@ -55,6 +46,15 @@ ADW_ALLOW_MEMIO		opt_adw.h
 TWA_DEBUG		opt_twa.h
 TWA_FLASH_FIRMWARE	opt_twa.h
 
+# Debugging options.
+DDB
+DDB_NUMSYM	opt_ddb.h
+GDB
+GDBSPEED	opt_gdb.h
+KDB		opt_global.h
+KDB_TRACE	opt_kdb.h
+KDB_UNATTENDED	opt_kdb.h
+
 # Miscellaneous options.
 ADAPTIVE_MUTEXES
 ALQ
@@ -64,15 +64,8 @@ COMPAT_FREEBSD4	opt_compat.h
 COMPILING_LINT	opt_global.h
 CONSPEED	opt_comconsole.h
 CY_PCI_FASTINTR
-DDB
-DDB_NOKLDSYM	opt_ddb.h
-DDB_NUMSYM	opt_ddb.h
-DDB_TRACE
-DDB_UNATTENDED
 DIRECTIO	opt_directio.h
 FULL_PREEMPTION
-GDB_REMOTE_CHAT	opt_ddb.h
-GDBSPEED	opt_ddb.h
 GEOM_AES	opt_geom.h
 GEOM_APPLE	opt_geom.h
 GEOM_BDE	opt_geom.h
@@ -589,7 +582,7 @@ KTR_COMPILE		opt_global.h
 KTR_ENTRIES		opt_global.h
 KTR_VERBOSE		opt_ktr.h
 WITNESS			opt_global.h
-WITNESS_DDB		opt_witness.h
+WITNESS_KDB		opt_witness.h
 WITNESS_SKIPSPIN	opt_witness.h
 
 # options for ACPI support
@@ -642,7 +635,7 @@ SC_CUT_SPACES2TABS	opt_syscons.h
 SC_CUT_SEPCHARS		opt_syscons.h
 SC_DEBUG_LEVEL		opt_syscons.h
 SC_DFLT_FONT		opt_syscons.h
-SC_DISABLE_DDBKEY	opt_syscons.h
+SC_DISABLE_KDBKEY	opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
 SC_HISTORY_SIZE		opt_syscons.h
 SC_KERNEL_CONS_ATTR	opt_syscons.h