Module Name: src
Committed By: phx
Date: Wed Jun 30 17:50:34 UTC 2010
Modified Files:
src/sys/arch/sandpoint/sandpoint: autoconf.c
Log Message:
Determine the boot disk with bootinfo cookie.
Patch submitted by Toru Nishimura.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sandpoint/sandpoint/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/sandpoint/autoconf.c
diff -u src/sys/arch/sandpoint/sandpoint/autoconf.c:1.21 src/sys/arch/sandpoint/sandpoint/autoconf.c:1.22
--- src/sys/arch/sandpoint/sandpoint/autoconf.c:1.21 Tue May 18 15:07:50 2010
+++ src/sys/arch/sandpoint/sandpoint/autoconf.c Wed Jun 30 17:50:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.21 2010/05/18 15:07:50 phx Exp $ */
+/* $NetBSD: autoconf.c,v 1.22 2010/06/30 17:50:34 phx Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2010/05/18 15:07:50 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.22 2010/06/30 17:50:34 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,37 +137,9 @@
}
}
if (bi_rdev != NULL && dev->dv_class == DV_DISK
- && device_is_a(dev, bi_rdev->devname)) {
+ && device_is_a(dev, bi_rdev->devname)
+ && dev->dv_unit == bi_rdev->cookie) {
booted_device = dev;
booted_partition = 0;
}
}
-
-#if 0
-void
-findroot(void)
-{
- int unit, part;
- device_t dv;
- const char *name;
-
-#if 0
- printf("howto %x bootdev %x ", boothowto, bootdev);
-#endif
-
- if ((bootdev & B_MAGICMASK) != (u_long)B_DEVMAGIC)
- return;
-
- name = devsw_blk2name((bootdev >> B_TYPESHIFT) & B_TYPEMASK);
- if (name == NULL)
- return;
-
- part = (bootdev >> B_PARTITIONSHIFT) & B_PARTITIONMASK;
- unit = (bootdev >> B_UNITSHIFT) & B_UNITMASK;
-
- if ((dv = device_find_by_driver_unit(name, unit)) != NULL) {
- booted_device = dv;
- booted_partition = part;
- }
-}
-#endif
