[Pommed-commits] r336 - in trunk: . pommed pommed/mactel

[jblache at alioth.debian.org]

Author: jblache
Date: 2007-06-17 08:44:45 +0000 (Sun, 17 Jun 2007)
New Revision: 336

Modified:
   trunk/ChangeLog
   trunk/pommed/evdev.c
   trunk/pommed/evdev.h
   trunk/pommed/mactel/kbd_backlight.c
   trunk/pommed/pommed.c
   trunk/pommed/pommed.h
Log:
Add partial support for the MacBookPro3,1 (Core2 Duo, 15" & 17", June 2007). New Apple IR receiver. Missing nVidia backlight support.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-27 14:11:48 UTC (rev 335)
+++ trunk/ChangeLog	2007-06-17 08:44:45 UTC (rev 336)
@@ -1,6 +1,11 @@
 ChangeLog for pommed
 --------------------
 
+version 1.7:
+	- pommed: add partial support for the MacBookPro3,1 (Core2 Duo,
+	15" & 17", June 2007). New Apple IR receiver too. Missing nVidia
+	backlight control.
+
 version 1.6:
 	- pommed: add new "Apple Inc." vendor ID in SMBIOS routine.
 

Modified: trunk/pommed/evdev.c
===================================================================
--- trunk/pommed/evdev.c	2007-05-27 14:11:48 UTC (rev 335)
+++ trunk/pommed/evdev.c	2007-06-17 08:44:45 UTC (rev 336)
@@ -390,7 +390,8 @@
   if (id[ID_VENDOR] != USB_VENDOR_ID_APPLE)
     return 0;
 
-  if (product == USB_PRODUCT_ID_APPLEIR)
+  if ((product == USB_PRODUCT_ID_APPLEIR)
+      || (product == USB_PRODUCT_ID_APPLEIR_2))
     {
       logdebug(" -> Apple IR receiver\n");
 

Modified: trunk/pommed/evdev.h
===================================================================
--- trunk/pommed/evdev.h	2007-05-27 14:11:48 UTC (rev 335)
+++ trunk/pommed/evdev.h	2007-06-17 08:44:45 UTC (rev 336)
@@ -40,6 +40,7 @@
 
 /* Apple Remote IR Receiver */
 #define USB_PRODUCT_ID_APPLEIR        0x8240
+#define USB_PRODUCT_ID_APPLEIR_2      0x8242
 
 
 /* Keyboard hotkeys */

Modified: trunk/pommed/mactel/kbd_backlight.c
===================================================================
--- trunk/pommed/mactel/kbd_backlight.c	2007-05-27 14:11:48 UTC (rev 335)
+++ trunk/pommed/mactel/kbd_backlight.c	2007-06-17 08:44:45 UTC (rev 336)
@@ -46,7 +46,8 @@
 has_kbd_backlight(void)
 {
   return ((mops->type == MACHINE_MACBOOKPRO_1)
-	  || (mops->type == MACHINE_MACBOOKPRO_2));
+	  || (mops->type == MACHINE_MACBOOKPRO_2)
+	  || (mops->type == MACHINE_MACBOOKPRO_3));
 }
 
 

Modified: trunk/pommed/pommed.c
===================================================================
--- trunk/pommed/pommed.c	2007-05-27 14:11:48 UTC (rev 335)
+++ trunk/pommed/pommed.c	2007-06-17 08:44:45 UTC (rev 336)
@@ -219,6 +219,16 @@
 
 #else
 
+int dummy_backlight_probe(void)
+{
+  return 0;
+}
+
+void dummy_backlight_step(int dir)
+{
+  return;
+}
+
 struct machine_ops mb_mops[] = {
   /* MacBook Pro machines */
 
@@ -236,6 +246,13 @@
     .evdev_identify = evdev_is_geyser4,
   },
 
+  {  /* MacBookPro3,1 (15" & 17", Core2 Duo, June 2007) */
+    .type = MACHINE_MACBOOKPRO_3,
+    /* dummy backlight operations for now - nVidia support needed */
+    .lcd_backlight_probe = dummy_backlight_probe,
+    .lcd_backlight_step = dummy_backlight_step,
+    .evdev_identify = evdev_is_geyser4,
+  },
 
   /* MacBook machines */
 
@@ -526,6 +543,9 @@
   /* Core2 Duo MacBook Pro 17" & 15" (October 2006) */
   else if ((strcmp(prop, "MacBookPro2,1") == 0) || (strcmp(prop, "MacBookPro2,2") == 0))
     ret = MACHINE_MACBOOKPRO_2;
+  /* Core2 Duo MacBook Pro 15" & 17" (June 2007) */
+  else if (strcmp(prop, "MacBookPro3,1") == 0)
+    ret = MACHINE_MACBOOKPRO_3;
   /* Core Duo MacBook (May 2006) */
   else if (strcmp(prop, "MacBook1,1") == 0)
     ret = MACHINE_MACBOOK_1;

Modified: trunk/pommed/pommed.h
===================================================================
--- trunk/pommed/pommed.h	2007-05-27 14:11:48 UTC (rev 335)
+++ trunk/pommed/pommed.h	2007-06-17 08:44:45 UTC (rev 336)
@@ -6,7 +6,7 @@
 #define __POMMED_H__
 
 
-#define M_VERSION "1.6"
+#define M_VERSION "1.7"
 
 
 extern int debug;
@@ -32,6 +32,7 @@
 #ifndef __powerpc__
     MACHINE_MACBOOKPRO_1,
     MACHINE_MACBOOKPRO_2,
+    MACHINE_MACBOOKPRO_3,
     MACHINE_MACBOOK_1,
     MACHINE_MACBOOK_2,
 #else