Release version 0.1.5. Added support for AMD family 0Fh CPUs. Fixed saving of wrong window size values for minimized forms (by not saving them).

GUI/MainForm.cs

@@ -238,10 +238,12 @@ namespace OpenHardwareMonitor.GUI {
       Utilities.Config.Set(tempMenuItem.Name, tempMenuItem.Checked);
       Utilities.Config.Set(fansMenuItem.Name, fansMenuItem.Checked);
 
-      Utilities.Config.Set("mainForm.Location.X", Location.X);
-      Utilities.Config.Set("mainForm.Location.Y", Location.Y);
-      Utilities.Config.Set("mainForm.Width", Width);
-      Utilities.Config.Set("mainForm.Height", Height);
+      if (WindowState != FormWindowState.Minimized) {
+        Utilities.Config.Set("mainForm.Location.X", Location.X);
+        Utilities.Config.Set("mainForm.Location.Y", Location.Y);
+        Utilities.Config.Set("mainForm.Width", Width);
+        Utilities.Config.Set("mainForm.Height", Height);
+      }
 
       foreach (IGroup group in groupList)
         group.Close();

Hardware/CPU/AMD0FCPU.cs

@@ -0,0 +1,136 @@
+/*
+  
+  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 <m.moeller@gmx.ch>.
+  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 AMD0FCPU : IHardware {
+
+    private string name;
+    private Image icon;
+
+    private uint pciAddress;
+
+    private Sensor[] coreTemperatures;
+
+    private float offset;
+
+    private const ushort PCI_AMD_VENDOR_ID = 0x1022;
+    private const ushort PCI_AMD_0FH_MISCELLANEOUS_DEVICE_ID = 0x1103;
+    private const uint THERMTRIP_STATUS_REGISTER = 0xE4;
+    private const byte THERM_SENSE_CORE_SEL_CPU0 = 0x2;
+    private const byte THERM_SENSE_CORE_SEL_CPU1 = 0x0;
+
+    public AMD0FCPU(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;
+
+      // max two cores
+      coreCount = coreCount > 2 ? 2 : coreCount;
+
+      coreTemperatures = new Sensor[coreCount];
+      for (int i = 0; i < coreCount; i++)
+        coreTemperatures[i] = 
+          new Sensor("Core #" + (i + 1), i, SensorType.Temperature, this);
+
+      pciAddress = WinRing0.FindPciDeviceById(PCI_AMD_VENDOR_ID,
+        PCI_AMD_0FH_MISCELLANEOUS_DEVICE_ID, 0);
+
+      offset = -49.0f;
+
+      // AM2+ 65nm +21 offset
+      if (model >= 0x69 && model != 0xc1 && model != 0x6c && model != 0x7c) 
+        offset += 21;
+
+      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 coreTemperatures;
+      }
+    }
+
+    public string GetReport() {
+      return null;
+    }
+
+    public void Update() {
+      if (pciAddress == 0xFFFFFFFF)
+        return;
+
+      for (uint i = 0; i < coreTemperatures.Length; i++) {
+        if (WinRing0.WritePciConfigDwordEx(
+          pciAddress, THERMTRIP_STATUS_REGISTER,
+          i > 0 ? THERM_SENSE_CORE_SEL_CPU1 : THERM_SENSE_CORE_SEL_CPU0)) {
+          uint value;
+          if (WinRing0.ReadPciConfigDwordEx(
+            pciAddress, THERMTRIP_STATUS_REGISTER, out value)) 
+            coreTemperatures[i].Value = ((value >> 16) & 0xFF) + offset;    
+        }
+      }   
+    }
+
+    #pragma warning disable 67
+    public event SensorEventHandler SensorAdded;
+    public event SensorEventHandler SensorRemoved;
+    #pragma warning restore 67
+
+  }
+}

Hardware/CPU/CPUGroup.cs

@@ -139,6 +139,10 @@ namespace OpenHardwareMonitor.Hardware.CPU {
             // check if processor supports a digital thermal sensor            
             if (maxCPUID_EXT >= 7 && (cpuidExtData[7, 3] & 1) != 0) {
               switch (family) {
+                case 0x0F:
+                  hardware.Add(new AMD0FCPU(name, family, model, stepping,
+                    cpuidData, cpuidExtData));
+                  break;
                 case 0x10:
                   hardware.Add(new AMD10CPU(name, family, model, stepping,
                     cpuidData, cpuidExtData));

Hardware/LPC/W83627DHG.cs

@@ -1,4 +1,41 @@
-using System;
+/*
+  
+  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 <m.moeller@gmx.ch>.
+  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;

Hardware/WinRing0.cs

@@ -90,6 +90,8 @@ namespace OpenHardwareMonitor.Hardware {
       ushort deviceId, byte index);
     public delegate bool ReadPciConfigDwordExDelegate(uint pciAddress, 
       uint regAddress, out uint value);
+    public delegate bool WritePciConfigDwordExDelegate(uint pciAddress, 
+      uint regAddress, uint value);
 
     private static InitializeOlsDelegate InitializeOls;
     private static DeinitializeOlsDelegate DeinitializeOls;
@@ -103,6 +105,8 @@ namespace OpenHardwareMonitor.Hardware {
     public static SetPciMaxBusIndexDelegate SetPciMaxBusIndex;
     public static FindPciDeviceByIdDelegate FindPciDeviceById;
     public static ReadPciConfigDwordExDelegate ReadPciConfigDwordEx;
+    public static WritePciConfigDwordExDelegate WritePciConfigDwordEx;
+
 
     private static void GetDelegate<T>(string entryPoint, out T newDelegate) 
       where T : class 
@@ -127,6 +131,7 @@ namespace OpenHardwareMonitor.Hardware {
       GetDelegate("SetPciMaxBusIndex", out SetPciMaxBusIndex);
       GetDelegate("FindPciDeviceById", out FindPciDeviceById);
       GetDelegate("ReadPciConfigDwordEx", out ReadPciConfigDwordEx);
+      GetDelegate("WritePciConfigDwordEx", out WritePciConfigDwordEx);
 
       try {
         if (InitializeOls != null && InitializeOls())

OpenHardwareMonitor.csproj

@@ -58,6 +58,7 @@
   <ItemGroup>
     <Compile Include="GUI\TypeNode.cs" />
     <Compile Include="Hardware\CPU\AMD10CPU.cs" />
+    <Compile Include="Hardware\CPU\AMD0FCPU.cs" />
     <Compile Include="Hardware\HDD\HDD.cs" />
     <Compile Include="Hardware\HDD\HDDGroup.cs" />
     <Compile Include="Hardware\HDD\SMART.cs" />

Properties/AssemblyInfo.cs

@@ -1,4 +1,41 @@
-using System.Reflection;
+/*
+  
+  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 <m.moeller@gmx.ch>.
+  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.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,5 +69,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.4.0")]
-[assembly: AssemblyFileVersion("0.1.4.0")]
+[assembly: AssemblyVersion("0.1.5.0")]
+[assembly: AssemblyFileVersion("0.1.5.0")]