svn commit: r342268 - stable/12/sys/dev/asmc

[David Bright]

Author: dab
Date: Thu Dec 20 00:57:23 2018
New Revision: 342268
URL: https://svnweb.freebsd.org/changeset/base/342268

Log:
  MFC r341988
  
  asmc: Add Support for Macbook Pro 8,1
  
  PR:		217505
  Submitted by:	John O. Brickley <obryan.brickley at gmail.com>, updated by Maciej Pasternacki <maciej at pasternacki.net>
  Reported by:	John O. Brickley <obryan.brickley at gmail.com>

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	Wed Dec 19 23:29:44 2018	(r342267)
+++ stable/12/sys/dev/asmc/asmc.c	Thu Dec 20 00:57:23 2018	(r342268)
@@ -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: stable/12/sys/dev/asmc/asmcvar.h
==============================================================================
--- stable/12/sys/dev/asmc/asmcvar.h	Wed Dec 19 23:29:44 2018	(r342267)
+++ stable/12/sys/dev/asmc/asmcvar.h	Thu Dec 20 00:57:23 2018	(r342268)
@@ -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", \