Commit 76398f96 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: fix pb_fnmode and move it to generic HID 



The apple powerbook people are used to switch the pb_fnmode
setting at runtime through writing to sysfs, altering the
module parameter value. This was broken for them in 2.6.20-rc1
when generic HID layer was introduced, as the pb_fnmode flag
was made per-hiddevice, instead of global variable.

This patch moves the pb_fnmode module parameter from usbhid module
to hid module, but apart from that retains backward compatibility
with respect to changing the mode through sysfs.

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 8eda232e

drivers/hid/hid-input.c

+8 −3
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 


#include <linux/hid.h>



static int hid_pb_fnmode = 1;

module_param_named(pb_fnmode, hid_pb_fnmode, int, 0644);

MODULE_PARM_DESC(pb_fnmode,

		"Mode of fn key on PowerBooks (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");



#define unk	KEY_UNKNOWN



static const unsigned char hid_keyboard[256] = {
@@ -154,7 +159,7 @@ static int hidinput_pb_event(struct hid_device *hid, struct input_dev *input, 
		return 1;

	}



	if (hid->pb_fnmode) {

	if (hid_pb_fnmode) {

		int do_translate;



		trans = find_translation(powerbook_fn_keys, usage->code);
@@ -163,8 +168,8 @@ static int hidinput_pb_event(struct hid_device *hid, struct input_dev *input, 
				do_translate = 1;

			else if (trans->flags & POWERBOOK_FLAG_FKEY)

				do_translate =

					(hid->pb_fnmode == 2 &&  (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON)) ||

					(hid->pb_fnmode == 1 && !(hid->quirks & HID_QUIRK_POWERBOOK_FN_ON));

					(hid_pb_fnmode == 2 &&  (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON)) ||

					(hid_pb_fnmode == 1 && !(hid->quirks & HID_QUIRK_POWERBOOK_FN_ON));

			else

				do_translate = (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON);

drivers/usb/input/hid-core.c

+0 −9
Original line number Diff line number Diff line
@@ -56,11 +56,6 @@ static unsigned int hid_mousepoll_interval; 
module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644);

MODULE_PARM_DESC(mousepoll, "Polling interval of mice");



static int usbhid_pb_fnmode = 1;

module_param_named(pb_fnmode, usbhid_pb_fnmode, int, 0644);

MODULE_PARM_DESC(pb_fnmode,

		"Mode of fn key on PowerBooks (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");



/*

 * Input submission and I/O error handler.

 */
@@ -1246,10 +1241,6 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) 
	hid->hiddev_hid_event = hiddev_hid_event;

	hid->hiddev_report_event = hiddev_report_event;

#endif

#ifdef CONFIG_USB_HIDINPUT_POWERBOOK

	hid->pb_fnmode = usbhid_pb_fnmode;

#endif



	return hid;



fail:

include/linux/hid.h

+0 −1
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ struct hid_device { /* device report descriptor */ 
				  struct hid_usage *, __s32);

	void (*hiddev_report_event) (struct hid_device *, struct hid_report *);

#ifdef CONFIG_USB_HIDINPUT_POWERBOOK

	unsigned int  pb_fnmode;

	unsigned long pb_pressed_fn[NBITS(KEY_MAX)];

	unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE