[src/netbsd-1-6]: src/sys/dev/ata Pull up revision 1.18 (requested by bouyer ...

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

details:   https://anonhg.NetBSD.org/src/rev/032febd58377
branches:  netbsd-1-6
changeset: 530484:032febd58377
user:      grant <grant%NetBSD.org@localhost>
date:      Mon Jun 30 02:53:47 2003 +0000

description:
Pull up revision 1.18 (requested by bouyer in ticket #1353):

Bump WDCC_IDENTIFY timeout to 3 seconds, as required by some drives.
Reported by Karl Janmar <karlj%mdstud.chalmers.se@localhost> on tech-kern.

diffstat:

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

diffs (27 lines):

diff -r 56900c78f6d4 -r 032febd58377 sys/dev/ata/ata.c
--- a/sys/dev/ata/ata.c Mon Jun 30 02:52:54 2003 +0000
+++ b/sys/dev/ata/ata.c Mon Jun 30 02:53:47 2003 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: ata.c,v 1.17 2002/04/09 21:17:53 bouyer Exp $      */
+/*      $NetBSD: ata.c,v 1.17.4.1 2003/06/30 02:53:47 grant Exp $      */
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
  *
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.17 2002/04/09 21:17:53 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.17.4.1 2003/06/30 02:53:47 grant Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -88,7 +88,7 @@
                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 */
+               wdc_c.timeout = 3000; /* 3s */
        } else if (drvp->drive_flags & DRIVE_ATAPI) {
                wdc_c.r_command = ATAPI_IDENTIFY_DEVICE;
                wdc_c.r_st_bmask = 0;