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

[jblache at alioth.debian.org]

Author: jblache
Date: 2007-08-22 14:14:16 +0000 (Wed, 22 Aug 2007)
New Revision: 352

Modified:
   trunk/ChangeLog
   trunk/pommed/kbd_backlight.h
   trunk/pommed/mactel/kbd_backlight.c
   trunk/pommed/pmac/kbd_backlight.c
Log:
Turn has_kbd_backlight() into an inline function.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-22 14:05:27 UTC (rev 351)
+++ trunk/ChangeLog	2007-08-22 14:14:16 UTC (rev 352)
@@ -4,6 +4,7 @@
 version 1.9:
 	- pommed: add an idle timer to automatically switch off the
 	keyboard backlight. Suggested by Javier Marcet.
+	- pommed: turn has_kbd_backlight() into an inline function.
 
 version 1.8:
 	- pommed: probe for the applesmc sysfs path in the ambient light

Modified: trunk/pommed/kbd_backlight.h
===================================================================
--- trunk/pommed/kbd_backlight.h	2007-08-22 14:05:27 UTC (rev 351)
+++ trunk/pommed/kbd_backlight.h	2007-08-22 14:14:16 UTC (rev 352)
@@ -47,10 +47,33 @@
 
 extern struct _kbd_bck_info kbd_bck_info;
 
+#ifdef __powerpc__
+static inline int
+has_kbd_backlight(void)
+{
+  return ((mops->type == MACHINE_POWERBOOK_51)
+	  || (mops->type == MACHINE_POWERBOOK_52)
+	  || (mops->type == MACHINE_POWERBOOK_53)
+	  || (mops->type == MACHINE_POWERBOOK_54)
+	  || (mops->type == MACHINE_POWERBOOK_55)
+	  || (mops->type == MACHINE_POWERBOOK_56)
+	  || (mops->type == MACHINE_POWERBOOK_57)
+	  || (mops->type == MACHINE_POWERBOOK_58)
+	  || (mops->type == MACHINE_POWERBOOK_59));
+}
 
-int
-has_kbd_backlight(void);
+#else
 
+static inline int
+has_kbd_backlight(void)
+{
+  return ((mops->type == MACHINE_MACBOOKPRO_1)
+	  || (mops->type == MACHINE_MACBOOKPRO_2)
+	  || (mops->type == MACHINE_MACBOOKPRO_3));
+}
+#endif /* __powerpc__ */
+
+
 void
 kbd_backlight_step(int dir);
 

Modified: trunk/pommed/mactel/kbd_backlight.c
===================================================================
--- trunk/pommed/mactel/kbd_backlight.c	2007-08-22 14:05:27 UTC (rev 351)
+++ trunk/pommed/mactel/kbd_backlight.c	2007-08-22 14:14:16 UTC (rev 352)
@@ -42,15 +42,6 @@
 struct _kbd_bck_info kbd_bck_info;
 
 
-int
-has_kbd_backlight(void)
-{
-  return ((mops->type == MACHINE_MACBOOKPRO_1)
-	  || (mops->type == MACHINE_MACBOOKPRO_2)
-	  || (mops->type == MACHINE_MACBOOKPRO_3));
-}
-
-
 static int
 kbd_backlight_get(void)
 {

Modified: trunk/pommed/pmac/kbd_backlight.c
===================================================================
--- trunk/pommed/pmac/kbd_backlight.c	2007-08-22 14:05:27 UTC (rev 351)
+++ trunk/pommed/pmac/kbd_backlight.c	2007-08-22 14:14:16 UTC (rev 352)
@@ -55,20 +55,6 @@
 struct _kbd_bck_info kbd_bck_info;
 
 
-int
-has_kbd_backlight(void)
-{
-  return ((mops->type == MACHINE_POWERBOOK_51)
-	  || (mops->type == MACHINE_POWERBOOK_52)
-	  || (mops->type == MACHINE_POWERBOOK_53)
-	  || (mops->type == MACHINE_POWERBOOK_54)
-	  || (mops->type == MACHINE_POWERBOOK_55)
-	  || (mops->type == MACHINE_POWERBOOK_56)
-	  || (mops->type == MACHINE_POWERBOOK_57)
-	  || (mops->type == MACHINE_POWERBOOK_58)
-	  || (mops->type == MACHINE_POWERBOOK_59));
-}
-
 static int
 kbd_backlight_get(void)
 {