--- Gnu-Mach/i386/i386at/cons_conf.c	2020/09/02 04:36:58	1.1.1.1
+++ Gnu-Mach/i386/i386at/cons_conf.c	2020/09/02 04:51:30	1.1.1.3
@@ -28,23 +28,36 @@
  * known algorithm unless we see a pressing need otherwise.
  */
 #include <sys/types.h>
-#include <cons.h>
-#include <com.h>
-#include <rc.h>
+#include <device/cons.h>
 
-extern	int kdcnprobe(), kdcninit(), kdcngetc(), kdcnputc();
-#if NCOM > 0 && RCLINE >= 0
-extern	int comcnprobe(), comcninit(), comcngetc(), comcnputc();
+#ifdef	MACH_HYP
+#include <xen/console.h>
+#else	/* MACH_HYP */
+#include "kd.h"
+#if NCOM > 0
+#include "com.h"
 #endif
+#endif	/* MACH_HYP */
+
+#if	ENABLE_IMMEDIATE_CONSOLE
+#include "immc.h"
+#endif	/* ENABLE_IMMEDIATE_CONSOLE */
 
 /*
  * The rest of the consdev fields are filled in by the respective
  * cnprobe routine.
  */
 struct	consdev constab[] = {
+#ifdef	MACH_HYP
+	{"hyp",	hypcnprobe,	hypcninit,	hypcngetc,	hypcnputc},
+#else	/* MACH_HYP */
+#if	ENABLE_IMMEDIATE_CONSOLE
+	{"immc", immc_cnprobe,	immc_cninit,	immc_cngetc,	immc_cnputc},
+#endif	/* ENABLE_IMMEDIATE_CONSOLE */
 	{"kd",	kdcnprobe,	kdcninit,	kdcngetc,	kdcnputc},
-#if NCOM > 0 && RCLINE >= 0 && 1
+#if NCOM > 0
 	{"com",	comcnprobe,	comcninit,	comcngetc,	comcnputc},
 #endif
+#endif	/* MACH_HYP */
 	{0}
 };