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

[Julien Blache]

Author: jblache
Date: 2007-02-22 14:21:34 +0100 (Thu, 22 Feb 2007)
New Revision: 267

Modified:
   trunk/ChangeLog
   trunk/pommed/lcd_backlight.h
   trunk/pommed/pmac/sysfs_backlight.c
   trunk/pommed/pommed.c
   trunk/pommed/pommed.h
Log:
Add support for PowerBook6,5 (iBook G4 October 2004)

Rename r9600_sysfs_backlight_probe() to r9x00_sysfs_backlight_probe() as it supports the R9200 too.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-02-22 13:06:02 UTC (rev 266)
+++ trunk/ChangeLog	2007-02-22 13:21:34 UTC (rev 267)
@@ -11,6 +11,8 @@
 	- gpomme: adapt to the new DBus notification.
 	- wmpomme: adapt to the new DBus notification.
 	- pommed: added support for PowerBook6,4 and nVidia GPUs.
+	- pommed: added support for
+		  + PowerBook6,5: iBook G4 October 2004
 
 version 1.1:
 	- gpomme: added theme selection; use -t theme_name to select the

Modified: trunk/pommed/lcd_backlight.h
===================================================================
--- trunk/pommed/lcd_backlight.h	2007-02-22 13:06:02 UTC (rev 266)
+++ trunk/pommed/lcd_backlight.h	2007-02-22 13:21:34 UTC (rev 267)
@@ -50,7 +50,7 @@
 sysfs_backlight_step(int dir);
 
 int
-r9600_sysfs_backlight_probe(void);
+r9x00_sysfs_backlight_probe(void);
 
 int
 nvidia_sysfs_backlight_probe(void);

Modified: trunk/pommed/pmac/sysfs_backlight.c
===================================================================
--- trunk/pommed/pmac/sysfs_backlight.c	2007-02-22 13:06:02 UTC (rev 266)
+++ trunk/pommed/pmac/sysfs_backlight.c	2007-02-22 13:21:34 UTC (rev 267)
@@ -258,7 +258,7 @@
 }
 
 int
-r9600_sysfs_backlight_probe(void)
+r9x00_sysfs_backlight_probe(void)
 {
   return sysfs_backlight_probe(SYSFS_DRIVER_RADEON);
 }

Modified: trunk/pommed/pommed.c
===================================================================
--- trunk/pommed/pommed.c	2007-02-22 13:06:02 UTC (rev 266)
+++ trunk/pommed/pommed.c	2007-02-22 13:21:34 UTC (rev 267)
@@ -72,7 +72,7 @@
 /* PowerBook5,5 */
 struct machine_ops pb55_ops = {
   .type = MACHINE_POWERBOOK_55,
-  .lcd_backlight_probe = r9600_sysfs_backlight_probe,
+  .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
   .lcd_backlight_step = sysfs_backlight_step,
   .evdev_identify = evdev_is_adb,
 };
@@ -80,7 +80,7 @@
 /* PowerBook5,6 / PowerBook G4 15" (Feb 2005) */
 struct machine_ops pb56_ops = {
   .type = MACHINE_POWERBOOK_56,
-  .lcd_backlight_probe = r9600_sysfs_backlight_probe,
+  .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
   .lcd_backlight_step = sysfs_backlight_step,
   .evdev_identify = evdev_is_fountain,
 };
@@ -88,7 +88,7 @@
 /* PowerBook5,7 */
 struct machine_ops pb57_ops = {
   .type = MACHINE_POWERBOOK_57,
-  .lcd_backlight_probe = r9600_sysfs_backlight_probe,
+  .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
   .lcd_backlight_step = sysfs_backlight_step,
   .evdev_identify = evdev_is_fountain,
 };
@@ -96,7 +96,7 @@
 /* PowerBook6,3 */
 struct machine_ops pb63_ops = {
   .type = MACHINE_POWERBOOK_63,
-  .lcd_backlight_probe = r9600_sysfs_backlight_probe,
+  .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
   .lcd_backlight_step = sysfs_backlight_step,
   .evdev_identify = evdev_is_adb,
 };
@@ -109,6 +109,14 @@
   .evdev_identify = evdev_is_adb,
 };
 
+/* PowerBook6,5 */
+struct machine_ops pb65_ops = {
+  .type = MACHINE_POWERBOOK_65,
+  .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+  .lcd_backlight_step = sysfs_backlight_step,
+  .evdev_identify = evdev_is_adb,
+};
+
 #else
 
 /* MacBook Pro machines */
@@ -313,6 +321,9 @@
   /* PowerBook G4 12" (April 2004) */
   else if (strncmp(buffer, "PowerBook6,4", 12) == 0)
     ret = MACHINE_POWERBOOK_64;
+  /* iBook G4 (October 2004) */
+  else if (strncmp(buffer, "PowerBook6,5", 12) == 0)
+    ret = MACHINE_POWERBOOK_65;
   else
     logmsg(LOG_ERR, "Unknown Apple machine: %s", buffer);
   
@@ -520,6 +531,10 @@
 	mops = &pb64_ops;
 	break;
 
+      case MACHINE_POWERBOOK_65:
+	mops = &pb65_ops;
+	break;
+
 #endif /* !__powerpc__ */
 
       case MACHINE_MAC_UNKNOWN:

Modified: trunk/pommed/pommed.h
===================================================================
--- trunk/pommed/pommed.h	2007-02-22 13:06:02 UTC (rev 266)
+++ trunk/pommed/pommed.h	2007-02-22 13:21:34 UTC (rev 267)
@@ -41,6 +41,7 @@
     MACHINE_POWERBOOK_57,
     MACHINE_POWERBOOK_63,
     MACHINE_POWERBOOK_64,
+    MACHINE_POWERBOOK_65,
 #endif /* !__powerpc__ */
   } machine_type;