Date: Thu, 7 Mar 2019 15:30:49 +0000 (UTC) From: David Bright <dab@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r344888 - stable/12/sys/dev/asmc Message-ID: <201903071530.x27FUnVt084988@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dab Date: Thu Mar 7 15:30:48 2019 New Revision: 344888 URL: https://svnweb.freebsd.org/changeset/base/344888 Log: MFC r344553: asmc: Add support for Mac mini 2,1 PR: 235798 Submitted by: Trev <fbsdbugs4@sentry.org> Reported by: Trev <fbsdbugs4@sentry.org> 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 Thu Mar 7 13:53:59 2019 (r344887) +++ stable/12/sys/dev/asmc/asmc.c Thu Mar 7 15:30:48 2019 (r344888) @@ -259,6 +259,15 @@ struct asmc_model asmc_models[] = { ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, + /* The Mac Mini 2,1 has no SMS */ + { + "Macmini2,1", "Apple SMC Mac Mini 2,1", + ASMC_SMS_FUNCS_DISABLED, + ASMC_FAN_FUNCS, + ASMC_LIGHT_FUNCS_DISABLED, + ASMC_MM21_TEMPS, ASMC_MM21_TEMPNAMES, ASMC_MM21_TEMPDESCS + }, + /* The Mac Mini 3,1 has no SMS */ { "Macmini3,1", "Apple SMC Mac Mini 3,1", Modified: stable/12/sys/dev/asmc/asmcvar.h ============================================================================== --- stable/12/sys/dev/asmc/asmcvar.h Thu Mar 7 13:53:59 2019 (r344887) +++ stable/12/sys/dev/asmc/asmcvar.h Thu Mar 7 15:30:48 2019 (r344888) @@ -341,6 +341,24 @@ struct asmc_softc { #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ "Northbridge Point 2" } +#define ASMC_MM21_TEMPS { "TA0P", "TC0D", \ + "TC0H", "TC0P", \ + "TC1P", "TN0P", \ + "TN1P", NULL } + +#define ASMC_MM21_TEMPNAMES { "ambient_air", "cpu_die", \ + "cpu_heatsink", "cpu_proximity1", \ + "cpu_proximity2", "northbridge_proximity1", \ + "northbridge_proximity2", } + +#define ASMC_MM21_TEMPDESCS { "Ambient Air Temperature" \ + "CPU Die Core Temperature", \ + "CPU Heatsink Temperature", \ + "CPU Proximity 1 Temperature", \ + "CPU Proximity 2 Temperature", \ + "Northbridge Proximity 1 Temperature", \ + "Northbridge Proximity 2 Temperature", } + #define ASMC_MM31_TEMPS { "TC0D", "TC0H", \ "TC0P", "TH0P", \ "TN0D", "TN0P", \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903071530.x27FUnVt084988>