-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: (30 commits) Revert "HID: add support for the Wacom Intuos 4 wireless" HID: fix up Kconfig entry for ACRUX driver HID: add ACRUX game controller force feedback support HID: Force input registration for "VEC footpedal" HID: add HID_QUIRK_HIDINPUT_FORCE HID: hid-input.c: indentation fixes HID: hiddev: use usb_find_interface, get rid of BKL HID: ignore digitizer usage Undefined (0x00) HID: Add support for Conceptronic CLLRCMCE HID: hid-ids.h: Whitespace fixup, align using TABs HID: picolcd: implement refcounting of framebuffer HID: picolcd: do not reallocate memory on depth change HID: picolcd: Add minimal palette required by fbcon on 8bpp HID: magicmouse: Correct parsing of large X and Y motions. HID: magicmouse: report last touch up HID: picolcd: fix deferred_io init/cleanup to fb ordering HID: hid-ids.h: keep vendor ids in alphabetical order HID: add proper support for Elecom BM084 bluetooth mouse HID: magicmouse: enable horizontal scrolling HID: magicmouse: add param for scroll speed ...
- Loading branch information
Showing
20 changed files
with
586 additions
and
196 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| /* | ||
| * Force feedback support for ACRUX game controllers | ||
| * | ||
| * From what I have gathered, these devices are mass produced in China | ||
| * by several vendors. They often share the same design as the original | ||
| * Xbox 360 controller. | ||
| * | ||
| * 1a34:0802 "ACRUX USB GAMEPAD 8116" | ||
| * - tested with a EXEQ EQ-PCU-02090 game controller. | ||
| * | ||
| * Copyright (c) 2010 Sergei Kolzun <x0r@dv-life.ru> | ||
| */ | ||
|
|
||
| /* | ||
| * 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. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| */ | ||
|
|
||
| #include <linux/input.h> | ||
| #include <linux/slab.h> | ||
| #include <linux/usb.h> | ||
| #include <linux/hid.h> | ||
|
|
||
| #include "hid-ids.h" | ||
| #include "usbhid/usbhid.h" | ||
|
|
||
| struct axff_device { | ||
| struct hid_report *report; | ||
| }; | ||
|
|
||
| static int axff_play(struct input_dev *dev, void *data, struct ff_effect *effect) | ||
| { | ||
| struct hid_device *hid = input_get_drvdata(dev); | ||
| struct axff_device *axff = data; | ||
| int left, right; | ||
|
|
||
| left = effect->u.rumble.strong_magnitude; | ||
| right = effect->u.rumble.weak_magnitude; | ||
|
|
||
| dbg_hid("called with 0x%04x 0x%04x", left, right); | ||
|
|
||
| left = left * 0xff / 0xffff; | ||
| right = right * 0xff / 0xffff; | ||
|
|
||
| axff->report->field[0]->value[0] = left; | ||
| axff->report->field[1]->value[0] = right; | ||
| axff->report->field[2]->value[0] = left; | ||
| axff->report->field[3]->value[0] = right; | ||
| dbg_hid("running with 0x%02x 0x%02x", left, right); | ||
| usbhid_submit_report(hid, axff->report, USB_DIR_OUT); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| static int axff_init(struct hid_device *hid) | ||
| { | ||
| struct axff_device *axff; | ||
| struct hid_report *report; | ||
| struct hid_input *hidinput = list_first_entry(&hid->inputs, struct hid_input, list); | ||
| struct list_head *report_list =&hid->report_enum[HID_OUTPUT_REPORT].report_list; | ||
| struct input_dev *dev = hidinput->input; | ||
| int error; | ||
|
|
||
| if (list_empty(report_list)) { | ||
| dev_err(&hid->dev, "no output reports found\n"); | ||
| return -ENODEV; | ||
| } | ||
|
|
||
| report = list_first_entry(report_list, struct hid_report, list); | ||
|
|
||
| if (report->maxfield < 4) { | ||
| dev_err(&hid->dev, "no fields in the report: %d\n", report->maxfield); | ||
| return -ENODEV; | ||
| } | ||
|
|
||
| axff = kzalloc(sizeof(struct axff_device), GFP_KERNEL); | ||
| if (!axff) | ||
| return -ENOMEM; | ||
|
|
||
| set_bit(FF_RUMBLE, dev->ffbit); | ||
|
|
||
| error = input_ff_create_memless(dev, axff, axff_play); | ||
| if (error) | ||
| goto err_free_mem; | ||
|
|
||
| axff->report = report; | ||
| axff->report->field[0]->value[0] = 0x00; | ||
| axff->report->field[1]->value[0] = 0x00; | ||
| axff->report->field[2]->value[0] = 0x00; | ||
| axff->report->field[3]->value[0] = 0x00; | ||
| usbhid_submit_report(hid, axff->report, USB_DIR_OUT); | ||
|
|
||
| dev_info(&hid->dev, "Force Feedback for ACRUX game controllers by Sergei Kolzun<x0r@dv-life.ru>\n"); | ||
|
|
||
| return 0; | ||
|
|
||
| err_free_mem: | ||
| kfree(axff); | ||
| return error; | ||
| } | ||
|
|
||
| static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id) | ||
| { | ||
| int error; | ||
|
|
||
| dev_dbg(&hdev->dev, "ACRUX HID hardware probe..."); | ||
|
|
||
| error = hid_parse(hdev); | ||
| if (error) { | ||
| dev_err(&hdev->dev, "parse failed\n"); | ||
| return error; | ||
| } | ||
|
|
||
| error = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); | ||
| if (error) { | ||
| dev_err(&hdev->dev, "hw start failed\n"); | ||
| return error; | ||
| } | ||
|
|
||
| error = axff_init(hdev); | ||
| if (error) { | ||
| /* | ||
| * Do not fail device initialization completely as device | ||
| * may still be partially operable, just warn. | ||
| */ | ||
| dev_warn(&hdev->dev, | ||
| "Failed to enable force feedback support, error: %d\n", | ||
| error); | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| static const struct hid_device_id ax_devices[] = { | ||
| { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), }, | ||
| { } | ||
| }; | ||
| MODULE_DEVICE_TABLE(hid, ax_devices); | ||
|
|
||
| static struct hid_driver ax_driver = { | ||
| .name = "acrux", | ||
| .id_table = ax_devices, | ||
| .probe = ax_probe, | ||
| }; | ||
|
|
||
| static int __init ax_init(void) | ||
| { | ||
| return hid_register_driver(&ax_driver); | ||
| } | ||
|
|
||
| static void __exit ax_exit(void) | ||
| { | ||
| hid_unregister_driver(&ax_driver); | ||
| } | ||
|
|
||
| module_init(ax_init); | ||
| module_exit(ax_exit); | ||
|
|
||
| MODULE_AUTHOR("Sergei Kolzun"); | ||
| MODULE_DESCRIPTION("Force feedback support for ACRUX game controllers"); | ||
| MODULE_LICENSE("GPL"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * HID driver for Elecom BM084 (bluetooth mouse). | ||
| * Removes a non-existing horizontal wheel from | ||
| * the HID descriptor. | ||
| * (This module is based on "hid-ortek".) | ||
| * | ||
| * Copyright (c) 2010 Richard Nauber <Richard.Nauber@gmail.com> | ||
| */ | ||
|
|
||
| /* | ||
| * 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 void elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, | ||
| unsigned int rsize) | ||
| { | ||
| if (rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) { | ||
| dev_info(&hdev->dev, "Fixing up Elecom BM084 " | ||
| "report descriptor.\n"); | ||
| rdesc[47] = 0x00; | ||
| } | ||
| } | ||
|
|
||
| static const struct hid_device_id elecom_devices[] = { | ||
| { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084)}, | ||
| { } | ||
| }; | ||
| MODULE_DEVICE_TABLE(hid, elecom_devices); | ||
|
|
||
| static struct hid_driver elecom_driver = { | ||
| .name = "elecom", | ||
| .id_table = elecom_devices, | ||
| .report_fixup = elecom_report_fixup | ||
| }; | ||
|
|
||
| static int __init elecom_init(void) | ||
| { | ||
| return hid_register_driver(&elecom_driver); | ||
| } | ||
|
|
||
| static void __exit elecom_exit(void) | ||
| { | ||
| hid_unregister_driver(&elecom_driver); | ||
| } | ||
|
|
||
| module_init(elecom_init); | ||
| module_exit(elecom_exit); | ||
| MODULE_LICENSE("GPL"); |
Oops, something went wrong.