[PATCH] Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE

Subsystems: input (keyboard, mouse, joystick, touchscreen) drivers, the rest

STALE3675d

6 messages, 3 authors, 2016-07-14 · open the first message on its own page

[PATCH] Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE

From: Peter Hutterer <hidden>
Date: 2016-01-11 03:51:55 

As of e0361b70175f0cd6199dd9ed6679632de73973d4
  Input: wacom_w8001 - split the touch and pen devices into two devices
the touch events aren't multiplexed over the same device anymore, the use of
ABS_MT_TOOL_TYPE is superfluous. And even before then it only ever sent
MT_TOOL_TYPE_FINGER anyway.

Signed-off-by: Peter Hutterer <redacted>
---
 drivers/input/touchscreen/wacom_w8001.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index fe983e7..bab3c6a 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -155,7 +155,6 @@ static void parse_multi_touch(struct w8001 *w8001)
 		bool touch = data[0] & (1 << i);
 
 		input_mt_slot(dev, i);
-		input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
 		if (touch) {
 			x = (data[6 * i + 1] << 7) | data[6 * i + 2];
 			y = (data[6 * i + 3] << 7) | data[6 * i + 4];
@@ -514,8 +513,6 @@ static int w8001_setup_touch(struct w8001 *w8001, char *basename,
 					0, touch.x, 0, 0);
 		input_set_abs_params(dev, ABS_MT_POSITION_Y,
 					0, touch.y, 0, 0);
-		input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
-					0, MT_TOOL_MAX, 0, 0);
 
 		strlcat(basename, " 2FG", basename_sz);
 		if (w8001->max_pen_x && w8001->max_pen_y)
-- 
2.5.0

Re: [PATCH] Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2016-01-11 08:12:36 

On Mon, Jan 11, 2016 at 01:51:51PM +1000, Peter Hutterer wrote:
As of e0361b70175f0cd6199dd9ed6679632de73973d4
  Input: wacom_w8001 - split the touch and pen devices into two devices
the touch events aren't multiplexed over the same device anymore, the use of
ABS_MT_TOOL_TYPE is superfluous. And even before then it only ever sent
MT_TOOL_TYPE_FINGER anyway.

Signed-off-by: Peter Hutterer <redacted>
Applied, thank you.
quoted hunk
---
 drivers/input/touchscreen/wacom_w8001.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index fe983e7..bab3c6a 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -155,7 +155,6 @@ static void parse_multi_touch(struct w8001 *w8001)
 		bool touch = data[0] & (1 << i);
 
 		input_mt_slot(dev, i);
-		input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
 		if (touch) {
 			x = (data[6 * i + 1] << 7) | data[6 * i + 2];
 			y = (data[6 * i + 3] << 7) | data[6 * i + 4];
@@ -514,8 +513,6 @@ static int w8001_setup_touch(struct w8001 *w8001, char *basename,
 					0, touch.x, 0, 0);
 		input_set_abs_params(dev, ABS_MT_POSITION_Y,
 					0, touch.y, 0, 0);
-		input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
-					0, MT_TOOL_MAX, 0, 0);
 
 		strlcat(basename, " 2FG", basename_sz);
 		if (w8001->max_pen_x && w8001->max_pen_y)
-- 
2.5.0
-- 
Dmitry

Re: [PATCH] Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2016-07-14 00:09:07 

On Mon, Jan 11, 2016 at 12:12 AM, Dmitry Torokhov
[off-list ref] wrote:
On Mon, Jan 11, 2016 at 01:51:51PM +1000, Peter Hutterer wrote:
quoted
As of e0361b70175f0cd6199dd9ed6679632de73973d4
  Input: wacom_w8001 - split the touch and pen devices into two devices
the touch events aren't multiplexed over the same device anymore, the use of
ABS_MT_TOOL_TYPE is superfluous. And even before then it only ever sent
MT_TOOL_TYPE_FINGER anyway.

Signed-off-by: Peter Hutterer <redacted>
Applied, thank you.
Hmm, so I applied that but removal of input_mt_report_slot_state()
means that we do not generate tacking IDs for the contacts. Revert?

quoted
---
 drivers/input/touchscreen/wacom_w8001.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index fe983e7..bab3c6a 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -155,7 +155,6 @@ static void parse_multi_touch(struct w8001 *w8001)
              bool touch = data[0] & (1 << i);

              input_mt_slot(dev, i);
-             input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
              if (touch) {
                      x = (data[6 * i + 1] << 7) | data[6 * i + 2];
                      y = (data[6 * i + 3] << 7) | data[6 * i + 4];
@@ -514,8 +513,6 @@ static int w8001_setup_touch(struct w8001 *w8001, char *basename,
                                      0, touch.x, 0, 0);
              input_set_abs_params(dev, ABS_MT_POSITION_Y,
                                      0, touch.y, 0, 0);
-             input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
-                                     0, MT_TOOL_MAX, 0, 0);

              strlcat(basename, " 2FG", basename_sz);
              if (w8001->max_pen_x && w8001->max_pen_y)
--
2.5.0
--
Dmitry


-- 
Dmitry





  

    
Re: [PATCH] Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE

    

      From: Ping Cheng <hidden>

      Date: 2016-07-14 00:22:50 
    

  

  
