Commit bb7eef6e authored by Olaf Hering's avatar Olaf Hering Committed by Greg Kroah-Hartman
Browse files

USB: correct keymapping on Powerbook built-in USB ISO keyboards 



similar to the version in adbhid_input_register(): The '<>' key and the
'^°' key on a german keyboard is swapped.  Provide correct keys to
userland, external USB keyboards will not work correctly when the
'badmap'/'goodmap' workarounds from xkeyboard-config are used.

It is expected that distributions drop the badmap/goodmap part from
keycodes/macintosh in the xkeyboard-config package.

This is probably 2.6.18.x material, if major distros settle on 2.6.18.

Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 583ceada

drivers/usb/input/hid-core.c

+2 −2
Original line number Diff line number Diff line
@@ -1797,10 +1797,10 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0214, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},

	{ USB_VENDOR_ID_APPLE, 0x0216, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0217, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},

	{ USB_VENDOR_ID_APPLE, 0x0219, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },

	{ USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },

drivers/usb/input/hid-input.c

+17 −0
Original line number Diff line number Diff line
@@ -121,6 +121,12 @@ static struct hidinput_key_translation powerbook_numlock_keys[] = { 
	{ }

};



static struct hidinput_key_translation powerbook_iso_keyboard[] = {

	{ KEY_GRAVE,    KEY_102ND },

	{ KEY_102ND,    KEY_GRAVE },

	{ }

};



static int usbhid_pb_fnmode = 1;

module_param_named(pb_fnmode, usbhid_pb_fnmode, int, 0644);

MODULE_PARM_DESC(pb_fnmode,
@@ -195,6 +201,14 @@ static int hidinput_pb_event(struct hid_device *hid, struct input_dev *input, 
		}

	}



	if (hid->quirks & HID_QUIRK_POWERBOOK_ISO_KEYBOARD) {

		trans = find_translation(powerbook_iso_keyboard, usage->code);

		if (trans) {

			input_event(input, usage->type, trans->to, value);

			return 1;

		}

	}



	return 0;

}
@@ -210,6 +224,9 @@ static void hidinput_pb_setup(struct input_dev *input) 


	for (trans = powerbook_numlock_keys; trans->from; trans++)

		set_bit(trans->to, input->keybit);



	for (trans = powerbook_iso_keyboard; trans->from; trans++)

		set_bit(trans->to, input->keybit);

}

#else

static inline int hidinput_pb_event(struct hid_device *hid, struct input_dev *input,

drivers/usb/input/hid.h

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ struct hid_item { 
#define HID_QUIRK_POWERBOOK_HAS_FN		0x00001000

#define HID_QUIRK_POWERBOOK_FN_ON		0x00002000

#define HID_QUIRK_INVERT_HWHEEL			0x00004000

#define HID_QUIRK_POWERBOOK_ISO_KEYBOARD	0x00008000



/*

 * This is the global environment of the parser. This information is

CRA Git | Maintained and supported by SUSTech CRA and CCSE