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

[Julien BLACHE]

The following commit has been merged in the master branch:
commit 180d4a820a02b27222c2e2d2eac74ede52e78cdf
Author: Julien BLACHE <jb at jblache.org>
Date:   Sun Mar 21 12:04:20 2010 +0100

    Add the MacBook6,1 (October 2009)

diff --git a/ChangeLog b/ChangeLog
index f6ce924..ca7610a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ ChangeLog for pommed
 --------------------
 
 version 1.33:
+	- pommed: added support for the MacBook6,1 (October 2009).
 
 version 1.32:
 	- pommed: add the rivabl sysfs backlight driver for older 12"
diff --git a/README b/README
index 1cb076f..25526a5 100644
--- a/README
+++ b/README
@@ -30,7 +30,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)
+   * MacBook Core2 Duo (February 2008, October 2008, October 2009)
    * MacBook Air Core2 Duo (January 2008, October 2008)
 
 
diff --git a/pommed/mactel/nv8600mgt_backlight.c b/pommed/mactel/nv8600mgt_backlight.c
index 79373f4..b980681 100644
--- a/pommed/mactel/nv8600mgt_backlight.c
+++ b/pommed/mactel/nv8600mgt_backlight.c
@@ -234,6 +234,7 @@ nv8600mgt_backlight_probe(void)
 
       case MACHINE_MACBOOKPRO_5:
       case MACHINE_MACBOOK_5:
+      case MACHINE_MACBOOK_6:
       case MACHINE_MACBOOKAIR_2:
 	bl_port = 0x52e; /* 0x52e - 0x52f */
 	break;
diff --git a/pommed/pommed.c b/pommed/pommed.c
index 20cd174..55d904c 100644
--- a/pommed/pommed.c
+++ b/pommed/pommed.c
@@ -329,6 +329,14 @@ struct machine_ops mb_mops[] = {
     /* .evdev_identify = evdev_is_wellspring3, */
   },
 
+  {  /* MacBook6,1 (Core2 Duo, October 2009) */
+    .type = MACHINE_MACBOOK_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 Air machines */
 
   {  /* MacBookAir1,1 (January 2008) */
@@ -698,6 +706,9 @@ check_machine_dmi(void)
   /* Core2 Duo MacBook (October 2008) (5,2 white MacBook) */
   else if ((strcmp(buf, "MacBook5,1") == 0) || (strcmp(buf, "MacBook5,2") == 0))
     ret = MACHINE_MACBOOK_5;
+  /* Core2 Duo MacBook (October 2009) */
+  else if (strcmp(buf, "MacBook6,1") == 0)
+    ret = MACHINE_MACBOOK_6;
   /* 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 6007d7b..77933a7 100644
--- a/pommed/pommed.h
+++ b/pommed/pommed.h
@@ -41,6 +41,7 @@ typedef enum
     MACHINE_MACBOOK_3,
     MACHINE_MACBOOK_4,
     MACHINE_MACBOOK_5,
+    MACHINE_MACBOOK_6,
 
     MACHINE_MACBOOKAIR_1,
     MACHINE_MACBOOKAIR_2,
diff --git a/pommed/sysfs_backlight.c b/pommed/sysfs_backlight.c
index 74dd7ab..47a6865 100644
--- a/pommed/sysfs_backlight.c
+++ b/pommed/sysfs_backlight.c
@@ -418,6 +418,7 @@ mbp_sysfs_backlight_probe(void)
       case MACHINE_MACBOOKPRO_4:
       case MACHINE_MACBOOKPRO_5:
       case MACHINE_MACBOOK_5:
+      case MACHINE_MACBOOK_6:
       case MACHINE_MACBOOKAIR_2:
 	logmsg(LOG_INFO, "sysfs backlight probe failed, falling back to nv8600mgt");
 

-- 
pommed - hotkeys handler for Apple laptops