[Pommed-commits] [SCM] pommed - hotkeys handler for Apple laptops branch, master, updated. 1.26-5-gcbe0ab7

[Julien BLACHE]

The following commit has been merged in the master branch:
commit cbe0ab7c1d8f8cce53347f201ae16f66ab5c5145
Author: Julien BLACHE <jb at jblache.org>
Date:   Tue Jun 30 17:50:59 2009 +0200

    Add support for the MacBookPro5,2 (17" MacBookPro June 2009)

diff --git a/ChangeLog b/ChangeLog
index 4c1b022..93365a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@ ChangeLog for pommed
 version 1.27:
 	- pommed: added support for the MacBook5,2 (white MacBook).
 	- pommed: added support for the MacBookPro5,5 (13" MacBookPro June
-	2009).
+	2009), MacBookPro5,2 (17" MacBookPro June 2009).
 
 version 1.26:
 	- pommed: only keystrokes on the built-in keyboard should reset
diff --git a/README b/README
index c2d7f96..4f3f5f3 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ Supported machines:
    * MacBook Pro Core Duo 17" (April 2006)
    * MacBook Pro Core2 Duo 15" (October 2006, June 2007, February 2008, October 2008)
    * MacBook Pro Core2 Duo 17" (October 2006, June 2007, February 2008, October 2008)
-   * MacBook Pro 13" (June 2009)
+   * MacBook Pro 13", 17" (June 2009)
    * MacBook Core Duo (May 2006)
    * MacBook Core2 Duo (November 2006 & May 2007)
    * MacBook Core2 Duo Santa Rosa (November 2007)
diff --git a/pommed/pommed.c b/pommed/pommed.c
index afd16ea..a50f1ef 100644
--- a/pommed/pommed.c
+++ b/pommed/pommed.c
@@ -276,6 +276,7 @@ struct machine_ops mb_mops[] = {
   },
 
   {  /* MacBookPro5,1 (15" & 17", Core2 Duo, October 2008)
+      * MacBookPro5,2 (17" June 2009)
       * MacBookPro5,5 (13" June 2009) */
     .type = MACHINE_MACBOOKPRO_5,
     .lcd_backlight_probe = mbp_sysfs_backlight_probe,
@@ -672,8 +673,10 @@ check_machine_dmi(void)
   else if (strcmp(buf, "MacBookPro4,1") == 0)
     ret = MACHINE_MACBOOKPRO_4;
   /* Core2 Duo MacBook Pro 15" & 17" (October 2008)
+   * MacBook Pro 17" (June 2009)
    * MacBook Pro 13" (June 2009) */
   else if ((strcmp(buf, "MacBookPro5,1") == 0)
+	   || (strcmp(buf, "MacBookPro5,2") == 0)
 	   || (strcmp(buf, "MacBookPro5,5") == 0))
     ret = MACHINE_MACBOOKPRO_5;
   /* Core Duo MacBook (May 2006) */

-- 
pommed - hotkeys handler for Apple laptops