PQUIK_NOMODESENSE no longer does anything, and PQUIRK_NOBIGMODESENSE was

defined to be 0. Expunge references. Null entries in quirks table will be
removed later.

3 files changed, 25 insertions, 35 deletions

diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c
index 375aa2199f9..dac2e4bf1ff 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.17 2004/11/11 07:48:02 grange Exp $	*/
+/*	$OpenBSD: umass_quirks.c,v 1.18 2005/05/25 21:12:54 krw Exp $	*/
 /*	$NetBSD: umass_quirks.c,v 1.67 2004/06/28 07:49:16 mycroft Exp $	*/
 
 /*
@@ -75,7 +75,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -83,7 +83,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_EASYDISK, USB_PRODUCT_EASYDISK_EASYDISK },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -99,7 +99,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -107,7 +107,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_HP, USB_PRODUCT_HP_CDWRITERPLUS },
 	  UMASS_WPROTO_CBI, UMASS_CPROTO_ATAPI,
 	  0,
-	  PQUIRK_NOSENSE | PQUIRK_NOMODESENSE,
+	  PQUIRK_NOSENSE,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -145,7 +145,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_IDEUSB2 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -193,7 +193,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_1XX },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOBIGMODESENSE | PQUIRK_NODOORLOCK | PQUIRK_ONLYBIG,
+	  PQUIRK_NODOORLOCK | PQUIRK_ONLYBIG,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -209,7 +209,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_DUBPXXG },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -249,7 +249,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE | PQUIRK_NODOORLOCK | PQUIRK_NOBIGMODESENSE,
+	  PQUIRK_NODOORLOCK,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -257,7 +257,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE | PQUIRK_NODOORLOCK | PQUIRK_NOBIGMODESENSE,
+	  PQUIRK_NODOORLOCK,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -265,7 +265,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3050 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -273,7 +273,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -297,7 +297,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD1II },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -305,7 +305,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD2 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -313,7 +313,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE | PQUIRK_NOBIGMODESENSE,
+	  0,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -321,7 +321,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,
+	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -337,7 +337,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_PEN, USB_PRODUCT_PEN_USBREADER },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -345,7 +345,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_PILOTECH, USB_PRODUCT_PILOTECH_CRW600 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -353,7 +353,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_PQI, USB_PRODUCT_PQI_TRAVELFLASH },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE | PQUIRK_NODOORLOCK,
+	  PQUIRK_NODOORLOCK,
 	  UMATCH_VENDOR_PRODUCT,
 	  NULL, NULL
 	},
@@ -409,7 +409,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC },
 	  UMASS_WPROTO_CBI, UMASS_CPROTO_UFI,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -417,7 +417,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
 	},
@@ -449,7 +449,7 @@ Static const struct umass_quirk umass_quirks[] = {
 	{ { USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UFI,
 	  0,
-	  PQUIRK_NOMODESENSE,
+	  0,
 	  UMATCH_VENDOR_PRODUCT_REV,
 	  NULL, umass_fixup_yedata
 	},
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index 537c17f5ed8..575f232f62b 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.12 2005/05/14 23:36:26 krw Exp $ */
+/*	$OpenBSD: umass_scsi.c,v 1.13 2005/05/25 21:12:54 krw Exp $ */
 /*	$NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -162,8 +162,7 @@ umass_scsi_setup(struct umass_softc *sc)
 	scbus->sc_link.adapter = &scbus->sc_adapter;
 	scbus->sc_link.adapter_softc = sc;
 	scbus->sc_link.openings = 1;
-	scbus->sc_link.quirks |= PQUIRK_ONLYBIG | PQUIRK_NOMODESENSE |
-		sc->sc_busquirks;
+	scbus->sc_link.quirks |= PQUIRK_ONLYBIG | sc->sc_busquirks;
 
 	return (scbus);
 }
@@ -213,12 +212,6 @@ umass_scsi_cmd(struct scsi_xfer *xs)
 	cmd = xs->cmd;
 	cmdlen = xs->cmdlen;
 
-	if (cmd->opcode == MODE_SENSE &&
-	    (sc_link->quirks & SDEV_NOMODESENSE)) {
-		xs->error = XS_TIMEOUT;
-		goto done;
-	}
-
 	dir = DIR_NONE;
 	if (xs->datalen) {
 		switch (xs->flags & (SCSI_DATA_IN | SCSI_DATA_OUT)) {
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index b0a503aaa19..d4906a7ebd8 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.55 2004/12/26 22:41:40 miod Exp $ */
+/*	$OpenBSD: usb_port.h,v 1.56 2005/05/25 21:12:54 krw 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 $	*/
 
@@ -241,13 +241,10 @@ int __CONCAT(dname,_detach)(struct device *self, int flags)
 #define UMASS_ATAPISTR		"atapiscsi"
 
 /* periph_quirks */
-#define	PQUIRK_NOMODESENSE	SDEV_NOMODESENSE/* device doesn't do MODE SENSE
-						   properly */
 #define	PQUIRK_NOTUR		ADEV_NOTUR	/* no TEST UNIT READY */
 #define	PQUIRK_NODOORLOCK	ADEV_NODOORLOCK	/* can't lock door */
 #define	PQUIRK_NOSENSE		ADEV_NOSENSE	/* can't REQUEST SENSE */
 #define PQUIRK_ONLYBIG		SDEV_ONLYBIG
-#define PQUIRK_NOBIGMODESENSE	0
 
 #define sel_klist si_note