[src/trunk]: src/sys/dev If maxlun>0, automatically set PQUIRK_FORCELUNS, rat...

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/03f6c9d3f955
branches:  trunk
changeset: 551605:03f6c9d3f955
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Mon Sep 08 19:57:29 2003 +0000

description:
If maxlun>0, automatically set PQUIRK_FORCELUNS, rather than using quirk
table entries.

diffstat:

 sys/dev/scsipi/scsiconf.c  |   6 ++----
 sys/dev/usb/umass.c        |   9 +++++++--
 sys/dev/usb/umass_quirks.c |  38 +++-----------------------------------
 3 files changed, 12 insertions(+), 41 deletions(-)

diffs (141 lines):

diff -r edee97931792 -r 03f6c9d3f955 sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Mon Sep 08 19:30:59 2003 +0000
+++ b/sys/dev/scsipi/scsiconf.c Mon Sep 08 19:57:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.209 2003/09/08 18:51:35 mycroft Exp $   */
+/*     $NetBSD: scsiconf.c,v 1.210 2003/09/08 19:57:29 mycroft Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.209 2003/09/08 18:51:35 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.210 2003/09/08 19:57:29 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -699,8 +699,6 @@
         "SONY    ", "CDL1100         ", ""},     PQUIRK_NOLUNS},
        {{T_ENCLOSURE, T_FIXED,
         "SUN     ", "SENA            ", ""},     PQUIRK_NOLUNS},
-       {{T_DIRECT, T_REMOV,
-        "Generic ", "USB Storage-SMC ", ""},     PQUIRK_FORCELUNS},
 };
 
 /*
diff -r edee97931792 -r 03f6c9d3f955 sys/dev/usb/umass.c
--- a/sys/dev/usb/umass.c       Mon Sep 08 19:30:59 2003 +0000
+++ b/sys/dev/usb/umass.c       Mon Sep 08 19:57:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass.c,v 1.98 2003/09/08 19:30:59 mycroft Exp $       */
+/*     $NetBSD: umass.c,v 1.99 2003/09/08 19:57:32 mycroft Exp $       */
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop%rr.iij4u.or.jp@localhost>,
  *                   Nick Hibma <n_hibma%freebsd.org@localhost>
@@ -94,7 +94,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.98 2003/09/08 19:30:59 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.99 2003/09/08 19:57:32 mycroft Exp $");
 
 #include "atapibus.h"
 #include "scsibus.h"
@@ -126,6 +126,9 @@
 #include <dev/usb/umass_scsipi.h>
 #include <dev/usb/umass_isdata.h>
 
+#include <dev/scsipi/scsipi_all.h>
+#include <dev/scsipi/scsipiconf.h>
+
 
 #ifdef UMASS_DEBUG
 int umassdebug = 0;
@@ -446,6 +449,8 @@
                               USBDEVNAME(sc->sc_dev), usbd_errstr(err));
                        USB_ATTACH_ERROR_RETURN;
                }
+               if (sc->maxlun > 0)
+                       sc->sc_busquirks |= PQUIRK_FORCELUNS;
        } else {
                sc->maxlun = 0;
        }
diff -r edee97931792 -r 03f6c9d3f955 sys/dev/usb/umass_quirks.c
--- a/sys/dev/usb/umass_quirks.c        Mon Sep 08 19:30:59 2003 +0000
+++ b/sys/dev/usb/umass_quirks.c        Mon Sep 08 19:57:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umass_quirks.c,v 1.49 2003/09/08 19:31:00 mycroft Exp $        */
+/*     $NetBSD: umass_quirks.c,v 1.50 2003/09/08 19:57:33 mycroft Exp $        */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.49 2003/09/08 19:31:00 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.50 2003/09/08 19:57:33 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -118,22 +118,6 @@
          NULL, NULL
        },
 
-       { { USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3050 },
-         UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-         0,
-         PQUIRK_FORCELUNS,
-         UMATCH_VENDOR_PRODUCT,
-         NULL, NULL
-       },
-
-       { { USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010 },
-         UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-         0,
-         PQUIRK_FORCELUNS,
-         UMATCH_VENDOR_PRODUCT,
-         NULL, NULL
-       },
-
        { { USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1 },
          UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
          UMASS_QUIRK_WRONG_CSWSIG,
@@ -145,19 +129,11 @@
        { { USB_VENDOR_PEN, USB_PRODUCT_PEN_MOBILEDRIVE },
          UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
          0,
-         PQUIRK_NODOORLOCK | PQUIRK_FORCELUNS,
+         PQUIRK_NODOORLOCK,
          UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
          NULL, NULL
        },
 
-       { { USB_VENDOR_PILOTECH, USB_PRODUCT_PILOTECH_CRW600 },
-         UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-         0,
-         PQUIRK_FORCELUNS,
-         UMATCH_VENDOR_PRODUCT,
-         NULL, NULL
-       },
-
        { { USB_VENDOR_PQI, USB_PRODUCT_PQI_TRAVELFLASH },
          UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
          0,
@@ -166,14 +142,6 @@
          NULL, NULL
        },
 
-       { { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR86 },
-         UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
-         0,
-         PQUIRK_FORCELUNS,
-         UMATCH_VENDOR_PRODUCT,
-         NULL, NULL
-       },
-
        { { USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R },
          UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UFI,
          UMASS_QUIRK_WRONG_CSWTAG,