[src/trunk]: src/sys/dev/ic If we detected an old drive on a channel, clear (...

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

details:   https://anonhg.NetBSD.org/src/rev/9ed4433da980
branches:  trunk
changeset: 555301:9ed4433da980
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Nov 13 22:18:10 2003 +0000

description:
If we detected an old drive on a channel, clear (ATA|ATAPI) for both
drives on the channel.

diffstat:

 sys/dev/ic/wdc.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r d1e1bb107d9e -r 9ed4433da980 sys/dev/ic/wdc.c
--- a/sys/dev/ic/wdc.c  Thu Nov 13 20:14:27 2003 +0000
+++ b/sys/dev/ic/wdc.c  Thu Nov 13 22:18:10 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wdc.c,v 1.153 2003/11/07 08:58:33 bouyer Exp $ */
+/*     $NetBSD: wdc.c,v 1.154 2003/11/13 22:18:10 bouyer Exp $ */
 
 /*
  * Copyright (c) 1998, 2001, 2003 Manuel Bouyer.  All rights reserved.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.153 2003/11/07 08:58:33 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.154 2003/11/13 22:18:10 bouyer Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -410,7 +410,9 @@
                        chp->ch_drive[0].drive_flags &= ~DRIVE_OLD;
                        chp->ch_drive[1].drive_flags &= ~DRIVE_OLD;
                } else {
-                       chp->ch_drive[i].drive_flags &=
+                       chp->ch_drive[0].drive_flags &=
+                           ~(DRIVE_ATA | DRIVE_ATAPI);
+                       chp->ch_drive[1].drive_flags &=
                            ~(DRIVE_ATA | DRIVE_ATAPI);
                        WDCDEBUG_PRINT(("%s:%d:%d: IDENTIFY failed (%d)\n",
                            chp->wdc->sc_dev.dv_xname,