diff -r 77e062628ef5 -r 361e324a0ed4 Hardware/CPU/AMD10CPU.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Hardware/CPU/AMD10CPU.cs Tue Jan 26 22:37:48 2010 +0000 @@ -0,0 +1,113 @@ +/* + + Version: MPL 1.1/GPL 2.0/LGPL 2.1 + + The contents of this file are subject to the Mozilla Public License Version + 1.1 (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" basis, + WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + for the specific language governing rights and limitations under the License. + + The Original Code is the Open Hardware Monitor code. + + The Initial Developer of the Original Code is + Michael Möller . + Portions created by the Initial Developer are Copyright (C) 2009-2010 + the Initial Developer. All Rights Reserved. + + Contributor(s): + + Alternatively, the contents of this file may be used under the terms of + either the GNU General Public License Version 2 or later (the "GPL"), or + the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + in which case the provisions of the GPL or the LGPL are applicable instead + of those above. If you wish to allow use of your version of this file only + under the terms of either the GPL or the LGPL, and not to allow others to + use your version of this file under the terms of the MPL, indicate your + decision by deleting the provisions above and replace them with the notice + and other provisions required by the GPL or the LGPL. If you do not delete + the provisions above, a recipient may use your version of this file under + the terms of any one of the MPL, the GPL or the LGPL. + +*/ + +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Text; + +namespace OpenHardwareMonitor.Hardware.CPU { + + public class AMD10CPU : IHardware { + private string name; + private Image icon; + + private uint pciAddress; + + private Sensor coreTemperature; + + private const ushort PCI_AMD_VENDOR_ID = 0x1022; + private const ushort PCI_AMD_10H_MISCELLANEOUS_DEVICE_ID = 0x1203; + private const uint REPORTED_TEMPERATURE_CONTROL_REGISTER = 0xA4; + + public AMD10CPU(string name, uint family, uint model, uint stepping, + uint[,] cpuidData, uint[,] cpuidExtData) { + + this.name = name; + this.icon = Utilities.EmbeddedResources.GetImage("cpu.png"); + + uint coreCount = 1; + if (cpuidExtData.GetLength(0) > 8) + coreCount = (cpuidExtData[8, 2] & 0xFF) + 1; + + // AMD family 10h processors support only one temperature sensor + coreTemperature = new Sensor("Core", 0, SensorType.Temperature, this); + + pciAddress = WinRing0.FindPciDeviceById(PCI_AMD_VENDOR_ID, + PCI_AMD_10H_MISCELLANEOUS_DEVICE_ID, 0); + Update(); + } + + public string Name { + get { return name; } + } + + public string Identifier { + get { return "/amdcpu/0"; } + } + + public Image Icon { + get { return icon; } + } + + public ISensor[] Sensors { + get { + return new ISensor[] { coreTemperature }; + } + } + + public string GetReport() { + return null; + } + + 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; + } + + #pragma warning disable 67 + public event SensorEventHandler SensorAdded; + public event SensorEventHandler SensorRemoved; + #pragma warning restore 67 + + } +}