Author: rwatson
Date: Sat Aug 27 14:24:27 2011
New Revision: 225214
URL: http://svn.freebsd.org/changeset/base/225214
Log:
Follow up to r225203 refining break-to-debugger run-time configuration
improvements:
(1) Implement new model in previously missed at91 UART driver
(2) Move BREAK_TO_DEBUGGER and ALT_BREAK_TO_DEBUGGER from opt_comconsole.h
to opt_kdb.h (spotted by np)
(3) Garbage collect now-unused opt_comconsole.h
MFC after: 3 weeks
Approved by: re (bz)
Modified:
head/sys/arm/at91/uart_dev_at91usart.c
head/sys/conf/options
head/sys/ddb/db_break.c
head/sys/dev/cfe/cfe_console.c
head/sys/dev/dcons/dcons_os.c
head/sys/dev/ofw/ofw_console.c
head/sys/dev/sio/sio.c
head/sys/dev/uart/uart_core.c
head/sys/modules/dcons/Makefile
head/sys/modules/sio/Makefile
head/sys/pc98/cbus/sio.c
head/sys/powerpc/mambo/mambo_console.c
Modified: head/sys/arm/at91/uart_dev_at91usart.c
==============================================================================
--- head/sys/arm/at91/uart_dev_at91usart.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/arm/at91/uart_dev_at91usart.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -29,8 +29,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -485,25 +483,10 @@ at91_usart_bus_param(struct uart_softc *
static __inline void
at91_rx_put(struct uart_softc *sc, int key)
{
-#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
- int kdb_brk;
- if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
- if ((kdb_brk = kdb_alt_break(key, &sc->sc_altbrk)) != 0) {
- switch (kdb_brk) {
- case KDB_REQ_DEBUGGER:
- kdb_enter(KDB_WHY_BREAK,
- "Break sequence on console");
- break;
- case KDB_REQ_PANIC:
- kdb_panic("Panic sequence on console");
- break;
- case KDB_REQ_REBOOT:
- kdb_reboot();
- break;
- }
- }
- }
+#if defined(KDB)
+ if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE)
+ kdb_alt_break(key, &sc->sc_altbrk);
#endif
uart_rx_put(sc, key);
}
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Sat Aug 27 14:03:27 2011 (r225213)
+++ head/sys/conf/options Sat Aug 27 14:24:27 2011 (r225214)
@@ -47,6 +47,8 @@ TWA_DEBUG opt_twa.h
TWA_FLASH_FIRMWARE opt_twa.h
# Debugging options.
+ALT_BREAK_TO_DEBUGGER opt_kdb.h
+BREAK_TO_DEBUGGER opt_kdb.h
DDB
DDB_BUFR_SIZE opt_ddb.h
DDB_CAPTURE_DEFAULTBUFSIZE opt_ddb.h
@@ -637,9 +639,6 @@ BKTR_SIS_VIA_MODE opt_bktr.h
BKTR_USE_FREEBSD_SMBUS opt_bktr.h
BKTR_NEW_MSP34XX_DRIVER opt_bktr.h
-BREAK_TO_DEBUGGER opt_comconsole.h
-ALT_BREAK_TO_DEBUGGER opt_comconsole.h
-
# Options to support PPS
UART_PPS_ON_CTS opt_uart.h
Modified: head/sys/ddb/db_break.c
==============================================================================
--- head/sys/ddb/db_break.c Sat Aug 27 14:03:27 2011 (r225213)
+++ head/sys/ddb/db_break.c Sat Aug 27 14:24:27 2011 (r225214)
@@ -35,8 +35,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
-
#include <sys/param.h>
#include <vm/vm.h>
Modified: head/sys/dev/cfe/cfe_console.c
==============================================================================
--- head/sys/dev/cfe/cfe_console.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/dev/cfe/cfe_console.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -27,8 +27,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
-
#include <sys/param.h>
#include <sys/kdb.h>
#include <sys/kernel.h>
Modified: head/sys/dev/dcons/dcons_os.c
==============================================================================
--- head/sys/dev/dcons/dcons_os.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/dev/dcons/dcons_os.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -64,7 +64,6 @@
#include <vm/vm_param.h>
#include <vm/pmap.h>
-#include "opt_comconsole.h"
#include "opt_dcons.h"
#include "opt_kdb.h"
#include "opt_gdb.h"
Modified: head/sys/dev/ofw/ofw_console.c
==============================================================================
--- head/sys/dev/ofw/ofw_console.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/dev/ofw/ofw_console.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -26,7 +26,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
#include "opt_ofw.h"
#include <sys/param.h>
Modified: head/sys/dev/sio/sio.c
==============================================================================
--- head/sys/dev/sio/sio.c Sat Aug 27 14:03:27 2011 (r225213)
+++ head/sys/dev/sio/sio.c Sat Aug 27 14:24:27 2011 (r225214)
@@ -33,7 +33,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
#include "opt_compat.h"
#include "opt_gdb.h"
#include "opt_kdb.h"
Modified: head/sys/dev/uart/uart_core.c
==============================================================================
--- head/sys/dev/uart/uart_core.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/dev/uart/uart_core.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -27,10 +27,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#ifndef KLD_MODULE
-#include "opt_comconsole.h"
-#endif
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
Modified: head/sys/modules/dcons/Makefile
==============================================================================
--- head/sys/modules/dcons/Makefile Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/modules/dcons/Makefile Sat Aug 27 14:24:27 2011
(r225214)
@@ -5,7 +5,7 @@
KMOD = dcons
SRCS = dcons.c dcons.h dcons_os.c dcons_os.h \
- opt_dcons.h opt_kdb.h opt_ddb.h opt_gdb.h opt_comconsole.h
+ opt_dcons.h opt_kdb.h opt_ddb.h opt_gdb.h
.if !defined(KERNBUILDDIR)
opt_kdb.h:
@@ -13,9 +13,6 @@ opt_kdb.h:
opt_ddb.h:
echo "#define DDB 1" > $@
-
-opt_comconsole.h:
- echo "#define ALT_BREAK_TO_DEBUGGER 1" > $@
.endif
CFLAGS+= -I${.CURDIR}/../..
Modified: head/sys/modules/sio/Makefile
==============================================================================
--- head/sys/modules/sio/Makefile Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/modules/sio/Makefile Sat Aug 27 14:24:27 2011
(r225214)
@@ -7,7 +7,7 @@
KMOD= sio
SRCS= bus_if.h card_if.h device_if.h isa_if.h pci_if.h serdev_if.h \
- opt_comconsole.h opt_compat.h opt_gdb.h opt_kdb.h opt_sio.h \
+ opt_compat.h opt_gdb.h opt_kdb.h opt_sio.h \
sio.c sio_pccard.c sio_pci.c sio_puc.c pccarddevs.h
.if ${MACHINE} == "pc98"
SRCS+= sio_cbus.c
Modified: head/sys/pc98/cbus/sio.c
==============================================================================
--- head/sys/pc98/cbus/sio.c Sat Aug 27 14:03:27 2011 (r225213)
+++ head/sys/pc98/cbus/sio.c Sat Aug 27 14:24:27 2011 (r225214)
@@ -31,7 +31,6 @@
* from: i386/isa sio.c,v 1.234
*/
-#include "opt_comconsole.h"
#include "opt_compat.h"
#include "opt_gdb.h"
#include "opt_kdb.h"
Modified: head/sys/powerpc/mambo/mambo_console.c
==============================================================================
--- head/sys/powerpc/mambo/mambo_console.c Sat Aug 27 14:03:27 2011
(r225213)
+++ head/sys/powerpc/mambo/mambo_console.c Sat Aug 27 14:24:27 2011
(r225214)
@@ -25,8 +25,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
-
#include <sys/param.h>
#include <sys/kdb.h>
#include <sys/kernel.h>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
