d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark the syscons and pcvt drivers as being allowed to conflict, so that

Browse Source 
well-meaning but uneducated users don't exterminate the psm driver in
their zeal to achieve zero conflicts.
This commit is contained in:
msmith 1998-09-17 03:15:30 +00:00
parent c52c9de83f
commit 0af76e6657
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/amd64/conf/GENERIC
View File

@ -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.115 1998/09/04 19:55:51 msmith Exp $
# $Id: GENERIC,v 1.116 1998/09/15 10:01:12 gibbs Exp $
machine "i386"
cpu "I386_CPU"
@ -109,9 +109,9 @@ controller matcd0 at isa? port 0x230 bio
device scd0 at isa? port 0x230 bio
# syscons is the default console driver, resembling an SCO console
device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr
device sc0 at isa? port "IO_KBD" conflicts 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
#device vt0 at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
#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

6
sys/conf/NOTES
View File

@ -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.465 1998/09/15 11:44:43 phk Exp $
# $Id: LINT,v 1.466 1998/09/15 18:16:36 sos 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
@ -787,14 +787,14 @@ options PPS_SYNC
controller pnp0
# The pcvt console driver (vt220 compatible).
device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint
device vt0 at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
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
options PCVT_SCANSET=2 # IBM keyboards are non-std
# The syscons console driver (sco color console compatible).
device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr
device sc0 at isa? port "IO_KBD" conflicts tty irq 1 vector scintr
options MAXCONS=16 # number of virtual consoles
options SLOW_VGA # do byte-wide i/o's to TS and GDC regs
options "STD8X16FONT" # Compile font in

6
sys/i386/conf/GENERIC
View File

@ -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.115 1998/09/04 19:55:51 msmith Exp $
# $Id: GENERIC,v 1.116 1998/09/15 10:01:12 gibbs Exp $
machine "i386"
cpu "I386_CPU"
@ -109,9 +109,9 @@ controller matcd0 at isa? port 0x230 bio
device scd0 at isa? port 0x230 bio
# syscons is the default console driver, resembling an SCO console
device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr
device sc0 at isa? port "IO_KBD" conflicts 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
#device vt0 at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
#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

6
sys/i386/conf/LINT
View File

@ -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.465 1998/09/15 11:44:43 phk Exp $
# $Id: LINT,v 1.466 1998/09/15 18:16:36 sos 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
@ -787,14 +787,14 @@ options PPS_SYNC
controller pnp0
# The pcvt console driver (vt220 compatible).
device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint
device vt0 at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
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
options PCVT_SCANSET=2 # IBM keyboards are non-std
# The syscons console driver (sco color console compatible).
device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr
device sc0 at isa? port "IO_KBD" conflicts tty irq 1 vector scintr
options MAXCONS=16 # number of virtual consoles
options SLOW_VGA # do byte-wide i/o's to TS and GDC regs
options "STD8X16FONT" # Compile font in

6
sys/i386/conf/NOTES
View File

@ -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.465 1998/09/15 11:44:43 phk Exp $
# $Id: LINT,v 1.466 1998/09/15 18:16:36 sos 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
@ -787,14 +787,14 @@ options PPS_SYNC
controller pnp0
# The pcvt console driver (vt220 compatible).
device vt0 at isa? port "IO_KBD" tty irq 1 vector pcrint
device vt0 at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
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
options PCVT_SCANSET=2 # IBM keyboards are non-std
# The syscons console driver (sco color console compatible).
device sc0 at isa? port "IO_KBD" tty irq 1 vector scintr
device sc0 at isa? port "IO_KBD" conflicts tty irq 1 vector scintr
options MAXCONS=16 # number of virtual consoles
options SLOW_VGA # do byte-wide i/o's to TS and GDC regs
options "STD8X16FONT" # Compile font in