From: Mathieu Bérard <mathieu.berard@crans.org>
Date: Sun, 17 Sep 2006 14:36:39 +0000 (+0000)
Subject: * Disable real hotkeys reading in nbmsi.
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=35ef25a3568764014487c23b29f8b130f3ff5c00;p=omnibook.git

* Disable real hotkeys reading in nbmsi.
  It is unreliable on a least Tecra S1
* Add Satellite A70 dmi info
---

diff --git a/laptop.h b/laptop.h
index 58df9b3..d9b5e2f 100644
--- a/laptop.h
+++ b/laptop.h
@@ -524,6 +524,16 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
 		},
 		.driver_data = (void*) XE3GF,
 	},
+	{
+                .callback = dmi_matched,
+                .ident = "Toshiba Satellite A70",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A70"),
+                },
+                .driver_data = (void*) TSM30X
+        },
+
         {
                 .callback = dmi_matched,
                 .ident = "Toshiba Satellite A105",
diff --git a/misc/dmi_strings.txt b/misc/dmi_strings.txt
index 971aff5..27ee394 100644
--- a/misc/dmi_strings.txt
+++ b/misc/dmi_strings.txt
@@ -152,6 +152,20 @@ Board Vendor:  TOSHIBA
 Board Name:    BTR80
 Board Version: Null
 
+---------------------------------------------
+Toshiba Satellite A70 -----------------------
+
+BIOS Vendor: TOSHIBA 
+BIOS Version: V1.50 
+BIOS Release: 11/16/2004 
+System Vendor: TOSHIBA 
+Product Name: Satellite A70 
+Version: PSA70C-KL100E 
+Serial Number: X4451615K 
+Board Vendor: TOSHIBA 
+Board Name: EDW10 
+Board Version: Null 
+
 ---------------------------------------------
 Toshiba Satellite A105 ----------------------
 
diff --git a/nbsmi.c b/nbsmi.c
index d9cf2a3..6cefb6a 100644
--- a/nbsmi.c
+++ b/nbsmi.c
@@ -505,8 +505,10 @@ static int omnibook_nbsmi_set_wireless(const struct omnibook_operation *io_op, u
 }
 
 /*
- * Hotkeys handling
+ * Hotkeys reading return completly unreliable results on a least Tecra S1
+ * It is therefore disabled
  */
+#if 0
 static int omnibook_nbmsi_hotkeys_get(const struct omnibook_operation *io_op, unsigned int *state)
 {
 	int retval;
@@ -527,6 +529,7 @@ static int omnibook_nbmsi_hotkeys_get(const struct omnibook_operation *io_op, un
 
 	return HKEY_FN | HKEY_STICK | HKEY_TWICE_LOCK | HKEY_DOCK;
 }
+#endif
 
 static int omnibook_nbmsi_hotkeys_set(const struct omnibook_operation *io_op, unsigned int state)
 {
@@ -611,7 +614,7 @@ struct omnibook_backend nbsmi_backend = {
 	.byte_write = nbsmi_smi_write_command,
 	.aerial_get = omnibook_nbsmi_get_wireless,
 	.aerial_set = omnibook_nbsmi_set_wireless,
-	.hotkeys_get = omnibook_nbmsi_hotkeys_get,
+/*	.hotkeys_get = omnibook_nbmsi_hotkeys_get, */
 	.hotkeys_set = omnibook_nbmsi_hotkeys_set,
 	.display_get = omnibook_nbmsi_display_get,
 	.display_set = omnibook_nbmsi_display_set,
diff --git a/omnibook.h b/omnibook.h
index 7a91e8d..06ed4af 100644
--- a/omnibook.h
+++ b/omnibook.h
@@ -45,7 +45,7 @@ extern enum omnibook_ectype_t {
 	AMILOD = (1<<9),  /* 10 Fujitsu Amilo D */
 	TSP10  = (1<<10), /* 11 Toshiba Satellite P10, P15, P20 and compatible */
 	TSM30X = (1<<11), /* 12 Toshiba Satellite M30X, M35X, M40X, M70 and compatible */
-	TSM40  = (1<<12), /* 13 Toshiba Satellite M40 */
+	TSM40  = (1<<12), /* 13 Toshiba Satellite M40 M45 Tecra S1 */
 	TSA105 = (1<<13)  /* 14 Toshiba Satellite A105 */
 } omnibook_ectype;
 
@@ -112,7 +112,7 @@ enum {
 	HKEY_ONETOUCH = (1<<0),		/* 1  Ontetouch button scancode generation */
 	HKEY_MULTIMEDIA = (1<<1),	/* 2  "Multimedia hotkeys" scancode generation */	
 	HKEY_FN = (1<<2),		/* 4  Fn + foo hotkeys scancode generation */
-	HKEY_STICK = (1<<3),		/* 8  Stick key (no clue what this is about) */
+	HKEY_STICK = (1<<3),		/* 8  Stick key (Fn locked/unlocked on keypress)  */
 	HKEY_TWICE_LOCK = (1<<4),	/* 16 Press Fn twice to lock */
 	HKEY_DOCK = (1<<5),		/* 32 (Un)Dock events scancode generation */
 	HKEY_FNF5 = (1<<6),		/* 64 Fn + F5 (toggle display) is enabled */
@@ -122,7 +122,7 @@ enum {
 /*
  * Display state backend neutral masks
  * _ON masks = port is powered up and running
- * _DET masks = a display have been detected to be plugged in the port 
+ * _DET masks = a plugged display have been detected 
  */
 
 enum {