Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/vax/vax Recognize racd* as boot device.



details:   https://anonhg.NetBSD.org/src/rev/b86014387792
branches:  trunk
changeset: 796108:b86014387792
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 20 16:02:37 2014 +0000

description:
Recognize racd* as boot device.

diffstat:

 sys/arch/vax/vax/autoconf.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r be967490f3c4 -r b86014387792 sys/arch/vax/vax/autoconf.c
--- a/sys/arch/vax/vax/autoconf.c       Tue May 20 15:50:11 2014 +0000
+++ b/sys/arch/vax/vax/autoconf.c       Tue May 20 16:02:37 2014 +0000
@@ -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 @@
 #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 @@
 }
 #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 @@
        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 @@
        return 0;
 }
 #endif
+
 #if NHP
 #include <vax/mba/mbavar.h>
 int



Home | Main Index | Thread Index | Old Index