From owner-p4-projects@FreeBSD.ORG  Sun May 23 14:00:41 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2EF7416A4D2; Sun, 23 May 2004 14:00:41 -0700 (PDT)
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 DC0B016A4CF
	for <perforce@freebsd.org>; Sun, 23 May 2004 14:00:40 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D584843D2D
	for <perforce@freebsd.org>; Sun, 23 May 2004 14:00:40 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NL0aLY079790
	for <perforce@freebsd.org>; Sun, 23 May 2004 14:00:36 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NL0as1079787
	for perforce@freebsd.org; Sun, 23 May 2004 14:00:36 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Date: Sun, 23 May 2004 14:00:36 -0700 (PDT)
Message-Id: <200405232100.i4NL0as1079787@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 53350 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: Sun, 23 May 2004 21:00:41 -0000

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

Change 53350 by marcel@marcel_nfs on 2004/05/23 14:00:33

	s/DDB/KDB/g
	s/db_alt_break()/kdb_alt_break()/g
	include <sys/kdb.h>

Affected files ...

.. //depot/projects/gdb/sys/dev/zs/zs.c#5 edit

Differences ...

==== //depot/projects/gdb/sys/dev/zs/zs.c#5 (text+ko) ====

@@ -72,7 +72,6 @@
  * Zilog Z8530 Dual UART driver.
  */
 
-#include "opt_ddb.h"
 #include "opt_comconsole.h"
 
 #include <sys/param.h>
@@ -82,6 +81,7 @@
 #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>
@@ -92,8 +92,6 @@
 #include <sys/syslog.h>
 #include <sys/tty.h>
 
-#include <ddb/ddb.h>
-
 #include <dev/zs/z8530reg.h>
 #include <dev/zs/z8530var.h>
 
@@ -360,9 +358,10 @@
 
 			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;
@@ -374,7 +373,7 @@
 	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