diff options
| author |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-08-06 13:52:56 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-06 14:18:11 -0700 |
| commit | 387142bb8fcb263771e1fa6b1a96e6a7ca36e820 (patch) | |
| tree | ef23bfa3991b5d35c7fec71c767d5bf5de2f5217 /drivers/hid/wacom_sys.c | |
| parent | Input: wacom - prepare the driver to include BT devices (diff) | |
| download | linux-dev-387142bb8fcb263771e1fa6b1a96e6a7ca36e820.tar.xz linux-dev-387142bb8fcb263771e1fa6b1a96e6a7ca36e820.zip | |
Input: wacom - handle Graphire BT tablets in wacom.ko
First, merge the Graphire BT tablet.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Tested-by: Przemo Firszt <przemo@firszt.eu>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/hid/wacom_sys.c')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 18154a5459b5..c21e58ba0693 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -265,6 +265,39 @@ static int wacom_set_device_mode(struct hid_device *hdev, int report_id, static int wacom_bt_query_tablet_data(struct hid_device *hdev, u8 speed, struct wacom_features *features) { + struct wacom *wacom = hid_get_drvdata(hdev); + int ret; + u8 rep_data[2]; + + switch (features->type) { + case GRAPHIRE_BT: + rep_data[0] = 0x03; + rep_data[1] = 0x00; + ret = wacom_set_report(hdev, HID_FEATURE_REPORT, + rep_data[0], rep_data, 2, 3); + + if (ret >= 0) { + rep_data[0] = speed == 0 ? 0x05 : 0x06; + rep_data[1] = 0x00; + + ret = wacom_set_report(hdev, HID_FEATURE_REPORT, + rep_data[0], rep_data, 2, 3); + + if (ret >= 0) { + wacom->wacom_wac.bt_high_speed = speed; + return 0; + } + } + + /* + * Note that if the raw queries fail, it's not a hard failure + * and it is safe to continue + */ + hid_warn(hdev, "failed to poke device, command %d, err %d\n", + rep_data[0], ret); + break; + } + return 0; } |