working autoconf version

SCCS-vsn: sys/vax/vax/autoconf.c 4.28
SCCS-vsn: sys/vax/vax/conf.c 4.29
SCCS-vsn: sys/vax/mba/hp.c 4.32
SCCS-vsn: sys/vax/uba/uba.c 4.24

diff --git a/usr/src/sys/vax/mba/hp.c b/usr/src/sys/vax/mba/hp.c
index cc30b21..a4629cf 100644 (file)
--- a/usr/src/sys/vax/mba/hp.c
+++ b/usr/src/sys/vax/mba/hp.c
@@ -1,4 +1,4 @@
-/*     hp.c    4.31    81/03/11        */
+/*     hp.c    4.32    81/03/16        */

 
 #include "hp.h"
 #if NHP > 0
 
 #include "hp.h"
 #if NHP > 0


@@ -53,11 +53,11 @@ struct      size {
 }, rm5_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 26 */
        33440,  27,             /* B=cyl 27 thru 81 */
 }, rm5_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 26 */
        33440,  27,             /* B=cyl 27 thru 81 */

-       500992, 0,              /* C=cyl 0 thru 823 */
+       500384, 0,              /* C=cyl 0 thru 822 */

        15884,  562,            /* D=cyl 562 thru 588 */
        55936,  589,            /* E=cyl 589 thru 680 */
        15884,  562,            /* D=cyl 562 thru 588 */
        55936,  589,            /* E=cyl 589 thru 680 */

-       86944,  681,            /* F=cyl 681 thru 823 */
-       159296, 562,            /* G=cyl 562 thru 823 */
+       86636,  681,            /* F=cyl 681 thru 822 */
+       158688, 562,            /* G=cyl 562 thru 822 */

        291346, 82,             /* H=cyl 82 thru 561 */
 }, rm80_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 36 */
        291346, 82,             /* H=cyl 82 thru 561 */
 }, rm80_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 36 */


@@ -241,8 +241,9 @@ hpdtint(mi, mbsr)
                    hpaddr->hper1 & HPER1_HARD ||
                    hpaddr->hper2 & HPER2_HARD) {
                        harderr(bp, "hp");
                    hpaddr->hper1 & HPER1_HARD ||
                    hpaddr->hper2 & HPER2_HARD) {
                        harderr(bp, "hp");

-                       printf("mbsr=%b er1=%b er2=%b\n",
-                           mbsr, mbsr_bits,
+                       if (mbsr & (MBSR_EBITS &~ (MBSR_DTABT|MBSR_MBEXC)))
+                               printf("mbsr=%b ", mbsr, mbsr_bits);
+                       printf("er1=%b er2=%b\n",

                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
                        bp->b_flags |= B_ERROR;
                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
                        bp->b_flags |= B_ERROR;

diff --git a/usr/src/sys/vax/uba/uba.c b/usr/src/sys/vax/uba/uba.c
index d2aa7e4..178a58c 100644 (file)
--- a/usr/src/sys/vax/uba/uba.c
+++ b/usr/src/sys/vax/uba/uba.c
@@ -1,4 +1,4 @@
-/*     uba.c   4.23    81/03/13        */
+/*     uba.c   4.24    81/03/16        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"

diff --git a/usr/src/sys/vax/vax/autoconf.c b/usr/src/sys/vax/vax/autoconf.c
index 539f456..0918013 100644 (file)
--- a/usr/src/sys/vax/vax/autoconf.c
+++ b/usr/src/sys/vax/vax/autoconf.c
@@ -1,4 +1,4 @@
-/*     autoconf.c      4.27    81/03/13        */
+/*     autoconf.c      4.28    81/03/16        */

 
 /*
  * Setup the system to run on the current machine.
 
 /*
  * Setup the system to run on the current machine.


@@ -109,7 +109,7 @@ probenexus(pcpu)
        register struct nexus *nxv;
        struct nexus *nxp = pcpu->pc_nexbase;
        union nexcsr nexcsr;
        register struct nexus *nxv;
        struct nexus *nxp = pcpu->pc_nexbase;
        union nexcsr nexcsr;

-       int i, ubawatch();
+       int i;

        
        nexnum = 0, nxv = nexus;
        for (; nexnum < pcpu->pc_nnexus; nexnum++, nxp++, nxv++) {
        
        nexnum = 0, nxv = nexus;
        for (; nexnum < pcpu->pc_nnexus; nexnum++, nxp++, nxv++) {


@@ -145,14 +145,19 @@ probenexus(pcpu)
                                printf("5 uba's");
                                goto unsupp;
                        }
                                printf("5 uba's");
                                goto unsupp;
                        }

-                       setscbnex(ubaintv[numuba]);
+#if VAX780
+                       if (cpu == VAX_780)
+                               setscbnex(ubaintv[numuba]);
+#endif

                        i = nexcsr.nex_type - NEX_UBA0;
                        unifind((struct uba_regs *)nxv, (struct uba_regs *)nxp,
                            umem[i], pcpu->pc_umaddr[i]);
                        i = nexcsr.nex_type - NEX_UBA0;
                        unifind((struct uba_regs *)nxv, (struct uba_regs *)nxp,
                            umem[i], pcpu->pc_umaddr[i]);

+#if VAX780

                        if (cpu == VAX_780)
                                ((struct uba_regs *)nxv)->uba_cr =
                                    UBACR_IFS|UBACR_BRIE|
                                    UBACR_USEFIE|UBACR_SUEFIE;
                        if (cpu == VAX_780)
                                ((struct uba_regs *)nxv)->uba_cr =
                                    UBACR_IFS|UBACR_BRIE|
                                    UBACR_USEFIE|UBACR_SUEFIE;

+#endif

                        numuba++;
                        break;
 
                        numuba++;
                        break;
 


@@ -190,7 +195,9 @@ unconfig:
                        continue;
                }
        }
                        continue;
                }
        }

-       timeout(ubawatch, (caddr_t)0, hz);
+#if VAX780
+       { int ubawatch(); timeout(ubawatch, (caddr_t)0, hz); }
+#endif

 }
 
 #if NMBA > 0
 }
 
 #if NMBA > 0


@@ -376,6 +383,7 @@ unifind(vubp, pubp, vumem, pumem)
         */
        uhp->uh_uba = vubp;
        uhp->uh_physuba = pubp;
         */
        uhp->uh_uba = vubp;
        uhp->uh_physuba = pubp;

+/* HAVE TO DO SOMETHING SPECIAL FOR SECOND UNIBUS ON COMETS HERE */

        if (numuba == 0)
                uhp->uh_vec = UNIvec;
        else
        if (numuba == 0)
                uhp->uh_vec = UNIvec;
        else

diff --git a/usr/src/sys/vax/vax/conf.c b/usr/src/sys/vax/vax/conf.c
index b4db3a0..7776e9f 100644 (file)
--- a/usr/src/sys/vax/vax/conf.c
+++ b/usr/src/sys/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/*     conf.c  4.28    81/03/11        */
+/*     conf.c  4.29    81/03/16        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -54,7 +54,7 @@ int   rkstrategy(),rkread(),rkwrite(),rkintr(),rkdump(),rkreset();
 #endif
 
 #include "te.h"
 #endif
 
 #include "te.h"

-#if NTM > 0
+#if NTE > 0

 int    tmopen(),tmclose(),tmstrategy(),tmread(),tmwrite();
 int    tmioctl(),tmdump(),tmreset();
 #else
 int    tmopen(),tmclose(),tmstrategy(),tmread(),tmwrite();
 int    tmioctl(),tmdump(),tmreset();
 #else