UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: wacom_i2c - use macros for the bit masks 

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
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Alistair Francis 2021-10-12 20:10:59 -07:00 committed by Dmitry Torokhov
parent 27931d38ce
commit 91e2e76695
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/input/touchscreen/wacom_i2c.c
View File

@ -6,6 +6,7 @@
* <tobita.tatsunosuke@wacom.co.jp> * <tobita.tatsunosuke@wacom.co.jp>
*/ */
#include <linux/bits.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/i2c.h> #include <linux/i2c.h>
@ -14,6 +15,15 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/unaligned.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_INVERT BIT(3)
#define WACOM_BARREL_SWITCH_2 BIT(4)
#define WACOM_IN_PROXIMITY BIT(5)
/* Registers */
#define WACOM_CMD_QUERY0 0x04 #define WACOM_CMD_QUERY0 0x04
#define WACOM_CMD_QUERY1 0x00 #define WACOM_CMD_QUERY1 0x00
#define WACOM_CMD_QUERY2 0x33 #define WACOM_CMD_QUERY2 0x33
@ -99,19 +109,19 @@ static irqreturn_t wacom_i2c_irq(int irq, void *dev_id)
if (error < 0) if (error < 0)
goto out; goto out;
tsw = data[3] & 0x01; tsw = data[3] & WACOM_TIP_SWITCH;
ers = data[3] & 0x04; ers = data[3] & WACOM_ERASER;
f1 = data[3] & 0x02; f1 = data[3] & WACOM_BARREL_SWITCH;
f2 = data[3] & 0x10; f2 = data[3] & WACOM_BARREL_SWITCH_2;
x = le16_to_cpup((__le16 *)&data[4]); x = le16_to_cpup((__le16 *)&data[4]);
y = le16_to_cpup((__le16 *)&data[6]); y = le16_to_cpup((__le16 *)&data[6]);
pressure = le16_to_cpup((__le16 *)&data[8]); pressure = le16_to_cpup((__le16 *)&data[8]);
if (!wac_i2c->prox) if (!wac_i2c->prox)
wac_i2c->tool = (data[3] & 0x0c) ? wac_i2c->tool = (data[3] & (WACOM_ERASER | WACOM_INVERT)) ?
BTN_TOOL_RUBBER : BTN_TOOL_PEN; 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, BTN_TOUCH, tsw || ers);
input_report_key(input, wac_i2c->tool, wac_i2c->prox); input_report_key(input, wac_i2c->tool, wac_i2c->prox);