[Pommed-commits] r270 - in trunk: . pommed

[Julien Blache]

Author: jblache
Date: 2007-02-22 15:14:42 +0100 (Thu, 22 Feb 2007)
New Revision: 270

Modified:
   trunk/ChangeLog
   trunk/pommed/pommed.c
   trunk/pommed/pommed.h
Log:
Add support for
 - PowerBook6,2 (PowerBook G4 12" September 2003)
 - PowerBook6,7 (iBook G4)
 - PowerBook6,8 (PowerBook G4 12")


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-02-22 14:00:31 UTC (rev 269)
+++ trunk/ChangeLog	2007-02-22 14:14:42 UTC (rev 270)
@@ -13,7 +13,10 @@
 	- pommed: added support for PowerBook6,4 and nVidia GPUs.
 	- pommed: added support for
 		  + PowerBook6,1: PowerBook G4 12" January 2003
+		  + PowerBook6,2: PowerBook G4 12" September 2003
 		  + PowerBook6,5: iBook G4 October 2004
+		  + PowerBook6,7: iBook G4
+		  + PowerBook6,8: PowerBook G4 12"
 
 version 1.1:
 	- gpomme: added theme selection; use -t theme_name to select the

Modified: trunk/pommed/pommed.c
===================================================================
--- trunk/pommed/pommed.c	2007-02-22 14:00:31 UTC (rev 269)
+++ trunk/pommed/pommed.c	2007-02-22 14:14:42 UTC (rev 270)
@@ -103,6 +103,13 @@
     .evdev_identify = evdev_is_adb,
   },
 
+  {  /* PowerBook6,2 */
+    .type = MACHINE_POWERBOOK_62,
+    .lcd_backlight_probe = nvidia_sysfs_backlight_probe,
+    .lcd_backlight_step = sysfs_backlight_step,
+    .evdev_identify = evdev_is_adb,
+  },
+
   {  /* PowerBook6,3 */
     .type = MACHINE_POWERBOOK_63,
     .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
@@ -122,6 +129,20 @@
     .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
     .lcd_backlight_step = sysfs_backlight_step,
     .evdev_identify = evdev_is_adb,
+  },
+
+  {  /* PowerBook6,7 */
+    .type = MACHINE_POWERBOOK_67,
+    .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+    .lcd_backlight_step = sysfs_backlight_step,
+    .evdev_identify = evdev_is_adb,
+  },
+
+  {  /* PowerBook6,8 */
+    .type = MACHINE_POWERBOOK_68,
+    .lcd_backlight_probe = nvidia_sysfs_backlight_probe,
+    .lcd_backlight_step = sysfs_backlight_step,
+    .evdev_identify = evdev_is_adb,
   }
 };
 
@@ -326,6 +347,9 @@
   /* PowerBook G4 12" (January 2003) */
   else if (strncmp(buffer, "PowerBook6,1", 12) == 0)
     ret = MACHINE_POWERBOOK_61;
+  /* PowerBook G4 12" (September 2003) */
+  else if (strncmp(buffer, "PowerBook6,2", 12) == 0)
+    ret = MACHINE_POWERBOOK_61;
   /* iBook G4 (October 2003) */
   else if (strncmp(buffer, "PowerBook6,3", 12) == 0)
     ret = MACHINE_POWERBOOK_63;
@@ -335,6 +359,12 @@
   /* iBook G4 (October 2004) */
   else if (strncmp(buffer, "PowerBook6,5", 12) == 0)
     ret = MACHINE_POWERBOOK_65;
+  /* iBook G4 */
+  else if (strncmp(buffer, "PowerBook6,7", 12) == 0)
+    ret = MACHINE_POWERBOOK_67;
+  /* PowerBook G4 12" */
+  else if (strncmp(buffer, "PowerBook6,8", 12) == 0)
+    ret = MACHINE_POWERBOOK_68;
   else
     logmsg(LOG_ERR, "Unknown Apple machine: %s", buffer);
   

Modified: trunk/pommed/pommed.h
===================================================================
--- trunk/pommed/pommed.h	2007-02-22 14:00:31 UTC (rev 269)
+++ trunk/pommed/pommed.h	2007-02-22 14:14:42 UTC (rev 270)
@@ -40,9 +40,12 @@
     MACHINE_POWERBOOK_56,
     MACHINE_POWERBOOK_57,
     MACHINE_POWERBOOK_61,
+    MACHINE_POWERBOOK_62,
     MACHINE_POWERBOOK_63,
     MACHINE_POWERBOOK_64,
     MACHINE_POWERBOOK_65,
+    MACHINE_POWERBOOK_67,
+    MACHINE_POWERBOOK_68,
 #endif /* !__powerpc__ */
     MACHINE_LAST
   } machine_type;