Input: switch to input_abs_*() access functions
Change all call sites in drivers/input to not access the ABS axis information directly anymore. Make them use the access helpers instead. Also use input_set_abs_params() when possible. Did some code refactoring as I was on it. Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:

committed by
Dmitry Torokhov

parent
7957e9c4d1
commit
987a6c0298
@@ -318,11 +318,8 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
|
||||
for (i = 0; i < gf2k_axes[gf2k->id]; i++)
|
||||
set_bit(gf2k_abs[i], input_dev->absbit);
|
||||
|
||||
for (i = 0; i < gf2k_hats[gf2k->id]; i++) {
|
||||
set_bit(ABS_HAT0X + i, input_dev->absbit);
|
||||
input_dev->absmin[ABS_HAT0X + i] = -1;
|
||||
input_dev->absmax[ABS_HAT0X + i] = 1;
|
||||
}
|
||||
for (i = 0; i < gf2k_hats[gf2k->id]; i++)
|
||||
input_set_abs_params(input_dev, ABS_HAT0X + i, -1, 1, 0, 0);
|
||||
|
||||
for (i = 0; i < gf2k_joys[gf2k->id]; i++)
|
||||
set_bit(gf2k_btn_joy[i], input_dev->keybit);
|
||||
@@ -334,11 +331,14 @@ static int gf2k_connect(struct gameport *gameport, struct gameport_driver *drv)
|
||||
gf2k_read(gf2k, data);
|
||||
|
||||
for (i = 0; i < gf2k_axes[gf2k->id]; i++) {
|
||||
input_dev->absmax[gf2k_abs[i]] = (i < 2) ? input_dev->abs[gf2k_abs[i]] * 2 - 32 :
|
||||
input_dev->abs[gf2k_abs[0]] + input_dev->abs[gf2k_abs[1]] - 32;
|
||||
input_dev->absmin[gf2k_abs[i]] = 32;
|
||||
input_dev->absfuzz[gf2k_abs[i]] = 8;
|
||||
input_dev->absflat[gf2k_abs[i]] = (i < 2) ? 24 : 0;
|
||||
int max = i < 2 ?
|
||||
input_abs_get_val(input_dev, gf2k_abs[i]) * 2 :
|
||||
input_abs_get_val(input_dev, gf2k_abs[0]) +
|
||||
input_abs_get_val(input_dev, gf2k_abs[1]);
|
||||
int flat = i < 2 ? 24 : 0;
|
||||
|
||||
input_set_abs_params(input_dev, gf2k_abs[i],
|
||||
32, max - 32, 8, flat);
|
||||
}
|
||||
|
||||
err = input_register_device(gf2k->dev);
|
||||
|
Reference in New Issue
Block a user