Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76483cf4 authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files

HID: remove hid-ff 



hid-ff.c now calls only pidff (generic driver), the special ones are now
in separate drivers. Invoke pidff on all non-special directly.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 987fbc1f

drivers/hid/usbhid/Kconfig

+0 −13
Original line number Original line Diff line number Diff line
@@ -24,21 +24,8 @@ config USB_HID 
comment "Input core support is needed for USB HID input layer or HIDBP support"

comment "Input core support is needed for USB HID input layer or HIDBP support"

	depends on USB_HID && INPUT=n

	depends on USB_HID && INPUT=n





config HID_FF

	bool "Force feedback support (EXPERIMENTAL)"

	depends on USB_HID && EXPERIMENTAL

	help

	  Say Y here is you want force feedback support for a few HID devices.

	  See below for a list of supported devices.



	  See <file:Documentation/input/ff.txt> for a description of the force

	  feedback API.



	  If unsure, say N.



config HID_PID

config HID_PID

	bool "PID device support"

	bool "PID device support"

	depends on HID_FF

	help

	help

	  Say Y here if you have a PID-compliant device and wish to enable force

	  Say Y here if you have a PID-compliant device and wish to enable force

	  feedback for it. Microsoft Sidewinder Force Feedback 2 is one of such

	  feedback for it. Microsoft Sidewinder Force Feedback 2 is one of such

drivers/hid/usbhid/Makefile

+0 −3
Original line number Original line Diff line number Diff line
@@ -13,9 +13,6 @@ endif 
ifeq ($(CONFIG_HID_PID),y)

ifeq ($(CONFIG_HID_PID),y)

	usbhid-objs	+= hid-pidff.o

	usbhid-objs	+= hid-pidff.o

endif

endif

ifeq ($(CONFIG_HID_FF),y)

	usbhid-objs	+= hid-ff.o

endif





obj-$(CONFIG_USB_HID)		+= usbhid.o

obj-$(CONFIG_USB_HID)		+= usbhid.o

obj-$(CONFIG_USB_KBD)		+= usbkbd.o

obj-$(CONFIG_USB_KBD)		+= usbkbd.o

drivers/hid/usbhid/hid-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -935,7 +935,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	usb_set_intfdata(intf, hid);

	usb_set_intfdata(intf, hid);

	hid->ll_driver = &usb_hid_driver;

	hid->ll_driver = &usb_hid_driver;

	hid->hid_output_raw_report = usbhid_output_raw_report;

	hid->hid_output_raw_report = usbhid_output_raw_report;

	hid->ff_init = hid_ff_init;

	hid->ff_init = hid_pidff_init;

#ifdef CONFIG_USB_HIDDEV

#ifdef CONFIG_USB_HIDDEV

	hid->hiddev_connect = hiddev_connect;

	hid->hiddev_connect = hiddev_connect;

	hid->hiddev_hid_event = hiddev_hid_event;

	hid->hiddev_hid_event = hiddev_hid_event;

drivers/hid/usbhid/hid-ff.c

deleted100644 → 0
+0 −69
Original line number Original line Diff line number Diff line 
/*

 *  Force feedback support for hid devices.

 *  Not all hid devices use the same protocol. For example, some use PID,

 *  other use their own proprietary procotol.

 *

 *  Copyright (c) 2002-2004 Johann Deneux

 */



/*

 * 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>



#undef DEBUG

#include <linux/usb.h>



#include <linux/hid.h>

#include "usbhid.h"



/*

 * This table contains pointers to initializers. To add support for new

 * devices, you need to add the USB vendor and product ids here.

 */

struct hid_ff_initializer {

	u16 idVendor;

	u16 idProduct;

	int (*init)(struct hid_device*);

};



/*

 * We try pidff when no other driver is found because PID is the

 * standards compliant way of implementing force feedback in HID.

 * pidff_init() will quickly abort if the device doesn't appear to

 * be a PID device

 */

static struct hid_ff_initializer inits[] = {

	{ 0,	 0,	 hid_pidff_init}  /* Matches anything */

};



int hid_ff_init(struct hid_device* hid)

{

	struct hid_ff_initializer *init;

	int vendor = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idVendor);

	int product = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idProduct);



	for (init = inits; init->idVendor; init++)

		if (init->idVendor == vendor && init->idProduct == product)

			break;



	return init->init(hid);

}

EXPORT_SYMBOL_GPL(hid_ff_init);

include/linux/hid.h

+1 −8
Original line number Original line Diff line number Diff line
@@ -757,17 +757,10 @@ int usbhid_quirks_init(char **quirks_param); 
void usbhid_quirks_exit(void);

void usbhid_quirks_exit(void);

void usbhid_set_leds(struct hid_device *hid);

void usbhid_set_leds(struct hid_device *hid);





#ifdef CONFIG_HID_FF

int hid_ff_init(struct hid_device *hid);



#ifdef CONFIG_HID_PID

#ifdef CONFIG_HID_PID

int hid_pidff_init(struct hid_device *hid);

int hid_pidff_init(struct hid_device *hid);

#else

#else

static inline int hid_pidff_init(struct hid_device *hid) { return -ENODEV; }

#define hid_pidff_init NULL

#endif



#else

#define hid_ff_init	NULL

#endif

#endif





#ifdef CONFIG_HID_DEBUG

#ifdef CONFIG_HID_DEBUG