diff options
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/conf/NOTES | 3 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 21 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 3 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 3 | ||||
| -rw-r--r-- | sys/i386/conf/options.i386 | 21 | ||||
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_hdr.h | 3 |
8 files changed, 40 insertions, 20 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index d52b3d8..21666fb 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.96 1997/09/22 00:37:08 gibbs Exp $ +# $Id: GENERIC,v 1.97 1997/10/08 17:05:03 nate Exp $ machine "i386" cpu "I386_CPU" @@ -96,7 +96,6 @@ device scd0 at isa? port 0x230 bio device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver #device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -#options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 #options XSERVER # support for X server #options FAT_CURSOR # start with block cursor # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines diff --git a/sys/conf/NOTES b/sys/conf/NOTES index f8f873a..880e7a1 100644 --- a/sys/conf/NOTES +++ b/sys/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.373 1997/10/18 01:24:20 peter Exp $ +# $Id: LINT,v 1.374 1997/10/18 10:10:36 peter 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 @@ -663,7 +663,6 @@ controller pnp0 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 options XSERVER # support for running an X server. options FAT_CURSOR # start with block cursor # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index b2446a5..15ca6cd 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.60 1997/09/19 15:25:49 jmg Exp $ +# $Id: options.i386,v 1.61 1997/10/10 09:43:56 peter Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -26,12 +26,8 @@ DSI_SOFT_MODEM opt_sio.h EXTRA_SIO opt_sio.h I586_CTR_GUPROF opt_i586_guprof.h I586_PMC_GUPROF opt_i586_guprof.h -FAT_CURSOR opt_pcvt.h -PCVT_FREEBSD opt_pcvt.h -PCVT_SCANSET opt_pcvt.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h -XSERVER opt_pcvt.h # These two SMP options have dramatic implications all over the kernel SMP opt_global.h @@ -104,3 +100,18 @@ EISA_SLOTS opt_eisa.h FDC_DEBUG opt_fdc.h FDC_PRINT_BOGUS_CHIPTYPE opt_fdc.h + +# pcvt(4) has a bunch of options +FAT_CURSOR opt_pcvt.h +XSERVER opt_pcvt.h +PCVT_24LINESDEF opt_pcvt.h +PCVT_CTRL_ALT_DEL opt_pcvt.h +PCVT_EMU_MOUSE opt_pcvt.h +PCVT_FREEBSD opt_pcvt.h +PCVT_META_ESC opt_pcvt.h +PCVT_NSCREENS opt_pcvt.h +PCVT_PRETTYSCRNS opt_pcvt.h +PCVT_SCANSET opt_pcvt.h +PCVT_SCREENSAVER opt_pcvt.h +PCVT_USEKBDSEC opt_pcvt.h +PCVT_VT220KEYB opt_pcvt.h diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index d52b3d8..21666fb 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.96 1997/09/22 00:37:08 gibbs Exp $ +# $Id: GENERIC,v 1.97 1997/10/08 17:05:03 nate Exp $ machine "i386" cpu "I386_CPU" @@ -96,7 +96,6 @@ device scd0 at isa? port 0x230 bio device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver #device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -#options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 #options XSERVER # support for X server #options FAT_CURSOR # start with block cursor # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index f8f873a..880e7a1 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.373 1997/10/18 01:24:20 peter Exp $ +# $Id: LINT,v 1.374 1997/10/18 10:10:36 peter 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 @@ -663,7 +663,6 @@ controller pnp0 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 options XSERVER # support for running an X server. options FAT_CURSOR # start with block cursor # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index f8f873a..880e7a1 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.373 1997/10/18 01:24:20 peter Exp $ +# $Id: LINT,v 1.374 1997/10/18 10:10:36 peter 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 @@ -663,7 +663,6 @@ controller pnp0 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint -options PCVT_FREEBSD=210 # pcvt running on FreeBSD >= 2.0.5 options XSERVER # support for running an X server. options FAT_CURSOR # start with block cursor # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index b2446a5..15ca6cd 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.60 1997/09/19 15:25:49 jmg Exp $ +# $Id: options.i386,v 1.61 1997/10/10 09:43:56 peter Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -26,12 +26,8 @@ DSI_SOFT_MODEM opt_sio.h EXTRA_SIO opt_sio.h I586_CTR_GUPROF opt_i586_guprof.h I586_PMC_GUPROF opt_i586_guprof.h -FAT_CURSOR opt_pcvt.h -PCVT_FREEBSD opt_pcvt.h -PCVT_SCANSET opt_pcvt.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h -XSERVER opt_pcvt.h # These two SMP options have dramatic implications all over the kernel SMP opt_global.h @@ -104,3 +100,18 @@ EISA_SLOTS opt_eisa.h FDC_DEBUG opt_fdc.h FDC_PRINT_BOGUS_CHIPTYPE opt_fdc.h + +# pcvt(4) has a bunch of options +FAT_CURSOR opt_pcvt.h +XSERVER opt_pcvt.h +PCVT_24LINESDEF opt_pcvt.h +PCVT_CTRL_ALT_DEL opt_pcvt.h +PCVT_EMU_MOUSE opt_pcvt.h +PCVT_FREEBSD opt_pcvt.h +PCVT_META_ESC opt_pcvt.h +PCVT_NSCREENS opt_pcvt.h +PCVT_PRETTYSCRNS opt_pcvt.h +PCVT_SCANSET opt_pcvt.h +PCVT_SCREENSAVER opt_pcvt.h +PCVT_USEKBDSEC opt_pcvt.h +PCVT_VT220KEYB opt_pcvt.h diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index 3578109..70c2891 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -67,6 +67,9 @@ /* see also: pcvt_ioctl.h */ #include "opt_pcvt.h" +#if defined(__FreeBSD__) && !defined(PCVT_FREEBSD) +# define PCVT_FREEBSD 210 +#endif #if PCVT_FREEBSD >= 200 |
