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

[Julien Blache]

Author: jblache
Date: 2007-02-22 14:06:02 +0100 (Thu, 22 Feb 2007)
New Revision: 266

Modified:
   trunk/ChangeLog
   trunk/pommed/pommed.c
   trunk/pommed/pommed.h
Log:
Added support for PowerBook6,4 (PowerBook G4 12" April 2004)


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-02-22 12:58:49 UTC (rev 265)
+++ trunk/ChangeLog	2007-02-22 13:06:02 UTC (rev 266)
@@ -10,6 +10,7 @@
 	the user itself.
 	- gpomme: adapt to the new DBus notification.
 	- wmpomme: adapt to the new DBus notification.
+	- pommed: added support for PowerBook6,4 and nVidia GPUs.
 
 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 12:58:49 UTC (rev 265)
+++ trunk/pommed/pommed.c	2007-02-22 13:06:02 UTC (rev 266)
@@ -3,7 +3,7 @@
  *
  * $Id$
  *
- * Copyright (C) 2006 Julien BLACHE <jb at jblache.org>
+ * Copyright (C) 2006-2007 Julien BLACHE <jb at jblache.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -101,6 +101,14 @@
   .evdev_identify = evdev_is_adb,
 };
 
+/* PowerBook6,4 */
+struct machine_ops pb64_ops = {
+  .type = MACHINE_POWERBOOK_64,
+  .lcd_backlight_probe = nvidia_sysfs_backlight_probe,
+  .lcd_backlight_step = sysfs_backlight_step,
+  .evdev_identify = evdev_is_adb,
+};
+
 #else
 
 /* MacBook Pro machines */
@@ -302,6 +310,9 @@
   /* iBook G4 (October 2003) */
   else if (strncmp(buffer, "PowerBook6,3", 12) == 0)
     ret = MACHINE_POWERBOOK_63;
+  /* PowerBook G4 12" (April 2004) */
+  else if (strncmp(buffer, "PowerBook6,4", 12) == 0)
+    ret = MACHINE_POWERBOOK_64;
   else
     logmsg(LOG_ERR, "Unknown Apple machine: %s", buffer);
   
@@ -505,6 +516,10 @@
 	mops = &pb63_ops;
 	break;
 
+      case MACHINE_POWERBOOK_64:
+	mops = &pb64_ops;
+	break;
+
 #endif /* !__powerpc__ */
 
       case MACHINE_MAC_UNKNOWN:

Modified: trunk/pommed/pommed.h
===================================================================
--- trunk/pommed/pommed.h	2007-02-22 12:58:49 UTC (rev 265)
+++ trunk/pommed/pommed.h	2007-02-22 13:06:02 UTC (rev 266)
@@ -40,6 +40,7 @@
     MACHINE_POWERBOOK_56,
     MACHINE_POWERBOOK_57,
     MACHINE_POWERBOOK_63,
+    MACHINE_POWERBOOK_64,
 #endif /* !__powerpc__ */
   } machine_type;