make ANSI C compatible

SCCS-vsn: sys/vax/vax/dkio.h 7.2
SCCS-vsn: sys/vax/uba/ikreg.h 7.2
SCCS-vsn: sys/vax/uba/psreg.h 7.2
SCCS-vsn: sys/vax/uba/adreg.h 7.2

diff --git a/usr/src/sys/vax/uba/adreg.h b/usr/src/sys/vax/uba/adreg.h
index 44f1514..dcb8bc3 100644 (file)
--- a/usr/src/sys/vax/uba/adreg.h
+++ b/usr/src/sys/vax/uba/adreg.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.
  *

- *     @(#)adreg.h     7.1 (Berkeley) %G%
+ *     @(#)adreg.h     7.2 (Berkeley) %G%

  */
 
 struct addevice {
  */
 
 struct addevice {


@@ -13,8 +13,8 @@ struct addevice {
 
 #define AD_CHAN                ADIOSCHAN
 #define AD_READ                ADIOGETW
 
 #define AD_CHAN                ADIOSCHAN
 #define AD_READ                ADIOGETW

-#define        ADIOSCHAN       _IOW(a, 0, int)         /* set channel */
-#define        ADIOGETW        _IOR(a, 1, int)         /* read one word */
+#define        ADIOSCHAN       _IOW('a', 0, int)       /* set channel */
+#define        ADIOGETW        _IOR('a', 1, int)       /* read one word */

 
 /*
  * Unibus CSR register bits
 
 /*
  * Unibus CSR register bits

diff --git a/usr/src/sys/vax/uba/ikreg.h b/usr/src/sys/vax/uba/ikreg.h
index c9624c0..32bb429 100644 (file)
--- a/usr/src/sys/vax/uba/ikreg.h
+++ b/usr/src/sys/vax/uba/ikreg.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.
  *

- *     @(#)ikreg.h     7.1 (Berkeley) %G%
+ *     @(#)ikreg.h     7.2 (Berkeley) %G%

  */
 
 struct ikdevice {
  */
 
 struct ikdevice {


@@ -19,8 +19,8 @@ struct ikdevice {
 
 #define IK_GETADDR     IKIOGETADDR
 #define IK_WAITINT     IKIOWAITINT
 
 #define IK_GETADDR     IKIOGETADDR
 #define IK_WAITINT     IKIOWAITINT

-#define        IKIOGETADDR     _IOR(i, 0, caddr_t)     /* get Unibus device address */
-#define        IKIOWAITINT     _IO(i, 1)               /* await device interrupt */
+#define        IKIOGETADDR     _IOR('i', 0, caddr_t)   /* get Unibus device address */
+#define        IKIOWAITINT     _IO('i', 1)             /* await device interrupt */

 
 /*
  * Unibus status/command register bits
 
 /*
  * Unibus status/command register bits

diff --git a/usr/src/sys/vax/uba/psreg.h b/usr/src/sys/vax/uba/psreg.h
index c9036ad..0303255 100644 (file)
--- a/usr/src/sys/vax/uba/psreg.h
+++ b/usr/src/sys/vax/uba/psreg.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.
  *

- *     @(#)psreg.h     7.1 (Berkeley) %G%
+ *     @(#)psreg.h     7.2 (Berkeley) %G%

  */
 
 
  */
 
 


@@ -22,19 +22,19 @@ struct psdevice {
 /*
  *     Possible ioctl's
  */
 /*
  *     Possible ioctl's
  */

-#define PSIOAUTOREFRESH                _IO(p, 0)       /* auto refresh */
-#define PSIOSINGLEREFRESH      _IO(p, 1)       /* single refresh */
-#define PSIOAUTOMAP            _IO(p, 2)       /* auto map */
-#define PSIOSINGLEMAP          _IO(p, 3)       /* single map */
-#define PSIODOUBLEBUFFER       _IO(p, 4)       /* double buffer */
-#define PSIOSINGLEBUFFER       _IO(p, 5)       /* single buffer */
-#define PSIOWAITREFRESH                _IO(p, 6)       /* await refresh */
-#define PSIOWAITMAP            _IO(p, 7)       /* await map */
-#define PSIOWAITHIT            _IO(p, 8)       /* await hit */
-#define PSIOSTOPREFRESH                _IO(p, 9)       /* stop refresh */
-#define PSIOSTOPMAP            _IO(p,10)       /* stop map */
-#define PSIOGETADDR            _IOR(p,11, int) /* get Unibus address */
-#define PSIOTIMEREFRESH                _IO(p,12)       /* time refresh */
+#define PSIOAUTOREFRESH                _IO('p', 0)             /* auto refresh */
+#define PSIOSINGLEREFRESH      _IO('p', 1)             /* single refresh */
+#define PSIOAUTOMAP            _IO('p', 2)             /* auto map */
+#define PSIOSINGLEMAP          _IO('p', 3)             /* single map */
+#define PSIODOUBLEBUFFER       _IO('p', 4)             /* double buffer */
+#define PSIOSINGLEBUFFER       _IO('p', 5)             /* single buffer */
+#define PSIOWAITREFRESH                _IO('p', 6)             /* await refresh */
+#define PSIOWAITMAP            _IO('p', 7)             /* await map */
+#define PSIOWAITHIT            _IO('p', 8)             /* await hit */
+#define PSIOSTOPREFRESH                _IO('p', 9)             /* stop refresh */
+#define PSIOSTOPMAP            _IO('p',10)             /* stop map */
+#define PSIOGETADDR            _IOR('p',11, int)       /* get Unibus address */
+#define PSIOTIMEREFRESH                _IO('p',12)             /* time refresh */

 
 /*
  *     Picture system io status register bits
 
 /*
  *     Picture system io status register bits

diff --git a/usr/src/sys/vax/vax/dkio.h b/usr/src/sys/vax/vax/dkio.h
index 397c9b1..1dba941 100644 (file)
--- a/usr/src/sys/vax/vax/dkio.h
+++ b/usr/src/sys/vax/vax/dkio.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.
  *

- *     @(#)dkio.h      7.1 (Berkeley) %G%
+ *     @(#)dkio.h      7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -15,4 +15,4 @@
  */
 
 /* disk io control commands */
  */
 
 /* disk io control commands */

-#define DKIOCHDR       _IO(d, 1)       /* next I/O will read/write header */
+#define DKIOCHDR       _IO('d', 1)     /* next I/O will read/write header */