[src/trunk]: src/sys/dev/scsipi Exorcise PQUIRK_NODOORLOCK.

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

details:   https://anonhg.NetBSD.org/src/rev/d9861ef634ab
branches:  trunk
changeset: 551618:d9861ef634ab
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Tue Sep 09 02:37:55 2003 +0000

description:
Exorcise PQUIRK_NODOORLOCK.

diffstat:

 sys/dev/scsipi/atapiconf.c   |  6 ++----
 sys/dev/scsipi/scsiconf.c    |  9 +++------
 sys/dev/scsipi/scsipi_base.c |  7 ++-----
 sys/dev/scsipi/scsipiconf.h  |  3 +--
 4 files changed, 8 insertions(+), 17 deletions(-)

diffs (109 lines):

diff -r fc987df5f431 -r d9861ef634ab sys/dev/scsipi/atapiconf.c
--- a/sys/dev/scsipi/atapiconf.c        Tue Sep 09 01:35:47 2003 +0000
+++ b/sys/dev/scsipi/atapiconf.c        Tue Sep 09 02:37:55 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atapiconf.c,v 1.58 2003/09/08 18:51:33 mycroft Exp $   */
+/*     $NetBSD: atapiconf.c,v 1.59 2003/09/09 02:37:55 mycroft Exp $   */
 
 /*
  * Copyright (c) 1996, 2001 Manuel Bouyer.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.58 2003/09/08 18:51:33 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.59 2003/09/09 02:37:55 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -103,8 +103,6 @@
         "CD-ROM  CDR-S1", "", "1.70"},         PQUIRK_NOCAPACITY}, /* Sanyo */
        {{T_CDROM, T_REMOV,
         "CD-ROM  CDR-N16", "", "1.25"},        PQUIRK_NOCAPACITY}, /* Sanyo */
-       {{T_CDROM, T_REMOV,
-        "UJDCD8730", "", "1.14"},              PQUIRK_NODOORLOCK}, /* Acer */
        {{T_DIRECT, T_REMOV,            /* Panasonic MultiMediaCard */
          "04DA", "1B00", "0010"},              PQUIRK_BYTE5_ZERO |
                                                PQUIRK_NO_FLEX_PAGE },
diff -r fc987df5f431 -r d9861ef634ab sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Tue Sep 09 01:35:47 2003 +0000
+++ b/sys/dev/scsipi/scsiconf.c Tue Sep 09 02:37:55 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.211 2003/09/08 23:43:05 mycroft Exp $   */
+/*     $NetBSD: scsiconf.c,v 1.212 2003/09/09 02:37:55 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.211 2003/09/08 23:43:05 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.212 2003/09/09 02:37:55 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -503,8 +503,6 @@
        {{T_CDROM, T_REMOV,
         "YAMAHA", "CRW8424S",           ""},     PQUIRK_NOLUNS},
        {{T_CDROM, T_REMOV,
-        "VMware", "Virtual",            "1.0"},  PQUIRK_NODOORLOCK},
-       {{T_CDROM, T_REMOV,
         "NEC     ", "CD-ROM DRIVE:222", ""},     PQUIRK_NOLUNS|PQUIRK_NOSYNC},
 
        {{T_DIRECT, T_FIXED,
@@ -632,8 +630,7 @@
         "IOMEGA", "ZIP 100",            "J.03"},
                                PQUIRK_NOMODESENSE|PQUIRK_NOLUNS},
        {{T_DIRECT, T_REMOV,
-        "INSITE", "I325VM",             ""},
-                               PQUIRK_NOLUNS|PQUIRK_NODOORLOCK},
+        "INSITE", "I325VM",             ""},     PQUIRK_NOLUNS},
 
        /* XXX: QIC-36 tape behind Emulex adapter.  Very broken. */
        {{T_SEQUENTIAL, T_REMOV,
diff -r fc987df5f431 -r d9861ef634ab sys/dev/scsipi/scsipi_base.c
--- a/sys/dev/scsipi/scsipi_base.c      Tue Sep 09 01:35:47 2003 +0000
+++ b/sys/dev/scsipi/scsipi_base.c      Tue Sep 09 02:37:55 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_base.c,v 1.92 2003/09/08 18:51:36 mycroft Exp $ */
+/*     $NetBSD: scsipi_base.c,v 1.93 2003/09/09 02:37:55 mycroft Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.92 2003/09/08 18:51:36 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.93 2003/09/09 02:37:55 mycroft Exp $");
 
 #include "opt_scsi.h"
 
@@ -1148,9 +1148,6 @@
 {
        struct scsipi_prevent scsipi_cmd;
 
-       if (periph->periph_quirks & PQUIRK_NODOORLOCK)
-               return (0);
-
        memset(&scsipi_cmd, 0, sizeof(scsipi_cmd));
        scsipi_cmd.opcode = PREVENT_ALLOW;
        scsipi_cmd.how = type;
diff -r fc987df5f431 -r d9861ef634ab sys/dev/scsipi/scsipiconf.h
--- a/sys/dev/scsipi/scsipiconf.h       Tue Sep 09 01:35:47 2003 +0000
+++ b/sys/dev/scsipi/scsipiconf.h       Tue Sep 09 02:37:55 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipiconf.h,v 1.77 2003/09/08 18:51:37 mycroft Exp $  */
+/*     $NetBSD: scsipiconf.h,v 1.78 2003/09/09 02:37:56 mycroft Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -450,7 +450,6 @@
 #define        PQUIRK_LITTLETOC        0x00000400      /* audio TOC is little-endian */
 #define        PQUIRK_NOCAPACITY       0x00000800      /* no READ CD CAPACITY */
 #define        PQUIRK_NOTUR            0x00001000      /* no TEST UNIT READY */
-#define        PQUIRK_NODOORLOCK       0x00002000      /* can't lock door */
 #define        PQUIRK_NOSENSE          0x00004000      /* can't REQUEST SENSE */
 #define PQUIRK_ONLYBIG         0x00008000      /* only use SCSI_{R,W}_BIG */
 #define PQUIRK_BYTE5_ZERO      0x00010000      /* byte5 in capacity is wrong */