[Pommed-commits] r274 - in trunk: . pommed pommed/pmac
Julien Blache
jblache at alioth.debian.org
Fri Feb 23 12:54:43 CET 2007
Author: jblache
Date: 2007-02-23 12:54:43 +0100 (Fri, 23 Feb 2007)
New Revision: 274
Modified:
trunk/ChangeLog
trunk/pommed/pmac/kbd_backlight.c
trunk/pommed/pommed.c
trunk/pommed/pommed.h
Log:
Add more (untested) machines.
We should have all the G4 machines listed now.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-02-22 22:58:13 UTC (rev 273)
+++ trunk/ChangeLog 2007-02-23 11:54:43 UTC (rev 274)
@@ -11,13 +11,30 @@
- 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
+ - pommed: added UNTESTED support for
+ + PowerBook3,3: PowerBook G4 Titanium 15" October 2001
+ + PowerBook3,4: PowerBook G4 Titanium 15" April 2002
+ + PowerBook3,5: PowerBook G4 Titanium 15"
+ + PowerBook5,1: PowerBook G4 Aluminium 17"
+ + PowerBook5,2: PowerBook G4 Aluminium 15" September 2003
+ + PowerBook5,3: PowerBook G4 Aluminium 17" September 2003
+ + PowerBook5,4: PowerBook G4 Aluminium 15" April 2004
+ + PowerBook5,8: PowerBook G4 Aluminium 15"
+ + PowerBook5,9: PowerBook G4 Aluminium 17"
+ 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"
+ If you own one of the machines listed above, please test pommed by
+ running pommed -d and tell us:
+ - if it works at all
+ - if, not running either pommed or pbbuttonsd, pressing the
+ backlight up/down keys makes the backlight level change
+ Please send the debug output along with these information; we know
+ that pommed won't work out of the box on some of these machines.
+
version 1.1:
- gpomme: added theme selection; use -t theme_name to select the
theme to use.
Modified: trunk/pommed/pmac/kbd_backlight.c
===================================================================
--- trunk/pommed/pmac/kbd_backlight.c 2007-02-22 22:58:13 UTC (rev 273)
+++ trunk/pommed/pmac/kbd_backlight.c 2007-02-23 11:54:43 UTC (rev 274)
@@ -57,9 +57,15 @@
int
has_kbd_backlight(void)
{
- return ((mops->type == MACHINE_POWERBOOK_55)
+ 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_57)
+ || (mops->type == MACHINE_POWERBOOK_58)
+ || (mops->type == MACHINE_POWERBOOK_59));
}
static int
Modified: trunk/pommed/pommed.c
===================================================================
--- trunk/pommed/pommed.c 2007-02-22 22:58:13 UTC (rev 273)
+++ trunk/pommed/pommed.c 2007-02-23 11:54:43 UTC (rev 274)
@@ -68,6 +68,8 @@
/* PowerBook machines */
struct machine_ops pb_mops[] = {
+ /* PowerBook3,1 is a G3-based PowerBook */
+
{ /* PowerBook3,2 */
.type = MACHINE_POWERBOOK_32,
.lcd_backlight_probe = r128_backlight_probe,
@@ -75,6 +77,57 @@
.evdev_identify = evdev_is_adb,
},
+ { /* PowerBook3,3 */
+ .type = MACHINE_POWERBOOK_33,
+ .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+ .lcd_backlight_step = sysfs_backlight_step,
+ .evdev_identify = evdev_is_adb,
+ },
+
+ { /* PowerBook3,4 */
+ .type = MACHINE_POWERBOOK_34,
+ .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+ .lcd_backlight_step = sysfs_backlight_step,
+ .evdev_identify = evdev_is_adb,
+ },
+
+ { /* PowerBook3,5 */
+ .type = MACHINE_POWERBOOK_35,
+ .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+ .lcd_backlight_step = sysfs_backlight_step,
+ .evdev_identify = evdev_is_adb,
+ },
+
+ /* PowerBook4,* -> G3 iBooks */
+
+ { /* PowerBook5,1 */
+ .type = MACHINE_POWERBOOK_51,
+ .lcd_backlight_probe = nvidia_sysfs_backlight_probe,
+ .lcd_backlight_step = sysfs_backlight_step,
+ .evdev_identify = evdev_is_adb,
+ },
+
+ { /* PowerBook5,2 */
+ .type = MACHINE_POWERBOOK_52,
+ .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+ .lcd_backlight_step = sysfs_backlight_step,
+ .evdev_identify = evdev_is_adb,
+ },
+
+ { /* PowerBook5,3 */
+ .type = MACHINE_POWERBOOK_53,
+ .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+ .lcd_backlight_step = sysfs_backlight_step,
+ .evdev_identify = evdev_is_adb,
+ },
+
+ { /* PowerBook5,4 */
+ .type = MACHINE_POWERBOOK_54,
+ .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+ .lcd_backlight_step = sysfs_backlight_step,
+ .evdev_identify = evdev_is_adb,
+ },
+
{ /* PowerBook5,5 */
.type = MACHINE_POWERBOOK_55,
.lcd_backlight_probe = r9x00_sysfs_backlight_probe,
@@ -96,6 +149,22 @@
.evdev_identify = evdev_is_fountain,
},
+ { /* PowerBook5,8 */
+ .type = MACHINE_POWERBOOK_58,
+ .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+ .lcd_backlight_step = sysfs_backlight_step,
+ .evdev_identify = evdev_is_fountain,
+ },
+
+ { /* PowerBook5,9 */
+ .type = MACHINE_POWERBOOK_59,
+ .lcd_backlight_probe = r9x00_sysfs_backlight_probe,
+ .lcd_backlight_step = sysfs_backlight_step,
+ .evdev_identify = evdev_is_fountain,
+ },
+
+ /* G4 iBooks & 12" PowerBooks */
+
{ /* PowerBook6,1 */
.type = MACHINE_POWERBOOK_61,
.lcd_backlight_probe = nvidia_sysfs_backlight_probe,
@@ -131,6 +200,8 @@
.evdev_identify = evdev_is_adb,
},
+ /* Looks like PowerBook6,6 never made it to the market ? */
+
{ /* PowerBook6,7 */
.type = MACHINE_POWERBOOK_67,
.lcd_backlight_probe = r9x00_sysfs_backlight_probe,
@@ -333,7 +404,28 @@
/* PowerBook G4 Titanium 15" (December 2000) */
if (strncmp(buffer, "PowerBook3,2", 12) == 0)
ret = MACHINE_POWERBOOK_32;
+ /* PowerBook G4 Titanium 15" (October 2001) */
+ else if (strncmp(buffer, "PowerBook3,3", 12) == 0)
+ ret = MACHINE_POWERBOOK_33;
+ /* PowerBook G4 Titanium 15" (April 2002) */
+ else if (strncmp(buffer, "PowerBook3,4", 12) == 0)
+ ret = MACHINE_POWERBOOK_34;
+ /* PowerBook G4 Titanium 15" */
+ else if (strncmp(buffer, "PowerBook3,5", 12) == 0)
+ ret = MACHINE_POWERBOOK_35;
+ /* PowerBook G4 Aluminium 17" */
+ else if (strncmp(buffer, "PowerBook5,1", 12) == 0)
+ ret = MACHINE_POWERBOOK_51;
+ /* PowerBook G4 Aluminium 15" (September 2003) */
+ else if (strncmp(buffer, "PowerBook5,2", 12) == 0)
+ ret = MACHINE_POWERBOOK_52;
+ /* PowerBook G4 Aluminium 17" (September 2003) */
+ else if (strncmp(buffer, "PowerBook5,3", 12) == 0)
+ ret = MACHINE_POWERBOOK_53;
+ /* PowerBook G4 Aluminium 15" (April 2004) */
+ else if (strncmp(buffer, "PowerBook5,4", 12) == 0)
+ ret = MACHINE_POWERBOOK_54;
/* PowerBook G4 Aluminium 17" (April 2004) */
else if (strncmp(buffer, "PowerBook5,5", 12) == 0)
ret = MACHINE_POWERBOOK_55;
@@ -343,6 +435,12 @@
/* PowerBook G4 Aluminium 17" (February 2005) */
else if (strncmp(buffer, "PowerBook5,7", 12) == 0)
ret = MACHINE_POWERBOOK_57;
+ /* PowerBook G4 Aluminium 15" */
+ else if (strncmp(buffer, "PowerBook5,8", 12) == 0)
+ ret = MACHINE_POWERBOOK_58;
+ /* PowerBook G4 Aluminium 17" */
+ else if (strncmp(buffer, "PowerBook5,9", 12) == 0)
+ ret = MACHINE_POWERBOOK_59;
/* PowerBook G4 12" (January 2003) */
else if (strncmp(buffer, "PowerBook6,1", 12) == 0)
Modified: trunk/pommed/pommed.h
===================================================================
--- trunk/pommed/pommed.h 2007-02-22 22:58:13 UTC (rev 273)
+++ trunk/pommed/pommed.h 2007-02-23 11:54:43 UTC (rev 274)
@@ -36,9 +36,20 @@
MACHINE_MACBOOK_2,
#else
MACHINE_POWERBOOK_32,
+ MACHINE_POWERBOOK_33,
+ MACHINE_POWERBOOK_34,
+ MACHINE_POWERBOOK_35,
+
+ MACHINE_POWERBOOK_51,
+ MACHINE_POWERBOOK_52,
+ MACHINE_POWERBOOK_53,
+ MACHINE_POWERBOOK_54,
MACHINE_POWERBOOK_55,
MACHINE_POWERBOOK_56,
MACHINE_POWERBOOK_57,
+ MACHINE_POWERBOOK_58,
+ MACHINE_POWERBOOK_59,
+
MACHINE_POWERBOOK_61,
MACHINE_POWERBOOK_62,
MACHINE_POWERBOOK_63,
More information about the Pommed-commits
mailing list