[src/netbsd-1-4]: src/sys/arch/next68k/dev pullup 1.1->1.2 (bad)

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

details:   https://anonhg.NetBSD.org/src/rev/dbea3dd99a17
branches:  netbsd-1-4
changeset: 468551:dbea3dd99a17
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Apr 29 15:58:56 1999 +0000

description:
pullup 1.1->1.2 (bad)

diffstat:

 sys/arch/next68k/dev/nextcons.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r fd1ad6d947f2 -r dbea3dd99a17 sys/arch/next68k/dev/nextcons.c
--- a/sys/arch/next68k/dev/nextcons.c   Thu Apr 29 15:52:25 1999 +0000
+++ b/sys/arch/next68k/dev/nextcons.c   Thu Apr 29 15:58:56 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nextcons.c,v 1.1 1999/03/26 04:42:59 dbj Exp $ */
+/*     $NetBSD: nextcons.c,v 1.1.2.1 1999/04/29 15:58:56 perry Exp $   */
 
 /*
  * Copyright (c) 1999 Darrin B. Jewell
@@ -53,6 +53,8 @@
 #include <next68k/dev/nextdisplayvar.h>
 #include <next68k/dev/nextkbdvar.h>
 
+#include <next68k/next68k/nextrom.h>
+
 void nextcnprobe __P((struct consdev *));
 void nextcninit __P((struct consdev *));
 int nextcngetc __P((dev_t));
@@ -63,7 +65,13 @@
 void
 nextcnprobe(struct consdev *cp)
 {
-       cp->cn_pri = CN_INTERNAL;
+
+       if ((rom_machine_type == NeXT_WARP9)
+           || (rom_machine_type == NeXT_X15))
+               cp->cn_pri = CN_INTERNAL;
+       else 
+               cp->cn_pri = CN_DEAD;
+
        cp->cn_dev = NODEV;
 }