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

[Julien BLACHE]

The following commit has been merged in the master branch:
commit 22109cd99ca4970ca3bdc0a68013749539416dfa
Author: Julien BLACHE <jb at jblache.org>
Date:   Thu Oct 1 18:41:38 2009 +0200

    Add support for the newer nvidia backlight driver
    
    Sysfs layout changed to nvidia_backlight from mbp_backlight.

diff --git a/ChangeLog b/ChangeLog
index d75ca5a..30c46f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ ChangeLog for pommed
 --------------------
 
 version 1.29:
+	- pommed: add support for newer nvidia backlight driver which
+	changed the sysfs layout.
 
 version 1.28:
 	- pommed: added support for the MacBookPro5,3 (15" MacBookPro
diff --git a/pommed/sysfs_backlight.c b/pommed/sysfs_backlight.c
index f5c464c..c1e8536 100644
--- a/pommed/sysfs_backlight.c
+++ b/pommed/sysfs_backlight.c
@@ -42,6 +42,7 @@ enum {
   SYSFS_DRIVER_NVIDIA,
 #else
   SYSFS_DRIVER_MBP,
+  SYSFS_DRIVER_NVIDIA,
 #endif
 };
 
@@ -59,6 +60,7 @@ static char *actual_brightness[] =
     "/sys/class/backlight/nvidiabl0/actual_brightness",
 #else
     "/sys/class/backlight/mbp_backlight/actual_brightness",
+    "/sys/class/backlight/nvidia_backlight/actual_brightness",
 #endif
   };
 
@@ -72,6 +74,7 @@ static char *brightness[] =
     "/sys/class/backlight/nvidiabl0/brightness",
 #else
     "/sys/class/backlight/mbp_backlight/brightness",
+    "/sys/class/backlight/nvidia_backlight/brightness",
 #endif
   };
 
@@ -85,6 +88,7 @@ static char *max_brightness[] =
     "/sys/class/backlight/nvidiabl0/max_brightness",
 #else
     "/sys/class/backlight/mbp_backlight/max_brightness",
+    "/sys/class/backlight/nvidia_backlight/max_brightness",
 #endif
   };
 
@@ -396,6 +400,11 @@ mbp_sysfs_backlight_probe(void)
   if (ret == 0)
     return 0;
 
+  ret = sysfs_backlight_probe(SYSFS_DRIVER_NVIDIA);
+
+  if (ret == 0)
+    return 0;
+
   /* Probe failed, wire up native driver instead */
   switch (mops->type)
     {

-- 
pommed - hotkeys handler for Apple laptops