diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/alpha/include/console.h | 4 | ||||
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 4 | ||||
| -rw-r--r-- | sys/dev/atkbdc/atkbd.c | 2 | ||||
| -rw-r--r-- | sys/dev/kbd/atkbd.c | 2 | ||||
| -rw-r--r-- | sys/dev/kbd/kbd.c | 2 | ||||
| -rw-r--r-- | sys/dev/kbd/kbdreg.h | 2 | ||||
| -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 | ||||
| -rw-r--r-- | sys/dev/usb/ukbd.c | 2 | ||||
| -rw-r--r-- | sys/i386/ibcs2/ibcs2_ioctl.c | 3 | ||||
| -rw-r--r-- | sys/i386/include/console.h | 4 | ||||
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_hdr.h | 3 | ||||
| -rw-r--r-- | sys/ia64/include/console.h | 4 | ||||
| -rw-r--r-- | sys/isa/syscons_isa.c | 3 |
21 files changed, 40 insertions, 20 deletions
diff --git a/sys/alpha/include/console.h b/sys/alpha/include/console.h index fe7f10e..79ff98f 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 234e502..e41d2ff 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 497d267..9b62dd8 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 497d267..9b62dd8 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 a9471e8..ec72820 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 54b2d6d..de7d941 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 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> diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index c333432..5debe8f 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 9ea3386..bc188f4 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 fe7f10e..79ff98f 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 2078f5f..1151298 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 fe7f10e..79ff98f 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 0dfe03c..fdb1614 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__ |
