diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-01-14 02:00:42 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-01-14 02:00:42 +0000 |
| commit | f7cc5b8655c9095d9f23aa77c1baec172c8b4598 (patch) | |
| tree | 98e1c8baa14b2f29b38626b97795d69e7a91ec61 /sys/dev/usb/umass_quirks.c | |
| parent | 7d99d1eb35ee8d037e426b4bb8e04e943a7c16da (diff) | |
Nuke SDEV_NOLUNS, SDEV_FORCELUNS, and PQUIRK_FORCELUNS quirks. Also
moreluns field in scsi_link structure. Instead, treat an INQUIRY
result that duplicates the INQUIRY result of LUN 0 as proof the LUN
does not exist. Compensate for lack of SDEV_NOLUNS where necessary by
setting sc_link->luns to 1, which has the same effect. From Marco
Peereboom.
Don't issue Test Unit Ready command before INQUIRY command - not
necessary and potentially harmful to devices with ADEV_NOTUR quirk
since quirks have not been set yet. From mycroft@NetBSD
ok deraadt@, mvme* changes by miod@.
Diffstat (limited to 'sys/dev/usb/umass_quirks.c')
| -rw-r--r-- | sys/dev/usb/umass_quirks.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c index 0bb484e5893..b3350e69239 100644 --- a/sys/dev/usb/umass_quirks.c +++ b/sys/dev/usb/umass_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_quirks.c,v 1.8 2003/12/03 09:11:37 markus Exp $ */ +/* $OpenBSD: umass_quirks.c,v 1.9 2004/01/14 02:00:41 krw Exp $ */ /* $NetBSD: umass_quirks.c,v 1.39 2003/05/08 15:19:47 augustss Exp $ */ /* @@ -243,7 +243,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3050 }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, 0, - PQUIRK_NOMODESENSE | PQUIRK_FORCELUNS, + PQUIRK_NOMODESENSE, UMATCH_VENDOR_PRODUCT, NULL, NULL }, @@ -251,7 +251,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010 }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, 0, - PQUIRK_NOMODESENSE | PQUIRK_FORCELUNS, + PQUIRK_NOMODESENSE, UMATCH_VENDOR_PRODUCT, NULL, NULL }, @@ -299,7 +299,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_PEN, USB_PRODUCT_PEN_MOBILEDRIVE }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, 0, - PQUIRK_NOMODESENSE | PQUIRK_NODOORLOCK | PQUIRK_FORCELUNS, + PQUIRK_NOMODESENSE | PQUIRK_NODOORLOCK, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL }, @@ -323,7 +323,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_PILOTECH, USB_PRODUCT_PILOTECH_CRW600 }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, 0, - PQUIRK_NOMODESENSE | PQUIRK_FORCELUNS, + PQUIRK_NOMODESENSE, UMATCH_VENDOR_PRODUCT, NULL, NULL }, |