Initiate deorbit burn sequence for <machine/console.h>.

Replace all in-tree uses with necessary subset of <sys/{fb,kb,cons}io.h>.
This is also the appropriate fix for exo-tree sources.

Put warnings in <machine/console.h> to discourage use.
November 15th 2000 the warnings will be converted to errors.
January 15th 2001 the <machine/console.h> files will be removed.

7 files changed, 13 insertions, 7 deletions

diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c
index 2714e89..177d171 100644
--- a/lib/libvgl/bitmap.c
+++ b/lib/libvgl/bitmap.c
@@ -30,7 +30,7 @@
 
 #include <sys/types.h>
 #include <signal.h>
-#include <machine/console.h>
+#include <sys/fbio.h>
 #include "vgl.h"
 
 #define min(x, y)	(((x) < (y)) ? (x) : (y))
diff --git a/lib/libvgl/keyboard.c b/lib/libvgl/keyboard.c
index 690da32..85850f5 100644
--- a/lib/libvgl/keyboard.c
+++ b/lib/libvgl/keyboard.c
@@ -33,7 +33,8 @@
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <sys/time.h>
-#include <machine/console.h>
+#include <sys/fbio.h>
+#include <sys/kbio.h>
 #include "vgl.h"
 
 static struct termios VGLKeyboardTty;
diff --git a/lib/libvgl/main.c b/lib/libvgl/main.c
index 8211842..6047fec 100644
--- a/lib/libvgl/main.c
+++ b/lib/libvgl/main.c
@@ -34,7 +34,9 @@
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <machine/console.h>
+#include <sys/fbio.h>
+#include <sys/kbio.h>
+#include <sys/consio.h>
 #include "vgl.h"
 
 #define min(x, y)	(((x) < (y)) ? (x) : (y))
diff --git a/lib/libvgl/mouse.c b/lib/libvgl/mouse.c
index 390ec6c..f75f81f 100644
--- a/lib/libvgl/mouse.c
+++ b/lib/libvgl/mouse.c
@@ -32,7 +32,8 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/signal.h>
-#include <machine/console.h>
+#include <sys/consio.h>
+#include <sys/fbio.h>
 #include "vgl.h"
 
 #define X 0xff
diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c
index 0dfc237..afa91b2 100644
--- a/lib/libvgl/simple.c
+++ b/lib/libvgl/simple.c
@@ -29,7 +29,7 @@
  */
 
 #include <signal.h>
-#include <machine/console.h>
+#include <sys/fbio.h>
 #include "vgl.h"
 
 static byte VGLSavePaletteRed[256];
diff --git a/lib/libvgl/text.c b/lib/libvgl/text.c
index 09b0964..aef974a 100644
--- a/lib/libvgl/text.c
+++ b/lib/libvgl/text.c
@@ -29,7 +29,7 @@
  */
 
 #include <stdio.h>
-#include <machine/console.h>
+#include <sys/fbio.h>
 #include "vgl.h"
 
 static VGLText		*VGLTextFont = 0;
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index c1b948b..36506ce 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -65,7 +65,9 @@
 .Sh LIBRARY
 .Lb libvgl
 .Sh SYNOPSIS
-.Fd #include <machine/console.h>
+.Fd #include <sys/fbio.h>
+.Fd #include <sys/consio.h>
+.Fd #include <sys/kbio.h>
 .Fd #include <vgl.h>
 .Ft int
 .Fn VGLInit "int mode"