From f89f94ea93e74b8f6a09a8327a3a7537a6f674c9 Mon Sep 17 00:00:00 2001 From: bde Date: Thu, 22 Oct 1998 13:49:51 +0000 Subject: Quote port names that have a digit in them. IO_TIMER1 was lexed as { port_name = "IO_TIMER", port_number = 1 } and only worked because it was reassembled to "IO_TIMER1". Trailing digits always work, but this is too magic to depend on. Don't quote port names that don't have a digit in them. --- sys/amd64/conf/GENERIC | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/amd64/conf') 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. -- cgit v1.1