* Fix _TOSHIBA_ M100 dmi string

* Introduction of ectype 14 for the Satellite A105
* Cleanup in Makefile

diff --git a/Makefile b/Makefile
index 23019d4a931a28cca98c0725d0a40b36d894633c..204421ce0c952fd4e20bf7a7a16034cd5d310990 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -103,20 +103,14 @@ kinstall:
 kpatch:                kinstall
                (cd $(KSRC); patch -p1 < $(BDIR)/misc/omnibook-integration.patch)
 
-deb:           clean
-               dch -v 1:2.$(TODAY)
-               fakeroot dpkg-buildpackage
-               
+version:       
+               sed -i "s|^\(#define OMNIBOOK_MODULE_VERSION.*\)\".*\"|\1\"2.$(TODAY)\"|" omnibook.h
+               sed -i "s|^\(2\.\)[[:alnum:]]\{8\}|\1$(TODAY)|" doc/ChangeLog
 
-release:       clean
+release:       clean version
                mkdir -p ../$(MODULE_NAME)-2.$(TODAY)
-               cp -a *.h *.c *.lds Makefile debian doc misc ../$(MODULE_NAME)-2.$(TODAY)
-               sed -i "s|^\(#define OMNIBOOK_MODULE_VERSION.*\)\".*\"|\1\"2.$(TODAY)\"|" ../$(MODULE_NAME)-2.$(TODAY)/omnibook.h
+               cp -a *.h *.c *.lds Makefile doc misc ../$(MODULE_NAME)-2.$(TODAY)
                rm -f ../$(MODULE_NAME)-2.$(TODAY).tar ../$(MODULE_NAME)-2.$(TODAY).tar.gz
                (cd ..; tar cvf $(MODULE_NAME)-2.$(TODAY).tar $(MODULE_NAME)-2.$(TODAY); gzip -9 $(MODULE_NAME)-2.$(TODAY).tar)
 
-current:       clean
-               rm -f ../$(MODULE_NAME)-2.current.tar ../$(MODULE_NAME)-2.current.tar.gz
-               (cd ..; tar cvf $(MODULE_NAME)-2.current.tar $(MODULE_NAME)-current; gzip -9 $(MODULE_NAME)-2.current.tar)
-
 # End of file

diff --git a/doc/ChangeLog b/doc/ChangeLog
index bb3c3b076686b7708c8423e66a1264df9f09d3a1..800bbafd9e733c8fc6fa3e269b0c853cf8fce3d8 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,11 @@ Changelog file for omnibook package:
 
 2.XXXXXXXX Mathieu Bérard <math_b@users.sourceforge.net>
 * Add dmi info for Toshiba Satellite M100 (Thanks Sertaç Ö. Yıldız)
+  And fix it
+* Add dmi info for Toshiba Satellite A105 (Thanks Mikkel L. Ellertson)
+  the support is pretty minimalistic (LCD brigtness only) this
+  also inaugurate ectype 14
+* Cleanup in Makefile
 
 2.20060809 Mathieu Bérard <math_b@users.sourceforge.net>
 * Add dmi info for Toshiba Satellite M40X (Thanks Julien Valroff) 

diff --git a/ec.h b/ec.h
index 1521916fb2da3e36fed9940cbb793ce453974da9..e3f03872dd87539a6834103d9c826e1f99c24a74 100644 (file)
--- a/ec.h
+++ b/ec.h
@@ -156,6 +156,12 @@ extern int omnibook_mem_write(u32 addr, u8 data);
 #define XE3GC_VOLU_SCAN                                0x30    /* Volume up button scancode */
 #define XE3GC_MUTE_SCAN                                0x20    /* Volume up button scancode */
 
+/*
+ * Toshiba Satellite A105 values
+ */
+
+#define A105_BNDT                              0xA3    /* LCD brightness */
+
 /*
  * Fujitsu Amilo D values
  */

diff --git a/laptop.h b/laptop.h
index b35b2755aa1a0ba48c21728129e4b3d6b5621207..4d25893f586c2861284b0e2119b7034546173b07 100644 (file)
--- a/laptop.h
+++ b/laptop.h
@@ -524,6 +524,15 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
                },
                .driver_data = (void*) XE3GF,
        },
