Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386/conf - replace all "scsibus* at XXXX" with a s...
details: https://anonhg.NetBSD.org/src/rev/0decb9d749e1
branches: trunk
changeset: 533233:0decb9d749e1
user: lukem <lukem%NetBSD.org@localhost>
date: Tue Jun 25 03:12:04 2002 +0000
description:
- replace all "scsibus* at XXXX" with a single "scsibus* at scsi?"
- replace all "atapibus* at XXXX" with a single "atapibus* at atapi?"
- replace all "audio* at XXXX" with a single "audio* at audiobus?"
- replace all "midi* at XXXX" (except "midi* at pcppi?") with a single
"midi* at midibus?"
diffstat:
sys/arch/i386/conf/CARDBUS | 63 +++-------------------------------
sys/arch/i386/conf/DELPHI | 47 +++----------------------
sys/arch/i386/conf/DISKLESS | 22 +++--------
sys/arch/i386/conf/DR-EVIL | 49 ++------------------------
sys/arch/i386/conf/GENERIC | 69 +++----------------------------------
sys/arch/i386/conf/GENERIC_LAPTOP | 50 +++------------------------
sys/arch/i386/conf/GENERIC_PS2TINY | 5 +-
sys/arch/i386/conf/GENERIC_TINY | 28 ++-------------
sys/arch/i386/conf/HOMEWORLD | 37 ++-----------------
sys/arch/i386/conf/INSTALL | 42 ++--------------------
sys/arch/i386/conf/INSTALL_LAPTOP | 10 +---
sys/arch/i386/conf/INSTALL_SMALL | 27 ++------------
sys/arch/i386/conf/INSTALL_TINY | 25 +------------
sys/arch/i386/conf/IOPENER | 11 ++---
sys/arch/i386/conf/MINBAR | 37 ++-----------------
sys/arch/i386/conf/NBFTP | 37 ++-----------------
sys/arch/i386/conf/SWINGER | 49 +++-----------------------
17 files changed, 82 insertions(+), 526 deletions(-)
diffs (truncated from 1284 to 300 lines):
diff -r d4ef81d53e52 -r 0decb9d749e1 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Tue Jun 25 02:55:14 2002 +0000
+++ b/sys/arch/i386/conf/CARDBUS Tue Jun 25 03:12:04 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.60 2002/06/17 05:14:12 lukem Exp $
+# $NetBSD: CARDBUS,v 1.61 2002/06/25 03:12:04 lukem Exp $
#
# CARDBUS: GENERIC + CardBus support. Additionally, some
# things typically not found on laptops have been commented out.
@@ -10,7 +10,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "CARDBUS-$Revision: 1.60 $"
+#ident "CARDBUS-$Revision: 1.61 $"
maxusers 32 # estimated number of users
@@ -467,23 +467,7 @@
#aha* at mca? slot ? # Adaptec AHA-1640
# SCSI bus support
-#scsibus* at adv?
-#scsibus* at adw?
-#scsibus* at aha?
-#scsibus* at ahb?
-scsibus* at ahc?
-scsibus* at aic?
-#scsibus* at bha?
-#scsibus* at dpt?
-scsibus* at esp?
-#scsibus* at iopsp?
-#scsibus* at isp?
-#scsibus* at nca?
-#scsibus* at pcscp?
-#scsibus* at sea?
-#scsibus* at siop?
-#scsibus* at uha?
-#scsibus* at wds?
+scsibus* at scsi?
# SCSI devices
sd* at scsibus? target ? lun ? # SCSI disk drives
@@ -541,8 +525,7 @@
wd* at pciide? channel ? drive ? flags 0x0000
# ATAPI bus support
-atapibus* at wdc? channel ?
-atapibus* at pciide? channel ?
+atapibus* at atapi?
# ATAPI devices
# flags have the same meaning as for IDE drives.
@@ -723,8 +706,6 @@
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
-atapibus* at umass? channel ?
-scsibus* at umass? channel ?
# USB audio
uaudio* at uhub? port ? configuration ?
@@ -763,7 +744,6 @@
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
-scsibus* at usscanner? channel ?
# Y@P firmware loader
uyap* at uhub? port ?
@@ -827,31 +807,7 @@
#opl* at ym?
# Audio support
-#audio* at aria?
-audio* at auich?
-audio* at auvia?
-audio* at clcs?
-audio* at clct?
-audio* at cmpci?
-audio* at eap?
-audio* at emuxki?
-audio* at esa?
-audio* at esl?
-audio* at esm?
-audio* at eso?
-#audio* at ess?
-audio* at fms?
-#audio* at gus?
-#audio* at guspnp?
-audio* at neo?
-#audio* at pas?
-audio* at sb?
-#audio* at sp?
-audio* at sv?
-audio* at uaudio?
-audio* at wss?
-audio* at yds?
-#audio* at ym?
+audio* at audiobus?
# MPU 401 UARTs
#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
@@ -863,15 +819,8 @@
#mpu* at ym?
# MIDI support
-midi* at clcs? # Cirrus Logic CS4280 MIDI port
-#midi* at clct? # Cirrus Logic CS4281 MIDI port
-#midi* at cms? # Creative Music System
-midi* at eap? # 137[01] MIDI port
-midi* at mpu? # MPU 401
-midi* at opl? # OPL FM synth
+midi* at midibus?
midi* at pcppi? # MIDI interface to the PC speaker
-midi* at sb? # SB1 MIDI port
-midi* at umidi? # USB MIDI
# The spkr driver provides a simple tone interface to the built in speaker.
#spkr0 at pcppi? # PC speaker
diff -r d4ef81d53e52 -r 0decb9d749e1 sys/arch/i386/conf/DELPHI
--- a/sys/arch/i386/conf/DELPHI Tue Jun 25 02:55:14 2002 +0000
+++ b/sys/arch/i386/conf/DELPHI Tue Jun 25 03:12:04 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DELPHI,v 1.18 2002/06/17 05:14:12 lukem Exp $
+# $NetBSD: DELPHI,v 1.19 2002/06/25 03:12:05 lukem Exp $
#
# DELPHI -- one of thorpej%zembu.com@localhost's devel machines
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "DELPHI-$Revision: 1.18 $"
+ident "DELPHI-$Revision: 1.19 $"
maxusers 64 # estimated number of users
@@ -385,21 +385,7 @@
#adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
# SCSI bus support
-#scsibus* at adv?
-#scsibus* at adw?
-#scsibus* at aha?
-#scsibus* at ahb?
-scsibus* at ahc?
-#scsibus* at aic?
-#scsibus* at bha?
-#scsibus* at dpt?
-#scsibus* at isp?
-#scsibus* at nca?
-#scsibus* at ncr?
-#scsibus* at pcscp?
-#scsibus* at sea?
-#scsibus* at uha?
-#scsibus* at wds?
+scsibus* at scsi?
# SCSI devices
#sd* at scsibus? target ? lun ? # SCSI disk drives
@@ -445,8 +431,7 @@
wd* at pciide? channel ? drive ? flags 0x0000
# ATAPI bus support
-#atapibus* at wdc? channel ?
-atapibus* at pciide? channel ?
+atapibus* at atapi?
# ATAPI devices
# flags have the same meaning as for IDE drives.
@@ -607,7 +592,6 @@
# USB Mass Storage
#umass* at uhub? port ? configuration ? interface ?
-#scsibus* at umass? channel ?
# USB audio
#uaudio* at uhub? port ? configuration ?
@@ -680,22 +664,7 @@
#opl* at ym?
# Audio support
-#audio* at aria?
-#audio* at clcs?
-audio* at eap?
-#audio* at eso?
-#audio* at ess?
-#audio* at fms?
-#audio* at gus?
-#audio* at guspnp?
-#audio* at pas?
-#audio* at sb?
-#audio* at sbl?
-#audio* at sp?
-#audio* at sv?
-#audio* at uaudio?
-#audio* at wss?
-#audio* at ym?
+audio* at audiobus?
# MPU 401 UARTs
#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
@@ -705,11 +674,7 @@
#mpu* at ym?
# MIDI support
-midi* at eap? # 137[01] MIDI port
-#midi* at mpu? # MPU 401
-#midi* at opl? # OPL FM synth
-#midi* at pcppi? # MIDI interface to the PC speaker
-#midi* at sb? # SB1 MIDI port
+midi* at midibus?
# The spkr driver provides a simple tone interface to the built in speaker.
spkr0 at pcppi? # PC speaker
diff -r d4ef81d53e52 -r 0decb9d749e1 sys/arch/i386/conf/DISKLESS
--- a/sys/arch/i386/conf/DISKLESS Tue Jun 25 02:55:14 2002 +0000
+++ b/sys/arch/i386/conf/DISKLESS Tue Jun 25 03:12:04 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.86 2002/06/17 05:14:12 lukem Exp $
+# $NetBSD: DISKLESS,v 1.87 2002/06/25 03:12:05 lukem Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
# This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -157,31 +157,24 @@
#aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers
#aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers
-#scsibus* at aha?
#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers
-#scsibus* at ahb?
#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers
#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers
#ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers
-#scsibus* at ahc?
#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
-#scsibus* at aic?
#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers
#bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers
#bha* at eisa? slot ?
#bha* at pci? dev ? function ?
-#scsibus* at bha?
#sea0 at isa? iomem 0xc8000 irq 5
-#scsibus* at sea?
#uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers
#uha1 at isa? port 0x340 irq ? drq ? # UltraStor [13]4f SCSI controllers
#uha* at eisa? slot ? # UltraStor 24f SCSI controllers
-#scsibus* at uha?
#wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
#wds1 at isa? port 0x358 irq 11 drq 5
-#scsibus* at wds?
#isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI controllers
-#scsibus* at isp?
+
+#scsibus* at scsi?
#sd* at scsibus? target ? lun ? # SCSI disk drives
#st* at scsibus? target ? lun ? # SCSI tape drives
@@ -199,7 +192,7 @@
#wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE controllers
#wdc1 at isa? port 0x170 irq 15
#wd* at wdc? drive ?
-#atapibus* at wdc?
+#atapibus* at atapi?
#cd* at atapibus? drive ?
#sd* at atapibus? drive ?
@@ -240,19 +233,16 @@
#pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
#sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver
-#audio* at sp0
#sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster
#sb* at isapnp?
-#audio* at sb?
#wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System
-#audio* at wss0
#pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
-#audio* at pas0
#gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound
-#audio* at gus0
#spkr0 at pcppi?
+#audio* at audiobus?
+
# Joystick driver. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
#joy* at isapnp?
diff -r d4ef81d53e52 -r 0decb9d749e1 sys/arch/i386/conf/DR-EVIL
--- a/sys/arch/i386/conf/DR-EVIL Tue Jun 25 02:55:14 2002 +0000
+++ b/sys/arch/i386/conf/DR-EVIL Tue Jun 25 03:12:04 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DR-EVIL,v 1.47 2002/06/21 22:57:55 ross Exp $
+# $NetBSD: DR-EVIL,v 1.48 2002/06/25 03:12:06 lukem Exp $
#
# DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej%netbsd.org@localhost
#
@@ -426,23 +426,7 @@
Home |
Main Index |
Thread Index |
Old Index