Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys - convert usage of "defopt" to "defflag" where the relev...
details: https://anonhg.NetBSD.org/src/rev/741051c6297f
branches: trunk
changeset: 518326:741051c6297f
user: lukem <lukem%NetBSD.org@localhost>
date: Wed Nov 28 10:21:10 2001 +0000
description:
- convert usage of "defopt" to "defflag" where the relevant option does
not support a value (e.g., it's to be used as "options FOO" instead of
"options FOO=xxx"). options that take a value were converted to
defparam recently.
- minor whitespace & formatting cleanups
diffstat:
sys/arch/acorn32/conf/files.acorn32 | 10 +-
sys/arch/algor/conf/files.algor | 18 +-
sys/arch/alpha/conf/files.alpha | 56 +-
sys/arch/amiga/conf/files.amiga | 34 +-
sys/arch/amigappc/conf/files.amigappc | 30 +-
sys/arch/arc/conf/files.arc | 4 +-
sys/arch/arm/conf/files.arm | 16 +-
sys/arch/arm/conf/files.footbridge | 4 +-
sys/arch/arm26/conf/files.arm26 | 4 +-
sys/arch/arm32/conf/files.arm32 | 12 +-
sys/arch/atari/conf/files.atari | 8 +-
sys/arch/cats/conf/files.cats | 12 +-
sys/arch/dnard/conf/files.dnard | 12 +-
sys/arch/dreamcast/conf/files.shbus | 12 +-
sys/arch/evbarm/conf/files.evbarm | 6 +-
sys/arch/evbsh3/conf/files.shbus | 12 +-
sys/arch/hp300/conf/files.hp300 | 6 +-
sys/arch/hpc/conf/files.hpc | 6 +-
sys/arch/hpcarm/conf/files.hpcarm | 6 +-
sys/arch/hpcmips/conf/files.hpcmips | 30 +-
sys/arch/hpcmips/dev/apm/files.apm | 4 +-
sys/arch/hpcsh/conf/files.shbus | 6 +-
sys/arch/i386/conf/files.i386 | 48 +-
sys/arch/i386/pnpbios/files.pnpbios | 4 +-
sys/arch/m68k/conf/files.m68k | 4 +-
sys/arch/mac68k/conf/files.mac68k | 8 +-
sys/arch/mips/conf/files.mips | 6 +-
sys/arch/mmeye/conf/files.shbus | 8 +-
sys/arch/mvme68k/conf/files.mvme68k | 4 +-
sys/arch/netwinder/conf/files.netwinder | 12 +-
sys/arch/news68k/conf/files.news68k | 4 +-
sys/arch/next68k/conf/files.next68k | 4 +-
sys/arch/ofppc/conf/files.ofppc | 10 +-
sys/arch/playstation2/conf/files.playstation2 | 6 +-
sys/arch/pmax/conf/files.pmax | 20 +-
sys/arch/powerpc/conf/files.powerpc | 10 +-
sys/arch/prep/conf/files.prep | 8 +-
sys/arch/sgimips/conf/files.sgimips | 4 +-
sys/arch/sparc/conf/files.sparc | 4 +-
sys/arch/vax/conf/files.vax | 6 +-
sys/arch/x68k/conf/files.x68k | 16 +-
sys/arch/x86_64/conf/files.x86_64 | 12 +-
sys/conf/files | 469 +++++++++++++------------
sys/dev/acpi/files.acpi | 4 +-
sys/dev/cardbus/files.cardbus | 6 +-
sys/dev/eisa/files.eisa | 4 +-
sys/dev/hpc/files.hpckbd | 4 +-
sys/dev/i2o/files.i2o | 4 +-
sys/dev/isa/files.isa | 6 +-
sys/dev/isapnp/files.isapnp | 4 +-
sys/dev/mca/files.mca | 4 +-
sys/dev/mii/files.mii | 4 +-
sys/dev/pci/files.pci | 16 +-
sys/dev/pcmcia/files.pcmcia | 8 +-
sys/dev/rasops/files.rasops | 4 +-
sys/dev/rcons/files.rcons | 4 +-
sys/dev/scsipi/files.scsipi | 10 +-
sys/dev/tc/files.tc | 4 +-
sys/dev/usb/files.usb | 4 +-
sys/dev/wscons/files.wscons | 6 +-
sys/dev/wsfont/files.wsfont | 4 +-
61 files changed, 544 insertions(+), 531 deletions(-)
diffs (truncated from 2302 to 300 lines):
diff -r abe4156eb4d8 -r 741051c6297f sys/arch/acorn32/conf/files.acorn32
--- a/sys/arch/acorn32/conf/files.acorn32 Wed Nov 28 09:49:51 2001 +0000
+++ b/sys/arch/acorn32/conf/files.acorn32 Wed Nov 28 10:21:10 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acorn32,v 1.4 2001/11/26 20:33:44 thorpej Exp $
+# $NetBSD: files.acorn32,v 1.5 2001/11/28 10:21:10 lukem Exp $
#
# First try for arm-specific configuration info
#
@@ -7,21 +7,21 @@
maxusers 2 8 64
# Maintain Interrupt statistics
-defopt IRQSTATS
+defflag IRQSTATS
# X server support in console drivers
-defopt XSERVER
+defflag XSERVER
# Bootloader options (COMPAT... to be dropped ASAP)
# (!)
-defopt COMPAT_OLD_BOOTLOADER
+defflag COMPAT_OLD_BOOTLOADER
#
# predefine some variables ... not that we have one but the arm framework
# needs it to compile ... esp. the isadma bothers me (used by pmap.c)
# it is never included but i need the isadma.h it generates
#
-defopt FOOTBRIDGE
+defflag FOOTBRIDGE
define isadma
file dev/isa/isadma.c isadma needs-flag
diff -r abe4156eb4d8 -r 741051c6297f sys/arch/algor/conf/files.algor
--- a/sys/arch/algor/conf/files.algor Wed Nov 28 09:49:51 2001 +0000
+++ b/sys/arch/algor/conf/files.algor Wed Nov 28 10:21:10 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.algor,v 1.9 2001/11/20 14:34:18 lukem Exp $
+# $NetBSD: files.algor,v 1.10 2001/11/28 10:21:10 lukem Exp $
# Algorithmics evaluation board specific configuration info.
@@ -8,13 +8,13 @@
maxusers 8 16 64
# Platform support option headers.
-defopt ALGOR_P4032 # Algorithmics P-4032
-defopt ALGOR_P5064 # Algorithmics P-5064
-defopt ALGOR_P6032 # Algorithmics P-6032
+defflag ALGOR_P4032 # Algorithmics P-4032
+defflag ALGOR_P5064 # Algorithmics P-5064
+defflag ALGOR_P6032 # Algorithmics P-6032
# Various items that a buggy PMON might not provide us.
-defparam MEMSIZE
-defparam 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
-defparam PCIC_ISA_ALLOC_IOBASE
-defparam PCIC_ISA_ALLOC_IOSIZE
-defparam 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 abe4156eb4d8 -r 741051c6297f sys/arch/alpha/conf/files.alpha
--- a/sys/arch/alpha/conf/files.alpha Wed Nov 28 09:49:51 2001 +0000
+++ b/sys/arch/alpha/conf/files.alpha Wed Nov 28 10:21:10 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.alpha,v 1.148 2001/11/20 14:34:18 lukem Exp $
+# $NetBSD: files.alpha,v 1.149 2001/11/28 10:21:11 lukem Exp $
#
# alpha-specific configuration info
@@ -8,36 +8,36 @@
maxusers 8 16 64
# CPU support option headers
-defopt DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150)
-defopt DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc.
-defopt DEC_2100_A500 # Sable etc: AlphaServer 2100
-defopt DEC_2100A_A500 # Lynx etc: AlphaServer 2100A
-defopt DEC_3000_300 # Pelican etc: 3000/300*
-defopt DEC_3000_500 # Flamingo etc: 3000/[4-9]00*
-defopt DEC_550 # Miata: Personal Workstation (550)
-defopt DEC_AXPPCI_33 # NoName: AXPpci33, etc.
-defopt DEC_EB164 # EB164: AlphaPC 164
-defopt DEC_EB64PLUS # EB64+: AlphaPC 64, etc.
-defopt DEC_KN20AA # KN20AA: AlphaStation 500 and 600
-defopt DEC_KN8AE # KN8AE: AlphaServer 8200 and 8400
-defopt DEC_KN300 # KN300: AlphaServer 4X00
-defopt AVALON_A12 # Avalon: A12T1, A12M Parallel Supercomputer
-defopt DEC_1000 # Mikasa etc: AlphaServer 1000
-defopt DEC_1000A # Corelle etc: AlphaServer 800 and 1000A
-defopt DEC_ALPHABOOK1 # AlphaBook1: Tadpole/DEC AlphaBook
-defopt DEC_EB66 # EB66: 21066 Evaluation Board
-defopt DEC_6600 # EV6 Various EV6 Systems
-defopt API_UP1000 # EV6 Alpha Processor, Inc. UP1000
+defflag DEC_2000_300 # "Jensen": 2000/300 (DECpc AXP 150)
+defflag DEC_2100_A50 # Avanti etc: AlphaStation 400, 200, etc.
+defflag DEC_2100_A500 # Sable etc: AlphaServer 2100
+defflag DEC_2100A_A500 # Lynx etc: AlphaServer 2100A
+defflag DEC_3000_300 # Pelican etc: 3000/300*
+defflag DEC_3000_500 # Flamingo etc: 3000/[4-9]00*
+defflag DEC_550 # Miata: Personal Workstation (550)
+defflag DEC_AXPPCI_33 # NoName: AXPpci33, etc.
+defflag DEC_EB164 # EB164: AlphaPC 164
+defflag DEC_EB64PLUS # EB64+: AlphaPC 64, etc.
+defflag DEC_KN20AA # KN20AA: AlphaStation 500 and 600
+defflag DEC_KN8AE # KN8AE: AlphaServer 8200 and 8400
+defflag DEC_KN300 # KN300: AlphaServer 4X00
+defflag AVALON_A12 # Avalon: A12T1, A12M Parallel Supercomputer
+defflag DEC_1000 # Mikasa etc: AlphaServer 1000
+defflag DEC_1000A # Corelle etc: AlphaServer 800 and 1000A
+defflag DEC_ALPHABOOK1 # AlphaBook1: Tadpole/DEC AlphaBook
+defflag DEC_EB66 # EB66: 21066 Evaluation Board
+defflag DEC_6600 # EV6 Various EV6 Systems
+defflag API_UP1000 # EV6 Alpha Processor, Inc. UP1000
# Miscellaneous CPU-specific option headers
-defopt FIX_UNALIGNED_VAX_FP
-defopt ZS_IOASIC_DMA
+defflag FIX_UNALIGNED_VAX_FP
+defflag ZS_IOASIC_DMA
# XXX Temporary, until integration is finished.
-defopt NEW_SCC_DRIVER
+defflag NEW_SCC_DRIVER
# realtime clock compatible to OSF/1
-defopt CLOCK_COMPAT_OSF1
+defflag CLOCK_COMPAT_OSF1
# this loses, but there's no way to define attributes which have attributes
define alpha_shared_intr
@@ -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.
-defparam PCIC_ISA_ALLOC_IOBASE
-defparam PCIC_ISA_ALLOC_IOSIZE
-defparam 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 abe4156eb4d8 -r 741051c6297f sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga Wed Nov 28 09:49:51 2001 +0000
+++ b/sys/arch/amiga/conf/files.amiga Wed Nov 28 10:21:10 2001 +0000
@@ -1,30 +1,30 @@
-# $NetBSD: files.amiga,v 1.112 2001/11/20 14:34:19 lukem Exp $
+# $NetBSD: files.amiga,v 1.113 2001/11/28 10:21:11 lukem Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
maxusers 2 8 64
-defopt opt_amigaccgrf.h GRF_PAL:GRF_NTSC # temporary workaround
-defopt opt_amigaccgrf.h GRF_NTSC
-defopt opt_amigaccgrf.h GRF_ECS GRF_AGA
-defopt opt_amigaccgrf.h GRF_A2024:GRF_ECS
-defopt opt_amigaccgrf.h GRF_AGA_VGA:GRF_AGA
-defopt opt_amigaccgrf.h GRF_SUPER72:GRF_AGA
-defopt opt_amigaccgrf.h USE_C_BFOPS
+defflag opt_amigaccgrf.h GRF_PAL :GRF_NTSC # temporary workaround
+defflag opt_amigaccgrf.h GRF_NTSC
+defflag opt_amigaccgrf.h GRF_ECS GRF_AGA
+defflag opt_amigaccgrf.h GRF_A2024:GRF_ECS
+defflag opt_amigaccgrf.h GRF_AGA_VGA:GRF_AGA
+defflag opt_amigaccgrf.h GRF_SUPER72:GRF_AGA
+defflag opt_amigaccgrf.h USE_C_BFOPS
-defopt opt_amigacons.h RETINACONSOLE ULOWELLCONSOLE CL5426CONSOLE
-defopt opt_amigacons.h CV64CONSOLE CV3DCONSOLE TSENGCONSOLE
-defopt opt_amigacons.h CV3DONZORRO2
-defopt opt_amigacons.h SERCONSOLE
+defflag opt_amigacons.h RETINACONSOLE ULOWELLCONSOLE CL5426CONSOLE
+defflag opt_amigacons.h CV64CONSOLE CV3DCONSOLE TSENGCONSOLE
+defflag opt_amigacons.h CV3DONZORRO2
+defflag opt_amigacons.h SERCONSOLE
defparam opt_retina.h RH_MEMCLK
-defopt opt_retina.h RH_64BIT_SPRITE RH_HARDWARECURSOR
-defopt opt_retina.h RETINA_SPEED_HACK
+defflag opt_retina.h RH_64BIT_SPRITE RH_HARDWARECURSOR
+defflag opt_retina.h RETINA_SPEED_HACK
-defopt BB060STUPIDROM
-defopt P5PPC68KBOARD
-defopt LEV6_DEFER
+defflag BB060STUPIDROM
+defflag P5PPC68KBOARD
+defflag LEV6_DEFER
defparam IOBZCLOCK
diff -r abe4156eb4d8 -r 741051c6297f sys/arch/amigappc/conf/files.amigappc
--- a/sys/arch/amigappc/conf/files.amigappc Wed Nov 28 09:49:51 2001 +0000
+++ b/sys/arch/amigappc/conf/files.amigappc Wed Nov 28 10:21:10 2001 +0000
@@ -1,28 +1,28 @@
-# $NetBSD: files.amigappc,v 1.5 2001/11/20 14:34:19 lukem Exp $
+# $NetBSD: files.amigappc,v 1.6 2001/11/28 10:21:11 lukem Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
maxusers 2 8 64
-defopt opt_amigaccgrf.h GRF_PAL:GRF_NTSC # temporary workaround
-defopt opt_amigaccgrf.h GRF_NTSC
-defopt opt_amigaccgrf.h GRF_ECS GRF_AGA
-defopt opt_amigaccgrf.h GRF_A2024:GRF_ECS
-defopt opt_amigaccgrf.h GRF_AGA_VGA:GRF_AGA
-defopt opt_amigaccgrf.h GRF_SUPER72:GRF_AGA
-defopt opt_amigaccgrf.h USE_C_BFOPS
+defflag opt_amigaccgrf.h GRF_PAL :GRF_NTSC # temporary workaround
+defflag opt_amigaccgrf.h GRF_NTSC
+defflag opt_amigaccgrf.h GRF_ECS GRF_AGA
+defflag opt_amigaccgrf.h GRF_A2024:GRF_ECS
+defflag opt_amigaccgrf.h GRF_AGA_VGA:GRF_AGA
+defflag opt_amigaccgrf.h GRF_SUPER72:GRF_AGA
+defflag opt_amigaccgrf.h USE_C_BFOPS
-defopt opt_amigacons.h RETINACONSOLE ULOWELLCONSOLE CL5426CONSOLE
-defopt opt_amigacons.h CV64CONSOLE CV3DCONSOLE TSENGCONSOLE
-defopt opt_amigacons.h CV3DONZORRO2
+defflag opt_amigacons.h RETINACONSOLE ULOWELLCONSOLE CL5426CONSOLE
+defflag opt_amigacons.h CV64CONSOLE CV3DCONSOLE TSENGCONSOLE
+defflag opt_amigacons.h CV3DONZORRO2
defparam opt_retina.h RH_MEMCLK
-defopt opt_retina.h RH_64BIT_SPRITE RH_HARDWARECURSOR
-defopt opt_retina.h RETINA_SPEED_HACK
+defflag opt_retina.h RH_64BIT_SPRITE RH_HARDWARECURSOR
+defflag opt_retina.h RETINA_SPEED_HACK
-defopt BB060STUPIDROM
-defopt P5PPC68KBOARD
+defflag BB060STUPIDROM
+defflag P5PPC68KBOARD
device mainbus {}
attach mainbus at root
diff -r abe4156eb4d8 -r 741051c6297f sys/arch/arc/conf/files.arc
--- a/sys/arch/arc/conf/files.arc Wed Nov 28 09:49:51 2001 +0000
+++ b/sys/arch/arc/conf/files.arc Wed Nov 28 10:21:10 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.arc,v 1.34 2001/11/20 12:56:21 lukem Exp $
+# $NetBSD: files.arc,v 1.35 2001/11/28 10:21:11 lukem Exp $
# $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $
#
# maxpartitions must be first item in files.${ARCH}
@@ -11,7 +11,7 @@
## Platform support option header and files
##
-defopt opt_platform.h PLATFORM_ACER_PICA_61
+defflag opt_platform.h PLATFORM_ACER_PICA_61
PLATFORM_DESKTECH_ARCSTATION_I
PLATFORM_DESKTECH_TYNE
PLATFORM_MICROSOFT_JAZZ
diff -r abe4156eb4d8 -r 741051c6297f sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm Wed Nov 28 09:49:51 2001 +0000
+++ b/sys/arch/arm/conf/files.arm Wed Nov 28 10:21:10 2001 +0000
@@ -1,22 +1,22 @@
-# $NetBSD: files.arm,v 1.45 2001/11/26 20:33:43 thorpej Exp $
+# $NetBSD: files.arm,v 1.46 2001/11/28 10:21:12 lukem Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
-defopt ARM32
+defflag ARM32
# CPU types
-defopt opt_cputypes.h CPU_ARM2 CPU_ARM250 CPU_ARM3
-defopt opt_cputypes.h CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8
- CPU_ARM9 CPU_SA110 CPU_SA1100 CPU_SA1110
- CPU_XSCALE
+defflag opt_cputypes.h CPU_ARM2 CPU_ARM250 CPU_ARM3
+defflag opt_cputypes.h CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8
+ CPU_ARM9 CPU_SA110 CPU_SA1100 CPU_SA1110
+ CPU_XSCALE
# Floating point emulator
-defopt ARMFPE
+defflag ARMFPE
file arch/arm/fpe-arm/armfpe_glue.S armfpe
Home |
Main Index |
Thread Index |
Old Index