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

[Przemo Firszt]

Dnia 9 Marca 2012, 10:40 pm, Pt, Chris Bagwell napisał(a):
> On Fri, Mar 9, 2012 at 2:27 PM, 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>
>> Reviewed-by: Jason Gerecke <killertofu@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..dab7588 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 & 0x80) {
>> +                       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);
>
> Is this input_set_capability MSC_SERIAL line to fix the next line
> thats above case statement?
>
>          __set_bit(MSC_SERIAL, input->mscbit);
>
> Should the original line be deleted/replaced?
Chris,
Thanks - good catch!
I no longer have the graphire tablet to test is it's safe to set "evbit" 
to "EV_MSC". That's the difference between "__set_bit(MSC_SERIAL,
input->mscbit);" and "input_set_capability(input, EV_MSC, MSC_SERIAL);" if
I read the code correctly. I'm OK to move "input_set_capability(input,
EV_MSC, MSC_SERIAL);" before the case statement, if someone can test that
it doesn't brak pad buttons on graphire tablet.

-- 
Regards,
Przemo Firszt

--
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/