PERFORCE change 49498 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sun Mar 21 19:50:00 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=49498
Change 49498 by marcel at marcel_nfs on 2004/03/21 19:49:31
o Remove inclusion of opt_ddb.h
o Remove inclusion of ddb/ddb.h
o Add inclusion of sys/kdb.h
o s/db_alt_break/kdb_alt_break/
o s/DDB/KDB/g
Affected files ...
.. //depot/projects/gdb/sys/dev/uart/uart_core.c#3 edit
Differences ...
==== //depot/projects/gdb/sys/dev/uart/uart_core.c#3 (text+ko) ====
@@ -29,7 +29,6 @@
#ifndef KLD_MODULE
#include "opt_comconsole.h"
-#include "opt_ddb.h"
#endif
#include <sys/param.h>
@@ -39,6 +38,7 @@
#include <sys/cons.h>
#include <sys/fcntl.h>
#include <sys/interrupt.h>
+#include <sys/kdb.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/queue.h>
@@ -50,8 +50,6 @@
#include <machine/resource.h>
#include <machine/stdarg.h>
-#include <ddb/ddb.h>
-
#include <dev/uart/uart.h>
#include <dev/uart/uart_bus.h>
#include <dev/uart/uart_cpu.h>
@@ -85,9 +83,9 @@
uart_intr_break(struct uart_softc *sc)
{
-#if defined(DDB) && defined(BREAK_TO_DEBUGGER)
+#if defined(KDB) && defined(BREAK_TO_DEBUGGER)
if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
- breakpoint();
+ kdb_enter("Line break on console");
return;
}
#endif
@@ -133,11 +131,11 @@
rxp = sc->sc_rxput;
UART_RECEIVE(sc);
-#if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER)
+#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
while (rxp != sc->sc_rxput) {
- if (db_alt_break(sc->sc_rxbuf[rxp++], &sc->sc_altbrk))
- breakpoint();
+ if (kdb_alt_break(sc->sc_rxbuf[rxp++], &sc->sc_altbrk))
+ kdb_enter("Break sequence on console");
if (rxp == sc->sc_rxbufsz)
rxp = 0;
}
More information about the p4-projects
mailing list