cleanups

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

diff --git a/usr/src/sys/vax/uba/ps.c b/usr/src/sys/vax/uba/ps.c
index 92ef390..c003ece 100644 (file)
--- a/usr/src/sys/vax/uba/ps.c
+++ b/usr/src/sys/vax/uba/ps.c
@@ -1,9 +1,9 @@
 /*
 /*

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

- *     @(#)ps.c        6.6 (Berkeley) %G%
+ *     @(#)ps.c        7.1 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -357,7 +357,7 @@ psioctl(dev, cmd, data, flag)
 
 #define SAVEPSADDR(psaddr, savepsaddr) { \
        register short i, xx1; \
 
 #define SAVEPSADDR(psaddr, savepsaddr) { \
        register short i, xx1; \

-       xx1 = spl6(); \
+       xx1 = splclock(); \

        i = psaddr->ps_addr; \
        while ((psaddr->ps_iostat & DIOREADY) == 0) \
                ; \
        i = psaddr->ps_addr; \
        while ((psaddr->ps_iostat & DIOREADY) == 0) \
                ; \


@@ -366,7 +366,7 @@ psioctl(dev, cmd, data, flag)
 }
 #define RESTORPSADDR(psaddr, savepsaddr) { \
        register short xx2; \
 }
 #define RESTORPSADDR(psaddr, savepsaddr) { \
        register short xx2; \

-       xx2 = spl6(); \
+       xx2 = splclock(); \

        while ((psaddr->ps_iostat & DIOREADY) == 0) \
                ;\
        psaddr->ps_addr = savepsaddr; \
        while ((psaddr->ps_iostat & DIOREADY) == 0) \
                ;\
        psaddr->ps_addr = savepsaddr; \


@@ -451,7 +451,7 @@ pssystemintr(dev)
                                        else
                                                psp->ps_map.mode = WAITING_RF;
 #ifdef EXTERNAL_SYNC
                                        else
                                                psp->ps_map.mode = WAITING_RF;
 #ifdef EXTERNAL_SYNC

-                                       x = spl6();
+                                       x = splclock();

 #endif
                                        (void) psrfnext(psp, psaddr);
 #ifdef EXTERNAL_SYNC
 #endif
                                        (void) psrfnext(psp, psaddr);
 #ifdef EXTERNAL_SYNC


@@ -494,7 +494,7 @@ tryrf:
                                }
                                psp->ps_refresh.srcntr = 0;
 #ifdef EXTERNAL_SYNC
                                }
                                psp->ps_refresh.srcntr = 0;
 #ifdef EXTERNAL_SYNC

-                               x = spl6();
+                               x = splclock();

 #endif
                                psp->ps_refresh.mode = SYNCING_RF;
                                if (psp->ps_clockticks)
 #endif
                                psp->ps_refresh.mode = SYNCING_RF;
                                if (psp->ps_clockticks)