mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 05:02:12 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID updates from Jiri Kosina: - a lot of Wacom driver updates; most notably second generation Intuos Pro is now supported, code from Aaron Armstrong Skomra and Jason Gerecke - Surface 3 and 4 Type Cover Pro support from Daniel Keller, Dennis Chen and Yuta Kobayashi - hid-rmi is now generic transport driver, used by synaptics-rmi4; Support the Lenovo Thinkpad X1 Tablet dock follows on top, from Andrew Duggan - a few misc bugfixes and improvements here and there * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (29 commits) HID: intel-ish-hid: constify device_type structure HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range HID: intel-ish-hid: ipc: check FW status to distinguish ISH resume paths HID: multitouch: fix LG Melfas touchscreen HID: wacom: don't apply generic settings to old devices HID: wacom: generic: support LEDs HID: wacom: generic: support generic touch switch HID: wacom: generic: add vendor defined touch HID: wacom: generic: add support for touchring HID: wacom: generic: remove input_event_flag HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface HID: wacom: Move WAC_CMD_* into wacom_wac.h HID: wacom: Enable HID_GENERIC codepath for Bluetooth devices HID: wacom: do not attempt to switch mode while in probe HID: wacom: remove warning while disconnecting devices HID: wacom: release the resources before leaving despite devm HID: whitespace cleanup HID: multitouch: enable Surface 3 Type Cover Pro to report multitouch data HID: rmi: Support the Lenovo Thinkpad X1 Tablet dock using hid-rmi HID: rmi: Handle all Synaptics touchpads using hid-rmi ...
This commit is contained in:
Linus Torvalds
commit
27a67e0f98
@ -785,6 +785,11 @@ config HID_SUNPLUS
|
||||
config HID_RMI
|
||||
tristate "Synaptics RMI4 device support"
|
||||
depends on HID
|
||||
select RMI4_CORE
|
||||
select RMI4_F03
|
||||
select RMI4_F11
|
||||
select RMI4_F12
|
||||
select RMI4_F30
|
||||
---help---
|
||||
Support for Synaptics RMI4 touchpads.
|
||||
Say Y here if you have a Synaptics RMI4 touchpads over i2c-hid or usbhid
|
||||
|
||||
@ -43,7 +43,6 @@
|
||||
*/
|
||||
|
||||
#define DRIVER_DESC "HID core driver"
|
||||
#define DRIVER_LICENSE "GPL"
|
||||
|
||||
int hid_debug = 0;
|
||||
module_param_named(debug, hid_debug, int, 0600);
|
||||
@ -724,13 +723,7 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
|
||||
hid->group = HID_GROUP_SENSOR_HUB;
|
||||
|
||||
if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
|
||||
(hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 ||
|
||||
hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 ||
|
||||
hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP ||
|
||||
hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 ||
|
||||
hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 ||
|
||||
hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP ||
|
||||
hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&
|
||||
hid->product == USB_DEVICE_ID_MS_POWER_COVER &&
|
||||
hid->group == HID_GROUP_MULTITOUCH)
|
||||
hid->group = HID_GROUP_GENERIC;
|
||||
|
||||
@ -826,7 +819,8 @@ static int hid_scan_report(struct hid_device *hid)
|
||||
hid->group = HID_GROUP_WACOM;
|
||||
break;
|
||||
case USB_VENDOR_ID_SYNAPTICS:
|
||||
if (hid->group == HID_GROUP_GENERIC)
|
||||
if (hid->group == HID_GROUP_GENERIC ||
|
||||
hid->group == HID_GROUP_MULTITOUCH_WIN_8)
|
||||
if ((parser->scan_flags & HID_SCAN_FLAG_VENDOR_SPECIFIC)
|
||||
&& (parser->scan_flags & HID_SCAN_FLAG_GD_POINTER))
|
||||
/*
|
||||
@ -1887,6 +1881,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },
|
||||
#if IS_ENABLED(CONFIG_HID_MAYFLASH)
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE2) },
|
||||
#endif
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_WN) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA) },
|
||||
@ -1933,6 +1930,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CBTKBD) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPPRODOCK) },
|
||||
#endif
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MELFAS_MT) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
|
||||
@ -1985,12 +1983,6 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },
|
||||
@ -2126,6 +2118,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) },
|
||||
{ }
|
||||
};
|
||||
|
||||
@ -2314,7 +2307,7 @@ __ATTRIBUTE_GROUPS(hid_dev);
|
||||
|
||||
static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
{
|
||||
struct hid_device *hdev = to_hid_device(dev);
|
||||
struct hid_device *hdev = to_hid_device(dev);
|
||||
|
||||
if (add_uevent_var(env, "HID_ID=%04X:%08X:%08X",
|
||||
hdev->bus, hdev->vendor, hdev->product))
|
||||
@ -2867,5 +2860,5 @@ module_exit(hid_exit);
|
||||
MODULE_AUTHOR("Andreas Gal");
|
||||
MODULE_AUTHOR("Vojtech Pavlik");
|
||||
MODULE_AUTHOR("Jiri Kosina");
|
||||
MODULE_LICENSE(DRIVER_LICENSE);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
||||
@ -323,7 +323,8 @@
|
||||
#define USB_DEVICE_ID_DRAGONRISE_WIIU 0x1800
|
||||
#define USB_DEVICE_ID_DRAGONRISE_PS3 0x1801
|
||||
#define USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR 0x1803
|
||||
#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE 0x1843
|
||||
#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE1 0x1843
|
||||
#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE2 0x1844
|
||||
|
||||
#define USB_VENDOR_ID_DWAV 0x0eef
|
||||
#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001
|
||||
@ -630,9 +631,11 @@
|
||||
#define USB_DEVICE_ID_LENOVO_CUSBKBD 0x6047
|
||||
#define USB_DEVICE_ID_LENOVO_CBTKBD 0x6048
|
||||
#define USB_DEVICE_ID_LENOVO_TPPRODOCK 0x6067
|
||||
#define USB_DEVICE_ID_LENOVO_X1_COVER 0x6085
|
||||
|
||||
#define USB_VENDOR_ID_LG 0x1fd2
|
||||
#define USB_DEVICE_ID_LG_MULTITOUCH 0x0064
|
||||
#define USB_DEVICE_ID_LG_MELFAS_MT 0x6007
|
||||
|
||||
#define USB_VENDOR_ID_LOGITECH 0x046d
|
||||
#define USB_DEVICE_ID_LOGITECH_AUDIOHUB 0x0a0e
|
||||
@ -725,12 +728,6 @@
|
||||
#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
|
||||
#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
|
||||
#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
|
||||
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc
|
||||
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2
|
||||
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
|
||||
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e4
|
||||
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8
|
||||
#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9
|
||||
#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
|
||||
|
||||
#define USB_VENDOR_ID_MOJO 0x8282
|
||||
|
||||
@ -6,12 +6,14 @@
|
||||
*
|
||||
* Tested with:
|
||||
* 0079:1801 "DragonRise Inc. Mayflash PS3 Game Controller Adapter"
|
||||
* 0079:1803 "DragonRise Inc. Mayflash Wireless Sensor DolphinBar"
|
||||
* 0079:1843 "DragonRise Inc. Mayflash GameCube Game Controller Adapter"
|
||||
* 0079:1844 "DragonRise Inc. Mayflash GameCube Game Controller Adapter (v04)"
|
||||
*
|
||||
* The following adapters probably work too, but need to be tested:
|
||||
* 0079:1800 "DragonRise Inc. Mayflash WIIU Game Controller Adapter"
|
||||
* 0079:1843 "DragonRise Inc. Mayflash GameCube Game Controller Adapter"
|
||||
*
|
||||
* Copyright (c) 2016 Marcel Hasler <mahasler@gmail.com>
|
||||
* Copyright (c) 2016-2017 Marcel Hasler <mahasler@gmail.com>
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -125,8 +127,8 @@ static int mf_probe(struct hid_device *hid, const struct hid_device_id *id)
|
||||
|
||||
dev_dbg(&hid->dev, "Mayflash HID hardware probe...\n");
|
||||
|
||||
/* Split device into four inputs */
|
||||
hid->quirks |= HID_QUIRK_MULTI_INPUT;
|
||||
/* Apply quirks as needed */
|
||||
hid->quirks |= id->driver_data;
|
||||
|
||||
error = hid_parse(hid);
|
||||
if (error) {
|
||||
@ -151,7 +153,14 @@ static int mf_probe(struct hid_device *hid, const struct hid_device_id *id)
|
||||
}
|
||||
|
||||
static const struct hid_device_id mf_devices[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3), },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3),
|
||||
.driver_data = HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR),
|
||||
.driver_data = HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1),
|
||||
.driver_data = HID_QUIRK_MULTI_INPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE2),
|
||||
.driver_data = 0 }, /* No quirk required */
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(hid, mf_devices);
|
||||
|
||||
@ -274,18 +274,6 @@ static const struct hid_device_id ms_devices[] = {
|
||||
.driver_data = MS_NOGET },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),
|
||||
.driver_data = MS_DUPLICATE_USAGES },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3),
|
||||
.driver_data = MS_HIDINPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2),
|
||||
.driver_data = MS_HIDINPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP),
|
||||
.driver_data = MS_HIDINPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4),
|
||||
.driver_data = MS_HIDINPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2),
|
||||
.driver_data = MS_HIDINPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP),
|
||||
.driver_data = MS_HIDINPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER),
|
||||
.driver_data = MS_HIDINPUT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
|
||||
|
||||
@ -68,6 +68,7 @@ MODULE_LICENSE("GPL");
|
||||
#define MT_QUIRK_HOVERING (1 << 11)
|
||||
#define MT_QUIRK_CONTACT_CNT_ACCURATE (1 << 12)
|
||||
#define MT_QUIRK_FORCE_GET_FEATURE (1 << 13)
|
||||
#define MT_QUIRK_FIX_CONST_CONTACT_ID (1 << 14)
|
||||
|
||||
#define MT_INPUTMODE_TOUCHSCREEN 0x02
|
||||
#define MT_INPUTMODE_TOUCHPAD 0x03
|
||||
@ -157,6 +158,7 @@ static void mt_post_parse(struct mt_device *td);
|
||||
#define MT_CLS_FLATFROG 0x0107
|
||||
#define MT_CLS_GENERALTOUCH_TWOFINGERS 0x0108
|
||||
#define MT_CLS_GENERALTOUCH_PWT_TENFINGERS 0x0109
|
||||
#define MT_CLS_LG 0x010a
|
||||
#define MT_CLS_VTL 0x0110
|
||||
|
||||
#define MT_DEFAULT_MAXCONTACT 10
|
||||
@ -263,6 +265,12 @@ static struct mt_class mt_classes[] = {
|
||||
.sn_move = 2048,
|
||||
.maxcontacts = 40,
|
||||
},
|
||||
{ .name = MT_CLS_LG,
|
||||
.quirks = MT_QUIRK_ALWAYS_VALID |
|
||||
MT_QUIRK_FIX_CONST_CONTACT_ID |
|
||||
MT_QUIRK_IGNORE_DUPLICATES |
|
||||
MT_QUIRK_HOVERING |
|
||||
MT_QUIRK_CONTACT_CNT_ACCURATE },
|
||||
{ .name = MT_CLS_VTL,
|
||||
.quirks = MT_QUIRK_ALWAYS_VALID |
|
||||
MT_QUIRK_CONTACT_CNT_ACCURATE |
|
||||
@ -1078,6 +1086,34 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void mt_fix_const_field(struct hid_field *field, unsigned int usage)
|
||||
{
|
||||
if (field->usage[0].hid != usage ||
|
||||
!(field->flags & HID_MAIN_ITEM_CONSTANT))
|
||||
return;
|
||||
|
||||
field->flags &= ~HID_MAIN_ITEM_CONSTANT;
|
||||
field->flags |= HID_MAIN_ITEM_VARIABLE;
|
||||
}
|
||||
|
||||
static void mt_fix_const_fields(struct hid_device *hdev, unsigned int usage)
|
||||
{
|
||||
struct hid_report *report;
|
||||
int i;
|
||||
|
||||
list_for_each_entry(report,
|
||||
&hdev->report_enum[HID_INPUT_REPORT].report_list,
|
||||
list) {
|
||||
|
||||
if (!report->maxfield)
|
||||
continue;
|
||||
|
||||
for (i = 0; i < report->maxfield; i++)
|
||||
if (report->field[i]->maxusage >= 1)
|
||||
mt_fix_const_field(report->field[i], usage);
|
||||
}
|
||||
}
|
||||
|
||||
static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret, i;
|
||||
@ -1151,6 +1187,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
if (mtclass->quirks & MT_QUIRK_FIX_CONST_CONTACT_ID)
|
||||
mt_fix_const_fields(hdev, HID_DG_CONTACTID);
|
||||
|
||||
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
|
||||
if (ret)
|
||||
return ret;
|
||||
@ -1398,6 +1437,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_ILITEK,
|
||||
USB_DEVICE_ID_ILITEK_MULTITOUCH) },
|
||||
|
||||
/* LG Melfas panel */
|
||||
{ .driver_data = MT_CLS_LG,
|
||||
HID_USB_DEVICE(USB_VENDOR_ID_LG,
|
||||
USB_DEVICE_ID_LG_MELFAS_MT) },
|
||||
|
||||
/* MosArt panels */
|
||||
{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
|
||||
MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -110,6 +110,14 @@
|
||||
#define IPC_ILUP_OFFS (0)
|
||||
#define IPC_ILUP_BIT (1<<IPC_ILUP_OFFS)
|
||||
|
||||
/*
|
||||
* ISH FW status bits in ISH FW Status Register
|
||||
*/
|
||||
#define IPC_ISH_FWSTS_SHIFT 12
|
||||
#define IPC_ISH_FWSTS_MASK GENMASK(15, 12)
|
||||
#define IPC_GET_ISH_FWSTS(status) \
|
||||
(((status) & IPC_ISH_FWSTS_MASK) >> IPC_ISH_FWSTS_SHIFT)
|
||||
|
||||
/*
|
||||
* FW status bits (relevant)
|
||||
*/
|
||||
|
||||
@ -61,6 +61,18 @@ struct ish_hw {
|
||||
void __iomem *mem_addr;
|
||||
};
|
||||
|
||||
/*
|
||||
* ISH FW status type
|
||||
*/
|
||||
enum {
|
||||
FWSTS_AFTER_RESET = 0,
|
||||
FWSTS_WAIT_FOR_HOST = 4,
|
||||
FWSTS_START_KERNEL_DMA = 5,
|
||||
FWSTS_FW_IS_RUNNING = 7,
|
||||
FWSTS_SENSOR_APP_LOADED = 8,
|
||||
FWSTS_SENSOR_APP_RUNNING = 15
|
||||
};
|
||||
|
||||
#define to_ish_hw(dev) (struct ish_hw *)((dev)->hw)
|
||||
|
||||
irqreturn_t ish_irq_handler(int irq, void *dev_id);
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
#include <linux/sched.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/miscdevice.h>
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include <trace/events/intel_ish.h>
|
||||
#include "ishtp-dev.h"
|
||||
@ -47,7 +46,8 @@ MODULE_DEVICE_TABLE(pci, ish_pci_tbl);
|
||||
*
|
||||
* Callback to direct log messages to Linux trace buffers
|
||||
*/
|
||||
static void ish_event_tracer(struct ishtp_device *dev, char *format, ...)
|
||||
static __printf(2, 3)
|
||||
void ish_event_tracer(struct ishtp_device *dev, const char *format, ...)
|
||||
{
|
||||
if (trace_ishtp_dump_enabled()) {
|
||||
va_list args;
|
||||
@ -205,12 +205,15 @@ static void ish_remove(struct pci_dev *pdev)
|
||||
#ifdef CONFIG_PM
|
||||
static struct device *ish_resume_device;
|
||||
|
||||
/* 50ms to get resume response */
|
||||
#define WAIT_FOR_RESUME_ACK_MS 50
|
||||
|
||||
/**
|
||||
* ish_resume_handler() - Work function to complete resume
|
||||
* @work: work struct
|
||||
*
|
||||
* The resume work function to complete resume function asynchronously.
|
||||
* There are two types of platforms, one where ISH is not powered off,
|
||||
* There are two resume paths, one where ISH is not powered off,
|
||||
* in that case a simple resume message is enough, others we need
|
||||
* a reset sequence.
|
||||
*/
|
||||
@ -218,20 +221,31 @@ static void ish_resume_handler(struct work_struct *work)
|
||||
{
|
||||
struct pci_dev *pdev = to_pci_dev(ish_resume_device);
|
||||
struct ishtp_device *dev = pci_get_drvdata(pdev);
|
||||
uint32_t fwsts;
|
||||
int ret;
|
||||
|
||||
ishtp_send_resume(dev);
|
||||
|
||||
/* 50 ms to get resume response */
|
||||
if (dev->resume_flag)
|
||||
ret = wait_event_interruptible_timeout(dev->resume_wait,
|
||||
!dev->resume_flag,
|
||||
msecs_to_jiffies(50));
|
||||
/* Get ISH FW status */
|
||||
fwsts = IPC_GET_ISH_FWSTS(dev->ops->get_fw_status(dev));
|
||||
|
||||
/*
|
||||
* If no resume response. This platform is not S0ix compatible
|
||||
* So on resume full reboot of ISH processor will happen, so
|
||||
* need to go through init sequence again
|
||||
* If currently, in ISH FW, sensor app is loaded or beyond that,
|
||||
* it means ISH isn't powered off, in this case, send a resume message.
|
||||
*/
|
||||
if (fwsts >= FWSTS_SENSOR_APP_LOADED) {
|
||||
ishtp_send_resume(dev);
|
||||
|
||||
/* Waiting to get resume response */
|
||||
if (dev->resume_flag)
|
||||
ret = wait_event_interruptible_timeout(dev->resume_wait,
|
||||
!dev->resume_flag,
|
||||
msecs_to_jiffies(WAIT_FOR_RESUME_ACK_MS));
|
||||
}
|
||||
|
||||
/*
|
||||
* If in ISH FW, sensor app isn't loaded yet, or no resume response.
|
||||
* That means this platform is not S0ix compatible, or something is
|
||||
* wrong with ISH FW. So on resume, full reboot of ISH processor will
|
||||
* happen, so need to go through init sequence again.
|
||||
*/
|
||||
if (dev->resume_flag)
|
||||
ish_init(dev);
|
||||
|
||||
@ -208,7 +208,7 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,
|
||||
hid->version = le16_to_cpu(ISH_HID_VERSION);
|
||||
hid->vendor = le16_to_cpu(ISH_HID_VENDOR);
|
||||
hid->product = le16_to_cpu(ISH_HID_PRODUCT);
|
||||
snprintf(hid->name, sizeof(hid->name), "%s %04hX:%04hX", "hid-ishtp",
|
||||
snprintf(hid->name, sizeof(hid->name), "%s %04X:%04X", "hid-ishtp",
|
||||
hid->vendor, hid->product);
|
||||
|
||||
rv = hid_add_device(hid);
|
||||
|
||||
@ -358,7 +358,7 @@ static void ishtp_cl_dev_release(struct device *dev)
|
||||
kfree(to_ishtp_cl_device(dev));
|
||||
}
|
||||
|
||||
static struct device_type ishtp_cl_device_type = {
|
||||
static const struct device_type ishtp_cl_device_type = {
|
||||
.release = ishtp_cl_dev_release,
|
||||
};
|
||||
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
#include <linux/sched.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/miscdevice.h>
|
||||
#include "ishtp-dev.h"
|
||||
#include "hbm.h"
|
||||
#include "client.h"
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
#include <linux/export.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/miscdevice.h>
|
||||
#include "ishtp-dev.h"
|
||||
#include "hbm.h"
|
||||
#include "client.h"
|
||||
|
||||
@ -238,7 +238,8 @@ struct ishtp_device {
|
||||
uint64_t ishtp_host_dma_rx_buf_phys;
|
||||
|
||||
/* Dump to trace buffers if enabled*/
|
||||
void (*print_log)(struct ishtp_device *dev, char *format, ...);
|
||||
__printf(2, 3) void (*print_log)(struct ishtp_device *dev,
|
||||
const char *format, ...);
|
||||
|
||||
/* Debug stats */
|
||||
unsigned int ipc_rx_cnt;
|
||||
|
||||
@ -43,7 +43,6 @@
|
||||
*/
|
||||
|
||||
#define DRIVER_DESC "USB HID core driver"
|
||||
#define DRIVER_LICENSE "GPL"
|
||||
|
||||
/*
|
||||
* Module parameters.
|
||||
@ -1660,4 +1659,4 @@ MODULE_AUTHOR("Andreas Gal");
|
||||
MODULE_AUTHOR("Vojtech Pavlik");
|
||||
MODULE_AUTHOR("Jiri Kosina");
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE(DRIVER_LICENSE);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@ -85,7 +85,7 @@ static const struct hid_blacklist {
|
||||
{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
|
||||
{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3, HID_QUIRK_MULTI_INPUT },
|
||||
{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR, HID_QUIRK_MULTI_INPUT },
|
||||
{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE, HID_QUIRK_MULTI_INPUT },
|
||||
{ USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1, HID_QUIRK_MULTI_INPUT },
|
||||
{ USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },
|
||||
{ USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
|
||||
{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
|
||||
@ -103,12 +103,6 @@ static const struct hid_blacklist {
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },
|
||||
@ -297,7 +291,7 @@ static void usbhid_remove_all_dquirks(void)
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* usbhid_quirks_init: apply USB HID quirks specified at module load time
|
||||
*/
|
||||
int usbhid_quirks_init(char **quirks_param)
|
||||
@ -361,7 +355,7 @@ static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor,
|
||||
|
||||
if (bl_entry != NULL)
|
||||
dbg_hid("Found squirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n",
|
||||
bl_entry->quirks, bl_entry->idVendor,
|
||||
bl_entry->quirks, bl_entry->idVendor,
|
||||
bl_entry->idProduct);
|
||||
return bl_entry;
|
||||
}
|
||||
|
||||
@ -39,11 +39,10 @@
|
||||
#define DRIVER_VERSION ""
|
||||
#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
|
||||
#define DRIVER_DESC "USB HID Boot Protocol keyboard driver"
|
||||
#define DRIVER_LICENSE "GPL"
|
||||
|
||||
MODULE_AUTHOR(DRIVER_AUTHOR);
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE(DRIVER_LICENSE);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static const unsigned char usb_kbd_keycode[256] = {
|
||||
0, 0, 0, 0, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38,
|
||||
|
||||
@ -42,11 +42,10 @@
|
||||
#define DRIVER_VERSION "v1.6"
|
||||
#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
|
||||
#define DRIVER_DESC "USB HID Boot Protocol mouse driver"
|
||||
#define DRIVER_LICENSE "GPL"
|
||||
|
||||
MODULE_AUTHOR(DRIVER_AUTHOR);
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE(DRIVER_LICENSE);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
struct usb_mouse {
|
||||
char name[128];
|
||||
|
||||
@ -102,7 +102,6 @@
|
||||
#define DRIVER_VERSION "v2.00"
|
||||
#define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
|
||||
#define DRIVER_DESC "USB Wacom tablet driver"
|
||||
#define DRIVER_LICENSE "GPL"
|
||||
|
||||
#define USB_VENDOR_ID_WACOM 0x056a
|
||||
#define USB_VENDOR_ID_LENOVO 0x17ef
|
||||
@ -166,7 +165,9 @@ struct wacom {
|
||||
struct work_struct wireless_work;
|
||||
struct work_struct battery_work;
|
||||
struct work_struct remote_work;
|
||||
struct delayed_work init_work;
|
||||
struct wacom_remote *remote;
|
||||
bool generic_has_leds;
|
||||
struct wacom_leds {
|
||||
struct wacom_group_leds *groups;
|
||||
unsigned int count;
|
||||
@ -218,4 +219,6 @@ enum led_brightness wacom_leds_brightness_get(struct wacom_led *led);
|
||||
struct wacom_led *wacom_led_find(struct wacom *wacom, unsigned int group,
|
||||
unsigned int id);
|
||||
struct wacom_led *wacom_led_next(struct wacom *wacom, struct wacom_led *cur);
|
||||
int wacom_equivalent_usage(int usage);
|
||||
int wacom_initialize_leds(struct wacom *wacom);
|
||||
#endif
|
||||
|
||||
@ -16,15 +16,7 @@
|
||||
#include <linux/input/mt.h>
|
||||
|
||||
#define WAC_MSG_RETRIES 5
|
||||
|
||||
#define WAC_CMD_WL_LED_CONTROL 0x03
|
||||
#define WAC_CMD_LED_CONTROL 0x20
|
||||
#define WAC_CMD_ICON_START 0x21
|
||||
#define WAC_CMD_ICON_XFER 0x23
|
||||
#define WAC_CMD_ICON_BT_XFER 0x26
|
||||
#define WAC_CMD_RETRIES 10
|
||||
#define WAC_CMD_DELETE_PAIRING 0x20
|
||||
#define WAC_CMD_UNPAIR_ALL 0xFF
|
||||
|
||||
#define DEV_ATTR_RW_PERM (S_IRUGO | S_IWUSR | S_IWGRP)
|
||||
#define DEV_ATTR_WO_PERM (S_IWUSR | S_IWGRP)
|
||||
@ -120,11 +112,12 @@ static void wacom_feature_mapping(struct hid_device *hdev,
|
||||
struct wacom *wacom = hid_get_drvdata(hdev);
|
||||
struct wacom_features *features = &wacom->wacom_wac.features;
|
||||
struct hid_data *hid_data = &wacom->wacom_wac.hid_data;
|
||||
unsigned int equivalent_usage = wacom_equivalent_usage(usage->hid);
|
||||
u8 *data;
|
||||
int ret;
|
||||
int n;
|
||||
|
||||
switch (usage->hid) {
|
||||
switch (equivalent_usage) {
|
||||
case HID_DG_CONTACTMAX:
|
||||
/* leave touch_max as is if predefined */
|
||||
if (!features->touch_max) {
|
||||
@ -333,8 +326,14 @@ static void wacom_post_parse_hid(struct hid_device *hdev,
|
||||
if (features->type == HID_GENERIC) {
|
||||
/* Any last-minute generic device setup */
|
||||
if (features->touch_max > 1) {
|
||||
input_mt_init_slots(wacom_wac->touch_input, wacom_wac->features.touch_max,
|
||||
INPUT_MT_DIRECT);
|
||||
if (features->device_type & WACOM_DEVICETYPE_DIRECT)
|
||||
input_mt_init_slots(wacom_wac->touch_input,
|
||||
wacom_wac->features.touch_max,
|
||||
INPUT_MT_DIRECT);
|
||||
else
|
||||
input_mt_init_slots(wacom_wac->touch_input,
|
||||
wacom_wac->features.touch_max,
|
||||
INPUT_MT_POINTER);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -497,11 +496,11 @@ static int wacom_bt_query_tablet_data(struct hid_device *hdev, u8 speed,
|
||||
* from the tablet, it is necessary to switch the tablet out of this
|
||||
* mode and into one which sends the full range of tablet data.
|
||||
*/
|
||||
static int wacom_query_tablet_data(struct hid_device *hdev,
|
||||
struct wacom_features *features)
|
||||
static int _wacom_query_tablet_data(struct wacom *wacom)
|
||||
{
|
||||
struct wacom *wacom = hid_get_drvdata(hdev);
|
||||
struct hid_device *hdev = wacom->hdev;
|
||||
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
|
||||
struct wacom_features *features = &wacom_wac->features;
|
||||
|
||||
if (hdev->bus == BUS_BLUETOOTH)
|
||||
return wacom_bt_query_tablet_data(hdev, 1, features);
|
||||
@ -757,9 +756,6 @@ static int wacom_led_control(struct wacom *wacom)
|
||||
unsigned char report_id = WAC_CMD_LED_CONTROL;
|
||||
int buf_size = 9;
|
||||
|
||||
if (!hid_get_drvdata(wacom->hdev))
|
||||
return -ENODEV;
|
||||
|
||||
if (!wacom->led.groups)
|
||||
return -ENOTSUPP;
|
||||
|
||||
@ -767,12 +763,21 @@ static int wacom_led_control(struct wacom *wacom)
|
||||
report_id = WAC_CMD_WL_LED_CONTROL;
|
||||
buf_size = 13;
|
||||
}
|
||||
else if (wacom->wacom_wac.features.type == INTUOSP2_BT) {
|
||||
report_id = WAC_CMD_WL_INTUOSP2;
|
||||
buf_size = 51;
|
||||
}
|
||||
buf = kzalloc(buf_size, GFP_KERNEL);
|
||||
if (!buf)
|
||||
return -ENOMEM;
|
||||
|
||||
if (wacom->wacom_wac.features.type >= INTUOS5S &&
|
||||
wacom->wacom_wac.features.type <= INTUOSPL) {
|
||||
if (wacom->wacom_wac.features.type == HID_GENERIC) {
|
||||
buf[0] = WAC_CMD_LED_CONTROL_GENERIC;
|
||||
buf[1] = wacom->led.llv;
|
||||
buf[2] = wacom->led.groups[0].select & 0x03;
|
||||
|
||||
} else if ((wacom->wacom_wac.features.type >= INTUOS5S &&
|
||||
wacom->wacom_wac.features.type <= INTUOSPL)) {
|
||||
/*
|
||||
* Touch Ring and crop mark LED luminance may take on
|
||||
* one of four values:
|
||||
@ -792,6 +797,16 @@ static int wacom_led_control(struct wacom *wacom)
|
||||
} else
|
||||
buf[1] = led_bits;
|
||||
}
|
||||
else if (wacom->wacom_wac.features.type == INTUOSP2_BT) {
|
||||
buf[0] = report_id;
|
||||
buf[4] = 100; // Power Connection LED (ORANGE)
|
||||
buf[5] = 100; // BT Connection LED (BLUE)
|
||||
buf[6] = 100; // Paper Mode (RED?)
|
||||
buf[7] = 100; // Paper Mode (GREEN?)
|
||||
buf[8] = 100; // Paper Mode (BLUE?)
|
||||
buf[9] = wacom->led.llv;
|
||||
buf[10] = wacom->led.groups[0].select & 0x03;
|
||||
}
|
||||
else {
|
||||
int led = wacom->led.groups[0].select | 0x4;
|
||||
|
||||
@ -1032,6 +1047,17 @@ static struct attribute_group intuos5_led_attr_group = {
|
||||
.attrs = intuos5_led_attrs,
|
||||
};
|
||||
|
||||
static struct attribute *generic_led_attrs[] = {
|
||||
&dev_attr_status0_luminance.attr,
|
||||
&dev_attr_status_led0_select.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static struct attribute_group generic_led_attr_group = {
|
||||
.name = "wacom_led",
|
||||
.attrs = generic_led_attrs,
|
||||
};
|
||||
|
||||
struct wacom_sysfs_group_devres {
|
||||
struct attribute_group *group;
|
||||
struct kobject *root;
|
||||
@ -1353,7 +1379,7 @@ static int wacom_leds_alloc_and_register(struct wacom *wacom, int group_count,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wacom_initialize_leds(struct wacom *wacom)
|
||||
int wacom_initialize_leds(struct wacom *wacom)
|
||||
{
|
||||
int error;
|
||||
|
||||
@ -1362,6 +1388,23 @@ static int wacom_initialize_leds(struct wacom *wacom)
|
||||
|
||||
/* Initialize default values */
|
||||
switch (wacom->wacom_wac.features.type) {
|
||||
case HID_GENERIC:
|
||||
if (!wacom->generic_has_leds)
|
||||
return 0;
|
||||
wacom->led.llv = 100;
|
||||
wacom->led.max_llv = 100;
|
||||
|
||||
error = wacom_leds_alloc_and_register(wacom, 1, 4, false);
|
||||
if (error) {
|
||||
hid_err(wacom->hdev,
|
||||
"cannot create leds err: %d\n", error);
|
||||
return error;
|
||||
}
|
||||
|
||||
error = wacom_devm_sysfs_create_group(wacom,
|
||||
&generic_led_attr_group);
|
||||
break;
|
||||
|
||||
case INTUOS4S:
|
||||
case INTUOS4:
|
||||
case INTUOS4WL:
|
||||
@ -1420,6 +1463,17 @@ static int wacom_initialize_leds(struct wacom *wacom)
|
||||
&intuos5_led_attr_group);
|
||||
break;
|
||||
|
||||
case INTUOSP2_BT:
|
||||
wacom->led.llv = 50;
|
||||
wacom->led.max_llv = 100;
|
||||
error = wacom_leds_alloc_and_register(wacom, 1, 4, false);
|
||||
if (error) {
|
||||
hid_err(wacom->hdev,
|
||||
"cannot create leds err: %d\n", error);
|
||||
return error;
|
||||
}
|
||||
return 0;
|
||||
|
||||
case REMOTE:
|
||||
wacom->led.llv = 255;
|
||||
wacom->led.max_llv = 255;
|
||||
@ -1440,11 +1494,23 @@ static int wacom_initialize_leds(struct wacom *wacom)
|
||||
"cannot create sysfs group err: %d\n", error);
|
||||
return error;
|
||||
}
|
||||
wacom_led_control(wacom);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void wacom_init_work(struct work_struct *work)
|
||||
{
|
||||
struct wacom *wacom = container_of(work, struct wacom, init_work.work);
|
||||
|
||||
_wacom_query_tablet_data(wacom);
|
||||
wacom_led_control(wacom);
|
||||
}
|
||||
|
||||
static void wacom_query_tablet_data(struct wacom *wacom)
|
||||
{
|
||||
schedule_delayed_work(&wacom->init_work, msecs_to_jiffies(1000));
|
||||
}
|
||||
|
||||
static enum power_supply_property wacom_battery_props[] = {
|
||||
POWER_SUPPLY_PROP_MODEL_NAME,
|
||||
POWER_SUPPLY_PROP_PRESENT,
|
||||
@ -2020,6 +2086,24 @@ static void wacom_release_resources(struct wacom *wacom)
|
||||
wacom->wacom_wac.pad_input = NULL;
|
||||
}
|
||||
|
||||
static void wacom_set_shared_values(struct wacom_wac *wacom_wac)
|
||||
{
|
||||
if (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH) {
|
||||
wacom_wac->shared->type = wacom_wac->features.type;
|
||||
wacom_wac->shared->touch_input = wacom_wac->touch_input;
|
||||
}
|
||||
|
||||
if (wacom_wac->has_mute_touch_switch)
|
||||
wacom_wac->shared->has_mute_touch_switch = true;
|
||||
|
||||
if (wacom_wac->shared->has_mute_touch_switch &&
|
||||
wacom_wac->shared->touch_input) {
|
||||
set_bit(EV_SW, wacom_wac->shared->touch_input->evbit);
|
||||
input_set_capability(wacom_wac->shared->touch_input, EV_SW,
|
||||
SW_MUTE_DEVICE);
|
||||
}
|
||||
}
|
||||
|
||||
static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
|
||||
{
|
||||
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
|
||||
@ -2118,7 +2202,7 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
|
||||
|
||||
if (!wireless) {
|
||||
/* Note that if query fails it is not a hard failure */
|
||||
wacom_query_tablet_data(hdev, features);
|
||||
wacom_query_tablet_data(wacom);
|
||||
}
|
||||
|
||||
/* touch only Bamboo doesn't support pen */
|
||||
@ -2139,13 +2223,7 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
|
||||
if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR)
|
||||
error = hid_hw_open(hdev);
|
||||
|
||||
if ((wacom_wac->features.type == INTUOSHT ||
|
||||
wacom_wac->features.type == INTUOSHT2) &&
|
||||
(wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH)) {
|
||||
wacom_wac->shared->type = wacom_wac->features.type;
|
||||
wacom_wac->shared->touch_input = wacom_wac->touch_input;
|
||||
}
|
||||
|
||||
wacom_set_shared_values(wacom_wac);
|
||||
devres_close_group(&hdev->dev, wacom);
|
||||
|
||||
return 0;
|
||||
@ -2450,6 +2528,7 @@ static int wacom_probe(struct hid_device *hdev,
|
||||
wacom->usbdev = dev;
|
||||
wacom->intf = intf;
|
||||
mutex_init(&wacom->lock);
|
||||
INIT_DELAYED_WORK(&wacom->init_work, wacom_init_work);
|
||||
INIT_WORK(&wacom->wireless_work, wacom_wireless_work);
|
||||
INIT_WORK(&wacom->battery_work, wacom_battery_work);
|
||||
INIT_WORK(&wacom->remote_work, wacom_remote_work);
|
||||
@ -2491,12 +2570,17 @@ static void wacom_remove(struct hid_device *hdev)
|
||||
|
||||
hid_hw_stop(hdev);
|
||||
|
||||
cancel_delayed_work_sync(&wacom->init_work);
|
||||
cancel_work_sync(&wacom->wireless_work);
|
||||
cancel_work_sync(&wacom->battery_work);
|
||||
cancel_work_sync(&wacom->remote_work);
|
||||
if (hdev->bus == BUS_BLUETOOTH)
|
||||
device_remove_file(&hdev->dev, &dev_attr_speed);
|
||||
|
||||
/* make sure we don't trigger the LEDs */
|
||||
wacom_led_groups_release(wacom);
|
||||
wacom_release_resources(wacom);
|
||||
|
||||
hid_set_drvdata(hdev, NULL);
|
||||
}
|
||||
|
||||
@ -2504,12 +2588,11 @@ static void wacom_remove(struct hid_device *hdev)
|
||||
static int wacom_resume(struct hid_device *hdev)
|
||||
{
|
||||
struct wacom *wacom = hid_get_drvdata(hdev);
|
||||
struct wacom_features *features = &wacom->wacom_wac.features;
|
||||
|
||||
mutex_lock(&wacom->lock);
|
||||
|
||||
/* switch to wacom mode first */
|
||||
wacom_query_tablet_data(hdev, features);
|
||||
_wacom_query_tablet_data(wacom);
|
||||
wacom_led_control(wacom);
|
||||
|
||||
mutex_unlock(&wacom->lock);
|
||||
@ -2540,4 +2623,4 @@ module_hid_driver(wacom_driver);
|
||||
MODULE_VERSION(DRIVER_VERSION);
|
||||
MODULE_AUTHOR(DRIVER_AUTHOR);
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE(DRIVER_LICENSE);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@ -43,6 +43,8 @@ static void wacom_report_numbered_buttons(struct input_dev *input_dev,
|
||||
|
||||
static int wacom_numbered_button_to_key(int n);
|
||||
|
||||
static void wacom_update_led(struct wacom *wacom, int button_count, int mask,
|
||||
int group);
|
||||
/*
|
||||
* Percent of battery capacity for Graphire.
|
||||
* 8th value means AC online and show 100% capacity.
|
||||
@ -1192,6 +1194,166 @@ static int wacom_wac_finger_count_touches(struct wacom_wac *wacom)
|
||||
return count;
|
||||
}
|
||||
|
||||
static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
|
||||
{
|
||||
const int pen_frame_len = 14;
|
||||
const int pen_frames = 7;
|
||||
|
||||
struct input_dev *pen_input = wacom->pen_input;
|
||||
unsigned char *data = wacom->data;
|
||||
int i;
|
||||
|
||||
wacom->serial[0] = get_unaligned_le64(&data[99]);
|
||||
wacom->id[0] = get_unaligned_le16(&data[107]);
|
||||
if (wacom->serial[0] >> 52 == 1) {
|
||||
/* Add back in missing bits of ID for non-USI pens */
|
||||
wacom->id[0] |= (wacom->serial[0] >> 32) & 0xFFFFF;
|
||||
}
|
||||
wacom->tool[0] = wacom_intuos_get_tool_type(wacom_intuos_id_mangle(wacom->id[0]));
|
||||
|
||||
for (i = 0; i < pen_frames; i++) {
|
||||
unsigned char *frame = &data[i*pen_frame_len + 1];
|
||||
bool valid = frame[0] & 0x80;
|
||||
bool prox = frame[0] & 0x40;
|
||||
bool range = frame[0] & 0x20;
|
||||
|
||||
if (!valid)
|
||||
continue;
|
||||
|
||||
if (range) {
|
||||
input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1]));
|
||||
input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3]));
|
||||
input_report_abs(pen_input, ABS_TILT_X, frame[7]);
|
||||
input_report_abs(pen_input, ABS_TILT_Y, frame[8]);
|
||||
input_report_abs(pen_input, ABS_Z, get_unaligned_le16(&frame[9]));
|
||||
input_report_abs(pen_input, ABS_WHEEL, get_unaligned_le16(&frame[11]));
|
||||
}
|
||||
input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
|
||||
input_report_abs(pen_input, ABS_DISTANCE, range ? frame[13] : wacom->features.distance_max);
|
||||
|
||||
input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01);
|
||||
input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02);
|
||||
input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04);
|
||||
|
||||
input_report_key(pen_input, wacom->tool[0], prox);
|
||||
input_event(pen_input, EV_MSC, MSC_SERIAL, wacom->serial[0]);
|
||||
input_report_abs(pen_input, ABS_MISC,
|
||||
wacom_intuos_id_mangle(wacom->id[0])); /* report tool id */
|
||||
|
||||
wacom->shared->stylus_in_proximity = prox;
|
||||
|
||||
input_sync(pen_input);
|
||||
}
|
||||
}
|
||||
|
||||
static void wacom_intuos_pro2_bt_touch(struct wacom_wac *wacom)
|
||||
{
|
||||
const int finger_touch_len = 8;
|
||||
const int finger_frames = 4;
|
||||
const int finger_frame_len = 43;
|
||||
|
||||
struct input_dev *touch_input = wacom->touch_input;
|
||||
unsigned char *data = wacom->data;
|
||||
int num_contacts_left = 5;
|
||||
int i, j;
|
||||
|
||||
for (i = 0; i < finger_frames; i++) {
|
||||
unsigned char *frame = &data[i*finger_frame_len + 109];
|
||||
int current_num_contacts = frame[0] & 0x7F;
|
||||
int contacts_to_send;
|
||||
|
||||
if (!(frame[0] & 0x80))
|
||||
continue;
|
||||
|
||||
/*
|
||||
* First packet resets the counter since only the first
|
||||
* packet in series will have non-zero current_num_contacts.
|
||||
*/
|
||||
if (current_num_contacts)
|
||||
wacom->num_contacts_left = current_num_contacts;
|
||||
|
||||
contacts_to_send = min(num_contacts_left, wacom->num_contacts_left);
|
||||
|
||||
for (j = 0; j < contacts_to_send; j++) {
|
||||
unsigned char *touch = &frame[j*finger_touch_len + 1];
|
||||
int slot = input_mt_get_slot_by_key(touch_input, touch[0]);
|
||||
int x = get_unaligned_le16(&touch[2]);
|
||||
int y = get_unaligned_le16(&touch[4]);
|
||||
int w = touch[6] * input_abs_get_res(touch_input, ABS_MT_POSITION_X);
|
||||
int h = touch[7] * input_abs_get_res(touch_input, ABS_MT_POSITION_Y);
|
||||
|
||||
if (slot < 0)
|
||||
continue;
|
||||
|
||||
input_mt_slot(touch_input, slot);
|
||||
input_mt_report_slot_state(touch_input, MT_TOOL_FINGER, touch[1] & 0x01);
|
||||
input_report_abs(touch_input, ABS_MT_POSITION_X, x);
|
||||
input_report_abs(touch_input, ABS_MT_POSITION_Y, y);
|
||||
input_report_abs(touch_input, ABS_MT_TOUCH_MAJOR, max(w, h));
|
||||
input_report_abs(touch_input, ABS_MT_TOUCH_MINOR, min(w, h));
|
||||
input_report_abs(touch_input, ABS_MT_ORIENTATION, w > h);
|
||||
}
|
||||
|
||||
input_mt_sync_frame(touch_input);
|
||||
|
||||
wacom->num_contacts_left -= contacts_to_send;
|
||||
if (wacom->num_contacts_left <= 0) {
|
||||
wacom->num_contacts_left = 0;
|
||||
wacom->shared->touch_down = wacom_wac_finger_count_touches(wacom);
|
||||
}
|
||||
}
|
||||
|
||||
input_report_switch(touch_input, SW_MUTE_DEVICE, !(data[281] >> 7));
|
||||
input_sync(touch_input);
|
||||
}
|
||||
|
||||
static void wacom_intuos_pro2_bt_pad(struct wacom_wac *wacom)
|
||||
{
|
||||
struct input_dev *pad_input = wacom->pad_input;
|
||||
unsigned char *data = wacom->data;
|
||||
|
||||
int buttons = (data[282] << 1) | ((data[281] >> 6) & 0x01);
|
||||
int ring = data[285];
|
||||
int prox = buttons | (ring & 0x80);
|
||||
|
||||
wacom_report_numbered_buttons(pad_input, 9, buttons);
|
||||
|
||||
input_report_abs(pad_input, ABS_WHEEL, (ring & 0x80) ? (ring & 0x7f) : 0);
|
||||
|
||||
input_report_key(pad_input, wacom->tool[1], prox ? 1 : 0);
|
||||
input_report_abs(pad_input, ABS_MISC, prox ? PAD_DEVICE_ID : 0);
|
||||
input_event(pad_input, EV_MSC, MSC_SERIAL, 0xffffffff);
|
||||
|
||||
input_sync(pad_input);
|
||||
}
|
||||
|
||||
static void wacom_intuos_pro2_bt_battery(struct wacom_wac *wacom)
|
||||
{
|
||||
unsigned char *data = wacom->data;
|
||||
|
||||
bool chg = data[284] & 0x80;
|
||||
int battery_status = data[284] & 0x7F;
|
||||
|
||||
wacom_notify_battery(wacom, battery_status, chg, 1, chg);
|
||||
}
|
||||
|
||||
static int wacom_intuos_pro2_bt_irq(struct wacom_wac *wacom, size_t len)
|
||||
{
|
||||
unsigned char *data = wacom->data;
|
||||
|
||||
if (data[0] != 0x80) {
|
||||
dev_dbg(wacom->pen_input->dev.parent,
|
||||
"%s: received unknown report #%d\n", __func__, data[0]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
wacom_intuos_pro2_bt_pen(wacom);
|
||||
wacom_intuos_pro2_bt_touch(wacom);
|
||||
wacom_intuos_pro2_bt_pad(wacom);
|
||||
wacom_intuos_pro2_bt_battery(wacom);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wacom_24hdt_irq(struct wacom_wac *wacom)
|
||||
{
|
||||
struct input_dev *input = wacom->touch_input;
|
||||
@ -1446,7 +1608,7 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, size_t len)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int wacom_equivalent_usage(int usage)
|
||||
int wacom_equivalent_usage(int usage)
|
||||
{
|
||||
if ((usage & HID_USAGE_PAGE) == WACOM_HID_UP_WACOMDIGITIZER) {
|
||||
int subpage = (usage & 0xFF00) << 8;
|
||||
@ -1473,6 +1635,16 @@ static int wacom_equivalent_usage(int usage)
|
||||
return subpage | subusage;
|
||||
}
|
||||
|
||||
if ((usage & HID_USAGE_PAGE) == WACOM_HID_UP_WACOMTOUCH) {
|
||||
int subpage = (usage & 0xFF00) << 8;
|
||||
int subusage = (usage & 0xFF);
|
||||
|
||||
if (subpage == HID_UP_UNDEFINED)
|
||||
subpage = WACOM_HID_SP_DIGITIZER;
|
||||
|
||||
return subpage | subusage;
|
||||
}
|
||||
|
||||
return usage;
|
||||
}
|
||||
|
||||
@ -1552,12 +1724,14 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev,
|
||||
wacom_map_usage(input, usage, field, EV_ABS, ABS_Z, 0);
|
||||
features->device_type |= WACOM_DEVICETYPE_PAD;
|
||||
break;
|
||||
case WACOM_HID_WD_BUTTONCENTER:
|
||||
wacom->generic_has_leds = true;
|
||||
/* fall through */
|
||||
case WACOM_HID_WD_BUTTONHOME:
|
||||
case WACOM_HID_WD_BUTTONUP:
|
||||
case WACOM_HID_WD_BUTTONDOWN:
|
||||
case WACOM_HID_WD_BUTTONLEFT:
|
||||
case WACOM_HID_WD_BUTTONRIGHT:
|
||||
case WACOM_HID_WD_BUTTONCENTER:
|
||||
wacom_map_usage(input, usage, field, EV_KEY,
|
||||
wacom_numbered_button_to_key(features->numbered_buttons),
|
||||
0);
|
||||
@ -1565,7 +1739,17 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev,
|
||||
features->device_type |= WACOM_DEVICETYPE_PAD;
|
||||
break;
|
||||
case WACOM_HID_WD_TOUCHONOFF:
|
||||
wacom_map_usage(input, usage, field, EV_SW, SW_MUTE_DEVICE, 0);
|
||||
/*
|
||||
* This usage, which is used to mute touch events, comes
|
||||
* from the pad packet, but is reported on the touch
|
||||
* interface. Because the touch interface may not have
|
||||
* been created yet, we cannot call wacom_map_usage(). In
|
||||
* order to process this usage when we receive it, we set
|
||||
* the usage type and code directly.
|
||||
*/
|
||||
wacom_wac->has_mute_touch_switch = true;
|
||||
usage->type = EV_SW;
|
||||
usage->code = SW_MUTE_DEVICE;
|
||||
features->device_type |= WACOM_DEVICETYPE_PAD;
|
||||
break;
|
||||
case WACOM_HID_WD_TOUCHSTRIP:
|
||||
@ -1580,6 +1764,10 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev,
|
||||
wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0);
|
||||
features->device_type |= WACOM_DEVICETYPE_PAD;
|
||||
break;
|
||||
case WACOM_HID_WD_TOUCHRINGSTATUS:
|
||||
wacom_map_usage(input, usage, field, EV_ABS, ABS_WHEEL, 0);
|
||||
features->device_type |= WACOM_DEVICETYPE_PAD;
|
||||
break;
|
||||
}
|
||||
|
||||
switch (equivalent_usage & 0xfffffff0) {
|
||||
@ -1622,17 +1810,40 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field
|
||||
struct input_dev *input = wacom_wac->pad_input;
|
||||
struct wacom_features *features = &wacom_wac->features;
|
||||
unsigned equivalent_usage = wacom_equivalent_usage(usage->hid);
|
||||
int i;
|
||||
|
||||
/*
|
||||
* Avoid reporting this event and setting inrange_state if this usage
|
||||
* hasn't been mapped.
|
||||
*/
|
||||
if (!usage->type)
|
||||
return;
|
||||
|
||||
if (wacom_equivalent_usage(field->physical) == HID_DG_TABLETFUNCTIONKEY) {
|
||||
wacom_wac->hid_data.inrange_state |= value;
|
||||
if (usage->hid != WACOM_HID_WD_TOUCHRING)
|
||||
wacom_wac->hid_data.inrange_state |= value;
|
||||
}
|
||||
|
||||
switch (equivalent_usage) {
|
||||
case WACOM_HID_WD_TOUCHRINGSTATUS:
|
||||
if (!value)
|
||||
input_event(input, usage->type, usage->code, 0);
|
||||
break;
|
||||
|
||||
case WACOM_HID_WD_TOUCHONOFF:
|
||||
if (wacom_wac->shared->touch_input) {
|
||||
input_report_switch(wacom_wac->shared->touch_input,
|
||||
SW_MUTE_DEVICE, !value);
|
||||
input_sync(wacom_wac->shared->touch_input);
|
||||
}
|
||||
break;
|
||||
|
||||
case WACOM_HID_WD_BUTTONCENTER:
|
||||
for (i = 0; i < wacom->led.count; i++)
|
||||
wacom_update_led(wacom, features->numbered_buttons,
|
||||
value, i);
|
||||
/* fall through*/
|
||||
default:
|
||||
features->input_event_flag = true;
|
||||
input_event(input, usage->type, usage->code, value);
|
||||
break;
|
||||
}
|
||||
@ -1670,20 +1881,15 @@ static void wacom_wac_pad_report(struct hid_device *hdev,
|
||||
{
|
||||
struct wacom *wacom = hid_get_drvdata(hdev);
|
||||
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
|
||||
struct wacom_features *features = &wacom_wac->features;
|
||||
struct input_dev *input = wacom_wac->pad_input;
|
||||
bool active = wacom_wac->hid_data.inrange_state != 0;
|
||||
|
||||
/* report prox for expresskey events */
|
||||
if (wacom_equivalent_usage(report->field[0]->physical) == HID_DG_TABLETFUNCTIONKEY) {
|
||||
features->input_event_flag = true;
|
||||
input_event(input, EV_ABS, ABS_MISC, active ? PAD_DEVICE_ID : 0);
|
||||
}
|
||||
|
||||
if (features->input_event_flag) {
|
||||
features->input_event_flag = false;
|
||||
input_sync(input);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void wacom_wac_pen_usage_mapping(struct hid_device *hdev,
|
||||
@ -2058,8 +2264,10 @@ static void wacom_wac_finger_pre_report(struct hid_device *hdev,
|
||||
|
||||
for (j = 0; j < field->maxusage; j++) {
|
||||
struct hid_usage *usage = &field->usage[j];
|
||||
unsigned int equivalent_usage =
|
||||
wacom_equivalent_usage(usage->hid);
|
||||
|
||||
switch (usage->hid) {
|
||||
switch (equivalent_usage) {
|
||||
case HID_GD_X:
|
||||
case HID_GD_Y:
|
||||
case HID_DG_WIDTH:
|
||||
@ -2068,7 +2276,7 @@ static void wacom_wac_finger_pre_report(struct hid_device *hdev,
|
||||
case HID_DG_INRANGE:
|
||||
case HID_DG_INVERT:
|
||||
case HID_DG_TIPSWITCH:
|
||||
hid_data->last_slot_field = usage->hid;
|
||||
hid_data->last_slot_field = equivalent_usage;
|
||||
break;
|
||||
case HID_DG_CONTACTCOUNT:
|
||||
hid_data->cc_report = report->id;
|
||||
@ -2123,8 +2331,8 @@ void wacom_wac_usage_mapping(struct hid_device *hdev,
|
||||
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
|
||||
struct wacom_features *features = &wacom_wac->features;
|
||||
|
||||
/* currently, only direct devices have proper hid report descriptors */
|
||||
features->device_type |= WACOM_DEVICETYPE_DIRECT;
|
||||
if (WACOM_DIRECT_DEVICE(field))
|
||||
features->device_type |= WACOM_DEVICETYPE_DIRECT;
|
||||
|
||||
if (WACOM_PAD_FIELD(field))
|
||||
wacom_wac_pad_usage_mapping(hdev, field, usage);
|
||||
@ -2142,6 +2350,9 @@ void wacom_wac_event(struct hid_device *hdev, struct hid_field *field,
|
||||
if (wacom->wacom_wac.features.type != HID_GENERIC)
|
||||
return;
|
||||
|
||||
if (value > field->logical_maximum || value < field->logical_minimum)
|
||||
return;
|
||||
|
||||
if (WACOM_PAD_FIELD(field)) {
|
||||
wacom_wac_pad_battery_event(hdev, field, usage, value);
|
||||
if (wacom->wacom_wac.pad_input)
|
||||
@ -2669,6 +2880,10 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
|
||||
sync = wacom_intuos_irq(wacom_wac);
|
||||
break;
|
||||
|
||||
case INTUOSP2_BT:
|
||||
sync = wacom_intuos_pro2_bt_irq(wacom_wac, len);
|
||||
break;
|
||||
|
||||
case TABLETPC:
|
||||
case TABLETPCE:
|
||||
case TABLETPC2FG:
|
||||
@ -2779,8 +2994,6 @@ void wacom_setup_device_quirks(struct wacom *wacom)
|
||||
struct wacom_features *features = &wacom->wacom_wac.features;
|
||||
|
||||
/* The pen and pad share the same interface on most devices */
|
||||
if (features->numbered_buttons > 0)
|
||||
features->device_type |= WACOM_DEVICETYPE_PAD;
|
||||
if (features->type == GRAPHIRE_BT || features->type == WACOM_G4 ||
|
||||
features->type == DTUS ||
|
||||
(features->type >= INTUOS3S && features->type <= WACOM_MO)) {
|
||||
@ -2840,6 +3053,13 @@ void wacom_setup_device_quirks(struct wacom *wacom)
|
||||
if (features->type == REMOTE)
|
||||
features->device_type = WACOM_DEVICETYPE_PAD;
|
||||
|
||||
if (features->type == INTUOSP2_BT) {
|
||||
features->device_type |= WACOM_DEVICETYPE_PEN |
|
||||
WACOM_DEVICETYPE_PAD |
|
||||
WACOM_DEVICETYPE_TOUCH;
|
||||
features->quirks |= WACOM_QUIRK_BATTERY;
|
||||
}
|
||||
|
||||
switch (features->type) {
|
||||
case PL:
|
||||
case DTU:
|
||||
@ -2986,6 +3206,7 @@ int wacom_setup_pen_input_capabilities(struct input_dev *input_dev,
|
||||
case INTUOSPL:
|
||||
case INTUOS5S:
|
||||
case INTUOSPS:
|
||||
case INTUOSP2_BT:
|
||||
input_set_abs_params(input_dev, ABS_DISTANCE, 0,
|
||||
features->distance_max,
|
||||
features->distance_fuzz, 0);
|
||||
@ -3094,6 +3315,27 @@ int wacom_setup_touch_input_capabilities(struct input_dev *input_dev,
|
||||
}
|
||||
|
||||
switch (features->type) {
|
||||
case INTUOSP2_BT:
|
||||
input_dev->evbit[0] |= BIT_MASK(EV_SW);
|
||||
__set_bit(SW_MUTE_DEVICE, input_dev->swbit);
|
||||
|
||||
if (wacom_wac->shared->touch->product == 0x361) {
|
||||
input_set_abs_params(input_dev, ABS_MT_POSITION_X,
|
||||
0, 12440, 4, 0);
|
||||
input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
|
||||
0, 8640, 4, 0);
|
||||
}
|
||||
else if (wacom_wac->shared->touch->product == 0x360) {
|
||||
input_set_abs_params(input_dev, ABS_MT_POSITION_X,
|
||||
0, 8960, 4, 0);
|
||||
input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
|
||||
0, 5920, 4, 0);
|
||||
}
|
||||
input_abs_set_res(input_dev, ABS_MT_POSITION_X, 40);
|
||||
input_abs_set_res(input_dev, ABS_MT_POSITION_X, 40);
|
||||
|
||||
/* fall through */
|
||||
|
||||
case INTUOS5:
|
||||
case INTUOS5L:
|
||||
case INTUOSPM:
|
||||
@ -3290,6 +3532,9 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
|
||||
{
|
||||
struct wacom_features *features = &wacom_wac->features;
|
||||
|
||||
if ((features->type == HID_GENERIC) && features->numbered_buttons > 0)
|
||||
features->device_type |= WACOM_DEVICETYPE_PAD;
|
||||
|
||||
if (!(features->device_type & WACOM_DEVICETYPE_PAD))
|
||||
return -ENODEV;
|
||||
|
||||
@ -3391,6 +3636,7 @@ int wacom_setup_pad_input_capabilities(struct input_dev *input_dev,
|
||||
case INTUOSPL:
|
||||
case INTUOS5S:
|
||||
case INTUOSPS:
|
||||
case INTUOSP2_BT:
|
||||
input_set_abs_params(input_dev, ABS_WHEEL, 0, 71, 0, 0);
|
||||
break;
|
||||
|
||||
@ -3949,6 +4195,12 @@ static const struct wacom_features wacom_features_0x343 =
|
||||
DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4,
|
||||
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET,
|
||||
WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
|
||||
static const struct wacom_features wacom_features_0x360 =
|
||||
{ "Wacom Intuos Pro M", 44800, 29600, 8191, 63,
|
||||
INTUOSP2_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 9, .touch_max = 10 };
|
||||
static const struct wacom_features wacom_features_0x361 =
|
||||
{ "Wacom Intuos Pro L", 62200, 43200, 8191, 63,
|
||||
INTUOSP2_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 9, .touch_max = 10 };
|
||||
|
||||
static const struct wacom_features wacom_features_HID_ANY_ID =
|
||||
{ "Wacom HID", .type = HID_GENERIC, .oVid = HID_ANY_ID, .oPid = HID_ANY_ID };
|
||||
@ -4115,6 +4367,8 @@ const struct hid_device_id wacom_ids[] = {
|
||||
{ USB_DEVICE_WACOM(0x33D) },
|
||||
{ USB_DEVICE_WACOM(0x33E) },
|
||||
{ USB_DEVICE_WACOM(0x343) },
|
||||
{ BT_DEVICE_WACOM(0x360) },
|
||||
{ BT_DEVICE_WACOM(0x361) },
|
||||
{ USB_DEVICE_WACOM(0x4001) },
|
||||
{ USB_DEVICE_WACOM(0x4004) },
|
||||
{ USB_DEVICE_WACOM(0x5000) },
|
||||
@ -4123,6 +4377,7 @@ const struct hid_device_id wacom_ids[] = {
|
||||
|
||||
{ USB_DEVICE_WACOM(HID_ANY_ID) },
|
||||
{ I2C_DEVICE_WACOM(HID_ANY_ID) },
|
||||
{ BT_DEVICE_WACOM(HID_ANY_ID) },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(hid, wacom_ids);
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/hid.h>
|
||||
|
||||
/* maximum packet length for USB devices */
|
||||
#define WACOM_PKGLEN_MAX 192
|
||||
/* maximum packet length for USB/BT devices */
|
||||
#define WACOM_PKGLEN_MAX 361
|
||||
|
||||
#define WACOM_NAME_MAX 64
|
||||
#define WACOM_MAX_REMOTES 5
|
||||
@ -72,6 +72,17 @@
|
||||
#define WACOM_REPORT_REMOTE 17
|
||||
#define WACOM_REPORT_INTUOSHT2_ID 8
|
||||
|
||||
/* wacom command report ids */
|
||||
#define WAC_CMD_WL_LED_CONTROL 0x03
|
||||
#define WAC_CMD_LED_CONTROL 0x20
|
||||
#define WAC_CMD_ICON_START 0x21
|
||||
#define WAC_CMD_ICON_XFER 0x23
|
||||
#define WAC_CMD_ICON_BT_XFER 0x26
|
||||
#define WAC_CMD_DELETE_PAIRING 0x20
|
||||
#define WAC_CMD_LED_CONTROL_GENERIC 0x32
|
||||
#define WAC_CMD_UNPAIR_ALL 0xFF
|
||||
#define WAC_CMD_WL_INTUOSP2 0x82
|
||||
|
||||
/* device quirks */
|
||||
#define WACOM_QUIRK_BBTOUCH_LOWRES 0x0001
|
||||
#define WACOM_QUIRK_SENSE 0x0002
|
||||
@ -91,6 +102,7 @@
|
||||
#define WACOM_HID_SP_DIGITIZER 0x000d0000
|
||||
#define WACOM_HID_SP_DIGITIZERINFO 0x00100000
|
||||
#define WACOM_HID_WD_DIGITIZER (WACOM_HID_UP_WACOMDIGITIZER | 0x01)
|
||||
#define WACOM_HID_WD_PEN (WACOM_HID_UP_WACOMDIGITIZER | 0x02)
|
||||
#define WACOM_HID_WD_SENSE (WACOM_HID_UP_WACOMDIGITIZER | 0x36)
|
||||
#define WACOM_HID_WD_DIGITIZERFNKEYS (WACOM_HID_UP_WACOMDIGITIZER | 0x39)
|
||||
#define WACOM_HID_WD_SERIALHI (WACOM_HID_UP_WACOMDIGITIZER | 0x5c)
|
||||
@ -104,6 +116,7 @@
|
||||
#define WACOM_HID_WD_ACCELEROMETER_Y (WACOM_HID_UP_WACOMDIGITIZER | 0x0402)
|
||||
#define WACOM_HID_WD_ACCELEROMETER_Z (WACOM_HID_UP_WACOMDIGITIZER | 0x0403)
|
||||
#define WACOM_HID_WD_BATTERY_CHARGING (WACOM_HID_UP_WACOMDIGITIZER | 0x0404)
|
||||
#define WACOM_HID_WD_TOUCHONOFF (WACOM_HID_UP_WACOMDIGITIZER | 0x0454)
|
||||
#define WACOM_HID_WD_BATTERY_LEVEL (WACOM_HID_UP_WACOMDIGITIZER | 0x043b)
|
||||
#define WACOM_HID_WD_EXPRESSKEY00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0910)
|
||||
#define WACOM_HID_WD_EXPRESSKEYCAP00 (WACOM_HID_UP_WACOMDIGITIZER | 0x0950)
|
||||
@ -113,7 +126,6 @@
|
||||
#define WACOM_HID_WD_BUTTONLEFT (WACOM_HID_UP_WACOMDIGITIZER | 0x0993)
|
||||
#define WACOM_HID_WD_BUTTONRIGHT (WACOM_HID_UP_WACOMDIGITIZER | 0x0994)
|
||||
#define WACOM_HID_WD_BUTTONCENTER (WACOM_HID_UP_WACOMDIGITIZER | 0x0995)
|
||||
#define WACOM_HID_WD_TOUCHONOFF (WACOM_HID_UP_WACOMDIGITIZER | 0x0996)
|
||||
#define WACOM_HID_WD_FINGERWHEEL (WACOM_HID_UP_WACOMDIGITIZER | 0x0d03)
|
||||
#define WACOM_HID_WD_OFFSETLEFT (WACOM_HID_UP_WACOMDIGITIZER | 0x0d30)
|
||||
#define WACOM_HID_WD_OFFSETTOP (WACOM_HID_UP_WACOMDIGITIZER | 0x0d31)
|
||||
@ -127,6 +139,12 @@
|
||||
#define WACOM_HID_UP_G11 0xff110000
|
||||
#define WACOM_HID_G11_PEN (WACOM_HID_UP_G11 | 0x02)
|
||||
#define WACOM_HID_G11_TOUCHSCREEN (WACOM_HID_UP_G11 | 0x11)
|
||||
#define WACOM_HID_UP_WACOMTOUCH 0xff000000
|
||||
#define WACOM_HID_WT_TOUCHSCREEN (WACOM_HID_UP_WACOMTOUCH | 0x04)
|
||||
#define WACOM_HID_WT_TOUCHPAD (WACOM_HID_UP_WACOMTOUCH | 0x05)
|
||||
#define WACOM_HID_WT_CONTACTMAX (WACOM_HID_UP_WACOMTOUCH | 0x55)
|
||||
#define WACOM_HID_WT_X (WACOM_HID_UP_WACOMTOUCH | 0x130)
|
||||
#define WACOM_HID_WT_Y (WACOM_HID_UP_WACOMTOUCH | 0x131)
|
||||
|
||||
#define WACOM_PAD_FIELD(f) (((f)->physical == HID_DG_TABLETFUNCTIONKEY) || \
|
||||
((f)->physical == WACOM_HID_WD_DIGITIZERFNKEYS) || \
|
||||
@ -144,7 +162,14 @@
|
||||
((f)->physical == HID_DG_FINGER) || \
|
||||
((f)->application == HID_DG_TOUCHSCREEN) || \
|
||||
((f)->application == WACOM_HID_G9_TOUCHSCREEN) || \
|
||||
((f)->application == WACOM_HID_G11_TOUCHSCREEN))
|
||||
((f)->application == WACOM_HID_G11_TOUCHSCREEN) || \
|
||||
((f)->application == WACOM_HID_WT_TOUCHPAD) || \
|
||||
((f)->application == HID_DG_TOUCHPAD))
|
||||
|
||||
#define WACOM_DIRECT_DEVICE(f) (((f)->application == HID_DG_TOUCHSCREEN) || \
|
||||
((f)->application == WACOM_HID_WT_TOUCHSCREEN) || \
|
||||
((f)->application == HID_DG_PEN) || \
|
||||
((f)->application == WACOM_HID_WD_PEN))
|
||||
|
||||
enum {
|
||||
PENPARTNER = 0,
|
||||
@ -170,6 +195,7 @@ enum {
|
||||
INTUOSPS,
|
||||
INTUOSPM,
|
||||
INTUOSPL,
|
||||
INTUOSP2_BT,
|
||||
WACOM_21UX2,
|
||||
WACOM_22HD,
|
||||
DTK,
|
||||
@ -232,7 +258,6 @@ struct wacom_features {
|
||||
int pktlen;
|
||||
bool check_for_hid_type;
|
||||
int hid_type;
|
||||
bool input_event_flag;
|
||||
};
|
||||
|
||||
struct wacom_shared {
|
||||
@ -244,6 +269,7 @@ struct wacom_shared {
|
||||
struct input_dev *touch_input;
|
||||
struct hid_device *pen;
|
||||
struct hid_device *touch;
|
||||
bool has_mute_touch_switch;
|
||||
};
|
||||
|
||||
struct hid_data {
|
||||
@ -300,6 +326,7 @@ struct wacom_wac {
|
||||
int mode_report;
|
||||
int mode_value;
|
||||
struct hid_data hid_data;
|
||||
bool has_mute_touch_switch;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user