linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields
@ 2021-10-09 11:37 Alistair Francis
  2021-10-09 11:37 ` [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks Alistair Francis
  2021-10-13  3:10 ` [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields Dmitry Torokhov
  0 siblings, 2 replies; 8+ messages in thread
From: Alistair Francis @ 2021-10-09 11:37 UTC (permalink / raw)
  To: dmitry.torokhov, linux-input, linux-kernel; +Cc: alistair, alistair23

Improve the query device fields to be more verbose.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
 drivers/input/touchscreen/wacom_i2c.c | 49 ++++++++++++++++-----------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 22826c387da5..8d7267ccc661 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -14,13 +14,21 @@
 #include <linux/interrupt.h>
 #include <asm/unaligned.h>
 
-#define WACOM_CMD_QUERY0	0x04
-#define WACOM_CMD_QUERY1	0x00
-#define WACOM_CMD_QUERY2	0x33
-#define WACOM_CMD_QUERY3	0x02
-#define WACOM_CMD_THROW0	0x05
-#define WACOM_CMD_THROW1	0x00
-#define WACOM_QUERY_SIZE	19
+// Registers
+#define WACOM_COMMAND_LSB   0x04
+#define WACOM_COMMAND_MSB   0x00
+
+#define WACOM_DATA_LSB      0x05
+#define WACOM_DATA_MSB      0x00
+
+// Report types
+#define REPORT_FEATURE      0x30
+
+// Requests / operations
+#define OPCODE_GET_REPORT   0x02
+
+#define WACOM_QUERY_REPORT	3
+#define WACOM_QUERY_SIZE	22
 
 struct wacom_features {
 	int x_max;
@@ -41,27 +49,30 @@ static int wacom_query_device(struct i2c_client *client,
 			      struct wacom_features *features)
 {
 	int ret;
-	u8 cmd1[] = { WACOM_CMD_QUERY0, WACOM_CMD_QUERY1,
-			WACOM_CMD_QUERY2, WACOM_CMD_QUERY3 };
-	u8 cmd2[] = { WACOM_CMD_THROW0, WACOM_CMD_THROW1 };
 	u8 data[WACOM_QUERY_SIZE];
+
+	u8 get_query_data_cmd[] = {
+		WACOM_COMMAND_LSB,
+		WACOM_COMMAND_MSB,
+		REPORT_FEATURE | WACOM_QUERY_REPORT,
+		OPCODE_GET_REPORT,
+		WACOM_DATA_LSB,
+		WACOM_DATA_MSB,
+	};
+
 	struct i2c_msg msgs[] = {
+		// Request reading of feature ReportID: 3 (Pen Query Data)
 		{
 			.addr = client->addr,
 			.flags = 0,
-			.len = sizeof(cmd1),
-			.buf = cmd1,
-		},
-		{
-			.addr = client->addr,
-			.flags = 0,
-			.len = sizeof(cmd2),
-			.buf = cmd2,
+			.len = sizeof(get_query_data_cmd),
+			.buf = get_query_data_cmd,
 		},
+		// Read 21 bytes
 		{
 			.addr = client->addr,
 			.flags = I2C_M_RD,
-			.len = sizeof(data),
+			.len = WACOM_QUERY_SIZE - 1,
 			.buf = data,
 		},
 	};
-- 
2.31.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks
  2021-10-09 11:37 [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields Alistair Francis
@ 2021-10-09 11:37 ` Alistair Francis
  2021-10-13  3:55   ` Dmitry Torokhov
  2021-10-13  3:10 ` [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields Dmitry Torokhov
  1 sibling, 1 reply; 8+ messages in thread
From: Alistair Francis @ 2021-10-09 11:37 UTC (permalink / raw)
  To: dmitry.torokhov, linux-input, linux-kernel; +Cc: alistair, alistair23

To make the code easier to read use macros for the bit masks.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
 drivers/input/touchscreen/wacom_i2c.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 8d7267ccc661..6865342db659 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -14,6 +14,12 @@
 #include <linux/interrupt.h>
 #include <asm/unaligned.h>
 
+// Bitmasks (for data[3])
+#define WACOM_TIP_SWITCH_bm         (1 << 0)
+#define WACOM_BARREL_SWITCH_bm      (1 << 1)
+#define WACOM_ERASER_bm             (1 << 2)
+#define WACOM_BARREL_SWITCH_2_bm    (1 << 4)
+
 // Registers
 #define WACOM_COMMAND_LSB   0x04
 #define WACOM_COMMAND_MSB   0x00
@@ -110,10 +116,10 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
 	if (error < 0)
 		goto out;
 
-	tsw = data[3] & 0x01;
-	ers = data[3] & 0x04;
-	f1 = data[3] & 0x02;
-	f2 = data[3] & 0x10;
+	tsw = data[3] & WACOM_TIP_SWITCH_bm;
+	ers = data[3] & WACOM_ERASER_bm;
+	f1 = data[3] & WACOM_BARREL_SWITCH_bm;
+	f2 = data[3] & WACOM_BARREL_SWITCH_2_bm;
 	x = le16_to_cpup((__le16 *)&data[4]);
 	y = le16_to_cpup((__le16 *)&data[6]);
 	pressure = le16_to_cpup((__le16 *)&data[8]);
-- 
2.31.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields
  2021-10-09 11:37 [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields Alistair Francis
  2021-10-09 11:37 ` [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks Alistair Francis
@ 2021-10-13  3:10 ` Dmitry Torokhov
  2021-10-13 13:05   ` Alistair Francis
  1 sibling, 1 reply; 8+ messages in thread
From: Dmitry Torokhov @ 2021-10-13  3:10 UTC (permalink / raw)
  To: Alistair Francis; +Cc: linux-input, linux-kernel, alistair23

Hi Alistair,

On Sat, Oct 09, 2021 at 09:37:06PM +1000, Alistair Francis wrote:
> Improve the query device fields to be more verbose.
> 
> Signed-off-by: Alistair Francis <alistair@alistair23.me>
> ---
>  drivers/input/touchscreen/wacom_i2c.c | 49 ++++++++++++++++-----------
>  1 file changed, 30 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
> index 22826c387da5..8d7267ccc661 100644
> --- a/drivers/input/touchscreen/wacom_i2c.c
> +++ b/drivers/input/touchscreen/wacom_i2c.c
> @@ -14,13 +14,21 @@
>  #include <linux/interrupt.h>
>  #include <asm/unaligned.h>
>  
> -#define WACOM_CMD_QUERY0	0x04
> -#define WACOM_CMD_QUERY1	0x00
> -#define WACOM_CMD_QUERY2	0x33
> -#define WACOM_CMD_QUERY3	0x02
> -#define WACOM_CMD_THROW0	0x05
> -#define WACOM_CMD_THROW1	0x00
> -#define WACOM_QUERY_SIZE	19
> +// Registers
> +#define WACOM_COMMAND_LSB   0x04
> +#define WACOM_COMMAND_MSB   0x00
> +
> +#define WACOM_DATA_LSB      0x05
> +#define WACOM_DATA_MSB      0x00
> +
> +// Report types
> +#define REPORT_FEATURE      0x30
> +
> +// Requests / operations
> +#define OPCODE_GET_REPORT   0x02
> +
> +#define WACOM_QUERY_REPORT	3
> +#define WACOM_QUERY_SIZE	22
>  
>  struct wacom_features {
>  	int x_max;
> @@ -41,27 +49,30 @@ static int wacom_query_device(struct i2c_client *client,
>  			      struct wacom_features *features)
>  {
>  	int ret;
> -	u8 cmd1[] = { WACOM_CMD_QUERY0, WACOM_CMD_QUERY1,
> -			WACOM_CMD_QUERY2, WACOM_CMD_QUERY3 };
> -	u8 cmd2[] = { WACOM_CMD_THROW0, WACOM_CMD_THROW1 };
>  	u8 data[WACOM_QUERY_SIZE];
> +
> +	u8 get_query_data_cmd[] = {
> +		WACOM_COMMAND_LSB,
> +		WACOM_COMMAND_MSB,
> +		REPORT_FEATURE | WACOM_QUERY_REPORT,
> +		OPCODE_GET_REPORT,
> +		WACOM_DATA_LSB,
> +		WACOM_DATA_MSB,
> +	};
> +
>  	struct i2c_msg msgs[] = {
> +		// Request reading of feature ReportID: 3 (Pen Query Data)
>  		{
>  			.addr = client->addr,
>  			.flags = 0,
> -			.len = sizeof(cmd1),
> -			.buf = cmd1,
> -		},
> -		{
> -			.addr = client->addr,
> -			.flags = 0,
> -			.len = sizeof(cmd2),
> -			.buf = cmd2,
> +			.len = sizeof(get_query_data_cmd),
> +			.buf = get_query_data_cmd,
>  		},
> +		// Read 21 bytes
>  		{
>  			.addr = client->addr,
>  			.flags = I2C_M_RD,
> -			.len = sizeof(data),
> +			.len = WACOM_QUERY_SIZE - 1,

Why is this change? If we are indeed supposed to read 1 byte less this
should be a separate patch.

>  			.buf = data,
>  		},
>  	};
> -- 
> 2.31.1
> 

Thanks.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks
  2021-10-09 11:37 ` [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks Alistair Francis
@ 2021-10-13  3:55   ` Dmitry Torokhov
  2021-10-13 13:04     ` Alistair Francis
  0 siblings, 1 reply; 8+ messages in thread
From: Dmitry Torokhov @ 2021-10-13  3:55 UTC (permalink / raw)
  To: Alistair Francis; +Cc: linux-input, linux-kernel, alistair23

Hi Alistair,

On Sat, Oct 09, 2021 at 09:37:07PM +1000, Alistair Francis wrote:
> To make the code easier to read use macros for the bit masks.
> 
> Signed-off-by: Alistair Francis <alistair@alistair23.me>
> ---
>  drivers/input/touchscreen/wacom_i2c.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
> index 8d7267ccc661..6865342db659 100644
> --- a/drivers/input/touchscreen/wacom_i2c.c
> +++ b/drivers/input/touchscreen/wacom_i2c.c
> @@ -14,6 +14,12 @@
>  #include <linux/interrupt.h>
>  #include <asm/unaligned.h>
>  
> +// Bitmasks (for data[3])
> +#define WACOM_TIP_SWITCH_bm         (1 << 0)
> +#define WACOM_BARREL_SWITCH_bm      (1 << 1)
> +#define WACOM_ERASER_bm             (1 << 2)
> +#define WACOM_BARREL_SWITCH_2_bm    (1 << 4)

We have BIT() for that.

By the way, do you know what is the good name for bit 3? I see it is
being used in:

        if (!wac_i2c->prox)
                wac_i2c->tool = (data[3] & 0x0c) ?
                        BTN_TOOL_RUBBER : BTN_TOOL_PEN;

        wac_i2c->prox = data[3] & WACOM_IN_PROXIMITY;

0x0c is (WACOM_ERASER | <something else>).

Also, I am a bit confused by this code, now that I look at it closer.
Are we saying that the tool type (eraser or something else) is set only
in first packet for contact/touch?

> +
>  // Registers
>  #define WACOM_COMMAND_LSB   0x04
>  #define WACOM_COMMAND_MSB   0x00
> @@ -110,10 +116,10 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
>  	if (error < 0)
>  		goto out;
>  
> -	tsw = data[3] & 0x01;
> -	ers = data[3] & 0x04;
> -	f1 = data[3] & 0x02;
> -	f2 = data[3] & 0x10;
> +	tsw = data[3] & WACOM_TIP_SWITCH_bm;
> +	ers = data[3] & WACOM_ERASER_bm;
> +	f1 = data[3] & WACOM_BARREL_SWITCH_bm;
> +	f2 = data[3] & WACOM_BARREL_SWITCH_2_bm;
>  	x = le16_to_cpup((__le16 *)&data[4]);
>  	y = le16_to_cpup((__le16 *)&data[6]);
>  	pressure = le16_to_cpup((__le16 *)&data[8]);
> -- 
> 2.31.1
> 

How about the version of the patch below?

-- 
Dmitry

Input: wacom_i2c - use macros for the bit masks

From: Alistair Francis <alistair@alistair23.me>

To make the code easier to read use macros for the bit masks.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
Link: https://lore.kernel.org/r/20211009113707.17568-2-alistair@alistair23.me
Patchwork-Id: 12547519
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/touchscreen/wacom_i2c.c |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 22826c387da5..d3ea9aa8a98c 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -6,6 +6,7 @@
  * <tobita.tatsunosuke@wacom.co.jp>
  */
 
+#include <linux/bits.h>
 #include <linux/module.h>
 #include <linux/input.h>
 #include <linux/i2c.h>
@@ -14,6 +15,14 @@
 #include <linux/interrupt.h>
 #include <asm/unaligned.h>
 
+// Bitmasks (for data[3])
+#define WACOM_TIP_SWITCH	BIT(0)
+#define WACOM_BARREL_SWITCH	BIT(1)
+#define WACOM_ERASER		BIT(2)
+#define WACOM_BARREL_SWITCH_2	BIT(4)
+#define WACOM_IN_PROXIMITY	BIT(5)
+
+// Registers
 #define WACOM_CMD_QUERY0	0x04
 #define WACOM_CMD_QUERY1	0x00
 #define WACOM_CMD_QUERY2	0x33
@@ -99,10 +108,10 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
 	if (error < 0)
 		goto out;
 
-	tsw = data[3] & 0x01;
-	ers = data[3] & 0x04;
-	f1 = data[3] & 0x02;
-	f2 = data[3] & 0x10;
+	tsw = data[3] & WACOM_TIP_SWITCH;
+	ers = data[3] & WACOM_ERASER;
+	f1 = data[3] & WACOM_BARREL_SWITCH;
+	f2 = data[3] & WACOM_BARREL_SWITCH_2;
 	x = le16_to_cpup((__le16 *)&data[4]);
 	y = le16_to_cpup((__le16 *)&data[6]);
 	pressure = le16_to_cpup((__le16 *)&data[8]);
@@ -111,7 +120,7 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
 		wac_i2c->tool = (data[3] & 0x0c) ?
 			BTN_TOOL_RUBBER : BTN_TOOL_PEN;
 
-	wac_i2c->prox = data[3] & 0x20;
+	wac_i2c->prox = data[3] & WACOM_IN_PROXIMITY;
 
 	input_report_key(input, BTN_TOUCH, tsw || ers);
 	input_report_key(input, wac_i2c->tool, wac_i2c->prox);

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks
  2021-10-13  3:55   ` Dmitry Torokhov
@ 2021-10-13 13:04     ` Alistair Francis
  2021-11-09  9:58       ` Alistair Francis
  0 siblings, 1 reply; 8+ messages in thread
From: Alistair Francis @ 2021-10-13 13:04 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: Alistair Francis, linux-input, Linux Kernel Mailing List

On Wed, Oct 13, 2021 at 1:56 PM Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
>
> Hi Alistair,
>
> On Sat, Oct 09, 2021 at 09:37:07PM +1000, Alistair Francis wrote:
> > To make the code easier to read use macros for the bit masks.
> >
> > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > ---
> >  drivers/input/touchscreen/wacom_i2c.c | 14 ++++++++++----
> >  1 file changed, 10 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
> > index 8d7267ccc661..6865342db659 100644
> > --- a/drivers/input/touchscreen/wacom_i2c.c
> > +++ b/drivers/input/touchscreen/wacom_i2c.c
> > @@ -14,6 +14,12 @@
> >  #include <linux/interrupt.h>
> >  #include <asm/unaligned.h>
> >
> > +// Bitmasks (for data[3])
> > +#define WACOM_TIP_SWITCH_bm         (1 << 0)
> > +#define WACOM_BARREL_SWITCH_bm      (1 << 1)
> > +#define WACOM_ERASER_bm             (1 << 2)
> > +#define WACOM_BARREL_SWITCH_2_bm    (1 << 4)
>
> We have BIT() for that.
>
> By the way, do you know what is the good name for bit 3? I see it is
> being used in:

I have this for bit 3:

#define WACOM_INVERT_bm             (1 << 3)


>
>         if (!wac_i2c->prox)
>                 wac_i2c->tool = (data[3] & 0x0c) ?
>                         BTN_TOOL_RUBBER : BTN_TOOL_PEN;
>
>         wac_i2c->prox = data[3] & WACOM_IN_PROXIMITY;
>
> 0x0c is (WACOM_ERASER | <something else>).
>
> Also, I am a bit confused by this code, now that I look at it closer.
> Are we saying that the tool type (eraser or something else) is set only
> in first packet for contact/touch?

I'm not sure, you would have to check with the wacom people.

>
> > +
> >  // Registers
> >  #define WACOM_COMMAND_LSB   0x04
> >  #define WACOM_COMMAND_MSB   0x00
> > @@ -110,10 +116,10 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
> >       if (error < 0)
> >               goto out;
> >
> > -     tsw = data[3] & 0x01;
> > -     ers = data[3] & 0x04;
> > -     f1 = data[3] & 0x02;
> > -     f2 = data[3] & 0x10;
> > +     tsw = data[3] & WACOM_TIP_SWITCH_bm;
> > +     ers = data[3] & WACOM_ERASER_bm;
> > +     f1 = data[3] & WACOM_BARREL_SWITCH_bm;
> > +     f2 = data[3] & WACOM_BARREL_SWITCH_2_bm;
> >       x = le16_to_cpup((__le16 *)&data[4]);
> >       y = le16_to_cpup((__le16 *)&data[6]);
> >       pressure = le16_to_cpup((__le16 *)&data[8]);
> > --
> > 2.31.1
> >
>
> How about the version of the patch below?

Looks good to me!

Alistair

>
> --
> Dmitry
>
> Input: wacom_i2c - use macros for the bit masks
>
> From: Alistair Francis <alistair@alistair23.me>
>
> To make the code easier to read use macros for the bit masks.
>
> Signed-off-by: Alistair Francis <alistair@alistair23.me>
> Link: https://lore.kernel.org/r/20211009113707.17568-2-alistair@alistair23.me
> Patchwork-Id: 12547519
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>  drivers/input/touchscreen/wacom_i2c.c |   19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
> index 22826c387da5..d3ea9aa8a98c 100644
> --- a/drivers/input/touchscreen/wacom_i2c.c
> +++ b/drivers/input/touchscreen/wacom_i2c.c
> @@ -6,6 +6,7 @@
>   * <tobita.tatsunosuke@wacom.co.jp>
>   */
>
> +#include <linux/bits.h>
>  #include <linux/module.h>
>  #include <linux/input.h>
>  #include <linux/i2c.h>
> @@ -14,6 +15,14 @@
>  #include <linux/interrupt.h>
>  #include <asm/unaligned.h>
>
> +// Bitmasks (for data[3])
> +#define WACOM_TIP_SWITCH       BIT(0)
> +#define WACOM_BARREL_SWITCH    BIT(1)
> +#define WACOM_ERASER           BIT(2)
> +#define WACOM_BARREL_SWITCH_2  BIT(4)
> +#define WACOM_IN_PROXIMITY     BIT(5)
> +
> +// Registers
>  #define WACOM_CMD_QUERY0       0x04
>  #define WACOM_CMD_QUERY1       0x00
>  #define WACOM_CMD_QUERY2       0x33
> @@ -99,10 +108,10 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
>         if (error < 0)
>                 goto out;
>
> -       tsw = data[3] & 0x01;
> -       ers = data[3] & 0x04;
> -       f1 = data[3] & 0x02;
> -       f2 = data[3] & 0x10;
> +       tsw = data[3] & WACOM_TIP_SWITCH;
> +       ers = data[3] & WACOM_ERASER;
> +       f1 = data[3] & WACOM_BARREL_SWITCH;
> +       f2 = data[3] & WACOM_BARREL_SWITCH_2;
>         x = le16_to_cpup((__le16 *)&data[4]);
>         y = le16_to_cpup((__le16 *)&data[6]);
>         pressure = le16_to_cpup((__le16 *)&data[8]);
> @@ -111,7 +120,7 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
>                 wac_i2c->tool = (data[3] & 0x0c) ?
>                         BTN_TOOL_RUBBER : BTN_TOOL_PEN;
>
> -       wac_i2c->prox = data[3] & 0x20;
> +       wac_i2c->prox = data[3] & WACOM_IN_PROXIMITY;
>
>         input_report_key(input, BTN_TOUCH, tsw || ers);
>         input_report_key(input, wac_i2c->tool, wac_i2c->prox);

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields
  2021-10-13  3:10 ` [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields Dmitry Torokhov
@ 2021-10-13 13:05   ` Alistair Francis
  0 siblings, 0 replies; 8+ messages in thread
From: Alistair Francis @ 2021-10-13 13:05 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: Alistair Francis, linux-input, Linux Kernel Mailing List

On Wed, Oct 13, 2021 at 1:10 PM Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
>
> Hi Alistair,
>
> On Sat, Oct 09, 2021 at 09:37:06PM +1000, Alistair Francis wrote:
> > Improve the query device fields to be more verbose.
> >
> > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > ---
> >  drivers/input/touchscreen/wacom_i2c.c | 49 ++++++++++++++++-----------
> >  1 file changed, 30 insertions(+), 19 deletions(-)
> >
> > diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
> > index 22826c387da5..8d7267ccc661 100644
> > --- a/drivers/input/touchscreen/wacom_i2c.c
> > +++ b/drivers/input/touchscreen/wacom_i2c.c
> > @@ -14,13 +14,21 @@
> >  #include <linux/interrupt.h>
> >  #include <asm/unaligned.h>
> >
> > -#define WACOM_CMD_QUERY0     0x04
> > -#define WACOM_CMD_QUERY1     0x00
> > -#define WACOM_CMD_QUERY2     0x33
> > -#define WACOM_CMD_QUERY3     0x02
> > -#define WACOM_CMD_THROW0     0x05
> > -#define WACOM_CMD_THROW1     0x00
> > -#define WACOM_QUERY_SIZE     19
> > +// Registers
> > +#define WACOM_COMMAND_LSB   0x04
> > +#define WACOM_COMMAND_MSB   0x00
> > +
> > +#define WACOM_DATA_LSB      0x05
> > +#define WACOM_DATA_MSB      0x00
> > +
> > +// Report types
> > +#define REPORT_FEATURE      0x30
> > +
> > +// Requests / operations
> > +#define OPCODE_GET_REPORT   0x02
> > +
> > +#define WACOM_QUERY_REPORT   3
> > +#define WACOM_QUERY_SIZE     22
> >
> >  struct wacom_features {
> >       int x_max;
> > @@ -41,27 +49,30 @@ static int wacom_query_device(struct i2c_client *client,
> >                             struct wacom_features *features)
> >  {
> >       int ret;
> > -     u8 cmd1[] = { WACOM_CMD_QUERY0, WACOM_CMD_QUERY1,
> > -                     WACOM_CMD_QUERY2, WACOM_CMD_QUERY3 };
> > -     u8 cmd2[] = { WACOM_CMD_THROW0, WACOM_CMD_THROW1 };
> >       u8 data[WACOM_QUERY_SIZE];
> > +
> > +     u8 get_query_data_cmd[] = {
> > +             WACOM_COMMAND_LSB,
> > +             WACOM_COMMAND_MSB,
> > +             REPORT_FEATURE | WACOM_QUERY_REPORT,
> > +             OPCODE_GET_REPORT,
> > +             WACOM_DATA_LSB,
> > +             WACOM_DATA_MSB,
> > +     };
> > +
> >       struct i2c_msg msgs[] = {
> > +             // Request reading of feature ReportID: 3 (Pen Query Data)
> >               {
> >                       .addr = client->addr,
> >                       .flags = 0,
> > -                     .len = sizeof(cmd1),
> > -                     .buf = cmd1,
> > -             },
> > -             {
> > -                     .addr = client->addr,
> > -                     .flags = 0,
> > -                     .len = sizeof(cmd2),
> > -                     .buf = cmd2,
> > +                     .len = sizeof(get_query_data_cmd),
> > +                     .buf = get_query_data_cmd,
> >               },
> > +             // Read 21 bytes
> >               {
> >                       .addr = client->addr,
> >                       .flags = I2C_M_RD,
> > -                     .len = sizeof(data),
> > +                     .len = WACOM_QUERY_SIZE - 1,
>
> Why is this change? If we are indeed supposed to read 1 byte less this
> should be a separate patch.

It shouldn't be a change, we are still reading 21 bytes of data. We
are just using a macro instead of sizeof().

Alistair

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks
  2021-10-13 13:04     ` Alistair Francis
@ 2021-11-09  9:58       ` Alistair Francis
  2021-11-10  6:54         ` Dmitry Torokhov
  0 siblings, 1 reply; 8+ messages in thread
From: Alistair Francis @ 2021-11-09  9:58 UTC (permalink / raw)
  To: Dmitry Torokhov; +Cc: Alistair Francis, linux-input, Linux Kernel Mailing List

On Wed, Oct 13, 2021 at 11:04 PM Alistair Francis <alistair23@gmail.com> wrote:
>
> On Wed, Oct 13, 2021 at 1:56 PM Dmitry Torokhov
> <dmitry.torokhov@gmail.com> wrote:
> >
> > Hi Alistair,
> >
> > On Sat, Oct 09, 2021 at 09:37:07PM +1000, Alistair Francis wrote:
> > > To make the code easier to read use macros for the bit masks.
> > >
> > > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > > ---
> > >  drivers/input/touchscreen/wacom_i2c.c | 14 ++++++++++----
> > >  1 file changed, 10 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
> > > index 8d7267ccc661..6865342db659 100644
> > > --- a/drivers/input/touchscreen/wacom_i2c.c
> > > +++ b/drivers/input/touchscreen/wacom_i2c.c
> > > @@ -14,6 +14,12 @@
> > >  #include <linux/interrupt.h>
> > >  #include <asm/unaligned.h>
> > >
> > > +// Bitmasks (for data[3])
> > > +#define WACOM_TIP_SWITCH_bm         (1 << 0)
> > > +#define WACOM_BARREL_SWITCH_bm      (1 << 1)
> > > +#define WACOM_ERASER_bm             (1 << 2)
> > > +#define WACOM_BARREL_SWITCH_2_bm    (1 << 4)
> >
> > We have BIT() for that.
> >
> > By the way, do you know what is the good name for bit 3? I see it is
> > being used in:
>
> I have this for bit 3:
>
> #define WACOM_INVERT_bm             (1 << 3)
>
>
> >
> >         if (!wac_i2c->prox)
> >                 wac_i2c->tool = (data[3] & 0x0c) ?
> >                         BTN_TOOL_RUBBER : BTN_TOOL_PEN;
> >
> >         wac_i2c->prox = data[3] & WACOM_IN_PROXIMITY;
> >
> > 0x0c is (WACOM_ERASER | <something else>).
> >
> > Also, I am a bit confused by this code, now that I look at it closer.
> > Are we saying that the tool type (eraser or something else) is set only
> > in first packet for contact/touch?
>
> I'm not sure, you would have to check with the wacom people.
>
> >
> > > +
> > >  // Registers
> > >  #define WACOM_COMMAND_LSB   0x04
> > >  #define WACOM_COMMAND_MSB   0x00
> > > @@ -110,10 +116,10 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
> > >       if (error < 0)
> > >               goto out;
> > >
> > > -     tsw = data[3] & 0x01;
> > > -     ers = data[3] & 0x04;
> > > -     f1 = data[3] & 0x02;
> > > -     f2 = data[3] & 0x10;
> > > +     tsw = data[3] & WACOM_TIP_SWITCH_bm;
> > > +     ers = data[3] & WACOM_ERASER_bm;
> > > +     f1 = data[3] & WACOM_BARREL_SWITCH_bm;
> > > +     f2 = data[3] & WACOM_BARREL_SWITCH_2_bm;
> > >       x = le16_to_cpup((__le16 *)&data[4]);
> > >       y = le16_to_cpup((__le16 *)&data[6]);
> > >       pressure = le16_to_cpup((__le16 *)&data[8]);
> > > --
> > > 2.31.1
> > >
> >
> > How about the version of the patch below?
>
> Looks good to me!
>
> Alistair
>
> >
> > --
> > Dmitry
> >
> > Input: wacom_i2c - use macros for the bit masks
> >
> > From: Alistair Francis <alistair@alistair23.me>
> >
> > To make the code easier to read use macros for the bit masks.
> >
> > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > Link: https://lore.kernel.org/r/20211009113707.17568-2-alistair@alistair23.me
> > Patchwork-Id: 12547519
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

I'm assuming you don't need me to re-send this. Let me know if you
want me to though.

Alistair

> > ---
> >  drivers/input/touchscreen/wacom_i2c.c |   19 ++++++++++++++-----
> >  1 file changed, 14 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
> > index 22826c387da5..d3ea9aa8a98c 100644
> > --- a/drivers/input/touchscreen/wacom_i2c.c
> > +++ b/drivers/input/touchscreen/wacom_i2c.c
> > @@ -6,6 +6,7 @@
> >   * <tobita.tatsunosuke@wacom.co.jp>
> >   */
> >
> > +#include <linux/bits.h>
> >  #include <linux/module.h>
> >  #include <linux/input.h>
> >  #include <linux/i2c.h>
> > @@ -14,6 +15,14 @@
> >  #include <linux/interrupt.h>
> >  #include <asm/unaligned.h>
> >
> > +// Bitmasks (for data[3])
> > +#define WACOM_TIP_SWITCH       BIT(0)
> > +#define WACOM_BARREL_SWITCH    BIT(1)
> > +#define WACOM_ERASER           BIT(2)
> > +#define WACOM_BARREL_SWITCH_2  BIT(4)
> > +#define WACOM_IN_PROXIMITY     BIT(5)
> > +
> > +// Registers
> >  #define WACOM_CMD_QUERY0       0x04
> >  #define WACOM_CMD_QUERY1       0x00
> >  #define WACOM_CMD_QUERY2       0x33
> > @@ -99,10 +108,10 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
> >         if (error < 0)
> >                 goto out;
> >
> > -       tsw = data[3] & 0x01;
> > -       ers = data[3] & 0x04;
> > -       f1 = data[3] & 0x02;
> > -       f2 = data[3] & 0x10;
> > +       tsw = data[3] & WACOM_TIP_SWITCH;
> > +       ers = data[3] & WACOM_ERASER;
> > +       f1 = data[3] & WACOM_BARREL_SWITCH;
> > +       f2 = data[3] & WACOM_BARREL_SWITCH_2;
> >         x = le16_to_cpup((__le16 *)&data[4]);
> >         y = le16_to_cpup((__le16 *)&data[6]);
> >         pressure = le16_to_cpup((__le16 *)&data[8]);
> > @@ -111,7 +120,7 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
> >                 wac_i2c->tool = (data[3] & 0x0c) ?
> >                         BTN_TOOL_RUBBER : BTN_TOOL_PEN;
> >
> > -       wac_i2c->prox = data[3] & 0x20;
> > +       wac_i2c->prox = data[3] & WACOM_IN_PROXIMITY;
> >
> >         input_report_key(input, BTN_TOUCH, tsw || ers);
> >         input_report_key(input, wac_i2c->tool, wac_i2c->prox);

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks
  2021-11-09  9:58       ` Alistair Francis
@ 2021-11-10  6:54         ` Dmitry Torokhov
  0 siblings, 0 replies; 8+ messages in thread
From: Dmitry Torokhov @ 2021-11-10  6:54 UTC (permalink / raw)
  To: Alistair Francis; +Cc: Alistair Francis, linux-input, Linux Kernel Mailing List

On Tue, Nov 09, 2021 at 07:58:00PM +1000, Alistair Francis wrote:
> 
> I'm assuming you don't need me to re-send this. Let me know if you
> want me to though.

It is applied now, thank you.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-11-10  6:54 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-09 11:37 [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields Alistair Francis
2021-10-09 11:37 ` [PATCH 2/2] Input: wacom_i2c - Use macros for the bit masks Alistair Francis
2021-10-13  3:55   ` Dmitry Torokhov
2021-10-13 13:04     ` Alistair Francis
2021-11-09  9:58       ` Alistair Francis
2021-11-10  6:54         ` Dmitry Torokhov
2021-10-13  3:10 ` [PATCH 1/2] Input: wacom_i2c - Clean up the query device fields Dmitry Torokhov
2021-10-13 13:05   ` Alistair Francis

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).