Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys - replace "defopt" with "defparam" for options which mus...
details: https://anonhg.NetBSD.org/src/rev/0519d02dceae
branches: trunk
changeset: 517857:0519d02dceae
user: lukem <lukem%NetBSD.org@localhost>
date: Tue Nov 20 14:34:18 2001 +0000
description:
- replace "defopt" with "defparam" for options which must take a value,
as config(8) will warn for value-less defparam options
- minor whitespace/formatting cleanup
- consolidate opt_tcp_recvspace.h and opt_tcp_sendspace.h into opt_tcp_space.h
diffstat:
sys/arch/algor/conf/files.algor | 12 +-
sys/arch/alpha/conf/files.alpha | 8 +-
sys/arch/amiga/conf/files.amiga | 7 +-
sys/arch/amigappc/conf/files.amigappc | 5 +-
sys/arch/dreamcast/conf/files.dreamcast | 8 +-
sys/arch/dreamcast/conf/files.shbus | 14 ++-
sys/arch/evbsh3/conf/files.evbsh3 | 8 +-
sys/arch/evbsh3/conf/files.shbus | 14 ++-
sys/arch/hp300/conf/files.hp300 | 6 +-
sys/arch/hpcmips/conf/files.hpcmips | 24 +++---
sys/arch/hpcmips/dev/apm/files.apm | 15 ++--
sys/arch/hpcsh/conf/files.shbus | 8 +-
sys/arch/i386/conf/files.i386 | 24 +++---
sys/arch/mmeye/conf/files.mmeye | 4 +-
sys/arch/mmeye/conf/files.shbus | 8 +-
sys/arch/playstation2/conf/files.playstation2 | 7 +-
sys/arch/powerpc/conf/files.powerpc | 3 +-
sys/arch/prep/conf/files.prep | 8 +-
sys/arch/sgimips/conf/files.sgimips | 4 +-
sys/arch/sh3/conf/files.sh3 | 4 +-
sys/arch/vax/conf/files.vax | 10 +-
sys/arch/x68k/conf/files.x68k | 7 +-
sys/arch/x86_64/conf/files.x86_64 | 6 +-
sys/conf/files | 85 +++++++++++++-------------
sys/dev/acpi/files.acpi | 4 +-
sys/dev/hpc/files.hpckbd | 4 +-
sys/dev/isa/files.isa | 4 +-
sys/dev/mii/files.mii | 4 +-
sys/dev/pckbc/files.pckbc | 4 +-
sys/dev/rcons/files.rcons | 6 +-
sys/dev/scsipi/files.scsipi | 8 +-
sys/dev/wscons/files.wscons | 22 +++---
sys/netinet/tcp_usrreq.c | 7 +-
33 files changed, 189 insertions(+), 173 deletions(-)
diffs (truncated from 966 to 300 lines):
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/algor/conf/files.algor
--- a/sys/arch/algor/conf/files.algor Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/algor/conf/files.algor Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.algor,v 1.8 2001/11/20 12:56:18 lukem Exp $
+# $NetBSD: files.algor,v 1.9 2001/11/20 14:34:18 lukem Exp $
# Algorithmics evaluation board specific configuration info.
@@ -13,8 +13,8 @@
defopt ALGOR_P6032 # Algorithmics P-6032
# Various items that a buggy PMON might not provide us.
-defopt MEMSIZE
-defopt ETHADDR
+defparam MEMSIZE
+defparam ETHADDR
# Platform support files
file arch/algor/algor/algor_p4032_bus_io.c algor_p4032
@@ -165,9 +165,9 @@
file arch/algor/isa/isapnp_machdep.c isapnp
# PCIC pcmcia controller
-defopt PCIC_ISA_ALLOC_IOBASE
-defopt PCIC_ISA_ALLOC_IOSIZE
-defopt PCIC_ISA_INTR_ALLOC_MASK
+defparam PCIC_ISA_ALLOC_IOBASE
+defparam PCIC_ISA_ALLOC_IOSIZE
+defparam PCIC_ISA_INTR_ALLOC_MASK
device pcic: pcmciabus
file dev/ic/i82365.c pcic
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/alpha/conf/files.alpha
--- a/sys/arch/alpha/conf/files.alpha Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/alpha/conf/files.alpha Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.147 2001/11/20 12:56:19 lukem Exp $
+# $NetBSD: files.alpha,v 1.148 2001/11/20 14:34:18 lukem Exp $
#
# alpha-specific configuration info
@@ -570,9 +570,9 @@
# XXX this needs to be done very late, so it's done here. This feels
# like a kludge, but it might be for the best.
-defopt PCIC_ISA_ALLOC_IOBASE
-defopt PCIC_ISA_ALLOC_IOSIZE
-defopt PCIC_ISA_INTR_ALLOC_MASK
+defparam PCIC_ISA_ALLOC_IOBASE
+defparam PCIC_ISA_ALLOC_IOSIZE
+defparam PCIC_ISA_INTR_ALLOC_MASK
device pcic: pcmciabus
file dev/ic/i82365.c pcic
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/amiga/conf/files.amiga Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.111 2001/11/20 12:56:20 lukem Exp $
+# $NetBSD: files.amiga,v 1.112 2001/11/20 14:34:19 lukem Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -18,14 +18,15 @@
defopt opt_amigacons.h CV3DONZORRO2
defopt opt_amigacons.h SERCONSOLE
-defopt opt_retina.h RH_MEMCLK RH_64BIT_SPRITE RH_HARDWARECURSOR
+defparam opt_retina.h RH_MEMCLK
+defopt opt_retina.h RH_64BIT_SPRITE RH_HARDWARECURSOR
defopt opt_retina.h RETINA_SPEED_HACK
defopt BB060STUPIDROM
defopt P5PPC68KBOARD
defopt LEV6_DEFER
-defopt IOBZCLOCK
+defparam IOBZCLOCK
device mainbus {}
attach mainbus at root
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/amigappc/conf/files.amigappc
--- a/sys/arch/amigappc/conf/files.amigappc Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/amigappc/conf/files.amigappc Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.amigappc,v 1.4 2001/11/20 12:56:21 lukem Exp $
+# $NetBSD: files.amigappc,v 1.5 2001/11/20 14:34:19 lukem Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -17,7 +17,8 @@
defopt opt_amigacons.h CV64CONSOLE CV3DCONSOLE TSENGCONSOLE
defopt opt_amigacons.h CV3DONZORRO2
-defopt opt_retina.h RH_MEMCLK RH_64BIT_SPRITE RH_HARDWARECURSOR
+defparam opt_retina.h RH_MEMCLK
+defopt opt_retina.h RH_64BIT_SPRITE RH_HARDWARECURSOR
defopt opt_retina.h RETINA_SPEED_HACK
defopt BB060STUPIDROM
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/dreamcast/conf/files.dreamcast
--- a/sys/arch/dreamcast/conf/files.dreamcast Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/dreamcast/conf/files.dreamcast Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.dreamcast,v 1.13 2001/11/20 12:56:25 lukem Exp $
+# $NetBSD: files.dreamcast,v 1.14 2001/11/20 14:34:20 lukem Exp $
#
# new style config file for sh3 architecture
#
@@ -22,9 +22,9 @@
file arch/dreamcast/dreamcast/clock.c
file arch/sh3/sh3/disksubr.c disk
-defopt opt_memsize.h IOM_ROM_BEGIN IOM_ROM_SIZE IOM_RAM_BEGIN IOM_RAM_SIZE
-defopt opt_led_addr.h LED_ADDR
-defopt opt_initbsc.h BSC_BCR1_VAL BSC_BCR2_VAL BSC_WCR1_VAL BSC_WCR2_VAL
+defparam opt_memsize.h IOM_ROM_BEGIN IOM_ROM_SIZE IOM_RAM_BEGIN IOM_RAM_SIZE
+defparam opt_led_addr.h LED_ADDR
+defparam opt_initbsc.h BSC_BCR1_VAL BSC_BCR2_VAL BSC_WCR1_VAL BSC_WCR2_VAL
BSC_WCR3_VAL BSC_MCR_VAL BSC_SDMR2_VAL BSC_SDMR3_VAL
BSC_RTCSR_VAL BSC_RTCNT_VAL BSC_RTCOR_VAL BSC_RFCR_VAL
BSC_PCR_VAL FRQCR_VAL PFC_SCPCR_VAL
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/dreamcast/conf/files.shbus
--- a/sys/arch/dreamcast/conf/files.shbus Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/dreamcast/conf/files.shbus Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.shbus,v 1.3 2001/08/22 13:32:45 msaitoh Exp $
+# $NetBSD: files.shbus,v 1.4 2001/11/20 14:34:20 lukem Exp $
#
# Config file and device description for machine-independent SHBus code.
# Included by ports that need it. Requires that the SCSI files be
@@ -26,12 +26,14 @@
# Serial drivers
#
-defopt opt_sci.h SCICONSOLE SCICN_SPEED
+defopt opt_sci.h SCICONSOLE
+defparam opt_sci.h SCICN_SPEED
device sci: tty
attach sci at shb
file arch/sh3/dev/sci.c sci needs-flag
-defopt opt_scif.h SCIFCONSOLE SCIFCN_SPEED
+defopt opt_scif.h SCIFCONSOLE
+defparam opt_scif.h SCIFCN_SPEED
device scif: tty
attach scif at shb
file arch/sh3/dev/scif.c scif needs-flag
@@ -45,9 +47,9 @@
# XXX this needs to be done very late, so it's done here. This feels
# like a kludge, but it might be for the best.
-defopt PCIC_SHB_ALLOC_IOBASE
-defopt PCIC_SHB_ALLOC_IOSIZE
-defopt PCIC_SHB_INTR_ALLOC_MASK
+defparam PCIC_SHB_ALLOC_IOBASE
+defparam PCIC_SHB_ALLOC_IOSIZE
+defparam PCIC_SHB_INTR_ALLOC_MASK
device shpcic: pcmciabus
file arch/sh3/dev/shpcic.c shpcic
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/evbsh3/conf/files.evbsh3
--- a/sys/arch/evbsh3/conf/files.evbsh3 Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/evbsh3/conf/files.evbsh3 Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.evbsh3,v 1.9 2001/11/20 12:56:26 lukem Exp $
+# $NetBSD: files.evbsh3,v 1.10 2001/11/20 14:34:20 lukem Exp $
#
# new style config file for sh3 architecture
#
@@ -15,9 +15,9 @@
file arch/sh3/sh3/clock.c
file arch/sh3/sh3/disksubr.c disk
-defopt opt_memsize.h IOM_ROM_BEGIN IOM_ROM_SIZE IOM_RAM_BEGIN IOM_RAM_SIZE
-defopt opt_led_addr.h LED_ADDR
-defopt opt_initbsc.h BSC_BCR1_VAL BSC_BCR2_VAL BSC_WCR1_VAL BSC_WCR2_VAL
+defparam opt_memsize.h IOM_ROM_BEGIN IOM_ROM_SIZE IOM_RAM_BEGIN IOM_RAM_SIZE
+defparam opt_led_addr.h LED_ADDR
+defparam opt_initbsc.h BSC_BCR1_VAL BSC_BCR2_VAL BSC_WCR1_VAL BSC_WCR2_VAL
BSC_WCR3_VAL BSC_MCR_VAL BSC_SDMR2_VAL BSC_SDMR3_VAL
BSC_RTCSR_VAL BSC_RTCNT_VAL BSC_RTCOR_VAL BSC_RFCR_VAL
BSC_PCR_VAL FRQCR_VAL PFC_SCPCR_VAL
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/evbsh3/conf/files.shbus
--- a/sys/arch/evbsh3/conf/files.shbus Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/evbsh3/conf/files.shbus Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.shbus,v 1.6 2001/08/22 13:32:45 msaitoh Exp $
+# $NetBSD: files.shbus,v 1.7 2001/11/20 14:34:20 lukem Exp $
#
# Config file and device description for machine-independent SHBus code.
# Included by ports that need it. Requires that the SCSI files be
@@ -25,12 +25,14 @@
# Serial drivers
#
-defopt opt_sci.h SCICONSOLE SCICN_SPEED
+defopt opt_sci.h SCICONSOLE
+defparam opt_sci.h SCICN_SPEED
device sci: tty
attach sci at shb
file arch/sh3/dev/sci.c sci needs-flag
-defopt opt_scif.h SCIFCONSOLE SCIFCN_SPEED
+defopt opt_scif.h SCIFCONSOLE
+defparam opt_scif.h SCIFCN_SPEED
device scif: tty
attach scif at shb
file arch/sh3/dev/scif.c scif needs-flag
@@ -44,9 +46,9 @@
# XXX this needs to be done very late, so it's done here. This feels
# like a kludge, but it might be for the best.
-defopt PCIC_SHB_ALLOC_IOBASE
-defopt PCIC_SHB_ALLOC_IOSIZE
-defopt PCIC_SHB_INTR_ALLOC_MASK
+defparam PCIC_SHB_ALLOC_IOBASE
+defparam PCIC_SHB_ALLOC_IOSIZE
+defparam PCIC_SHB_INTR_ALLOC_MASK
device shpcic: pcmciabus
file arch/sh3/dev/shpcic.c shpcic
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/hp300/conf/files.hp300
--- a/sys/arch/hp300/conf/files.hp300 Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/hp300/conf/files.hp300 Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hp300,v 1.48 2001/11/20 12:56:27 lukem Exp $
+# $NetBSD: files.hp300,v 1.49 2001/11/20 14:34:20 lukem Exp $
#
# hp300-specific configuration info
@@ -8,8 +8,8 @@
maxusers 2 8 64
# SPU configuration options.
-defopt opt_spuconf.h HP320 HP330 HP340 HP345 HP350 HP360 HP370
- HP375 HP380 HP385 HP400 HP425 HP433
+defopt opt_spuconf.h HP320 HP330 HP340 HP345 HP350 HP360 HP370
+ HP375 HP380 HP385 HP400 HP425 HP433
# Misc. options.
defopt USELEDS # make the lights twinkle
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/hpcmips/conf/files.hpcmips
--- a/sys/arch/hpcmips/conf/files.hpcmips Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/hpcmips/conf/files.hpcmips Tue Nov 20 14:34:18 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcmips,v 1.62 2001/11/18 08:19:39 takemura Exp $
+# $NetBSD: files.hpcmips,v 1.63 2001/11/20 14:34:20 lukem Exp $
# maxpartitions must be first item in files.${ARCH}.
maxpartitions 8
@@ -199,14 +199,14 @@
#
# TOSHIBA TX3912/3922
#
-defopt TX39_DEBUG
-defopt TX39_WATCHDOGTIMER
-defopt TX39ICUDEBUG
-defopt TX39CLKDEBUG
-defopt TX39BIUDEBUG
-defopt TX39POWERDEBUG
-defopt TX39UARTDEBUG
-defopt USE_POLL
+defopt TX39_DEBUG
+defopt TX39_WATCHDOGTIMER
+defopt TX39ICUDEBUG
+defopt TX39CLKDEBUG
+defopt TX39BIUDEBUG
+defopt TX39POWERDEBUG
+defopt TX39UARTDEBUG
+defopt USE_POLL
device txsim { }
device txcsbusif {[platform = -1]}
@@ -367,9 +367,9 @@
# XXX this needs to be done very late, so it's done here. This feels
# like a kludge, but it might be for the best.
-defopt PCIC_ISA_ALLOC_IOBASE
-defopt PCIC_ISA_ALLOC_IOSIZE
-defopt PCIC_ISA_INTR_ALLOC_MASK
+defparam PCIC_ISA_ALLOC_IOBASE
+defparam PCIC_ISA_ALLOC_IOSIZE
+defparam PCIC_ISA_INTR_ALLOC_MASK
device pcic: pcmciabus
file dev/ic/i82365.c pcic
diff -r 66c735f5d930 -r 0519d02dceae sys/arch/hpcmips/dev/apm/files.apm
--- a/sys/arch/hpcmips/dev/apm/files.apm Tue Nov 20 14:28:44 2001 +0000
+++ b/sys/arch/hpcmips/dev/apm/files.apm Tue Nov 20 14:34:18 2001 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: files.apm,v 1.1 2000/07/30 04:29:22 takemura Exp $
+# $NetBSD: files.apm,v 1.2 2001/11/20 14:34:21 lukem Exp $
#
# Common APM support files
#
-defopt opt_apmdev.h APM_DISABLE APM_FORCE_64K_SEGMENTS APM_NO_IDLE
- APM_NO_STANDBY APM_V10_ONLY APM_NO_V12 APMDEBUG APMDEBUG_VALUE
Home |
Main Index |
Thread Index |
Old Index