Date: Sat, 8 Feb 2003 18:41:37 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 24864 for review Message-ID: <200302090241.h192fboQ000504@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=24864 Change 24864 by marcel@marcel_vaio on 2003/02/08 18:40:38 o Disconnect libvgl. o Remove kernel options for syscons, gfb, vga, tga and vesa. o Remove syscons and pcvt from GENERIC (i386) and modules. o Add #error directives to <sys/consio.h> and <sys/fbio.h>. o Fix buildworld to not need the headers mentioned above. This mostly axes non-serial consoles (keyboard stuff still there) and makes room for something else. Affected files ... .. //depot/projects/tty/lib/Makefile#2 edit .. //depot/projects/tty/sys/conf/options.alpha#2 edit .. //depot/projects/tty/sys/conf/options.i386#2 edit .. //depot/projects/tty/sys/conf/options.ia64#2 edit .. //depot/projects/tty/sys/conf/options.pc98#2 edit .. //depot/projects/tty/sys/conf/options.x86_64#2 edit .. //depot/projects/tty/sys/i386/conf/GENERIC#2 edit .. //depot/projects/tty/sys/modules/Makefile#2 edit .. //depot/projects/tty/sys/sys/consio.h#2 edit .. //depot/projects/tty/sys/sys/fbio.h#2 edit .. //depot/projects/tty/usr.bin/kdump/mkioctls#2 edit .. //depot/projects/tty/usr.bin/lock/lock.c#2 edit .. //depot/projects/tty/usr.sbin/Makefile#2 edit Differences ... ==== //depot/projects/tty/lib/Makefile#2 (text+ko) ==== @@ -29,7 +29,7 @@ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ - libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ + libstand ${_libtelnet} libufs libugidfw libusbhid \ libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -59,7 +59,6 @@ _compat= compat _libncp= libncp _libsmb= libsmb -_libvgl= libvgl .endif .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/tty/sys/conf/options.alpha#2 (text+ko) ==== @@ -21,45 +21,6 @@ PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h -DEV_SC - -VGA_ALT_SEQACCESS opt_vga.h -VGA_DEBUG opt_vga.h -VGA_NO_FONT_LOADING opt_vga.h -VGA_NO_MODE_CHANGE opt_vga.h -VGA_SLOW_IOACCESS opt_vga.h -VGA_WIDTH90 opt_vga.h - -GFB_DEBUG opt_gfb.h -GFB_NO_FONT_LOADING opt_gfb.h -GFB_NO_MODE_CHANGE opt_gfb.h - -TGA_DEBUG opt_tga.h -TGA_NO_FONT_LOADING opt_tga.h -TGA_NO_MODE_CHANGE opt_tga.h - PSM_HOOKRESUME opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h ==== //depot/projects/tty/sys/conf/options.i386#2 (text+ko) ==== @@ -74,39 +74,6 @@ I586_CPU opt_global.h I686_CPU opt_global.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - -VGA_ALT_SEQACCESS opt_vga.h -VGA_DEBUG opt_vga.h -VGA_NO_FONT_LOADING opt_vga.h -VGA_NO_MODE_CHANGE opt_vga.h -VGA_SLOW_IOACCESS opt_vga.h -VGA_WIDTH90 opt_vga.h - -VESA opt_vesa.h -VESA_DEBUG opt_vesa.h - PSM_HOOKRESUME opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h ==== //depot/projects/tty/sys/conf/options.ia64#2 (text+ko) ==== @@ -13,36 +13,6 @@ PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - -VGA_ALT_SEQACCESS opt_vga.h -VGA_DEBUG opt_vga.h -VGA_NO_FONT_LOADING opt_vga.h -VGA_NO_MODE_CHANGE opt_vga.h -VGA_SLOW_IOACCESS opt_vga.h -VGA_WIDTH90 opt_vga.h - PSM_HOOKRESUME opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h ==== //depot/projects/tty/sys/conf/options.pc98#2 (text+ko) ==== @@ -69,29 +69,6 @@ I586_CPU opt_global.h I686_CPU opt_global.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - GDC opt_gdc.h KBD_DISABLE_KEYMAP_LOAD opt_kbd.h @@ -132,7 +109,6 @@ PC98 opt_global.h EPSON_BOUNCEDMA opt_pc98.h EPSON_MEMWIN opt_pc98.h -LINE30 opt_syscons.h # Device options DEV_NPX opt_npx.h ==== //depot/projects/tty/sys/conf/options.x86_64#2 (text+ko) ==== @@ -10,39 +10,6 @@ CLK_CALIBRATION_LOOP opt_clock.h TIMER_FREQ opt_clock.h -MAXCONS opt_syscons.h -SC_ALT_MOUSE_IMAGE opt_syscons.h -SC_CUT_SPACES2TABS opt_syscons.h -SC_CUT_SEPCHARS opt_syscons.h -SC_DEBUG_LEVEL opt_syscons.h -SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDBKEY opt_syscons.h -SC_DISABLE_REBOOT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h -SC_KERNEL_CONS_ATTR opt_syscons.h -SC_KERNEL_CONS_REV_ATTR opt_syscons.h -SC_MOUSE_CHAR opt_syscons.h -SC_NO_CUTPASTE opt_syscons.h -SC_NO_FONT_LOADING opt_syscons.h -SC_NO_HISTORY opt_syscons.h -SC_NO_SYSMOUSE opt_syscons.h -SC_NORM_ATTR opt_syscons.h -SC_NORM_REV_ATTR opt_syscons.h -SC_PIXEL_MODE opt_syscons.h -SC_RENDER_DEBUG opt_syscons.h -SC_TWOBUTTON_MOUSE opt_syscons.h -SC_NO_SUSPEND_VTYSWITCH opt_syscons.h - -VGA_ALT_SEQACCESS opt_vga.h -VGA_DEBUG opt_vga.h -VGA_NO_FONT_LOADING opt_vga.h -VGA_NO_MODE_CHANGE opt_vga.h -VGA_SLOW_IOACCESS opt_vga.h -VGA_WIDTH90 opt_vga.h - -VESA opt_vesa.h -VESA_DEBUG opt_vesa.h - ATKBD_DFLT_KEYMAP opt_atkbd.h KBD_DISABLE_KEYMAP_LOAD opt_kbd.h ==== //depot/projects/tty/sys/i386/conf/GENERIC#2 (text+ko) ==== @@ -135,18 +135,6 @@ device atkbd # AT keyboard device psm # PS/2 mouse -device vga # VGA video card driver - -device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - device agp # support several AGP chipsets # Floating point support - do not disable. ==== //depot/projects/tty/sys/modules/Makefile#2 (text+ko) ==== @@ -148,10 +148,6 @@ SUBDIR+=ipfilter .endif -.if ${MACHINE_ARCH} != "sparc64" -SUBDIR+=syscons -.endif - # XXX some of these can move to the general case when de-i386'ed # XXX some of these can move now, but are untested on other architectures. .if ${MACHINE_ARCH} == "i386" @@ -172,9 +168,7 @@ gnufpu \ hea \ hfa \ - ibcs2 \ linprocfs \ - linux \ lnc \ ncv \ netgraph \ @@ -187,7 +181,6 @@ scsi_low \ smbfs \ sound \ - splash \ sppp \ sr \ stg \ @@ -210,10 +203,8 @@ exca \ iir \ mly \ - s3 \ - smapi \ - vesa - + smapi + .elif ${MACHINE} == "pc98" SUBDIR+=pcspeaker \ pmc \ ==== //depot/projects/tty/sys/sys/consio.h#2 (text+ko) ==== @@ -31,6 +31,8 @@ #ifndef _SYS_CONSIO_H_ #define _SYS_CONSIO_H_ +#error Gotta go... + #ifndef _KERNEL #include <sys/types.h> #endif ==== //depot/projects/tty/sys/sys/fbio.h#2 (text+ko) ==== @@ -42,6 +42,8 @@ #ifndef _SYS_FBIO_H_ #define _SYS_FBIO_H_ +#error Gotta go... + #ifndef _KERNEL #include <sys/types.h> #endif ==== //depot/projects/tty/usr.bin/kdump/mkioctls#2 (text+ko) ==== @@ -23,6 +23,7 @@ cd $1 find -s * -name '*.h' -follow | egrep -v '^(netns)/' | + egrep -v 'sys/consio.h' | egrep -v 'sys/fbio.h' | xargs egrep -l \ '^#[ ]*define[ ]+[A-Za-z_][A-Za-z0-9_]*[ ]+_IO[^a-z0-9_]' | awk '{printf("#include <%s>\\\\n", $1)}' ==== //depot/projects/tty/usr.bin/lock/lock.c#2 (text+ko) ==== @@ -60,7 +60,6 @@ #include <sys/stat.h> #include <sys/time.h> #include <sys/signal.h> -#include <sys/consio.h> #include <err.h> #include <ctype.h> #include <pwd.h> @@ -84,7 +83,6 @@ struct sgttyb tty, ntty; long nexttime; /* keep the timeout time */ int no_timeout; /* lock terminal forever */ -int vtyunlock; /* Unlock flag and code. */ /*ARGSUSED*/ int @@ -95,7 +93,7 @@ time_t timval_sec; struct itimerval ntimer, otimer; struct tm *timp; - int ch, failures, sectimeout, usemine, vtylock; + int ch, failures, sectimeout, usemine; char *ap, *mypw, *ttynam, *tzn; char hostname[MAXHOSTNAMELEN], s[BUFSIZ], s1[BUFSIZ]; @@ -105,8 +103,7 @@ mypw = NULL; usemine = 0; no_timeout = 0; - vtylock = 0; - while ((ch = getopt(argc, argv, "npt:v")) != -1) + while ((ch = getopt(argc, argv, "npt:")) != -1) switch((char)ch) { case 't': if ((sectimeout = atoi(optarg)) <= 0) @@ -121,9 +118,6 @@ case 'n': no_timeout = 1; break; - case 'v': - vtylock = 1; - break; case '?': default: usage(); @@ -181,19 +175,6 @@ ntimer.it_value = timeout; if (!no_timeout) setitimer(ITIMER_REAL, &ntimer, &otimer); - if (vtylock) { - /* - * If this failed, we want to err out; warn isn't good - * enough, since we don't want the user to think that - * everything is nice and locked because they got a - * "Key:" prompt. - */ - if (ioctl(0, VT_LOCKSWITCH, &vtylock) == -1) { - (void)ioctl(0, TIOCSETP, &tty); - err(1, "locking vty"); - } - vtyunlock = 0x2; - } /* header info */ (void)printf("lock: %s on %s.", ttynam, hostname); @@ -202,8 +183,6 @@ else (void)printf(" timeout in %d minute%s.", sectimeout, sectimeout != 1 ? "s" : ""); - if (vtylock) - (void)printf(" vty locked."); (void)printf("\ntime now is %.20s%s%s", ap, tzn, ap + 19); failures = 0; @@ -268,8 +247,6 @@ { (void)putchar('\n'); (void)ioctl(0, TIOCSETP, &tty); - if (vtyunlock) - (void)ioctl(0, VT_LOCKSWITCH, &vtyunlock); exit(0); } @@ -278,8 +255,6 @@ { if (!no_timeout) { (void)ioctl(0, TIOCSETP, &tty); - if (vtyunlock) - (void)ioctl(0, VT_LOCKSWITCH, &vtyunlock); (void)printf("lock: timeout\n"); exit(1); } ==== //depot/projects/tty/usr.sbin/Makefile#2 (text+ko) ==== @@ -40,7 +40,6 @@ inetd \ iostat \ jail \ - kbdcontrol \ kbdmap \ kernbb \ kldxref \ @@ -52,8 +51,7 @@ mixer \ mld6query \ mlxcontrol \ - mountd \ - moused \ + mountd \ mrouted \ mtest \ mtree \ @@ -100,7 +98,6 @@ sliplogin \ slstat \ spray \ - sysinstall \ syslogd \ tcpdchk \ tcpdmatch \ @@ -113,7 +110,6 @@ ugidfw \ usbd \ usbdevs \ - vidcontrol \ vipw \ vnconfig \ watch \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302090241.h192fboQ000504>