Module Name: src
Committed By: martin
Date: Tue May 20 16:02:37 UTC 2014
Modified Files:
src/sys/arch/vax/vax: autoconf.c
Log Message:
Recognize racd* as boot device.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/vax/vax/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/vax/vax/autoconf.c
diff -u src/sys/arch/vax/vax/autoconf.c:1.95 src/sys/arch/vax/vax/autoconf.c:1.96
--- src/sys/arch/vax/vax/autoconf.c:1.95 Sat Oct 27 17:18:13 2012
+++ src/sys/arch/vax/vax/autoconf.c Tue May 20 16:02:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.95 2012/10/27 17:18:13 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.96 2014/05/20 16:02:37 martin Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.95 2012/10/27 17:18:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.96 2014/05/20 16:02:37 martin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cputype.h"
@@ -217,7 +217,7 @@ static int booted_sd(device_t, void *);
#if NRL > 0
static int booted_rl(device_t, void *);
#endif
-#if NRA
+#if NRA > 0 || NRACD > 0
static int booted_ra(device_t, void *);
#endif
#if NHP
@@ -411,7 +411,7 @@ booted_rl(device_t dev, void *aux)
}
#endif
-#if NRA
+#if NRA > 0 || NRACD > 0
#include <dev/mscp/mscp.h>
#include <dev/mscp/mscpreg.h>
#include <dev/mscp/mscpvar.h>
@@ -422,7 +422,7 @@ booted_ra(device_t dev, void *aux)
struct mscp_softc *pdev = device_private(device_parent(dev));
paddr_t ioaddr;
- if (jmfr("ra", dev, BDEV_UDA))
+ if (jmfr("ra", dev, BDEV_UDA) && jmfr("racd", dev, BDEV_UDA))
return 0;
if (da->da_mp->mscp_unit != rpb.unit)
@@ -435,6 +435,7 @@ booted_ra(device_t dev, void *aux)
return 0;
}
#endif
+
#if NHP
#include <vax/mba/mbavar.h>
int
