diff mbox

[7/9,sony-laptop] Add FW specific hotkey events and DMI

Message ID 1235882445-2404-8-git-send-email-malattia@linux.it (mailing list archive)
State Accepted
Headers show

Commit Message

Mattia Dongili March 1, 2009, 4:40 a.m. UTC 
From: Anton Veretenenko <anton@veretenenko.ru>

From: Anton Veretenenko <anton@veretenenko.ru>
Signed-off-by: Mattia Dongili <malattia@linux.it>
---
 drivers/platform/x86/sony-laptop.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

Comments

Mattia Dongili March 10, 2009, 1:53 a.m. UTC | #1 
On Sun, Mar 01, 2009 at 01:40:43PM +0900, Mattia Dongili wrote:
> From: Anton Veretenenko <anton@veretenenko.ru>
> 
> From: Anton Veretenenko <anton@veretenenko.ru>
> Signed-off-by: Mattia Dongili <malattia@linux.it>
> ---
>  drivers/platform/x86/sony-laptop.c |   18 ++++++++++++++++++
>  1 files changed, 18 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> index 8568d1e..576c9c2 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -843,16 +843,25 @@ static int sony_nc_C_enable(const struct dmi_system_id *id)
>  static struct sony_nc_event sony_C_events[] = {
>  	{ 0x81, SONYPI_EVENT_FNKEY_F1 },
>  	{ 0x01, SONYPI_EVENT_FNKEY_RELEASED },
> +	{ 0x82, SONYPI_EVENT_FNKEY_F2 },
> +	{ 0x02, SONYPI_EVENT_FNKEY_RELEASED },
>  	{ 0x85, SONYPI_EVENT_FNKEY_F5 },
>  	{ 0x05, SONYPI_EVENT_FNKEY_RELEASED },
> +	{ 0x85, SONYPI_EVENT_FNKEY_F5 },

Gah, duplicate Fn+F5. I'll resend the whole serie with this fix and some
more additions

Thanks
diff mbox

Patch

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 8568d1e..576c9c2 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -843,16 +843,25 @@  static int sony_nc_C_enable(const struct dmi_system_id *id)
 static struct sony_nc_event sony_C_events[] = {
 	{ 0x81, SONYPI_EVENT_FNKEY_F1 },
 	{ 0x01, SONYPI_EVENT_FNKEY_RELEASED },
+	{ 0x82, SONYPI_EVENT_FNKEY_F2 },
+	{ 0x02, SONYPI_EVENT_FNKEY_RELEASED },
 	{ 0x85, SONYPI_EVENT_FNKEY_F5 },
 	{ 0x05, SONYPI_EVENT_FNKEY_RELEASED },
+	{ 0x85, SONYPI_EVENT_FNKEY_F5 },
 	{ 0x86, SONYPI_EVENT_FNKEY_F6 },
 	{ 0x06, SONYPI_EVENT_FNKEY_RELEASED },
 	{ 0x87, SONYPI_EVENT_FNKEY_F7 },
 	{ 0x07, SONYPI_EVENT_FNKEY_RELEASED },
+	{ 0x89, SONYPI_EVENT_FNKEY_F9 },
+	{ 0x09, SONYPI_EVENT_FNKEY_RELEASED },
 	{ 0x8A, SONYPI_EVENT_FNKEY_F10 },
 	{ 0x0A, SONYPI_EVENT_FNKEY_RELEASED },
 	{ 0x8C, SONYPI_EVENT_FNKEY_F12 },
 	{ 0x0C, SONYPI_EVENT_FNKEY_RELEASED },
+	{ 0x90, SONYPI_EVENT_PKEY_P1 },
+	{ 0x10, SONYPI_EVENT_FNKEY_RELEASED },
+	{ 0xA1, SONYPI_EVENT_PKEY_P2 },
+	{ 0x21, SONYPI_EVENT_FNKEY_RELEASED },
 	{ 0, 0 },
 };
 
@@ -868,6 +877,15 @@  static const struct dmi_system_id sony_nc_ids[] = {
 			},
 		},
 		{
+			.ident = "Sony Vaio FW Series",
+			.callback = sony_nc_C_enable,
+			.driver_data = sony_C_events,
+			.matches = {
+				DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+				DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW"),
+			},
+		},
+		{
 			.ident = "Sony Vaio FZ Series",
 			.callback = sony_nc_C_enable,
 			.driver_data = sony_C_events,