diff options
| author | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-24 20:27:12 +0000 |
|---|---|---|
| committer | Matthew Dempsky <matthew@cvs.openbsd.org> | 2011-05-24 20:27:12 +0000 |
| commit | 74ab674d435acdab3c4aa84f2cb2e4cd6b2d6f6b (patch) | |
| tree | 64afc765c3480299856522cd5b0b04e415ecb4bd /sys | |
| parent | 84cded86709d8bc018a9101ce6a067d69b5aa936 (diff) | |
On OpenBSD, we've always attached scsibus(4) to umass(4), even for
ATAPI devices. atapiscsi(4) is only for handling ATAPI devices on an
ATA bus, so umass(4) shouldn't care about it.
ok krw@, dlg@; no objections from deraadt@
Diffstat (limited to 'sys')
34 files changed, 43 insertions, 95 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 8c8ca90db81..23c906a21f3 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.221 2011/03/28 15:24:54 claudio Exp $ +# $OpenBSD: GENERIC,v 1.222 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -91,7 +91,6 @@ midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index 47739ca6a9d..f10a801e7f1 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.82 2011/03/28 15:24:54 claudio Exp $ +# $OpenBSD: RAMDISKBIG,v 1.83 2011/05/24 20:27:11 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. @@ -79,7 +79,6 @@ uhid* at uhidev? # USB Generic HID devices # USB Mass Storage devices umass* at uhub? scsibus* at umass? -atapiscsi* at umass? # USB Modems #umodem* at uhub? diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index a6db361ccdb..4e06af1cac7 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.317 2011/05/18 14:21:20 sthen Exp $ +# $OpenBSD: GENERIC,v 1.318 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -200,7 +200,6 @@ midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index 04adcc08dd9..1fdbc93fb41 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.50 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: RAMDISK,v 1.51 2011/05/24 20:27:11 matthew Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -98,7 +98,6 @@ ukbd* at uhidev? wskbd* at ukbd? mux 1 #umass* at uhub? # USB Mass Storage devices #scsibus* at umass? -#atapiscsi* at umass? #ums* at uhidev? #wsmouse* at ums? mux 0 #aue* at uhub? # ADMtek AN986 Pegasus Ethernet diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 1c0446c73fd..09af8ea563e 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.117 2011/05/18 14:21:20 sthen Exp $ +# $OpenBSD: RAMDISK_CD,v 1.118 2011/05/24 20:27:11 matthew Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -103,7 +103,6 @@ ukbd* at uhidev? wskbd* at ukbd? mux 1 umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? #ums* at uhidev? #wsmouse* at ums? mux 0 aue* at uhub? # ADMtek AN986 Pegasus Ethernet diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC index f18620cbf9a..ab4f6eed5a6 100644 --- a/sys/arch/armish/conf/GENERIC +++ b/sys/arch/armish/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.39 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: GENERIC,v 1.40 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -121,7 +121,6 @@ midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* 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 4167c21d8c9..df871b29c56 100644 --- a/sys/arch/armish/conf/RAMDISK +++ b/sys/arch/armish/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.17 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: RAMDISK,v 1.18 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -117,7 +117,6 @@ ucom* at umsm? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/gumstix/conf/GENERIC b/sys/arch/gumstix/conf/GENERIC index 6a9bb0300b6..4b7688cb18f 100644 --- a/sys/arch/gumstix/conf/GENERIC +++ b/sys/arch/gumstix/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: GENERIC,v 1.12 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -102,7 +102,6 @@ midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -#atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index 2e9a5f9f68e..41ef9314b63 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.142 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: GENERIC,v 1.143 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -108,7 +108,6 @@ uark* at uhub? # Arkmicro ARK3116 serial ucom* at uark? umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index a48f0353eeb..919a68e428e 100644 --- a/sys/arch/hppa/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.91 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: RAMDISK,v 1.92 2011/05/24 20:27:11 matthew Exp $ # # Diskless kernel config # @@ -115,7 +115,6 @@ uhub* at uhub? # USB Hubs #ucom* at uftdi? umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC index 5e0dfbc45cb..95911400185 100644 --- a/sys/arch/hppa64/conf/GENERIC +++ b/sys/arch/hppa64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.23 2011/04/13 15:25:22 jsing Exp $ +# $OpenBSD: GENERIC,v 1.24 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -88,7 +88,6 @@ pci* at ppb? #ulpt* at uhub? # USB Printers #umass* at uhub? # USB Mass Storage devices #scsibus* at umass? -#atapiscsi* at umass? #uhidev* at uhub? # Human Interface Devices #ums* at uhidev? # USB mouse #wsmouse* at ums? mux 0 diff --git a/sys/arch/hppa64/conf/RAMDISK b/sys/arch/hppa64/conf/RAMDISK index 1a10077db8a..e1949ba0901 100644 --- a/sys/arch/hppa64/conf/RAMDISK +++ b/sys/arch/hppa64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.10 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: RAMDISK,v 1.11 2011/05/24 20:27:11 matthew Exp $ # # Diskless kernel config # @@ -89,7 +89,6 @@ pcmcia* at cardslot? #ulpt* at uhub? # USB Printers #umass* at uhub? # USB Mass Storage devices #scsibus* at umass? -#atapiscsi* at umass? #uhidev* at uhub? # Human Interface Devices #ums* at uhidev? # USB mouse #wsmouse* at ums? mux 0 diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 34b1d6d6702..d0ede0eaed8 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.714 2011/05/18 14:21:20 sthen Exp $ +# $OpenBSD: GENERIC,v 1.715 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -253,7 +253,6 @@ midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index fcfcc87e1cc..7fb060607f9 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.97 2011/01/07 19:33:08 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.98 2011/05/24 20:27:11 matthew Exp $ machine i386 # architecture, used by config; REQUIRED @@ -108,7 +108,6 @@ uhub* at usb? # USB Hubs uhub* at uhub? # USB Hubs umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ukbd* at uhidev? # USB keyboard wskbd* at ukbd? mux 1 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 311ff87c314..a0dc6d142f2 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.186 2011/05/18 14:21:20 sthen Exp $ +# $OpenBSD: RAMDISK_CD,v 1.187 2011/05/24 20:27:11 matthew Exp $ machine i386 # architecture, used by config; REQUIRED @@ -124,7 +124,6 @@ ukbd* at uhidev? wskbd* at ukbd? mux 1 umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? #ums* at uhidev? #wsmouse* at ums? mux 0 aue* at uhub? # ADMtek AN986 Pegasus Ethernet diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC index 31a5f225d6b..1b4fff0e667 100644 --- a/sys/arch/landisk/conf/GENERIC +++ b/sys/arch/landisk/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.33 2011/04/17 19:18:11 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.34 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -120,7 +120,6 @@ audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/landisk/conf/RAMDISK b/sys/arch/landisk/conf/RAMDISK index 712ef07ee60..8420878cd19 100644 --- a/sys/arch/landisk/conf/RAMDISK +++ b/sys/arch/landisk/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.13 2010/07/03 01:48:18 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.14 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -93,7 +93,6 @@ uhub* at usb? uhub* at uhub? port ? configuration ? interface ? umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* 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 diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC index 31a146ece1c..f0a098a99b4 100644 --- a/sys/arch/loongson/conf/GENERIC +++ b/sys/arch/loongson/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.33 2011/04/10 20:27:02 shadchin Exp $ +# $OpenBSD: GENERIC,v 1.34 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -122,8 +122,6 @@ uchcom* at uhub? # WinChipHead CH341/340 serial ucom* at uchcom? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK index 75e91b4f49c..9ff47388570 100644 --- a/sys/arch/loongson/conf/RAMDISK +++ b/sys/arch/loongson/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.16 2010/09/26 21:44:35 miod Exp $ +# $OpenBSD: RAMDISK,v 1.17 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -101,8 +101,6 @@ ucom* at ubsa? uplcom* at uhub? # I/O DATA USB-RSAQ2 serial adapter ucom* at uplcom? umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? uhidev* at uhub? # Human Interface Devices ukbd* at uhidev? # USB keyboard diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index ee79c204856..42491127b8b 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.208 2011/05/22 11:22:57 mpi Exp $g +# $OpenBSD: GENERIC,v 1.209 2011/05/24 20:27:11 matthew Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -256,7 +256,6 @@ midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices tpms* at uhidev? # Apple touchpad mouse wsmouse* at tpms? mux 0 diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC index 78b2be16a0c..f48280a5c96 100644 --- a/sys/arch/palm/conf/GENERIC +++ b/sys/arch/palm/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.10 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: GENERIC,v 1.11 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -89,7 +89,6 @@ midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27 index 9df8c719f33..26c5258e5ca 100644 --- a/sys/arch/sgi/conf/GENERIC-IP27 +++ b/sys/arch/sgi/conf/GENERIC-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP27,v 1.40 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: GENERIC-IP27,v 1.41 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. # @@ -117,8 +117,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30 index 072c341fba8..722c6755eac 100644 --- a/sys/arch/sgi/conf/GENERIC-IP30 +++ b/sys/arch/sgi/conf/GENERIC-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP30,v 1.34 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: GENERIC-IP30,v 1.35 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. # @@ -109,8 +109,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32 index 105082060e5..31163d6e61d 100644 --- a/sys/arch/sgi/conf/GENERIC-IP32 +++ b/sys/arch/sgi/conf/GENERIC-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP32,v 1.25 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: GENERIC-IP32,v 1.26 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. # @@ -101,8 +101,6 @@ uaudio* at uhub? # USB Audio audio* at uaudio? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? urio* at uhub? # Diamond Multimedia Rio 500 uscanner* at uhub? disable# USB Scanners diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27 index e6ef8fe73cd..46ca2425e3e 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP27 +++ b/sys/arch/sgi/conf/RAMDISK-IP27 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP27,v 1.24 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: RAMDISK-IP27,v 1.25 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY. @@ -109,8 +109,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30 index 28ccfeb879c..0b75b55436b 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP30 +++ b/sys/arch/sgi/conf/RAMDISK-IP30 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP30,v 1.20 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: RAMDISK-IP30,v 1.21 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY. @@ -102,8 +102,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32 index 4ed300a96e2..45c4386f143 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP32 +++ b/sys/arch/sgi/conf/RAMDISK-IP32 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP32,v 1.16 2011/05/02 19:51:05 miod Exp $ +# $OpenBSD: RAMDISK-IP32,v 1.17 2011/05/24 20:27:11 matthew Exp $ # # THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY. @@ -92,8 +92,6 @@ ubsa* at uhub? # Belkin serial adapter ucom* at ubsa? #ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices -atapiscsi* at umass? -scsibus* at atapiscsi? scsibus* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 8521885827a..d9b94ab9e58 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.263 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: GENERIC,v 1.264 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -205,7 +205,6 @@ midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK index 77e97a60d64..9474fb77277 100644 --- a/sys/arch/sparc64/conf/RAMDISK +++ b/sys/arch/sparc64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.99 2011/03/08 19:57:51 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.100 2011/05/24 20:27:11 matthew Exp $ # Machine architecture; required by config(8) machine sparc64 @@ -245,7 +245,6 @@ ukbd* at uhidev? # USB keyboard wskbd* at ukbd? umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* 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/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index d2f2227ffc6..16e798cfc19 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.82 2011/02/17 20:14:30 miod Exp $ +# $OpenBSD: GENERIC,v 1.83 2011/05/24 20:27:11 matthew Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -102,7 +102,6 @@ midi* at umidi? ulpt* at uhub? # USB Printers umass* at uhub? # USB Mass Storage devices scsibus* at umass? -atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb index 9fff2e9a8ab..394d18d19d8 100644 --- a/sys/dev/usb/files.usb +++ b/sys/dev/usb/files.usb @@ -1,4 +1,4 @@ -# $OpenBSD: files.usb,v 1.97 2011/01/06 19:32:09 damien Exp $ +# $OpenBSD: files.usb,v 1.98 2011/05/24 20:27:11 matthew Exp $ # $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $ # # Config file and device description for machine-independent USB code. @@ -115,11 +115,11 @@ file dev/usb/ulpt.c ulpt needs-flag # Mass storage -device umass: scsi, atapi, ata +device umass: scsi attach umass at uhub file dev/usb/umass.c umass file dev/usb/umass_quirks.c umass -file dev/usb/umass_scsi.c umass & (scsibus | atapiscsi) +file dev/usb/umass_scsi.c umass & scsibus # Misc diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 2c1511dd4ab..e1bece5b2f5 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.60 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: umass.c,v 1.61 2011/05/24 20:27:11 matthew Exp $ */ /* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */ /* @@ -124,8 +124,6 @@ * umass_cam_cb again to complete the CAM command. */ -#include "atapiscsi.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -597,11 +595,7 @@ umass_attach(struct device *parent, struct device *self, void *aux) case UMASS_CPROTO_UFI: case UMASS_CPROTO_ATAPI: -#if (NATAPIBUS > 0) || (NATAPISCSI > 0) error = umass_atapi_attach(sc); -#else - printf("%s: atapiscsi not configured\n", sc->sc_dev.dv_xname); -#endif break; case UMASS_CPROTO_ISD_ATA: diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c index 3c87178a28d..f82bdc52c52 100644 --- a/sys/dev/usb/umass_scsi.c +++ b/sys/dev/usb/umass_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_scsi.c,v 1.34 2011/04/19 23:21:15 matthew Exp $ */ +/* $OpenBSD: umass_scsi.c,v 1.35 2011/05/24 20:27:11 matthew Exp $ */ /* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,8 +30,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "atapiscsi.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -57,7 +55,6 @@ struct umass_scsi_softc { struct umassbus_softc base; struct scsi_link sc_link; - struct scsi_adapter sc_adapter; struct scsi_iopool sc_iopool; int sc_open; @@ -68,12 +65,16 @@ struct umass_scsi_softc { #define UMASS_SCSIID_HOST 0x00 #define UMASS_SCSIID_DEVICE 0x01 -#define UMASS_ATAPI_DRIVE 0 - int umass_scsi_probe(struct scsi_link *); void umass_scsi_cmd(struct scsi_xfer *); void umass_scsi_minphys(struct buf *, struct scsi_link *); +struct scsi_adapter umass_scsi_switch = { + umass_scsi_cmd, + umass_scsi_minphys, + umass_scsi_probe +}; + void umass_scsi_cb(struct umass_softc *sc, void *priv, int residue, int status); void umass_scsi_sense_cb(struct umass_softc *sc, void *priv, int residue, @@ -111,7 +112,6 @@ umass_scsi_attach(struct umass_softc *sc) return (0); } -#if NATAPISCSI > 0 int umass_atapi_attach(struct umass_softc *sc) { @@ -139,7 +139,6 @@ umass_atapi_attach(struct umass_softc *sc) return (0); } -#endif struct umass_scsi_softc * umass_scsi_setup(struct umass_softc *sc) @@ -152,14 +151,9 @@ umass_scsi_setup(struct umass_softc *sc) scsi_iopool_init(&scbus->sc_iopool, scbus, umass_io_get, umass_io_put); - /* Fill in the adapter. */ - scbus->sc_adapter.scsi_cmd = umass_scsi_cmd; - scbus->sc_adapter.scsi_minphys = umass_scsi_minphys; - scbus->sc_adapter.dev_probe = umass_scsi_probe; - /* Fill in the link. */ scbus->sc_link.adapter_buswidth = 2; - scbus->sc_link.adapter = &scbus->sc_adapter; + scbus->sc_link.adapter = &umass_scsi_switch; scbus->sc_link.adapter_softc = sc; scbus->sc_link.openings = 1; scbus->sc_link.quirks |= SDEV_ONLYBIG | sc->sc_busquirks; diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index a18fb4623a4..112dda31ccc 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_port.h,v 1.99 2009/11/04 19:14:10 kettenis Exp $ */ +/* $OpenBSD: usb_port.h,v 1.100 2011/05/24 20:27:11 matthew Exp $ */ /* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -42,8 +42,6 @@ #define Static -#define UMASS_ATAPISTR "atapiscsi" - /* periph_quirks */ #define PQUIRK_NOSENSE ADEV_NOSENSE /* can't REQUEST SENSE */ #define PQUIRK_ONLYBIG SDEV_ONLYBIG |