add support for 256K memory chips (from ghg@purdue)

SCCS-vsn: sys/vax/vax/autoconf.c 6.14
SCCS-vsn: sys/vax/vax/nexus.h 6.5

diff --git a/usr/src/sys/vax/vax/autoconf.c b/usr/src/sys/vax/vax/autoconf.c
index d72436c..eab8111 100644 (file)
--- a/usr/src/sys/vax/vax/autoconf.c
+++ b/usr/src/sys/vax/vax/autoconf.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)autoconf.c  6.13 (Berkeley) %G%
+ *     @(#)autoconf.c  6.14 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -308,6 +308,9 @@ probesbi(psbi)
                case NEX_MEM64I:
                case NEX_MEM64L:
                case NEX_MEM64LI:
                case NEX_MEM64I:
                case NEX_MEM64L:
                case NEX_MEM64LI:

+               case NEX_MEM256I:
+               case NEX_MEM256L:
+               case NEX_MEM256LI:

                        printf("mcr%d (el) at tr%d\n", nmcr, nexnum);
                        if (nmcr >= 4) {
                                printf("5 mcr's");
                        printf("mcr%d (el) at tr%d\n", nmcr, nexnum);
                        if (nmcr >= 4) {
                                printf("5 mcr's");


@@ -316,12 +319,15 @@ probesbi(psbi)
                        if (cpu == VAX_780)
                                mcrtype[nmcr] = M780EL;
                        mcraddr[nmcr++] = (struct mcr *)nxv;
                        if (cpu == VAX_780)
                                mcrtype[nmcr] = M780EL;
                        mcraddr[nmcr++] = (struct mcr *)nxv;

-                       if (nexcsr.nex_type != NEX_MEM64I)
+                       if (nexcsr.nex_type != NEX_MEM64I && 
+                         nexcsr.nex_type != NEX_MEM256I)

                                break;
                        /* fall into ... */
 
                case NEX_MEM64U:
                case NEX_MEM64UI:
                                break;
                        /* fall into ... */
 
                case NEX_MEM64U:
                case NEX_MEM64UI:

+               case NEX_MEM256U:
+               case NEX_MEM256UI:

                        printf("mcr%d (eu) at tr%d\n", nmcr, nexnum);
                        if (nmcr >= 4) {
                                printf("5 mcr's");
                        printf("mcr%d (eu) at tr%d\n", nmcr, nexnum);
                        if (nmcr >= 4) {
                                printf("5 mcr's");

diff --git a/usr/src/sys/vax/vax/nexus.h b/usr/src/sys/vax/vax/nexus.h
index edcabc1..b4b5957 100644 (file)
--- a/usr/src/sys/vax/vax/nexus.h
+++ b/usr/src/sys/vax/vax/nexus.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)nexus.h     6.4 (Berkeley) %G%
+ *     @(#)nexus.h     6.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -105,3 +105,8 @@ struct nexus nexus[MAXNNEXUS];
 #define        NEX_MEM64U      0x6a            /* 64K chips, non-interleaved, upper */
 #define        NEX_MEM64UI     0x6b            /* 64K chips, ext-interleaved, upper */
 #define        NEX_MEM64I      0x6c            /* 64K chips, interleaved */
 #define        NEX_MEM64U      0x6a            /* 64K chips, non-interleaved, upper */
 #define        NEX_MEM64UI     0x6b            /* 64K chips, ext-interleaved, upper */
 #define        NEX_MEM64I      0x6c            /* 64K chips, interleaved */

+#define        NEX_MEM256L     0x70            /* 256K chips, non-interleaved, lower */
+#define        NEX_MEM256LI    0x71            /* 256K chips, ext-interleaved, lower */
+#define        NEX_MEM256U     0x72            /* 256K chips, non-interleaved, upper */
+#define        NEX_MEM256UI    0x73            /* 256K chips, ext-interleaved, upper */
+#define        NEX_MEM256I     0x74            /* 256K chips, interleaved */