diff options
author | jmz <jmz@FreeBSD.org> | 1995-02-22 23:34:58 +0000 |
---|---|---|
committer | jmz <jmz@FreeBSD.org> | 1995-02-22 23:34:58 +0000 |
commit | 7ef28cc37085f27cc0d0a2721f79dcd9f74ccaa5 (patch) | |
tree | 159d7620e33456cefc4017f1011b42604b72ba0b /sys/i386/isa/joy.c | |
parent | e55d5d3716f96764f85c283761adf6d7f778a23f (diff) | |
download | FreeBSD-src-7ef28cc37085f27cc0d0a2721f79dcd9f74ccaa5.zip FreeBSD-src-7ef28cc37085f27cc0d0a2721f79dcd9f74ccaa5.tar.gz |
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.
Diffstat (limited to 'sys/i386/isa/joy.c')
-rw-r--r-- | sys/i386/isa/joy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c index aacd92e..77ef121 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) { |