[Linuxconsole-commit]CVS: ruby/linux/include/linux input.h,1.64,1.65

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

Update of /cvsroot/linuxconsole/ruby/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv15969/include/linux

Modified Files:
	input.h 
Log Message:
Replaced __u16-style types by their more portable equivalents (uint16_t) in force feedback related structures.


Index: input.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/input.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- input.h	10 Mar 2002 12:20:56 -0000	1.64
+++ input.h	15 Apr 2002 19:14:22 -0000	1.65
@@ -519,69 +519,65 @@
  * Structures used in ioctls to upload effects to a device
  * The first structures are not passed directly by using ioctls.
  * They are sub-structures of the actually sent structure (called ff_effect)
- *
- * Ranges:
- *  0 <= __u16 <= 65535
- *  -32768 <= __s16 <= +32767
  */
 
 struct ff_replay {
-	__u16 length;		/* Duration of an effect in ms. All other times are also expressed in ms */
-	__u16 delay;		/* Time to wait before to start playing an effect */
+	uint16_t length; /* Duration of an effect in ms. All other times are also expressed in ms */
+	uint16_t delay;  /* Time to wait before to start playing an effect */
 };
 
 struct ff_trigger {
-	__u16 button;		/* Number of button triggering an effect */
-	__u16 interval;		/* Time to wait before an effect can be re-triggered (ms) */
+	uint16_t button;   /* Number of button triggering an effect */
+	uint16_t interval; /* Time to wait before an effect can be re-triggered (ms) */
 };
 
 struct ff_envelope {
-	__u16 attack_length;	/* Duration of attack (ms) */
-	__u16 attack_level;	/* Level at beginning of attack */
-	__u16 fade_length;	/* Duration of fade (ms) */
-	__u16 fade_level;	/* Level at end of fade */
+	uint16_t attack_length;	/* Duration of attack (ms) */
+	uint16_t attack_level;	/* Level at beginning of attack */
+	uint16_t fade_length;	/* Duration of fade (ms) */
+	uint16_t fade_level;	/* Level at end of fade */
 };
 
 /* FF_CONSTANT */
 struct ff_constant_effect {
-	__s16 level;		/* Strength of effect. Negative values are OK */
+	int16_t level;	    /* Strength of effect. Negative values are OK */
 	struct ff_envelope envelope;
 };
 
 /* FF_RAMP */
 struct ff_ramp_effect {
-	__s16 start_level;
-	__s16 end_level;
+	int16_t start_level;
+	int16_t end_level;
 	struct ff_envelope envelope;
 };
 
 /* FF_SPRING of FF_FRICTION */
 struct ff_condition_effect {
-	__u16 right_saturation; /* Max level when joystick is on the right */
-	__u16 left_saturation;  /* Max level when joystick in on the left */
+	uint16_t right_saturation; /* Max level when joystick is on the right */
+	uint16_t left_saturation;  /* Max level when joystick in on the left */
 
-	__s16 right_coeff;	/* Indicates how fast the force grows when the
+	int16_t right_coeff;	/* Indicates how fast the force grows when the
 				   joystick moves to the right */
-	__s16 left_coeff;	/* Same for left side */
+	int16_t left_coeff;	/* Same for left side */
 
-	__u16 deadband;		/* Size of area where no force is produced */
-	__s16 center;		/* Position of dead zone */
+	uint16_t deadband;	/* Size of area where no force is produced */
+	int16_t center;	/* Position of dead zone */
 
 };
 
 /* FF_PERIODIC */
 struct ff_periodic_effect {
-	__u16 waveform;		/* Kind of wave (sine, square...) */
-	__u16 period;		/* in ms */
-	__s16 magnitude;	/* Peak value */
-	__s16 offset;		/* Mean value of wave (roughly) */
-	__u16 phase;		/* 'Horizontal' shift */
+	uint16_t waveform;	/* Kind of wave (sine, square...) */
+	uint16_t period;	/* in ms */
+	int16_t magnitude;	/* Peak value */
+	int16_t offset;	/* Mean value of wave (roughly) */
+	uint16_t phase;		/* 'Horizontal' shift */
 
 	struct ff_envelope envelope;
 
 /* Only used if waveform == FF_CUSTOM */
-	__u32 custom_len;	/* Number of samples  */	
-	__s16 *custom_data;	/* Buffer of samples */
+	uint32_t custom_len;	/* Number of samples  */	
+	int16_t *custom_data;	/* Buffer of samples */
 /* Note: the data pointed by custom_data is copied by the driver. You can
  * therefore dispose of the memory after the upload/update */
 };
@@ -592,22 +588,22 @@
    by the heavy motor.
 */
 struct ff_rumble_effect {
-	__u16 strong_magnitude;  /* Magnitude of the heavy motor */
-	__u16 weak_magnitude;    /* Magnitude of the light one */
+	uint16_t strong_magnitude;  /* Magnitude of the heavy motor */
+	uint16_t weak_magnitude;    /* Magnitude of the light one */
 };
 
 /*
  * Structure sent through ioctl from the application to the driver
  */
 struct ff_effect {
-	__u16 type;
+	uint16_t type;
 /* Following field denotes the unique id assigned to an effect.
  * If user sets if to -1, a new effect is created, and its id is returned in the same field
  * Else, the user sets it to the effect id it wants to update.
  */
-	__s16 id;
+	int16_t id;
 
-	__u16 direction;	/* Direction. 0 deg -> 0x0000 (down)
+	uint16_t direction;	/* Direction. 0 deg -> 0x0000 (down)
 					     90 deg -> 0x4000 (left)
 					    180 deg -> 0x8000 (up)
 					    270 deg -> 0xC000 (right)
@@ -620,7 +616,7 @@
 		struct ff_constant_effect constant;
 		struct ff_ramp_effect ramp;
 		struct ff_periodic_effect periodic;
-		struct ff_condition_effect condition[2];	/* One for each axis */
+		struct ff_condition_effect condition[2]; /* One for each axis */
 		struct ff_rumble_effect rumble;
 	} u;
 };