need to omit qv/qd from bootxx's

[unix-history] / usr / src / sys / vax / stand / uba.c

diff --git a/usr/src/sys/vax/stand/uba.c b/usr/src/sys/vax/stand/uba.c
index 1abb099..03f14d8 100644 (file)
--- a/usr/src/sys/vax/stand/uba.c
+++ b/usr/src/sys/vax/stand/uba.c
@@ -1,17 +1,17 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
+ * Copyright (c) 1982, 1986 Regents of the University of California.

  * 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.
  *

- *     @(#)uba.c       6.2 (Berkeley) %G%
+ *     @(#)uba.c       7.3 (Berkeley) %G%

  */
 
 #include "../machine/pte.h"
 
  */
 
 #include "../machine/pte.h"
 

-#include "../h/param.h"
-#include "../h/inode.h"
-#include "../h/vm.h"
-#include "../h/fs.h"
+#include "param.h"
+#include "inode.h"
+#include "vm.h"
+#include "fs.h"

 
 #include "../vax/cpu.h"
 #include "../vaxuba/ubareg.h"
 
 #include "../vax/cpu.h"
 #include "../vaxuba/ubareg.h"


@@ -30,7 +30,7 @@ ubasetup(io, bdp)
        int bdp;
 {
        int npf;
        int bdp;
 {
        int npf;

-       unsigned v;
+       unsigned int v;

        register struct pte *pte;
        int o, temp, reg;
        static int lastreg = 128+64;
        register struct pte *pte;
        int o, temp, reg;
        static int lastreg = 128+64;


@@ -44,7 +44,7 @@ ubasetup(io, bdp)
                bdp = 0;
        } else
                reg = 0;
                bdp = 0;
        } else
                reg = 0;

-       pte = &ubauba(io->i_unit)->uba_map[reg];
+       pte = &ubauba(io->i_adapt)->uba_map[reg];

        temp = (bdp << 21) | UBAMR_MRV;
        if (bdp && (o & 01))
                temp |= UBAMR_BO;
        temp = (bdp << 21) | UBAMR_MRV;
        if (bdp && (o & 01))
                temp |= UBAMR_BO;


@@ -66,15 +66,23 @@ ubafree(io, mr)
                return;
        switch (cpu) {
 
                return;
        switch (cpu) {
 

+#if VAX8200
+       case VAX_8200:
+               UBA_PURGEBUA(ubauba(io->i_adapt), bdp);
+               break;
+#endif
+
+       case VAX_8600:

        case VAX_780:
        case VAX_780:

-               ubauba(io->i_unit)->uba_dpr[bdp] |= UBADPR_BNE;
+               ubauba(io->i_adapt)->uba_dpr[bdp] |= UBADPR_BNE;

                break;
 
        case VAX_750:
                break;
 
        case VAX_750:

-               ubauba(io->i_unit)->uba_dpr[bdp] |=
+               ubauba(io->i_adapt)->uba_dpr[bdp] |=

                     UBADPR_PURGE|UBADPR_NXM|UBADPR_UCE;
                break;
                     UBADPR_PURGE|UBADPR_NXM|UBADPR_UCE;
                break;

-       case VAX_730:
+
+       default:

                break;
        }
 }
                break;
        }
 }