[src/trunk]: src/sys/arch/vax/vsa Don't try to search for these devices on 40...

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

details:   https://anonhg.NetBSD.org/src/rev/c7677b4e12a3
branches:  trunk
changeset: 475844:c7677b4e12a3
user:      ragge <ragge%NetBSD.org@localhost>
date:      Fri Aug 27 17:49:41 1999 +0000

description:
Don't try to search for these devices on 4000/90. badaddr() should
be fixed for this arch also.

diffstat:

 sys/arch/vax/vsa/ncr.c |   5 ++++-
 sys/arch/vax/vsa/smg.c |  11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 3b925b35ed80 -r c7677b4e12a3 sys/arch/vax/vsa/ncr.c
--- a/sys/arch/vax/vsa/ncr.c    Fri Aug 27 17:45:57 1999 +0000
+++ b/sys/arch/vax/vsa/ncr.c    Fri Aug 27 17:49:41 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.20 1999/06/19 15:46:05 ragge Exp $   */
+/*     $NetBSD: ncr.c,v 1.21 1999/08/27 17:49:42 ragge Exp $   */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -71,6 +71,7 @@
 
 #include <machine/vsbus.h>
 #include <machine/bus.h>
+#include <machine/sid.h>
 
 #include "ioconf.h"
 
@@ -126,6 +127,8 @@
        struct vsbus_attach_args *va = aux;
        volatile char *si_csr = (char *) va->va_addr;
 
+       if (vax_boardtype == VAX_BTYP_49)
+               return 0;
        /* This is the way Linux autoprobes the interrupt MK-990321 */
        si_csr[12] = 0;
        si_csr[16] = 0x80;
diff -r 3b925b35ed80 -r c7677b4e12a3 sys/arch/vax/vsa/smg.c
--- a/sys/arch/vax/vsa/smg.c    Fri Aug 27 17:45:57 1999 +0000
+++ b/sys/arch/vax/vsa/smg.c    Fri Aug 27 17:49:41 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smg.c,v 1.16 1999/05/20 23:00:58 ragge Exp $ */
+/*     $NetBSD: smg.c,v 1.17 1999/08/27 17:49:41 ragge Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -146,10 +146,15 @@
        void *aux;
 {
        struct vsbus_attach_args *va = aux;
-       volatile short *curcmd = (short *)va->va_addr;
-       volatile short *cfgtst = (short *)vax_map_physmem(VS_CFGTST, 1);
+       volatile short *curcmd;
+       volatile short *cfgtst;
        short tmp, tmp2;
 
+       if (vax_boardtype == VAX_BTYP_49)
+               return 0;
+
+       curcmd = (short *)va->va_addr;
+       cfgtst = (short *)vax_map_physmem(VS_CFGTST, 1);
        /*
         * Try to find the cursor chip by testing the flip-flop.
         * If nonexistent, no glass tty.