diff options
| author | Adam S <adam@anschwa.com> | 2022-05-09 12:44:09 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2022-05-18 21:16:01 +0000 |
| commit | d7417aa55e73a4c3019901095371e34cc00b99f7 (patch) | |
| tree | 036cbd00b609c33b03f08f0fd691431f1798cbf3 | |
| parent | d6fe8a8eab1891a098a03ea92621c71485f2c2a9 (diff) | |
asmc: Update Mac Pro 6 sensor definitions
- Make descriptions a bit more human-friendly.
- Don't attempt to probe fan safe speeds, this model does not provide
one.
PR: 260781
(cherry picked from commit dc484aed0a014de0fdf33d972c36413da6903a2e)
| -rw-r--r-- | sys/dev/asmc/asmc.c | 6 | ||||
| -rw-r--r-- | sys/dev/asmc/asmcvar.h | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index ee6c4b01a141..2e824602b98c 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -363,11 +363,11 @@ static const struct asmc_model asmc_models[] = { ASMC_MP5_TEMPS, ASMC_MP5_TEMPNAMES, ASMC_MP5_TEMPDESCS }, - /* Idem for the MacPro 2013 (cylinder) */ + /* Idem for the Mac Pro 2013 (cylinder) */ { - "MacPro6,1", "Apple SMC MacPro (2013)", + "MacPro6,1", "Apple SMC Mac Pro (2013)", ASMC_SMS_FUNCS_DISABLED, - ASMC_FAN_FUNCS, + ASMC_FAN_FUNCS2, ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP6_TEMPS, ASMC_MP6_TEMPNAMES, ASMC_MP6_TEMPDESCS }, diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 2b981f1bd6c6..533686d0c56b 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -646,17 +646,17 @@ struct asmc_softc { #define ASMC_MP6_TEMPS { "TA0P", "TA1P", "TC0P", "TG0D", "TG0P", \ "TG1D", "TG1P", "TM0P", "TM1P", NULL } -#define ASMC_MP6_TEMPNAMES { "AMBIENT_AIR_0", "AMBIENT_AIR_1", \ - "CPU_0_PROXIMITY", "GPU_0_DIODE", \ - "GPU_0_PROXIMITY", "GPU_1_DIODE", \ - "GPU_1_PROXIMITY", "MEM_SLOTS_0_PROXIMITY", \ - "MEM_SLOTS_1_PROXIMITY" } - -#define ASMC_MP6_TEMPDESCS { "Ambient Air 0", "Ambient Air 1", \ - "CPU Proximity 0", "GPU Diode 0", \ - "GPU Proximity 0", "GPU Diode 1", \ - "GPU Proximity 1", "Memory Proximity 0", \ - "Memory Proximity 1" } +#define ASMC_MP6_TEMPNAMES { "ambient_air_1", "ambient_air_2", \ + "cpu_proximity", "gpu_diode_1", \ + "gpu_proximity_1", "gpu_diode_2", \ + "gpu_proximity_2", "mem_proximity_1", \ + "mem_proximity_2" } + +#define ASMC_MP6_TEMPDESCS { "Ambient Air 1", "Ambient Air 2", \ + "CPU Proximity", "GPU Diode 1", \ + "GPU Proximity 1", "GPU Diode 2", \ + "GPU Proximity 2", "Memory Bank A", \ + "Memory Bank B" } #define ASMC_MBA_TEMPS { "TB0T", NULL } #define ASMC_MBA_TEMPNAMES { "enclosure" } |