On Wednesday, July 13, 2016, Dmitry Torokhov [off-list ref] wrote:
On Mon, Jan 11, 2016 at 12:12 AM, Dmitry Torokhov
[off-list ref] wrote:
quoted
On Mon, Jan 11, 2016 at 01:51:51PM +1000, Peter Hutterer wrote:
quoted
As of e0361b70175f0cd6199dd9ed6679632de73973d4
  Input: wacom_w8001 - split the touch and pen devices into two devices
the touch events aren't multiplexed over the same device anymore, the use of
ABS_MT_TOOL_TYPE is superfluous. And even before then it only ever sent
MT_TOOL_TYPE_FINGER anyway.

Signed-off-by: Peter Hutterer <redacted>
Applied, thank you.
Hmm, so I applied that but removal of input_mt_report_slot_state()
means that we do not generate tacking IDs for the contacts.
You are right. I have a set of patches to clean up the code. It is
still under testing/reviewing...

Revert?
It may be quicker to revert this one now. I'll submit the clean up set later.

Thanks,

Ping

quoted
quoted
---
 drivers/input/touchscreen/wacom_w8001.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c
index fe983e7..bab3c6a 100644
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
@@ -155,7 +155,6 @@ static void parse_multi_touch(struct w8001 *w8001)
              bool touch = data[0] & (1 << i);

              input_mt_slot(dev, i);
-             input_mt_report_slot_state(dev, MT_TOOL_FINGER, touch);
              if (touch) {
                      x = (data[6 * i + 1] << 7) | data[6 * i + 2];
                      y = (data[6 * i + 3] << 7) | data[6 * i + 4];
@@ -514,8 +513,6 @@ static int w8001_setup_touch(struct w8001 *w8001, char *basename,
                                      0, touch.x, 0, 0);
              input_set_abs_params(dev, ABS_MT_POSITION_Y,
                                      0, touch.y, 0, 0);
-             input_set_abs_params(dev, ABS_MT_TOOL_TYPE,
-                                     0, MT_TOOL_MAX, 0, 0);

              strlcat(basename, " 2FG", basename_sz);
              if (w8001->max_pen_x && w8001->max_pen_y)
--
2.5.0
--
Dmitry


--
Dmitry





  

    
Re: [PATCH] Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE

    

      From: Peter Hutterer <hidden>

      Date: 2016-07-14 05:58:06 
    

  

  
On Wed, Jul 13, 2016 at 05:22:30PM -0700, Ping Cheng wrote:
On Wednesday, July 13, 2016, Dmitry Torokhov [off-list ref] wrote:
quoted
On Mon, Jan 11, 2016 at 12:12 AM, Dmitry Torokhov
[off-list ref] wrote:
quoted
On Mon, Jan 11, 2016 at 01:51:51PM +1000, Peter Hutterer wrote:
quoted
As of e0361b70175f0cd6199dd9ed6679632de73973d4
  Input: wacom_w8001 - split the touch and pen devices into two devices
the touch events aren't multiplexed over the same device anymore, the use of
ABS_MT_TOOL_TYPE is superfluous. And even before then it only ever sent
MT_TOOL_TYPE_FINGER anyway.

Signed-off-by: Peter Hutterer <redacted>
Applied, thank you.
Hmm, so I applied that but removal of input_mt_report_slot_state()
means that we do not generate tacking IDs for the contacts.
You are right. I have a set of patches to clean up the code. It is
still under testing/reviewing...

quoted
Revert?
It may be quicker to revert this one now. I'll submit the clean up set later.
yeah, I agree and we found another bug with these devices. It'll be easier
to merge the fixed set.

Cheers,
   Peter





  

    
Re: [PATCH] Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE

    

      From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

      Date: 2016-07-14 16:42:33 
    

  

  
On Thu, Jul 14, 2016 at 03:57:59PM +1000, Peter Hutterer wrote:
On Wed, Jul 13, 2016 at 05:22:30PM -0700, Ping Cheng wrote:
quoted
On Wednesday, July 13, 2016, Dmitry Torokhov [off-list ref] wrote:
quoted
On Mon, Jan 11, 2016 at 12:12 AM, Dmitry Torokhov
[off-list ref] wrote:
quoted
On Mon, Jan 11, 2016 at 01:51:51PM +1000, Peter Hutterer wrote:
quoted
As of e0361b70175f0cd6199dd9ed6679632de73973d4
  Input: wacom_w8001 - split the touch and pen devices into two devices
the touch events aren't multiplexed over the same device anymore, the use of
ABS_MT_TOOL_TYPE is superfluous. And even before then it only ever sent
MT_TOOL_TYPE_FINGER anyway.

Signed-off-by: Peter Hutterer <redacted>
Applied, thank you.
Hmm, so I applied that but removal of input_mt_report_slot_state()
means that we do not generate tacking IDs for the contacts.
You are right. I have a set of patches to clean up the code. It is
still under testing/reviewing...

quoted
Revert?
It may be quicker to revert this one now. I'll submit the clean up set later.
yeah, I agree and we found another bug with these devices. It'll be easier
to merge the fixed set.
OK, reverted (and revert marked for stable). I added your acks to the
revert commit.

Thanks!

-- 
Dmitry




    
  

  
    

      

        Keyboard shortcuts
      

      

        
          
hback out one level

          
jnext message in thread

          
kprevious message in thread

          
ldrill in

          
Escclose help / fold thread tree

          
?toggle this help