fix cleanups

SCCS-vsn: sys/vax/vax/nexus.h 6.6
SCCS-vsn: sys/vax/vax/autoconf.c 6.24

diff --git a/usr/src/sys/vax/vax/autoconf.c b/usr/src/sys/vax/vax/autoconf.c
index 58ba119..6c2473f 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.23 (Berkeley) %G%
+ *     @(#)autoconf.c  6.24 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -222,9 +222,9 @@ probenexi(pnc)
        union nexcsr nexcsr;
        int i;
        
        union nexcsr nexcsr;
        int i;
        

-       nexnum = 0, nxv = &nexus[nsbi * NNEX8600];
+       nexnum = 0, nxv = &nexus[nsbi * NNEXSBI];

        for (; nexnum < pnc->psb_nnexus; nexnum++, nxp++, nxv++) {
        for (; nexnum < pnc->psb_nnexus; nexnum++, nxp++, nxv++) {

-               ioaccess((caddr_t)nxp, Nexmap[nsbi * 16 + nexnum],
+               ioaccess((caddr_t)nxp, Nexmap[nsbi * NNEXSBI + nexnum],

                     sizeof(struct nexus));
                if (badaddr((caddr_t)nxv, 4))
                        continue;
                     sizeof(struct nexus));
                if (badaddr((caddr_t)nxv, 4))
                        continue;

diff --git a/usr/src/sys/vax/vax/nexus.h b/usr/src/sys/vax/vax/nexus.h
index b4b5957..cb7d9f1 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.5 (Berkeley) %G%
+ *     @(#)nexus.h     6.6 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -15,29 +15,30 @@
  * At boot time the system looks through the array of available
  * slots and finds the interconnects for the machine.
  */
  * At boot time the system looks through the array of available
  * slots and finds the interconnects for the machine.
  */

+#define        NNEXSBI         16

 #if VAX8600
 #if VAX8600

-#define        NNEX8600        16
+#define        NNEX8600        NNEXSBI

 #define        NEXA8600        ((struct nexus *)(0x20000000))
 #define        NEXB8600        ((struct nexus *)(0x22000000))
 #endif
 #if VAX780
 #define        NEXA8600        ((struct nexus *)(0x20000000))
 #define        NEXB8600        ((struct nexus *)(0x22000000))
 #endif
 #if VAX780

-#define        NNEX780 16
+#define        NNEX780 NNEXSBI

 #define        NEX780  ((struct nexus *)0x20000000)
 #endif
 #if VAX750
 #define        NEX780  ((struct nexus *)0x20000000)
 #endif
 #if VAX750

-#define        NNEX750 16
+#define        NNEX750 NNEXSBI

 #define        NEX750  ((struct nexus *)0xf20000)
 #endif
 #if VAX730
 #define        NEX750  ((struct nexus *)0xf20000)
 #endif
 #if VAX730

-#define        NNEX730 16
+#define        NNEX730 NNEXSBI

 #define        NEX730  ((struct nexus *)0xf20000)
 #endif
 #define        NEXSIZE 0x2000
 
 #if VAX8600
 #define        NEX730  ((struct nexus *)0xf20000)
 #endif
 #define        NEXSIZE 0x2000
 
 #if VAX8600

-#define        MAXNNEXUS 32
+#define        MAXNNEXUS (2 * NNEXSBI)

 #else 
 #else 

-#define        MAXNNEXUS 16
+#define        MAXNNEXUS NNEXSBI

 #endif
 
 #ifndef LOCORE
 #endif
 
 #ifndef LOCORE