From 25bb0727e6bdc0f44f68319c778dd306fddcbded Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Mon, 5 Sep 2005 01:57:33 -0500 Subject: [PATCH] --- yaml --- r: 8473 b: refs/heads/master c: e875ce374759087771313c9e76b672b86ac20950 h: refs/heads/master i: 8471: abafc6151822e83344175ae1d0a66ecaef6b93a3 v: v3 --- [refs] | 2 +- trunk/drivers/usb/input/hid-input.c | 12 ++++++++++-- trunk/drivers/usb/input/hid.h | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index efe75d7b6d90..40a8e8f2e512 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61cdecd9f5f602775af1e89c200179d093a94ae2 +refs/heads/master: e875ce374759087771313c9e76b672b86ac20950 diff --git a/trunk/drivers/usb/input/hid-input.c b/trunk/drivers/usb/input/hid-input.c index 14acfc579f86..0b6452248a39 100644 --- a/trunk/drivers/usb/input/hid-input.c +++ b/trunk/drivers/usb/input/hid-input.c @@ -318,10 +318,18 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel break; case HID_UP_MSVENDOR: - case HID_UP_LOGIVENDOR: goto ignore; - case HID_UP_LOGIVENDOR2: /* Reported on Logitech Ultra X Media Remote */ + case HID_UP_CUSTOM: /* Reported on Logitech and Powerbook USB keyboards */ + + set_bit(EV_REP, input->evbit); + switch(usage->hid & HID_USAGE) { + case 0x003: map_key_clear(KEY_FN); break; + default: goto ignore; + } + break; + + case HID_UP_LOGIVENDOR: /* Reported on Logitech Ultra X Media Remote */ set_bit(EV_REP, input->evbit); switch(usage->hid & HID_USAGE) { diff --git a/trunk/drivers/usb/input/hid.h b/trunk/drivers/usb/input/hid.h index 47f75a43a468..ec2412c42f1e 100644 --- a/trunk/drivers/usb/input/hid.h +++ b/trunk/drivers/usb/input/hid.h @@ -183,8 +183,8 @@ struct hid_item { #define HID_UP_PID 0x000f0000 #define HID_UP_HPVENDOR 0xff7f0000 #define HID_UP_MSVENDOR 0xff000000 -#define HID_UP_LOGIVENDOR 0x00ff0000 -#define HID_UP_LOGIVENDOR2 0xffbc0000 +#define HID_UP_CUSTOM 0x00ff0000 +#define HID_UP_LOGIVENDOR 0xffbc0000 #define HID_USAGE 0x0000ffff