aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2008-09-04 22:28:31 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2008-09-04 22:57:26 -0400
commita6821f345fd508b17f5ce310b677b37aefb028dc (patch)
tree4cb19a8cb7c749af96e29ec141ff0f4e0cfd9bdc /drivers
parent75e21e3f3bb2b4a41bb0646a4d54eef27eb36ca5 (diff)
Input: bcm5974 - add BTN_TOUCH event for mousedev benefit
The mousedev driver requires the use of BTN_TOUCH events to process ABS_X and ABS_Y events properly, which is what is needed for the bcm5974-based apple computers to have a functional pointer out-of-the-box. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/mouse/bcm5974.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 8568211c5564..18f4d7f6ce6d 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -253,6 +253,7 @@ static void setup_events_to_report(struct input_dev *input_dev,
253 0, cfg->y.dim, cfg->y.fuzz, 0); 253 0, cfg->y.dim, cfg->y.fuzz, 0);
254 254
255 __set_bit(EV_KEY, input_dev->evbit); 255 __set_bit(EV_KEY, input_dev->evbit);
256 __set_bit(BTN_TOUCH, input_dev->keybit);
256 __set_bit(BTN_TOOL_FINGER, input_dev->keybit); 257 __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
257 __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit); 258 __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
258 __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); 259 __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
@@ -320,6 +321,7 @@ static int report_tp_state(struct bcm5974 *dev, int size)
320 if (dev->fingers > nmax) 321 if (dev->fingers > nmax)
321 dev->fingers = nmax; 322 dev->fingers = nmax;
322 323
324 input_report_key(input, BTN_TOUCH, dev->fingers > 0);
323 input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1); 325 input_report_key(input, BTN_TOOL_FINGER, dev->fingers == 1);
324 input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2); 326 input_report_key(input, BTN_TOOL_DOUBLETAP, dev->fingers == 2);
325 input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers > 2); 327 input_report_key(input, BTN_TOOL_TRIPLETAP, dev->fingers > 2);