GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-01 12:04:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

HID: fix pb_fnmode and move it to generic HID

Browse source 
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: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Jiri Kosina 2007-01-29 12:44:41 +01:00
parent 8eda232e22
commit 76398f9667
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/hid/hid-input.c
View file

@ -35,6 +35,11 @@
#include <linux/hid.h> #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 #define unk KEY_UNKNOWN
static const unsigned char hid_keyboard[256] = { 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; return 1;
} }
if (hid->pb_fnmode) { if (hid_pb_fnmode) {
int do_translate; int do_translate;
trans = find_translation(powerbook_fn_keys, usage->code); 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; do_translate = 1;
else if (trans->flags & POWERBOOK_FLAG_FKEY) else if (trans->flags & POWERBOOK_FLAG_FKEY)
do_translate = do_translate =
(hid->pb_fnmode == 2 && (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)); (hid_pb_fnmode == 1 && !(hid->quirks & HID_QUIRK_POWERBOOK_FN_ON));
else else
do_translate = (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON); do_translate = (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON);

9
drivers/usb/input/hid-core.c
View file

@ -56,11 +56,6 @@ static unsigned int hid_mousepoll_interval;
module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644); module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644);
MODULE_PARM_DESC(mousepoll, "Polling interval of mice"); 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. * 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_hid_event = hiddev_hid_event;
hid->hiddev_report_event = hiddev_report_event; hid->hiddev_report_event = hiddev_report_event;
#endif #endif
#ifdef CONFIG_USB_HIDINPUT_POWERBOOK
hid->pb_fnmode = usbhid_pb_fnmode;
#endif
return hid; return hid;
fail: fail:

1
include/linux/hid.h
View file

@ -438,7 +438,6 @@ struct hid_device { /* device report descriptor */
struct hid_usage *, __s32); struct hid_usage *, __s32);
void (*hiddev_report_event) (struct hid_device *, struct hid_report *); void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
#ifdef CONFIG_USB_HIDINPUT_POWERBOOK #ifdef CONFIG_USB_HIDINPUT_POWERBOOK
unsigned int pb_fnmode;
unsigned long pb_pressed_fn[NBITS(KEY_MAX)]; unsigned long pb_pressed_fn[NBITS(KEY_MAX)];
unsigned long pb_pressed_numlock[NBITS(KEY_MAX)]; unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];
#endif #endif