PCSP updated to do the Right Thing(tm) w.r.t. joystick.

David Woodhouse (David.Woodhouse@mvhi.com)
Thu, 29 Oct 1998 16:41:19 +0000


Thanks to Vojtech for helping me sort out the interaction with the joystick
drivers.

If you're using any pcsp driver since the overhaul of the joystick drivers in
(circa) 2.1.125, then you'll need this extra patch.

I've put an updated, complete PCSP patch at
http://www.imladris.demon.co.uk/pcsp/patch-pcsp-soundcore-2.1.126-v2

It applied cleanly to pre-127-2, I haven't tried pre-3 yet. Suck it and see.

--- linux/drivers/char/joystick/joystick.c Thu Oct 29 00:04:06 1998
+++ linux-pcsp/drivers/char/joystick/joystick.c Thu Oct 29 16:26:22 1998
@@ -46,6 +46,10 @@
#include <linux/poll.h>
#endif

+#if defined(CONFIG_PCSP) || defined(CONFIG_PCSP_MODULE)
+#include <linux/pcsp.h>
+#endif
+
/*
* Configurable parameters.
*/
@@ -115,6 +119,10 @@
outb(0, 0x43);
x = inb(0x40);
x |= inb(0x40) << 8;
+
+#if defined (CONFIG_PCSP) || defined (CONFIG_PCSP_MODULE)
+ x += pcsp_clockticks - pcsp_timer0_latch;
+#endif
__restore_flags(flags);

return x;

---- ---- ----
David Woodhouse David.Woodhouse@mvhi.com Office: (+44) 1223 810302
Project Leader, Process Information Systems Mobile: (+44) 976 658355
Axiom (Cambridge) Ltd., Swaffham Bulbeck, Cambridge, CB5 0NA, UK.
finger dwmw2@ferret.lmh.ox.ac.uk for PGP key.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/