Author: dab
Date: Wed Dec 12 13:43:55 2018
New Revision: 341988
URL: https://svnweb.freebsd.org/changeset/base/341988

Log:
  asmc: Add Support for Macbook Pro 8,1
  
  PR:           217505
  Submitted by: John O. Brickley <obryan.brick...@gmail.com>, updated by Maciej 
Pasternacki <mac...@pasternacki.net>
  Reported by:  John O. Brickley <obryan.brick...@gmail.com>
  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    Wed Dec 12 13:17:51 2018        (r341987)
+++ head/sys/dev/asmc/asmc.c    Wed Dec 12 13:43:55 2018        (r341988)
@@ -219,9 +219,15 @@ struct asmc_model asmc_models[] = {
        },
 
        {
+         "MacBookPro8,1", "Apple SMC MacBook Pro (early 2011, 13-inch)",
+         ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS,
+         ASMC_MBP81_TEMPS, ASMC_MBP81_TEMPNAMES, ASMC_MBP81_TEMPDESCS
+       },
+
+       {
          "MacBookPro8,2", "Apple SMC MacBook Pro (early 2011)",
          ASMC_SMS_FUNCS, ASMC_FAN_FUNCS, ASMC_LIGHT_FUNCS,
-         ASMC_MBP8_TEMPS, ASMC_MBP8_TEMPNAMES, ASMC_MBP8_TEMPDESCS
+         ASMC_MBP82_TEMPS, ASMC_MBP82_TEMPNAMES, ASMC_MBP82_TEMPDESCS
        },
 
        {

Modified: head/sys/dev/asmc/asmcvar.h
==============================================================================
--- head/sys/dev/asmc/asmcvar.h Wed Dec 12 13:17:51 2018        (r341987)
+++ head/sys/dev/asmc/asmcvar.h Wed Dec 12 13:43:55 2018        (r341988)
@@ -218,21 +218,39 @@ struct asmc_softc {
                                  "Heatsink 2", "Memory Controller", \
                                  "PCI Express Slot Pin", "PCI Express Slot 
(unk)" }
 
-#define ASMC_MBP8_TEMPS                { "TB0T", "TB1T", "TB2T", "TC0C", 
"TC0D", \
+#define ASMC_MBP81_TEMPS       { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", \
                                  "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
+                                 "TCFC", "TCGC", "TCSA", "TM0S", "TMBS", \
+                                 "TP0P", "TPCD", "TW0P", "Th1H", "Ts0P", \
+                                 "Ts0S", NULL }
+
+#define ASMC_MBP81_TEMPNAMES   { "enclosure", "TB1T", "TB2T", "TC0C", "TC0D", \
+                                 "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
+                                 "TCFC", "TCGC", "TCSA", "TM0S", "TMBS", \
+                                 "TP0P", "TPCD", "wireless", "Th1H", "Ts0P", \
+                                 "Ts0S" }
+
+#define ASMC_MBP81_TEMPDESCS   { "Enclosure Bottomside", "TB1T", "TB2T", 
"TC0C", "TC0D", \
+                                 "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
+                                 "TCFC", "TCGC", "TCSA", "TM0S", "TMBS", \
+                                 "TP0P", "TPCD", "TW0P", "Th1H", "Ts0P", \
+                                 "Ts0S" }
+
+#define ASMC_MBP82_TEMPS       { "TB0T", "TB1T", "TB2T", "TC0C", "TC0D", \
+                                 "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
                                  "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \
                                  "TCTD", "TG0D", "TG0P", "THSP", "TM0S", \
                                  "TMBS", "TP0P", "TPCD", "TW0P", "Th1H", \
                                  "Th2H", "Tm0P", "Ts0P", "Ts0S", NULL }
 
-#define ASMC_MBP8_TEMPNAMES    { "enclosure", "TB1T", "TB2T", "TC0C", "TC0D", \
+#define ASMC_MBP82_TEMPNAMES   { "enclosure", "TB1T", "TB2T", "TC0C", "TC0D", \
                                  "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
                                  "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \
                                  "TCTD", "graphics", "TG0P", "THSP", "TM0S", \
                                  "TMBS", "TP0P", "TPCD", "wireless", "Th1H", \
                                  "Th2H", "memory", "Ts0P", "Ts0S" }
 
-#define ASMC_MBP8_TEMPDESCS    { "Enclosure Bottomside", "TB1T", "TB2T", 
"TC0C", "TC0D", \
+#define ASMC_MBP82_TEMPDESCS   { "Enclosure Bottomside", "TB1T", "TB2T", 
"TC0C", "TC0D", \
                                  "TC0E", "TC0F", "TC0P", "TC1C", "TC2C", \
                                  "TC3C", "TC4C", "TCFC", "TCGC", "TCSA", \
                                  "TCTD", "TG0D", "TG0P", "THSP", "TM0S", \
_______________________________________________
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