From: Alistair Francis <alistair@alistair23.me>
To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org,
linux-imx@nxp.com, kernel@pengutronix.de, pinglinux@gmail.com,
tatsunosuke.tobita@wacom.com, junkpainting@gmail.com,
ping.cheng@wacom.com
Cc: linux-kernel@vger.kernel.org, alistair23@gmail.com,
robh+dt@kernel.org, devicetree@vger.kernel.org,
Alistair Francis <alistair@alistair23.me>
Subject: [PATCH v10 09/12] Input: wacom_i2c - Use macros for the bit masks
Date: Sun, 29 Aug 2021 19:19:22 +1000 [thread overview]
Message-ID: <20210829091925.190-11-alistair@alistair23.me> (raw)
In-Reply-To: <20210829091925.190-1-alistair@alistair23.me>
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 | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c
index 13341e76368b..f78a43212901 100644
--- a/drivers/input/touchscreen/wacom_i2c.c
+++ b/drivers/input/touchscreen/wacom_i2c.c
@@ -18,6 +18,14 @@
#include <linux/of.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_INVERT_bm (1 << 3)
+#define WACOM_BARREL_SWITCH_2_bm (1 << 4)
+#define WACOM_IN_RANGE_bm (1 << 5)
+
// Registers
#define WACOM_DESC_REG 0x01
#define WACOM_COMMAND_LSB 0x04
@@ -206,10 +214,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
next prev parent reply other threads:[~2021-08-29 9:20 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-29 9:19 [PATCH v10 00/12] Add Wacom I2C support to rM2 Alistair Francis
2021-08-29 9:19 ` [PATCH v10 01/12] dt-bindings: Add Wacom to vendor bindings Alistair Francis
2021-08-29 9:19 ` [PATCH] Input: wacom_i2c - Allow flipping the values from the DT Alistair Francis
2021-08-29 9:19 ` [PATCH v10 02/12] dt-bindings: touchscreen: Initial commit of wacom,i2c Alistair Francis
2021-08-29 9:19 ` [PATCH v10 03/12] Input: wacom_i2c - Add device tree support to wacom_i2c Alistair Francis
2021-08-29 9:19 ` [PATCH v10 04/12] Input: wacom_i2c - Add touchscren properties Alistair Francis
2021-08-29 9:19 ` [PATCH v10 05/12] Input: wacom_i2c - Read the descriptor values Alistair Francis
2021-08-30 20:44 ` Dmitry Torokhov
[not found] ` <PA4PR07MB7407FE9FE271191AC52F7EA387CE9@PA4PR07MB7407.eurprd07.prod.outlook.com>
2021-09-07 6:05 ` Dmitry Torokhov
[not found] ` <CAF8JNh+PcYuaLL=ToS0hOT62YbVmMWY9BCT-CGx_x+AkKuO_Tw@mail.gmail.com>
2021-09-08 5:55 ` Dmitry Torokhov
2021-09-10 4:10 ` Tobita, Tatsunosuke
2021-10-06 7:08 ` Tobita, Tatsunosuke
2021-10-06 18:02 ` Dmitry Torokhov
2021-10-12 23:41 ` Tobita, Tatsunosuke
2021-09-17 20:43 ` Ping Cheng
2021-09-21 4:35 ` Dmitry Torokhov
2021-09-29 7:50 ` Alistair Francis
2021-08-29 9:19 ` [PATCH v10 06/12] Input: wacom_i2c - Add support for distance and tilt x/y Alistair Francis
2021-08-29 9:19 ` [PATCH v10 07/12] Input: wacom_i2c - Clean up the query device fields Alistair Francis
2021-08-31 22:28 ` Kari Argillander
2021-08-29 9:19 ` [PATCH v10 08/12] Input: wacom_i2c - Add support for vdd regulator Alistair Francis
2021-08-29 9:19 ` Alistair Francis [this message]
2021-08-29 9:19 ` [PATCH v10 10/12] Input: wacom_i2c - Allow flipping the values from the DT Alistair Francis
2021-08-31 21:54 ` Rob Herring
2021-08-29 9:19 ` [PATCH v10 11/12] ARM: imx_v6_v7_defconfig: Enable Wacom I2C Alistair Francis
2021-08-29 9:19 ` [PATCH v10 12/12] ARM: dts: imx7d: remarkable2: add wacom digitizer device Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210829091925.190-11-alistair@alistair23.me \
--to=alistair@alistair23.me \
--cc=alistair23@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=junkpainting@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-imx@nxp.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ping.cheng@wacom.com \
--cc=pinglinux@gmail.com \
--cc=robh+dt@kernel.org \
--cc=tatsunosuke.tobita@wacom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).