+        {
+                .callback = dmi_matched,
+                .ident = "Toshiba Satellite A105",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite A105"),
+                },
+                .driver_data = (void*) TSA105
+        },
        {
                .callback = dmi_matched,
                .ident = "Toshiba Satellite P10",
@@ -592,7 +601,7 @@ static struct  dmi_system_id omnibook_ids[] __initdata = {
                 .ident = "Toshiba Satellite M100",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite M100"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE M100"),
                 },
                 .driver_data = (void*) TSM30X
         },

diff --git a/lcd.c b/lcd.c
index 1e973e5c2f8902af0b509144aa43efa64c65cece..ee71a3bf8d9eaa94bf0fb95ffd56da3370bd88e2 100644 (file)
--- a/lcd.c
+++ b/lcd.c
@@ -115,6 +115,12 @@ static int omnibook_set_lcd_brightness(int brgt)
        } else if (omnibook_ectype & (AMILOD) ) {
                if ((retval = omnibook_ec_write(AMILOD_CBRG, brgt)))
                        return retval;
+       /*
+        * TSA105
+        */
+       } else if (omnibook_ectype & (TSA105) ) {
+                if ((retval = omnibook_ec_write(A105_BNDT, brgt)))
+                        return retval;
        } else {
                printk(KERN_INFO
                       "%s: LCD brightness handling is unsupported on this machine.\n",
@@ -174,14 +180,15 @@ static int omnibook_brightness_init(void)
 {
        /*
         * FIXME: What is exactly de max value for each model ?
-        * I know that it's 7 for the TSM30X and the TSM40
+        * I know that it's 7 for the TSM30X, TSM40 and TSA105
         * and previous versions of this driver assumed it was 10 for
         * all models.
         * 
         * TSM30X
         * TSM40
+        * TSA105
         */
-       if (omnibook_ectype & (TSM30X|TSM40) )
+       if (omnibook_ectype & (TSM30X|TSM40|TSA105) )
                omnibook_max_brightness = 7;
        else
                omnibook_max_brightness = 10;
@@ -216,7 +223,7 @@ static struct omnibook_feature __declared_feature lcd_feature = {
         .write = omnibook_brightness_write,
         .init = omnibook_brightness_init,
         .exit = omnibook_brightness_cleanup,
-        .ectypes = XE3GF|XE3GC|AMILOD|TSP10|TSM30X|TSM40,
+        .ectypes = XE3GF|XE3GC|AMILOD|TSP10|TSM30X|TSM40|TSA105,
 };
 
 module_param_named(lcd, lcd_feature.enabled, int, S_IRUGO);

diff --git a/misc/dmi_strings.txt b/misc/dmi_strings.txt
index 156554573752699058004ea14af63031da92a655..d3fdcc490639f528f32766b360312946e6ed67f8 100644 (file)
--- a/misc/dmi_strings.txt
+++ b/misc/dmi_strings.txt
@@ -164,6 +164,19 @@ Board Vendor:  TOSHIBA
 Board Name:    BTR80
 Board Version: Null
 
+---------------------------------------------
+Toshiba Satellite A105 ----------------------
+
+BIOS Vendor:   Phoenix Technologies LTD
+BIOS Version:  1.30
+BIOS Release:  02/09/2006
+System Vendor: TOSHIBA
+Product Name:  Satellite A105
+Version:       PSAA8U-02000U
+Serial Number: 36244466Q
+Board Vendor:  Intel Corporation
+Board Name:    Not Applicable
+
 ---------------------------------------------
 Toshiba Satellite P10 -----------------------
 
@@ -240,7 +253,7 @@ BIOS Vendor:    TOSHIBA
 BIOS Version:   V1.90
 BIOS Release:   07/20/2006
 System Vendor:  TOSHIBA
-Product Name:   Satellite M100
+Product Name:   SATELLITE M100
 Version:        PSMA0E-030019TE
 Serial Number:  46795329G
 Board Vendor:   TOSHIBA

diff --git a/omnibook.h b/omnibook.h
index 7f8349f13eb9441f67cac5bd717489fbc5e493e1..4a307b55c5635da7182470274c311b6c6380e12f 100644 (file)
--- a/omnibook.h
+++ b/omnibook.h
@@ -48,6 +48,7 @@ extern int omnibook_ectype;
 #define        TSP10   1024    /* 11 Toshiba Satellite P10, P15, P20 and compatible */
 #define        TSM30X  2048    /* 12 Toshiba Satellite M30X, M35X, M40X, M70 and compatible */
 #define        TSM40   4096    /* 13 Toshiba Satellite M40 */
+#define        TSA105  8192    /* 14 Toshiba Satellite A105 */
 
 /*
  * This represent a feature provided by this module