* [PATCH 1/2] HID: wacom: report distance for Intuos4 WL @ 2012-02-28 17:19 Przemo Firszt 2012-02-28 17:19 ` [PATCH 2/2] HID: wacom: Add pad buttons reporting on " Przemo Firszt 2012-03-01 8:26 ` [PATCH 1/2] HID: wacom: report distance for " Jiri Kosina 0 siblings, 2 replies; 4+ messages in thread From: Przemo Firszt @ 2012-02-28 17:19 UTC (permalink / raw) To: jkosina, pinglinux, peter.hutterer Cc: linuxwacom-devel, linux-input, linux-kernel, Przemo Firszt This patch adds reporting of distance of tool to the tablet surface. Maximum reported value is 63 (0x3F). Signed-off-by: Przemo Firszt <przemo@firszt.eu> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> --- drivers/hid/hid-wacom.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index a3476f9..5a58db2 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c @@ -320,6 +320,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata, struct input_dev *input, unsigned char *data) { __u16 x, y, pressure; + __u8 distance; switch (data[1]) { case 0x80: /* Out of proximity report */ @@ -353,6 +354,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata, y = data[4] << 9 | data[5] << 1 | (data[9] & 0x01); pressure = (data[6] << 3) | ((data[7] & 0xC0) >> 5) | (data[1] & 0x01); + distance = (data[9] >> 2) & 0x3f; input_report_key(input, BTN_TOUCH, pressure > 1); @@ -362,6 +364,7 @@ static void wacom_i4_parse_pen_report(struct wacom_data *wdata, input_report_abs(input, ABS_X, x); input_report_abs(input, ABS_Y, y); input_report_abs(input, ABS_PRESSURE, pressure); + input_report_abs(input, ABS_DISTANCE, distance); input_report_abs(input, ABS_MISC, wdata->id); input_event(input, EV_MSC, MSC_SERIAL, wdata->serial); input_report_key(input, wdata->tool, 1); @@ -484,6 +487,7 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi, input_set_abs_params(input, ABS_X, 0, 40640, 4, 0); input_set_abs_params(input, ABS_Y, 0, 25400, 4, 0); input_set_abs_params(input, ABS_PRESSURE, 0, 2047, 0, 0); + input_set_abs_params(input, ABS_DISTANCE, 0, 63, 0, 0); break; } -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] HID: wacom: Add pad buttons reporting on Intuos4 WL 2012-02-28 17:19 [PATCH 1/2] HID: wacom: report distance for Intuos4 WL Przemo Firszt @ 2012-02-28 17:19 ` Przemo Firszt 2012-03-01 8:26 ` Jiri Kosina 2012-03-01 8:26 ` [PATCH 1/2] HID: wacom: report distance for " Jiri Kosina 1 sibling, 1 reply; 4+ messages in thread From: Przemo Firszt @ 2012-02-28 17:19 UTC (permalink / raw) To: jkosina, pinglinux, peter.hutterer Cc: linuxwacom-devel, linux-input, linux-kernel, Przemo Firszt This patch adds reporting of 1 wheel button and 8 strip buttons for Intuos4 WL. The buttons are reported as BTN_0 to BTN_9. The change of type butstate variable is required as the old type 'char' couldn't store state of 9 buttons. The change is not affecting Graphire tablet as it only uses first 2 bits of 'butstate'. Signed-off-by: Przemo Firszt <przemo@firszt.eu> Acked-by：Ping Cheng <pinglinux@gmail.com> --- drivers/hid/hid-wacom.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index 5a58db2..58aedbc 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c @@ -31,9 +31,11 @@ #include "hid-ids.h" +#define PAD_DEVICE_ID 0x0F + struct wacom_data { __u16 tool; - unsigned char butstate; + __u16 butstate; __u8 features; __u32 id; __u32 serial; @@ -316,6 +318,30 @@ static int wacom_gr_parse_report(struct hid_device *hdev, return 1; } +static void wacom_i4_parse_button_report(struct wacom_data *wdata, + struct input_dev *input, unsigned char *data) +{ + __u16 new_butstate; + + new_butstate = (data[3] << 1) | (data[2] & 0x01); + if (new_butstate != wdata->butstate) { + wdata->butstate = new_butstate; + input_report_key(input, BTN_0, new_butstate & 0x001); + input_report_key(input, BTN_1, new_butstate & 0x002); + input_report_key(input, BTN_2, new_butstate & 0x004); + input_report_key(input, BTN_3, new_butstate & 0x008); + input_report_key(input, BTN_4, new_butstate & 0x010); + input_report_key(input, BTN_5, new_butstate & 0x020); + input_report_key(input, BTN_6, new_butstate & 0x040); + input_report_key(input, BTN_7, new_butstate & 0x080); + input_report_key(input, BTN_8, new_butstate & 0x100); + input_report_key(input, BTN_TOOL_FINGER, 1); + input_report_abs(input, ABS_MISC, PAD_DEVICE_ID); + input_event(input, EV_MSC, MSC_SERIAL, 0xffffffff); + input_sync(input); + } +} + static void wacom_i4_parse_pen_report(struct wacom_data *wdata, struct input_dev *input, unsigned char *data) { @@ -389,6 +415,7 @@ static void wacom_i4_parse_report(struct hid_device *hdev, wdata->features = data[2]; break; case 0x0C: /* Button report */ + wacom_i4_parse_button_report(wdata, input, data); break; default: hid_err(hdev, "Unknown report: %d,%d\n", data[0], data[1]); @@ -484,6 +511,13 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi, break; case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH: __set_bit(ABS_MISC, input->absbit); + __set_bit(BTN_2, input->keybit); + __set_bit(BTN_3, input->keybit); + __set_bit(BTN_4, input->keybit); + __set_bit(BTN_5, input->keybit); + __set_bit(BTN_6, input->keybit); + __set_bit(BTN_7, input->keybit); + __set_bit(BTN_8, input->keybit); input_set_abs_params(input, ABS_X, 0, 40640, 4, 0); input_set_abs_params(input, ABS_Y, 0, 25400, 4, 0); input_set_abs_params(input, ABS_PRESSURE, 0, 2047, 0, 0); -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] HID: wacom: Add pad buttons reporting on Intuos4 WL 2012-02-28 17:19 ` [PATCH 2/2] HID: wacom: Add pad buttons reporting on " Przemo Firszt @ 2012-03-01 8:26 ` Jiri Kosina 0 siblings, 0 replies; 4+ messages in thread From: Jiri Kosina @ 2012-03-01 8:26 UTC (permalink / raw) To: Przemo Firszt Cc: pinglinux, peter.hutterer, linuxwacom-devel, linux-input, linux-kernel On Tue, 28 Feb 2012, Przemo Firszt wrote: > This patch adds reporting of 1 wheel button and 8 strip buttons for Intuos4 WL. > The buttons are reported as BTN_0 to BTN_9. The change of type butstate variable > is required as the old type 'char' couldn't store state of 9 buttons. The change > is not affecting Graphire tablet as it only uses first 2 bits of 'butstate'. Applied, thanks. -- Jiri Kosina SUSE Labs ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] HID: wacom: report distance for Intuos4 WL 2012-02-28 17:19 [PATCH 1/2] HID: wacom: report distance for Intuos4 WL Przemo Firszt 2012-02-28 17:19 ` [PATCH 2/2] HID: wacom: Add pad buttons reporting on " Przemo Firszt @ 2012-03-01 8:26 ` Jiri Kosina 1 sibling, 0 replies; 4+ messages in thread From: Jiri Kosina @ 2012-03-01 8:26 UTC (permalink / raw) To: Przemo Firszt Cc: pinglinux, peter.hutterer, linuxwacom-devel, linux-input, linux-kernel On Tue, 28 Feb 2012, Przemo Firszt wrote: > This patch adds reporting of distance of tool to the tablet surface. Maximum > reported value is 63 (0x3F). Applied. -- Jiri Kosina SUSE Labs ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-01 8:26 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-02-28 17:19 [PATCH 1/2] HID: wacom: report distance for Intuos4 WL Przemo Firszt 2012-02-28 17:19 ` [PATCH 2/2] HID: wacom: Add pad buttons reporting on " Przemo Firszt 2012-03-01 8:26 ` Jiri Kosina 2012-03-01 8:26 ` [PATCH 1/2] HID: wacom: report distance for " Jiri Kosina
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).