# HG changeset patch
# User moel.mich
# Date 1265055386 0
# Node ID e9abdc6e05af271855ae608459eda67d0fb5694c
# Parent  0e812fe67bacb4c57e450ecf3f426abd0ff79ab6
Added support for Fintek F71862, F71869, F71889.

diff -r 0e812fe67bac -r e9abdc6e05af Hardware/LPC/Chip.cs
--- a/Hardware/LPC/Chip.cs	Sun Jan 31 22:00:31 2010 +0000
+++ b/Hardware/LPC/Chip.cs	Mon Feb 01 20:16:26 2010 +0000
@@ -7,12 +7,15 @@
 
   public enum Chip : ushort {
     Unknown = 0,
-    IT8716F = 0x8716,
-    IT8718F = 0x8718,
-    IT8720F = 0x8720,
-    IT8726F = 0x8726,
+    IT8716 = 0x8716,
+    IT8718 = 0x8718,
+    IT8720 = 0x8720,
+    IT8726 = 0x8726,
     W83627DHG = 0xA020,
-    F71882FG = 0x0541
+    F71862 = 0x0601, 
+    F71869 = 0x0814,
+    F71882 = 0x0541,
+    F71889 = 0x0723 
   }
 
 }
diff -r 0e812fe67bac -r e9abdc6e05af Hardware/LPC/F718XX.cs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Hardware/LPC/F718XX.cs	Mon Feb 01 20:16:26 2010 +0000
@@ -0,0 +1,199 @@
+/*
+  
+  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.LPC {
+  public class F718XX  : IHardware {
+
+    private string name;
+    private Image icon;
+
+    private Chip chip;
+    private ushort address;
+
+    private List<ISensor> active = new List<ISensor>();
+
+    private Sensor[] temperatures;
+    private Sensor[] fans;
+    private Sensor[] voltages;
+    private float[] voltageGains;
+
+    // Hardware Monitor
+    private const byte ADDRESS_REGISTER_OFFSET = 0x05;
+    private const byte DATA_REGISTER_OFFSET = 0x06;
+
+    // Hardware Monitor Registers
+    private const byte VOLTAGE_BASE_REG = 0x20;
+    private const byte TEMPERATURE_BASE_REG = 0x72;
+    private byte[] FAN_TACHOMETER_REG = new byte[] { 0xA0, 0xB0, 0xC0, 0xD0 };
+    
+    private byte ReadByte(byte register) {
+      WinRing0.WriteIoPortByte(
+        (ushort)(address + ADDRESS_REGISTER_OFFSET), register);
+      return WinRing0.ReadIoPortByte((ushort)(address + DATA_REGISTER_OFFSET));
+    }
+
+    public F718XX(Chip chip, ushort address) {
+      this.chip = chip;
+      this.address = address;
+
+      switch (chip) {
+        case Chip.F71862: name = "Fintek F71862"; break;
+        case Chip.F71869: name = "Fintek F71869"; break;
+        case Chip.F71882: name = "Fintek F71882"; break;
+        case Chip.F71889: name = "Fintek F71889"; break;
+        default: return;
+      }
+
+      temperatures = new Sensor[3];
+      for (int i = 0; i < temperatures.Length; i++)
+        temperatures[i] = new Sensor("Temperature #" + (i + 1), i,
+          SensorType.Temperature, this);
+
+      fans = new Sensor[4];
+      for (int i = 0; i < fans.Length; i++)
+        fans[i] = new Sensor("Fan #" + (i + 1), i, SensorType.Fan, this);
+
+      voltageGains = new float[] { 1, 0.5f, 1, 1, 1, 1, 1, 1, 1 };
+      voltages = new Sensor[4];
+      voltages[0] = new Sensor("VCC3V", 0, SensorType.Voltage, this);
+      voltages[1] = new Sensor("CPU VCore", 1, SensorType.Voltage, this);      
+      voltages[2] = new Sensor("VSB3V", 7, SensorType.Voltage, this);
+      voltages[3] = new Sensor("Battery", 8, SensorType.Voltage, this);
+
+      this.icon = Utilities.EmbeddedResources.GetImage("chip.png");
+    }
+
+    public string Name {
+      get { return name; }
+    }
+
+    public string Identifier {
+      get { return "/lpc/f71882fg"; }
+    }
+
+    public Image Icon {
+      get { return icon; }
+    }
+
+    public ISensor[] Sensors {
+      get { return active.ToArray(); }
+    }
+
+    public string GetReport() {
+      StringBuilder r = new StringBuilder();
+
+      r.AppendLine("LPC F718XX");
+      r.AppendLine();
+      r.Append("Base Adress: 0x"); r.AppendLine(address.ToString("X4"));
+      r.AppendLine();
+      r.AppendLine("Hardware Monitor Registers");
+      r.AppendLine();
+
+      r.AppendLine("      00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
+      r.AppendLine();
+      for (int i = 0; i <= 0xF; i++) {
+        r.Append(" "); r.Append((i << 4).ToString("X2")); r.Append("  ");
+        for (int j = 0; j <= 0xF; j++) {
+          r.Append(" ");
+          r.Append(ReadByte((byte)((i << 4) | j)).ToString("X2"));
+        }
+        r.AppendLine();
+      }
+      r.AppendLine();
+      return r.ToString();
+    }
+
+    public void Update() {
+
+      foreach (Sensor sensor in voltages) {
+        int value = ReadByte((byte)(VOLTAGE_BASE_REG + sensor.Index));
+        sensor.Value = voltageGains[sensor.Index] * 0.001f * (value << 4);
+        if (sensor.Value > 0)
+          ActivateSensor(sensor);
+        else
+          DeactivateSensor(sensor);
+      }
+
+      foreach (Sensor sensor in temperatures) {
+        sbyte value = (sbyte)ReadByte((byte)(
+          TEMPERATURE_BASE_REG + 2 * sensor.Index));
+        sensor.Value = value;
+        if (value < sbyte.MaxValue && value > 0)
+          ActivateSensor(sensor);
+        else
+          DeactivateSensor(sensor);
+      }
+
+      foreach (Sensor sensor in fans) {
+        int value = ReadByte(FAN_TACHOMETER_REG[sensor.Index]) << 8;
+        value |= ReadByte((byte)(FAN_TACHOMETER_REG[sensor.Index] + 1));
+
+        if (value > 0) {
+          sensor.Value = (value < 0x0fff) ? 1.5e6f / value : 0;
+          ActivateSensor(sensor);
+        } else {
+          DeactivateSensor(sensor);
+        }
+      }      
+    }
+
+    private void ActivateSensor(Sensor sensor) {
+      if (!active.Contains(sensor)) {
+        active.Add(sensor);
+        if (SensorAdded != null)
+          SensorAdded(sensor);
+      }
+    }
+
+    private void DeactivateSensor(Sensor sensor) {
+      if (active.Contains(sensor)) {
+        active.Remove(sensor);
+        if (SensorRemoved != null)
+          SensorRemoved(sensor);
+      }
+    }
+
+    public event SensorEventHandler SensorAdded;
+    public event SensorEventHandler SensorRemoved;
+
+  }
+}
diff -r 0e812fe67bac -r e9abdc6e05af Hardware/LPC/IT87XX.cs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Hardware/LPC/IT87XX.cs	Mon Feb 01 20:16:26 2010 +0000
@@ -0,0 +1,225 @@
+/*
+  
+  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.LPC {
+  public class IT87XX : IHardware {
+
+    private string name;
+    private Image icon;
+        
+    private bool available = false;
+    private Chip chip;
+    private ushort address;
+
+    private Sensor[] temperatures;
+    private Sensor[] fans;
+    private Sensor[] voltages;
+    private List<ISensor> active = new List<ISensor>();
+    private float[] voltageGains;
+   
+    // Consts
+    private const byte ITE_VENDOR_ID = 0x90;
+       
+    // Environment Controller
+    private const byte ADDRESS_REGISTER_OFFSET = 0x05;
+    private const byte DATA_REGISTER_OFFSET = 0x06;
+
+    // Environment Controller Registers    
+    private const byte CONFIGURATION_REGISTER = 0x00;
+    private const byte TEMPERATURE_BASE_REG = 0x29;
+    private const byte VENDOR_ID_REGISTER = 0x58;
+    private const byte FAN_TACHOMETER_16_BIT_ENABLE_REGISTER = 0x0c;
+    private byte[] FAN_TACHOMETER_REG = 
+      new byte[] { 0x0d, 0x0e, 0x0f, 0x80, 0x82 };
+    private byte[] FAN_TACHOMETER_EXT_REG =
+      new byte[] { 0x18, 0x19, 0x1a, 0x81, 0x83 };
+    private const byte VOLTAGE_BASE_REG = 0x20;  
+    
+    private byte ReadByte(byte register) {
+      WinRing0.WriteIoPortByte(
+        (ushort)(address + ADDRESS_REGISTER_OFFSET), register);
+      return WinRing0.ReadIoPortByte((ushort)(address + DATA_REGISTER_OFFSET));
+    }
+
+    public IT87XX(Chip chip, ushort address) {
+      
+      this.chip = chip;
+      this.address = address;
+
+      switch (chip) {
+        case Chip.IT8716: name = "ITE IT8716"; break;
+        case Chip.IT8718: name = "ITE IT8718"; break;
+        case Chip.IT8720: name = "ITE IT8720"; break;
+        case Chip.IT8726: name = "ITE IT8726"; break;
+        default: return;
+      }
+      
+      // Check vendor id
+      byte vendorId = ReadByte(VENDOR_ID_REGISTER);      
+      if (vendorId != ITE_VENDOR_ID)
+        return;
+
+      // Bit 0x10 of the configuration register should always be 1
+      if ((ReadByte(CONFIGURATION_REGISTER) & 0x10) == 0)
+        return;
+
+      temperatures = new Sensor[3];
+      for (int i = 0; i < temperatures.Length; i++) 
+        temperatures[i] = new Sensor("Temperature #" + (i + 1), i,
+          SensorType.Temperature, this);
+
+      fans = new Sensor[5];
+      for (int i = 0; i < fans.Length; i++)
+        fans[i] = new Sensor("Fan #" + (i + 1), i, SensorType.Fan, this);
+
+      voltageGains = new float[] { 
+        1, 1, 1, (6.8f / 10 + 1), 1, 1, 1, 1, 1 };
+
+      voltages = new Sensor[2];
+      voltages[0] = new Sensor("CPU VCore", 0, SensorType.Voltage, this);
+      voltages[1] = new Sensor("Battery", 8, SensorType.Voltage, this);           
+
+      available = true;
+      icon = Utilities.EmbeddedResources.GetImage("chip.png");
+    }
+
+    public bool IsAvailable {
+      get { return available; } 
+    }
+
+    public string Name {
+      get { return name; }
+    }
+
+    public string Identifier {
+      get { return "/lpc/it87"; }
+    }
+
+    public Image Icon {
+      get { return icon; }
+    }
+
+    public ISensor[] Sensors {
+      get { return active.ToArray(); }
+    }
+
+    public string GetReport() {
+      StringBuilder r = new StringBuilder();
+
+      r.AppendLine("LPC IT87XX");
+      r.AppendLine();
+      r.Append("Chip ID: 0x"); r.AppendLine(chip.ToString("X"));
+      r.Append("Chip Name: "); r.AppendLine(name);
+      r.Append("Base Address: 0x"); r.AppendLine(address.ToString("X4"));
+      r.AppendLine();
+      r.AppendLine("Environment Controller Registers");
+      r.AppendLine();
+
+      r.AppendLine("      00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
+      r.AppendLine();
+      for (int i = 0; i <= 0xA; i++) {
+        r.Append(" "); r.Append((i << 4).ToString("X2")); r.Append("  ");
+        for (int j = 0; j <= 0xF; j++) {
+          r.Append(" ");
+          r.Append(ReadByte((byte)((i << 4) | j)).ToString("X2"));
+        }
+        r.AppendLine();
+      }
+      r.AppendLine();
+
+      return r.ToString();
+    }
+
+    public void Update() {
+
+      foreach (Sensor sensor in voltages) {
+        int value = ReadByte((byte)(VOLTAGE_BASE_REG + sensor.Index));
+        sensor.Value = voltageGains[sensor.Index] * 0.001f * (value << 4);
+        if (sensor.Value > 0)
+          ActivateSensor(sensor);
+        else
+          DeactivateSensor(sensor);
+      }
+
+      foreach (Sensor sensor in temperatures) {
+        sbyte value = (sbyte)ReadByte((byte)(TEMPERATURE_BASE_REG + sensor.Index));
+        sensor.Value = value;
+        if (value < sbyte.MaxValue && value > 0)
+          ActivateSensor(sensor);
+        else
+          DeactivateSensor(sensor);
+      }
+
+      foreach (Sensor sensor in fans) {
+        int value = ReadByte(FAN_TACHOMETER_REG[sensor.Index]);
+        value |= ReadByte(FAN_TACHOMETER_EXT_REG[sensor.Index]) << 8;
+
+        if (value > 0) {
+          sensor.Value = (value < 0xffff) ? 1.35e6f / ((value) * 2) : 0;
+          ActivateSensor(sensor);
+        } else {
+          DeactivateSensor(sensor);
+        }
+      }      
+    }
+
+    private void ActivateSensor(Sensor sensor) {
+      if (!active.Contains(sensor)) {
+        active.Add(sensor);
+        if (SensorAdded != null)
+          SensorAdded(sensor);
+      }
+    }
+
+    private void DeactivateSensor(Sensor sensor) {
+      if (active.Contains(sensor)) {
+        active.Remove(sensor);
+        if (SensorRemoved != null)
+          SensorRemoved(sensor);
+      }
+    }
+
+    public event SensorEventHandler SensorAdded;
+    public event SensorEventHandler SensorRemoved;
+
+  }
+}
diff -r 0e812fe67bac -r e9abdc6e05af Hardware/LPC/LPCGroup.cs
--- a/Hardware/LPC/LPCGroup.cs	Sun Jan 31 22:00:31 2010 +0000
+++ b/Hardware/LPC/LPCGroup.cs	Mon Feb 01 20:16:26 2010 +0000
@@ -75,12 +75,6 @@
       WinRing0.WriteIoPortByte(valuePort, logicalDeviceNumber);
     }
 
-    // IT87
-    private const ushort IT8716F_CHIP_ID = 0x8716;
-    private const ushort IT8718F_CHIP_ID = 0x8718;
-    private const ushort IT8720F_CHIP_ID = 0x8720;
-    private const ushort IT8726F_CHIP_ID = 0x8726;
-
     private const byte IT87_ENVIRONMENT_CONTROLLER_LDN = 0x04;    
 
     private void IT87Enter() {
@@ -100,7 +94,9 @@
     private const ushort FINTEK_VENDOR_ID = 0x1934;
 
     private const byte W83627DHG_HARDWARE_MONITOR_LDN = 0x0B;
-    private const byte F71882FG_HARDWARE_MONITOR_LDN = 0x04;
+
+    private const byte F71858_HARDWARE_MONITOR_LDN = 0x02;
+    private const byte FINTEK_HARDWARE_MONITOR_LDN = 0x04;
 
     private void WinbondFintekEnter() {
       WinRing0.WriteIoPortByte(registerPort, 0x87);
@@ -121,46 +117,79 @@
 
         WinbondFintekEnter();
 
-        byte hardwareMonitorLDN;
+        byte logicalDeviceNumber;
         byte id = ReadByte(CHIP_ID_REGISTER);
         byte revision = ReadByte(CHIP_REVISION_REGISTER);
         switch (id) {
+          case 0x05:
+            switch (revision) {
+              case 0x41:
+                chip = Chip.F71882;
+                logicalDeviceNumber = FINTEK_HARDWARE_MONITOR_LDN;
+                break;
+              default:
+                chip = Chip.Unknown;
+                logicalDeviceNumber = 0;
+                break;
+            } break;
+          case 0x06:
+            switch (revision) {             
+              case 0x01:
+                chip = Chip.F71862;
+                logicalDeviceNumber = FINTEK_HARDWARE_MONITOR_LDN;
+                break;
+              default:
+                chip = Chip.Unknown;
+                logicalDeviceNumber = 0;
+                break;
+            } break;
+          case 0x07:
+            switch (revision) {
+              case 0x23:
+                chip = Chip.F71889;
+                logicalDeviceNumber = FINTEK_HARDWARE_MONITOR_LDN;
+                break;
+              default:
+                chip = Chip.Unknown;
+                logicalDeviceNumber = 0;
+                break;
+            } break;
+          case 0x08:
+            switch (revision) {
+              case 0x14:
+                chip = Chip.F71869;
+                logicalDeviceNumber = FINTEK_HARDWARE_MONITOR_LDN;
+                break;
+              default:
+                chip = Chip.Unknown;
+                logicalDeviceNumber = 0;
+                break;
+            } break;
           case 0xA0:
             switch (revision & 0xF0) {
               case 0x20: 
                 chip = Chip.W83627DHG;
-                hardwareMonitorLDN = W83627DHG_HARDWARE_MONITOR_LDN;  
+                logicalDeviceNumber = W83627DHG_HARDWARE_MONITOR_LDN;  
                 break;
               default: 
                 chip = Chip.Unknown;
-                hardwareMonitorLDN = 0;
+                logicalDeviceNumber = 0;
                 break;
-            } break;
-          case 0x05:
-            switch (revision) {
-              case 0x41: 
-                chip = Chip.F71882FG;
-                hardwareMonitorLDN = F71882FG_HARDWARE_MONITOR_LDN; 
-                break;
-              default: 
-                chip = Chip.Unknown; 
-                hardwareMonitorLDN = 0;
-                break;
-            } break;
+            } break;          
           default:
             chip = Chip.Unknown; 
-            hardwareMonitorLDN = 0;
+            logicalDeviceNumber = 0;
             break;
         }
         if (chip != Chip.Unknown) {
 
-          Select(hardwareMonitorLDN);
+          Select(logicalDeviceNumber);
           ushort address = ReadWord(BASE_ADDRESS_REGISTER);
           Thread.Sleep(1);
           ushort verify = ReadWord(BASE_ADDRESS_REGISTER);
 
           ushort vendorID = 0;
-          if (chip == Chip.F71882FG)
+          if (chip == Chip.F71862 || chip == Chip.F71882 || chip == Chip.F71889)
             vendorID = ReadWord(FINTEK_VENDOR_ID_REGISTER);
 
           WinbondFintekExit();
@@ -174,9 +203,14 @@
               if (w83627dhg.IsAvailable)
                 hardware.Add(w83627dhg);
               break;
-            case Chip.F71882FG:  
+            case Chip.F71862:
+            case Chip.F71882:
+            case Chip.F71889: 
               if (vendorID == FINTEK_VENDOR_ID)
-                hardware.Add(new F71882(address));
+                hardware.Add(new F718XX(chip, address));
+              break;
+            case Chip.F71869:
+              hardware.Add(new F718XX(chip, address));
               break;
             default: break;
           }
@@ -187,10 +221,10 @@
         IT87Enter();
 
         switch (ReadWord(CHIP_ID_REGISTER)) {
-          case 0x8716: chip = Chip.IT8716F; break;
-          case 0x8718: chip = Chip.IT8718F; break;
-          case 0x8720: chip = Chip.IT8720F; break;
-          case 0x8726: chip = Chip.IT8726F; break;
+          case 0x8716: chip = Chip.IT8716; break;
+          case 0x8718: chip = Chip.IT8718; break;
+          case 0x8720: chip = Chip.IT8720; break;
+          case 0x8726: chip = Chip.IT8726; break;
           default: chip = Chip.Unknown; break;
         }
 
@@ -205,7 +239,7 @@
           if (address != verify || address == 0 || (address & 0xF007) != 0)
             return;
 
-          IT87 it87 = new IT87(chip, address);
+          IT87XX it87 = new IT87XX(chip, address);
           if (it87.IsAvailable)
             hardware.Add(it87);
 
diff -r 0e812fe67bac -r e9abdc6e05af OpenHardwareMonitor.csproj
--- a/OpenHardwareMonitor.csproj	Sun Jan 31 22:00:31 2010 +0000
+++ b/OpenHardwareMonitor.csproj	Mon Feb 01 20:16:26 2010 +0000
@@ -63,7 +63,7 @@
     <Compile Include="Hardware\HDD\HDDGroup.cs" />
     <Compile Include="Hardware\HDD\SMART.cs" />
     <Compile Include="Hardware\LPC\Chip.cs" />
-    <Compile Include="Hardware\LPC\F71882.cs" />
+    <Compile Include="Hardware\LPC\F718XX.cs" />
     <Compile Include="Hardware\SMBIOS\SMBIOSGroup.cs" />
     <Compile Include="Hardware\LPC\W83627DHG.cs" />
     <Compile Include="Hardware\ReportWriter.cs" />
@@ -84,7 +84,7 @@
     <Compile Include="Hardware\IGroup.cs" />
     <Compile Include="Hardware\IHardware.cs" />
     <Compile Include="Hardware\ISensor.cs" />
-    <Compile Include="Hardware\LPC\IT87.cs" />
+    <Compile Include="Hardware\LPC\IT87XX.cs" />
     <Compile Include="Hardware\LPC\LPCGroup.cs" />
     <Compile Include="GUI\MainForm.cs">
       <SubType>Form</SubType>