input : wacom - Remove BTN_TOOL_FINGER for pad
Subsystems (2)
PATCH 3/4 input : wacom - Remove BTN_TOOL_FINGER for pad
BTN_TOOL_FINGER was designed to indicate a single finger touch. Remove the lines that borrowed this type for expresskeys and tablet buttons.
Signed-off-by Ping Cheng <[email protected]>
--- drivers/input/tablet/wacom_wac.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-)
drivers/input/tablet/wacom_wac.c +0 -11
@@ -278,7 +278,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)input_report_key (input,BTN_4 , (data[7 ] &0x80 )); rw = ((data[7 ] &0x18 ) >>3 ) - ((data[7 ] &0x20 ) >>3 );input_report_rel (input,REL_WHEEL , rw); -input_report_key (input,BTN_TOOL_FINGER ,0xf0 );if (!prox) wacom->id[1 ] =0 ;input_report_abs (input,ABS_MISC , wacom->id[1 ]);
@@ -296,7 +295,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)input_report_key (input,BTN_4 , (data[7 ] &0x10 ));input_report_key (input,BTN_5 , (data[7 ] &0x40 ));input_report_abs (input,ABS_WHEEL , (data[8 ] &0x7f )); -input_report_key (input,BTN_TOOL_FINGER ,0xf0 );if (!prox) wacom->id[1 ] =0 ;input_report_abs (input,ABS_MISC , wacom->id[1 ]);
@@ -495,10 +493,6 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)/* pad packets. Works as a second tool and is always in prox */ if (data[0 ] ==WACOM_REPORT_INTUOSPAD ) { -/* initiate the pad as a device */ -if (wacom->tool[1 ] !=BTN_TOOL_FINGER ) - wacom->tool[1 ] =BTN_TOOL_FINGER ; -if (features->type >=INTUOS4S && features->type <=INTUOS4L ) {input_report_key (input,BTN_0 , (data[2 ] &0x01 ));input_report_key (input,BTN_1 , (data[3 ] &0x01 ));
@@ -1090,7 +1084,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,case WACOM_G4 :input_set_capability (input_dev,EV_MSC ,MSC_SERIAL ); -__set_bit (BTN_TOOL_FINGER , input_dev->keybit);__set_bit (BTN_0 , input_dev->keybit);__set_bit (BTN_4 , input_dev->keybit);/* fall through */
@@ -1128,7 +1121,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,case CINTIQ :for (i =0 ; i <8 ; i++)__set_bit (BTN_0 + i, input_dev->keybit); -__set_bit (BTN_TOOL_FINGER , input_dev->keybit);if (wacom_wac->features.type !=WACOM_21UX2 ) {input_set_abs_params (input_dev,ABS_RX ,0 ,4096 ,0 ,0 );
@@ -1155,8 +1147,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,__set_bit (BTN_2 , input_dev->keybit);__set_bit (BTN_3 , input_dev->keybit); -__set_bit (BTN_TOOL_FINGER , input_dev->keybit); -input_set_abs_params (input_dev,ABS_RX ,0 ,4096 ,0 ,0 );input_set_abs_params (input_dev,ABS_Z ,-900 ,899 ,0 ,0 );/* fall through */
@@ -1174,7 +1164,6 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev,case INTUOS4S :for (i =0 ; i <7 ; i++)__set_bit (BTN_0 + i, input_dev->keybit); -__set_bit (BTN_TOOL_FINGER , input_dev->keybit);input_set_abs_params (input_dev,ABS_Z ,-900 ,899 ,0 ,0 );wacom_setup_intuos (wacom_wac);
Signature · 1 line
1.7.5.4