diff options
| author | Stefan Glasenhardt <stefan@glasen-hardt.de> | 2010-01-05 23:30:30 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-01-06 11:21:37 +0100 |
| commit | 54a6593d65e638ad7e1e8cc986159d76054dab4b (patch) | |
| tree | d26cb72a7ba89dbeab7d9df9d530dad03ed52e06 /drivers/hid/hid-apple.c | |
| parent | 722612cd51cf1b574c89dff57cc5dbedf1f645bb (diff) | |
| download | linux-stable-54a6593d65e638ad7e1e8cc986159d76054dab4b.tar.gz linux-stable-54a6593d65e638ad7e1e8cc986159d76054dab4b.tar.bz2 linux-stable-54a6593d65e638ad7e1e8cc986159d76054dab4b.zip | |
HID: allow disabling hard-coded ISO-layout for Apple keyboards
This patch adds a new option named "iso_layout" to the driver
"hid-apple.ko", to allow disabling of the hard-coded ISO-layout.
Disabling the hard-coded layout solves the problem that the kernel-module only
works perfectly for the english/american version of the Apple aluminum
keyboard. Other versions have swapped keys, e.g. the "<"-key is swapped with
"^"-key on the german keyboard. There is a very long bug-entry on Launchpad to
this problem:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/214786
Signed-off-by: Stefan Glasenhardt <stefan@glasen-hardt.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-apple.c')
| -rw-r--r-- | drivers/hid/hid-apple.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 4b96e7a898cf..1433cbbaa99f 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -40,6 +40,11 @@ module_param(fnmode, uint, 0644); MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, " "[1] = fkeyslast, 2 = fkeysfirst)"); +static unsigned int iso_layout = 1; +module_param(iso_layout, uint, 0644); +MODULE_PARM_DESC(iso_layout, "Enable/Disable hardcoded ISO-layout of the keyboard. " + "(0 = disabled, [1] = enabled)"); + struct apple_sc { unsigned long quirks; unsigned int fn_on; @@ -199,11 +204,13 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, } } - if (asc->quirks & APPLE_ISO_KEYBOARD) { - trans = apple_find_translation(apple_iso_keyboard, usage->code); - if (trans) { - input_event(input, usage->type, trans->to, value); - return 1; + if (iso_layout) { + if (asc->quirks & APPLE_ISO_KEYBOARD) { + trans = apple_find_translation(apple_iso_keyboard, usage->code); + if (trans) { + input_event(input, usage->type, trans->to, value); + return 1; + } } } |