from netbsd, umass.c 1.98, umassvar.h 1.20

log message:
Remove UMASS_QUIRK_NO_START_STOP and UMASS_QUIRK_NO_MAX_LUN.

We don't have UMASS_QUIRK_NO_START_STOP so I didn't have to remove it. I
consider umass_quirks.c to be too different so I hand removed references to
the removed defines. There are some useless entries in there now which will
be cleaned up after umass is merged with netbsd.

ok deraadt@

3 files changed, 14 insertions, 16 deletions

diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 46dd6d6b93f..af3244924fc 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: umass.c,v 1.27 2004/07/15 05:48:09 deraadt Exp $ */
-/*	$NetBSD: umass.c,v 1.97 2003/09/04 00:02:59 mycroft Exp $	*/
+/*	$OpenBSD: umass.c,v 1.28 2004/07/17 06:04:00 dlg Exp $ */
+/*	$NetBSD: umass.c,v 1.98 2003/09/08 19:30:59 mycroft Exp $	*/
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
  *		      Nick Hibma <n_hibma@freebsd.org>
@@ -441,8 +441,7 @@ USB_ATTACH(umass)
 	/*
 	 * Get the maximum LUN supported by the device.
 	 */
-	if (sc->sc_wire == UMASS_WPROTO_BBB &&
-	    !(sc->sc_quirks & UMASS_QUIRK_NO_MAX_LUN)) {
+	if (sc->sc_wire == UMASS_WPROTO_BBB) {
 		err = umass_bbb_get_max_lun(sc, &sc->maxlun);
 		if (err) {
 			printf("%s: unable to get Max Lun: %s\n",
diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c
index 0e527fbdeee..eaa0eb21303 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.13 2004/07/09 19:14:41 deraadt Exp $	*/
+/*	$OpenBSD: umass_quirks.c,v 1.14 2004/07/17 06:04:00 dlg Exp $	*/
 /*	$NetBSD: umass_quirks.c,v 1.67 2004/06/28 07:49:16 mycroft Exp $	*/
 
 /*
@@ -216,7 +216,7 @@ Static const struct umass_quirk umass_quirks[] = {
 
 	{ { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_S304 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-	  UMASS_QUIRK_NO_MAX_LUN,
+	  0,
 	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
@@ -224,7 +224,7 @@ Static const struct umass_quirk umass_quirks[] = {
 
 	{ { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_X },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-	  UMASS_QUIRK_NO_MAX_LUN,
+	  0,
 	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
@@ -232,7 +232,7 @@ Static const struct umass_quirk umass_quirks[] = {
 
 	{ { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGEA1 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-	  UMASS_QUIRK_NO_MAX_LUN,
+	  0,
 	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
@@ -240,7 +240,7 @@ Static const struct umass_quirk umass_quirks[] = {
 
 	{ { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-	  UMASS_QUIRK_NO_MAX_LUN,
+	  0,
 	  PQUIRK_NOMODESENSE | PQUIRK_NODOORLOCK | PQUIRK_NOBIGMODESENSE,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
@@ -248,7 +248,7 @@ Static const struct umass_quirk umass_quirks[] = {
 
 	{ { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2 },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-	  UMASS_QUIRK_NO_MAX_LUN,
+	  0,
 	  PQUIRK_NOMODESENSE | PQUIRK_NODOORLOCK | PQUIRK_NOBIGMODESENSE,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
@@ -288,7 +288,7 @@ Static const struct umass_quirk umass_quirks[] = {
 
 	{ { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD1II },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-	  UMASS_QUIRK_NO_MAX_LUN,
+	  0,
 	  PQUIRK_NOMODESENSE,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
@@ -320,7 +320,7 @@ Static const struct umass_quirk umass_quirks[] = {
 
 	{ { USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK },
 	  UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-	  UMASS_QUIRK_NO_MAX_LUN,
+	  0,
 	  0,
 	  UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
 	  NULL, NULL
diff --git a/sys/dev/usb/umassvar.h b/sys/dev/usb/umassvar.h
index b824f131eaf..1b65d874ea9 100644
--- a/sys/dev/usb/umassvar.h
+++ b/sys/dev/usb/umassvar.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: umassvar.h,v 1.5 2004/07/08 22:20:04 deraadt Exp $ */
-/*	$NetBSD: umassvar.h,v 1.19 2003/02/22 05:18:50 tsutsui Exp $	*/
+/*	$OpenBSD: umassvar.h,v 1.6 2004/07/17 06:04:00 dlg Exp $ */
+/*	$NetBSD: umassvar.h,v 1.20 2003/09/08 19:31:01 mycroft Exp $	*/
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
  *		      Nick Hibma <n_hibma@freebsd.org>
@@ -179,8 +179,7 @@ struct umass_softc {
 	u_int32_t		sc_quirks;
 #define UMASS_QUIRK_RS_NO_CLEAR_UA	0x00000002
 #define UMASS_QUIRK_WRONG_CSWSIG	0x00000010
-#define UMASS_QUIRK_NO_MAX_LUN		0x00000020
-#define UMASS_QUIRK_WRONG_CSWTAG	0x00000040
+#define UMASS_QUIRK_WRONG_CSWTAG	0x00000020
 
 	u_int32_t		sc_busquirks;