diff options
-rw-r--r-- | drivers/hid/Kconfig | 8 | ||||
-rw-r--r-- | drivers/hid/Makefile | 1 | ||||
-rw-r--r-- | drivers/hid/hid-axff.c | 172 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 3 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 4 |
5 files changed, 187 insertions, 1 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index f54050c2e38d..6369ba7f96f8 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -68,6 +68,14 @@ config HID_A4TECH | |||
68 | ---help--- | 68 | ---help--- |
69 | Support for A4 tech X5 and WOP-35 / Trust 450L mice. | 69 | Support for A4 tech X5 and WOP-35 / Trust 450L mice. |
70 | 70 | ||
71 | config HID_ACRUX_FF | ||
72 | tristate "ACRUX force feedback support" | ||
73 | depends on USB_HID | ||
74 | select INPUT_FF_MEMLESS | ||
75 | ---help--- | ||
76 | Say Y here if you want to enable force feedback support for ACRUX | ||
77 | game controllers. | ||
78 | |||
71 | config HID_APPLE | 79 | config HID_APPLE |
72 | tristate "Apple" if EMBEDDED | 80 | tristate "Apple" if EMBEDDED |
73 | depends on (USB_HID || BT_HIDP) | 81 | depends on (USB_HID || BT_HIDP) |
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 2ec042f57138..46f037f3df80 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
@@ -24,6 +24,7 @@ endif | |||
24 | 24 | ||
25 | obj-$(CONFIG_HID_3M_PCT) += hid-3m-pct.o | 25 | obj-$(CONFIG_HID_3M_PCT) += hid-3m-pct.o |
26 | obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o | 26 | obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o |
27 | obj-$(CONFIG_HID_ACRUX_FF) += hid-axff.o | ||
27 | obj-$(CONFIG_HID_APPLE) += hid-apple.o | 28 | obj-$(CONFIG_HID_APPLE) += hid-apple.o |
28 | obj-$(CONFIG_HID_BELKIN) += hid-belkin.o | 29 | obj-$(CONFIG_HID_BELKIN) += hid-belkin.o |
29 | obj-$(CONFIG_HID_CANDO) += hid-cando.o | 30 | obj-$(CONFIG_HID_CANDO) += hid-cando.o |
diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c new file mode 100644 index 000000000000..f42ee140738a --- /dev/null +++ b/drivers/hid/hid-axff.c | |||
@@ -0,0 +1,172 @@ | |||
1 | /* | ||
2 | * Force feedback support for ACRUX game controllers | ||
3 | * | ||
4 | * From what I have gathered, these devices are mass produced in China | ||
5 | * by several vendors. They often share the same design as the original | ||
6 | * Xbox 360 controller. | ||
7 | * | ||
8 | * 1a34:0802 "ACRUX USB GAMEPAD 8116" | ||
9 | * - tested with a EXEQ EQ-PCU-02090 game controller. | ||
10 | * | ||
11 | * Copyright (c) 2010 Sergei Kolzun <x0r@dv-life.ru> | ||
12 | */ | ||
13 | |||
14 | /* | ||
15 | * This program is free software; you can redistribute it and/or modify | ||
16 | * it under the terms of the GNU General Public License as published by | ||
17 | * the Free Software Foundation; either version 2 of the License, or | ||
18 | * (at your option) any later version. | ||
19 | * | ||
20 | * This program is distributed in the hope that it will be useful, | ||
21 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
22 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
23 | * GNU General Public License for more details. | ||
24 | * | ||
25 | * You should have received a copy of the GNU General Public License | ||
26 | * along with this program; if not, write to the Free Software | ||
27 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
28 | */ | ||
29 | |||
30 | #include <linux/input.h> | ||
31 | #include <linux/slab.h> | ||
32 | #include <linux/usb.h> | ||
33 | #include <linux/hid.h> | ||
34 | |||
35 | #include "hid-ids.h" | ||
36 | #include "usbhid/usbhid.h" | ||
37 | |||
38 | struct axff_device { | ||
39 | struct hid_report *report; | ||
40 | }; | ||
41 | |||
42 | static int axff_play(struct input_dev *dev, void *data, struct ff_effect *effect) | ||
43 | { | ||
44 | struct hid_device *hid = input_get_drvdata(dev); | ||
45 | struct axff_device *axff = data; | ||
46 | int left, right; | ||
47 | |||
48 | left = effect->u.rumble.strong_magnitude; | ||
49 | right = effect->u.rumble.weak_magnitude; | ||
50 | |||
51 | dbg_hid("called with 0x%04x 0x%04x", left, right); | ||
52 | |||
53 | left = left * 0xff / 0xffff; | ||
54 | right = right * 0xff / 0xffff; | ||
55 | |||
56 | axff->report->field[0]->value[0] = left; | ||
57 | axff->report->field[1]->value[0] = right; | ||
58 | axff->report->field[2]->value[0] = left; | ||
59 | axff->report->field[3]->value[0] = right; | ||
60 | dbg_hid("running with 0x%02x 0x%02x", left, right); | ||
61 | usbhid_submit_report(hid, axff->report, USB_DIR_OUT); | ||
62 | |||
63 | return 0; | ||
64 | } | ||
65 | |||
66 | static int axff_init(struct hid_device *hid) | ||
67 | { | ||
68 | struct axff_device *axff; | ||
69 | struct hid_report *report; | ||
70 | struct hid_input *hidinput = list_first_entry(&hid->inputs, struct hid_input, list); | ||
71 | struct list_head *report_list =&hid->report_enum[HID_OUTPUT_REPORT].report_list; | ||
72 | struct input_dev *dev = hidinput->input; | ||
73 | int error; | ||
74 | |||
75 | if (list_empty(report_list)) { | ||
76 | dev_err(&hid->dev, "no output reports found\n"); | ||
77 | return -ENODEV; | ||
78 | } | ||
79 | |||
80 | report = list_first_entry(report_list, struct hid_report, list); | ||
81 | |||
82 | if (report->maxfield < 4) { | ||
83 | dev_err(&hid->dev, "no fields in the report: %d\n", report->maxfield); | ||
84 | return -ENODEV; | ||
85 | } | ||
86 | |||
87 | axff = kzalloc(sizeof(struct axff_device), GFP_KERNEL); | ||
88 | if (!axff) | ||
89 | return -ENOMEM; | ||
90 | |||
91 | set_bit(FF_RUMBLE, dev->ffbit); | ||
92 | |||
93 | error = input_ff_create_memless(dev, axff, axff_play); | ||
94 | if (error) | ||
95 | goto err_free_mem; | ||
96 | |||
97 | axff->report = report; | ||
98 | axff->report->field[0]->value[0] = 0x00; | ||
99 | axff->report->field[1]->value[0] = 0x00; | ||
100 | axff->report->field[2]->value[0] = 0x00; | ||
101 | axff->report->field[3]->value[0] = 0x00; | ||
102 | usbhid_submit_report(hid, axff->report, USB_DIR_OUT); | ||
103 | |||
104 | dev_info(&hid->dev, "Force Feedback for ACRUX game controllers by Sergei Kolzun<x0r@dv-life.ru>\n"); | ||
105 | |||
106 | return 0; | ||
107 | |||
108 | err_free_mem: | ||
109 | kfree(axff); | ||
110 | return error; | ||
111 | } | ||
112 | |||
113 | static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id) | ||
114 | { | ||
115 | int error; | ||
116 | |||
117 | dev_dbg(&hdev->dev, "ACRUX HID hardware probe..."); | ||
118 | |||
119 | error = hid_parse(hdev); | ||
120 | if (error) { | ||
121 | dev_err(&hdev->dev, "parse failed\n"); | ||
122 | return error; | ||
123 | } | ||
124 | |||
125 | error = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF); | ||
126 | if (error) { | ||
127 | dev_err(&hdev->dev, "hw start failed\n"); | ||
128 | return error; | ||
129 | } | ||
130 | |||
131 | error = axff_init(hdev); | ||
132 | if (error) { | ||
133 | /* | ||
134 | * Do not fail device initialization completely as device | ||
135 | * may still be partially operable, just warn. | ||
136 | */ | ||
137 | dev_warn(&hdev->dev, | ||
138 | "Failed to enable force feedback support, error: %d\n", | ||
139 | error); | ||
140 | } | ||
141 | |||
142 | return 0; | ||
143 | } | ||
144 | |||
145 | static const struct hid_device_id ax_devices[] = { | ||
146 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), }, | ||
147 | { } | ||
148 | }; | ||
149 | MODULE_DEVICE_TABLE(hid, ax_devices); | ||
150 | |||
151 | static struct hid_driver ax_driver = { | ||
152 | .name = "acrux", | ||
153 | .id_table = ax_devices, | ||
154 | .probe = ax_probe, | ||
155 | }; | ||
156 | |||
157 | static int __init ax_init(void) | ||
158 | { | ||
159 | return hid_register_driver(&ax_driver); | ||
160 | } | ||
161 | |||
162 | static void __exit ax_exit(void) | ||
163 | { | ||
164 | hid_unregister_driver(&ax_driver); | ||
165 | } | ||
166 | |||
167 | module_init(ax_init); | ||
168 | module_exit(ax_exit); | ||
169 | |||
170 | MODULE_AUTHOR("Sergei Kolzun"); | ||
171 | MODULE_DESCRIPTION("Force feedback support for ACRUX game controllers"); | ||
172 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index be7ee330e480..e13d8033a84b 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1239,6 +1239,9 @@ static const struct hid_device_id hid_blacklist[] = { | |||
1239 | { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) }, | 1239 | { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) }, |
1240 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, | 1240 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, |
1241 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, | 1241 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, |
1242 | #if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE) | ||
1243 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, | ||
1244 | #endif | ||
1242 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) }, | 1245 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) }, |
1243 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) }, | 1246 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) }, |
1244 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, | 1247 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 066d219b7f10..08b6ac6d2cc1 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -34,7 +34,9 @@ | |||
34 | #define USB_DEVICE_ID_ACECAD_FLAIR 0x0004 | 34 | #define USB_DEVICE_ID_ACECAD_FLAIR 0x0004 |
35 | #define USB_DEVICE_ID_ACECAD_302 0x0008 | 35 | #define USB_DEVICE_ID_ACECAD_302 0x0008 |
36 | 36 | ||
37 | #define USB_VENDOR_ID_ADS_TECH 0x06e1 | 37 | #define USB_VENDOR_ID_ACRUX 0x1a34 |
38 | |||
39 | #define USB_VENDOR_ID_ADS_TECH 0x06e1 | ||
38 | #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155 | 40 | #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155 |
39 | 41 | ||
40 | #define USB_VENDOR_ID_AFATECH 0x15a4 | 42 | #define USB_VENDOR_ID_AFATECH 0x15a4 |