diff options
author | phk <phk@FreeBSD.org> | 2000-10-08 21:34:00 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2000-10-08 21:34:00 +0000 |
commit | a4f549597e4f1de22e1614caaad56127b519e00e (patch) | |
tree | 1860f0608a5e1d1647a4b799848d18efa3cfc199 /usr.sbin | |
parent | f2b5910f009d28be5159b8535af2d8628019a37f (diff) | |
download | FreeBSD-src-a4f549597e4f1de22e1614caaad56127b519e00e.zip FreeBSD-src-a4f549597e4f1de22e1614caaad56127b519e00e.tar.gz |
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.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/kbdcontrol/kbdcontrol.c | 3 | ||||
-rw-r--r-- | usr.sbin/moused/moused.c | 2 | ||||
-rw-r--r-- | usr.sbin/sade/keymap.c | 2 | ||||
-rw-r--r-- | usr.sbin/sade/msg.c | 2 | ||||
-rw-r--r-- | usr.sbin/sade/system.c | 2 | ||||
-rw-r--r-- | usr.sbin/sade/termcap.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/keymap.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/msg.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/system.c | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/termcap.c | 2 | ||||
-rw-r--r-- | usr.sbin/vidcontrol/vidcontrol.c | 3 |
11 files changed, 13 insertions, 11 deletions
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index 1349686..15a84f1 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -38,7 +38,8 @@ static const char rcsid[] = #include <string.h> #include <unistd.h> #include <fcntl.h> -#include <machine/console.h> +#include <sys/kbio.h> +#include <sys/consio.h> #include "path.h" #include "lex.h" diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c index 1157bd8..9f33c36 100644 --- a/usr.sbin/moused/moused.c +++ b/usr.sbin/moused/moused.c @@ -64,9 +64,9 @@ static const char rcsid[] = #include <termios.h> #include <syslog.h> -#include <machine/console.h> #include <machine/mouse.h> +#include <sys/consio.h> #include <sys/types.h> #include <sys/time.h> #include <sys/socket.h> diff --git a/usr.sbin/sade/keymap.c b/usr.sbin/sade/keymap.c index 53b0761..3c53a00 100644 --- a/usr.sbin/sade/keymap.c +++ b/usr.sbin/sade/keymap.c @@ -30,7 +30,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <machine/console.h> +#include <sys/kbio.h> struct keymapInfo { const char *name; diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c index 499d705..19e16c5 100644 --- a/usr.sbin/sade/msg.c +++ b/usr.sbin/sade/msg.c @@ -37,7 +37,7 @@ #include "sysinstall.h" #include <stdarg.h> #include <sys/ioctl.h> -#include <machine/console.h> +#include <sys/consio.h> Boolean isDebug(void) diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c index 6010e7a..0eec38a 100644 --- a/usr.sbin/sade/system.c +++ b/usr.sbin/sade/system.c @@ -20,7 +20,7 @@ #include <signal.h> #include <termios.h> #include <sys/reboot.h> -#include <machine/console.h> +#include <sys/consio.h> #include <sys/fcntl.h> #include <sys/ioctl.h> #include <sys/stat.h> diff --git a/usr.sbin/sade/termcap.c b/usr.sbin/sade/termcap.c index edac12e..78a78d6 100644 --- a/usr.sbin/sade/termcap.c +++ b/usr.sbin/sade/termcap.c @@ -16,7 +16,7 @@ #include <fcntl.h> #include <sys/errno.h> #include <sys/ioctl.h> -#include <machine/console.h> +#include <sys/consio.h> #define VTY_STATUS_LINE 24 #define TTY_STATUS_LINE 23 diff --git a/usr.sbin/sysinstall/keymap.c b/usr.sbin/sysinstall/keymap.c index 53b0761..3c53a00 100644 --- a/usr.sbin/sysinstall/keymap.c +++ b/usr.sbin/sysinstall/keymap.c @@ -30,7 +30,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <machine/console.h> +#include <sys/kbio.h> struct keymapInfo { const char *name; diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c index 499d705..19e16c5 100644 --- a/usr.sbin/sysinstall/msg.c +++ b/usr.sbin/sysinstall/msg.c @@ -37,7 +37,7 @@ #include "sysinstall.h" #include <stdarg.h> #include <sys/ioctl.h> -#include <machine/console.h> +#include <sys/consio.h> Boolean isDebug(void) diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index 6010e7a..0eec38a 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -20,7 +20,7 @@ #include <signal.h> #include <termios.h> #include <sys/reboot.h> -#include <machine/console.h> +#include <sys/consio.h> #include <sys/fcntl.h> #include <sys/ioctl.h> #include <sys/stat.h> diff --git a/usr.sbin/sysinstall/termcap.c b/usr.sbin/sysinstall/termcap.c index edac12e..78a78d6 100644 --- a/usr.sbin/sysinstall/termcap.c +++ b/usr.sbin/sysinstall/termcap.c @@ -16,7 +16,7 @@ #include <fcntl.h> #include <sys/errno.h> #include <sys/ioctl.h> -#include <machine/console.h> +#include <sys/consio.h> #define VTY_STATUS_LINE 24 #define TTY_STATUS_LINE 23 diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c index 1e81cf5..cf2dc30 100644 --- a/usr.sbin/vidcontrol/vidcontrol.c +++ b/usr.sbin/vidcontrol/vidcontrol.c @@ -38,7 +38,8 @@ static const char rcsid[] = #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <machine/console.h> +#include <sys/fbio.h> +#include <sys/consio.h> #include <sys/errno.h> #include "path.h" #include "decode.h" |