Merge branch 'for-4.7/wacom' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:42:27 +0000 (12:42 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 17 May 2016 10:42:27 +0000 (12:42 +0200)
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-asus.c [new file with mode: 0644]
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-roccat.c
drivers/hid/hid-thingm.c
drivers/hid/hidraw.c
drivers/hid/usbhid/hid-quirks.c
drivers/hid/wacom_wac.c

index 411722570035b0c2d3375991e82008c0d61a08fc..5646ca4b95de1cc616be21e163374f1473d41478 100644 (file)
@@ -134,6 +134,16 @@ config HID_APPLEIR
 
        Say Y here if you want support for Apple infrared remote control.
 
+config HID_ASUS
+       tristate "Asus"
+       depends on I2C_HID
+       ---help---
+       Support for Asus notebook built-in keyboard via i2c.
+
+       Supported devices:
+       - EeeBook X205TA
+       - VivoBook E200HA
+
 config HID_AUREAL
        tristate "Aureal"
        depends on HID
index be56ab6f75a87c063229cb7bd39b5028c7d11ed9..a2fb562de7489f868a1c39f7f0eedcab6a9063a7 100644 (file)
@@ -24,6 +24,7 @@ obj-$(CONFIG_HID_A4TECH)      += hid-a4tech.o
 obj-$(CONFIG_HID_ACRUX)                += hid-axff.o
 obj-$(CONFIG_HID_APPLE)                += hid-apple.o
 obj-$(CONFIG_HID_APPLEIR)      += hid-appleir.o
+obj-$(CONFIG_HID_ASUS)         += hid-asus.o
 obj-$(CONFIG_HID_AUREAL)       += hid-aureal.o
 obj-$(CONFIG_HID_BELKIN)       += hid-belkin.o
 obj-$(CONFIG_HID_BETOP_FF)     += hid-betopff.o
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
new file mode 100644 (file)
index 0000000..7a811ec
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ *  HID driver for Asus notebook built-in keyboard.
+ *  Fixes small logical maximum to match usage maximum.
+ *
+ *  Currently supported devices are:
+ *    EeeBook X205TA
+ *    VivoBook E200HA
+ *
+ *  Copyright (c) 2016 Yusuke Fujimaki <usk.fujimaki@gmail.com>
+ *
+ *  This module based on hid-ortek by
+ *  Copyright (c) 2010 Johnathon Harris <jmharris@gmail.com>
+ *  Copyright (c) 2011 Jiri Kosina
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+#include <linux/device.h>
+#include <linux/hid.h>
+#include <linux/module.h>
+
+#include "hid-ids.h"
+
+static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+               unsigned int *rsize)
+{
+       if (*rsize >= 56 && rdesc[54] == 0x25 && rdesc[55] == 0x65) {
+               hid_info(hdev, "Fixing up Asus notebook report descriptor\n");
+               rdesc[55] = 0xdd;
+       }
+       return rdesc;
+}
+
+static const struct hid_device_id asus_devices[] = {
+       { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD) },
+       { }
+};
+MODULE_DEVICE_TABLE(hid, asus_devices);
+
+static struct hid_driver asus_driver = {
+       .name = "asus",
+       .id_table = asus_devices,
+       .report_fixup = asus_report_fixup
+};
+module_hid_driver(asus_driver);
+
+MODULE_LICENSE("GPL");
index 4f9c5c6deaed189f6be5a34145a2ec5cf3fa40b7..8ea3a26360e941614efd496a2d8435322e0ff567 100644 (file)
@@ -1129,49 +1129,46 @@ EXPORT_SYMBOL_GPL(hid_field_extract);
 static void __implement(u8 *report, unsigned offset, int n, u32 value)
 {
        unsigned int idx = offset / 8;
-       unsigned int size = offset + n;
        unsigned int bit_shift = offset % 8;
        int bits_to_set = 8 - bit_shift;
-       u8 bit_mask = 0xff << bit_shift;
 
        while (n - bits_to_set >= 0) {
-               report[idx] &= ~bit_mask;
+               report[idx] &= ~(0xff << bit_shift);
                report[idx] |= value << bit_shift;
                value >>= bits_to_set;
                n -= bits_to_set;
                bits_to_set = 8;
-               bit_mask = 0xff;
                bit_shift = 0;
                idx++;
        }
 
        /* last nibble */
        if (n) {
-               if (size % 8)
-                       bit_mask &= (1U << (size % 8)) - 1;
-               report[idx] &= ~bit_mask;
-               report[idx] |= (value << bit_shift) & bit_mask;
+               u8 bit_mask = ((1U << n) - 1);
+               report[idx] &= ~(bit_mask << bit_shift);
+               report[idx] |= value << bit_shift;
        }
 }
 
 static void implement(const struct hid_device *hid, u8 *report,
                      unsigned offset, unsigned n, u32 value)
 {
-       u64 m;
-
-       if (n > 32) {
+       if (unlikely(n > 32)) {
                hid_warn(hid, "%s() called with n (%d) > 32! (%s)\n",
                         __func__, n, current->comm);
                n = 32;
+       } else if (n < 32) {
+               u32 m = (1U << n) - 1;
+
+               if (unlikely(value > m)) {
+                       hid_warn(hid,
+                                "%s() called with too large value %d (n: %d)! (%s)\n",
+                                __func__, value, n, current->comm);
+                       WARN_ON(1);
+                       value &= m;
+               }
        }
 
-       m = (1ULL << n) - 1;
-       if (value > m)
-               hid_warn(hid, "%s() called with too large value %d! (%s)\n",
-                        __func__, value, current->comm);
-       WARN_ON(value > m);
-       value &= m;
-
        __implement(report, offset, n, value);
 }
 
@@ -1856,6 +1853,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+       { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
        { HID_USB_DEVICE(USB_VENDOR_ID_BETOP_2185BFM, 0x2208) },
index c6eaff5f88451f770cf036e71b9167a0202351e7..3eec09a134cb66ac1b9e03f89e3c201cd1b48adb 100644 (file)
 #define USB_VENDOR_ID_ASUSTEK          0x0b05
 #define USB_DEVICE_ID_ASUSTEK_LCM      0x1726
 #define USB_DEVICE_ID_ASUSTEK_LCM2     0x175b
+#define USB_DEVICE_ID_ASUSTEK_NOTEBOOK_KEYBOARD        0x8585
 
 #define USB_VENDOR_ID_ATEN             0x0557
 #define USB_DEVICE_ID_ATEN_UC100KM     0x2004
 #define USB_VENDOR_ID_CORSAIR          0x1b1c
 #define USB_DEVICE_ID_CORSAIR_K90      0x1b02
 
+#define USB_VENDOR_ID_CORSAIR           0x1b1c
+#define USB_DEVICE_ID_CORSAIR_K70R      0x1b09
+#define USB_DEVICE_ID_CORSAIR_K95RGB    0x1b11
+#define USB_DEVICE_ID_CORSAIR_M65RGB    0x1b12
+#define USB_DEVICE_ID_CORSAIR_K70RGB    0x1b13
+#define USB_DEVICE_ID_CORSAIR_K65RGB    0x1b17
+
 #define USB_VENDOR_ID_CREATIVELABS     0x041e
+#define USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51     0x322c
 #define USB_DEVICE_ID_PRODIKEYS_PCMIDI 0x2801
 
 #define USB_VENDOR_ID_CVTOUCH          0x1ff7
index 65c4ccfcbd2941994b7778fdbde661c60005c4d6..76d06cf87b2ac31958d238d7bd0254bf02032fda 100644 (file)
@@ -421,14 +421,13 @@ static int __init roccat_init(void)
 
        retval = alloc_chrdev_region(&dev_id, ROCCAT_FIRST_MINOR,
                        ROCCAT_MAX_DEVICES, "roccat");
-
-       roccat_major = MAJOR(dev_id);
-
        if (retval < 0) {
                pr_warn("can't get major number\n");
                goto error;
        }
 
+       roccat_major = MAJOR(dev_id);
+
        cdev_init(&roccat_cdev, &roccat_ops);
        retval = cdev_add(&roccat_cdev, dev_id, ROCCAT_MAX_DEVICES);
 
index 847a497cd47245223185665839fb9e2452a7665a..9ad9c6ec5bba232dd2e697660a6a894ac15fb185 100644 (file)
@@ -148,13 +148,21 @@ static int thingm_led_set(struct led_classdev *ldev,
                          enum led_brightness brightness)
 {
        struct thingm_led *led = container_of(ldev, struct thingm_led, ldev);
-       int ret;
 
-       ret = thingm_write_color(led->rgb);
-       if (ret)
-               hid_err(led->rgb->tdev->hdev, "failed to write color\n");
+       return thingm_write_color(led->rgb);
+}
 
-       return ret;
+static int thingm_init_led(struct thingm_led *led, const char *color_name,
+                          struct thingm_rgb *rgb, int minor)
+{
+       snprintf(led->name, sizeof(led->name), "thingm%d:%s:led%d",
+                minor, color_name, rgb->num);
+       led->ldev.name = led->name;
+       led->ldev.max_brightness = 255;
+       led->ldev.brightness_set_blocking = thingm_led_set;
+       led->ldev.flags = LED_HW_PLUGGABLE;
+       led->rgb = rgb;
+       return devm_led_classdev_register(&rgb->tdev->hdev->dev, &led->ldev);
 }
 
 static int thingm_init_rgb(struct thingm_rgb *rgb)
@@ -163,42 +171,17 @@ static int thingm_init_rgb(struct thingm_rgb *rgb)
        int err;
 
        /* Register the red diode */
-       snprintf(rgb->red.name, sizeof(rgb->red.name),
-                       "thingm%d:red:led%d", minor, rgb->num);
-       rgb->red.ldev.name = rgb->red.name;
-       rgb->red.ldev.max_brightness = 255;
-       rgb->red.ldev.brightness_set_blocking = thingm_led_set;
-       rgb->red.rgb = rgb;
-
-       err = devm_led_classdev_register(&rgb->tdev->hdev->dev,
-                                        &rgb->red.ldev);
+       err = thingm_init_led(&rgb->red, "red", rgb, minor);
        if (err)
                return err;
 
        /* Register the green diode */
-       snprintf(rgb->green.name, sizeof(rgb->green.name),
-                       "thingm%d:green:led%d", minor, rgb->num);
-       rgb->green.ldev.name = rgb->green.name;
-       rgb->green.ldev.max_brightness = 255;
-       rgb->green.ldev.brightness_set_blocking = thingm_led_set;
-       rgb->green.rgb = rgb;
-
-       err = devm_led_classdev_register(&rgb->tdev->hdev->dev,
-                                        &rgb->green.ldev);
+       err = thingm_init_led(&rgb->green, "green", rgb, minor);
        if (err)
                return err;
 
        /* Register the blue diode */
-       snprintf(rgb->blue.name, sizeof(rgb->blue.name),
-                       "thingm%d:blue:led%d", minor, rgb->num);
-       rgb->blue.ldev.name = rgb->blue.name;
-       rgb->blue.ldev.max_brightness = 255;
-       rgb->blue.ldev.brightness_set_blocking = thingm_led_set;
-       rgb->blue.rgb = rgb;
-
-       err = devm_led_classdev_register(&rgb->tdev->hdev->dev,
-                                        &rgb->blue.ldev);
-       return err;
+       return thingm_init_led(&rgb->blue, "blue", rgb, minor);
 }
 
 static int thingm_probe(struct hid_device *hdev, const struct hid_device_id *id)
index 9c2d7c23f2966f43953626b82d03cf62bca0c8ba..f0e2757cb9094dee3bab158d2c368c739ec91c20 100644 (file)
@@ -34,6 +34,7 @@
 #include <linux/hid.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
+#include <linux/string.h>
 
 #include <linux/hidraw.h>
 
@@ -123,7 +124,6 @@ static ssize_t hidraw_send_report(struct file *file, const char __user *buffer,
 
        dev = hidraw_table[minor]->hid;
 
-
        if (count > HID_MAX_BUFFER_SIZE) {
                hid_warn(dev, "pid %d passed too large report\n",
                         task_pid_nr(current));
@@ -138,17 +138,12 @@ static ssize_t hidraw_send_report(struct file *file, const char __user *buffer,
                goto out;
        }
 
-       buf = kmalloc(count * sizeof(__u8), GFP_KERNEL);
-       if (!buf) {
-               ret = -ENOMEM;
+       buf = memdup_user(buffer, count);
+       if (IS_ERR(buf)) {
+               ret = PTR_ERR(buf);
                goto out;
        }
 
-       if (copy_from_user(buf, buffer, count)) {
-               ret = -EFAULT;
-               goto out_free;
-       }
-
        if ((report_type == HID_OUTPUT_REPORT) &&
            !(dev->quirks & HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP)) {
                ret = hid_hw_output_report(dev, buf, count);
@@ -587,14 +582,13 @@ int __init hidraw_init(void)
 
        result = alloc_chrdev_region(&dev_id, HIDRAW_FIRST_MINOR,
                        HIDRAW_MAX_DEVICES, "hidraw");
-
-       hidraw_major = MAJOR(dev_id);
-
        if (result < 0) {
                pr_warn("can't get major number\n");
                goto out;
        }
 
+       hidraw_major = MAJOR(dev_id);
+
        hidraw_class = class_create(THIS_MODULE, "hidraw");
        if (IS_ERR(hidraw_class)) {
                result = PTR_ERR(hidraw_class);
index ed2f68edc8f1c648e30b15178fc550cb9a071f88..b4b8c6abb03e130e5ee54d473fce11070d51eb81 100644 (file)
@@ -71,6 +71,12 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE, HID_QUIRK_ALWAYS_POLL },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70R, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_M65RGB, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K95RGB, HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70RGB, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },
index ea949cb2ec1ea59264b9b9e4420d486e0043bab3..1eae13cdc5020b5ec5dbcfe05f452f5528e8b958 100644 (file)
@@ -684,6 +684,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom)
 
                wacom->tool[idx] = wacom_intuos_get_tool_type(wacom->id[idx]);
 
+               wacom->shared->stylus_in_proximity = true;
                return 1;
        }
 
@@ -3396,6 +3397,10 @@ static const struct wacom_features wacom_features_0x33E =
        { "Wacom Intuos PT M 2", 21600, 13500, 2047, 63,
          INTUOSHT2, WACOM_INTUOS_RES, WACOM_INTUOS_RES, .touch_max = 16,
          .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
+static const struct wacom_features wacom_features_0x343 =
+       { "Wacom DTK1651", 34616, 19559, 1023, 0,
+         DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 4,
+         WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
 
 static const struct wacom_features wacom_features_HID_ANY_ID =
        { "Wacom HID", .type = HID_GENERIC };
@@ -3561,6 +3566,7 @@ const struct hid_device_id wacom_ids[] = {
        { USB_DEVICE_WACOM(0x33C) },
        { USB_DEVICE_WACOM(0x33D) },
        { USB_DEVICE_WACOM(0x33E) },
+       { USB_DEVICE_WACOM(0x343) },
        { USB_DEVICE_WACOM(0x4001) },
        { USB_DEVICE_WACOM(0x4004) },
        { USB_DEVICE_WACOM(0x5000) },
This page took 0.032776 seconds and 5 git commands to generate.