[src/netbsd-1-4]: src/sys/dev/scsipi Pull up revision 1.29 (via patch, reques...

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

details:   https://anonhg.NetBSD.org/src/rev/82878ef4d923
branches:  netbsd-1-4
changeset: 470187:82878ef4d923
user:      he <he%NetBSD.org@localhost>
date:      Sun Jan 23 12:41:20 2000 +0000

description:
Pull up revision 1.29 (via patch, requested by bouyer):
  Use SCSIPIRETRIES instead of hard-coded value '2' for number of
  retries in common routines, and define it as 4 so that ATAPI
  command will succeed after several downgrade.

diffstat:

 sys/dev/scsipi/scsipi_base.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r cc007164a298 -r 82878ef4d923 sys/dev/scsipi/scsipi_base.c
--- a/sys/dev/scsipi/scsipi_base.c      Sun Jan 23 12:40:43 2000 +0000
+++ b/sys/dev/scsipi/scsipi_base.c      Sun Jan 23 12:41:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_base.c,v 1.20.2.3 2000/01/16 17:49:42 he Exp $  */
+/*     $NetBSD: scsipi_base.c,v 1.20.2.4 2000/01/23 12:41:20 he Exp $  */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -423,7 +423,7 @@
         */
        if (scsipi_command(sc_link, (struct scsipi_generic *)&scsipi_cmd,
            sizeof(scsipi_cmd), (u_char *)&rdcap, sizeof(rdcap),
-           2, 20000, NULL, flags | SCSI_DATA_IN) != 0) {
+           SCSIPIRETRIES, 20000, NULL, flags | SCSI_DATA_IN) != 0) {
                sc_link->sc_print_addr(sc_link);
                printf("could not get size\n");
                return (0);
@@ -451,7 +451,7 @@
 
        return (scsipi_command(sc_link,
            (struct scsipi_generic *)&scsipi_cmd, sizeof(scsipi_cmd),
-           0, 0, 2, 10000, NULL, flags));
+           0, 0, SCSIPIRETRIES, 10000, NULL, flags));
 }
 
 /*
@@ -476,7 +476,7 @@
        return (scsipi_command(sc_link,
            (struct scsipi_generic *) &scsipi_cmd, sizeof(scsipi_cmd),
            (u_char *) inqbuf, sizeof(struct scsipi_inquiry_data),
-           2, 10000, NULL, SCSI_DATA_IN | flags));
+           SCSIPIRETRIES, 10000, NULL, SCSI_DATA_IN | flags));
 }
 
 /*
@@ -497,7 +497,7 @@
        scsipi_cmd.how = type;
        return (scsipi_command(sc_link,
            (struct scsipi_generic *) &scsipi_cmd, sizeof(scsipi_cmd),
-           0, 0, 2, 5000, NULL, flags));
+           0, 0, SCSIPIRETRIES, 5000, NULL, flags));
 }
 
 /*
@@ -519,7 +519,8 @@
        scsipi_cmd.how = type;
        return (scsipi_command(sc_link,
            (struct scsipi_generic *) &scsipi_cmd, sizeof(scsipi_cmd),
-           0, 0, 2, (type & SSS_START) ? 30000 : 10000, NULL, flags));
+           0, 0, SCSIPIRETRIES, (type & SSS_START) ? 30000 : 10000,
+           NULL, flags));
 }
 
 /*