HID: move logitech FF processing

Merge the logitech force feedback processing directly into logitech
driver from the usbhid core.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

6 files changed, 1 insertions, 307 deletions

diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig
index 177bfa1a3e5b..0e7e2e6d975e 100644
--- a/drivers/hid/usbhid/Kconfig
+++ b/drivers/hid/usbhid/Kconfig
@@ -44,30 +44,6 @@ config HID_PID
           feedback for it. Microsoft Sidewinder Force Feedback 2 is one of such
           devices.
 
-config LOGITECH_FF
-        bool "Logitech devices support"
-        depends on HID_FF
-        select INPUT_FF_MEMLESS if USB_HID
-        help
-          Say Y here if you have one of these devices:
-          - Logitech WingMan Cordless RumblePad
-          - Logitech WingMan Cordless RumblePad 2
-          - Logitech WingMan Force 3D
-          - Logitech Formula Force EX
-          - Logitech MOMO Force wheel
-
-          and if you want to enable force feedback for them.
-          Note: if you say N here, this device will still be supported, but without
-          force feedback.
-
-config LOGIRUMBLEPAD2_FF
-        bool "Logitech Rumblepad 2 support"
-        depends on HID_FF
-        select INPUT_FF_MEMLESS if USB_HID
-        help
-          Say Y here if you want to enable force feedback support for Logitech
-          Rumblepad 2 devices.
-
 config PANTHERLORD_FF
         bool "PantherLord/GreenAsia based device support"
         depends on HID_FF
diff --git a/drivers/hid/usbhid/Makefile b/drivers/hid/usbhid/Makefile
index 00a7b7090192..224c62dc6a32 100644
--- a/drivers/hid/usbhid/Makefile
+++ b/drivers/hid/usbhid/Makefile
@@ -13,12 +13,6 @@ endif
 ifeq ($(CONFIG_HID_PID),y)
         usbhid-objs     += hid-pidff.o
 endif
-ifeq ($(CONFIG_LOGITECH_FF),y)
-        usbhid-objs     += hid-lgff.o
-endif
-ifeq ($(CONFIG_LOGIRUMBLEPAD2_FF),y)
-        usbhid-objs     += hid-lg2ff.o
-endif
 ifeq ($(CONFIG_PANTHERLORD_FF),y)
         usbhid-objs     += hid-plff.o
 endif
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 402ace751271..4ec10aa618db 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -444,6 +444,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
 
         spin_unlock_irqrestore(&usbhid->ctrllock, flags);
 }
