Put the joystick status in a struct {int x, y, b1, b2;} rather than in a

dummy array of 4 integers. Declare the struct in the header file and update
the man page.

5 files changed, 32 insertions, 18 deletions

diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index aacd92e67338..77ef121941ed 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -129,7 +129,7 @@ joyread (dev_t dev, struct uio *uio, int flag)
     int port = joy[unit].port;
     int i, t0, t1;
     int state = 0, x = 0, y = 0;
-    int c[4];
+    struct joystick c;
     
     disable_intr ();
     outb (port, 0xff);
@@ -151,12 +151,12 @@ joyread (dev_t dev, struct uio *uio, int flag)
 	    break;
     }
     enable_intr ();
-    c[0] = x ? joy[unit].x_off[joypart(dev)] + ticks2usec(t0-x) : 0x80000000;
-    c[1] = y ? joy[unit].y_off[joypart(dev)] + ticks2usec(t0-y) : 0x80000000;
+    c.x = x ? joy[unit].x_off[joypart(dev)] + ticks2usec(t0-x) : 0x80000000;
+    c.y = y ? joy[unit].y_off[joypart(dev)] + ticks2usec(t0-y) : 0x80000000;
     state >>= 4;
-    c[2] = ~state & 1;
-    c[3] = ~(state >> 1) & 1;
-    return uiomove (c, 4*sizeof(int), uio);
+    c.b1 = ~state & 1;
+    c.b2 = ~(state >> 1) & 1;
+    return uiomove (&c, sizeof(struct joystick), uio);
 }
 int joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
 {
diff --git a/sys/i386/include/joystick.h b/sys/i386/include/joystick.h
index 2ba31a665707..d070ac050714 100644
--- a/sys/i386/include/joystick.h
+++ b/sys/i386/include/joystick.h
@@ -4,6 +4,13 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
+struct joystick {
+    int x;
+    int y;
+    int b1;
+    int b2;
+};
+
 #define JOY_SETTIMEOUT    _IOW('J', 1, int)    /* set timeout */
 #define JOY_GETTIMEOUT    _IOR('J', 2, int)    /* get timeout */
 #define JOY_SET_X_OFFSET  _IOW('J', 3, int)    /* set offset on X-axis */
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c
index aacd92e67338..77ef121941ed 100644
--- a/sys/i386/isa/joy.c
+++ b/sys/i386/isa/joy.c
@@ -129,7 +129,7 @@ joyread (dev_t dev, struct uio *uio, int flag)
     int port = joy[unit].port;
     int i, t0, t1;
     int state = 0, x = 0, y = 0;
-    int c[4];
+    struct joystick c;
     
     disable_intr ();
     outb (port, 0xff);
@@ -151,12 +151,12 @@ joyread (dev_t dev, struct uio *uio, int flag)
 	    break;
     }
     enable_intr ();
-    c[0] = x ? joy[unit].x_off[joypart(dev)] + ticks2usec(t0-x) : 0x80000000;
-    c[1] = y ? joy[unit].y_off[joypart(dev)] + ticks2usec(t0-y) : 0x80000000;
+    c.x = x ? joy[unit].x_off[joypart(dev)] + ticks2usec(t0-x) : 0x80000000;
+    c.y = y ? joy[unit].y_off[joypart(dev)] + ticks2usec(t0-y) : 0x80000000;
     state >>= 4;
-    c[2] = ~state & 1;
-    c[3] = ~(state >> 1) & 1;
-    return uiomove (c, 4*sizeof(int), uio);
+    c.b1 = ~state & 1;
+    c.b2 = ~(state >> 1) & 1;
+    return uiomove (&c, sizeof(struct joystick), uio);
 }
 int joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
 {
diff --git a/sys/isa/joy.c b/sys/isa/joy.c
index aacd92e67338..77ef121941ed 100644
--- a/sys/isa/joy.c
+++ b/sys/isa/joy.c
@@ -129,7 +129,7 @@ joyread (dev_t dev, struct uio *uio, int flag)
     int port = joy[unit].port;
     int i, t0, t1;
     int state = 0, x = 0, y = 0;
-    int c[4];
+    struct joystick c;
     
     disable_intr ();
     outb (port, 0xff);
@@ -151,12 +151,12 @@ joyread (dev_t dev, struct uio *uio, int flag)
 	    break;
     }
     enable_intr ();
-    c[0] = x ? joy[unit].x_off[joypart(dev)] + ticks2usec(t0-x) : 0x80000000;
-    c[1] = y ? joy[unit].y_off[joypart(dev)] + ticks2usec(t0-y) : 0x80000000;
+    c.x = x ? joy[unit].x_off[joypart(dev)] + ticks2usec(t0-x) : 0x80000000;
+    c.y = y ? joy[unit].y_off[joypart(dev)] + ticks2usec(t0-y) : 0x80000000;
     state >>= 4;
-    c[2] = ~state & 1;
-    c[3] = ~(state >> 1) & 1;
-    return uiomove (c, 4*sizeof(int), uio);
+    c.b1 = ~state & 1;
+    c.b2 = ~(state >> 1) & 1;
+    return uiomove (&c, sizeof(struct joystick), uio);
 }
 int joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
 {
diff --git a/sys/sys/joystick.h b/sys/sys/joystick.h
index 2ba31a665707..d070ac050714 100644
--- a/sys/sys/joystick.h
+++ b/sys/sys/joystick.h
@@ -4,6 +4,13 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
+struct joystick {
+    int x;
+    int y;
+    int b1;
+    int b2;
+};
+
 #define JOY_SETTIMEOUT    _IOW('J', 1, int)    /* set timeout */
 #define JOY_GETTIMEOUT    _IOR('J', 2, int)    /* get timeout */
 #define JOY_SET_X_OFFSET  _IOW('J', 3, int)    /* set offset on X-axis */