[src/netbsd-1-4]: src/sys/arch/vax Apply patch (requested by toddpw):

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

details:   https://anonhg.NetBSD.org/src/rev/84bf9c8dac5e
branches:  netbsd-1-4
changeset: 470454:84bf9c8dac5e
user:      he <he%NetBSD.org@localhost>
date:      Wed Mar 01 12:46:36 2000 +0000

description:
Apply patch (requested by toddpw):
  Fix bugs in support for VaxStation 2000 and 3100, vax pmap, and
  the NCR scsi driver.

diffstat:

 sys/arch/vax/vax/locore.c |  17 +++++++++++++----
 sys/arch/vax/vax/pmap.c   |  10 +++++-----
 sys/arch/vax/vsa/ncr.c    |   3 ++-
 3 files changed, 20 insertions(+), 10 deletions(-)

diffs (96 lines):

diff -r d97da45d3e7e -r 84bf9c8dac5e sys/arch/vax/vax/locore.c
--- a/sys/arch/vax/vax/locore.c Wed Mar 01 12:45:28 2000 +0000
+++ b/sys/arch/vax/vax/locore.c Wed Mar 01 12:46:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.c,v 1.35.2.1 1999/05/03 12:56:07 perry Exp $    */
+/*     $NetBSD: locore.c,v 1.35.2.2 2000/03/01 12:46:36 he Exp $       */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -169,12 +169,21 @@
                        if (vax_boardtype == VAX_BTYP_49)
                                dep_call = &ka48_calls;
 #endif
-                       if ((dep_call == &ka410_calls ||
-                           dep_call == &ka43_calls) &&
-                           (vax_confdata & 0x80))
+#if VAX410 || VAX43
+                       if ((
+#if VAX410 && VAX43
+                               dep_call == &ka410_calls ||
+                               dep_call == &ka43_calls
+#elif VAX410
+                               dep_call == &ka410_calls
+#else
+                               dep_call == &ka43_calls
+#endif
+                           ) && (vax_confdata & 0x80))
                                strcpy(cpu_model, "MicroVAX ");
                        else
                                strcpy(cpu_model, "VAXstation ");
+#endif
 
                        switch (vax_boardtype) {
 #if VAX410
diff -r d97da45d3e7e -r 84bf9c8dac5e sys/arch/vax/vax/pmap.c
--- a/sys/arch/vax/vax/pmap.c   Wed Mar 01 12:45:28 2000 +0000
+++ b/sys/arch/vax/vax/pmap.c   Wed Mar 01 12:46:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.61.2.2 2000/01/31 19:22:56 he Exp $    */
+/*     $NetBSD: pmap.c,v 1.61.2.3 2000/03/01 12:46:37 he Exp $    */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -448,7 +448,7 @@
        s = splimp();
        if (pv->pv_pte == ptp) {
                g = (int *)pv->pv_pte;
-               if ((pv->pv_attr & (PG_V|PG_M)) == 0)
+               if ((pv->pv_attr & (PG_V|PG_M)) != (PG_V|PG_M))
                        pv->pv_attr |= g[0]|g[1]|g[2]|g[3]|g[4]|g[5]|g[6]|g[7];
                pv->pv_pte = 0;
                pv->pv_pmap->pm_stats.resident_count--;
@@ -461,7 +461,7 @@
                        pf = pl->pv_next;
                        pl->pv_next = pl->pv_next->pv_next;
                        g = (int *)pf->pv_pte;
-                       if ((pv->pv_attr & (PG_V|PG_M)) == 0)
+                       if ((pv->pv_attr & (PG_V|PG_M)) != (PG_V|PG_M))
                                pv->pv_attr |=
                                    g[0]|g[1]|g[2]|g[3]|g[4]|g[5]|g[6]|g[7];
                        pf->pv_pmap->pm_stats.resident_count--;
@@ -1151,7 +1151,7 @@
                g = (int *)pv->pv_pte;
                s = splimp();
                if (g) {
-                       if ((pv->pv_attr & (PG_V|PG_M)) == 0)
+                       if ((pv->pv_attr & (PG_V|PG_M)) != (PG_V|PG_M))
                                pv->pv_attr |= 
                                    g[0]|g[1]|g[2]|g[3]|g[4]|g[5]|g[6]|g[7];
                        bzero(g, sizeof(struct pte) * LTOHPN);
@@ -1163,7 +1163,7 @@
                pv->pv_next = 0;
                while (pl) {
                        g = (int *)pl->pv_pte;
-                       if ((pv->pv_attr & (PG_V|PG_M)) == 0)
+                       if ((pv->pv_attr & (PG_V|PG_M)) != (PG_V|PG_M))
                                pv->pv_attr |=
                                    g[0]|g[1]|g[2]|g[3]|g[4]|g[5]|g[6]|g[7];
                        bzero(g, sizeof(struct pte) * LTOHPN);
diff -r d97da45d3e7e -r 84bf9c8dac5e sys/arch/vax/vsa/ncr.c
--- a/sys/arch/vax/vsa/ncr.c    Wed Mar 01 12:45:28 2000 +0000
+++ b/sys/arch/vax/vsa/ncr.c    Wed Mar 01 12:46:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.19 1999/03/26 22:04:07 ragge Exp $   */
+/*     $NetBSD: ncr.c,v 1.19.2.1 2000/03/01 12:46:42 he Exp $  */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -196,6 +196,7 @@
        ncr_sc->sci_r6 = sc->sca_regs + 24; /* IN_DATA/DMA_TRCV  (rw) */
        ncr_sc->sci_r7 = sc->sca_regs + 28; /* RESET/DMA_IRCV    (rw) */
 
+       ncr_sc->sc_no_disconnect = 0xff;
        /*
         * Initialize si board itself.
         */