* Various fixes and DMI ids from trackers at sf.net, thanks to the reporters

* Ids added: Tecra A6 and Satellite M50

diff --git a/hotkeys.c b/hotkeys.c
index bb3ba1de2e2f08bf4546516e17c9b2b643b1432a..f3bd263046d14ef022d72daaa7a76d784b1821ae 100644 (file)
--- a/hotkeys.c
+++ b/hotkeys.c
@@ -99,7 +99,7 @@ static int omnibook_hotkeys_suspend(struct omnibook_operation *io_op)
 }
 
 static const char pretty_name[][27] = {
-       "Onetouch buttons",
+       "Onetouch buttons are",
        "Multimedia hotkeys are",
        "Fn hotkeys are",
        "Stick key is",

diff --git a/init.c b/init.c
index 2dfdb7a6b39233cf1d79f22b6b07461c4f8c72b5..420226ffb4177583c22fcd107bb2869c62f82694 100644 (file)
--- a/init.c
+++ b/init.c
@@ -138,7 +138,7 @@ static int __init dmi_matched(struct dmi_system_id *dmi)
 static int __init dmi_matched(const struct dmi_system_id *dmi)
 #endif
 {
-       omnibook_ectype = (int)dmi->driver_data;
+       omnibook_ectype = (enum omnibook_ectype_t)dmi->driver_data;
        if (dmi->ident)
                laptop_model = (char *)dmi->ident;
        else

diff --git a/laptop.h b/laptop.h
index 8d77448b00740c0e756c8060e5b1fd374fdcf7c2..1c29b8b2fb9568c4eef1ed07e1e0e812f4fd2034 100644 (file)
--- a/laptop.h
+++ b/laptop.h
@@ -698,6 +698,15 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
                },
                .driver_data = (void*) TSM70
        },
+       {
+               .callback = dmi_matched,
+               .ident = "Toshiba Satellite M50",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M50"),
+               },
+               .driver_data = (void*) TSM70
+       },
        {
                .callback = dmi_matched,
                .ident = "Toshiba Satellite M60",
@@ -806,6 +815,15 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
                },
                .driver_data = (void*) TSM40
        },
+       {
+               .callback = dmi_matched,
+               .ident = "Toshiba Tecra A6",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TECRA A6"),
+               },
+               .driver_data = (void*) TSM70
+       },
        {
                 .callback = dmi_matched,
                 .ident = "Toshiba Equium A110",

diff --git a/lcd.c b/lcd.c
index 8bc9d70c75269c9598c2caa070a10619c374d615..43a38710cc734efc5ed5c40687ba680665949ff5 100644 (file)
--- a/lcd.c
+++ b/lcd.c
@@ -128,12 +128,13 @@ static int __init omnibook_brightness_init(struct omnibook_operation *io_op)
         * and previous versions of this driver (wrongly) assumed it was 10 for
         * all models.
         * 
+        * XE3GF
         * TSM30X
         * TSM70
         * TSM40
         * TSA105
         */
-       if (omnibook_ectype & (TSM70 | TSM30X | TSM40 | TSA105))
+       if (omnibook_ectype & (XE3GF | TSM70 | TSM30X | TSM40 | TSA105))
                omnibook_max_brightness = 7;
        else {
                omnibook_max_brightness = 10;

diff --git a/misc/dmi_strings.txt b/misc/dmi_strings.txt
index 3488d43f1015c5cb444889fb1e831c0dfdff1bcc..4eef0c09ae76e722c52872e2fcb045a61882cb9b 100644 (file)
--- a/misc/dmi_strings.txt
+++ b/misc/dmi_strings.txt
@@ -291,6 +291,18 @@ Board Vendor:  TOSHIBA
 Board Name:    EAL30
 Board Version: Null
 
+---------------------------------------------
+Toshiba Satellite M50------------------------
+
+BIOS Vendor: TOSHIBA
+BIOS Version: V2.10
+BIOS Release: 05/08/2006
+System Vendor: TOSHIBA
+Product Name: Satellite M50
+Version: PSM51E-01C011IT
+Board Vendor: TOSHIBA
+Board Name: Null
+
 ---------------------------------------------
 Toshiba Satellite M60 -----------------------
 
@@ -391,6 +403,18 @@ Version:       PTA40E-0UN00FSP
 Board Vendor:  TOSHIBA
 Board Name:    Version A0
 
+---------------------------------------------
+Toshiba Tecra A6 ----------------------------
+
+BIOS Vendor: TOSHIBA
+BIOS Version: V2.70
+BIOS Release: 04/26/2007
+System Vendor: TOSHIBA
+Product Name: TECRA A6
+Version: PTA60U-0FK00D
+Board Vendor: TOSHIBA
+Board Name: Null
+
 ---------------------------------------------
 Toshiba Tecra S2 ----------------------------