diff options
| author | gavin <gavin@FreeBSD.org> | 2014-09-03 23:29:06 +0000 |
|---|---|---|
| committer | gavin <gavin@FreeBSD.org> | 2014-09-03 23:29:06 +0000 |
| commit | 27085e5c8f1ea9951759f78809c9e1cd402db2b2 (patch) | |
| tree | 510e6ebc21a087e794103d5efc0ca9dd25a780d6 | |
| parent | 5f36460b017024c0d87c6caef19acf0a5ede45a6 (diff) | |
| download | FreeBSD-src-27085e5c8f1ea9951759f78809c9e1cd402db2b2.zip FreeBSD-src-27085e5c8f1ea9951759f78809c9e1cd402db2b2.tar.gz | |
Merge r268303 from head:
Add support to asmc(4) for Macmini 3,1.
PR: 190195
Submitted by: fbsdbugs2 sentry.org
Relnotes: yes
| -rw-r--r-- | sys/dev/asmc/asmc.c | 9 | ||||
| -rw-r--r-- | sys/dev/asmc/asmcvar.h | 19 |
2 files changed, 28 insertions, 0 deletions
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index bc4c4e9..099e7f1 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -206,6 +206,15 @@ struct asmc_model asmc_models[] = { ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS }, + /* The Mac Mini 3,1 has no SMS */ + { + "Macmini3,1", "Apple SMC Mac Mini 3,1", + NULL, NULL, NULL, + ASMC_FAN_FUNCS, + NULL, NULL, NULL, + ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS + }, + /* Idem for the MacPro */ { "MacPro2", "Apple SMC Mac Pro (8-core)", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 11156d7..67e7f3b 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -180,6 +180,25 @@ struct asmc_softc { #define ASMC_MM_TEMPDESCS { "Northbridge Point 1", \ "Northbridge Point 2" } +#define ASMC_MM31_TEMPS { "TC0D", "TC0H", \ + "TC0P", "TH0P", \ + "TN0D", "TN0P", \ + "TW0P", NULL } + +#define ASMC_MM31_TEMPNAMES { "cpu0_die", "cpu0_heatsink", \ + "cpu0_proximity", "hdd_bay", \ + "northbridge_die", \ + "northbridge_proximity", \ + "wireless_module", } + +#define ASMC_MM31_TEMPDESCS { "CPU0 Die Core Temperature", \ + "CPU0 Heatsink Temperature", \ + "CPU0 Proximity Temperature", \ + "HDD Bay Temperature", \ + "Northbridge Die Core Temperature", \ + "Northbridge Proximity Temperature", \ + "Wireless Module Temperature", } + #define ASMC_MP_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ |
