HID: move zeroplus FF processing
Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Родитель
10e41a711e
Коммит
987fbc1f7d
|
@ -252,6 +252,14 @@ config THRUSTMASTER_FF
|
|||
Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
|
||||
a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.
|
||||
|
||||
config ZEROPLUS_FF
|
||||
tristate "Zeroplus based game controller support"
|
||||
default m
|
||||
depends on USB_HID
|
||||
select INPUT_FF_MEMLESS
|
||||
help
|
||||
Say Y here if you have a Zeroplus based game controller.
|
||||
|
||||
endmenu
|
||||
|
||||
endif # HID_SUPPORT
|
||||
|
|
|
@ -38,6 +38,7 @@ obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
|
|||
obj-$(CONFIG_HID_SONY) += hid-sony.o
|
||||
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
|
||||
obj-$(CONFIG_THRUSTMASTER_FF) += hid-tmff.o
|
||||
obj-$(CONFIG_ZEROPLUS_FF) += hid-zpff.o
|
||||
|
||||
obj-$(CONFIG_USB_HID) += usbhid/
|
||||
obj-$(CONFIG_USB_MOUSE) += usbhid/
|
||||
|
|
|
@ -1530,6 +1530,8 @@ static const struct hid_device_id hid_ignore_list[] = {
|
|||
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
|
||||
{ }
|
||||
};
|
||||
|
||||
|
|
|
@ -58,6 +58,9 @@ static int __init hid_dummy_init(void)
|
|||
#ifdef CONFIG_THRUSTMASTER_FF_MODULE
|
||||
HID_COMPAT_CALL_DRIVER(thrustmaster);
|
||||
#endif
|
||||
#ifdef CONFIG_ZEROPLUS_FF_MODULE
|
||||
HID_COMPAT_CALL_DRIVER(zeroplus);
|
||||
#endif
|
||||
|
||||
return -EIO;
|
||||
}
|
||||
|
|
|
@ -388,6 +388,8 @@
|
|||
#define USB_VENDOR_ID_YEALINK 0x6993
|
||||
#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001
|
||||
|
||||
#define USB_VENDOR_ID_ZEROPLUS 0x0c12
|
||||
|
||||
#define USB_VENDOR_ID_KYE 0x0458
|
||||
#define USB_DEVICE_ID_KYE_GPEN_560 0x5003
|
||||
|
||||
|
|
|
@ -21,16 +21,19 @@
|
|||
*/
|
||||
|
||||
|
||||
#include <linux/hid.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/hid.h>
|
||||
#include "usbhid.h"
|
||||
|
||||
#include "hid-ids.h"
|
||||
|
||||
#include "usbhid/usbhid.h"
|
||||
|
||||
struct zpff_device {
|
||||
struct hid_report *report;
|
||||
};
|
||||
|
||||
static int hid_zpff_play(struct input_dev *dev, void *data,
|
||||
static int zpff_play(struct input_dev *dev, void *data,
|
||||
struct ff_effect *effect)
|
||||
{
|
||||
struct hid_device *hid = input_get_drvdata(dev);
|
||||
|
@ -58,7 +61,7 @@ static int hid_zpff_play(struct input_dev *dev, void *data,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int hid_zpff_init(struct hid_device *hid)
|
||||
static int zpff_init(struct hid_device *hid)
|
||||
{
|
||||
struct zpff_device *zpff;
|
||||
struct hid_report *report;
|
||||
|
@ -87,7 +90,7 @@ int hid_zpff_init(struct hid_device *hid)
|
|||
|
||||
set_bit(FF_RUMBLE, dev->ffbit);
|
||||
|
||||
error = input_ff_create_memless(dev, zpff, hid_zpff_play);
|
||||
error = input_ff_create_memless(dev, zpff, zpff_play);
|
||||
if (error) {
|
||||
kfree(zpff);
|
||||
return error;
|
||||
|
@ -105,3 +108,55 @@ int hid_zpff_init(struct hid_device *hid)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int zp_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = hid_parse(hdev);
|
||||
if (ret) {
|
||||
dev_err(&hdev->dev, "parse failed\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_FF);
|
||||
if (ret) {
|
||||
dev_err(&hdev->dev, "hw start failed\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
zpff_init(hdev);
|
||||
|
||||
return 0;
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const struct hid_device_id zp_devices[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(hid, zp_devices);
|
||||
|
||||
static struct hid_driver zp_driver = {
|
||||
.name = "zeroplus",
|
||||
.id_table = zp_devices,
|
||||
.probe = zp_probe,
|
||||
};
|
||||
|
||||
static int zp_init(void)
|
||||
{
|
||||
return hid_register_driver(&zp_driver);
|
||||
}
|
||||
|
||||
static void zp_exit(void)
|
||||
{
|
||||
hid_unregister_driver(&zp_driver);
|
||||
}
|
||||
|
||||
module_init(zp_init);
|
||||
module_exit(zp_exit);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
HID_COMPAT_LOAD_DRIVER(zeroplus);
|
|
@ -44,14 +44,6 @@ config HID_PID
|
|||
feedback for it. Microsoft Sidewinder Force Feedback 2 is one of such
|
||||
devices.
|
||||
|
||||
config ZEROPLUS_FF
|
||||
bool "Zeroplus based game controller support"
|
||||
depends on HID_FF
|
||||
select INPUT_FF_MEMLESS if USB_HID
|
||||
help
|
||||
Say Y here if you have a Zeroplus based game controller and want to
|
||||
enable force feedback for it.
|
||||
|
||||
config USB_HIDDEV
|
||||
bool "/dev/hiddev raw HID device support"
|
||||
depends on USB_HID
|
||||
|
|
|
@ -13,9 +13,6 @@ endif
|
|||
ifeq ($(CONFIG_HID_PID),y)
|
||||
usbhid-objs += hid-pidff.o
|
||||
endif
|
||||
ifeq ($(CONFIG_ZEROPLUS_FF),y)
|
||||
usbhid-objs += hid-zpff.o
|
||||
endif
|
||||
ifeq ($(CONFIG_HID_FF),y)
|
||||
usbhid-objs += hid-ff.o
|
||||
endif
|
||||
|
|
|
@ -50,10 +50,6 @@ struct hid_ff_initializer {
|
|||
* be a PID device
|
||||
*/
|
||||
static struct hid_ff_initializer inits[] = {
|
||||
#ifdef CONFIG_ZEROPLUS_FF
|
||||
{ 0xc12, 0x0005, hid_zpff_init },
|
||||
{ 0xc12, 0x0030, hid_zpff_init },
|
||||
#endif
|
||||
{ 0, 0, hid_pidff_init} /* Matches anything */
|
||||
};
|
||||
|
||||
|
|
|
@ -760,7 +760,6 @@ void usbhid_set_leds(struct hid_device *hid);
|
|||
#ifdef CONFIG_HID_FF
|
||||
int hid_ff_init(struct hid_device *hid);
|
||||
|
||||
int hid_zpff_init(struct hid_device *hid);
|
||||
#ifdef CONFIG_HID_PID
|
||||
int hid_pidff_init(struct hid_device *hid);
|
||||
#else
|
||||
|
|
Загрузка…
Ссылка в новой задаче