]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
HID: wacom: Add speed setting for Intuos4 WL
authorPrzemo Firszt <przemo@firszt.eu>
Tue, 15 May 2012 18:32:26 +0000 (19:32 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 16 May 2012 19:42:15 +0000 (21:42 +0200)
Add option to change reporting speed for Intuos4 WL. The option is only
internal to the module, but it will be extended to allow control over sysfs,
as it is already implemented for Graphire.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-wacom.c

index 4fc4eebe978486182db9bf7adeb0399b072eb351..5f6ce70c23fb5903a9fa6d6116d5470823e01a0b 100644 (file)
@@ -228,16 +228,25 @@ static int wacom_ac_get_property(struct power_supply *psy,
        return ret;
 }
 
-static void wacom_set_features(struct hid_device *hdev)
+static void wacom_set_features(struct hid_device *hdev, u8 speed)
 {
+       struct wacom_data *wdata = hid_get_drvdata(hdev);
        int ret;
        __u8 rep_data[2];
 
-       /*set high speed, tablet mode*/
+       if (speed == 1)
+               wdata->features &= ~0x20;
+       else
+               wdata->features |= 0x20;
+
        rep_data[0] = 0x03;
-       rep_data[1] = 0x20;
+       rep_data[1] = wdata->features;
+
        ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
                                HID_FEATURE_REPORT);
+       if (ret >= 0)
+               wdata->high_speed = speed;
+
        return;
 }
 
@@ -719,7 +728,7 @@ static int wacom_probe(struct hid_device *hdev,
        case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:
                sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
                wdata->features = 0;
-               wacom_set_features(hdev);
+               wacom_set_features(hdev, 1);
                ret = wacom_initialize_leds(hdev);
                if (ret) {
                        hid_warn(hdev,