Date: Wed, 12 Feb 2003 02:31:37 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 25047 for review Message-ID: <200302121031.h1CAVbV3040716@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=25047 Change 25047 by marcel@marcel_vaio on 2003/02/12 02:30:57 Axe configuration options and devices that relate to syscons and/or pcvt and add the new VGA adapter skeleton. Get alpha in on the action. Affected files ... .. //depot/projects/tty/sys/alpha/alpha/vga_machdep.c#1 add .. //depot/projects/tty/sys/alpha/conf/GENERIC#3 edit .. //depot/projects/tty/sys/alpha/conf/GENERIC.hints#2 edit .. //depot/projects/tty/sys/alpha/conf/NOTES#2 edit .. //depot/projects/tty/sys/conf/NOTES#3 edit .. //depot/projects/tty/sys/conf/files.alpha#3 edit .. //depot/projects/tty/sys/conf/files.i386#3 edit .. //depot/projects/tty/sys/conf/files.ia64#3 edit .. //depot/projects/tty/sys/conf/files.x86_64#3 edit .. //depot/projects/tty/sys/dev/vga/vga.h#2 edit .. //depot/projects/tty/sys/dev/vga/vga_cons.c#1 add .. //depot/projects/tty/sys/i386/conf/GENERIC#4 edit .. //depot/projects/tty/sys/i386/conf/GENERIC.hints#2 edit .. //depot/projects/tty/sys/i386/conf/NOTES#3 edit .. //depot/projects/tty/sys/i386/conf/OLDCARD#3 edit .. //depot/projects/tty/sys/ia64/conf/GENERIC#3 edit .. //depot/projects/tty/sys/ia64/conf/GENERIC.hints#2 edit Differences ... ==== //depot/projects/tty/sys/alpha/conf/GENERIC#3 (text+ko) ==== @@ -119,12 +119,6 @@ device psm # PS/2 mouse device vga # VGA video card driver -device tga # TGA video card driver - -device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc device mcclock # MC146818 real time clock device ==== //depot/projects/tty/sys/alpha/conf/GENERIC.hints#2 (text+ko) ==== @@ -17,8 +17,6 @@ hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" -hint.vga.0.at="isa" -hint.sc.0.at="isa" hint.mcclock.0.at="isa" hint.mcclock.0.port="0x70" hint.sio.0.at="isa" ==== //depot/projects/tty/sys/alpha/conf/NOTES#2 (text+ko) ==== @@ -61,8 +61,6 @@ # Optional devices: # -device tga # TGA video card driver - ##################################################################### # SIMULATOR OPTIONS ==== //depot/projects/tty/sys/conf/NOTES#3 (text+ko) ==== @@ -1075,81 +1075,7 @@ # Video card driver for VGA adapters. device vga -hint.vga.0.at="isa" - -# Options for vga: -# Try the following option if the mouse pointer is not drawn correctly -# or font does not seem to be loaded properly. May cause flicker on -# some systems. -options VGA_ALT_SEQACCESS - -# If you can dispense with some vga driver features, you may want to -# use the following options to save some memory. -#options VGA_NO_FONT_LOADING # don't save/load font -#options VGA_NO_MODE_CHANGE # don't change video modes - -# Older video cards may require this option for proper operation. -options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs - -# The following option probably won't work with the LCD displays. -options VGA_WIDTH90 # support 90 column modes - -options FB_DEBUG # Frame buffer debugging -options FB_INSTALL_CDEV # install a CDEV entry in /dev - -device splash # Splash screen and screen saver support - -# Various screen savers. -device blank_saver -device daemon_saver -device fade_saver -device fire_saver -device green_saver -device logo_saver -device rain_saver -device star_saver -device warp_saver - -# The syscons console driver (sco color console compatible). -device sc -hint.sc.0.at="isa" -options MAXCONS=16 # number of virtual consoles -options SC_ALT_MOUSE_IMAGE # simplified mouse cursor in text mode -options SC_DFLT_FONT # compile font in -makeoptions SC_DFLT_FONT=cp850 -options SC_DISABLE_DDBKEY # disable `debug' key -options SC_DISABLE_REBOOT # disable reboot key sequence -options SC_HISTORY_SIZE=200 # number of history buffer lines -options SC_MOUSE_CHAR=0x3 # char code for text mode mouse cursor -options SC_PIXEL_MODE # add support for the raster text mode - -# The following options will let you change the default colors of syscons. -options SC_NORM_ATTR=(FG_GREEN|BG_BLACK) -options SC_NORM_REV_ATTR=(FG_YELLOW|BG_GREEN) -options SC_KERNEL_CONS_ATTR=(FG_RED|BG_BLACK) -options SC_KERNEL_CONS_REV_ATTR=(FG_BLACK|BG_RED) - -# The following options will let you change the default behaviour of -# cut-n-paste feature -options SC_CUT_SPACES2TABS # convert leading spaces into tabs -options SC_CUT_SEPCHARS=\"x09\" # set of characters that delimit words - # (default is single space - \"x20\") - -# If you have a two button mouse, you may want to add the following option -# to use the right button of the mouse to paste text. -options SC_TWOBUTTON_MOUSE - -# You can selectively disable features in syscons. -options SC_NO_CUTPASTE -options SC_NO_FONT_LOADING -options SC_NO_HISTORY -options SC_NO_SYSMOUSE -options SC_NO_SUSPEND_VTYSWITCH -# `flags' for sc -# 0x80 Put the video card in the VESA 800x600 dots, 16 color mode -# 0x100 Probe for a keyboard device periodically if one is not present - # # Optional devices: # @@ -2260,9 +2186,6 @@ options SCSI_NCR_MAX_WIDE=1 options SCSI_NCR_MYADDR=7 -options SC_DEBUG_LEVEL=5 # Syscons debug level -options SC_RENDER_DEBUG # syscons rendering debugging - options SHOW_BUSYBUFS # List buffers that prevent root unmount options SLIP_IFF_OPTS options VFS_BIO_DEBUG # VFS buffer I/O debugging @@ -2289,6 +2212,3 @@ options METEOR_TEST_VIDEO options NDEVFSINO=1025 options NDEVFSOVERFLOW=32769 - -# Yet more undocumented options for linting. -options VGA_DEBUG ==== //depot/projects/tty/sys/conf/files.alpha#3 (text+ko) ==== @@ -20,11 +20,6 @@ no-obj no-implicit-rule before-depend \ clean "linux_assym.h" # -font.h optional sc_dflt_font \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ - no-obj no-implicit-rule before-depend \ - clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" -# atkbdmap.h optional atkbd_dflt_keymap \ compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ no-obj no-implicit-rule before-depend \ @@ -170,44 +165,20 @@ dev/dec/mcclock.c optional mcclock dev/dec/mcclock_if.m optional mcclock dev/ed/if_ed_isa.c optional ed isa -dev/fb/fb.c optional fb -dev/fb/fb.c optional vga -dev/fb/splash.c optional splash -dev/fb/vga.c optional vga dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional kbd -dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa -dev/syscons/schistory.c optional sc -dev/syscons/scmouse.c optional sc -dev/syscons/scterm.c optional sc -dev/syscons/scterm-dumb.c optional sc -dev/syscons/scterm-sc.c optional sc -dev/syscons/scvgarndr.c optional sc vga -dev/syscons/scgfbrndr.c optional sc tga -dev/syscons/scvidctl.c optional sc -dev/syscons/scvtb.c optional sc -dev/syscons/syscons.c optional sc -dev/syscons/sysmouse.c optional sc geom/geom_bsd.c standard isa/atkbd_isa.c optional atkbd isa/atkbdc_isa.c optional atkbdc isa/fd.c optional fdc isa/ppc.c optional ppc isa/psm.c optional psm -isa/syscons_isa.c optional sc -isa/vga_isa.c optional vga libkern/alpha/bswap16.S standard libkern/alpha/bswap32.S standard libkern/bcmp.c standard libkern/ffs.c standard -dev/fb/tga.c optional tga -dev/fb/boot_font.c optional tga -dev/tga/tga_pci.c optional tga -dev/fb/fb.c optional tga -dev/fb/gfb.c optional tga -dev/gfb/gfb_pci.c optional tga ==== //depot/projects/tty/sys/conf/files.i386#3 (text+ko) ==== @@ -31,11 +31,6 @@ no-obj no-implicit-rule before-depend \ clean "svr4_assym.h" # -font.h optional sc_dflt_font \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ - no-obj no-implicit-rule before-depend \ - clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" -# atkbdmap.h optional atkbd_dflt_keymap \ compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ no-obj no-implicit-rule before-depend \ @@ -115,16 +110,11 @@ dev/dgb/dgb.c count dgb dev/ed/if_ed_isa.c optional ed isa dev/eisa/eisaconf.c optional eisa -dev/fb/fb.c optional fb -dev/fb/fb.c optional vga -dev/fb/splash.c optional splash -dev/fb/vga.c optional vga dev/fe/if_fe_isa.c optional fe isa dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional kbd -dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt dev/lnc/if_lnc_isa.c optional lnc isa @@ -137,18 +127,10 @@ dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/sr/if_sr_isa.c optional sr isa -dev/syscons/apm/apm_saver.c optional apm_saver apm -dev/syscons/schistory.c optional sc -dev/syscons/scmouse.c optional sc -dev/syscons/scterm.c optional sc -dev/syscons/scterm-dumb.c optional sc -dev/syscons/scterm-sc.c optional sc -dev/syscons/scvesactl.c optional sc vga vesa -dev/syscons/scvgarndr.c optional sc vga -dev/syscons/scvidctl.c optional sc -dev/syscons/scvtb.c optional sc -dev/syscons/syscons.c optional sc -dev/syscons/sysmouse.c optional sc +dev/vga/vga.c optional vga +dev/vga/vga_cons.c optional vga +dev/vga/vga_isa.c optional vga isa +dev/vga/vga_pci.c optional vga pci geom/geom_bsd.c standard geom/geom_mbr.c standard gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ @@ -233,6 +215,7 @@ i386/i386/sys_machdep.c standard i386/i386/trap.c standard i386/i386/tsc.c standard +i386/i386/vga_machdep.c optional vga i386/i386/vm86.c standard i386/i386/vm_machdep.c standard i386/ibcs2/ibcs2_errno.c optional ibcs2 @@ -281,12 +264,6 @@ i386/isa/npx.c optional npx i386/isa/pcaudio.c optional pca i386/isa/pcf.c optional pcf -i386/isa/pcvt/pcvt_drv.c optional vt -i386/isa/pcvt/pcvt_ext.c optional vt -i386/isa/pcvt/pcvt_kbd.c optional vt -i386/isa/pcvt/pcvt_out.c optional vt -i386/isa/pcvt/pcvt_sup.c optional vt -i386/isa/pcvt/pcvt_vtf.c optional vt i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spic.c optional spic @@ -294,7 +271,6 @@ i386/isa/spkr.c optional speaker i386/isa/stallion.c optional stl nowerror i386/isa/tw.c count tw -i386/isa/vesa.c optional vga vesa i386/isa/wt.c count wt i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux @@ -407,8 +383,6 @@ isa/fd.c optional fdc isa/ppc.c optional ppc isa/psm.c optional psm -isa/syscons_isa.c optional sc -isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip libkern/divdi3.c standard ==== //depot/projects/tty/sys/conf/files.ia64#3 (text+ko) ==== @@ -8,11 +8,6 @@ # dependency lines other than the first are silently ignored. # # -font8x16.o optional std8x16font \ - compile-with "uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \ - no-implicit-rule before-depend \ - clean "${STD8X16FONT}-8x16 font8x16.c" -# atkbdmap.h optional atkbd_dflt_keymap \ compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ no-obj no-implicit-rule before-depend \ @@ -62,6 +57,7 @@ ia64/ia64/trap.c standard ia64/ia64/unaligned.c standard ia64/ia64/unwind.c standard +ia64/ia64/vga_machdep.c optional vga ia64/ia64/vm_machdep.c standard ia64/isa/isa.c optional isa ia64/isa/isa_dma.c optional isa @@ -72,28 +68,17 @@ crypto/des/des_enc.c optional crypto dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa -dev/fb/fb.c optional fb -dev/fb/fb.c optional vga -dev/fb/splash.c optional splash -dev/fb/vga.c optional vga dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional kbd -dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa -dev/syscons/schistory.c optional sc -dev/syscons/scmouse.c optional sc -dev/syscons/scterm.c optional sc -dev/syscons/scterm-dumb.c optional sc -dev/syscons/scterm-sc.c optional sc -dev/syscons/scvgarndr.c optional sc vga -dev/syscons/scvidctl.c optional sc -dev/syscons/scvtb.c optional sc -dev/syscons/syscons.c optional sc -dev/syscons/sysmouse.c optional sc +dev/vga/vga.c optional vga +dev/vga/vga_cons.c optional vga +dev/vga/vga_isa.c optional vga isa +dev/vga/vga_pci.c optional vga pci geom/geom_bsd.c standard geom/geom_gpt.c standard geom/geom_mbr.c standard @@ -102,8 +87,6 @@ isa/fd.c optional fdc isa/ppc.c optional ppc isa/psm.c optional psm -isa/syscons_isa.c optional sc -isa/vga_isa.c optional vga kern/imgact_elf32.c optional ia32 libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard ==== //depot/projects/tty/sys/conf/files.x86_64#3 (text+ko) ==== @@ -12,23 +12,10 @@ dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd dev/kbd/kbd.c optional kbd -dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd -dev/kbd/kbd.c optional vt dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/syscons/apm/apm_saver.c optional apm_saver apm -dev/syscons/schistory.c optional sc -dev/syscons/scmouse.c optional sc -dev/syscons/scterm.c optional sc -dev/syscons/scterm-dumb.c optional sc -dev/syscons/scterm-sc.c optional sc -dev/syscons/scvesactl.c optional sc vga vesa -dev/syscons/scvgarndr.c optional sc vga -dev/syscons/scvidctl.c optional sc -dev/syscons/scvtb.c optional sc -dev/syscons/syscons.c optional sc -dev/syscons/sysmouse.c optional sc isa/atkbd_isa.c optional atkbd libkern/ffs.c standard ==== //depot/projects/tty/sys/dev/vga/vga.h#2 (text+ko) ==== @@ -36,6 +36,7 @@ struct vga_softc { + struct consdev * vga_consdev; device_t vga_dev; dev_t vga_node; ==== //depot/projects/tty/sys/i386/conf/GENERIC#4 (text+ko) ==== @@ -136,6 +136,7 @@ device atkbd # AT keyboard device psm # PS/2 mouse +device vga # VGA video card driver device agp # support several AGP chipsets # Floating point support - do not disable. ==== //depot/projects/tty/sys/i386/conf/GENERIC.hints#2 (text+ko) ==== @@ -28,11 +28,6 @@ hint.atkbd.0.flags="0x1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" -hint.vga.0.at="isa" -hint.sc.0.at="isa" -hint.sc.0.flags="0x100" -hint.vt.0.at="isa" -hint.vt.0.disabled="1" hint.apm.0.disabled="1" hint.apm.0.flags="0x20" hint.pcic.0.at="isa" ==== //depot/projects/tty/sys/i386/conf/NOTES#3 (text+ko) ==== @@ -338,30 +338,6 @@ # Mandatory devices: # -# To include support for VGA VESA video modes -options VESA - -# Turn on extra debugging checks and output for VESA support. -options VESA_DEBUG - -# The pcvt console driver (vt220 compatible). -device vt -hint.vt.0.at="isa" -options XSERVER # support for running an X server on vt -options FAT_CURSOR # start with block cursor -# This PCVT option is for keyboards such as those used on really old ThinkPads -options PCVT_SCANSET=2 -# Other PCVT options are documented in pcvt(4). -options PCVT_24LINESDEF -options PCVT_CTRL_ALT_DEL -options PCVT_META_ESC -options PCVT_NSCREENS=9 -options PCVT_PRETTYSCRNS -options PCVT_SCREENSAVER -options PCVT_USEKBDSEC -options PCVT_VT220KEYB -options PCVT_GREENSAVER - # # The Numeric Processing eXtension driver. In addition to this, you # may configure a math emulator (see above). If your machine has a ==== //depot/projects/tty/sys/i386/conf/OLDCARD#3 (text+ko) ==== @@ -138,17 +138,6 @@ 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/ia64/conf/GENERIC#3 (text+ko) ==== @@ -114,12 +114,6 @@ 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 - #device agp # support several AGP chipsets # Serial (COM) ports ==== //depot/projects/tty/sys/ia64/conf/GENERIC.hints#2 (text+ko) ==== @@ -11,8 +11,6 @@ hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" -hint.vga.0.at="isa" -hint.sc.0.at="isa" hint.sio.0.at="isa" hint.sio.0.port="0x3F8" hint.sio.0.flags="0x10" 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?200302121031.h1CAVbV3040716>