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

[Julien BLACHE]

The following commit has been merged in the master branch:
commit 6487ad1ae67b68d720d0bbcbaa4231995b42654a
Author: Julien BLACHE <jb at jblache.org>
Date:   Tue Jun 22 22:01:59 2010 +0200

    Add support for the MacBookPro7,1 (13", Core2 Duo, April 2010)
    
    Patch from <panard at inzenet.org>.

diff --git a/ChangeLog b/ChangeLog
index 7618b50..5c24616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ version 1.33:
 	- pommed: added support for the MacBookPro6,1 & 6,2 (Core i5/i7,
 	April 2010).
 	- pommed: kill PCI device check in nv8600mgt.
+	- pommed: added support for the MacBookPro7,1 (13", Core2 Duo,
+	April 2010). Requires a patched nvidia-bl module for backlight
+	support at the moment.
 
 version 1.32:
 	- pommed: add the rivabl sysfs backlight driver for older 12"
diff --git a/README b/README
index 3862398..0070007 100644
--- a/README
+++ b/README
@@ -28,6 +28,7 @@ Supported machines:
    * 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 Pro Core2 Duo 13" (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 09177cb..6a737f4 100644
--- a/pommed/kbd_backlight.h
+++ b/pommed/kbd_backlight.h
@@ -69,6 +69,7 @@ has_kbd_backlight(void)
 	  || (mops->type == MACHINE_MACBOOKPRO_4)
 	  || (mops->type == MACHINE_MACBOOKPRO_5)
 	  || (mops->type == MACHINE_MACBOOKPRO_6)
+	  || (mops->type == MACHINE_MACBOOKPRO_7)
 	  || (mops->type == MACHINE_MACBOOK_5)
 	  || (mops->type == MACHINE_MACBOOKAIR_1)
 	  || (mops->type == MACHINE_MACBOOKAIR_2));
diff --git a/pommed/pommed.c b/pommed/pommed.c
index 918914f..59a5a82 100644
--- a/pommed/pommed.c
+++ b/pommed/pommed.c
@@ -296,6 +296,14 @@ struct machine_ops mb_mops[] = {
     /* .evdev_identify = evdev_is_wellspring3, */
   },
 
+  {  /* MacBookPro7,1 (13", Core2 Duo, April 2010) */
+    .type = MACHINE_MACBOOKPRO_7,
+    .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) */
@@ -704,6 +712,9 @@ check_machine_dmi(void)
   else if ((strcmp(buf, "MacBookPro6,1") == 0)
 	   || (strcmp(buf, "MacBookPro6,2") == 0))
     ret = MACHINE_MACBOOKPRO_6;
+  /* Core2 Duo MacBook Pro 13" (April 2010) */
+  else if (strcmp(buf, "MacBookPro7,1") == 0)
+    ret = MACHINE_MACBOOKPRO_7;
   /* 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 821f339..95e377b 100644
--- a/pommed/pommed.h
+++ b/pommed/pommed.h
@@ -36,6 +36,7 @@ typedef enum
     MACHINE_MACBOOKPRO_4,
     MACHINE_MACBOOKPRO_5,
     MACHINE_MACBOOKPRO_6,
+    MACHINE_MACBOOKPRO_7,
 
     MACHINE_MACBOOK_1,
     MACHINE_MACBOOK_2,

-- 
pommed - hotkeys handler for Apple laptops