[src/netbsd-3]: src/sys/dev/ata Pull up revision 1.13 (requested by briggs in...

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

details:   https://anonhg.NetBSD.org/src/rev/33ca0db9cafd
branches:  netbsd-3
changeset: 576470:33ca0db9cafd
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Jul 03 21:11:04 2005 +0000

description:
Pull up revision 1.13 (requested by briggs in ticket #521):
Basic support for RAID0 and RAID1 for the Adaptec HostRAID format as found
on the Intel 6300ESB on-board RAID.  Adapted from FreeBSD.

diffstat:

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

diffs (27 lines):

diff -r 270b7b58b27d -r 33ca0db9cafd sys/dev/ata/ata_raid.c
--- a/sys/dev/ata/ata_raid.c    Sun Jul 03 21:10:58 2005 +0000
+++ b/sys/dev/ata/ata_raid.c    Sun Jul 03 21:11:04 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ata_raid.c,v 1.11 2004/10/28 07:07:39 yamt Exp $       */
+/*     $NetBSD: ata_raid.c,v 1.11.10.1 2005/07/03 21:11:04 tron Exp $  */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.11 2004/10/28 07:07:39 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.11.10.1 2005/07/03 21:11:04 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -259,6 +259,8 @@
 {
        struct wd_softc *sc = (void *) self;
 
+       if (ata_raid_read_config_adaptec(sc) == 0)
+               return;
        if (ata_raid_read_config_promise(sc) == 0)
                return;
 }