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.
This commit is contained in:
parent
3c703fcbe2
commit
00d25f512c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=66834
@ -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))
|
||||
|
@ -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;
|
||||
|
@ -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))
|
||||
|
@ -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
|
||||
|
@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
#include <signal.h>
|
||||
#include <machine/console.h>
|
||||
#include <sys/fbio.h>
|
||||
#include "vgl.h"
|
||||
|
||||
static byte VGLSavePaletteRed[256];
|
||||
|
@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <machine/console.h>
|
||||
#include <sys/fbio.h>
|
||||
#include "vgl.h"
|
||||
|
||||
static VGLText *VGLTextFont = 0;
|
||||
|
@ -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"
|
||||
|
@ -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>
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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 ,
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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__
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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__
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user