2009-07-30 07:48:15

by TJ

Subject: wistron_btns: support Prestigio Wifi RF kill button over suspend

We've been carrying this patch in Ubuntu since March 2009. I emailed the
upstream maintainer prior to that but there was no reply or action so it
hasn't been pushed upstream as I had expected.

https://launchpad.net/bugs/346586

I wonder if the maintainer field for this module should be changed to
reflect that?

----

The Prestigio 157, an old no-name clone laptop uses input keys very
similar to the Wistron 1557/MS2141 with the addition of BIOS-controlled
wireless radio frequency kill switch.

This patch adds support for the RF kill switch control and adds manual
identification of the model.

The Prestigio does not expose any recognisable identity via dmidecode
and so requires manual selection at module init using

force=1 keymap=prestigio

Signed-off-by: TJ <[email protected]>

diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -611,6 +611,20 @@ static struct key_entry keymap_wistron_generic[] __initdata = {
{ KE_END, 0 }
};

+static struct key_entry keymap_prestigio[] __initdata = {
+ { KE_KEY, 0x11, {KEY_PROG1} },
+ { KE_KEY, 0x12, {KEY_PROG2} },
+ { KE_WIFI, 0x30 },
+ { KE_KEY, 0x22, {KEY_REWIND} },
+ { KE_KEY, 0x23, {KEY_FORWARD} },
+ { KE_KEY, 0x24, {KEY_PLAYPAUSE} },
+ { KE_KEY, 0x25, {KEY_STOPCD} },
+ { KE_KEY, 0x31, {KEY_MAIL} },
+ { KE_KEY, 0x36, {KEY_WWW} },
+ { KE_END, 0 }
+};
+
+
/*
* If your machine is not here (which is currently rather likely), please send
* a list of buttons and their key codes (reported when loading this module
@@ -964,6 +978,10 @@ static int __init select_keymap(void)
keymap = keymap_wistron_ms2141;
else if (strcmp (keymap_name, "generic") == 0)
keymap = keymap_wistron_generic;
+ else if (strcmp (keymap_name, "prestigio") == 0) {
+ keymap = keymap_prestigio;
+ have_wifi = 1;
+ }
else {
printk(KERN_ERR "wistron_btns: Keymap unknown\n");
return -EINVAL;

2009-07-30 17:35:49

by Dmitry Torokhov

Subject: Re: wistron_btns: support Prestigio Wifi RF kill button over suspend

Hi,

On Thu, Jul 30, 2009 at 08:38:50AM +0100, TJ wrote:
> We've been carrying this patch in Ubuntu since March 2009. I emailed the
> upstream maintainer prior to that but there was no reply or action so it
> hasn't been pushed upstream as I had expected.
>
> https://launchpad.net/bugs/346586
>
> I wonder if the maintainer field for this module should be changed to
> reflect that?
>
> ----
>
> The Prestigio 157, an old no-name clone laptop uses input keys very
> similar to the Wistron 1557/MS2141 with the addition of BIOS-controlled
> wireless radio frequency kill switch.
>
> This patch adds support for the RF kill switch control and adds manual
> identification of the model.
>
> The Prestigio does not expose any recognisable identity via dmidecode
> and so requires manual selection at module init using
>
> force=1 keymap=prestigio
>
> Signed-off-by: TJ <[email protected]>
>

I'd like to pick up this patch but you really need to use your name instead
of just initials in your signoff line. Care to resend, please?

Thanks!

--
Dmitry