[Pommed-commits] r532 - in trunk/pommed: . mactel

[jblache at alioth.debian.org]

Author: jblache
Date: 2008-12-21 14:52:23 +0000 (Sun, 21 Dec 2008)
New Revision: 532

Modified:
   trunk/pommed/kbd_backlight.h
   trunk/pommed/mactel/kbd_backlight.c
Log:
Refactor code.


Modified: trunk/pommed/kbd_backlight.h
===================================================================
--- trunk/pommed/kbd_backlight.h	2008-12-21 14:51:36 UTC (rev 531)
+++ trunk/pommed/kbd_backlight.h	2008-12-21 14:52:23 UTC (rev 532)
@@ -5,12 +5,6 @@
 #ifndef __KBD_BACKLIGHT_H__
 #define __KBD_BACKLIGHT_H__
 
-#ifndef __powerpc__
-#define KBD_BACKLIGHT           "/sys/class/leds/smc:kbd_backlight/brightness"
-#define KBD_BACKLIGHT_2625      "/sys/class/leds/smc::kbd_backlight/brightness"
-#endif /* !__powerpc__ */
-
-
 #define KBD_BACKLIGHT_OFF       0
 #define KBD_BACKLIGHT_MAX       255
 

Modified: trunk/pommed/mactel/kbd_backlight.c
===================================================================
--- trunk/pommed/mactel/kbd_backlight.c	2008-12-21 14:51:36 UTC (rev 531)
+++ trunk/pommed/mactel/kbd_backlight.c	2008-12-21 14:52:23 UTC (rev 532)
@@ -47,24 +47,30 @@
 static int
 kbd_backlight_open(int flags)
 {
-  int errno1;
+  char *kbdbck_node[] =
+    {
+      "/sys/class/leds/smc::kbd_backlight/brightness", /* 2.6.25 & up */
+      "/sys/class/leds/smc:kbd_backlight/brightness"
+    };
   int fd;
+  int i;
 
-  fd = open(KBD_BACKLIGHT, flags);
-  if (fd < 0)
+  for (i = 0; i < sizeof(kbdbck_node) / sizeof(*kbdbck_node); i++)
     {
-      errno1 = errno;
+      logdebug("Trying %s\n", kbdbck_node[i]);
 
-      fd = open(KBD_BACKLIGHT_2625, flags);
-      if (fd < 0)
-	{
-	  logmsg(LOG_WARNING, "Could not open %s: %s", KBD_BACKLIGHT, strerror(errno1));
-	  logmsg(LOG_WARNING, "Could not open %s: %s", KBD_BACKLIGHT_2625, strerror(errno));
-	  return -1;
-	}
+      fd = open(kbdbck_node[i], flags);
+      if (fd >= 0)
+	return fd;
+
+      if (errno == ENOENT)
+	continue;
+
+      logmsg(LOG_WARNING, "Could not open %s: %s", kbdbck_node[i], strerror(errno));
+      return -1;
     }
 
-  return fd;
+  return -1;
 }