[src/netbsd-1-4]: src/sys/dev/ata Pull up to HEAD 1.9, per Manuel Bouyer <bou...

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

details:   https://anonhg.NetBSD.org/src/rev/394f65e46167
branches:  netbsd-1-4
changeset: 468381:394f65e46167
user:      cjs <cjs%NetBSD.org@localhost>
date:      Tue Apr 20 00:54:40 1999 +0000

description:
Pull up to HEAD 1.9, per Manuel Bouyer <bouyer%antioche.eu.org@localhost>

diffstat:

 sys/dev/ata/ata.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 2deb720d56f0 -r 394f65e46167 sys/dev/ata/ata.c
--- a/sys/dev/ata/ata.c Mon Apr 19 21:10:00 1999 +0000
+++ b/sys/dev/ata/ata.c Tue Apr 20 00:54:40 1999 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: ata.c,v 1.7 1999/03/10 13:11:43 bouyer Exp $      */
+/*      $NetBSD: ata.c,v 1.7.2.1 1999/04/20 00:54:40 cjs Exp $      */
 /*
  * Copyright (c) 1998 Manuel Bouyer.  All rights reserved.
  *
@@ -81,15 +81,16 @@
                wdc_c.r_command = WDCC_IDENTIFY;
                wdc_c.r_st_bmask = WDCS_DRDY;
                wdc_c.r_st_pmask = WDCS_DRQ;
+               wdc_c.timeout = 1000; /* 1s */
        } else if (drvp->drive_flags & DRIVE_ATAPI) {
                wdc_c.r_command = ATAPI_IDENTIFY_DEVICE;
                wdc_c.r_st_bmask = 0;
                wdc_c.r_st_pmask = WDCS_DRQ;
+               wdc_c.timeout = 10000; /* 10s */
        } else {
                return CMD_ERR;
        }
        wdc_c.flags = AT_READ | flags;
-       wdc_c.timeout = 1000; /* 1s */
        wdc_c.data = tb;
        wdc_c.bcount = DEV_BSIZE;
        if (wdc_exec_command(drvp, &wdc_c) != WDC_COMPLETE)