[Pommed-commits] [SCM] pommed - hotkeys handler for Apple laptops branch, master, updated. 1.32-4-gf624899

[Julien BLACHE]

The following commit has been merged in the master branch:
commit dc27e30c62162cbc7ac44dff887b41c009a00ea9
Author: Colin Harrington <colin.harrington at gmail.com>
Date:   Tue May 11 18:53:30 2010 -0500

    Add support for the MacBookPro6,1 and MacBookPro6,2 (April 2010)

diff --git a/ChangeLog b/ChangeLog
index ca7610a..2a4bd67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ ChangeLog for pommed
 
 version 1.33:
 	- pommed: added support for the MacBook6,1 (October 2009).
+	- pommed: added support for the MacBookPro6,1 & 6,2 (Core i5/i7,
+	April 2010).
 
 version 1.32:
 	- pommed: add the rivabl sysfs backlight driver for older 12"
diff --git a/README b/README
index 25526a5..522d76d 100644
--- a/README
+++ b/README
@@ -27,6 +27,7 @@ Supported machines:
    * 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", 15", 17" (June 2009)
+   * MacBook Pro Core i5/i7 15", 17" (April 2010)
    * MacBook Core Duo (May 2006)
    * MacBook Core2 Duo (November 2006 & May 2007)
    * MacBook Core2 Duo Santa Rosa (November 2007)
diff --git a/pommed/kbd_backlight.h b/pommed/kbd_backlight.h
index f0fa40b..09177cb 100644
--- a/pommed/kbd_backlight.h
+++ b/pommed/kbd_backlight.h
@@ -68,6 +68,7 @@ has_kbd_backlight(void)
 	  || (mops->type == MACHINE_MACBOOKPRO_3)
 	  || (mops->type == MACHINE_MACBOOKPRO_4)
 	  || (mops->type == MACHINE_MACBOOKPRO_5)
+	  || (mops->type == MACHINE_MACBOOKPRO_6)
 	  || (mops->type == MACHINE_MACBOOK_5)
 	  || (mops->type == MACHINE_MACBOOKAIR_1)
 	  || (mops->type == MACHINE_MACBOOKAIR_2));
diff --git a/pommed/mactel/nv8600mgt_backlight.c b/pommed/mactel/nv8600mgt_backlight.c
index b980681..d4a0edf 100644
--- a/pommed/mactel/nv8600mgt_backlight.c
+++ b/pommed/mactel/nv8600mgt_backlight.c
@@ -233,6 +233,7 @@ nv8600mgt_backlight_probe(void)
 	break;
 
       case MACHINE_MACBOOKPRO_5:
+      case MACHINE_MACBOOKPRO_6:
       case MACHINE_MACBOOK_5:
       case MACHINE_MACBOOK_6:
       case MACHINE_MACBOOKAIR_2:
diff --git a/pommed/pommed.c b/pommed/pommed.c
index 55d904c..918914f 100644
--- a/pommed/pommed.c
+++ b/pommed/pommed.c
@@ -287,6 +287,15 @@ struct machine_ops mb_mops[] = {
     /* .evdev_identify = evdev_is_wellspring3, */
   },
 
+  {  /* MacBookPro6,1 (17", Core i5/i7, April 2010)
+      * MacBookPro6,2 (15", Core i5/i7, April 2010) */
+    .type = MACHINE_MACBOOKPRO_6,
+    .lcd_backlight_probe = mbp_sysfs_backlight_probe,
+    .lcd_backlight_step = sysfs_backlight_step,
+    .lcd_backlight_toggle = sysfs_backlight_toggle,
+    /* .evdev_identify = evdev_is_wellspring3, */
+  },
+
   /* MacBook machines */
 
   {  /* MacBook1,1 (Core Duo) */
@@ -691,6 +700,10 @@ check_machine_dmi(void)
 	   || (strcmp(buf, "MacBookPro5,4") == 0)
 	   || (strcmp(buf, "MacBookPro5,5") == 0))
     ret = MACHINE_MACBOOKPRO_5;
+  /* Core i5/i7 MacBook Pro 15" & 17" (April 2010) */
+  else if ((strcmp(buf, "MacBookPro6,1") == 0)
+	   || (strcmp(buf, "MacBookPro6,2") == 0))
+    ret = MACHINE_MACBOOKPRO_6;
   /* Core Duo MacBook (May 2006) */
   else if (strcmp(buf, "MacBook1,1") == 0)
     ret = MACHINE_MACBOOK_1;
diff --git a/pommed/pommed.h b/pommed/pommed.h
index 77933a7..821f339 100644
--- a/pommed/pommed.h
+++ b/pommed/pommed.h
@@ -35,6 +35,7 @@ typedef enum
     MACHINE_MACBOOKPRO_3,
     MACHINE_MACBOOKPRO_4,
     MACHINE_MACBOOKPRO_5,
+    MACHINE_MACBOOKPRO_6,
 
     MACHINE_MACBOOK_1,
     MACHINE_MACBOOK_2,
diff --git a/pommed/sysfs_backlight.c b/pommed/sysfs_backlight.c
index 47a6865..3d2d098 100644
--- a/pommed/sysfs_backlight.c
+++ b/pommed/sysfs_backlight.c
@@ -417,6 +417,7 @@ mbp_sysfs_backlight_probe(void)
       case MACHINE_MACBOOKPRO_3:
       case MACHINE_MACBOOKPRO_4:
       case MACHINE_MACBOOKPRO_5:
+      case MACHINE_MACBOOKPRO_6:
       case MACHINE_MACBOOK_5:
       case MACHINE_MACBOOK_6:
       case MACHINE_MACBOOKAIR_2:

-- 
pommed - hotkeys handler for Apple laptops