summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorMatthew Dempsky <matthew@cvs.openbsd.org>2011-06-29 20:52:10 +0000
committerMatthew Dempsky <matthew@cvs.openbsd.org>2011-06-29 20:52:10 +0000
commit1c63422424678d077b8f6207ad065ce1012cd7ec (patch)
treef06aa763bb28acf5e131818fd79869e578f2addd /sys/arch/i386/conf
parentad0b39e32d3724d10b4909d983b7289f9f4d7874 (diff)
Replace all instances of "scsibus* at hba?" with a single "scsibus* at
scsi?" rule, similar to how ethernet PHY drivers attach at mii. Discussed on icb.
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC39
-rw-r--r--sys/arch/i386/conf/RAMDISK18
-rw-r--r--sys/arch/i386/conf/RAMDISKB30
-rw-r--r--sys/arch/i386/conf/RAMDISKC19
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD37
5 files changed, 10 insertions, 133 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index a261e82a444..626c6588d9e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.720 2011/06/29 17:48:22 tedu Exp $
+# $OpenBSD: GENERIC,v 1.721 2011/06/29 20:52:09 matthew Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -253,7 +253,6 @@ umidi* at uhub? # USB MIDI
midi* at umidi?
ulpt* at uhub? # USB Printers
umass* at uhub? # USB Mass Storage devices
-scsibus* at umass?
uhidev* at uhub? # Human Interface Devices
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
@@ -317,7 +316,6 @@ puc* at pci? # PCI "universal" communication device
sdhc* at pci? # SD Host Controller
sdmmc* at sdhc? # SD/MMC bus
-scsibus* at sdmmc? # SCSI emulation
# Bluetooth controllers
sbt* at sdmmc? disable # SDIO Bluetooth
@@ -440,82 +438,52 @@ bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers
bha2 at isa? disable
bha* at pci?
#bha* at eisa? # XXX eisa still runs in isa-compat
-scsibus* at bha?
aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers
aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers
aha* at isapnp?
-scsibus* at aha?
ahb* at eisa? # Adaptec 174[024] SCSI controllers
-scsibus* at ahb?
#ahc0 at isa? # Adaptec 284x SCSI controllers
ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers
ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers
-scsibus* at ahc?
jmb* at pci? # JMicron JMB36x controllers
ahci* at jmb? flags 0x0000 # flags 0x0001 to force SATA 1 (1.5Gb/s)
pciide* at jmb?
ahci* at pci? flags 0x0000 # AHCI SATA controllers
# flags 0x0001 to force SATA 1 (1.5Gb/s)
-scsibus* at ahci?
sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers
-scsibus* at sili?
ahd* at pci? # Adaptec 79?? SCSI controllers
-scsibus* at ahd?
arc* at pci? # Areca RAID Controllers
-scsibus* at arc?
mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface
-scsibus* at mpi?
mpii* at pci? # LSI Fusion MPT Message Passing Interface II
-scsibus* at mpii?
gdt* at pci? # ICP Vortex GDT RAID controllers
-scsibus* at gdt?
twe* at pci? # 3ware Escalade RAID controllers
-scsibus* at twe?
#aac* at pci? # Adaptec FSA RAID controllers
-#scsibus* at aac?
ami* at pci? # AMI MegaRAID controllers
-scsibus* at ami?
mfi* at pci? # LSI MegaRAID SAS controllers
-scsibus* at mfi?
cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers
cac* at eisa?
-scsibus* at cac?
ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers
-scsibus* at ciss?
iha* at pci? # Initio Ultra/UltraWide SCSI controllers
-scsibus* at iha?
ips* at pci? # IBM ServeRAID controllers
-scsibus* at ips?
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-scsibus* at isp?
#qli* at pci? # Qlogic 4010 & 4022 iSCSI
-#scsibus* at qli?
aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
aic* at pcmcia? # PCMCIA based aic SCSI controllers
aic* at isapnp? # isapnp configured aic SCSI controllers
-scsibus* at aic?
#esp* at pcmcia? # PCMCIA based NCR 53C9X SCSI
-#scsibus* at esp?
siop* at pci? # NCR 538XX SCSI controllers(new)
-scsibus* at siop?
adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
-scsibus* at adv?
adw* at pci? # AdvanSys ULTRA WIDE SCSI
-scsibus* at adw?
pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI
-scsibus* at pcscp?
sea0 at isa? disable iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers
-scsibus* at sea?
trm* at pci? # Tekram DC-3x5U SCSI Controllers
-scsibus* at trm?
uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers
uha1 at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers
uha* at eisa? # UltraStor 24f SCSI controllers
-scsibus* at uha?
wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
#wds1 at isa? port 0x358 irq 11 drq 5
-scsibus* at wds?
+scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
st* at scsibus? # SCSI tape drives
cd* at scsibus? # SCSI CD-ROM drives
@@ -543,7 +511,6 @@ wd* at pciide? flags 0x0000
# ATAPI<->SCSI
atapiscsi* at wdc?
atapiscsi* at pciide?
-scsibus* at atapiscsi?
# Networking devices
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet
@@ -811,9 +778,7 @@ glxsb* at pci? # AMD Geode LX series processor security block
# I2O
iop* at pci? # I2O processor
ioprbs* at iop? # I2O arrays
-scsibus* at ioprbs?
iopsp* at iop? # I2O SCSI pass-through
-scsibus* at iopsp?
# GPIO ``pin bus'' drivers
#gpioiic* at gpio? offset 0 mask 0x3 # I2C bus bit-banging
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 9ed61c59ec9..96edbe36afd 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.176 2011/06/29 16:18:04 tedu Exp $
+# $OpenBSD: RAMDISK,v 1.177 2011/06/29 20:52:09 matthew Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -128,43 +128,30 @@ com* at isapnp?
#bha2 at isa? disable
#bha* at pci?
#bha* at eisa? # XXX eisa still runs in isa-compat
-#scsibus* at bha?
#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers
#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers
#aha* at isapnp?
-#scsibus* at aha?
#ahb* at eisa? # Adaptec 174[024] SCSI controllers
-#scsibus* at ahb?
#ahc0 at isa? # Adaptec 284x SCSI controllers
#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers
ahc* at pci? # Adaptec 2940 SCSI controllers
-scsibus* at ahc?
#ahd* at pci? # Adaptec 79?? SCSI controllers
-#scsibus* at ahd?
#twe* at pcu? # 3ware Escalade RAID controllers
-#scsibus* at twe?
#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#scsibus* at isp?
#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
#aic* at isapnp?
#aic* at pcmcia? # PCMCIA based aic SCSI controllers
-#scsibus* at aic?
siop* at pci? # NCR 538XX SCSI controllers(new)
-scsibus* at siop?
#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
-#scsibus* at adv?
#adw* at pci? # AdvanSys ULTRA WIDE SCSI
-#scsibus* at adw?
#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers
-#scsibus* at sea?
#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers
#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers
#uha* at eisa? # 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?
+scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
st* at scsibus? # SCSI tape drives
cd* at scsibus? # SCSI CD-ROM drives
@@ -190,7 +177,6 @@ wd* at pciide? flags 0x0000
# ATAPI<->SCSI
atapiscsi* at wdc?
atapiscsi* at pciide?
-scsibus* at atapiscsi?
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series
we1 at isa? port 0x300 iomem 0xcc000 irq 10 #
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 3112f2c7c55..7529a72a0e7 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.119 2011/06/29 16:18:04 tedu Exp $
+# $OpenBSD: RAMDISKB,v 1.120 2011/06/29 20:52:09 matthew Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -126,63 +126,40 @@ com2 at isa? port 0x3e8 irq 5
#bha2 at isa? disable
#bha* at pci?
#bha* at eisa? # XXX eisa still runs in isa-compat
-#scsibus* at bha?
#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers
#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers
#aha* at isapnp?
-#scsibus* at aha?
#ahb* at eisa? # Adaptec 174[024] SCSI controllers
-#scsibus* at ahb?
ahc0 at isa? # Adaptec 284x SCSI controllers
#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers
ahc* at pci? # Adaptec 2940 SCSI controllers
-scsibus* at ahc?
ahd* at pci? # Adaptec 79?? SCSI controllers
-scsibus* at ahd?
mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface
-scsibus* at mpi?
#gdt* at pci? # ICP Vortex GDT RAID controllers
-#scsibus* at gdt?
#aac* at pci? # Adaptec FSA RAID controllers
-#scsibus* at aac?
ami* at pci? # AMI MegaRAID controllers
-scsibus* at ami?
mfi* at pci? # LSI MegaRAID SAS controllers
-scsibus* at mfi?
cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers
#cac* at eisa?
-scsibus* at cac?
#ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers
-#scsibus* at ciss?
#twe* at pci? # 3ware Escalade RAID controllers
-#scsibus* at twe?
#iha* at pci? # Initio Ultra/UltraWide SCSI controllers
-#scsibus* at iha?
#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#scsibus* at isp?
#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
#aic* at isapnp?
-#scsibus* at aic?
#siop* at pci? # NCR 538XX SCSI controllers(new)
-#scsibus* at siop?
#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
-#scsibus* at adv?
#adw* at pci? # AdvanSys ULTRA WIDE SCSI
-#scsibus* at adw?
#pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI
-#scsibus* at pcscp?
#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers
-#scsibus* at sea?
#trm* at pci? # Tekram DC-3x5U SCSI Controllers
-#scsibus* at trm?
#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers
#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers
#uha* at eisa? # 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?
+scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
st* at scsibus? # SCSI tape drives
cd* at scsibus? # SCSI CD-ROM drives
@@ -208,14 +185,11 @@ wd* at pciide? flags 0x0000
# I2O
#iop* at pci? # I2O processor
#ioprbs* at iop? # I2O arrays
-#scsibus* at ioprbs?
#iopsp* at iop? # I2O SCSI pass-through
-#scsibus* at iopsp?
# ATAPI<->SCSI
atapiscsi* at wdc?
atapiscsi* at pciide?
-scsibus* at atapiscsi?
#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series
#we1 at isa? port 0x300 iomem 0xcc000 irq 10 #
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 097889f4a0c..d8b6889c1d0 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.100 2011/06/29 16:18:04 tedu Exp $
+# $OpenBSD: RAMDISKC,v 1.101 2011/06/29 20:52:09 matthew Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -106,7 +106,6 @@ usb* at ohci?
uhub* at usb? # USB Hubs
uhub* at uhub? # USB Hubs
umass* at uhub? # USB Mass Storage devices
-scsibus* at umass?
uhidev* at uhub? # Human Interface Devices
ukbd* at uhidev? # USB keyboard
wskbd* at ukbd? mux 1
@@ -163,43 +162,30 @@ com2 at isa? port 0x3e8 irq 5
#bha2 at isa? disable
#bha* at pci?
#bha* at eisa? # XXX eisa still runs in isa-compat
-#scsibus* at bha?
#aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers
#aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers
#aha* at isapnp?
-#scsibus* at aha?
#ahb* at eisa? # Adaptec 174[024] SCSI controllers
-#scsibus* at ahb?
#ahc0 at isa? # Adaptec 284x SCSI controllers
#ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers
#ahc* at pci? # Adaptec 2940 SCSI controllers
-#scsibus* at ahc?
#gdt* at pci? # ICP Vortex GDT RAID controllers
-#scsibus* at gdt?
#twe* at pci? # 3ware Escalade RAID controllers
-#scsibus* at pci?
#isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-#scsibus* at isp?
#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
#aic* at isapnp?
#aic* at pcmcia? # PCMCIA based aic SCSI controllers
-#scsibus* at aic?
#siop* at pci? # NCR 538XX SCSI controllers(new)
-#scsibus* at siop?
#adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
-#scsibus* at adv?
#adw* at pci? # AdvanSys ULTRA WIDE SCSI
-#scsibus* at adw?
#sea0 at isa? iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers
-#scsibus* at sea?
#uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers
#uha1 at isa? port 0x334 # UltraStor [13]4f SCSI controllers
#uha* at eisa? # 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?
+scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
#st* at scsibus? # SCSI tape drives
cd* at scsibus? # SCSI CD-ROM drives
@@ -225,7 +211,6 @@ wd* at pciide? flags 0x0000
# ATAPI<->SCSI
atapiscsi* at wdc?
atapiscsi* at pciide?
-scsibus* at atapiscsi?
#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series
#we1 at isa? port 0x300 iomem 0xcc000 irq 10 #
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 834876e82e9..d6a6579c0ae 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.189 2011/06/29 16:18:04 tedu Exp $
+# $OpenBSD: RAMDISK_CD,v 1.190 2011/06/29 20:52:09 matthew Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -122,7 +122,6 @@ uhidev* at uhub?
ukbd* at uhidev?
wskbd* at ukbd? mux 1
umass* at uhub? # USB Mass Storage devices
-scsibus* at umass?
#ums* at uhidev?
#wsmouse* at ums? mux 0
aue* at uhub? # ADMtek AN986 Pegasus Ethernet
@@ -188,86 +187,55 @@ bha1 at isa? disable port 0x334 # BusLogic [57]4X SCSI controllers
bha2 at isa? disable
bha* at pci?
#bha* at eisa? # XXX eisa still runs in isa-compat
-scsibus* at bha?
aha0 at isa? port 0x330 # Adaptec 154[02] SCSI controllers
aha1 at isa? port 0x334 # Adaptec 154[02] SCSI controllers
aha* at isapnp?
-scsibus* at aha?
ahb* at eisa? # Adaptec 174[024] SCSI controllers
-scsibus* at ahb?
#ahc0 at isa? # Adaptec 284x SCSI controllers
ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers
ahc* at pci? # Adaptec 2940/3940/78?? SCSI controllers
-scsibus* at ahc?
jmb* at pci? # JMicron JMB36x controllers
ahci* at jmb?
pciide* at jmb?
ahci* at pci? # AHCI SATA controllers
-scsibus* at ahci?
sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers
-scsibus* at sili?
ahd* at pci? # Adaptec 79?? SCSI controllers
-scsibus* at ahd?
arc* at pci? # Areca RAID Controllers
-scsibus* at arc?
mpi* at pci? # LSI Logic Fusion-MPT Message Passing Interface
-scsibus* at mpi?
mpii* at pci? # LSI Fusion-MPT Message Passing Interface II
-scsibus* at mpii?
gdt* at pci? # ICP Vortex GDT RAID controllers
-scsibus* at gdt?
#aac* at pci? # Adaptec FSA RAID controllers
-#scsibus* at aac?
ami* at pci? # AMI MegaRAID controllers
-scsibus* at ami?
mfi* at pci? # LSI MegaRAID SAS controllers
-scsibus* at mfi?
cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers
cac* at eisa?
-scsibus* at cac?
ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers
-scsibus* at ciss?
twe* at pci? # 3ware Escalade RAID controllers
-scsibus* at twe?
iha* at pci? # Initio Ultra/UltraWide SCSI controllers
-scsibus* at iha?
ips* at pci? # IBM ServeRAID controllers
-scsibus* at ips?
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-scsibus* at isp?
aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
aic* at isapnp?
aic* at pcmcia? # PCMCIA based aic SCSI controllers
-scsibus* at aic?
siop* at pci? # NCR 538XX SCSI controllers(new)
-scsibus* at siop?
adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI
-scsibus* at adv?
adw* at pci? # AdvanSys ULTRA WIDE SCSI
-scsibus* at adw?
pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI
-scsibus* at pcscp?
sea0 at isa? disable iomem 0xc8000 irq 5 # Seagate ST0[12] SCSI controllers
-scsibus* at sea?
trm* at pci? # Tekram DC-3x5U SCSI Controllers
-scsibus* at trm?
uha0 at isa? port 0x330 # UltraStor [13]4f SCSI controllers
uha1 at isa? disable port 0x334 # UltraStor [13]4f SCSI controllers
uha* at eisa? # UltraStor 24f SCSI controllers
-scsibus* at uha?
wds0 at isa? disable port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
#wds1 at isa? port 0x358 irq 11 drq 5
-scsibus* at wds?
softraid0 at root # Software RAID
-scsibus* at softraid?
# I2O
iop* at pci? # I2O processor
ioprbs* at iop? # I2O arrays
-scsibus* at ioprbs?
iopsp* at iop? # I2O SCSI pass-through
-scsibus* at iopsp?
+scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
st* at scsibus? # SCSI tape drives
cd* at scsibus? # SCSI CD-ROM drives
@@ -293,7 +261,6 @@ wd* at pciide? flags 0x0000
# ATAPI<->SCSI
atapiscsi* at wdc?
atapiscsi* at pciide?
-scsibus* at atapiscsi?
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series
we1 at isa? port 0x300 iomem 0xcc000 irq 10 #