diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-29 20:52:10 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-06-29 20:52:10 +0000 |
| commit | 1c63422424678d077b8f6207ad065ce1012cd7ec (patch) | |
| tree | f06aa763bb28acf5e131818fd79869e578f2addd /sys | |
| parent | ad0b39e32d3724d10b4909d983b7289f9f4d7874 (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')
71 files changed, 142 insertions, 539 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 23c906a21f3..7b929dd1334 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.222 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.223 2011/06/29 20:52:08 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -90,7 +90,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 @@ -162,7 +161,6 @@ scc0 at ioasic? scc1 at ioasic? tcds* at tc? asc* at tcds? -scsibus* at asc? asc* at tc? #cfb* at tc? #sfb* at tc? @@ -195,31 +193,19 @@ cy* at pci? # PCI cyclom card # PCI SCSI devices ahc* at pci? # Adaptec 2940 SCSI controllers -scsibus* at ahc? isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel -scsibus* at isp? siop* at pci? # NCR 53c8xx SCSI -scsibus* at siop? pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -scsibus* at pcscp? twe* at pci? # 3ware Escalade RAID controllers -scsibus* at twe? mpi* at pci? # LSI Logic Message Passing Interface -scsibus* at mpi? sili* at pci? # Silicon Image 3124/3132/3531 SATA -scsibus* at sili? #UNTESTED: the following drivers are untested. adw* at pci? # AdvanSys ULTRA WIDE SCSI -scsibus* at adw? ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers -scsibus* at ciss? gdt* at pci? # ICP Vortex GDT RAID controllers -scsibus* at gdt? #adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI -#scsibus* at adv? #ami* at pci? # AMI MegaRAID controllers -#scsibus* at ami? # Networking devices lmc* at pci? # Lan Media Corp SSI/T3/HSSI @@ -355,7 +341,6 @@ fdc0 at isa? port 0x3f0 irq 6 drq 2 # floppy controller fd* at fdc? #aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI -#scsibus* at aic? # option for using CD1400 handshaking for incoming data # requires a special cable that exchanges the RTS and DTR lines @@ -367,6 +352,7 @@ fea* at eisa? # DEC DEFEA FDDI cards ahc* at eisa? # Adaptec 274x, aic7770 SCSI # SCSI devices +scsibus* at scsi? cd* at scsibus? sd* at scsibus? st* at scsibus? @@ -385,7 +371,6 @@ wd* at pciide? flags 0x0000 # ATAPI<->SCSI atapiscsi* at wdc? atapiscsi* at pciide? -scsibus* at atapiscsi? # Audio devices cmpci* at pci? # C-Media CMI8338/8738 diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index 4eba29d4fb4..8015a47cca7 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.70 2009/06/24 11:38:39 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.71 2011/06/29 20:52:08 matthew Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -138,14 +138,11 @@ wd* at pciide? flags 0x0000 #atapiscsi* at wdc? #atapiscsi* at pciide? -#scsibus* at atapiscsi? # SCSI bus support -#scsibus* at asc? -scsibus* at siop? -scsibus* at isp? # SCSI devices +scsibus* at scsi? #cd* at scsibus? # SCSI CD-ROM drives sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB index 8590ef0a816..95f81e48248 100644 --- a/sys/arch/alpha/conf/RAMDISKB +++ b/sys/arch/alpha/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.36 2009/06/25 13:06:16 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.37 2011/06/29 20:52:08 matthew Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -133,15 +133,11 @@ wd* at pciide? flags 0x0000 #atapiscsi* at wdc? #atapiscsi* at pciide? -#scsibus* at atapiscsi? # SCSI bus support -#scsibus* at asc? -scsibus* at ahc? -scsibus* at siop? -scsibus* at isp? # SCSI devices +scsibus* at scsi? #cd* at scsibus? # SCSI CD-ROM drives sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index f10a801e7f1..d26bfe1b5ac 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.83 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISKBIG,v 1.84 2011/06/29 20:52:08 matthew Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -78,7 +78,6 @@ uhid* at uhidev? # USB Generic HID devices # USB Mass Storage devices umass* at uhub? -scsibus* at umass? # USB Modems #umodem* at uhub? @@ -126,7 +125,6 @@ scc1 at ioasic? tcds* at tc? asc* at tcds? asc* at tc? -scsibus* at asc? #cfb* at tc? #sfb* at tc? le* at tc? @@ -159,27 +157,17 @@ cy* at pci? # PCI cyclom card # PCI SCSI devices ahc* at pci? # Adaptec 2940 SCSI controllers -scsibus* at ahc? isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel -scsibus* at isp? siop* at pci? # NCR 53c8xx SCSI -scsibus* at siop? pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -scsibus* at pcscp? twe* at pci? # 3ware Escalade RAID controllers -scsibus* at twe? softraid0 at root # Software RAID -scsibus* at softraid? #UNTESTED: the following drivers are untested. adw* at pci? # AdvanSys ULTRA WIDE SCSI -scsibus* at adw? ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers -scsibus* at ciss? gdt* at pci? # ICP Vortex GDT RAID controllers -scsibus* at gdt? #adv* at pci? # AdvanSys 1200A/B and ULTRA SCSI -#scsibus* at adv? # PCI Network devices pcn* at pci? # AMD PCnet-PCI Ethernet @@ -283,7 +271,6 @@ lc1 at isa? port 0x280 # DEC EtherWorks cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom card #aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI -#scsibus* at aic? #ahc0 at isa? # Adaptec 284x SCSI controllers @@ -292,6 +279,7 @@ fea* at eisa? # DEC DEFEA FDDI cards ahc* at eisa? # Adaptec 274x, aic7770 SCSI # SCSI devices +scsibus* at scsi? cd* at scsibus? sd* at scsibus? st* at scsibus? @@ -308,7 +296,6 @@ wd* at pciide? flags 0x0000 # ATAPI<->SCSI #atapiscsi* at wdc? atapiscsi* at pciide? -scsibus* at atapiscsi? # Workstation Console attachments #wsdisplay* at cfb? diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 364ba086571..09f2cc83f97 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.321 2011/06/20 06:06:34 dlg Exp $ +# $OpenBSD: GENERIC,v 1.322 2011/06/29 20:52:08 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -200,7 +200,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 @@ -259,7 +258,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 @@ -335,60 +333,36 @@ lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports lpt* at puc? #bha* at pci? # BusLogic [57]4X SCSI controllers -#scsibus* at bha? ahc* at pci? # Adaptec 2940 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 -scsibus* at sili? ahd* at pci? # Adaptec 79?? SCSI controllers -scsibus* at ahd? arc* at pci? # Areca RAID Controller -scsibus* at arc? mpi* at pci? # LSI Logic Message Passing Interface -scsibus* at mpi? mpii* at pci? # LSI 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 -#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? aic* at pcmcia? # PCMCIA Adaptec 152[02] SCSI -scsibus* at aic? #esp* at pcmcia? # PCMCIA based NCR 53C9X SCSI -#scsibus* at esp? siop* at pci? # NCR 538XX SCSI controllers -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? #trm* at pci? # Tekram DC-3x5U SCSI Controllers -#scsibus* at trm? +scsibus* at scsi? sd* at scsibus? # SCSI disk drives st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives @@ -415,7 +389,6 @@ wd* at pciide? flags 0x0000 # ATAPI<->SCSI atapiscsi* at wdc? atapiscsi* at pciide? -scsibus* at atapiscsi? # Networking devices lmc* at pci? # Lan Media Corp SSI/T3/HSSI @@ -615,9 +588,7 @@ safe* at pci? # SafeNet SafeXcel 1141/1741 # I2O iop* at pci? # I2O processor ioprbs* at iop? # I2O arrays -scsibus* at ioprbs? iopsp* at iop? # I2O SCSI pass-through -scsibus* at iopsp? # 1-Wire devices option ONEWIREVERBOSE diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index 1fdbc93fb41..d78143dfc2b 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.51 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.52 2011/06/29 20:52:08 matthew Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -97,7 +97,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 @@ -131,51 +130,31 @@ com1 at isa? port 0x2f8 irq 3 #lpt2 at isa? port 0x3bc #bha* at pci? -#scsibus* at bha? #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 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 -#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? #aic* at pcmcia? # PCMCIA Adaptec 152[02] SCSI -#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? #trm* at pci? # Tekram DC-3x5U SCSI Controllers -#scsibus* at trm? # 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 @@ -198,7 +177,6 @@ wd* at pciide? flags 0x0000 # ATAPI<->SCSI #atapiscsi* at wdc? atapiscsi* at pciide? -scsibus* at atapiscsi? #de* at pci? # DC21X4X-based ethernet fxp* at pci? # EtherExpress 10/100B ethernet diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 09af8ea563e..cab8eba6789 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.118 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK_CD,v 1.119 2011/06/29 20:52:08 matthew Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -102,7 +102,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 @@ -155,66 +154,40 @@ com2 at isa? port 0x3e8 irq 5 #lpt2 at isa? port 0x3bc #bha* at pci? -#scsibus* at bha? ahc* at pci? # Adaptec 2940 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 Controller -scsibus* at arc? mpi* at pci? # LSI Logic Message Passing Interface -scsibus* at mpi? mpii* at pci? # LSI 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 -#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? #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? #trm* at pci? # Tekram DC-3x5U SCSI Controllers -#scsibus* at trm? 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 @@ -239,7 +212,6 @@ wd* at pciide? flags 0x0000 # ATAPI<->SCSI atapiscsi* at wdc? atapiscsi* at pciide? -scsibus* at atapiscsi? de* at pci? # DC21X4X-based ethernet fxp* at pci? # EtherExpress 10/100B ethernet diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC index ab4f6eed5a6..77da2129fbc 100644 --- a/sys/arch/armish/conf/GENERIC +++ b/sys/arch/armish/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.40 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.41 2011/06/29 20:52:08 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -61,7 +61,6 @@ pci0 at iopxs? bus ? # PCI/PCI-X support siop* at pci? # NCR 538XX SCSI controllers(new) -scsibus* at siop? em* at pci? re* at pci? ral* at pci? @@ -71,6 +70,7 @@ pciide* at pci? flags 0x0000 wd* at pciide? flags 0x0000 +scsibus* at scsi? sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives @@ -120,7 +120,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 diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK index df871b29c56..ea7457dc862 100644 --- a/sys/arch/armish/conf/RAMDISK +++ b/sys/arch/armish/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.18 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.19 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -63,7 +63,6 @@ pci0 at iopxs? bus ? # PCI/PCI-X support siop* at pci? # NCR 538XX SCSI controllers(new) -scsibus* at siop? em* at pci? re* at pci? ral* at pci? @@ -73,6 +72,7 @@ pciide* at pci? flags 0x0000 wd* at pciide? flags 0x0000 +scsibus* at scsi? sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives @@ -116,7 +116,6 @@ ucom* at umsm? #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 diff --git a/sys/arch/aviion/conf/GENERIC b/sys/arch/aviion/conf/GENERIC index 80940023ee7..9ae6549b85b 100644 --- a/sys/arch/aviion/conf/GENERIC +++ b/sys/arch/aviion/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.6 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: GENERIC,v 1.7 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -86,8 +86,8 @@ le* at vme? a32 0x55980000 a16 0x5000 ipl 1 # SCSI devices # -scsibus* at oosiop? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/beagle/conf/GENERIC b/sys/arch/beagle/conf/GENERIC index 50e071d7f3a..19db0a17e26 100644 --- a/sys/arch/beagle/conf/GENERIC +++ b/sys/arch/beagle/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.5 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: GENERIC,v 1.6 2011/06/29 20:52:09 matthew Exp $ # # GENERIC machine description file # @@ -122,7 +122,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 @@ -149,6 +148,7 @@ ugen* at uhub? # USB Generic driver ukphy* at mii? # "unknown" PHYs +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? @@ -166,7 +166,6 @@ com0 at ahb? addr 0x49020000 size 0x400 intr 74 # UART3 #wsdisplay* at omdisplay? console ? sdmmc* at ommmc? # SD/MMC bus -scsibus* at sdmmc? # SCSI emulation # Bluetooth controllers #sbt* at sdmmc? disable # SDIO Bluetooth diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK index 09c381c2ba5..cd75837f07f 100644 --- a/sys/arch/beagle/conf/RAMDISK +++ b/sys/arch/beagle/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.9 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: RAMDISK,v 1.10 2011/06/29 20:52:09 matthew Exp $ # # GENERIC machine description file # @@ -154,6 +154,7 @@ ommmc0 at ahb? addr 0x4809c000 intr 83 # # ukphy* at mii? # "unknown" PHYs # +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? @@ -172,7 +173,6 @@ com0 at ahb? addr 0x49020000 size 0x400 intr 74 # UART3 #wsdisplay* at omdisplay? console ? sdmmc* at ommmc? # SD/MMC bus -scsibus* at sdmmc? # SCSI emulation # Bluetooth controllers #sbt* at sdmmc? disable # SDIO Bluetooth diff --git a/sys/arch/gumstix/conf/GENERIC b/sys/arch/gumstix/conf/GENERIC index 4b7688cb18f..0eca8bff6c9 100644 --- a/sys/arch/gumstix/conf/GENERIC +++ b/sys/arch/gumstix/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.12 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.13 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -101,7 +101,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 @@ -136,6 +135,7 @@ uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? utwitch* at uhidev? # YUREX BBU sensor +scsibus* at scsi? sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives @@ -205,7 +205,6 @@ ukphy* at mii? # "unknown" PHYs #pxammc0 at pxaip? # MMC/SD/SDIO controller #sdmmc* at pxammc? # SD/MMC bus -#scsibus* at sdmmc? # SCSI emulation # Bluetooth controllers #sbt* at sdmmc? disable # SDIO Bluetooth diff --git a/sys/arch/gumstix/conf/RAMDISK b/sys/arch/gumstix/conf/RAMDISK index d257cacecec..08797a502e5 100644 --- a/sys/arch/gumstix/conf/RAMDISK +++ b/sys/arch/gumstix/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.3 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: RAMDISK,v 1.4 2011/06/29 20:52:09 matthew Exp $ machine gumstix arm @@ -92,13 +92,12 @@ pxaost0 at pxaip? addr 0x40a00000 size 0x20 #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver #umass* at uhub? # USB Mass Storage devices -#scsibus* at umass? # SD/MMC support #pxammc0 at pxaip? # MMC/SD/SDIO controller #sdmmc* at pxammc? # SD/MMC bus -#scsibus* at sdmmc? # SCSI emulation +#scsibus* at scsi? #sd* at scsibus? #st* at scsibus? #cd* at scsibus? diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index 0e4187c53a2..e410009217e 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.51 2010/11/19 20:52:39 miod Exp $ +# $OpenBSD: GENERIC,v 1.52 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -119,8 +119,8 @@ mt* at hpibbus? # HP-IB 9-track tape ppi0 at hpibbus0 slave 5 punit 0 # HP-IB plotter spc* at dio? flags 0x00 # SCSI controller -scsibus* at spc? +scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK index 5ce9535eb5e..39835a9cf1f 100644 --- a/sys/arch/hp300/conf/RAMDISK +++ b/sys/arch/hp300/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.30 2008/06/08 20:37:39 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.31 2011/06/29 20:52:09 matthew Exp $ # # Ram disk kernel. # @@ -128,8 +128,8 @@ ct* at hpibbus? # HP-IB cartridge tapes mt* at hpibbus? # HP-IB 9-track tape spc* at dio? flags 0x00 # SCSI controller -scsibus* at spc? +scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index 41ef9314b63..8eb01fde08b 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.143 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.144 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -107,7 +107,6 @@ ucom* at uplcom? uark* at uhub? # Arkmicro ARK3116 serial ucom* at uark? 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 @@ -235,9 +234,7 @@ ie0 at gsc0 irq 8 # 82C596DX/CA ether #siop* at gsc? irq 3 # NCR 53C720 (Fast-Wide HVD) osiop* at gsc? irq 9 # NCR 53C710 (Narrow SE) #osiop* at eisa? -scsibus* at osiop? oosiop* at gsc? irq 9 # NCR 53C700 (Narrow SE) -scsibus* at oosiop? harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) audio* at harmony? gsckbc* at gsc? irq 26 @@ -246,26 +243,19 @@ pms* at gsckbc? # PS/2 mouse #sh* at eisa? # Interphase Seahawk 4811 EISA/FDDI #ahb* at eisa? # Adaptec 174[024] SCSI controllers -#scsibus* at aha? #ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers ahc* at pci? # Adaptec 2940 SCSI controllers -scsibus* at ahc? mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface -scsibus* at mpi? #option BHADEBUG #bha* at eisa? #bha* at pci? -#scsibus* at bha? isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel -scsibus* at isp? siop* at mainbus? irq 3 # NCR 53C720 (Fast-Wide HVD) siop* at phantomas? irq 3 siop* at uturn? irq 3 siop* at pci? # NCR 53C8XX SCSI controllers -scsibus* at siop? #ahd* at pci? # Adaptec 79?? SCSI controllers -#scsibus* at ahd? em* at pci? # Intel Pro/1000 ethernet ti* at pci? # Alteon Tigon 1Gb ethernet @@ -347,10 +337,10 @@ wdc* at pcmcia? wd* at wdc? flags 0x0000 wd* at pciide? flags 0x0000 atapiscsi* at pciide? -scsibus* at atapiscsi? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index 919a68e428e..5fe1e7f052f 100644 --- a/sys/arch/hppa/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.92 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.93 2011/06/29 20:52:09 matthew Exp $ # # Diskless kernel config # @@ -114,7 +114,6 @@ uhub* at uhub? # USB Hubs #uftdi* at uhub? # FTDI FT8U100AX serial adapter #ucom* at uftdi? 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 @@ -213,9 +212,7 @@ ie0 at gsc0 irq 8 # 82C596DX/CA ether #tms* at gsc? irq 10 # TMS380C26 Network Controller osiop* at gsc? irq 9 # NCR 53C710 (Narrow SE) #osiop* at eisa? -scsibus* at osiop? oosiop* at gsc? irq 9 # NCR 53C700 (Narrow SE) -scsibus* at oosiop? #harmony* at gsc? irq 13 # Audio Type 2 (CS4215/AD1849) #audio* at harmony? gsckbc* at gsc? irq 26 @@ -224,26 +221,19 @@ pckbd* at gsckbc? # PS/2 keyboard #sh* at eisa? # Interphase Seahawk 4811 EISA/FDDI #ahb* at eisa? # Adaptec 174[024] SCSI controllers -#scsibus* at aha? #ahc* at eisa? # Adaptec 274x, aic7770 SCSI controllers ahc* at pci? # Adaptec 2940 SCSI controllers -scsibus* at ahc? mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface -scsibus* at mpi? #option BHADEBUG #bha* at eisa? #bha* at pci? -#scsibus* at bha? siop* at mainbus? irq 3 # NCR 53C720 (Fast/Wide HVD) siop* at phantomas? irq 3 siop* at uturn? irq 3 siop* at pci? # NCR 53C8XX SCSI controllers -scsibus* at siop? #ahd* at pci? # Adaptec 79?? SCSI controllers -#scsibus* at ahd? softraid0 at root # Software RAID -scsibus* at softraid? em* at pci? # Intel Pro/1000 ethernet #ti* at pci? # Alteon Tigon 1Gb ethernet @@ -325,10 +315,10 @@ wdc* at pcmcia? wd* at wdc? flags 0x0000 wd* at pciide? flags 0x0000 atapiscsi* at pciide? -scsibus* at atapiscsi? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC index 95911400185..9024d18c91f 100644 --- a/sys/arch/hppa64/conf/GENERIC +++ b/sys/arch/hppa64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.24 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.25 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -87,7 +87,6 @@ pci* at ppb? #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 @@ -121,9 +120,7 @@ pci* at ppb? #ie* at pci? siop* at pci? # NCR 538XX SCSI controllers(new) -scsibus* at siop? #ahd* at pci? # Adaptec 79?? SCSI controllers -#scsibus* at ahd? #em* at pci? # Intel Pro/1000 ethernet #ti* at pci? # Alteon Tigon 1Gb ethernet @@ -171,10 +168,10 @@ ukphy* at mii? # generic unknown PHYs #wd* at wdc? flags 0x0000 #wd* at pciide? flags 0x0000 #atapiscsi* at pciide? -#scsibus* at atapiscsi? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? #st* at scsibus? #cd* at scsibus? diff --git a/sys/arch/hppa64/conf/RAMDISK b/sys/arch/hppa64/conf/RAMDISK index e1949ba0901..533915a7738 100644 --- a/sys/arch/hppa64/conf/RAMDISK +++ b/sys/arch/hppa64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.11 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.12 2011/06/29 20:52:09 matthew Exp $ # # Diskless kernel config # @@ -88,7 +88,6 @@ pcmcia* at cardslot? #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 @@ -120,15 +119,11 @@ pcmcia* at cardslot? #ep* at pci? # 3c59x ethernets ahc* at pci? # Adaptec 2940 SCSI controllers -scsibus* at ahc? #option BHADEBUG #bha* at pci? -#scsibus* at bha? siop* at pci? # NCR 538XX SCSI controllers(new) -scsibus* at siop? #ahd* at pci? # Adaptec 79?? SCSI controllers -#scsibus* at ahd? #em* at pci? # Intel Pro/1000 ethernet #ti* at pci? # Alteon Tigon 1Gb ethernet @@ -176,10 +171,10 @@ ukphy* at mii? # generic unknown PHYs #wd* at wdc? flags 0x0000 #wd* at pciide? flags 0x0000 #atapiscsi* at pciide? -#scsibus* at atapiscsi? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? 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 # diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC index 1b4fff0e667..9c5a77f3a1c 100644 --- a/sys/arch/landisk/conf/GENERIC +++ b/sys/arch/landisk/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.34 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.35 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -72,7 +72,6 @@ ukphy* at mii? # generic unknown PHYs pciide* at pci? wd* at pciide? atapiscsi* at pciide? flags 0x0000 -scsibus* at atapiscsi? # USB Controller and Devices @@ -119,7 +118,6 @@ audio* at uaudio? #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 @@ -176,6 +174,7 @@ bthidev* at bthub? # Bluetooth HID support btsco* at bthub? # Bluetooth audio support audio* at btsco? +scsibus* at scsi? sd* at scsibus? # SCSI disk drives cd* at scsibus? # SCSI CD-ROM drives diff --git a/sys/arch/landisk/conf/RAMDISK b/sys/arch/landisk/conf/RAMDISK index 8420878cd19..551e5bf1629 100644 --- a/sys/arch/landisk/conf/RAMDISK +++ b/sys/arch/landisk/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.14 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.15 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -76,7 +76,6 @@ ukphy* at mii? # generic unknown PHYs pciide* at pci? wd* at pciide? atapiscsi* at pciide? flags 0x0000 -scsibus* at atapiscsi? # USB Controller and Devices @@ -92,7 +91,6 @@ usb* at ohci? uhub* at usb? uhub* at uhub? port ? configuration ? interface ? umass* at uhub? # USB Mass Storage devices -scsibus* at umass? aue* at uhub? # ADMtek AN986 Pegasus Ethernet atu* at uhub? # Atmel AT76c50x based 802.11b axe* at uhub? # ASIX Electronics AX88172 USB Ethernet @@ -116,6 +114,7 @@ zyd* at uhub? # Zydas ZD1211 #uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter #onewire* at uow? +scsibus* at scsi? sd* at scsibus? # SCSI disk drives cd* at scsibus? # SCSI CD-ROM drives diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC index f0a098a99b4..a84ee62d874 100644 --- a/sys/arch/loongson/conf/GENERIC +++ b/sys/arch/loongson/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.34 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.35 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -122,7 +122,6 @@ uchcom* at uhub? # WinChipHead CH341/340 serial ucom* at uchcom? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices @@ -201,6 +200,7 @@ urlphy* at mii? # Realtek RTL8150L internal PHY ukphy* at mii? # "unknown" PHYs # SCSI Bus devices +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK index 1a8c722980c..c6bbf9aa1c6 100644 --- a/sys/arch/loongson/conf/RAMDISK +++ b/sys/arch/loongson/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.18 2011/05/25 21:19:59 miod Exp $ +# $OpenBSD: RAMDISK,v 1.19 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -102,7 +102,6 @@ ucom* at ubsa? uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter ucom* at uplcom? 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 @@ -143,6 +142,7 @@ rlphy* at mii? # RealTek 8139 internal PHYs urlphy* at mii? # Realtek RTL8150L internal PHY ukphy* at mii? # "unknown" PHYs +scsibus* at scsi? sd* at scsibus? #st* at scsibus? cd* at scsibus? diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC index 166406e3b17..280a99477af 100644 --- a/sys/arch/luna88k/conf/GENERIC +++ b/sys/arch/luna88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.14 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: GENERIC,v 1.15 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -46,9 +46,9 @@ wskbd* at ws? wsmouse* at ws? # SCSI bus support -scsibus* at spc? # SCSI devices +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/luna88k/conf/RAMDISK b/sys/arch/luna88k/conf/RAMDISK index e88a58fa626..28756370ddd 100644 --- a/sys/arch/luna88k/conf/RAMDISK +++ b/sys/arch/luna88k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.9 2008/06/08 20:37:39 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.10 2011/06/29 20:52:09 matthew Exp $ machine luna88k m88k @@ -51,9 +51,9 @@ wskbd* at ws? wsmouse* at ws? # SCSI bus support -scsibus* at spc? # SCSI devices +scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROM diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index 8e62e6aabef..624730f3136 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.50 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: GENERIC,v 1.51 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -62,10 +62,8 @@ wsmouse* at ams? mux 0 ncrscsi0 at obio? # SCSI NCR 5380 sbc0 at obio? disable flags 0x1 # MI NCR 5380 SCSI Bus Controller -scsibus* at esp? -scsibus* at ncrscsi? -scsibus* at sbc? +scsibus* at scsi? sd* at scsibus? # SCSI disk drives st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK index 219ce64144e..704a29355df 100644 --- a/sys/arch/mac68k/conf/RAMDISK +++ b/sys/arch/mac68k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.23 2008/06/08 20:37:39 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.24 2011/06/29 20:52:09 matthew Exp $ # # RAMDISK - bsd.rd configuration file (non-SBC version) @@ -68,10 +68,8 @@ wskbd* at akbd? ncrscsi0 at obio? # SCSI NCR 5380 sbc0 at obio? disable flags 0x1 # MI NCR 5380 SCSI Bus Controller -scsibus* at esp? -scsibus* at ncrscsi? -scsibus* at sbc? +scsibus* at scsi? sd* at scsibus? # SCSI disk drives st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 1195dcac1f0..d56f386bbb0 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.210 2011/05/25 07:42:15 mpi Exp $g +# $OpenBSD: GENERIC,v 1.211 2011/06/29 20:52:09 matthew Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -186,19 +186,6 @@ puc* at pci? # PCI "universal" comm device #puc* at cardbus? com* at puc? -#scsibus* at adv? -scsibus* at ahc? -#scsibus* at ami? -#scsibus* at bha? -#scsibus* at esp? -scsibus* at mesh? -scsibus* at ioprbs? -scsibus* at iopsp? -scsibus* at pcscp? -scsibus* at isp? -scsibus* at mpi? -scsibus* at arc? -scsibus* at siop? mediabay* at macobio? wdc* at mediabay? @@ -207,7 +194,6 @@ wd* at wdc? flags 0x0000 wd* at pciide? flags 0x0000 atapiscsi* at wdc? flags 0x0000 atapiscsi* at pciide? flags 0x0000 -scsibus* at atapiscsi? # USB Controllers ohci* at pci? # Open Host Controller @@ -256,7 +242,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 tpms* at uhidev? # Apple touchpad mouse wsmouse* at tpms? mux 0 @@ -388,6 +373,7 @@ audio* at daca? # MIDI support midi* at eap? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 208588a7c97..af8ec6632fb 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.90 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: RAMDISK,v 1.91 2011/06/29 20:52:09 matthew Exp $ # # PPC GENERIC config file # @@ -142,19 +142,6 @@ wskbd* at akbd? mux 1 zsc* at macobio? zstty* at zsc? -scsibus* at siop? -#scsibus* at adv? -scsibus* at ahc? -#scsibus* at bha? -#scsibus* at esp? -scsibus* at mesh? -scsibus* at ioprbs? -scsibus* at iopsp? -scsibus* at pcscp? -scsibus* at isp? -scsibus* at mpi? -scsibus* at arc? -scsibus* at softraid? mediabay* at macobio? wdc* at mediabay? @@ -163,7 +150,6 @@ wd* at wdc? flags 0x0000 wd* at pciide? atapiscsi* at wdc? flags 0x0000 atapiscsi* at pciide? flags 0x0000 -scsibus* at atapiscsi? # USB Controllers ohci* at pci? # Open Host Controller @@ -202,7 +188,6 @@ wi* at uhub? # WaveLAN IEEE 802.11DS #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices -scsibus* at umass? # CardBus bus support cardbus* at cardslot? @@ -220,6 +205,7 @@ wdc* at pcmcia? wsdisplay* at vgafb? wskbd* at ukbd? mux 1 +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC index 69a00cce8ba..aa972571cf3 100644 --- a/sys/arch/mvme68k/conf/GENERIC +++ b/sys/arch/mvme68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.35 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: GENERIC,v 1.36 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -109,11 +109,8 @@ le* at vmes0 addr 0xffff1600 ipl 3 vec 0x76 vmel0 at vme0 -scsibus* at osiop? -scsibus* at vs? -scsibus* at vsbic? -scsibus* at wdsc? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147 index 91e91838708..67190de5e94 100644 --- a/sys/arch/mvme68k/conf/MVME147 +++ b/sys/arch/mvme68k/conf/MVME147 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME147,v 1.25 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: MVME147,v 1.26 2011/06/29 20:52:09 matthew Exp $ machine mvme68k m68k @@ -45,10 +45,8 @@ le* at vmes0 addr 0xffff1600 ipl 3 vec 0x76 vmel0 at vme0 -scsibus* at wdsc? -#scsibus* at vs? -#scsibus* at vsbic? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162 index ae93dcd5cb5..1f0c8497b89 100644 --- a/sys/arch/mvme68k/conf/MVME162 +++ b/sys/arch/mvme68k/conf/MVME162 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME162,v 1.28 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: MVME162,v 1.29 2011/06/29 20:52:09 matthew Exp $ machine mvme68k m68k @@ -52,10 +52,8 @@ le* at vmes0 addr 0xffff1600 ipl 3 vec 0x76 vmel0 at vme0 -scsibus* at osiop? -scsibus* at vs? -scsibus* at vsbic? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167 index 23801c6a510..71c6c4716db 100644 --- a/sys/arch/mvme68k/conf/MVME167 +++ b/sys/arch/mvme68k/conf/MVME167 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME167,v 1.28 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: MVME167,v 1.29 2011/06/29 20:52:09 matthew Exp $ machine mvme68k m68k @@ -48,10 +48,8 @@ le* at vmes0 addr 0xffff1600 ipl 3 vec 0x76 vmel0 at vme0 -scsibus* at osiop? -scsibus* at vs? -scsibus* at vsbic? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme68k/conf/MVME177 b/sys/arch/mvme68k/conf/MVME177 index 9cddddf8444..cc1cc48e958 100644 --- a/sys/arch/mvme68k/conf/MVME177 +++ b/sys/arch/mvme68k/conf/MVME177 @@ -1,4 +1,4 @@ -# $OpenBSD: MVME177,v 1.17 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: MVME177,v 1.18 2011/06/29 20:52:09 matthew Exp $ machine mvme68k m68k @@ -47,10 +47,8 @@ le* at vmes0 addr 0xffff1600 ipl 3 vec 0x76 vmel0 at vme0 -scsibus* at osiop? -scsibus* at vs? -scsibus* at vsbic? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme68k/conf/RAMDISK b/sys/arch/mvme68k/conf/RAMDISK index d7ba6b1fa0b..62fa8878c48 100644 --- a/sys/arch/mvme68k/conf/RAMDISK +++ b/sys/arch/mvme68k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.14 2009/04/12 16:11:40 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.15 2011/06/29 20:52:09 matthew Exp $ machine mvme68k m68k @@ -115,11 +115,8 @@ le* at vmes0 addr 0xffff1600 ipl 3 vec 0x76 vmel0 at vme0 -scsibus* at osiop? -scsibus* at vs? -scsibus* at vsbic? -scsibus* at wdsc? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index 662c80f8af0..72017ad2b38 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.54 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: GENERIC,v 1.55 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -77,10 +77,8 @@ le0 at vmes0 addr 0xffff1200 ipl 3 le1 at vmes0 addr 0xffff1400 ipl 3 le2 at vmes0 addr 0xffff1600 ipl 3 -scsibus* at osiop? -scsibus* at vs? -scsibus* at vsbic? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187 index 6c5965a2ab1..488604a83b4 100644 --- a/sys/arch/mvme88k/conf/M187 +++ b/sys/arch/mvme88k/conf/M187 @@ -1,4 +1,4 @@ -# $OpenBSD: M187,v 1.37 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: M187,v 1.38 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -66,10 +66,8 @@ le0 at vmes0 addr 0xffff1200 ipl 3 le1 at vmes0 addr 0xffff1400 ipl 3 le2 at vmes0 addr 0xffff1600 ipl 3 -scsibus* at osiop? -scsibus* at vs? -scsibus* at vsbic? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188 index eb4e0158cf8..7c548af2973 100644 --- a/sys/arch/mvme88k/conf/M188 +++ b/sys/arch/mvme88k/conf/M188 @@ -1,4 +1,4 @@ -# $OpenBSD: M188,v 1.30 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: M188,v 1.31 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -60,9 +60,8 @@ le0 at vmes0 addr 0xffff1200 ipl 3 le1 at vmes0 addr 0xffff1400 ipl 3 le2 at vmes0 addr 0xffff1600 ipl 3 -scsibus* at vs? -scsibus* at vsbic? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197 index 4c10bc3fc9a..c9f056a824d 100644 --- a/sys/arch/mvme88k/conf/M197 +++ b/sys/arch/mvme88k/conf/M197 @@ -1,4 +1,4 @@ -# $OpenBSD: M197,v 1.33 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: M197,v 1.34 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -61,10 +61,8 @@ le0 at vmes0 addr 0xffff1200 ipl 3 le1 at vmes0 addr 0xffff1400 ipl 3 le2 at vmes0 addr 0xffff1600 ipl 3 -scsibus* at osiop? -scsibus* at vs? -scsibus* at vsbic? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK index 391d8be6b59..b9bcd2917a7 100644 --- a/sys/arch/mvme88k/conf/RAMDISK +++ b/sys/arch/mvme88k/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.32 2009/02/14 17:41:40 miod Exp $ +# $OpenBSD: RAMDISK,v 1.33 2011/06/29 20:52:09 matthew Exp $ machine mvme88k m88k @@ -75,10 +75,8 @@ le0 at vmes0 addr 0xffff1200 ipl 3 le1 at vmes0 addr 0xffff1400 ipl 3 le2 at vmes0 addr 0xffff1600 ipl 3 -scsibus* at osiop? -scsibus* at vs? -scsibus* at vsbic? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC index 8aec953ebfc..fbe5bd94032 100644 --- a/sys/arch/mvmeppc/conf/GENERIC +++ b/sys/arch/mvmeppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.12 2010/09/26 20:39:08 miod Exp $ +# $OpenBSD: GENERIC,v 1.13 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -68,7 +68,6 @@ isa* at pcib? #### SCSI attachment points -scsibus* at siop? #wdc* at mainbus? flags 0x0 #wd* at wdc? flags 0x0000 @@ -76,10 +75,10 @@ scsibus* at siop? #atapiscsi* at wdc? flags 0x0000 # ATAPI<->SCSI -#scsibus* at atapiscsi? #### SCSI Bus devices +scsibus* at scsi? sd0 at scsibus? target 0 lun 0 #st* at scsibus? #cd* at scsibus? diff --git a/sys/arch/mvmeppc/conf/RAMDISK b/sys/arch/mvmeppc/conf/RAMDISK index e2d18eeb903..4bd8d499971 100644 --- a/sys/arch/mvmeppc/conf/RAMDISK +++ b/sys/arch/mvmeppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.13 2010/09/26 20:39:08 miod Exp $ +# $OpenBSD: RAMDISK,v 1.14 2011/06/29 20:52:09 matthew Exp $ # # MVMEPPC GENERIC config file # @@ -64,7 +64,6 @@ isa* at pcib? #### SCSI attachment points -scsibus* at siop? #wdc* at mainbus? flags 0x0 #wd* at wdc? flags 0x0000 @@ -72,10 +71,10 @@ scsibus* at siop? #atapiscsi* at wdc? flags 0x0000 # ATAPI<->SCSI -#scsibus* at atapiscsi? #### SCSI Bus devices +scsibus* at scsi? sd0 at scsibus? target 0 lun 0 #st* at scsibus? #cd* at scsibus? diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC index f48280a5c96..923818915ec 100644 --- a/sys/arch/palm/conf/GENERIC +++ b/sys/arch/palm/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.12 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -88,7 +88,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 @@ -124,6 +123,7 @@ uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? utwitch* at uhidev? # YUREX BBU sensor +scsibus* at scsi? sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives @@ -191,7 +191,6 @@ wsdisplay* at lcd? console ? pxammc0 at pxaip? addr 0x41100000 # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus -scsibus* at sdmmc? # SCSI emulation # Bluetooth controllers sbt* at sdmmc? disable # SDIO Bluetooth diff --git a/sys/arch/palm/conf/RAMDISK b/sys/arch/palm/conf/RAMDISK index 9c3cfd7d0a3..676d780cb7b 100644 --- a/sys/arch/palm/conf/RAMDISK +++ b/sys/arch/palm/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.7 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: RAMDISK,v 1.8 2011/06/29 20:52:09 matthew Exp $ machine palm arm @@ -83,15 +83,13 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host #uyap* at uhub? # Y@P firmware loader ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices -scsibus* at umass? # SD/MMC support pxammc0 at pxaip? addr 0x41100000 # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus -scsibus* at sdmmc? # SCSI emulation softraid0 at root # Software RAID -scsibus* at softraid? +scsibus* at scsi? sd* at scsibus? #st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27 index 26c5258e5ca..67c7df04275 100644 --- a/sys/arch/sgi/conf/GENERIC-IP27 +++ b/sys/arch/sgi/conf/GENERIC-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP27,v 1.41 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC-IP27,v 1.42 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. # @@ -80,10 +80,6 @@ isp* at pci? mpi* at pci? siop* at pci? -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? # CardBus bus support cbb* at pci? @@ -117,7 +113,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices @@ -252,6 +247,7 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30 index 722c6755eac..2af4986d2c6 100644 --- a/sys/arch/sgi/conf/GENERIC-IP30 +++ b/sys/arch/sgi/conf/GENERIC-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP30,v 1.35 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC-IP30,v 1.36 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. # @@ -72,10 +72,6 @@ isp* at pci? mpi* at pci? siop* at pci? -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? # CardBus bus support cbb* at pci? @@ -109,7 +105,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices @@ -244,6 +239,7 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32 index 31163d6e61d..a5d0ce3401b 100644 --- a/sys/arch/sgi/conf/GENERIC-IP32 +++ b/sys/arch/sgi/conf/GENERIC-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP32,v 1.26 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC-IP32,v 1.27 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. # @@ -64,10 +64,6 @@ isp* at pci? mpi* at pci? siop* at pci? -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? # CardBus bus support cbb* at pci? @@ -101,7 +97,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners uhidev* at uhub? # Human Interface Devices @@ -240,6 +235,7 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index 46ca2425e3e..d9c75d0a006 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP27,v 1.25 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.26 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. @@ -109,7 +109,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #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 @@ -205,11 +204,8 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30 index 0b75b55436b..4dbe2f73a08 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP30 +++ b/sys/arch/sgi/conf/RAMDISK-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP30,v 1.21 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK-IP30,v 1.22 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. @@ -102,7 +102,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #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 @@ -198,11 +197,8 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 #### SCSI Bus devices -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32 index 45c4386f143..c058c6c9a56 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP32 +++ b/sys/arch/sgi/conf/RAMDISK-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP32,v 1.17 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK-IP32,v 1.18 2011/06/29 20:52:09 matthew Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. @@ -92,7 +92,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #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 @@ -189,11 +188,8 @@ pckbd* at mkbc? wskbd* at pckbd? console ? #### SCSI Bus devices -scsibus* at ahc? -scsibus* at isp? -scsibus* at mpi? -scsibus* at siop? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/socppc/conf/GENERIC b/sys/arch/socppc/conf/GENERIC index ca407f55d0a..8243ac1ac08 100644 --- a/sys/arch/socppc/conf/GENERIC +++ b/sys/arch/socppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.21 2011/01/12 22:16:19 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.22 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -63,7 +63,6 @@ uhub* at usb? # USB Hubs uhub* at uhub? # USB Hubs 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 @@ -89,6 +88,7 @@ utwitch* at uhidev? # YUREX BBU sensor udl* at uhub? wsdisplay* at udl? +scsibus* at scsi? sd* at scsibus? # On-board TSEC diff --git a/sys/arch/socppc/conf/RAMDISK b/sys/arch/socppc/conf/RAMDISK index f1e36c9a70b..03b49de0665 100644 --- a/sys/arch/socppc/conf/RAMDISK +++ b/sys/arch/socppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.8 2010/03/03 22:19:40 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.9 2011/06/29 20:52:09 matthew Exp $ machine socppc powerpc @@ -60,11 +60,11 @@ usb* at ehci? uhub* at usb? # USB Hubs uhub* at uhub? # USB Hubs umass* at uhub? # USB Mass Storage devices -scsibus* at umass? ural* at uhub? # Ralink RT2500USB rum* at uhub? # Ralink RT2501USB/RT2601USB zyd* at uhub? # Zydas ZD1211 +scsibus* at scsi? sd* at scsibus? # On-board TSEC diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 8563b4cf81c..4802c13be7d 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.100 2010/11/19 20:52:41 miod Exp $ +# $OpenBSD: GENERIC,v 1.101 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -337,13 +337,10 @@ ukphy* at mii? # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. -scsibus* at esp? -scsibus* at si? -scsibus* at sw? -scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK index 5a2386c6bd2..80b00eb29d0 100644 --- a/sys/arch/sparc/conf/RAMDISK +++ b/sys/arch/sparc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.71 2010/07/10 19:32:20 miod Exp $ +# $OpenBSD: RAMDISK,v 1.72 2011/06/29 20:52:09 matthew Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -311,12 +311,10 @@ wsdisplay* at rfx? # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. -scsibus* at esp? -scsibus* at si? -scsibus* at sw? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4 index f65c5043dbb..4d062a42c45 100644 --- a/sys/arch/sparc/conf/SUN4 +++ b/sys/arch/sparc/conf/SUN4 @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4,v 1.39 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: SUN4,v 1.40 2011/06/29 20:52:09 matthew Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -152,12 +152,10 @@ wsdisplay* at cgeight? # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. -scsibus* at esp? -scsibus* at si? -scsibus* at sw? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C index 2008010434a..1a770ce6dd5 100644 --- a/sys/arch/sparc/conf/SUN4C +++ b/sys/arch/sparc/conf/SUN4C @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4C,v 1.62 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: SUN4C,v 1.63 2011/06/29 20:52:09 matthew Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -174,11 +174,10 @@ ukphy* at mii? # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. -scsibus* at esp? -scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M index 538121a3760..e174a4a0a18 100644 --- a/sys/arch/sparc/conf/SUN4M +++ b/sys/arch/sparc/conf/SUN4M @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4M,v 1.78 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: SUN4M,v 1.79 2011/06/29 20:52:09 matthew Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -233,11 +233,10 @@ ukphy* at mii? # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. -scsibus* at esp? -scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 8df6fb61c65..a8f68f0ee79 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.265 2011/06/22 04:33:01 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.266 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -111,24 +111,17 @@ malo* at pcmcia? # Marvell 88W8385 # PCI SCSI ahc* at pci? # Adaptec 2940 SCSI controllers -scsibus* at ahc? siop* at pci? # NCR 538XX SCSI controllers -scsibus* at siop? isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI -scsibus* at pcscp? mpi* at pci? # LSI Logic Fusion MPT Message Passing Interface -scsibus* at mpi? arc* at pci? # Areca RAID Controllers -scsibus* at arc? 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? # PCI crypto hifn* at pci? # Hifn 7751/7811/7951 @@ -205,7 +198,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 +309,6 @@ pmc* at ebus? ppm* at ebus? wbsd* at ebus? sdmmc* at wbsd? -scsibus* at sdmmc? # performance counters uperf* at ebus? @@ -346,7 +337,6 @@ vcons0 at vbus? vrtc0 at vbus? vrng0 at vbus? vdsk* at cbus? -scsibus* at vdsk? vnet* at cbus? vcc* at cbus? vcctty* at vcc? @@ -384,7 +374,6 @@ sbpp* at spif? pciide* at pci? flags 0x0000 wd* at pciide? flags 0x0a00 atapiscsi* at pciide? -scsibus* at atapiscsi? wdc* at pcmcia? wd* at wdc? flags 0x0000 @@ -406,11 +395,10 @@ isp* at sbus? # SCSI bus layer. SCSI devices attach to the SCSI bus, which attaches # to the underlying hardware controller. -scsibus* at esp? -scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? # SCSI disks st* at scsibus? # SCSI tapes cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index 9474fb77277..ae0bface68d 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.100 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.101 2011/06/29 20:52:09 matthew Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -132,7 +132,6 @@ vcons0 at vbus? vrtc0 at vbus? vrng0 at vbus? vdsk* at cbus? -scsibus* at vdsk? vnet* at cbus? ## Lance Ethernet - AMD7990 @@ -154,7 +153,6 @@ gem* at sbus? pciide* at pci? flags 0x0000 wd* at pciide? flags 0x0a00 atapiscsi* at pciide? -scsibus* at atapiscsi? # # Note the flags on the esp entries below, that work around @@ -170,9 +168,7 @@ dma* at sbus? # SBus esp* at dma? # SBus esp* at sbus? isp* at sbus? -scsibus* at esp? softraid0 at root # Software RAID -scsibus* at softraid? ahc* at pci? siop* at pci? @@ -185,16 +181,10 @@ ahci* at jmb? pciide* at jmb? ahci* at pci? -scsibus* at ahc? -scsibus* at siop? -scsibus* at mpi? -scsibus* at sili? -scsibus* at arc? -scsibus* at ahci? -scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? # SCSI disks cd* at scsibus? # SCSI CD-ROMs @@ -244,7 +234,6 @@ uhidev* at uhub? # Human Interface Devices ukbd* at uhidev? # USB keyboard wskbd* at ukbd? umass* at uhub? # USB Mass Storage devices -scsibus* at umass? aue* at uhub? # ADMtek AN986 Pegasus Ethernet axe* at uhub? # ASIX Electronics AX88172 USB Ethernet cue* at uhub? # CATC USB-EL1201A based Ethernet diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1 index abc8bf3c48d..2bf402554bd 100644 --- a/sys/arch/sparc64/conf/RAMDISKU1 +++ b/sys/arch/sparc64/conf/RAMDISKU1 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU1,v 1.20 2009/07/12 19:17:50 kettenis Exp $ +# $OpenBSD: RAMDISKU1,v 1.21 2011/06/29 20:52:09 matthew Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -64,10 +64,10 @@ gem* at sbus? dma* at sbus? # SBus esp* at dma? # SBus esp* at sbus? -scsibus* at esp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? # SCSI disks #cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5 index 0c36748a2a8..ff08d1b80d6 100644 --- a/sys/arch/sparc64/conf/RAMDISKU5 +++ b/sys/arch/sparc64/conf/RAMDISKU5 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKU5,v 1.16 2009/06/24 11:38:40 deraadt Exp $ +# $OpenBSD: RAMDISKU5,v 1.17 2011/06/29 20:52:09 matthew Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -57,15 +57,13 @@ timer* at mainbus0 # Timer chip (some systems) pciide* at pci? flags 0x0000 wd* at pciide? flags 0x0a00 atapiscsi* at pciide? -scsibus* at atapiscsi? siop* at pci? -scsibus* at siop? #isp* at pci? -#scsibus* at isp? # These entries find devices on all SCSI busses and assign # unit numers dynamically. +scsibus* at scsi? sd* at scsibus? # SCSI disks #cd* at scsibus? # SCSI CD-ROMs diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index 7461b7fbdf0..a78ad9f8f6a 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.54 2011/06/27 03:27:07 tedu Exp $ +# $OpenBSD: GENERIC,v 1.55 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -137,10 +137,8 @@ rx* at mscpbus? drive? # MSCP floppy mt* at mscpbus? drive? # MSCP tape # SCSI devices -scsibus* at asc? -scsibus* at ncr? -scsibus* at sii? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK index 71f87ff9375..1db39e23642 100644 --- a/sys/arch/vax/conf/RAMDISK +++ b/sys/arch/vax/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.34 2011/06/27 03:27:07 tedu Exp $ +# $OpenBSD: RAMDISK,v 1.35 2011/06/29 20:52:09 matthew Exp $ machine vax # machine type @@ -144,10 +144,8 @@ rx* at mscpbus? drive? # MSCP floppy mt* at mscpbus? drive? # MSCP tape # SCSI devices -scsibus* at asc? -scsibus* at ncr? -scsibus* at sii? +scsibus* at scsi? sd* at scsibus? st* at scsibus? cd* at scsibus? diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 16e798cfc19..827986d1651 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.83 2011/05/24 20:27:11 matthew Exp $ +# $OpenBSD: GENERIC,v 1.84 2011/06/29 20:52:09 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -101,7 +101,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 @@ -137,6 +136,7 @@ uow* at uhub? # Maxim/Dallas DS2490 1-Wire adapter onewire* at uow? utwitch* at uhidev? # YUREX BBU sensor +scsibus* at scsi? sd* at scsibus? # SCSI disk drives #st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives @@ -206,7 +206,6 @@ flash0 at pxaip? # NAND flash memory pxammc0 at pxaip? # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus -scsibus* at sdmmc? # SCSI emulation # Bluetooth controllers sbt* at sdmmc? disable # SDIO Bluetooth diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK index 267d96491c1..74b2a62ffc3 100644 --- a/sys/arch/zaurus/conf/RAMDISK +++ b/sys/arch/zaurus/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.41 2010/07/03 03:59:17 krw Exp $ +# $OpenBSD: RAMDISK,v 1.42 2011/06/29 20:52:09 matthew Exp $ machine zaurus arm @@ -93,15 +93,13 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices -scsibus* at umass? # SD/MMC support pxammc0 at pxaip? # MMC/SD/SDIO controller sdmmc* at pxammc? # SD/MMC bus -scsibus* at sdmmc? # SCSI emulation softraid0 at root # Software RAID -scsibus* at softraid? +scsibus* at scsi? sd* at scsibus? #st* at scsibus? cd* at scsibus? |