Added support for using wscons as console.

Enabled wscons as default console.
Use option SERCONSOLE now to use serial console instead now.

sys/arch/next68k/conf/files.next68k

@@ -1,4 +1,4 @@
-# $NetBSD: files.next68k,v 1.8 1999/03/24 23:15:51 dbj Exp $
+# $NetBSD: files.next68k,v 1.9 1999/03/26 04:42:59 dbj Exp $
 
 # next68k-specific configuration info
 
@@ -74,6 +74,7 @@ device  nextkbd: wskbddev
 attach  nextkbd at intio
 file    arch/next68k/dev/nextkbd.c      nextkbd needs-flag
 file	arch/next68k/dev/wskbdmap_next.c		nextkbd
+file    arch/next68k/dev/nextcons.c
 
 device	esp: scsi, ncr53c9x, disk
 attach	esp at intio

sys/arch/next68k/dev/nextcons.c

@@ -0,0 +1,93 @@
+/*	$NetBSD: nextcons.c,v 1.1 1999/03/26 04:42:59 dbj Exp $	*/
+
+/*
+ * Copyright (c) 1999 Darrin B. Jewell
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Darrin B. Jewell
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <sys/errno.h>
+#include <sys/queue.h>
+#include <sys/lock.h>
+
+#include <machine/autoconf.h>
+#include <machine/cpu.h>
+#include <machine/intr.h>
+#include <machine/bus.h>
+
+#include <dev/cons.h>
+#include <dev/wscons/wskbdvar.h>
+#include <dev/wscons/wsdisplayvar.h>
+#include <next68k/dev/nextdisplayvar.h>
+#include <next68k/dev/nextkbdvar.h>
+
+void nextcnprobe __P((struct consdev *));
+void nextcninit __P((struct consdev *));
+int nextcngetc __P((dev_t));
+void nextcnputc __P((dev_t, int));
+void nextcnpollc __P((dev_t, int));
+
+
+void
+nextcnprobe(struct consdev *cp)
+{
+	cp->cn_pri = CN_INTERNAL;
+	cp->cn_dev = NODEV;
+}
+
+void
+nextcninit(struct consdev *cp)
+{
+	nextkbd_cnattach(NEXT68K_INTIO_BUS_SPACE);
+	nextdisplay_cnattach();
+}
+
+int
+nextcngetc (dev_t dev)
+{
+	return wskbd_cngetc(dev);
+}
+
+void
+nextcnputc(dev_t dev, int c)
+{
+	wsdisplay_cnputc(dev,c);	
+}
+
+void
+nextcnpollc(dev_t dev, int on)
+{
+	wskbd_cnpollc(dev,on);
+}

sys/arch/next68k/dev/zs.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.7 1999/02/11 15:28:05 mycroft Exp $	*/
+/*	$NetBSD: zs.c,v 1.8 1999/03/26 04:42:59 dbj Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -664,7 +664,11 @@ zscnprobe(cp)
     }
   }
   if (maj != nchrdev) {
+#ifdef SERCONSOLE
+    cp->cn_pri = CN_REMOTE;
+#else
     cp->cn_pri = CN_NORMAL;		 /* Lower than CN_INTERNAL */
+#endif
     zs_major = maj;
     zs_consunit = 0;
     zsaddr[0] = (void *)IIOV(NEXT_P_SCC);

sys/arch/next68k/next68k/conf.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.5 1999/01/02 13:23:31 dbj Exp $	*/
+/*	$NetBSD: conf.c,v 1.6 1999/03/26 04:43:00 dbj Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -292,9 +292,17 @@ chrtoblk(dev)
 #define zscnpollc	nullcnpollc
 cons_decl(zs);
 
+#include "nextkbd.h"
+#include "nextdisplay.h"
+
+cons_decl(next);
+
 struct	consdev constab[] = {
 #if NZSTTY > 0
 	cons_init(zs),
+#endif
+#if (NNEXTKBD > 0) && (NNEXTDISPLAY > 0)
+	cons_init(next),
 #endif
 	{ 0 },
 };