From owner-p4-projects@FreeBSD.ORG  Sun Mar 21 19:50:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1224016A4D0; Sun, 21 Mar 2004 19:50:00 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D098A16A4CF
	for <perforce@freebsd.org>; Sun, 21 Mar 2004 19:49:59 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C63BF43D1D
	for <perforce@freebsd.org>; Sun, 21 Mar 2004 19:49:59 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2M3nxGe097824
	for <perforce@freebsd.org>; Sun, 21 Mar 2004 19:49:59 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2M3nx9a097821
	for perforce@freebsd.org; Sun, 21 Mar 2004 19:49:59 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Date: Sun, 21 Mar 2004 19:49:59 -0800 (PST)
Message-Id: <200403220349.i2M3nx9a097821@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 49498 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Mar 2004 03:50:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=49498

Change 49498 by marcel@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;
 		}