21
21
22
22
23
23
#define PID_EFFECTS_MAX 64
24
- #define PID_INFINITE 0xffff
24
+ #define PID_INFINITE U16_MAX
25
25
26
26
/* Linux Force Feedback API uses miliseconds as time unit */
27
27
#define FF_TIME_EXPONENT -3
@@ -226,12 +226,12 @@ static int pidff_rescale(int i, int max, struct hid_field *field)
226
226
}
227
227
228
228
/*
229
- * Scale a signed value in range -0x8000..0x7fff for the given field
229
+ * Scale a signed value in range S16_MIN..S16_MAX for the given field
230
230
*/
231
231
static int pidff_rescale_signed (int i , struct hid_field * field )
232
232
{
233
- if (i > 0 ) return i * field -> logical_maximum / 0x7fff ;
234
- if (i < 0 ) return i * field -> logical_minimum / -0x8000 ;
233
+ if (i > 0 ) return i * field -> logical_maximum / S16_MAX ;
234
+ if (i < 0 ) return i * field -> logical_minimum / S16_MIN ;
235
235
return 0 ;
236
236
}
237
237
@@ -255,7 +255,7 @@ static u32 pidff_rescale_time(u16 time, struct hid_field *field)
255
255
256
256
static void pidff_set (struct pidff_usage * usage , u16 value )
257
257
{
258
- usage -> value [0 ] = pidff_rescale (value , 0xffff , usage -> field );
258
+ usage -> value [0 ] = pidff_rescale (value , U16_MAX , usage -> field );
259
259
pr_debug ("calculated from %d to %d\n" , value , usage -> value [0 ]);
260
260
}
261
261
@@ -266,10 +266,10 @@ static void pidff_set_signed(struct pidff_usage *usage, s16 value)
266
266
else {
267
267
if (value < 0 )
268
268
usage -> value [0 ] =
269
- pidff_rescale (- value , 0x8000 , usage -> field );
269
+ pidff_rescale (- value , - S16_MIN , usage -> field );
270
270
else
271
271
usage -> value [0 ] =
272
- pidff_rescale (value , 0x7fff , usage -> field );
272
+ pidff_rescale (value , S16_MAX , usage -> field );
273
273
}
274
274
pr_debug ("calculated from %d to %d\n" , value , usage -> value [0 ]);
275
275
}
@@ -306,11 +306,11 @@ static void pidff_set_envelope_report(struct pidff_device *pidff,
306
306
307
307
pidff -> set_envelope [PID_ATTACK_LEVEL ].value [0 ] =
308
308
pidff_rescale (envelope -> attack_level >
309
- 0x7fff ? 0x7fff : envelope -> attack_level , 0x7fff ,
309
+ S16_MAX ? S16_MAX : envelope -> attack_level , S16_MAX ,
310
310
pidff -> set_envelope [PID_ATTACK_LEVEL ].field );
311
311
pidff -> set_envelope [PID_FADE_LEVEL ].value [0 ] =
312
312
pidff_rescale (envelope -> fade_level >
313
- 0x7fff ? 0x7fff : envelope -> fade_level , 0x7fff ,
313
+ S16_MAX ? S16_MAX : envelope -> fade_level , S16_MAX ,
314
314
pidff -> set_envelope [PID_FADE_LEVEL ].field );
315
315
316
316
pidff_set_time (& pidff -> set_envelope [PID_ATTACK_TIME ],
@@ -399,7 +399,7 @@ static void pidff_set_effect_report(struct pidff_device *pidff,
399
399
pidff -> effect_direction -> value [0 ] = pidff_rescale (
400
400
pidff -> quirks & HID_PIDFF_QUIRK_FIX_WHEEL_DIRECTION ?
401
401
PIDFF_FIXED_WHEEL_DIRECTION : effect -> direction ,
402
- 0xffff , pidff -> effect_direction );
402
+ U16_MAX , pidff -> effect_direction );
403
403
404
404
/* Omit setting delay field if it's missing */
405
405
if (!(pidff -> quirks & HID_PIDFF_QUIRK_MISSING_DELAY ))
@@ -1366,7 +1366,7 @@ static int pidff_check_autocenter(struct pidff_device *pidff,
1366
1366
1367
1367
if (pidff -> block_load [PID_EFFECT_BLOCK_INDEX ].value [0 ] ==
1368
1368
pidff -> block_load [PID_EFFECT_BLOCK_INDEX ].field -> logical_minimum + 1 ) {
1369
- pidff_autocenter (pidff , 0xffff );
1369
+ pidff_autocenter (pidff , U16_MAX );
1370
1370
set_bit (FF_AUTOCENTER , dev -> ffbit );
1371
1371
} else {
1372
1372
hid_notice (pidff -> hid ,
@@ -1424,7 +1424,7 @@ int hid_pidff_init_with_quirks(struct hid_device *hid, u32 initial_quirks)
1424
1424
if (error )
1425
1425
goto fail ;
1426
1426
1427
- pidff_set_gain_report (pidff , 0xffff );
1427
+ pidff_set_gain_report (pidff , U16_MAX );
1428
1428
error = pidff_check_autocenter (pidff , dev );
1429
1429
if (error )
1430
1430
goto fail ;
0 commit comments