patch-2.1.131 linux/include/linux/joystick.h

• Lines: 35
• Date: Tue Dec 1 22:11:10 1998
• Orig file: v2.1.130/linux/include/linux/joystick.h
• Orig date: Fri Oct 23 22:01:26 1998

diff -u --recursive --new-file v2.1.130/linux/include/linux/joystick.h linux/include/linux/joystick.h
@@ -34,7 +34,7 @@
  * Version
  */
 
-#define JS_VERSION		0x01020c
+#define JS_VERSION		0x01020d
 
 /*
  * Types and constants for reading from /dev/js
@@ -179,18 +179,23 @@
 
 #ifdef USE_PARPORT
 #include <linux/parport.h>
-#define JS_PAR_STATUS(y)	parport_read_status(y->port)
 #define JS_PAR_DATA_IN(y)	parport_read_data(y->port)
 #define JS_PAR_DATA_OUT(x,y)	parport_write_data(y->port, x)
+#define JS_PAR_STATUS(y)	parport_read_status(y->port)
+#define JS_PAR_CTRL_IN(y)	parport_read_control(y->port)
 #define JS_PAR_CTRL_OUT(x,y)	parport_write_control(y->port, x)
+#define JS_PAR_ECTRL_OUT(x,y)	parport_write_econtrol(y->port, x)
 #else
-#define JS_PAR_STATUS(y)	inb(y+1)
 #define JS_PAR_DATA_IN(y)	inb(y)
 #define JS_PAR_DATA_OUT(x,y)	outb(x,y)
+#define JS_PAR_STATUS(y)	inb(y+1)
+#define JS_PAR_CTRL_IN(y)	inb(y+2)
 #define JS_PAR_CTRL_OUT(x,y)	outb(x,y+2)
+#define JS_PAR_ECTRL_OUT(x,y)	outb(x,y+0x402)
 #endif
 
 #define JS_PAR_STATUS_INVERT	(0x80)
+#define JS_PAR_CTRL_INVERT	(0x04)
 
 /*
  * Internal types