Author: markj
Date: Mon Aug 24 13:50:55 2020
New Revision: 364676
URL: https://svnweb.freebsd.org/changeset/base/364676

Log:
  MFC r364300:
  asmc(4): Add support for MacBook7,1.
  
  PR:   248693

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

Modified: stable/12/sys/dev/asmc/asmc.c
==============================================================================
--- stable/12/sys/dev/asmc/asmc.c       Mon Aug 24 13:40:35 2020        
(r364675)
+++ stable/12/sys/dev/asmc/asmc.c       Mon Aug 24 13:50:55 2020        
(r364676)
@@ -173,6 +173,12 @@ struct asmc_model asmc_models[] = {
        },
 
        {
+         "MacBook7,1", "Apple SMC MacBook Core 2 Duo (mid 2010)",
+         ASMC_SMS_FUNCS, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS_DISABLED,
+         ASMC_MB71_TEMPS, ASMC_MB71_TEMPNAMES, ASMC_MB71_TEMPDESCS
+       },
+
+       {
          "MacBookPro1,1", "Apple SMC MacBook Pro Core Duo (15-inch)",
          ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS,
          ASMC_MBP_TEMPS, ASMC_MBP_TEMPNAMES, ASMC_MBP_TEMPDESCS

Modified: stable/12/sys/dev/asmc/asmcvar.h
==============================================================================
--- stable/12/sys/dev/asmc/asmcvar.h    Mon Aug 24 13:40:35 2020        
(r364675)
+++ stable/12/sys/dev/asmc/asmcvar.h    Mon Aug 24 13:50:55 2020        
(r364676)
@@ -158,6 +158,21 @@ struct asmc_softc {
                                  "Heatsink 1","Heatsink 2" \
                                  "Memory Bank A", }
 
+#define ASMC_MB71_TEMPS                { "TB0T", "TB1T", "TB2T", "TC0D", 
"TC0P", \
+                                 "TH0P", "TN0D", "TN0P", "TN0S", "TN1D", \
+                                 "TN1E", "TN1F", "TN1G", "TN1S", "Th1H", \
+                                 "Ts0P", "Ts0S", NULL }
+
+#define ASMC_MB71_TEMPNAMES    { "enclosure_bottom0", "battery_1", 
"battery_2", "cpu_package", "cpu_proximity", \
+                                 "hdd_bay", "northbridge0_diode", 
"northbridge0_proximity", "TN0S", "mpc_die2", \
+                                 "TN1E", "TN1F", "TN1G", "TN1S", "heatsink1", \
+                                 "palm_rest", "memory_proximity", }
+
+#define ASMC_MB71_TEMPDESCS    { "Enclosure Bottom 0", "Battery 1", "Battery 
2", "CPU Package", "CPU Proximity", \
+                                 "HDD Bay", "Northbridge Diode", "Northbridge 
Proximity", "TN0S", "MPC Die 2", \
+                                 "TN1E", "TN1F", "TN1G", "TN1S", "Heatsink 1", 
\
+                                 "Palm Rest", "Memory Proximity", }
+
 #define ASMC_MBP_TEMPS         { "TB0T", "Th0H", "Th1H", "Tm0P",       \
                                  "TG0H", "TG0P", "TG0T", NULL }
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to