diff options
48 files changed, 81 insertions, 48 deletions
diff --git a/lib/libvgl/bitmap.c b/lib/libvgl/bitmap.c index 2714e890a506..177d171cb1f7 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 690da320e50d..85850f5972fe 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 8211842ddc98..6047fec9e41f 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 390ec6cd86d2..f75f81fd2ea8 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 0dfc23704210..afa91b2aab19 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 09b09644a3e9..aef974a02fc4 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 c1b948b51b9b..36506ceb5926 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" diff --git a/release/picobsd/tinyware/view/view.c b/release/picobsd/tinyware/view/view.c index dfb7608e0816..19e9cf6c998a 100644 --- a/release/picobsd/tinyware/view/view.c +++ b/release/picobsd/tinyware/view/view.c @@ -36,7 +36,8 @@ #include <signal.h> #include <termios.h> #include <sys/types.h> -#include <machine/console.h> +#include <sys/fbio.h> +#include <sys/consio.h> #include <machine/mouse.h> #include <vgl.h> #include <png.h> diff --git a/release/sysinstall/keymap.c b/release/sysinstall/keymap.c index 53b076180ebe..3c53a0070a17 100644 --- a/release/sysinstall/keymap.c +++ b/release/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/release/sysinstall/msg.c b/release/sysinstall/msg.c index 499d70501a37..19e16c525cc0 100644 --- a/release/sysinstall/msg.c +++ b/release/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/release/sysinstall/system.c b/release/sysinstall/system.c index 6010e7a25f8d..0eec38aa48f6 100644 --- a/release/sysinstall/system.c +++ b/release/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/release/sysinstall/termcap.c b/release/sysinstall/termcap.c index edac12e0f38c..78a78d6410b1 100644 --- a/release/sysinstall/termcap.c +++ b/release/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/share/examples/libvgl/demo.c b/share/examples/libvgl/demo.c index ace1b9429b48..99dd9c63dbdf 100644 --- a/share/examples/libvgl/demo.c +++ b/share/examples/libvgl/demo.c @@ -29,7 +29,9 @@ */ #include <sys/types.h> -#include <machine/console.h> +#include <sys/fbio.h> +#include <sys/kbio.h> +#include <sys/consio.h> #include <vgl.h> int @@ -39,7 +41,7 @@ main(int argc, char **argv) VGLBitmap *tmp; // set graphics mode, here 320x240 256 colors - // supported modes are (from <machine/console.h>): + // supported modes are (from <sys/consio.h>): // SW_VGA_CG320: std VGA 320x200 256 colors // SW_VGA_MODEX: Modex VGA 320x240 256 colors // SW_VGA_VG640: std VGA 640x480 16 colors diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4 index f8af5bc6f8e7..74c24532798d 100644 --- a/share/man/man4/sysmouse.4 +++ b/share/man/man4/sysmouse.4 @@ -36,7 +36,7 @@ .Nd virtualized mouse driver .Sh SYNOPSIS .Fd #include <machine/mouse.h> -.Fd #include <machine/console.h> +.Fd #include <sys/consio.h> .Sh DESCRIPTION The console driver, in conjunction with the mouse daemon .Xr moused 8 , diff --git a/share/syscons/scrnmaps/mkscrfil.c b/share/syscons/scrnmaps/mkscrfil.c index d66283e1c8c3..c981b23bf57b 100644 --- a/share/syscons/scrnmaps/mkscrfil.c +++ b/share/syscons/scrnmaps/mkscrfil.c @@ -22,10 +22,12 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #include <sys/ioctl.h> -#include <machine/console.h> +#include <sys/consio.h> #include <stdio.h> #include FIL diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h index fe7f10e64655..79ff98f6a3a0 100644 --- a/sys/alpha/include/console.h +++ b/sys/alpha/include/console.h @@ -3,6 +3,10 @@ #ifndef _MACHINE_CONSOLE_H_ #define _MACHINE_CONSOLE_H_ +#if __GNUC__ +#warning "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead" +#endif + #include <sys/fbio.h> #include <sys/kbio.h> #include <sys/consio.h> diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 234e502588b9..e41d2ff795f5 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -33,10 +33,12 @@ #include <sys/sysproto.h> #include <sys/proc.h> #include <sys/cdio.h> +#include <sys/consio.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/filio.h> +#include <sys/kbio.h> #include <sys/linker_set.h> #include <sys/malloc.h> #include <sys/tty.h> @@ -48,8 +50,6 @@ #include <sys/soundcard.h> #include <sys/disklabel.h> -#include <machine/console.h> - #include <machine/../linux/linux.h> #include <machine/../linux/linux_proto.h> #include <compat/linux/linux_ioctl.h> diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index 497d267bc272..9b62dd813773 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -167,7 +167,7 @@ atkbd_timeout(void *arg) /* LOW-LEVEL */ #include <machine/limits.h> -#include <machine/console.h> +#include <sys/kbio.h> #include <machine/clock.h> #define ATKBD_DEFAULT 0 diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c index 497d267bc272..9b62dd813773 100644 --- a/sys/dev/kbd/atkbd.c +++ b/sys/dev/kbd/atkbd.c @@ -167,7 +167,7 @@ atkbd_timeout(void *arg) /* LOW-LEVEL */ #include <machine/limits.h> -#include <machine/console.h> +#include <sys/kbio.h> #include <machine/clock.h> #define ATKBD_DEFAULT 0 diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c index a9471e807a19..ec72820a25cd 100644 --- a/sys/dev/kbd/kbd.c +++ b/sys/dev/kbd/kbd.c @@ -39,7 +39,7 @@ #include <sys/vnode.h> #include <sys/uio.h> -#include <machine/console.h> +#include <sys/kbio.h> #include <dev/kbd/kbdreg.h> diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h index 54b2d6d4089d..de7d9419c910 100644 --- a/sys/dev/kbd/kbdreg.h +++ b/sys/dev/kbd/kbdreg.h @@ -232,7 +232,7 @@ int kbd_detach(keyboard_t *kbd); #define CLKDOWN (1 << 28) #define ALKDOWN (1 << 29) #define SHIFTAON (1 << 30) -/* lock key state (defined in machine/console.h) */ +/* lock key state (defined in sys/kbio.h) */ /* #define CLKED LED_CAP #define NLKED LED_NUM diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c index 74615258d8ce..85c4418e1036 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 c4053498acf0..1c5f15468aa2 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 f08659327594..08ee861b4950 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 8c498f995f07..e550b17db9e2 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 74615258d8ce..85c4418e1036 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 8af13a0b0719..be9d1e66f30d 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 de9dfca2d92e..2654a4ae265b 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 43b7724582a3..d622613ae7cc 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 e97be1ac6602..7d7c575bcafb 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> diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index c3334329d36c..5debe8f2652c 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -216,7 +216,7 @@ ukbd_intr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status) DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0); #include <machine/limits.h> -#include <machine/console.h> +#include <sys/kbio.h> #include <machine/clock.h> #define UKBD_DEFAULT 0 diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c index 9ea3386d3ea0..bc188f4b13ee 100644 --- a/sys/i386/ibcs2/ibcs2_ioctl.c +++ b/sys/i386/ibcs2/ibcs2_ioctl.c @@ -36,7 +36,8 @@ #include <sys/filio.h> #include <sys/ioctl_compat.h> #include <sys/tty.h> -#include <machine/console.h> +#include <sys/kbio.h> +#include <sys/consio.h> #include <sys/sysproto.h> diff --git a/sys/i386/include/console.h b/sys/i386/include/console.h index fe7f10e64655..79ff98f6a3a0 100644 --- a/sys/i386/include/console.h +++ b/sys/i386/include/console.h @@ -3,6 +3,10 @@ #ifndef _MACHINE_CONSOLE_H_ #define _MACHINE_CONSOLE_H_ +#if __GNUC__ +#warning "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead" +#endif + #include <sys/fbio.h> #include <sys/kbio.h> #include <sys/consio.h> diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index 2078f5f2ac78..1151298722da 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -91,8 +91,9 @@ /* a nonresponding keyboard */ /* - * The following values are defined in machine/console.h, but the header + * The following values are defined in sys/kbio.h, but the header * file is not included here due to conflicts with pcvt_ioctl.h. + * XXX: Still relevant ? */ #define KDGKBTYPE _IOR('K', 64, int) #define KB_84 1 diff --git a/sys/ia64/include/console.h b/sys/ia64/include/console.h index fe7f10e64655..79ff98f6a3a0 100644 --- a/sys/ia64/include/console.h +++ b/sys/ia64/include/console.h @@ -3,6 +3,10 @@ #ifndef _MACHINE_CONSOLE_H_ #define _MACHINE_CONSOLE_H_ +#if __GNUC__ +#warning "this file includes <machine/console.h> which is deprecated, use <sys/{kb,cons,fb}io.h> instead" +#endif + #include <sys/fbio.h> #include <sys/kbio.h> #include <sys/consio.h> diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c index 0dfe03ca2335..fdb161499970 100644 --- a/sys/isa/syscons_isa.c +++ b/sys/isa/syscons_isa.c @@ -34,8 +34,9 @@ #include <sys/module.h> #include <sys/bus.h> #include <sys/cons.h> +#include <sys/kbio.h> +#include <sys/consio.h> -#include <machine/console.h> #ifdef __i386__ diff --git a/usr.bin/doscmd/tty.c b/usr.bin/doscmd/tty.c index be747b0a4041..389695c5094a 100644 --- a/usr.bin/doscmd/tty.c +++ b/usr.bin/doscmd/tty.c @@ -47,7 +47,7 @@ #include <signal.h> #include <sys/time.h> #ifdef __FreeBSD__ -# include <machine/console.h> +# include <sys/kbio.h> #else # ifdef __NetBSD__ # include "machine/pccons.h" diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index 134968692548..15a84f1b1eda 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 1157bd874730..9f33c36b59ca 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 53b076180ebe..3c53a0070a17 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 499d70501a37..19e16c525cc0 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 6010e7a25f8d..0eec38aa48f6 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 edac12e0f38c..78a78d6410b1 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 53b076180ebe..3c53a0070a17 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 499d70501a37..19e16c525cc0 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 6010e7a25f8d..0eec38aa48f6 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 edac12e0f38c..78a78d6410b1 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 1e81cf5c2452..cf2dc300ebbd 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" |