[Linuxconsole-commit]CVS: ruby/linux/Documentation/input ff.txt,1.8,1.9

[johann d. <jd...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/Documentation/input
In directory usw-pr-cvs1:/tmp/cvs-serv28518/linux/Documentation/input

Modified Files:
	ff.txt 
Log Message:
Merged iforce-split back into the main trunk.


Index: ff.txt
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/Documentation/input/ff.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ff.txt	2001/08/31 22:06:32	1.8
+++ ff.txt	2001/10/16 21:05:57	1.9
@@ -81,9 +81,10 @@
 #include <linux/input.h>
 #include <sys/ioctl.h>
 
+unsigned long features[4];
 int ioctl(int file_descriptor, int request, unsigned long *features);
 
-"request" must be EVIOCGBIT(EV_FF, sizeof(unsigned long))
+"request" must be EVIOCGBIT(EV_FF, sizeof(unsigned long) * 4)
 
 Returns the features supported by the device. features is a bitfield with the
 following bits:
@@ -95,8 +96,11 @@
 - FF_FRICTION	can simulate friction (aka drag, damper effect...)
 - FF_RUMBLE	rumble effects (normally the only effect supported by rumble
 		pads)
-- 8 bits from FF_N_EFFECTS_0 containing the number of effects that can be
-		simultaneously played.
+
+
+int ioctl(int fd, EVIOCGEFFECTS, int *n);
+
+Returns the number of effects the device can keep in its memory.
 
 3.2 Uploading effects to the device
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~