diff options
| author | marcel <marcel@FreeBSD.org> | 2004-07-10 21:18:33 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2004-07-10 21:18:33 +0000 |
| commit | 2f2074cbd9f04da0b12bf1cf6610c05cfe96913c (patch) | |
| tree | 5994f4daec7fe667d1c3d56ba05fc22cc254b17f | |
| parent | 3351894f4f1db6871dd97146e062af72132cbce4 (diff) | |
| download | FreeBSD-src-2f2074cbd9f04da0b12bf1cf6610c05cfe96913c.zip FreeBSD-src-2f2074cbd9f04da0b12bf1cf6610c05cfe96913c.tar.gz | |
Update for the KDB framework:
o Make debugging code conditional upon KDB instead of DDB.
o Call kdb_alt_break() insteadof db_alt_break().
| -rw-r--r-- | sys/dev/zs/zs.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/zs/zs.c b/sys/dev/zs/zs.c index 11bfa44..1c400eb0 100644 --- a/sys/dev/zs/zs.c +++ b/sys/dev/zs/zs.c @@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$"); * Zilog Z8530 Dual UART driver. */ -#include "opt_ddb.h" #include "opt_comconsole.h" #include <sys/param.h> @@ -82,6 +81,7 @@ __FBSDID("$FreeBSD$"); #include <sys/cons.h> #include <sys/fcntl.h> #include <sys/interrupt.h> +#include <sys/kdb.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/mutex.h> @@ -93,8 +93,6 @@ __FBSDID("$FreeBSD$"); #include <sys/syslog.h> #include <sys/tty.h> -#include <ddb/ddb.h> - #include <dev/zs/z8530reg.h> #include <dev/zs/z8530var.h> @@ -362,9 +360,10 @@ zstty_intr(struct zstty_softc *sc, uint8_t rr3) if ((rr1 & (ZSRR1_FE | ZSRR1_DO | ZSRR1_PE)) != 0) ZS_WRITE(sc, sc->sc_csr, ZSWR0_RESET_ERRORS); -#if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER) +#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) if (sc->sc_console != 0) - brk = db_alt_break(c, &sc->sc_alt_break_state); + brk = kdb_alt_break(c, + &sc->sc_alt_break_state); #endif *sc->sc_iput++ = c; *sc->sc_iput++ = rr1; @@ -376,7 +375,7 @@ zstty_intr(struct zstty_softc *sc, uint8_t rr3) if ((rr3 & ZSRR3_IP_B_STAT) != 0) { rr0 = ZS_READ(sc, sc->sc_csr); ZS_WRITE(sc, sc->sc_csr, ZSWR0_RESET_STATUS); -#if defined(DDB) && defined(BREAK_TO_DEBUGGER) +#if defined(KDB) && defined(BREAK_TO_DEBUGGER) if (sc->sc_console != 0 && (rr0 & ZSRR0_BREAK) != 0) brk = 1; #endif |
