Re: [PATCH] HID: wacom: Add reporting of wheel for Intuos4 WL

[Jason Gerecke]

On Fri, Mar 9, 2012 at 10:16 AM, Przemo Firszt <przemo@xxxxxxxxx> wrote:
> This patch adds reporting of ABS_WHEEL event. Raported walues are 0..71
> and are related to absolute location of the finger on the wheel.
>
> Signed-off-by: Przemo Firszt <przemo@xxxxxxxxx>
> ---
> Âdrivers/hid/hid-wacom.c | Â 25 +++++++++++++++++++++++++
> Â1 files changed, 25 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
> index 5c25036..925d4a7 100644
> --- a/drivers/hid/hid-wacom.c
> +++ b/drivers/hid/hid-wacom.c
> @@ -36,6 +36,7 @@
> Âstruct wacom_data {
> Â Â Â Â__u16 tool;
> Â Â Â Â__u16 butstate;
> + Â Â Â __u8 whlstate;
> Â Â Â Â__u8 features;
> Â Â Â Â__u32 id;
> Â Â Â Â__u32 serial;
> @@ -322,6 +323,23 @@ static void wacom_i4_parse_button_report(struct wacom_data *wdata,
> Â Â Â Â Â Â Â Â Â Â Â Âstruct input_dev *input, unsigned char *data)
> Â{
> Â Â Â Â__u16 new_butstate;
> + Â Â Â __u8 new_whlstate;
> + Â Â Â __u8 sync = 0;
> +
> + Â Â Â new_whlstate = data[1];
> + Â Â Â if (new_whlstate != wdata->whlstate) {
> + Â Â Â Â Â Â Â wdata->whlstate = new_whlstate;
> + Â Â Â Â Â Â Â if (new_whlstate & 0x10) {
Should be 0x80 to get the highest bit. Aside from that issue though:

Reviewed-by: Jason Gerecke <killertofu@xxxxxxxxx>

Jason

---
Day xee-nee-svsh duu-'ushtlh-ts'it;
nuu-wee-ya' duu-xan' 'vm-nvshtlh-ts'it.
Huu-chan xuu naa~-gha.

> + Â Â Â Â Â Â Â Â Â Â Â input_report_key(input, BTN_TOUCH, 1);
> + Â Â Â Â Â Â Â Â Â Â Â input_report_abs(input, ABS_WHEEL, (new_whlstate & 0x7f));
> + Â Â Â Â Â Â Â Â Â Â Â input_report_key(input, BTN_TOOL_FINGER, 1);
> + Â Â Â Â Â Â Â } else {
> + Â Â Â Â Â Â Â Â Â Â Â input_report_key(input, BTN_TOUCH, 0);
> + Â Â Â Â Â Â Â Â Â Â Â input_report_abs(input, ABS_WHEEL, 0);
> + Â Â Â Â Â Â Â Â Â Â Â input_report_key(input, BTN_TOOL_FINGER, 0);
> + Â Â Â Â Â Â Â }
> + Â Â Â Â Â Â Â sync = 1;
> + Â Â Â }
>
> Â Â Â Ânew_butstate = (data[3] << 1) | (data[2] & 0x01);
> Â Â Â Âif (new_butstate != wdata->butstate) {
> @@ -336,6 +354,10 @@ static void wacom_i4_parse_button_report(struct wacom_data *wdata,
> Â Â Â Â Â Â Â Â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);
> + Â Â Â Â Â Â Â sync = 1;
> + Â Â Â }
> +
> + Â Â Â if (sync) {
> Â Â Â Â Â Â Â Âinput_report_abs(input, ABS_MISC, PAD_DEVICE_ID);
> Â Â Â Â Â Â Â Âinput_event(input, EV_MSC, MSC_SERIAL, 0xffffffff);
> Â Â Â Â Â Â Â Âinput_sync(input);
> @@ -512,6 +534,9 @@ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,
> Â Â Â Â Â Â Â Âinput_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);
> Â Â Â Â Â Â Â Âbreak;
> Â Â Â Âcase USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:
> + Â Â Â Â Â Â Â __set_bit(ABS_WHEEL, input->absbit);
> + Â Â Â Â Â Â Â input_set_abs_params(input, ABS_WHEEL, 0, 71, 0, 0);
> + Â Â Â Â Â Â Â input_set_capability(input, EV_MSC, MSC_SERIAL);
> Â Â Â Â Â Â Â Â__set_bit(ABS_MISC, input->absbit);
> Â Â Â Â Â Â Â Â__set_bit(BTN_2, input->keybit);
> Â Â Â Â Â Â Â Â__set_bit(BTN_3, input->keybit);
> --
> 1.7.6.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/