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

[Julien BLACHE]

The following commit has been merged in the master branch:
commit 5afd619210208e713d2ab6a8ac9a921d09fff3a3
Author: Julien BLACHE <jb at jblache.org>
Date:   Fri Dec 24 20:36:50 2010 +0100

    Add support for the MacBook7,1 (April 2010)
    
    Reported and tested by Soledad Penades <sole at soledadpenades.com>

diff --git a/ChangeLog b/ChangeLog
index 6a069f6..a7ecf3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ ChangeLog for pommed
 
 version 1.36:
 	- pommed: probe for applesmc through /sys/class/hwmon.
+	- pommed: add support for the MacBook7,1 (April 2010).
 
 version 1.35:
 	- pommed: fix crash if no fnmode sysfs node found.
diff --git a/README b/README
index 98cb83a..0a96ff7 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ Supported machines:
    * MacBook Core Duo (May 2006)
    * MacBook Core2 Duo (November 2006 & May 2007)
    * MacBook Core2 Duo Santa Rosa (November 2007)
-   * MacBook Core2 Duo (February 2008, October 2008, October 2009)
+   * MacBook Core2 Duo (February 2008, October 2008, October 2009, April 2010)
    * MacBook Air Core2 Duo (January 2008, October 2008)
    * MacBook Air Core2 Duo 11" & 13" (October 2010)
 
diff --git a/pommed/pommed.c b/pommed/pommed.c
index e03eb90..ee323ef 100644
--- a/pommed/pommed.c
+++ b/pommed/pommed.c
@@ -354,6 +354,14 @@ struct machine_ops mb_mops[] = {
     /* .evdev_identify = evdev_is_wellspring3, */
   },
 
+  {  /* MacBook7,1 (Core2 Duo, April 2010) */
+    .type = MACHINE_MACBOOK_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 Air machines */
 
   {  /* MacBookAir1,1 (January 2008) */
@@ -747,6 +755,9 @@ check_machine_dmi(void)
   /* Core2 Duo MacBook (October 2009) */
   else if (strcmp(buf, "MacBook6,1") == 0)
     ret = MACHINE_MACBOOK_6;
+  /* Core2 Duo MacBook (April 2010) */
+  else if (strcmp(buf, "MacBook7,1") == 0)
+    ret = MACHINE_MACBOOK_7;
   /* MacBook Air (January 2008) */
   else if (strcmp(buf, "MacBookAir1,1") == 0)
     ret = MACHINE_MACBOOKAIR_1;
diff --git a/pommed/pommed.h b/pommed/pommed.h
index 6cc1b7b..924f540 100644
--- a/pommed/pommed.h
+++ b/pommed/pommed.h
@@ -44,6 +44,7 @@ typedef enum
     MACHINE_MACBOOK_4,
     MACHINE_MACBOOK_5,
     MACHINE_MACBOOK_6,
+    MACHINE_MACBOOK_7,
 
     MACHINE_MACBOOKAIR_1,
     MACHINE_MACBOOKAIR_2,

-- 
pommed - hotkeys handler for Apple laptops