[src/trunk]: src/sys/arch/pmax - Add missing "opt_ddb.h" to dc.c and dtop.c (...

[nisimura <nisimura%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d0f6cc59fddf
branches:  trunk
changeset: 481913:d0f6cc59fddf
user:      nisimura <nisimura%NetBSD.org@localhost>
date:      Wed Feb 09 08:29:40 2000 +0000

description:
- Add missing "opt_ddb.h" to dc.c and dtop.c (oh, boy)
- Nuke irrelevant "dcvar.h" and "tc.h" inclusion from dc.c
- Put '#if NRASTERCONSOLE > 0' around scc_lk201_cnattach().

diffstat:

 sys/arch/pmax/dev/dc.c   |  11 +++++------
 sys/arch/pmax/dev/dtop.c |   5 +++--
 sys/arch/pmax/tc/scc.c   |  14 ++++++++------
 3 files changed, 16 insertions(+), 14 deletions(-)

diffs (115 lines):

diff -r f8df4c204824 -r d0f6cc59fddf sys/arch/pmax/dev/dc.c
--- a/sys/arch/pmax/dev/dc.c    Wed Feb 09 08:18:19 2000 +0000
+++ b/sys/arch/pmax/dev/dc.c    Wed Feb 09 08:29:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dc.c,v 1.60 2000/02/03 04:09:19 nisimura Exp $ */
+/*     $NetBSD: dc.c,v 1.61 2000/02/09 08:29:40 nisimura Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.60 2000/02/03 04:09:19 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dc.c,v 1.61 2000/02/09 08:29:40 nisimura Exp $");
 
 /*
  * devDC7085.c --
@@ -59,6 +59,9 @@
  *     v 1.4 89/08/29 11:55:30 nelson Exp  SPRITE (DECWRL)";
  */
 
+#include "opt_ddb.h"
+#include "rasterconsole.h"
+
 /*
  * DC7085 (DZ-11 look alike) Driver
  */
@@ -89,10 +92,6 @@
 #include <pmax/pmax/cons.h>
 #include <pmax/pmax/pmaxtype.h>
 
-#include "dcvar.h"
-#include "tc.h"
-#include "rasterconsole.h"
-
 #define DCUNIT(dev) (minor(dev) >> 2)
 #define DCLINE(dev) (minor(dev) & 3)
 
diff -r f8df4c204824 -r d0f6cc59fddf sys/arch/pmax/dev/dtop.c
--- a/sys/arch/pmax/dev/dtop.c  Wed Feb 09 08:18:19 2000 +0000
+++ b/sys/arch/pmax/dev/dtop.c  Wed Feb 09 08:29:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dtop.c,v 1.47 2000/02/03 08:13:44 nisimura Exp $       */
+/*     $NetBSD: dtop.c,v 1.48 2000/02/09 08:29:40 nisimura Exp $       */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -94,8 +94,9 @@
 ********************************************************/
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.47 2000/02/03 08:13:44 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtop.c,v 1.48 2000/02/09 08:29:40 nisimura Exp $");
 
+#include "opt_ddb.h"
 #include "rasterconsole.h"
 
 #include <sys/param.h>
diff -r f8df4c204824 -r d0f6cc59fddf sys/arch/pmax/tc/scc.c
--- a/sys/arch/pmax/tc/scc.c    Wed Feb 09 08:18:19 2000 +0000
+++ b/sys/arch/pmax/tc/scc.c    Wed Feb 09 08:29:40 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scc.c,v 1.63 2000/02/03 04:09:07 nisimura Exp $        */
+/*     $NetBSD: scc.c,v 1.64 2000/02/09 08:29:40 nisimura Exp $        */
 
 /*
  * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@@ -66,9 +66,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.63 2000/02/03 04:09:07 nisimura Exp $");
-
-#include "opt_ddb.h"
+__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.64 2000/02/09 08:29:40 nisimura Exp $");
 
 /*
  * Intel 82530 dual usart chip driver. Supports the serial port(s) on the
@@ -78,6 +76,10 @@
  *
  * See: Intel MicroCommunications Handbook, Section 2, pg. 155-173, 1992.
  */
+
+#include "opt_ddb.h"
+#include "rasterconsole.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
@@ -108,8 +110,6 @@
 #include <dev/tc/tcvar.h>
 #include <dev/tc/ioasicvar.h>
 
-#include "rasterconsole.h"
-
 void   ttrstrt __P((void *));
 
 
@@ -292,6 +292,7 @@
        scc_tty_init(sc, cn_tab->cn_dev);
 }
 
+#if NRASTERCONSOLE > 0
 void
 scc_lk201_cnattach(base, offset)
        u_int32_t       base;
@@ -307,6 +308,7 @@
        cn_tab->cn_getc = lk_getc;
        rcons_indev(cn_tab); /* cn_dev & cn_putc */
 }
+#endif
 
 /*
  * Test to see if device is present.