summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2010-01-20 13:00:53 +0100
committerJiri Kosina <jkosina@suse.cz>2010-02-03 15:45:49 +0100
commit46a709b900bfcf43244cd19cf3245c77484ec733 (patch)
tree0d046897eabf34790181c7d302a5deca438e8eb6
parentHID: make raw reports possible for both feature and output reports (diff)
downloadlinux-46a709b900bfcf43244cd19cf3245c77484ec733.tar.xz
linux-46a709b900bfcf43244cd19cf3245c77484ec733.zip
HID: Implement Wacom quirk in the kernel
The hid-wacom driver required user-space to poke at the tablet to make it send data about the cursor location. This patch makes it do the same thing but in the kernel. Signed-off-by: Bastien Nocera <hadess@hadess.net> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-wacom.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 12dcda529201..b8778db720bc 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -156,7 +156,9 @@ static int wacom_probe(struct hid_device *hdev,
struct hid_input *hidinput;
struct input_dev *input;
struct wacom_data *wdata;
+ char rep_data[2];
int ret;
+ int limit;
wdata = kzalloc(sizeof(*wdata), GFP_KERNEL);
if (wdata == NULL) {
@@ -166,6 +168,7 @@ static int wacom_probe(struct hid_device *hdev,
hid_set_drvdata(hdev, wdata);
+ /* Parse the HID report now */
ret = hid_parse(hdev);
if (ret) {
dev_err(&hdev->dev, "parse failed\n");
@@ -178,6 +181,30 @@ static int wacom_probe(struct hid_device *hdev,
goto err_free;
}
+ /* Set Wacom mode2 */
+ rep_data[0] = 0x03; rep_data[1] = 0x00;
+ limit = 3;
+ do {
+ ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
+ HID_FEATURE_REPORT);
+ } while (ret < 0 && limit-- > 0);
+ if (ret < 0) {
+ dev_err(&hdev->dev, "failed to poke device #1, %d\n", ret);
+ goto err_free;
+ }
+
+ /* 0x06 - high reporting speed, 0x05 - low speed */
+ rep_data[0] = 0x06; rep_data[1] = 0x00;
+ limit = 3;
+ do {
+ ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
+ HID_FEATURE_REPORT);
+ } while (ret < 0 && limit-- > 0);
+ if (ret < 0) {
+ dev_err(&hdev->dev, "failed to poke device #2, %d\n", ret);
+ goto err_free;
+ }
+
hidinput = list_entry(hdev->inputs.next, struct hid_input, list);
input = hidinput->input;