svn commit: r343151 - stable/11/sys/dev/asmc

[David Bright]

Author: dab
Date: Fri Jan 18 16:04:36 2019
New Revision: 343151
URL: https://svnweb.freebsd.org/changeset/base/343151

Log:
  MFC r342822:
  
  asmc: Add support for Mac mini 4,1 (Mid-2010)

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

Modified: stable/11/sys/dev/asmc/asmc.c
==============================================================================
--- stable/11/sys/dev/asmc/asmc.c	Fri Jan 18 16:03:59 2019	(r343150)
+++ stable/11/sys/dev/asmc/asmc.c	Fri Jan 18 16:04:36 2019	(r343151)
@@ -154,6 +154,8 @@ static struct asmc_model *asmc_match(device_t dev);
 			 asmc_mbp_sysctl_light_right, \
 			 asmc_mbp_sysctl_light_control
 
+#define ASMC_LIGHT_FUNCS_DISABLED NULL, NULL, NULL
+
 struct asmc_model asmc_models[] = {
 	{
 	  "MacBook1,1", "Apple SMC MacBook Core Duo",
@@ -267,6 +269,15 @@ struct asmc_model asmc_models[] = {
 	  ASMC_FAN_FUNCS,
 	  NULL, NULL, NULL,
 	  ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS
+	},
+
+	/* The Mac Mini 4,1 (Mid-2010) has no SMS */
+	{ 
+	  "Macmini4,1", "Apple SMC Mac mini 4,1 (Mid-2010)",
+	  ASMC_SMS_FUNCS_DISABLED,
+	  ASMC_FAN_FUNCS,
+	  ASMC_LIGHT_FUNCS_DISABLED,
+	  ASMC_MM41_TEMPS, ASMC_MM41_TEMPNAMES, ASMC_MM41_TEMPDESCS
 	},
 
 	/* The Mac Mini 5,2 has no SMS */

Modified: stable/11/sys/dev/asmc/asmcvar.h
==============================================================================
--- stable/11/sys/dev/asmc/asmcvar.h	Fri Jan 18 16:03:59 2019	(r343150)
+++ stable/11/sys/dev/asmc/asmcvar.h	Fri Jan 18 16:04:36 2019	(r343151)
@@ -358,6 +358,27 @@ struct asmc_softc {
 				  "Northbridge Proximity Temperature", \
 				  "Wireless Module Proximity Temperature", }
 
+#define ASMC_MM41_TEMPS		{ "TA0P", "TC0D", "TC0G", "TC0H", "TC0P", \
+				  "TC0p", "TCPG", "TH0G", "TH0P", "TH0p", \
+				  "TM0G", "TM0P", "TM0p", "TN0D", "TN0G", \
+				  "TN0P", "TN0p", "TN1D", "TN1E", "TN1F", \
+				  "TN1G", "TN1S", "TNPG", "TO0P", "TO0p", \
+				  "TW0P", "Tm0P", "Tp0C", NULL }
+
+#define ASMC_MM41_TEMPNAMES	{ "TA0P", "TC0D", "TC0G", "TC0H", "TC0P", \
+				  "TC0p", "TCPG", "TH0G", "TH0P", "TH0p", \
+				  "TM0G", "TM0P", "TM0p", "TN0D", "TN0G", \
+				  "TN0P", "TN0p", "TN1D", "TN1E", "TN1F", \
+				  "TN1G", "TN1S", "TNPG", "TO0P", "TO0p", \
+				  "TW0P", "Tm0P", "Tp0C", NULL }
+
+#define ASMC_MM41_TEMPDESCS	{ "TA0P", "TC0D", "TC0G", "TC0H", "TC0P", \
+				  "TC0p", "TCPG", "TH0G", "TH0P", "TH0p", \
+				  "TM0G", "TM0P", "TM0p", "TN0D", "TN0G", \
+				  "TN0P", "TN0p", "TN1D", "TN1E", "TN1F", \
+				  "TN1G", "TN1S", "TNPG", "TO0P", "TO0p", \
+				  "TW0P", "Tm0P", "Tp0C", NULL }
+
 #define ASMC_MM52_TEMPS		{ "TA0P", "TA1P", \
 				  "TC0D", "TC0P", \
 				  "TG0D", "TG1D", \