Commit f45471cb authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: roccat: fix build failure if built as module
  HID: roccat: propagate special events of roccat hardware to userspace
  HID: Add the GYR4101US USB ID to hid-gyration
  HID: fix hid-roccat-kone for bin_attr API change
parents 2214482c 0e927bfc
...@@ -347,6 +347,14 @@ config HID_QUANTA ...@@ -347,6 +347,14 @@ config HID_QUANTA
---help--- ---help---
Support for Quanta Optical Touch dual-touch panels. Support for Quanta Optical Touch dual-touch panels.
config HID_ROCCAT
tristate "Roccat special event support"
depends on USB_HID
---help---
Support for Roccat special events.
Say Y here if you have a Roccat mouse or keyboard and want OSD or
macro execution support.
config HID_ROCCAT_KONE config HID_ROCCAT_KONE
tristate "Roccat Kone Mouse support" tristate "Roccat Kone Mouse support"
depends on USB_HID depends on USB_HID
......
...@@ -48,6 +48,7 @@ obj-$(CONFIG_HID_QUANTA) += hid-quanta.o ...@@ -48,6 +48,7 @@ obj-$(CONFIG_HID_QUANTA) += hid-quanta.o
obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o
obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o
obj-$(CONFIG_HID_ROCCAT_KONE) += hid-roccat-kone.o obj-$(CONFIG_HID_ROCCAT_KONE) += hid-roccat-kone.o
obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
......
...@@ -1301,6 +1301,7 @@ static const struct hid_device_id hid_blacklist[] = { ...@@ -1301,6 +1301,7 @@ static const struct hid_device_id hid_blacklist[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) }, { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },
{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
......
...@@ -73,6 +73,7 @@ static int gyration_event(struct hid_device *hdev, struct hid_field *field, ...@@ -73,6 +73,7 @@ static int gyration_event(struct hid_device *hdev, struct hid_field *field,
static const struct hid_device_id gyration_devices[] = { static const struct hid_device_id gyration_devices[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) }, { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_3) },
{ } { }
}; };
MODULE_DEVICE_TABLE(hid, gyration_devices); MODULE_DEVICE_TABLE(hid, gyration_devices);
......
...@@ -282,6 +282,7 @@ ...@@ -282,6 +282,7 @@
#define USB_VENDOR_ID_GYRATION 0x0c16 #define USB_VENDOR_ID_GYRATION 0x0c16
#define USB_DEVICE_ID_GYRATION_REMOTE 0x0002 #define USB_DEVICE_ID_GYRATION_REMOTE 0x0002
#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003 #define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003
#define USB_DEVICE_ID_GYRATION_REMOTE_3 0x0008
#define USB_VENDOR_ID_HAPP 0x078b #define USB_VENDOR_ID_HAPP 0x078b
#define USB_DEVICE_ID_UGCI_DRIVING 0x0010 #define USB_DEVICE_ID_UGCI_DRIVING 0x0010
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "hid-ids.h" #include "hid-ids.h"
#include "hid-roccat.h"
#include "hid-roccat-kone.h" #include "hid-roccat-kone.h"
static void kone_set_settings_checksum(struct kone_settings *settings) static void kone_set_settings_checksum(struct kone_settings *settings)
...@@ -263,7 +264,7 @@ static int kone_get_firmware_version(struct usb_device *usb_dev, int *result) ...@@ -263,7 +264,7 @@ static int kone_get_firmware_version(struct usb_device *usb_dev, int *result)
return 0; return 0;
} }
static ssize_t kone_sysfs_read_settings(struct kobject *kobj, static ssize_t kone_sysfs_read_settings(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
struct device *dev = container_of(kobj, struct device, kobj); struct device *dev = container_of(kobj, struct device, kobj);
...@@ -287,7 +288,7 @@ static ssize_t kone_sysfs_read_settings(struct kobject *kobj, ...@@ -287,7 +288,7 @@ static ssize_t kone_sysfs_read_settings(struct kobject *kobj,
* This function keeps values in kone_device up to date and assumes that in * This function keeps values in kone_device up to date and assumes that in
* case of error the old data is still valid * case of error the old data is still valid
*/ */
static ssize_t kone_sysfs_write_settings(struct kobject *kobj, static ssize_t kone_sysfs_write_settings(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
struct device *dev = container_of(kobj, struct device, kobj); struct device *dev = container_of(kobj, struct device, kobj);
...@@ -342,31 +343,31 @@ static ssize_t kone_sysfs_read_profilex(struct kobject *kobj, ...@@ -342,31 +343,31 @@ static ssize_t kone_sysfs_read_profilex(struct kobject *kobj,
return count; return count;
} }
static ssize_t kone_sysfs_read_profile1(struct kobject *kobj, static ssize_t kone_sysfs_read_profile1(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 1); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 1);
} }
static ssize_t kone_sysfs_read_profile2(struct kobject *kobj, static ssize_t kone_sysfs_read_profile2(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 2); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 2);
} }
static ssize_t kone_sysfs_read_profile3(struct kobject *kobj, static ssize_t kone_sysfs_read_profile3(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 3); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 3);
} }
static ssize_t kone_sysfs_read_profile4(struct kobject *kobj, static ssize_t kone_sysfs_read_profile4(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 4); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 4);
} }
static ssize_t kone_sysfs_read_profile5(struct kobject *kobj, static ssize_t kone_sysfs_read_profile5(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 5); return kone_sysfs_read_profilex(kobj, attr, buf, off, count, 5);
...@@ -404,31 +405,31 @@ static ssize_t kone_sysfs_write_profilex(struct kobject *kobj, ...@@ -404,31 +405,31 @@ static ssize_t kone_sysfs_write_profilex(struct kobject *kobj,
return sizeof(struct kone_profile); return sizeof(struct kone_profile);
} }
static ssize_t kone_sysfs_write_profile1(struct kobject *kobj, static ssize_t kone_sysfs_write_profile1(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 1); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 1);
} }
static ssize_t kone_sysfs_write_profile2(struct kobject *kobj, static ssize_t kone_sysfs_write_profile2(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 2); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 2);
} }
static ssize_t kone_sysfs_write_profile3(struct kobject *kobj, static ssize_t kone_sysfs_write_profile3(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 3); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 3);
} }
static ssize_t kone_sysfs_write_profile4(struct kobject *kobj, static ssize_t kone_sysfs_write_profile4(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 4); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 4);
} }
static ssize_t kone_sysfs_write_profile5(struct kobject *kobj, static ssize_t kone_sysfs_write_profile5(struct file *fp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t off, size_t count) { loff_t off, size_t count) {
return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 5); return kone_sysfs_write_profilex(kobj, attr, buf, off, count, 5);
...@@ -849,6 +850,16 @@ static int kone_init_specials(struct hid_device *hdev) ...@@ -849,6 +850,16 @@ static int kone_init_specials(struct hid_device *hdev)
"couldn't init struct kone_device\n"); "couldn't init struct kone_device\n");
goto exit_free; goto exit_free;
} }
retval = roccat_connect(hdev);
if (retval < 0) {
dev_err(&hdev->dev, "couldn't init char dev\n");
/* be tolerant about not getting chrdev */
} else {
kone->roccat_claimed = 1;
kone->chrdev_minor = retval;
}
retval = kone_create_sysfs_attributes(intf); retval = kone_create_sysfs_attributes(intf);
if (retval) { if (retval) {
dev_err(&hdev->dev, "cannot create sysfs files\n"); dev_err(&hdev->dev, "cannot create sysfs files\n");
...@@ -868,10 +879,14 @@ static int kone_init_specials(struct hid_device *hdev) ...@@ -868,10 +879,14 @@ static int kone_init_specials(struct hid_device *hdev)
static void kone_remove_specials(struct hid_device *hdev) static void kone_remove_specials(struct hid_device *hdev)
{ {
struct usb_interface *intf = to_usb_interface(hdev->dev.parent); struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
struct kone_device *kone;
if (intf->cur_altsetting->desc.bInterfaceProtocol if (intf->cur_altsetting->desc.bInterfaceProtocol
== USB_INTERFACE_PROTOCOL_MOUSE) { == USB_INTERFACE_PROTOCOL_MOUSE) {
kone_remove_sysfs_attributes(intf); kone_remove_sysfs_attributes(intf);
kone = hid_get_drvdata(hdev);
if (kone->roccat_claimed)
roccat_disconnect(kone->chrdev_minor);
kfree(hid_get_drvdata(hdev)); kfree(hid_get_drvdata(hdev));
} }
} }
...@@ -930,6 +945,37 @@ static void kone_keep_values_up_to_date(struct kone_device *kone, ...@@ -930,6 +945,37 @@ static void kone_keep_values_up_to_date(struct kone_device *kone,
} }
} }
static void kone_report_to_chrdev(struct kone_device const *kone,
struct kone_mouse_event const *event)
{
struct kone_roccat_report roccat_report;
switch (event->event) {
case kone_mouse_event_switch_profile:
case kone_mouse_event_switch_dpi:
case kone_mouse_event_osd_profile:
case kone_mouse_event_osd_dpi:
roccat_report.event = event->event;
roccat_report.value = event->value;
roccat_report.key = 0;
roccat_report_event(kone->chrdev_minor,
(uint8_t *)&roccat_report,
sizeof(struct kone_roccat_report));
break;
case kone_mouse_event_call_overlong_macro:
if (event->value == kone_keystroke_action_press) {
roccat_report.event = kone_mouse_event_call_overlong_macro;
roccat_report.value = kone->actual_profile;
roccat_report.key = event->macro_key;
roccat_report_event(kone->chrdev_minor,
(uint8_t *)&roccat_report,
sizeof(struct kone_roccat_report));
}
break;
}
}
/* /*
* Is called for keyboard- and mousepart. * Is called for keyboard- and mousepart.
* Only mousepart gets informations about special events in its extended event * Only mousepart gets informations about special events in its extended event
...@@ -958,6 +1004,9 @@ static int kone_raw_event(struct hid_device *hdev, struct hid_report *report, ...@@ -958,6 +1004,9 @@ static int kone_raw_event(struct hid_device *hdev, struct hid_report *report,
kone_keep_values_up_to_date(kone, event); kone_keep_values_up_to_date(kone, event);
if (kone->roccat_claimed)
kone_report_to_chrdev(kone, event);
return 0; /* always do further processing */ return 0; /* always do further processing */
} }
......
...@@ -189,6 +189,12 @@ enum kone_commands { ...@@ -189,6 +189,12 @@ enum kone_commands {
kone_command_firmware = 0xe5a kone_command_firmware = 0xe5a
}; };
struct kone_roccat_report {
uint8_t event;
uint8_t value; /* holds dpi or profile value */
uint8_t key; /* macro key on overlong macro execution */
};
#pragma pack(pop) #pragma pack(pop)
struct kone_device { struct kone_device {
...@@ -219,6 +225,9 @@ struct kone_device { ...@@ -219,6 +225,9 @@ struct kone_device {
* so it's read only once * so it's read only once
*/ */
int firmware_version; int firmware_version;
int roccat_claimed;
int chrdev_minor;
}; };
#endif #endif
This diff is collapsed.
#ifndef __HID_ROCCAT_H
#define __HID_ROCCAT_H
/*
* Copyright (c) 2010 Stefan Achatz <erazor_de@users.sourceforge.net>
*/
/*
* 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/hid.h>
#include <linux/types.h>
#if defined(CONFIG_HID_ROCCAT) || defined (CONFIG_HID_ROCCAT_MODULE)
int roccat_connect(struct hid_device *hid);
void roccat_disconnect(int minor);
int roccat_report_event(int minor, u8 const *data, int len);
#else
static inline int roccat_connect(struct hid_device *hid) { return -1; }
static inline void roccat_disconnect(int minor) {}
static inline int roccat_report_event(int minor, u8 const *data, int len)
{
return 0;
}
#endif
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment