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 /sys/dev/syscons | |
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 'sys/dev/syscons')
-rw-r--r-- | sys/dev/syscons/scgfbrndr.c | 3 | ||||
-rw-r--r-- | sys/dev/syscons/schistory.c | 2 | ||||
-rw-r--r-- | sys/dev/syscons/scmouse.c | 3 | ||||
-rw-r--r-- | sys/dev/syscons/scvesactl.c | 1 | ||||
-rw-r--r-- | sys/dev/syscons/scvgarndr.c | 3 | ||||
-rw-r--r-- | sys/dev/syscons/scvidctl.c | 4 | ||||
-rw-r--r-- | sys/dev/syscons/scvtb.c | 3 | ||||
-rw-r--r-- | sys/dev/syscons/syscons.c | 4 | ||||
-rw-r--r-- | sys/dev/syscons/sysmouse.c | 2 |
9 files changed, 15 insertions, 10 deletions
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c index 7461525..85c4418 100644 --- a/sys/dev/syscons/scgfbrndr.c +++ b/sys/dev/syscons/scgfbrndr.c @@ -32,8 +32,9 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/fbio.h> +#include <sys/consio.h> -#include <machine/console.h> #include <machine/bus.h> #include <dev/fb/fbreg.h> diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c index c405349..1c5f154 100644 --- a/sys/dev/syscons/schistory.c +++ b/sys/dev/syscons/schistory.c @@ -37,11 +37,11 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> +#include <sys/consio.h> #include <sys/tty.h> #include <sys/kernel.h> #include <sys/malloc.h> -#include <machine/console.h> #include <machine/pc/display.h> #include <dev/syscons/syscons.h> diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c index f0865932..08ee861 100644 --- a/sys/dev/syscons/scmouse.c +++ b/sys/dev/syscons/scmouse.c @@ -37,8 +37,9 @@ #include <sys/random.h> #include <sys/tty.h> #include <sys/malloc.h> +#include <sys/consio.h> +#include <sys/fbio.h> -#include <machine/console.h> #include <machine/mouse.h> #include <dev/syscons/syscons.h> diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index 8c498f9..e550b17 100644 --- a/sys/dev/syscons/scvesactl.c +++ b/sys/dev/syscons/scvesactl.c @@ -36,7 +36,6 @@ #include <sys/tty.h> #include <sys/kernel.h> -#include <machine/console.h> #include <machine/pc/vesa.h> #include <dev/fb/fbreg.h> diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c index 7461525..85c4418 100644 --- a/sys/dev/syscons/scvgarndr.c +++ b/sys/dev/syscons/scvgarndr.c @@ -32,8 +32,9 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/fbio.h> +#include <sys/consio.h> -#include <machine/console.h> #include <machine/bus.h> #include <dev/fb/fbreg.h> diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c index 8af13a0..be9d1e6 100644 --- a/sys/dev/syscons/scvidctl.c +++ b/sys/dev/syscons/scvidctl.c @@ -34,8 +34,8 @@ #include <sys/signalvar.h> #include <sys/tty.h> #include <sys/kernel.h> - -#include <machine/console.h> +#include <sys/fbio.h> +#include <sys/consio.h> #include <dev/fb/fbreg.h> #include <dev/syscons/syscons.h> diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c index de9dfca..2654a4a 100644 --- a/sys/dev/syscons/scvtb.c +++ b/sys/dev/syscons/scvtb.c @@ -31,8 +31,9 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> +#include <sys/fbio.h> +#include <sys/consio.h> -#include <machine/console.h> #include <machine/md_var.h> #include <machine/bus.h> diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 43b7724..d622613 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -48,9 +48,11 @@ #include <sys/malloc.h> #include <sys/cons.h> #include <sys/random.h> +#include <sys/consio.h> +#include <sys/kbio.h> +#include <sys/fbio.h> #include <machine/clock.h> -#include <machine/console.h> #include <machine/psl.h> #include <machine/pc/display.h> #ifdef __i386__ diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c index e97be1a..7d7c575 100644 --- a/sys/dev/syscons/sysmouse.c +++ b/sys/dev/syscons/sysmouse.c @@ -34,8 +34,8 @@ #include <sys/proc.h> #include <sys/tty.h> #include <sys/kernel.h> +#include <sys/consio.h> -#include <machine/console.h> #include <machine/mouse.h> #include <dev/syscons/syscons.h> |