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

[Julien BLACHE]

The following commit has been merged in the master branch:
commit 694e766178cd215428cc99c04d05f395d7085de5
Author: Julien BLACHE <jb at jblache.org>
Date:   Tue May 12 22:07:58 2009 +0200

    Add support for the MacBook5,2 (white MacBook)

diff --git a/ChangeLog b/ChangeLog
index 072c9bb..26d6b11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ ChangeLog for pommed
 --------------------
 
 version 1.27:
+	- pommed: added support for the MacBook5,2 (white MacBook).
 
 version 1.26:
 	- pommed: only keystrokes on the built-in keyboard should reset
diff --git a/pommed/mactel/nv8600mgt_backlight.c b/pommed/mactel/nv8600mgt_backlight.c
index 9c6e18e..79373f4 100644
--- a/pommed/mactel/nv8600mgt_backlight.c
+++ b/pommed/mactel/nv8600mgt_backlight.c
@@ -180,6 +180,7 @@ nv8600mgt_backlight_toggle(int lvl)
 #define PCI_ID_VENDOR_NVIDIA     0x10de
 #define PCI_ID_PRODUCT_8600MGT   0x0407
 #define PCI_ID_PRODUCT_9400M     0x0863
+#define PCI_ID_PRODUCT_9400M_G   0x0866
 #define PCI_ID_PRODUCT_9600MGT   0x0647
 
 /* Look for an nVidia GeForce 8600M GT, 9400M or 9600M GT */
@@ -208,6 +209,7 @@ nv8600mgt_backlight_probe(void)
       if ((dev->vendor_id == PCI_ID_VENDOR_NVIDIA)
 	  && ((dev->device_id == PCI_ID_PRODUCT_8600MGT)
 	      || (dev->device_id == PCI_ID_PRODUCT_9400M)
+	      || (dev->device_id == PCI_ID_PRODUCT_9400M_G)
 	      || (dev->device_id == PCI_ID_PRODUCT_9600MGT)))
 	{
 	  break;
diff --git a/pommed/pommed.c b/pommed/pommed.c
index 87b847e..b09a632 100644
--- a/pommed/pommed.c
+++ b/pommed/pommed.c
@@ -685,8 +685,8 @@ check_machine_dmi(void)
   /* Core2 Duo MacBook (February 2008) */
   else if (strcmp(buf, "MacBook4,1") == 0)
     ret = MACHINE_MACBOOK_4;
-  /* Core2 Duo MacBook (October 2008) */
-  else if (strcmp(buf, "MacBook5,1") == 0)
+  /* 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;
   /* MacBook Air (January 2008) */
   else if (strcmp(buf, "MacBookAir1,1") == 0)

-- 
pommed - hotkeys handler for Apple laptops