make ANSI C compatible

[unix-history] / usr / src / sys / vax / uba / ikreg.h

diff --git a/usr/src/sys/vax/uba/ikreg.h b/usr/src/sys/vax/uba/ikreg.h
index 6cf113c..32bb429 100644 (file)
--- a/usr/src/sys/vax/uba/ikreg.h
+++ b/usr/src/sys/vax/uba/ikreg.h
@@ -1,18 +1,26 @@
-/*     ikreg.h 4.1     82/06/26        */
+/*
+ * 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.
+ *
+ *     @(#)ikreg.h     7.2 (Berkeley) %G%
+ */

 
 struct ikdevice {
 
 struct ikdevice {

-       short int ik_wc;                        /* Unibus word count reg */
-       unsigned short int ik_ubaddr;           /* Unibus address register */
-       unsigned short int ik_ustat;            /* Unibus status/command reg */
-       unsigned short int ik_data;             /* Data register */
-       unsigned short int ik_xaddr;            /* X address in frame buffer */
-       unsigned short int ik_yaddr;            /* Y address in frame buffer */
-       unsigned short int ik_istat;            /* Ikonas status/command reg */
-       unsigned short int ik_dummy;
+       short   ik_wc;                  /* Unibus word count reg */
+       u_short ik_ubaddr;              /* Unibus address register */
+       u_short ik_ustat;               /* Unibus status/command reg */
+       u_short ik_data;                /* Data register */
+       u_short ik_xaddr;               /* X address in frame buffer */
+       u_short ik_yaddr;               /* Y address in frame buffer */
+       u_short ik_istat;               /* Ikonas status/command reg */
+       u_short ik_chan;                /* Channel control register */

 };
 
 };
 

-#define IK_GETADDR (('i'<<8)|0)
-#define IK_WAITINT (('i'<<8)|1)
+#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 */

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