diff options
| author | rwatson <rwatson@FreeBSD.org> | 2011-08-27 14:24:27 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2011-08-27 14:24:27 +0000 |
| commit | 55dd870b96d9c6061c2eff00ceaddd2a509b4919 (patch) | |
| tree | 49e850acfe39af24efb3586c06c15ff6b9183c36 /sys/arm | |
| parent | 75529036c4053c147bc25c97cdce45422f260647 (diff) | |
| download | FreeBSD-src-55dd870b96d9c6061c2eff00ceaddd2a509b4919.zip FreeBSD-src-55dd870b96d9c6061c2eff00ceaddd2a509b4919.tar.gz | |
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)
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/at91/uart_dev_at91usart.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/sys/arm/at91/uart_dev_at91usart.c b/sys/arm/at91/uart_dev_at91usart.c index 94ea9de..f3d21aa 100644 --- a/sys/arm/at91/uart_dev_at91usart.c +++ b/sys/arm/at91/uart_dev_at91usart.c @@ -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 *sc, int baudrate, int databits, 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); } |
