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

[Julien BLACHE]

The following commit has been merged in the master branch:
commit d03e847f64e7edd710a0a87b2c13c4284663e12a
Author: Benoit Gschwind <gschwind at gnu-log.net>
Date:   Fri Jul 30 17:30:58 2010 +0200

    Add the nouveau sysfs backlight driver

diff --git a/ChangeLog b/ChangeLog
index f1e2537..621ba7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ ChangeLog for pommed
 
 version 1.34:
 	- pommed: be more careful when invoking eject (Alioth #312213).
+	- pommed: add the nouveau sysfs backlight driver.
 
 version 1.33:
 	- pommed: added support for the MacBook6,1 (October 2009).
diff --git a/pommed/sysfs_backlight.c b/pommed/sysfs_backlight.c
index 3d2d098..d56423e 100644
--- a/pommed/sysfs_backlight.c
+++ b/pommed/sysfs_backlight.c
@@ -43,6 +43,7 @@ enum {
   SYSFS_DRIVER_RIVA,
 #else
   SYSFS_DRIVER_MBP,
+  SYSFS_DRIVER_NOUVEAU,
   SYSFS_DRIVER_NVIDIA,
 #endif
 };
@@ -62,6 +63,7 @@ static char *actual_brightness[] =
     "/sys/class/backlight/rivabl0/actual_brightness",
 #else
     "/sys/class/backlight/mbp_backlight/actual_brightness",
+    "/sys/class/backlight/nv_backlight/actual_brightness",
     "/sys/class/backlight/nvidia_backlight/actual_brightness",
 #endif
   };
@@ -77,6 +79,7 @@ static char *brightness[] =
     "/sys/class/backlight/rivabl0/brightness",
 #else
     "/sys/class/backlight/mbp_backlight/brightness",
+    "/sys/class/backlight/nv_backlight/brightness",
     "/sys/class/backlight/nvidia_backlight/brightness",
 #endif
   };
@@ -92,6 +95,7 @@ static char *max_brightness[] =
     "/sys/class/backlight/rivabl0/max_brightness",
 #else
     "/sys/class/backlight/mbp_backlight/max_brightness",
+    "/sys/class/backlight/nv_backlight/max_brightness",
     "/sys/class/backlight/nvidia_backlight/max_brightness",
 #endif
   };
@@ -406,6 +410,11 @@ mbp_sysfs_backlight_probe(void)
   if (ret == 0)
     return 0;
 
+  ret = sysfs_backlight_probe(SYSFS_DRIVER_NOUVEAU);
+
+  if (ret == 0)
+    return 0;
+
   ret = sysfs_backlight_probe(SYSFS_DRIVER_NVIDIA);
 
   if (ret == 0)

-- 
pommed - hotkeys handler for Apple laptops