[src/netbsd-1-5]: src/sys/arch/pmax/pmax Pull up revision 1.57 via patch (req...

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

details:   https://anonhg.NetBSD.org/src/rev/de4ed6a27c1e
branches:  netbsd-1-5
changeset: 490532:de4ed6a27c1e
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Jan 25 20:40:14 2001 +0000

description:
Pull up revision 1.57 via patch (requested by simonb):
  Adjust recent netboot fix to work on the 5100 as well.

diffstat:

 sys/arch/pmax/pmax/autoconf.c |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r 9edd4ad2bab3 -r de4ed6a27c1e sys/arch/pmax/pmax/autoconf.c
--- a/sys/arch/pmax/pmax/autoconf.c     Thu Jan 25 20:35:24 2001 +0000
+++ b/sys/arch/pmax/pmax/autoconf.c     Thu Jan 25 20:40:14 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.53.4.2 2000/11/29 22:56:52 tv Exp $     */
+/*     $NetBSD: autoconf.c,v 1.53.4.3 2001/01/25 20:40:14 jhawk Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.53.4.2 2000/11/29 22:56:52 tv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.53.4.3 2001/01/25 20:40:14 jhawk Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -69,6 +69,7 @@
 #include "xasc_ioasic.h"
 #include "xasc_pmaz.h"
 #include "opt_dec_3100.h"
+#include "opt_dec_5100.h"
 
 struct intrhand intrtab[MAX_DEV_NCOOKIES];
 struct device *booted_device;
@@ -102,7 +103,7 @@
  * Look at the string 'cp' and decode the boot device.  Boot names
  * can be something like 'rz(0,0,0)vmunix' or '5/rz0/vmunix'.
  *
- * 3100 allows abbrivation;
+ * 2100/3100/5100 allows abbrivation;
  *     dev(controller[,uni-number[,partition-number]]])[filename]
  */
 void
@@ -113,7 +114,7 @@
        booted_slot = booted_unit = booted_partition = 0;
        booted_protocol = NULL;
 
-#ifdef DEC_3100
+#if defined(DEC_3100) || defined(DEC_5100)
        if (cp[0] == 'r' && cp[1] == 'z' && cp[2] == '(') {
                cp += 3;
                if (*cp >= '0' && *cp <= '9')
@@ -288,9 +289,9 @@
        if (netboot && strcmp(cd->cd_name, "le") == 0) {
                struct tc_attach_args *ta = aux;
 
-#ifdef DEC_3100
-               /* Only one Ethernet interface on 3100. */
-               if (systype == DS_PMAX) {
+#if defined(DEC_3100) || defined(DEC_5100)
+               /* Only one Ethernet interface on 2100/3100/5100. */
+               if (systype == DS_PMAX || systype == DS_MIPSMATE) {
                        booted_device = dev;
                        found = 1;
                        return;