De-quote.

2 files changed, 38 insertions, 40 deletions

diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index a03b575..35dafc6 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -11,21 +11,21 @@
 # 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: GENERIC98,v 1.71 1999/04/18 14:42:14 kato Exp $
+#	$Id: GENERIC98,v 1.72 1999/04/20 09:06:03 kato Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
-machine		"pc98"
-cpu		"I386_CPU"
-cpu		"I486_CPU"
-cpu		"I586_CPU"
-cpu		"I686_CPU"
-ident		"GENERIC98"
+machine		pc98
+cpu		I386_CPU
+cpu		I486_CPU
+cpu		I586_CPU
+cpu		I686_CPU
+ident		GENERIC98
 maxusers	32
 
-#makeoptions	DEBUG="-g"		#Build kernel with gdb(1) debug symbols
+#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
-options		"PC98"			#PC98
+options		PC98			#PC98
 options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
@@ -35,15 +35,15 @@ options		MFS_ROOT		#MFS usable as root device, "MFS" req'ed
 options		NFS			#Network Filesystem
 options		NFS_ROOT		#NFS usable as root device, "NFS" req'ed
 options		MSDOSFS			#MSDOS Filesystem
-options		"CD9660"		#ISO 9660 Filesystem
-options		"CD9660_ROOT"		#CD-ROM usable as root. "CD9660" req'ed
+options		CD9660			#ISO 9660 Filesystem
+options		CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
 options		PROCFS			#Process filesystem
-options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
+options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
 options		EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
 #options		EPSON_MEMWIN		#EPSON memory window support
 options		UCONSOLE		#Allow users to grab the console
-#options		"LINE30"
+#options		LINE30
 options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
 options		VISUAL_USERCONFIG	#visual boot -c editor
@@ -69,14 +69,13 @@ controller	isa0	at nexus?
 controller	pnp0			# PnP support for ISA
 controller	pci0	at nexus?
 
-controller	fdc0	at isa? port "IO_FD1" bio irq 11 drq 2
+controller	fdc0	at isa? port IO_FD1 bio irq 11 drq 2
 disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 disk		fd2	at fdc0 drive 2
 disk		fd3	at fdc0 drive 3
 
-# options		"CMD640"	# work around CMD640 chip deficiency
-controller	wdc0	at isa? port "IO_WD1" bio irq 9
+controller	wdc0	at isa? port IO_WD1 bio irq 9
 disk		wd0	at wdc0 drive 0
 #disk		wd1	at wdc0 drive 1
 #disk		wd2	at wdc0 drive 2
@@ -150,12 +149,12 @@ device		apm0    at nexus? disable flags 0x31 # Advanced Power Management
 # Serial Interface
 #
 # COM1
-device		sio0	at isa? port "IO_COM1" tty irq 4
+device		sio0	at isa? port IO_COM1 tty irq 4
 # COM2 (2nd CCU)
 device		sio1	at isa? port 0x238 tty irq 5 flags 0x12000000
 # PC-9861K, PC-9801-101, MDC-926Rs
-#device		sio1	at isa? port "IO_COM2" tty irq 5 flags 0x01000000
-#device		sio2	at isa? port "IO_COM3" tty irq 6 flags 0x02000000
+#device		sio1	at isa? port IO_COM2 tty irq 5 flags 0x01000000
+#device		sio2	at isa? port IO_COM3 tty irq 6 flags 0x02000000
 # PC-9801-120 (PnP off)
 #device		sio1	at isa? port 0x8b0 tty irq 5 flags 0x11000000
 # MC-16550II, MC-RS98
@@ -227,7 +226,7 @@ device fe1 at isa? port 0x73d0 net irq 5
 device lnc0 at isa? port 0x03d0 net irq 6
 #device zp0 at isa? port 0x00d0 net irq 10 iomem 0xe0000
 
-options "FE_8BIT_SUPPORT"	# LAC-98 support
+options FE_8BIT_SUPPORT		# LAC-98 support
 
 #controller	snd0
 #device	sb0	at isa? port 0x20d2 irq 10 conflicts drq 3
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index a03b575..35dafc6 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -11,21 +11,21 @@
 # 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: GENERIC98,v 1.71 1999/04/18 14:42:14 kato Exp $
