[src/trunk]: src/sys/dev/scsipi Nobody said no to adding a pointer to origina...

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

details:   https://anonhg.NetBSD.org/src/rev/dc05b7639e03
branches:  trunk
changeset: 480804:dc05b7639e03
user:      mjacob <mjacob%NetBSD.org@localhost>
date:      Thu Jan 20 17:10:18 2000 +0000

description:
Nobody said no to adding a pointer to original scsi inquiry data
to the scsibus attach args. Make sure it's nulled for ATAPI. Also,
for scsiconf.c, modify SENA's quirk entry.

diffstat:

 sys/dev/scsipi/atapiconf.c  |  3 ++-
 sys/dev/scsipi/scsiconf.c   |  5 +++--
 sys/dev/scsipi/scsipiconf.h |  3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r 0e4bd7d75a49 -r dc05b7639e03 sys/dev/scsipi/atapiconf.c
--- a/sys/dev/scsipi/atapiconf.c        Thu Jan 20 17:07:41 2000 +0000
+++ b/sys/dev/scsipi/atapiconf.c        Thu Jan 20 17:10:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atapiconf.c,v 1.29 1999/10/20 15:22:27 enami Exp $     */
+/*     $NetBSD: atapiconf.c,v 1.30 2000/01/20 17:10:19 mjacob Exp $    */
 
 /*
  * Copyright (c) 1996 Manuel Bouyer.  All rights reserved.
@@ -367,6 +367,7 @@
                sa.sa_inqbuf.vendor = model;
                sa.sa_inqbuf.product = serial_number;
                sa.sa_inqbuf.revision = firmware_revision;
+               sa.sa_inqptr = NULL;
 
                finger = (struct scsi_quirk_inquiry_pattern *)scsipi_inqmatch(
                    &sa.sa_inqbuf, (caddr_t)atapi_quirk_patterns,
diff -r 0e4bd7d75a49 -r dc05b7639e03 sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Thu Jan 20 17:07:41 2000 +0000
+++ b/sys/dev/scsipi/scsiconf.c Thu Jan 20 17:10:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.133 2000/01/13 00:18:27 nisimura Exp $  */
+/*     $NetBSD: scsiconf.c,v 1.134 2000/01/20 17:10:18 mjacob Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -665,7 +665,7 @@
         "SONY    ", "CDL1100         ", ""},     SDEV_NOLUNS},
 
        {{T_ENCLOSURE, T_FIXED,
-        "SUN     ", "SENA            ", "1.07"}, SDEV_NOLUNS},
+        "SUN     ", "SENA            ", ""},     SDEV_NOLUNS},
 };
 
 /*
@@ -744,6 +744,7 @@
        sa.sa_inqbuf.product = inqbuf.product;
        sa.sa_inqbuf.revision = inqbuf.revision;
        sa.scsipi_info.scsi_version = inqbuf.version;
+       sa.sa_inqptr = &inqbuf;
 
        finger = (struct scsi_quirk_inquiry_pattern *)scsipi_inqmatch(
            &sa.sa_inqbuf, (caddr_t)scsi_quirk_patterns,
diff -r 0e4bd7d75a49 -r dc05b7639e03 sys/dev/scsipi/scsipiconf.h
--- a/sys/dev/scsipi/scsipiconf.h       Thu Jan 20 17:07:41 2000 +0000
+++ b/sys/dev/scsipi/scsipiconf.h       Thu Jan 20 17:10:18 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipiconf.h,v 1.36 2000/01/17 17:59:49 bouyer Exp $   */
+/*     $NetBSD: scsipiconf.h,v 1.37 2000/01/20 17:10:18 mjacob Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -353,6 +353,7 @@
 struct scsipibus_attach_args {
        struct scsipi_link *sa_sc_link;
        struct scsipi_inquiry_pattern sa_inqbuf;
+       struct scsipi_inquiry_data *sa_inqptr; 
        union {                         /* bus-type specific infos */
                u_int8_t scsi_version;  /* SCSI version */
        } scsipi_info;