+EXPORT_SYMBOL_GPL(usbhid_submit_report);
 
 static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
 {
diff --git a/drivers/hid/usbhid/hid-ff.c b/drivers/hid/usbhid/hid-ff.c
index 1d0dac52f166..8891f60d3beb 100644
--- a/drivers/hid/usbhid/hid-ff.c
+++ b/drivers/hid/usbhid/hid-ff.c
@@ -50,18 +50,6 @@ struct hid_ff_initializer {
  * be a PID device
  */
 static struct hid_ff_initializer inits[] = {
-#ifdef CONFIG_LOGITECH_FF
-        { 0x46d, 0xc211, hid_lgff_init }, /* Logitech Cordless rumble pad */
-        { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */
-        { 0x46d, 0xc283, hid_lgff_init }, /* Logitech Wingman Force 3d */
-        { 0x46d, 0xc286, hid_lgff_init }, /* Logitech Force 3D Pro Joystick */
-        { 0x46d, 0xc294, hid_lgff_init }, /* Logitech Formula Force EX */
-        { 0x46d, 0xc295, hid_lgff_init }, /* Logitech MOMO force wheel */
-        { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */
-#endif
-#ifdef CONFIG_LOGIRUMBLEPAD2_FF
-        { 0x46d, 0xc218, hid_lg2ff_init }, /* Logitech Rumblepad 2 */
-#endif
 #ifdef CONFIG_PANTHERLORD_FF
         { 0x810, 0x0001, hid_plff_init }, /* "Twin USB Joystick" */
         { 0xe8f, 0x0003, hid_plff_init }, /* "GreenAsia Inc.    USB Joystick     " */
diff --git a/drivers/hid/usbhid/hid-lg2ff.c b/drivers/hid/usbhid/hid-lg2ff.c
deleted file mode 100644
index d469bd0061c9..000000000000
--- a/drivers/hid/usbhid/hid-lg2ff.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Force feedback support for Logitech Rumblepad 2
- *
- *  Copyright (c) 2008 Anssi Hannula <anssi.hannula@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.
- *
- * 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/usb.h>
-#include <linux/hid.h>
-#include "usbhid.h"
-
-struct lg2ff_device {
-        struct hid_report *report;
-};
-
-static int play_effect(struct input_dev *dev, void *data,
-                         struct ff_effect *effect)
-{
-        struct hid_device *hid = input_get_drvdata(dev);
-        struct lg2ff_device *lg2ff = data;
-        int weak, strong;
-
-        strong = effect->u.rumble.strong_magnitude;
-        weak = effect->u.rumble.weak_magnitude;
-
-        if (weak || strong) {
-                weak = weak * 0xff / 0xffff;
-                strong = strong * 0xff / 0xffff;
-
-                lg2ff->report->field[0]->value[0] = 0x51;
-                lg2ff->report->field[0]->value[2] = weak;
-                lg2ff->report->field[0]->value[4] = strong;
-        } else {
-                lg2ff->report->field[0]->value[0] = 0xf3;
-                lg2ff->report->field[0]->value[2] = 0x00;
-                lg2ff->report->field[0]->value[4] = 0x00;
-        }
-
-        usbhid_submit_report(hid, lg2ff->report, USB_DIR_OUT);
-        return 0;
-}
-
-int hid_lg2ff_init(struct hid_device *hid)
-{
-        struct lg2ff_device *lg2ff;
-        struct hid_report *report;
-        struct hid_input *hidinput = list_entry(hid->inputs.next,
-                                                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)) {
-                printk(KERN_ERR "hid-lg2ff: no output report found\n");
-                return -ENODEV;
-        }
-
-        report = list_entry(report_list->next, struct hid_report, list);
-
-        if (report->maxfield < 1) {
-                printk(KERN_ERR "hid-lg2ff: output report is empty\n");
-                return -ENODEV;
-        }
-        if (report->field[0]->report_count < 7) {
-                printk(KERN_ERR "hid-lg2ff: not enough values in the field\n");
-                return -ENODEV;
-        }
-
-        lg2ff = kmalloc(sizeof(struct lg2ff_device), GFP_KERNEL);
-        if (!lg2ff)
-                return -ENOMEM;
-
-        set_bit(FF_RUMBLE, dev->ffbit);
-
-        error = input_ff_create_memless(dev, lg2ff, play_effect);
-        if (error) {
-                kfree(lg2ff);
-                return error;
-        }
-
-        lg2ff->report = report;
-        report->field[0]->value[0] = 0xf3;
-        report->field[0]->value[1] = 0x00;
-        report->field[0]->value[2] = 0x00;
-        report->field[0]->value[3] = 0x00;
-        report->field[0]->value[4] = 0x00;
-        report->field[0]->value[5] = 0x00;
-        report->field[0]->value[6] = 0x00;
-
-        usbhid_submit_report(hid, report, USB_DIR_OUT);
-
-        printk(KERN_INFO "Force feedback for Logitech Rumblepad 2 by "
-               "Anssi Hannula <anssi.hannula@gmail.com>\n");
-
-        return 0;
-}
diff --git a/drivers/hid/usbhid/hid-lgff.c b/drivers/hid/usbhid/hid-lgff.c
deleted file mode 100644
index 4b7ab6a46d93..000000000000
--- a/drivers/hid/usbhid/hid-lgff.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Force feedback support for hid-compliant for some of the devices from
- * Logitech, namely:
- * - WingMan Cordless RumblePad
- * - WingMan Force 3D
- *
- *  Copyright (c) 2002-2004 Johann Deneux
- *  Copyright (c) 2006 Anssi Hannula <anssi.hannula@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.
- *
- * 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
- *
- * Should you need to contact me, the author, you can do so by
- * e-mail - mail your message to <johann.deneux@it.uu.se>
- */
-
-#include <linux/input.h>
-#include <linux/usb.h>
-#include <linux/hid.h>
-#include "usbhid.h"
-
-struct dev_type {
-        u16 idVendor;
-        u16 idProduct;
-        const signed short *ff;
-};
-
-static const signed short ff_rumble[] = {
-        FF_RUMBLE,
-        -1
-};
-
-static const signed short ff_joystick[] = {
-        FF_CONSTANT,
-        -1
-};
-
-static const struct dev_type devices[] = {
-        { 0x046d, 0xc211, ff_rumble },
-        { 0x046d, 0xc219, ff_rumble },
-        { 0x046d, 0xc283, ff_joystick },
-        { 0x046d, 0xc286, ff_joystick },
-        { 0x046d, 0xc294, ff_joystick },
-        { 0x046d, 0xc295, ff_joystick },
-        { 0x046d, 0xca03, ff_joystick },
-};
-
-static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *effect)
-{
-        struct hid_device *hid = input_get_drvdata(dev);
-        struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list;
-        struct hid_report *report = list_entry(report_list->next, struct hid_report, list);
-        int x, y;
-        unsigned int left, right;
-
-#define CLAMP(x) if (x < 0) x = 0; if (x > 0xff) x = 0xff
-
-        switch (effect->type) {
-        case FF_CONSTANT:
-                x = effect->u.ramp.start_level + 0x7f;  /* 0x7f is center */
-                y = effect->u.ramp.end_level + 0x7f;
-                CLAMP(x);
-                CLAMP(y);
-                report->field[0]->value[0] = 0x51;
-                report->field[0]->value[1] = 0x08;
-                report->field[0]->value[2] = x;
-                report->field[0]->value[3] = y;
-                dbg_hid("(x, y)=(%04x, %04x)\n", x, y);
-                usbhid_submit_report(hid, report, USB_DIR_OUT);
-                break;
-
-        case FF_RUMBLE:
-                right = effect->u.rumble.strong_magnitude;
-                left = effect->u.rumble.weak_magnitude;
-                right = right * 0xff / 0xffff;
-                left = left * 0xff / 0xffff;
-                CLAMP(left);
-                CLAMP(right);
-                report->field[0]->value[0] = 0x42;
-                report->field[0]->value[1] = 0x00;
-                report->field[0]->value[2] = left;
-                report->field[0]->value[3] = right;
-                dbg_hid("(left, right)=(%04x, %04x)\n", left, right);
-                usbhid_submit_report(hid, report, USB_DIR_OUT);
-                break;
-        }
-        return 0;
-}
-
-int hid_lgff_init(struct hid_device* hid)
-{
-        struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list);
-        struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list;
-        struct input_dev *dev = hidinput->input;
-        struct hid_report *report;
-        struct hid_field *field;
-        const signed short *ff_bits = ff_joystick;
-        int error;
-        int i;
-
-        /* Find the report to use */
-        if (list_empty(report_list)) {
-                err_hid("No output report found");
-                return -1;
-        }
-
-        /* Check that the report looks ok */
-        report = list_entry(report_list->next, struct hid_report, list);
-        if (!report) {
-                err_hid("NULL output report");
-                return -1;
-        }
-
-        field = report->field[0];
-        if (!field) {
-                err_hid("NULL field");
-                return -1;
-        }
-
-        for (i = 0; i < ARRAY_SIZE(devices); i++) {
-                if (dev->id.vendor == devices[i].idVendor &&
-                    dev->id.product == devices[i].idProduct) {
-                        ff_bits = devices[i].ff;
-                        break;
-                }
-        }
-
-        for (i = 0; ff_bits[i] >= 0; i++)
-                set_bit(ff_bits[i], dev->ffbit);
-
-        error = input_ff_create_memless(dev, NULL, hid_lgff_play);
-        if (error)
-                return error;
-
-        printk(KERN_INFO "Force feedback for Logitech force feedback devices by Johann Deneux <johann.deneux@it.uu.se>\n");
-
-        return 0;
-}