summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/amd64/conf/GENERIC10
-rw-r--r--sys/conf/NOTES16
-rw-r--r--sys/i386/conf/GENERIC10
-rw-r--r--sys/i386/conf/GENERICupgrade10
-rw-r--r--sys/i386/conf/LINT16
-rw-r--r--sys/i386/conf/LKM6
-rw-r--r--sys/i386/conf/NOTES16
-rw-r--r--sys/i386/conf/PCCARD8
-rw-r--r--sys/i386/conf/SMP-GENERIC10
9 files changed, 51 insertions, 51 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 9f65bdf..6b4dddc 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.126 1998/10/18 16:24:32 wpaul Exp $
+# $Id: GENERIC,v 1.127 1998/10/22 12:23:03 bde Exp $
machine "i386"
cpu "I386_CPU"
@@ -109,15 +109,15 @@ 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" conflicts tty irq 1
+device sc0 at isa? port IO_KBD conflicts tty irq 1
# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
-#device vt0 at isa? port "IO_KBD" conflicts tty irq 1
+#device vt0 at isa? port IO_KBD conflicts tty irq 1
#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
#options PCVT_SCANSET=2 # IBM keyboards are non-std
-device npx0 at isa? port "IO_NPX" irq 13
+device npx0 at isa? port IO_NPX irq 13
#
# Laptop support (see LINT for more options)
@@ -136,7 +136,7 @@ device sio3 at isa? disable port "IO_COM4" tty irq 9
device lpt0 at isa? port? tty irq 7
-device psm0 at isa? port "IO_KBD" conflicts tty irq 12
+device psm0 at isa? port IO_KBD conflicts tty irq 12
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e834963..7b54db6 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.489 1998/10/18 16:24:32 wpaul Exp $
+# $Id: LINT,v 1.490 1998/10/22 12:23:04 bde 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
@@ -798,14 +798,14 @@ options PPS_SYNC
controller pnp0
# The pcvt console driver (vt220 compatible).
-device vt0 at isa? port "IO_KBD" conflicts tty irq 1
+device vt0 at isa? port IO_KBD conflicts tty irq 1
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" conflicts tty irq 1
+device sc0 at isa? port IO_KBD conflicts tty irq 1
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
@@ -838,7 +838,7 @@ options VESA # needs VM86 defined too!!
# buggy. If it is not configured then you *must* configure math emulation
# (see above). If both npx0 and emulation are configured, then only npx0
# is used (provided it works).
-device npx0 at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13
+device npx0 at isa? port IO_NPX iosiz 0x0 flags 0x0 irq 13
#
# `flags' for npx0:
@@ -1024,7 +1024,7 @@ tape ft0 at fdc0 drive 2
device lpt0 at isa? port? tty irq 7
device lpt1 at isa? port "IO_LPT3" tty irq 5
device mse0 at isa? port 0x23c tty irq 5
-device psm0 at isa? port "IO_KBD" conflicts tty irq 12
+device psm0 at isa? port IO_KBD conflicts tty irq 12
# Options for psm:
options PSM_HOOKAPM #hook the APM resume event, useful
@@ -1218,7 +1218,7 @@ device uart0 at isa? port 0x330 irq 5
#device pcm0 at isa? port ? tty irq 10 drq 1 flags 0x0
# Not controlled by `snd'
-device pca0 at isa? port IO_TIMER1 tty
+device pca0 at isa? port "IO_TIMER1" tty
#
# Miscellaneous hardware:
@@ -1337,7 +1337,7 @@ device spigot0 at isa? port 0xad6 irq 15 iomem 0xee000
device apm0 at isa?
device gp0 at isa? port 0x2c0 tty
device gsc0 at isa? port "IO_GSC1" tty drq 3
-device joy0 at isa? port "IO_GAME"
+device joy0 at isa? port IO_GAME
device alog0 at isa? port 0x260 tty irq 5
device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000
device dgb0 at isa? port 0x220 iomem 0xfc0000 iosiz ? tty
@@ -1348,7 +1348,7 @@ device rp0 at isa? port 0x280 tty
# the port and irq for tw0 are fictitious
device tw0 at isa? port 0x380 tty irq 11
device si0 at isa? iomem 0xd0000 tty irq 12
-device asc0 at isa? port IO_ASC1 tty drq 3 irq 10
+device asc0 at isa? port "IO_ASC1" tty drq 3 irq 10
device bqu0 at isa? port 0x150
device stl0 at isa? port 0x2a0 tty irq 10
device stli0 at isa? port 0x2a0 tty iomem 0xcc000 flags 23 iosiz 0x1000
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 9f65bdf..6b4dddc 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.126 1998/10/18 16:24:32 wpaul Exp $
+# $Id: GENERIC,v 1.127 1998/10/22 12:23:03 bde Exp $
machine "i386"
cpu "I386_CPU"
@@ -109,15 +109,15 @@ 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" conflicts tty irq 1
+device sc0 at isa? port IO_KBD conflicts tty irq 1
# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
-#device vt0 at isa? port "IO_KBD" conflicts tty irq 1
+#device vt0 at isa? port IO_KBD conflicts tty irq 1
#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
#options PCVT_SCANSET=2 # IBM keyboards are non-std
-device npx0 at isa? port "IO_NPX" irq 13
+device npx0 at isa? port IO_NPX irq 13
#
# Laptop support (see LINT for more options)
@@ -136,7 +136,7 @@ device sio3 at isa? disable port "IO_COM4" tty irq 9
device lpt0 at isa? port? tty irq 7
-device psm0 at isa? port "IO_KBD" conflicts tty irq 12
+device psm0 at isa? port IO_KBD conflicts tty irq 12
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
diff --git a/sys/i386/conf/GENERICupgrade b/sys/i386/conf/GENERICupgrade
index c7a66b6..49d2d2f 100644
--- a/sys/i386/conf/GENERICupgrade
+++ b/sys/i386/conf/GENERICupgrade
@@ -8,7 +8,7 @@
# being perfomed on a machine for which this config file is inappropriate,
# it should be replaced with a suitable one prior to performing the upgrade.
#
-# $Id: GENERICupgrade,v 1.4 1998/10/18 16:24:32 wpaul Exp $
+# $Id: GENERICupgrade,v 1.5 1998/10/22 12:23:04 bde Exp $
machine "i386"
cpu "I386_CPU"
@@ -105,15 +105,15 @@ 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" conflicts tty irq 1
+device sc0 at isa? port IO_KBD conflicts tty irq 1
# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
-#device vt0 at isa? port "IO_KBD" conflicts tty irq 1
+#device vt0 at isa? port IO_KBD conflicts tty irq 1
#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
#options PCVT_SCANSET=2 # IBM keyboards are non-std
-device npx0 at isa? port "IO_NPX" irq 13
+device npx0 at isa? port IO_NPX irq 13
#
# Laptop support (see LINT for more options)
@@ -134,7 +134,7 @@ device lpt0 at isa? port? tty irq 7
device lpt1 at isa? port? tty
device mse0 at isa? port 0x23c tty irq 5
-device psm0 at isa? port "IO_KBD" conflicts tty irq 12
+device psm0 at isa? port IO_KBD conflicts tty irq 12
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index e834963..7b54db6 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.489 1998/10/18 16:24:32 wpaul Exp $
+# $Id: LINT,v 1.490 1998/10/22 12:23:04 bde 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
@@ -798,14 +798,14 @@ options PPS_SYNC
controller pnp0
# The pcvt console driver (vt220 compatible).
-device vt0 at isa? port "IO_KBD" conflicts tty irq 1
+device vt0 at isa? port IO_KBD conflicts tty irq 1
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" conflicts tty irq 1
+device sc0 at isa? port IO_KBD conflicts tty irq 1
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
@@ -838,7 +838,7 @@ options VESA # needs VM86 defined too!!
# buggy. If it is not configured then you *must* configure math emulation
# (see above). If both npx0 and emulation are configured, then only npx0
# is used (provided it works).
-device npx0 at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13
+device npx0 at isa? port IO_NPX iosiz 0x0 flags 0x0 irq 13
#
# `flags' for npx0:
@@ -1024,7 +1024,7 @@ tape ft0 at fdc0 drive 2
device lpt0 at isa? port? tty irq 7
device lpt1 at isa? port "IO_LPT3" tty irq 5
device mse0 at isa? port 0x23c tty irq 5
-device psm0 at isa? port "IO_KBD" conflicts tty irq 12
+device psm0 at isa? port IO_KBD conflicts tty irq 12
# Options for psm:
options PSM_HOOKAPM #hook the APM resume event, useful
@@ -1218,7 +1218,7 @@ device uart0 at isa? port 0x330 irq 5
#device pcm0 at isa? port ? tty irq 10 drq 1 flags 0x0
# Not controlled by `snd'
-device pca0 at isa? port IO_TIMER1 tty
+device pca0 at isa? port "IO_TIMER1" tty
#
# Miscellaneous hardware:
@@ -1337,7 +1337,7 @@ device spigot0 at isa? port 0xad6 irq 15 iomem 0xee000
device apm0 at isa?
device gp0 at isa? port 0x2c0 tty
device gsc0 at isa? port "IO_GSC1" tty drq 3
-device joy0 at isa? port "IO_GAME"
+device joy0 at isa? port IO_GAME
device alog0 at isa? port 0x260 tty irq 5
device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000
device dgb0 at isa? port 0x220 iomem 0xfc0000 iosiz ? tty
@@ -1348,7 +1348,7 @@ device rp0 at isa? port 0x280 tty
# the port and irq for tw0 are fictitious
device tw0 at isa? port 0x380 tty irq 11
device si0 at isa? iomem 0xd0000 tty irq 12
-device asc0 at isa? port IO_ASC1 tty drq 3 irq 10
+device asc0 at isa? port "IO_ASC1" tty drq 3 irq 10
device bqu0 at isa? port 0x150
device stl0 at isa? port 0x2a0 tty irq 10
device stli0 at isa? port 0x2a0 tty iomem 0xcc000 flags 23 iosiz 0x1000
diff --git a/sys/i386/conf/LKM b/sys/i386/conf/LKM
index e0e6b21..d29ac86 100644
--- a/sys/i386/conf/LKM
+++ b/sys/i386/conf/LKM
@@ -2,7 +2,7 @@
# LKM - verification kernel for LKMs. This is not intended to be run
# on any real hardware, only to make it possible to test-link LKMs.
#
-# $Id: LKM,v 1.1 1998/03/12 20:00:21 eivind Exp $
+# $Id: LKM,v 1.2 1998/10/22 12:23:04 bde Exp $
#
##
@@ -23,7 +23,7 @@ options FFS
# missing NPX...
controller isa0
# npx is mandated by config(8)
-device npx0 at isa? port "IO_NPX" irq 13
+device npx0 at isa? port IO_NPX irq 13
##
# Requirements for various LKMs
@@ -65,7 +65,7 @@ device sio0 at isa? port "IO_COM1" tty irq 4
#
# For the screensavers
#
-device sc0 at isa? port "IO_KBD" tty irq 1
+device sc0 at isa? port IO_KBD tty irq 1
#
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index e834963..7b54db6 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.489 1998/10/18 16:24:32 wpaul Exp $
+# $Id: LINT,v 1.490 1998/10/22 12:23:04 bde 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
@@ -798,14 +798,14 @@ options PPS_SYNC
controller pnp0
# The pcvt console driver (vt220 compatible).
-device vt0 at isa? port "IO_KBD" conflicts tty irq 1
+device vt0 at isa? port IO_KBD conflicts tty irq 1
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" conflicts tty irq 1
+device sc0 at isa? port IO_KBD conflicts tty irq 1
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
@@ -838,7 +838,7 @@ options VESA # needs VM86 defined too!!
# buggy. If it is not configured then you *must* configure math emulation
# (see above). If both npx0 and emulation are configured, then only npx0
# is used (provided it works).
-device npx0 at isa? port "IO_NPX" iosiz 0x0 flags 0x0 irq 13
+device npx0 at isa? port IO_NPX iosiz 0x0 flags 0x0 irq 13
#
# `flags' for npx0:
@@ -1024,7 +1024,7 @@ tape ft0 at fdc0 drive 2
device lpt0 at isa? port? tty irq 7
device lpt1 at isa? port "IO_LPT3" tty irq 5
device mse0 at isa? port 0x23c tty irq 5
-device psm0 at isa? port "IO_KBD" conflicts tty irq 12
+device psm0 at isa? port IO_KBD conflicts tty irq 12
# Options for psm:
options PSM_HOOKAPM #hook the APM resume event, useful
@@ -1218,7 +1218,7 @@ device uart0 at isa? port 0x330 irq 5
#device pcm0 at isa? port ? tty irq 10 drq 1 flags 0x0
# Not controlled by `snd'
-device pca0 at isa? port IO_TIMER1 tty
+device pca0 at isa? port "IO_TIMER1" tty
#
# Miscellaneous hardware:
@@ -1337,7 +1337,7 @@ device spigot0 at isa? port 0xad6 irq 15 iomem 0xee000
device apm0 at isa?
device gp0 at isa? port 0x2c0 tty
device gsc0 at isa? port "IO_GSC1" tty drq 3
-device joy0 at isa? port "IO_GAME"
+device joy0 at isa? port IO_GAME
device alog0 at isa? port 0x260 tty irq 5
device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000
device dgb0 at isa? port 0x220 iomem 0xfc0000 iosiz ? tty
@@ -1348,7 +1348,7 @@ device rp0 at isa? port 0x280 tty
# the port and irq for tw0 are fictitious
device tw0 at isa? port 0x380 tty irq 11
device si0 at isa? iomem 0xd0000 tty irq 12
-device asc0 at isa? port IO_ASC1 tty drq 3 irq 10
+device asc0 at isa? port "IO_ASC1" tty drq 3 irq 10
device bqu0 at isa? port 0x150
device stl0 at isa? port 0x2a0 tty irq 10
device stli0 at isa? port 0x2a0 tty iomem 0xcc000 flags 23 iosiz 0x1000
diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD
index 5c36505..369c363 100644
--- a/sys/i386/conf/PCCARD
+++ b/sys/i386/conf/PCCARD
@@ -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: PCCARD,v 1.7 1998/09/30 03:48:23 gibbs Exp $
+# $Id: PCCARD,v 1.8 1998/10/22 12:23:04 bde Exp $
machine "i386"
cpu "I386_CPU"
@@ -64,9 +64,9 @@ device wcd0 #IDE CD-ROM
#device cd0 #Only need one of these, the code dynamically grows
# syscons is the default console driver, resembling an SCO console
-device sc0 at isa? port "IO_KBD" tty irq 1
+device sc0 at isa? port IO_KBD tty irq 1
-device npx0 at isa? port "IO_NPX" irq 13
+device npx0 at isa? port IO_NPX irq 13
#
# Laptop support (see LINT for more options)
@@ -87,7 +87,7 @@ device sio3 at isa? disable port "IO_COM4" tty irq 9
device lpt0 at isa? port? tty irq 7
-device psm0 at isa? port "IO_KBD" conflicts tty irq 12
+device psm0 at isa? port IO_KBD conflicts tty irq 12
options PSM_HOOKAPM #hook the APM resume event
options PSM_RESETAFTERSUSPEND #reset the device at the resume event
diff --git a/sys/i386/conf/SMP-GENERIC b/sys/i386/conf/SMP-GENERIC
index 228a64e..ec1bea1 100644
--- a/sys/i386/conf/SMP-GENERIC
+++ b/sys/i386/conf/SMP-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: SMP-GENERIC,v 1.18 1998/10/18 16:24:32 wpaul Exp $
+# $Id: SMP-GENERIC,v 1.19 1998/10/22 12:23:04 bde Exp $
machine "i386"
# SMP does NOT support 386/486 CPUs.
@@ -126,15 +126,15 @@ 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" conflicts tty irq 1
+device sc0 at isa? port IO_KBD conflicts tty irq 1
# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
-#device vt0 at isa? port "IO_KBD" conflicts tty irq 1
+#device vt0 at isa? port IO_KBD conflicts tty irq 1
#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
#options PCVT_SCANSET=2 # IBM keyboards are non-std
-device npx0 at isa? port "IO_NPX" irq 13
+device npx0 at isa? port IO_NPX irq 13
#
# Laptop support (see LINT for more options)
@@ -153,7 +153,7 @@ device sio3 at isa? disable port "IO_COM4" tty irq 9
device lpt0 at isa? port? tty irq 7
-device psm0 at isa? port "IO_KBD" conflicts tty irq 12
+device psm0 at isa? port IO_KBD conflicts tty irq 12
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
OpenPOWER on IntegriCloud