mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-08-31 14:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tray sensor display default color is black and color can be changed now. Fixed CPU load reading for AMD CPUs and added additional misc device for AMD core temperature reading.

Browse Source
This commit is contained in:
Michael Möller
2010-02-12 22:46:31 +00:00
parent 1b965a3ab3
commit ac6d7f818a
8 changed files with 110 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Hardware/CPU/AMD10CPU.cs
View File

@@ -57,6 +57,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
private const ushort PCI_AMD_VENDOR_ID = 0x1022;
private const ushort PCI_AMD_10H_MISCELLANEOUS_DEVICE_ID = 0x1203;
private const ushort PCI_AMD_11H_MISCELLANEOUS_DEVICE_ID = 0x1303;
private const uint REPORTED_TEMPERATURE_CONTROL_REGISTER = 0xA4;
public AMD10CPU(string name, uint family, uint model, uint stepping,
@@ -90,6 +91,10 @@ namespace OpenHardwareMonitor.Hardware.CPU {
pciAddress = WinRing0.FindPciDeviceById(PCI_AMD_VENDOR_ID,
PCI_AMD_10H_MISCELLANEOUS_DEVICE_ID, 0);
if (pciAddress == 0xFFFFFFFF)
pciAddress = WinRing0.FindPciDeviceById(PCI_AMD_VENDOR_ID,
PCI_AMD_11H_MISCELLANEOUS_DEVICE_ID, 0);
Update();
}
@@ -110,16 +115,15 @@ namespace OpenHardwareMonitor.Hardware.CPU {
}
public void Update() {
if (pciAddress == 0xFFFFFFFF)
return;
uint value;
if (WinRing0.ReadPciConfigDwordEx(pciAddress,
REPORTED_TEMPERATURE_CONTROL_REGISTER, out value)) {
coreTemperature.Value = ((value >> 21) & 0x7FF) / 8.0f;
ActivateSensor(coreTemperature);
} else {
DeactivateSensor(coreTemperature);
if (pciAddress != 0xFFFFFFFF) {
uint value;
if (WinRing0.ReadPciConfigDwordEx(pciAddress,
REPORTED_TEMPERATURE_CONTROL_REGISTER, out value)) {
coreTemperature.Value = ((value >> 21) & 0x7FF) / 8.0f;
ActivateSensor(coreTemperature);
} else {
DeactivateSensor(coreTemperature);
}
}
if (cpuLoad.IsAvailable) {