--- Gnu-Mach/device/cons.c	2020/09/02 04:41:23	1.1.1.2
+++ Gnu-Mach/device/cons.c	2020/09/02 04:45:28	1.1.1.3
@@ -20,33 +20,20 @@
  *      Utah $Hdr: cons.c 1.14 94/12/14$
  */
 
-#ifdef MACH_KERNEL
+#include <string.h>
+#include <kern/debug.h>
 #include <sys/types.h>
 #include <device/conf.h>
 #include <mach/boolean.h>
-#include <cons.h>
-#else
-#include <sys/param.h>
-#include <sys/user.h>
-#include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/file.h>
-#include <sys/conf.h>
-#include <hpdev/cons.h>
-#endif
+#include <device/cons.h>
 
 #ifdef MACH_KMSG
 #include <device/io_req.h>
-#include <kmsg.h>
+#include <device/kmsg.h>
 #endif
 
-static	int cn_inited = 0;
+static	boolean_t cn_inited = FALSE;
 static	struct consdev *cn_tab = 0;	/* physical console device info */
-#ifndef MACH_KERNEL
-static	struct tty *constty = 0;	/* virtual console output device */
-#endif
 
 /*
  * ROM getc/putc primitives.
@@ -67,16 +54,15 @@ void	(*romputc)() = 0;
  */
 static	char consbuf[CONSBUFSIZE] = { 0 };
 static	char *consbp = consbuf;
-static	int consbufused = 0;
+static	boolean_t consbufused = FALSE;
 #endif
 
+void
 cninit()
 {
 	struct consdev *cp;
-#ifdef MACH_KERNEL
 	dev_ops_t cn_ops;
 	int x;
-#endif
 
 	if (cn_inited)
 		return;
@@ -95,12 +81,11 @@ cninit()
 	/*
 	 * Found a console, initialize it.
 	 */
-	if (cp = cn_tab) { 
+	if ((cp = cn_tab)) { 
 		/*
 		 * Initialize as console
 		 */
 		(*cp->cn_init)(cp);
-#ifdef MACH_KERNEL
 		/*
 		 * Look up its dev_ops pointer in the device table and
 		 * place it in the device indirection table.
@@ -108,7 +93,6 @@ cninit()
 		if (dev_name_lookup(cp->cn_name, &cn_ops, &x) == FALSE)
 			panic("cninit: dev_name_lookup failed");
 		dev_set_indirection("console", cn_ops, minor(cp->cn_dev));
-#endif
 #if CONSBUFSIZE > 0
 		/*
 		 * Now that the console is initialized, dump any chars in
@@ -122,107 +106,20 @@ cninit()
 				if (++cbp == &consbuf[CONSBUFSIZE])
 					cbp = consbuf;
 			} while (cbp != consbp);
-			consbufused = 0;
+			consbufused = FALSE;
 		}
 #endif
-		cn_inited = 1;
+		cn_inited = TRUE;
 		return;
 	}
 	/*
 	 * No console device found, not a problem for BSD, fatal for Mach
 	 */
-#ifdef MACH_KERNEL
 	panic("can't find a console device");
-#endif
 }
 
-#ifndef MACH_KERNEL
-cnopen(dev, flag)
-	dev_t dev;
-{
-	if (cn_tab == NULL)
-		return(0);
-	dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)].d_open)(dev, flag));
-}
- 
-cnclose(dev, flag)
-	dev_t dev;
-{
-	if (cn_tab == NULL)
-		return(0);
-	dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)].d_close)(dev, flag));
-}
- 
-cnread(dev, uio)
-	dev_t dev;
-	struct uio *uio;
-{
-	if (cn_tab == NULL)
-		return(0);
-	dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)].d_read)(dev, uio));
-}
- 
-cnwrite(dev, uio)
-	dev_t dev;
-	struct uio *uio;
-{
-	if (cn_tab == NULL)
-		return(0);
-	dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)].d_write)(dev, uio));
-}
- 
-cnioctl(dev, cmd, data, flag)
-	dev_t dev;
-	caddr_t data;
-{
-	if (cn_tab == NULL)
-		return(0);
-	/*
-	 * Superuser can always use this to wrest control of console
-	 * output from the "virtual" console.
-	 */
-	if (cmd == TIOCCONS && constty) {
-		if (!suser())
-			return(EPERM);
-		constty = NULL;
-		return(0);
-	}
-	dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)].d_ioctl)(dev, cmd, data, flag));
-}
-
-cnselect(dev, rw)
-	dev_t dev;
-	int rw;
-{
-	if (cn_tab == NULL)
-		return(1);
-	return(ttselect(cn_tab->cn_dev, rw));
-}
-
-#ifndef hp300
-/*
- * XXX Should go away when the new CIO MUX driver is in place
- */
-#define	d_control	d_mmap
-cncontrol(dev, cmd, data)
-	dev_t dev;
-	int cmd;
-	int data;
-{
-	if (cn_tab == NULL)
-		return(0);
-	dev = cn_tab->cn_dev;
-	return((*cdevsw[major(dev)].d_control)(dev, cmd, data));
-}
-#undef	d_control
-#endif
-#endif
 
+int
 cngetc()
 {
 	if (cn_tab)
@@ -232,7 +129,7 @@ cngetc()
 	return (0);
 }
 
-#ifdef MACH_KERNEL
+int
 cnmaygetc()
 {
 	if (cn_tab)
@@ -241,10 +138,10 @@ cnmaygetc()
 		return ((*romgetc)(0));
 	return (0);
 }
-#endif
 
+void
 cnputc(c)
-	int c;
+	char c;
 {
 	if (c == 0)
 		return;
@@ -254,6 +151,15 @@ cnputc(c)
 	kmsg_putchar (c);
 #endif
 	
+#if defined(MACH_HYP) && 0
+	{
+		/* Also output on hypervisor's emergency console, for
+		 * debugging */
+		unsigned char d = c;
+		hyp_console_write(&d, 1);
+	}
+#endif	/* MACH_HYP */
+	
 	if (cn_tab) {
 		(*cn_tab->cn_putc)(cn_tab->cn_dev, c);
 		if (c == '\n')
@@ -265,10 +171,10 @@ cnputc(c)
 	}
 #if CONSBUFSIZE > 0
 	else {
-		if (consbufused == 0) {
+		if (consbufused == FALSE) {
 			consbp = consbuf;
-			consbufused = 1;
-			bzero(consbuf, CONSBUFSIZE);
+			consbufused = TRUE;
+			memset(consbuf, 0, CONSBUFSIZE);
 		}
 		*consbp++ = c;
 		if (consbp >= &consbuf[CONSBUFSIZE])