[src/netbsd-1-6]: src/sys/arch/sparc64/sparc64 Pull up revision 1.67 (request...

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

details:   https://anonhg.NetBSD.org/src/rev/a9c17d071ee8
branches:  netbsd-1-6
changeset: 529345:a9c17d071ee8
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Nov 15 00:32:33 2002 +0000

description:
Pull up revision 1.67 (requested by mrg in ticket #959):
match channel & disk when trying to determine if this IDE disk is the boot device.
now we can boot from any IDE disk on the system.

diffstat:

 sys/arch/sparc64/sparc64/autoconf.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 45ebc4cfe266 -r a9c17d071ee8 sys/arch/sparc64/sparc64/autoconf.c
--- a/sys/arch/sparc64/sparc64/autoconf.c       Fri Nov 15 00:22:50 2002 +0000
+++ b/sys/arch/sparc64/sparc64/autoconf.c       Fri Nov 15 00:32:33 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.57.4.1 2002/06/05 04:07:28 lukem Exp $ */
+/*     $NetBSD: autoconf.c,v 1.57.4.2 2002/11/15 00:32:33 lukem Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -1339,7 +1339,8 @@
                /* IDE disks. */
                struct ata_device *adev = aux;
 
-               if (adev->adev_channel == bp->val[0]) {
+               if (adev->adev_channel == bp->val[1] &&
+                   adev->adev_drv_data->drive == bp->val[0]) {
                        nail_bootdev(dev, bp);
                        DPRINTF(ACDB_BOOTDEV, ("\t-- found wd disk %s\n",
                            dev->dv_xname));