From patchwork Wed Apr 23 09:38:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Gay X-Patchwork-Id: 4039861 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1D0BBBFF02 for ; Wed, 23 Apr 2014 09:38:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2129A201DE for ; Wed, 23 Apr 2014 09:38:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2666201BA for ; Wed, 23 Apr 2014 09:38:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932155AbaDWJiZ (ORCPT ); Wed, 23 Apr 2014 05:38:25 -0400 Received: from na3sys009aog130.obsmtp.com ([74.125.149.143]:44999 "EHLO na3sys009aog130.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932122AbaDWJiW (ORCPT ); Wed, 23 Apr 2014 05:38:22 -0400 Received: from mail-ee0-f42.google.com ([74.125.83.42]) (using TLSv1) by na3sys009aob130.postini.com ([74.125.148.12]) with SMTP ID DSNKU1eKDUS/shATGoFtFlS+EmGHfP5J2Iz3@postini.com; Wed, 23 Apr 2014 02:38:22 PDT Received: by mail-ee0-f42.google.com with SMTP id d17so547669eek.15 for ; Wed, 23 Apr 2014 02:38:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ytFcP5exKewLbYKZQRK9+BsonLrfbWFgiVLftU2dUdE=; b=VTy/UafQ+ICiS0UXiO4egue7z1+KBJcZBRsdm286xfNYP6GZg/HqOl2nd0aJrZ/kjl /XEqPawZbBrOGAj70mDudqS6+cfO4sz2ALSTVh/ywavPcPL5ix7ib1bhqp9TTk1bZSZU fqE6gq2kxc6UjlfzQhvJoMT6m+l6rasPJpCk3k/7KDF79qH6VWZ02M6d8rPWzAj6PDmS NsEf1wEZlG9lC4KIayrrIPOxKtxS1TIZzpVKssufqMwTzac7JlgUT0Ex+ar9xaUoLoSV oWDraDm6TxSPtmBBRa8Dm6XKhC7kPUm4g1J+us94ashaicuDej+iiPQ+ofw5lYCsI1QY dE5A== X-Gm-Message-State: ALoCoQmXtk/Op3WQ+ojPqi2cTCKjQvAOq1neeeD5wIcXS8CwRBSCxqTsym4hp7kNoUKxH90migdDE/l2oz3GWanf0T4OuX/1MT8nHDvqus2WtqKtXxmkfjfBHtBgMksDa0sInxzWXoTXH0o3WC/zjccJoA9Ve+VXDw== X-Received: by 10.15.32.206 with SMTP id a54mr61522822eev.51.1398245900115; Wed, 23 Apr 2014 02:38:20 -0700 (PDT) X-Received: by 10.15.32.206 with SMTP id a54mr61522809eev.51.1398245900034; Wed, 23 Apr 2014 02:38:20 -0700 (PDT) Received: from localhost.localdomain ([154.53.1.15]) by mx.google.com with ESMTPSA id q41sm4666086eez.7.2014.04.23.02.38.17 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 02:38:18 -0700 (PDT) From: Olivier Gay To: linux-input@vger.kernel.org Cc: Dmitry Torokhov , Jiri Kosina , Nestor Lopez Casado , Olivier Gay , Mathieu Meisser Subject: [PATCH v2] HID: add missing hid usages Date: Wed, 23 Apr 2014 11:38:46 +0200 Message-Id: <1398245926-16988-1-git-send-email-ogay@logitech.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add some missing hid usages from consumer page, add display brightness control usages from approved hid usage table request HUTTR41: http://www.usb.org/developers/hidpage/HUTRR41.pdf and add voice command usage from approved request HUTTR45: http://www.usb.org/developers/hidpage/Voice_Command_Usage.pdf Signed-off-by: Olivier Gay Signed-off-by: Mathieu Meisser --- drivers/hid/hid-debug.c | 14 ++++++++++++++ drivers/hid/hid-input.c | 15 +++++++++++++++ include/uapi/linux/input.h | 16 ++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index 53b771d..742d78b 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c @@ -855,6 +855,20 @@ static const char *keys[KEY_MAX + 1] = { [KEY_KBDILLUMDOWN] = "KbdIlluminationDown", [KEY_KBDILLUMUP] = "KbdIlluminationUp", [KEY_SWITCHVIDEOMODE] = "SwitchVideoMode", + [KEY_BUTTONCONFIG] = "ButtonConfig", + [KEY_TASKMANAGER] = "TaskManager", + [KEY_JOURNAL] = "Journal", + [KEY_CONTROLPANEL] = "ControlPanel", + [KEY_APPSELECT] = "AppSelect", + [KEY_SCREENSAVER] = "ScreenSaver", + [KEY_VOICECOMMAND] = "VoiceCommand", + [KEY_BRIGHTNESS_INC] = "BrightnessInc", + [KEY_BRIGHTNESS_DEC] = "BrightnessDec", + [KEY_BRIGHTNESS] = "Brightness", + [KEY_BRIGHTNESS_TOGGLE] = "BrightnessToggle", + [KEY_BRIGHTNESS_MIN] = "BrightnessMin", + [KEY_BRIGHTNESS_MAX] = "BrightnessMax", + [KEY_BRIGHTNESS_AUTO] = "BrightnessAuto", }; static const char *relatives[REL_MAX + 1] = { diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index e7e8b19..f78b18d 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c @@ -721,6 +721,14 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x06c: map_key_clear(KEY_YELLOW); break; case 0x06d: map_key_clear(KEY_ZOOM); break; + case 0x06f: map_key_clear(KEY_BRIGHTNESS_INC); break; + case 0x070: map_key_clear(KEY_BRIGHTNESS_DEC); break; + case 0x071: map_key_clear(KEY_BRIGHTNESS); break; + case 0x072: map_key_clear(KEY_BRIGHTNESS_TOGGLE); break; + case 0x073: map_key_clear(KEY_BRIGHTNESS_MIN); break; + case 0x074: map_key_clear(KEY_BRIGHTNESS_MAX); break; + case 0x075: map_key_clear(KEY_BRIGHTNESS_AUTO); break; + case 0x082: map_key_clear(KEY_VIDEO_NEXT); break; case 0x083: map_key_clear(KEY_LAST); break; case 0x084: map_key_clear(KEY_ENTER); break; @@ -761,6 +769,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x0bf: map_key_clear(KEY_SLOW); break; case 0x0cd: map_key_clear(KEY_PLAYPAUSE); break; + case 0x0cf: map_key_clear(KEY_VOICECOMMAND); break; case 0x0e0: map_abs_clear(ABS_VOLUME); break; case 0x0e2: map_key_clear(KEY_MUTE); break; case 0x0e5: map_key_clear(KEY_BASSBOOST); break; @@ -768,6 +777,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x0ea: map_key_clear(KEY_VOLUMEDOWN); break; case 0x0f5: map_key_clear(KEY_SLOW); break; + case 0x181: map_key_clear(KEY_BUTTONCONFIG); break; case 0x182: map_key_clear(KEY_BOOKMARKS); break; case 0x183: map_key_clear(KEY_CONFIG); break; case 0x184: map_key_clear(KEY_WORDPROCESSOR); break; @@ -781,6 +791,8 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x18c: map_key_clear(KEY_VOICEMAIL); break; case 0x18d: map_key_clear(KEY_ADDRESSBOOK); break; case 0x18e: map_key_clear(KEY_CALENDAR); break; + case 0x18f: map_key_clear(KEY_TASKMANAGER); break; + case 0x190: map_key_clear(KEY_JOURNAL); break; case 0x191: map_key_clear(KEY_FINANCE); break; case 0x192: map_key_clear(KEY_CALC); break; case 0x193: map_key_clear(KEY_PLAYER); break; @@ -789,12 +801,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel case 0x199: map_key_clear(KEY_CHAT); break; case 0x19c: map_key_clear(KEY_LOGOFF); break; case 0x19e: map_key_clear(KEY_COFFEE); break; + case 0x19f: map_key_clear(KEY_CONTROLPANEL); break; + case 0x1a2: map_key_clear(KEY_APPSELECT); break; case 0x1a3: map_key_clear(KEY_NEXT); break; case 0x1a4: map_key_clear(KEY_PREVIOUS); break; case 0x1a6: map_key_clear(KEY_HELP); break; case 0x1a7: map_key_clear(KEY_DOCUMENTS); break; case 0x1ab: map_key_clear(KEY_SPELLCHECK); break; case 0x1ae: map_key_clear(KEY_KEYBOARD); break; + case 0x1b1: map_key_clear(KEY_SCREENSAVER); break; case 0x1b4: map_key_clear(KEY_FILE); break; case 0x1b6: map_key_clear(KEY_IMAGES); break; case 0x1b7: map_key_clear(KEY_AUDIO); break; diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index bd24470..389be5d 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -722,6 +722,22 @@ struct input_keymap_entry { #define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ +#define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ +#define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ +#define KEY_JOURNAL 0x242 /* AL Log/Journal/Timecard */ +#define KEY_CONTROLPANEL 0x243 /* AL Control Panel */ +#define KEY_APPSELECT 0x244 /* AL Select Task/Application */ +#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */ +#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ + +#define KEY_BRIGHTNESS_INC KEY_BRIGHTNESSUP +#define KEY_BRIGHTNESS_DEC KEY_BRIGHTNESSDOWN +#define KEY_BRIGHTNESS 0x250 /* Set Brightness */ +#define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE +#define KEY_BRIGHTNESS_MIN 0x251 /* Set Brightness to Minimum */ +#define KEY_BRIGHTNESS_MAX 0x252 /* Set Brightness to Maximum */ +#define KEY_BRIGHTNESS_AUTO 0x253 /* Set Auto Brightness */ + #define BTN_TRIGGER_HAPPY 0x2c0 #define BTN_TRIGGER_HAPPY1 0x2c0 #define BTN_TRIGGER_HAPPY2 0x2c1