PERFORCE change 123042 for review

[Rui Paulo]

http://perforce.freebsd.org/chv.cgi?CH=123042

Change 123042 by rpaulo at rpaulo_epsilon on 2007/07/07 02:23:33

	Add correct MacBook Pro temperature keys.
	
	Obtained from:	Latest applesmc patch.

Affected files ...

.. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#21 edit
.. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#10 edit

Differences ...

==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#21 (text+ko) ====

@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#20 $
+ * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#21 $
  *
  */
 
@@ -127,25 +127,25 @@
 	{ 
 	  "MacBookPro1,1", "Apple SMC MacBook Pro Core Duo (15-inch)",
 	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS,
-	  ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS
+	  ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS
 	},
 
 	{ 
 	  "MacBookPro1,2", "Apple SMC MacBook Pro Core Duo (17-inch)",
 	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS,
-	  ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS
+	  ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS
 	},
 
 	{ 
 	  "MacBookPro2,1", "Apple SMC MacBook Pro Core 2 Duo (17-inch)",
 	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS,
-	  ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS
+	  ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS
 	},
 
 	{ 
 	  "MacBookPro2,2", "Apple SMC MacBook Pro Core 2 Duo (15-inch)",
 	  ASMC_SMS_FUNCS, ASMC_FAN_FUNCS,
-	  ASMC_MB_TEMPS, ASMC_MB_TEMPNAMES, ASMC_MB_TEMPDESCS
+	  ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS
 	},
 
 	/* The Mac Mini has no SMS */

==== //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#10 (text+ko) ====

@@ -23,7 +23,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#9 $
+ * $P4: //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#10 $
  *
  */
 
@@ -147,7 +147,7 @@
 /*
  * Temperatures.
  *
- * First for MacBook/MacBook Pro, then for Intel Mac Mini.
+ * First for MacBook, second for MacBook Pro, then for Intel Mac Mini.
  * 
  */
 
@@ -161,6 +161,19 @@
 				  "Northbridge Point 2", "Heatsink 1", \
 				  "Heatsink 2", "Memory Bank A", }
 
+#define ASMC_MBP_TEMPS		{ "TB0T", "Th0H", "Th1H", "Tm0P", \
+				  "TG0H", "TG0P", "TG0T", NULL }
+
+#define ASMC_MBP_TEMPNAMES	{ "enclosure", "heatsink1", \
+				  "heatsink2", "memory", "graphics", \
+				  "graphicssink", "unknown", }
+
+#define ASMC_MBP_TEMPDESCS	{ "Enclosure Bottomside", \
+				  "Heatsink 1", "Heatsink 2", \
+				  "Memory Controller", \
+				  "Graphics Chip", "Graphics Heatsink", \
+				  "Unknown", } 
+
 #define ASMC_MM_TEMPS		{ "TN0P", "TN1P", NULL }
 #define ASMC_MM_TEMPNAMES	{ "northbridge1", "northbridge2" }
 #define ASMC_MM_TEMPDESCS	{ "Northbridge Point 1", \