diff options
-rw-r--r-- | drivers/usb/input/Kconfig | 8 | ||||
-rw-r--r-- | drivers/usb/input/Makefile | 3 | ||||
-rw-r--r-- | drivers/usb/input/hid-ff.c | 4 | ||||
-rw-r--r-- | drivers/usb/input/hid-zpff.c | 110 | ||||
-rw-r--r-- | drivers/usb/input/hid.h | 1 |
5 files changed, 126 insertions, 0 deletions
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig index 3ca64c3cada3..7ec35c90d2d7 100644 --- a/drivers/usb/input/Kconfig +++ b/drivers/usb/input/Kconfig | |||
@@ -89,6 +89,14 @@ config THRUSTMASTER_FF | |||
89 | Note: if you say N here, this device will still be supported, but without | 89 | Note: if you say N here, this device will still be supported, but without |
90 | force feedback. | 90 | force feedback. |
91 | 91 | ||
92 | config ZEROPLUS_FF | ||
93 | bool "Zeroplus based game controller support" | ||
94 | depends on HID_FF | ||
95 | select INPUT_FF_MEMLESS if USB_HID | ||
96 | help | ||
97 | Say Y here if you have a Zeroplus based game controller and want to | ||
98 | enable force feedback for it. | ||
99 | |||
92 | config USB_HIDDEV | 100 | config USB_HIDDEV |
93 | bool "/dev/hiddev raw HID device support" | 101 | bool "/dev/hiddev raw HID device support" |
94 | depends on USB_HID | 102 | depends on USB_HID |
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index 84e72dcfc920..affb6a36d242 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile | |||
@@ -22,6 +22,9 @@ endif | |||
22 | ifeq ($(CONFIG_THRUSTMASTER_FF),y) | 22 | ifeq ($(CONFIG_THRUSTMASTER_FF),y) |
23 | usbhid-objs += hid-tmff.o | 23 | usbhid-objs += hid-tmff.o |
24 | endif | 24 | endif |
25 | ifeq ($(CONFIG_ZEROPLUS_FF),y) | ||
26 | usbhid-objs += hid-zpff.o | ||
27 | endif | ||
25 | ifeq ($(CONFIG_HID_FF),y) | 28 | ifeq ($(CONFIG_HID_FF),y) |
26 | usbhid-objs += hid-ff.o | 29 | usbhid-objs += hid-ff.o |
27 | endif | 30 | endif |
diff --git a/drivers/usb/input/hid-ff.c b/drivers/usb/input/hid-ff.c index 1b4882202144..a8fc46c721c5 100644 --- a/drivers/usb/input/hid-ff.c +++ b/drivers/usb/input/hid-ff.c | |||
@@ -60,6 +60,10 @@ static struct hid_ff_initializer inits[] = { | |||
60 | #ifdef CONFIG_THRUSTMASTER_FF | 60 | #ifdef CONFIG_THRUSTMASTER_FF |
61 | { 0x44f, 0xb304, hid_tmff_init }, | 61 | { 0x44f, 0xb304, hid_tmff_init }, |
62 | #endif | 62 | #endif |
63 | #ifdef CONFIG_ZEROPLUS_FF | ||
64 | { 0xc12, 0x0005, hid_zpff_init }, | ||
65 | { 0xc12, 0x0030, hid_zpff_init }, | ||
66 | #endif | ||
63 | { 0, 0, hid_pidff_init} /* Matches anything */ | 67 | { 0, 0, hid_pidff_init} /* Matches anything */ |
64 | }; | 68 | }; |
65 | 69 | ||
diff --git a/drivers/usb/input/hid-zpff.c b/drivers/usb/input/hid-zpff.c new file mode 100644 index 000000000000..d2ce3214572c --- /dev/null +++ b/drivers/usb/input/hid-zpff.c | |||
@@ -0,0 +1,110 @@ | |||
1 | /* | ||
2 | * Force feedback support for Zeroplus based devices | ||
3 | * | ||
4 | * Copyright (c) 2005, 2006 Anssi Hannula <anssi.hannula@gmail.com> | ||
5 | */ | ||
6 | |||
7 | /* | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
21 | */ | ||
22 | |||
23 | |||
24 | /* #define DEBUG */ | ||
25 | |||
26 | #define debug(format, arg...) pr_debug("hid-zpff: " format "\n" , ## arg) | ||
27 | |||
28 | #include <linux/input.h> | ||
29 | #include <linux/usb.h> | ||
30 | #include "hid.h" | ||
31 | |||
32 | struct zpff_device { | ||
33 | struct hid_report *report; | ||
34 | }; | ||
35 | |||
36 | static int hid_zpff_play(struct input_dev *dev, void *data, | ||
37 | struct ff_effect *effect) | ||
38 | { | ||
39 | struct hid_device *hid = dev->private; | ||
40 | struct zpff_device *zpff = data; | ||
41 | int left, right; | ||
42 | |||
43 | /* | ||
44 | * The following is specified the other way around in the Zeroplus | ||
45 | * datasheet but the order below is correct for the XFX Executioner; | ||
46 | * however it is possible that the XFX Executioner is an exception | ||
47 | */ | ||
48 | |||
49 | left = effect->u.rumble.strong_magnitude; | ||
50 | right = effect->u.rumble.weak_magnitude; | ||
51 | debug("called with 0x%04x 0x%04x", left, right); | ||
52 | |||
53 | left = left * 0x7f / 0xffff; | ||
54 | right = right * 0x7f / 0xffff; | ||
55 | |||
56 | zpff->report->field[2]->value[0] = left; | ||
57 | zpff->report->field[3]->value[0] = right; | ||
58 | debug("running with 0x%02x 0x%02x", left, right); | ||
59 | hid_submit_report(hid, zpff->report, USB_DIR_OUT); | ||
60 | |||
61 | return 0; | ||
62 | } | ||
63 | |||
64 | int hid_zpff_init(struct hid_device *hid) | ||
65 | { | ||
66 | struct zpff_device *zpff; | ||
67 | struct hid_report *report; | ||
68 | struct hid_input *hidinput = list_entry(hid->inputs.next, | ||
69 | struct hid_input, list); | ||
70 | struct list_head *report_list = | ||
71 | &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 | printk(KERN_ERR "hid-zpff: no output report found\n"); | ||
77 | return -ENODEV; | ||
78 | } | ||
79 | |||
80 | report = list_entry(report_list->next, struct hid_report, list); | ||
81 | |||
82 | if (report->maxfield < 4) { | ||
83 | printk(KERN_ERR "hid-zpff: not enough fields in report\n"); | ||
84 | return -ENODEV; | ||
85 | } | ||
86 | |||
87 | zpff = kzalloc(sizeof(struct zpff_device), GFP_KERNEL); | ||
88 | if (!zpff) | ||
89 | return -ENOMEM; | ||
90 | |||
91 | set_bit(FF_RUMBLE, dev->ffbit); | ||
92 | |||
93 | error = input_ff_create_memless(dev, zpff, hid_zpff_play); | ||
94 | if (error) { | ||
95 | kfree(zpff); | ||
96 | return error; | ||
97 | } | ||
98 | |||
99 | zpff->report = report; | ||
100 | zpff->report->field[0]->value[0] = 0x00; | ||
101 | zpff->report->field[1]->value[0] = 0x02; | ||
102 | zpff->report->field[2]->value[0] = 0x00; | ||
103 | zpff->report->field[3]->value[0] = 0x00; | ||
104 | hid_submit_report(hid, zpff->report, USB_DIR_OUT); | ||
105 | |||
106 | printk(KERN_INFO "Force feedback for Zeroplus based devices by " | ||
107 | "Anssi Hannula <anssi.hannula@gmail.com>\n"); | ||
108 | |||
109 | return 0; | ||
110 | } | ||
diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h index 6d88c0c0b903..3dae8a949de2 100644 --- a/drivers/usb/input/hid.h +++ b/drivers/usb/input/hid.h | |||
@@ -525,6 +525,7 @@ int hid_ff_init(struct hid_device *hid); | |||
525 | 525 | ||
526 | int hid_lgff_init(struct hid_device *hid); | 526 | int hid_lgff_init(struct hid_device *hid); |
527 | int hid_tmff_init(struct hid_device *hid); | 527 | int hid_tmff_init(struct hid_device *hid); |
528 | int hid_zpff_init(struct hid_device *hid); | ||
528 | #ifdef CONFIG_HID_PID | 529 | #ifdef CONFIG_HID_PID |
529 | int hid_pidff_init(struct hid_device *hid); | 530 | int hid_pidff_init(struct hid_device *hid); |
530 | #else | 531 | #else |