diff options
author | yokota <yokota@FreeBSD.org> | 1999-06-22 14:14:06 +0000 |
---|---|---|
committer | yokota <yokota@FreeBSD.org> | 1999-06-22 14:14:06 +0000 |
commit | 4f4eb0cfe54e001639240b3b63551c42280cdcc0 (patch) | |
tree | 75738e04df5c55c7d14fd6fb083ab1062bd92a85 /sys/i386/conf | |
parent | d252fb51781d3bcdc1697ebd89678c9a00d94124 (diff) | |
download | FreeBSD-src-4f4eb0cfe54e001639240b3b63551c42280cdcc0.zip FreeBSD-src-4f4eb0cfe54e001639240b3b63551c42280cdcc0.tar.gz |
The second phase of syscons reorganization.
- Split syscons source code into manageable chunks and reorganize
some of complicated functions.
- Many static variables are moved to the softc structure.
- Added a new key function, PREV. When this key is pressed, the vty
immediately before the current vty will become foreground. Analogue
to PREV, which is usually assigned to the PrntScrn key.
PR: kern/10113
Submitted by: Christian Weisgerber <naddy@mips.rhein-neckar.de>
- Modified the kernel console input function sccngetc() so that it
handles function keys properly.
- Reorganized the screen update routine.
- VT switching code is reorganized. It now should be slightly more
robust than before.
- Added the DEVICE_RESUME function so that syscons no longer hooks the
APM resume event directly.
- New kernel configuration options: SC_NO_CUTPASTE, SC_NO_FONT_LOADING,
SC_NO_HISTORY and SC_NO_SYSMOUSE.
Various parts of syscons can be omitted so that the kernel size is
reduced.
SC_PIXEL_MODE
Made the VESA 800x600 mode an option, rather than a standard part of
syscons.
SC_DISABLE_DDBKEY
Disables the `debug' key combination.
SC_ALT_MOUSE_IMAGE
Inverse the character cell at the mouse cursor position in the text
console, rather than drawing an arrow on the screen.
Submitted by: Nick Hibma (n_hibma@FreeBSD.ORG)
SC_DFLT_FONT
makeoptions "SC_DFLT_FONT=_font_name_"
Include the named font as the default font of syscons. 16-line,
14-line and 8-line font data will be compiled in. This option replaces
the existing STD8X16FONT option, which loads 16-line font data only.
- The VGA driver is split into /sys/dev/fb/vga.c and /sys/isa/vga_isa.c.
- The video driver provides a set of ioctl commands to manipulate the
frame buffer.
- New kernel configuration option: VGA_WIDTH90
Enables 90 column modes: 90x25, 90x30, 90x43, 90x50, 90x60. These
modes are mot always supported by the video card.
PR: i386/7510
Submitted by: kbyanc@freedomnet.com and alexv@sui.gda.itesm.mx.
- The header file machine/console.h is reorganized; its contents is now
split into sys/fbio.h, sys/kbio.h (a new file) and sys/consio.h
(another new file). machine/console.h is still maintained for
compatibility reasons.
- Kernel console selection/installation routines are fixed and
slightly rebumped so that it should now be possible to switch between
the interanl kernel console (sc or vt) and a remote kernel console
(sio) again, as it was in 2.x, 3.0 and 3.1.
- Screen savers and splash screen decoders
Because of the header file reorganization described above, screen
savers and splash screen decoders are slightly modified. After this
update, /sys/modules/syscons/saver.h is no longer necessary and is
removed.
Diffstat (limited to 'sys/i386/conf')
-rw-r--r-- | sys/i386/conf/LINT | 31 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 31 | ||||
-rw-r--r-- | sys/i386/conf/files.i386 | 15 | ||||
-rw-r--r-- | sys/i386/conf/options.i386 | 21 |
4 files changed, 67 insertions, 31 deletions
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 5563146..cc51183 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.606 1999/06/15 13:14:40 des Exp $ +# $Id: LINT,v 1.607 1999/06/19 20:20:52 rnordier Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -912,6 +912,9 @@ 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 + # To include support for VESA video modes options VESA @@ -939,18 +942,20 @@ options PCVT_VT220KEYB # The syscons console driver (sco color console compatible). device sc0 at isa? options MAXCONS=16 # number of virtual consoles -options STD8X16FONT # Compile font in -makeoptions STD8X16FONT=cp850 -options SC_HISTORY_SIZE=200 # number of history buffer lines +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 -# -# `flags' for sc0: -# 0x01 Use a 'visual' bell -# 0x02 Use a 'blink' cursor -# 0x04 Use a 'underline' cursor -# 0x06 Use a 'blinking underline' (destructive) cursor -# 0x40 Make the bell quiet if it is rung in the background vty. +# You can selectively disable features in syscons. +options SC_NO_CUTPASTE +options SC_NO_FONT_LOADING +options SC_NO_HISTORY +options SC_NO_SYSMOUSE # # The Numeric Processing eXtension driver. This should be configured if @@ -2155,6 +2160,10 @@ options ULPT_DEBUG options UMASS_DEBUG options UMS_DEBUG +# options for ukbd: +options UKBD_DFLT_KEYMAP # specify the built-in keymap +makeoptions UKBD_DFLT_KEYMAP="it.iso" + # # Embedded system options: # diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 5563146..cc51183 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.606 1999/06/15 13:14:40 des Exp $ +# $Id: LINT,v 1.607 1999/06/19 20:20:52 rnordier Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -912,6 +912,9 @@ 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 + # To include support for VESA video modes options VESA @@ -939,18 +942,20 @@ options PCVT_VT220KEYB # The syscons console driver (sco color console compatible). device sc0 at isa? options MAXCONS=16 # number of virtual consoles -options STD8X16FONT # Compile font in -makeoptions STD8X16FONT=cp850 -options SC_HISTORY_SIZE=200 # number of history buffer lines +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 -# -# `flags' for sc0: -# 0x01 Use a 'visual' bell -# 0x02 Use a 'blink' cursor -# 0x04 Use a 'underline' cursor -# 0x06 Use a 'blinking underline' (destructive) cursor -# 0x40 Make the bell quiet if it is rung in the background vty. +# You can selectively disable features in syscons. +options SC_NO_CUTPASTE +options SC_NO_FONT_LOADING +options SC_NO_HISTORY +options SC_NO_SYSMOUSE # # The Numeric Processing eXtension driver. This should be configured if @@ -2155,6 +2160,10 @@ options ULPT_DEBUG options UMASS_DEBUG options UMS_DEBUG +# options for ukbd: +options UKBD_DFLT_KEYMAP # specify the built-in keymap +makeoptions UKBD_DFLT_KEYMAP="it.iso" + # # Embedded system options: # diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index 44c115c..ae19e96 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.246 1999/06/01 18:18:38 jlemon Exp $ +# $Id: files.i386,v 1.247 1999/06/18 19:55:50 green Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -19,10 +19,10 @@ linux_assym.h optional compat_linux \ no-obj no-implicit-rule before-depend \ clean "linux_assym.h" # -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" +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" # atkbdmap.h optional atkbd_dflt_keymap \ compile-with "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" \ @@ -44,14 +44,19 @@ dev/ata/atapi-tape.c optional atapist device-driver dev/fb/fb.c optional fb device-driver dev/fb/fb.c optional vga device-driver dev/fb/splash.c optional splash +dev/fb/vga.c optional vga device-driver dev/kbd/atkbd.c optional atkbd device-driver dev/kbd/atkbdc.c optional atkbdc device-driver dev/kbd/kbd.c optional atkbd device-driver dev/kbd/kbd.c optional kbd device-driver dev/kbd/kbd.c optional ukbd device-driver dev/syscons/syscons.c optional sc device-driver +dev/syscons/schistory.c optional sc device-driver +dev/syscons/scmouse.c optional sc device-driver dev/syscons/scvidctl.c optional sc device-driver dev/syscons/scvesactl.c optional sc device-driver +dev/syscons/scvgarndr.c optional sc device-driver +dev/syscons/scvtb.c optional sc device-driver i386/apm/apm.c optional apm device-driver i386/apm/apm_setup.s optional apm i386/eisa/dpt_eisa.c optional eisa dpt device-driver diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index c3aa0d9..d7cc7b4 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.116 1999/06/06 22:45:04 steve Exp $ +# $Id: options.i386,v 1.117 1999/06/15 13:14:43 des Exp $ DISABLE_PSE IDE_DELAY @@ -65,17 +65,30 @@ I586_CPU opt_global.h I686_CPU opt_global.h MAXCONS opt_syscons.h -STD8X16FONT opt_syscons.h -SC_HISTORY_SIZE opt_syscons.h +SC_ALT_MOUSE_IMAGE 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_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_PIXEL_MODE opt_syscons.h +SC_RENDER_DEBUG opt_syscons.h +SC_VIDEO_DEBUG opt_syscons.h + +FB_DEBUG opt_fb.h FB_INSTALL_CDEV opt_fb.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 |