[src/trunk]: src/sys/dev/scsipi Remove PQUIRK_BYTE5_ZERO.

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

details:   https://anonhg.NetBSD.org/src/rev/8dc26dcaa152
branches:  trunk
changeset: 552065:8dc26dcaa152
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Wed Sep 17 19:14:56 2003 +0000

description:
Remove PQUIRK_BYTE5_ZERO.

diffstat:

 sys/dev/scsipi/atapi_disk.h |   4 ++--
 sys/dev/scsipi/atapiconf.c  |   9 +++------
 sys/dev/scsipi/scsipiconf.h |   3 +--
 sys/dev/scsipi/sd_atapi.c   |  15 +++------------
 4 files changed, 9 insertions(+), 22 deletions(-)

diffs (104 lines):

diff -r f7f24fb92bab -r 8dc26dcaa152 sys/dev/scsipi/atapi_disk.h
--- a/sys/dev/scsipi/atapi_disk.h       Wed Sep 17 18:24:47 2003 +0000
+++ b/sys/dev/scsipi/atapi_disk.h       Wed Sep 17 19:14:56 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atapi_disk.h,v 1.4 2001/05/14 20:35:27 bouyer Exp $    */
+/*     $NetBSD: atapi_disk.h,v 1.5 2003/09/17 19:14:56 mycroft Exp $   */
 
 /*
  * Copyright 1998
@@ -61,7 +61,7 @@
 
 /* codes only valid in the current/maximum capacity descriptor */
 #define        ATAPI_CAP_DESC_CODE_MASK        0x3
-/*     reserved                        0x0 */
+#define        ATAPI_CAP_DESC_CODE_RESERVED    0x0
 #define        ATAPI_CAP_DESC_CODE_UNFORMATTED 0x1
 #define        ATAPI_CAP_DESC_CODE_FORMATTED   0x2
 #define        ATAPI_CAP_DESC_CODE_NONE        0x3
diff -r f7f24fb92bab -r 8dc26dcaa152 sys/dev/scsipi/atapiconf.c
--- a/sys/dev/scsipi/atapiconf.c        Wed Sep 17 18:24:47 2003 +0000
+++ b/sys/dev/scsipi/atapiconf.c        Wed Sep 17 19:14:56 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atapiconf.c,v 1.59 2003/09/09 02:37:55 mycroft Exp $   */
+/*     $NetBSD: atapiconf.c,v 1.60 2003/09/17 19:14:57 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.59 2003/09/09 02:37:55 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.60 2003/09/17 19:14:57 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -104,10 +104,7 @@
        {{T_CDROM, T_REMOV,
         "CD-ROM  CDR-N16", "", "1.25"},        PQUIRK_NOCAPACITY}, /* Sanyo */
        {{T_DIRECT, T_REMOV,            /* Panasonic MultiMediaCard */
-         "04DA", "1B00", "0010"},              PQUIRK_BYTE5_ZERO |
-                                               PQUIRK_NO_FLEX_PAGE },
-       {{T_DIRECT, T_REMOV,            /* NEO Jukebox */
-         "IC25N020", "ATDA04-0", "DA3O"}, PQUIRK_BYTE5_ZERO },
+         "04DA", "1B00", "0010"},              PQUIRK_NO_FLEX_PAGE },
        {{T_DIRECT, T_REMOV,            /* ZiO! MultiMediaCard */
          "eUSB", "MultiMediaCard", ""},        PQUIRK_NO_FLEX_PAGE },
        {{T_DIRECT, T_REMOV,
diff -r f7f24fb92bab -r 8dc26dcaa152 sys/dev/scsipi/scsipiconf.h
--- a/sys/dev/scsipi/scsipiconf.h       Wed Sep 17 18:24:47 2003 +0000
+++ b/sys/dev/scsipi/scsipiconf.h       Wed Sep 17 19:14:56 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipiconf.h,v 1.78 2003/09/09 02:37:56 mycroft Exp $  */
+/*     $NetBSD: scsipiconf.h,v 1.79 2003/09/17 19:14:58 mycroft Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -452,7 +452,6 @@
 #define        PQUIRK_NOTUR            0x00001000      /* no TEST UNIT READY */
 #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 */
 #define PQUIRK_NO_FLEX_PAGE    0x00020000      /* does not support flex geom
                                                   page */
 #define PQUIRK_NOBIGMODESENSE  0x00040000      /* has no big mode-sense op */
diff -r f7f24fb92bab -r 8dc26dcaa152 sys/dev/scsipi/sd_atapi.c
--- a/sys/dev/scsipi/sd_atapi.c Wed Sep 17 18:24:47 2003 +0000
+++ b/sys/dev/scsipi/sd_atapi.c Wed Sep 17 19:14:56 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sd_atapi.c,v 1.19 2003/09/08 01:27:09 mycroft Exp $    */
+/*     $NetBSD: sd_atapi.c,v 1.20 2003/09/17 19:15:00 mycroft Exp $    */
 
 /*
  * Copyright 1998
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd_atapi.c,v 1.19 2003/09/08 01:27:09 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd_atapi.c,v 1.20 2003/09/17 19:15:00 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -155,19 +155,10 @@
        case ATAPI_CAP_DESC_CODE_UNFORMATTED:
                return SDGP_RESULT_UNFORMATTED;
 
+       case ATAPI_CAP_DESC_CODE_RESERVED:
        case ATAPI_CAP_DESC_CODE_FORMATTED:
                break;
 
-       case 0:
-               if (sd->sc_periph->periph_quirks & PQUIRK_BYTE5_ZERO)
-                       break;
-
-       default:
-#ifdef DIAGNOSTIC
-               printf("%s: strange capacity descriptor byte5 0x%x\n",
-                   sd->sc_dev.dv_xname, (u_int)descp->byte5);
-#endif
-               /* FALLTHROUGH */
        case ATAPI_CAP_DESC_CODE_NONE:
                return SDGP_RESULT_OFFLINE;
        }