[PATCH 6/7] thinkpad_acpi: More Carbon X1 2014 keys

[PATCH 6/7] thinkpad_acpi: More Carbon X1 2014 keys

[Bastien Nocera]

Add support for newly added evdev keycodes.

Signed-off-by: Bastien Nocera <hadess@hadess.net>
---
 drivers/platform/x86/thinkpad_acpi.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 57130a1..535095d 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3264,24 +3264,24 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
 		 */
 		KEY_RESERVED,        /* Mute held, 0x103 */
 		KEY_BRIGHTNESS_MIN,  /* Backlight off */
-		KEY_RESERVED,        /* Clipping tool */
-		KEY_RESERVED,        /* Cloud */
+		KEY_CLIPPING_TOOL,   /* Clipping tool */
+		KEY_CLOUD,           /* Cloud */
 		KEY_RESERVED,
 		KEY_VOICECOMMAND,    /* Voice */
 		KEY_RESERVED,
-		KEY_RESERVED,        /* Gestures */
+		KEY_CAMERA_GESTURES, /* Gestures */
 		KEY_RESERVED,
 		KEY_RESERVED,
 		KEY_RESERVED,
 		KEY_CONFIG,          /* Settings */
-		KEY_RESERVED,        /* New tab */
+		KEY_NEW_TAB,         /* New tab */
 		KEY_REFRESH,         /* Reload */
 		KEY_BACK,            /* Back */
-		KEY_RESERVED,        /* Microphone down */
-		KEY_RESERVED,        /* Microphone up */
-		KEY_RESERVED,        /* Microphone cancellation */
-		KEY_RESERVED,        /* Camera mode */
-		KEY_RESERVED,        /* Rotate display, 0x116 */
+		KEY_MICUP,           /* Microphone down */
+		KEY_MICDOWN,         /* Microphone up */
+		KEY_MICCANCEL_MODE,  /* Microphone cancellation */
+		KEY_CAMERA_ZOOM_MODE,/* Camera mode */
+		KEY_ROTATE_DISPLAY,  /* Rotate display, 0x116 */
 		},
 	};
 
-- 
2.1.0

Re: [PATCH 6/7] thinkpad_acpi: More Carbon X1 2014 keys

[Andy Lutomirski]

On 02/20/2015 06:44 AM, Bastien Nocera wrote:
> +		KEY_MICCANCEL_MODE,  /* Microphone cancellation */

What's this?  We already have KEY_MICMUTE.  Is this different?  If so, 
can you improve the comment a bit?

The answer may be obvious to anyone who has an awful X1 carbon gen 2 
keyboard, but these KEY_XYZ defines should IMO be clear enough that even 
people without the hardware can figure out what's going on.

--Andy

Re: [PATCH 6/7] thinkpad_acpi: More Carbon X1 2014 keys

[Bastien Nocera]

On Fri, 2015-02-20 at 11:27 -0800, Andy Lutomirski wrote:
> On 02/20/2015 06:44 AM, Bastien Nocera wrote:
> > +		KEY_MICCANCEL_MODE,  /* Microphone cancellation */
> 
> What's this?  We already have KEY_MICMUTE.  Is this different?  If so, 
> can you improve the comment a bit?

I don't think the comment needs improving. This is the device driver
part of the patch series. If comment was required, it would in the
commit adding the keycode to input.h. We're discussing that with Dmitry.

> The answer may be obvious to anyone who has an awful X1 carbon gen 2 
> keyboard, but these KEY_XYZ defines should IMO be clear enough that even 
> people without the hardware can figure out what's going on.

I'll make sure to link this in the input.h patch:
http://www.lenovo.com/shop/americas/content/user_guides/x1carbon_2_ug_en.pdf

In any case, it doesn't look like this particular keycode will make it.

Re: [PATCH 6/7] thinkpad_acpi: More Carbon X1 2014 keys

[Andy Lutomirski]

On Mon, Feb 23, 2015 at 2:09 AM, Bastien Nocera <hadess@hadess.net> wrote:
> On Fri, 2015-02-20 at 11:27 -0800, Andy Lutomirski wrote:
>> On 02/20/2015 06:44 AM, Bastien Nocera wrote:
>> > +           KEY_MICCANCEL_MODE,  /* Microphone cancellation */
>>
>> What's this?  We already have KEY_MICMUTE.  Is this different?  If so,
>> can you improve the comment a bit?
>
> I don't think the comment needs improving. This is the device driver
> part of the patch series. If comment was required, it would in the
> commit adding the keycode to input.h. We're discussing that with Dmitry.
>

Right, sorry, I replied to the wrong patch.

>> The answer may be obvious to anyone who has an awful X1 carbon gen 2
>> keyboard, but these KEY_XYZ defines should IMO be clear enough that even
>> people without the hardware can figure out what's going on.
>
> I'll make sure to link this in the input.h patch:
> http://www.lenovo.com/shop/americas/content/user_guides/x1carbon_2_ug_en.pdf
>
> In any case, it doesn't look like this particular keycode will make it.
>

Oh, it's microphone *noise* cancellation.  I assumed it somehow
cancelled the microphone, and I was a bit confused.

If the keycode ends up getting added, could you add the word "noise" somewhere?

Thanks,
Andy