+#	$Id: GENERIC98,v 1.72 1999/04/20 09:06:03 kato Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
-machine		"pc98"
-cpu		"I386_CPU"
-cpu		"I486_CPU"
-cpu		"I586_CPU"
-cpu		"I686_CPU"
-ident		"GENERIC98"
+machine		pc98
+cpu		I386_CPU
+cpu		I486_CPU
+cpu		I586_CPU
+cpu		I686_CPU
+ident		GENERIC98
 maxusers	32
 
-#makeoptions	DEBUG="-g"		#Build kernel with gdb(1) debug symbols
+#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
-options		"PC98"			#PC98
+options		PC98			#PC98
 options		MATH_EMULATE		#Support for x87 emulation
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
@@ -35,15 +35,15 @@ options		MFS_ROOT		#MFS usable as root device, "MFS" req'ed
 options		NFS			#Network Filesystem
 options		NFS_ROOT		#NFS usable as root device, "NFS" req'ed
 options		MSDOSFS			#MSDOS Filesystem
-options		"CD9660"		#ISO 9660 Filesystem
-options		"CD9660_ROOT"		#CD-ROM usable as root. "CD9660" req'ed
+options		CD9660			#ISO 9660 Filesystem
+options		CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
 options		PROCFS			#Process filesystem
-options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
+options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
 options		EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
 #options		EPSON_MEMWIN		#EPSON memory window support
 options		UCONSOLE		#Allow users to grab the console
-#options		"LINE30"
+#options		LINE30
 options		FAILSAFE		#Be conservative
 options		USERCONFIG		#boot -c editor
 options		VISUAL_USERCONFIG	#visual boot -c editor
@@ -69,14 +69,13 @@ controller	isa0	at nexus?
 controller	pnp0			# PnP support for ISA
 controller	pci0	at nexus?
 
-controller	fdc0	at isa? port "IO_FD1" bio irq 11 drq 2
+controller	fdc0	at isa? port IO_FD1 bio irq 11 drq 2
 disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 disk		fd2	at fdc0 drive 2
 disk		fd3	at fdc0 drive 3
 
-# options		"CMD640"	# work around CMD640 chip deficiency
-controller	wdc0	at isa? port "IO_WD1" bio irq 9
+controller	wdc0	at isa? port IO_WD1 bio irq 9
 disk		wd0	at wdc0 drive 0
 #disk		wd1	at wdc0 drive 1
 #disk		wd2	at wdc0 drive 2
@@ -150,12 +149,12 @@ device		apm0    at nexus? disable flags 0x31 # Advanced Power Management
 # Serial Interface
 #
 # COM1
-device		sio0	at isa? port "IO_COM1" tty irq 4
+device		sio0	at isa? port IO_COM1 tty irq 4
 # COM2 (2nd CCU)
 device		sio1	at isa? port 0x238 tty irq 5 flags 0x12000000
 # PC-9861K, PC-9801-101, MDC-926Rs
-#device		sio1	at isa? port "IO_COM2" tty irq 5 flags 0x01000000
-#device		sio2	at isa? port "IO_COM3" tty irq 6 flags 0x02000000
+#device		sio1	at isa? port IO_COM2 tty irq 5 flags 0x01000000
+#device		sio2	at isa? port IO_COM3 tty irq 6 flags 0x02000000
 # PC-9801-120 (PnP off)
 #device		sio1	at isa? port 0x8b0 tty irq 5 flags 0x11000000
 # MC-16550II, MC-RS98
@@ -227,7 +226,7 @@ device fe1 at isa? port 0x73d0 net irq 5
 device lnc0 at isa? port 0x03d0 net irq 6
 #device zp0 at isa? port 0x00d0 net irq 10 iomem 0xe0000
 
-options "FE_8BIT_SUPPORT"	# LAC-98 support
+options FE_8BIT_SUPPORT		# LAC-98 support
 
 #controller	snd0
 #device	sb0	at isa? port 0x20d2 irq 10 conflicts drq 3