Author: dab
Date: Sun Jan  6 23:43:12 2019
New Revision: 342822
URL: https://svnweb.freebsd.org/changeset/base/342822

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

Modified:
  head/sys/dev/asmc/asmc.c
  head/sys/dev/asmc/asmcvar.h

Modified: head/sys/dev/asmc/asmc.c
==============================================================================
--- head/sys/dev/asmc/asmc.c    Sun Jan  6 22:50:16 2019        (r342821)
+++ head/sys/dev/asmc/asmc.c    Sun Jan  6 23:43:12 2019        (r342822)
@@ -151,6 +151,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",
@@ -264,6 +266,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: head/sys/dev/asmc/asmcvar.h
==============================================================================
--- head/sys/dev/asmc/asmcvar.h Sun Jan  6 22:50:16 2019        (r342821)
+++ head/sys/dev/asmc/asmcvar.h Sun Jan  6 23:43:12 2019        (r342822)
@@ -360,6 +360,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", \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to