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

[jblache at alioth.debian.org]

Author: jblache
Date: 2008-01-23 13:33:31 +0000 (Wed, 23 Jan 2008)
New Revision: 432

Modified:
   trunk/ChangeLog
   trunk/README
   trunk/pommed/kbd_backlight.h
   trunk/pommed/pommed.c
   trunk/pommed/pommed.h
Log:
Support for the MacBook Air1,1. Keyboard USB IDs still TBD.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-19 21:35:58 UTC (rev 431)
+++ trunk/ChangeLog	2008-01-23 13:33:31 UTC (rev 432)
@@ -2,6 +2,7 @@
 --------------------
 
 version 1.15:
+	- pommed: add support for the MacBook Air1,1.
 
 version 1.14:
 	- pommed: fix error handling in the audio sample loading code to

Modified: trunk/README
===================================================================
--- trunk/README	2007-12-19 21:35:58 UTC (rev 431)
+++ trunk/README	2008-01-23 13:33:31 UTC (rev 432)
@@ -10,7 +10,7 @@
 Kernel version requirements:
 ----------------------------
 
- - on the MacBook and MacBook Pro
+ - on the MacBook, MacBook Pro and MacBook Air
     + kernel >= 2.6.19 at least
     + kernel >= 2.6.20 recommended
    Newer machines may require a newer kernel and/or patches.
@@ -32,6 +32,7 @@
    * MacBook Core Duo (May 2006)
    * MacBook Core2 Duo (November 2006 & May 2007)
    * MacBook Core2 Duo Santa Rosa (November 2007)
+   * MacBook Air Core2 Duo (January 2008)
 
 
  - PowerMac machines

Modified: trunk/pommed/kbd_backlight.h
===================================================================
--- trunk/pommed/kbd_backlight.h	2007-12-19 21:35:58 UTC (rev 431)
+++ trunk/pommed/kbd_backlight.h	2008-01-23 13:33:31 UTC (rev 432)
@@ -69,7 +69,8 @@
 {
   return ((mops->type == MACHINE_MACBOOKPRO_1)
 	  || (mops->type == MACHINE_MACBOOKPRO_2)
-	  || (mops->type == MACHINE_MACBOOKPRO_3));
+	  || (mops->type == MACHINE_MACBOOKPRO_3)
+	  || (mops->type == MACHINE_MACBOOKAIR_1));
 }
 #endif /* __powerpc__ */
 

Modified: trunk/pommed/pommed.c
===================================================================
--- trunk/pommed/pommed.c	2007-12-19 21:35:58 UTC (rev 431)
+++ trunk/pommed/pommed.c	2008-01-23 13:33:31 UTC (rev 432)
@@ -291,6 +291,15 @@
     .lcd_backlight_step = gma950_backlight_step,
     .lcd_backlight_toggle = gma950_backlight_toggle,
     .evdev_identify = evdev_is_geyser4hf,
+  },
+
+  /* MacBook Air machines */
+  {  /* MacBook Air1,1 (January 2008) */
+    .type = MACHINE_MACBOOKAIR_1,
+    .lcd_backlight_probe = gma950_backlight_probe, /* gma950 supports the gma965 */
+    .lcd_backlight_step = gma950_backlight_step,
+    .lcd_backlight_toggle = gma950_backlight_toggle,
+    .evdev_identify = evdev_is_geyser4hf,
   }
 };
 #endif /* __powerpc__ */
@@ -578,6 +587,9 @@
   /* Core2 Duo Santa Rosa MacBook (November 2007) */
   else if (strcmp(prop, "MacBook3,1") == 0)
     ret = MACHINE_MACBOOK_3;
+  /* MacBook Air (January 2008) */
+  else if (strcmp(prop, "MacBook Air1,1") == 0)
+    ret = MACHINE_MACBOOKAIR_1;
   else
     logmsg(LOG_ERR, "Unknown Apple machine: %s", prop);
 

Modified: trunk/pommed/pommed.h
===================================================================
--- trunk/pommed/pommed.h	2007-12-19 21:35:58 UTC (rev 431)
+++ trunk/pommed/pommed.h	2008-01-23 13:33:31 UTC (rev 432)
@@ -33,9 +33,12 @@
     MACHINE_MACBOOKPRO_1,
     MACHINE_MACBOOKPRO_2,
     MACHINE_MACBOOKPRO_3,
+
     MACHINE_MACBOOK_1,
     MACHINE_MACBOOK_2,
     MACHINE_MACBOOK_3,
+
+    MACHINE_MACBOOKAIR_1,
 #else
     MACHINE_POWERBOOK_32,
     MACHINE_POWERBOOK_33,