aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/bvm
diff options
context:
space:
mode:
authorPeter Grehan <grehan@FreeBSD.org>2011-09-15 22:14:35 +0000
committerPeter Grehan <grehan@FreeBSD.org>2011-09-15 22:14:35 +0000
commitfab4c373af4f465f03ae217f491d8cf3a3eeb26d (patch)
tree42ba64b8c25f527cf3d9b56c4ce4c51c11d445d1 /sys/dev/bvm
parentbd2228ab3ee0cde6831fe446d793fffda2f48503 (diff)
parent3fb4fa3574e36c997c2cdcaa6f6e39a37e89f572 (diff)
Notes
Diffstat (limited to 'sys/dev/bvm')
-rw-r--r--sys/dev/bvm/bvm_console.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/sys/dev/bvm/bvm_console.c b/sys/dev/bvm/bvm_console.c
index 392346ee3eae..291910076f92 100644
--- a/sys/dev/bvm/bvm_console.c
+++ b/sys/dev/bvm/bvm_console.c
@@ -29,8 +29,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_comconsole.h"
-
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
@@ -63,7 +61,7 @@ static int polltime;
static struct callout_handle bvm_timeouthandle
= CALLOUT_HANDLE_INITIALIZER(&bvm_timeouthandle);
-#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
+#if defined(KDB)
static int alt_break_state;
#endif
@@ -211,24 +209,8 @@ bvm_cngetc(struct consdev *cp)
unsigned char ch;
if (bvm_rcons(&ch) == 0) {
-#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
- int kdb_brk;
-
- if ((kdb_brk = kdb_alt_break(ch, &alt_break_state)) != 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)
+ kdb_alt_break(ch, &alt_break_state);
#endif
return (ch);
}