svn commit: r271069 - stable/10/sys/dev/asmc

[Gavin Atkinson]

Author: gavin
Date: Wed Sep  3 23:29:06 2014
New Revision: 271069
URL: http://svnweb.freebsd.org/changeset/base/271069

Log:
  Merge r268303 from head:
  
    Add support to asmc(4) for Macmini 3,1.
  
  PR:		190195
  Submitted by:	fbsdbugs2 sentry.org
  Relnotes:	yes

Modified:
  stable/10/sys/dev/asmc/asmc.c
  stable/10/sys/dev/asmc/asmcvar.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/asmc/asmc.c
==============================================================================
--- stable/10/sys/dev/asmc/asmc.c	Wed Sep  3 23:29:01 2014	(r271068)
+++ stable/10/sys/dev/asmc/asmc.c	Wed Sep  3 23:29:06 2014	(r271069)
@@ -206,6 +206,15 @@ struct asmc_model asmc_models[] = {
 	  ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS
 	},
 
+	/* The Mac Mini 3,1 has no SMS */
+	{ 
+	  "Macmini3,1", "Apple SMC Mac Mini 3,1",
+	  NULL, NULL, NULL,
+	  ASMC_FAN_FUNCS,
+	  NULL, NULL, NULL,
+	  ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS
+	},
+
 	/* Idem for the MacPro */
 	{
 	  "MacPro2", "Apple SMC Mac Pro (8-core)",

Modified: stable/10/sys/dev/asmc/asmcvar.h
==============================================================================
--- stable/10/sys/dev/asmc/asmcvar.h	Wed Sep  3 23:29:01 2014	(r271068)
+++ stable/10/sys/dev/asmc/asmcvar.h	Wed Sep  3 23:29:06 2014	(r271069)
@@ -180,6 +180,25 @@ struct asmc_softc {
 #define ASMC_MM_TEMPDESCS	{ "Northbridge Point 1", \
 				  "Northbridge Point 2" }
 
+#define ASMC_MM31_TEMPS		{ "TC0D", "TC0H", \
+				  "TC0P", "TH0P", \
+				  "TN0D", "TN0P", \
+				  "TW0P", NULL }
+
+#define ASMC_MM31_TEMPNAMES	{ "cpu0_die", "cpu0_heatsink", \
+				  "cpu0_proximity", "hdd_bay", \
+				  "northbridge_die", \
+				  "northbridge_proximity", \
+				  "wireless_module", }
+
+#define ASMC_MM31_TEMPDESCS	{ "CPU0 Die Core Temperature", \
+				  "CPU0 Heatsink Temperature", \
+				  "CPU0 Proximity Temperature", \
+				  "HDD Bay Temperature", \
+				  "Northbridge Die Core Temperature", \
+				  "Northbridge Proximity Temperature", \
+				  "Wireless Module Temperature", }
+
 #define ASMC_MP_TEMPS		{ "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \
 				  "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \
 				  "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \