diff options
Diffstat (limited to 'drivers/input/joystick/warrior.c')
| -rw-r--r-- | drivers/input/joystick/warrior.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c index 4e85f72eefd7..e928b6e3724a 100644 --- a/drivers/input/joystick/warrior.c +++ b/drivers/input/joystick/warrior.c | |||
| @@ -162,9 +162,11 @@ static int warrior_connect(struct serio *serio, struct serio_driver *drv) | |||
| 162 | input_dev->id.version = 0x0100; | 162 | input_dev->id.version = 0x0100; |
| 163 | input_dev->dev.parent = &serio->dev; | 163 | input_dev->dev.parent = &serio->dev; |
| 164 | 164 | ||
| 165 | input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS); | 165 | input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) | |
| 166 | input_dev->keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2); | 166 | BIT_MASK(EV_ABS); |
| 167 | input_dev->relbit[0] = BIT(REL_DIAL); | 167 | input_dev->keybit[BIT_WORD(BTN_TRIGGER)] = BIT_MASK(BTN_TRIGGER) | |
| 168 | BIT_MASK(BTN_THUMB) | BIT_MASK(BTN_TOP) | BIT_MASK(BTN_TOP2); | ||
| 169 | input_dev->relbit[0] = BIT_MASK(REL_DIAL); | ||
| 168 | input_set_abs_params(input_dev, ABS_X, -64, 64, 0, 8); | 170 | input_set_abs_params(input_dev, ABS_X, -64, 64, 0, 8); |
| 169 | input_set_abs_params(input_dev, ABS_Y, -64, 64, 0, 8); | 171 | input_set_abs_params(input_dev, ABS_Y, -64, 64, 0, 8); |
| 170 | input_set_abs_params(input_dev, ABS_THROTTLE, -112, 112, 0, 0); | 172 | input_set_abs_params(input_dev, ABS_THROTTLE, -112, 112, 0, 0); |