View | Details | Raw Unified | Return to bug 10818 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/hid/hid-apple.c (-4 / +4 lines)
Lines 35-44 Link Here
35
35
36
#define APPLE_FLAG_FKEY		0x01
36
#define APPLE_FLAG_FKEY		0x01
37
37
38
static unsigned int fnmode = 1;
38
static unsigned int fnmode = 2;
39
module_param(fnmode, uint, 0644);
39
module_param(fnmode, uint, 0644);
40
MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, "
40
MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, "
41
		"[1] = fkeyslast, 2 = fkeysfirst)");
41
		"1 = fkeyslast, [2] = fkeysfirst)");
42
42
43
struct apple_sc {
43
struct apple_sc {
44
	unsigned long quirks;
44
	unsigned long quirks;
Lines 396-402 static const struct hid_device_id apple_devices[] = { Link Here
396
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),
396
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),
397
		.driver_data = APPLE_HAS_FN },
397
		.driver_data = APPLE_HAS_FN },
398
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),
398
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),
399
		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
399
		.driver_data = APPLE_HAS_FN },
400
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS),
400
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS),
401
		.driver_data = APPLE_HAS_FN },
401
		.driver_data = APPLE_HAS_FN },
402
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI),
402
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI),
Lines 409-415 static const struct hid_device_id apple_devices[] = { Link Here
409
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
409
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
410
		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
410
		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
411
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
411
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
412
		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
412
		.driver_data = APPLE_HAS_FN |
413
			APPLE_ISO_KEYBOARD },
413
			APPLE_ISO_KEYBOARD },
414
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
414
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
415
		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
415
		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

Return to bug 10818