# HG changeset patch # User moel.mich # Date 1275736516 0 # Node ID 680ed54e05ca003dd49a2ac2c7deb3262d8df018 # Parent b68cb7c8d5cebddc78b00acaa07e02115b74bf9d Fixed Issue 23. diff -r b68cb7c8d5ce -r 680ed54e05ca Hardware/LPC/F718XX.cs --- a/Hardware/LPC/F718XX.cs Sat Jun 05 09:40:57 2010 +0000 +++ b/Hardware/LPC/F718XX.cs Sat Jun 05 11:15:16 2010 +0000 @@ -64,7 +64,7 @@ WinRing0.WriteIoPortByte( (ushort)(address + ADDRESS_REGISTER_OFFSET), register); return WinRing0.ReadIoPortByte((ushort)(address + DATA_REGISTER_OFFSET)); - } + } public F718XX(Chip chip, ushort address) { this.address = address; @@ -108,7 +108,7 @@ for (int i = 0; i < voltages.Length; i++) { int value = ReadByte((byte)(VOLTAGE_BASE_REG + i)); - voltages[i] = 0.001f * (value << 4); + voltages[i] = 0.008f * value; } for (int i = 0; i < temperatures.Length; i++) { diff -r b68cb7c8d5ce -r 680ed54e05ca Hardware/Mainboard/Manufacturer.cs --- a/Hardware/Mainboard/Manufacturer.cs Sat Jun 05 09:40:57 2010 +0000 +++ b/Hardware/Mainboard/Manufacturer.cs Sat Jun 05 11:15:16 2010 +0000 @@ -35,15 +35,13 @@ */ -using System; -using System.Collections.Generic; - namespace OpenHardwareMonitor.Hardware.Mainboard { public enum Manufacturer { ASUS, DFI, EPoX, + EVGA, Gigabyte, IBM, MSI, diff -r b68cb7c8d5ce -r 680ed54e05ca Hardware/Mainboard/Model.cs --- a/Hardware/Mainboard/Model.cs Sat Jun 05 09:40:57 2010 +0000 +++ b/Hardware/Mainboard/Model.cs Sat Jun 05 11:15:16 2010 +0000 @@ -1,6 +1,39 @@ -using System; -using System.Collections.Generic; -using System.Text; +/* + + 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. + +*/ namespace OpenHardwareMonitor.Hardware.Mainboard { @@ -10,7 +43,10 @@ // DFI LP_BI_P45_T2RS_Elite, - LP_DK_P55_T3eH9, + LP_DK_P55_T3eH9, + + // EVGA + X58_SLI_Classified, // Gigabyte _965P_S3, diff -r b68cb7c8d5ce -r 680ed54e05ca Hardware/Mainboard/SMBIOS.cs --- a/Hardware/Mainboard/SMBIOS.cs Sat Jun 05 09:40:57 2010 +0000 +++ b/Hardware/Mainboard/SMBIOS.cs Sat Jun 05 11:15:16 2010 +0000 @@ -212,6 +212,8 @@ manufacturer = Manufacturer.DFI; break; case "EPoX COMPUTER CO., LTD": manufacturer = Manufacturer.EPoX; break; + case "EVGA": + manufacturer = Manufacturer.EVGA; break; case "Gigabyte Technology Co., Ltd.": manufacturer = Manufacturer.Gigabyte; break; case "IBM": @@ -230,6 +232,8 @@ model = Model.LP_BI_P45_T2RS_Elite; break; case "LP DK P55-T3eH9": model = Model.LP_DK_P55_T3eH9; break; + case "X58 SLI Classified": + model = Model.X58_SLI_Classified; break; case "965P-S3": model = Model._965P_S3; break; case "EP45-DS3R": diff -r b68cb7c8d5ce -r 680ed54e05ca Hardware/Mainboard/SuperIOHardware.cs --- a/Hardware/Mainboard/SuperIOHardware.cs Sat Jun 05 09:40:57 2010 +0000 +++ b/Hardware/Mainboard/SuperIOHardware.cs Sat Jun 05 11:15:16 2010 +0000 @@ -238,9 +238,9 @@ break; case Chip.F71858: - v.Add(new Voltage("VCC3V", 0)); - v.Add(new Voltage("VSB3V", 1)); - v.Add(new Voltage("Battery", 2)); + v.Add(new Voltage("VCC3V", 0, 150, 150, 0)); + v.Add(new Voltage("VSB3V", 1, 150, 150, 0)); + v.Add(new Voltage("Battery", 2, 150, 150, 0)); for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); for (int i = 0; i < superIO.Fans.Length; i++) @@ -251,19 +251,59 @@ case Chip.F71882: case Chip.F71889ED: case Chip.F71889F: - v.Add(new Voltage("VCC3V", 0)); - v.Add(new Voltage("CPU VCore", 1)); - v.Add(new Voltage("Voltage #3", 2, true)); - v.Add(new Voltage("Voltage #4", 3, true)); - v.Add(new Voltage("Voltage #5", 4, true)); - v.Add(new Voltage("Voltage #6", 5, true)); - v.Add(new Voltage("Voltage #7", 6, true)); - v.Add(new Voltage("VSB3V", 7)); - v.Add(new Voltage("Battery", 8)); - for (int i = 0; i < superIO.Temperatures.Length; i++) - t.Add(new Temperature("Temperature #" + (i + 1), i)); - for (int i = 0; i < superIO.Fans.Length; i++) - f.Add(new Fan("Fan #" + (i + 1), i)); + switch (manufacturer) { + case Manufacturer.EVGA: + switch (model) { + case Model.X58_SLI_Classified: + v.Add(new Voltage("VCC3V", 0, 150, 150, 0)); + v.Add(new Voltage("CPU VCore", 1, 47, 100, 0)); + v.Add(new Voltage("DIMM", 2, 47, 100, 0)); + v.Add(new Voltage("CPU VTT", 3, 24, 100, 0)); + v.Add(new Voltage("IOH Vcore", 4, 24, 100, 0)); + v.Add(new Voltage("+5V", 5, 51, 12, 0)); + v.Add(new Voltage("+12V", 6, 56, 6.8f, 0)); + v.Add(new Voltage("3VSB", 7, 150, 150, 0)); + v.Add(new Voltage("VBat", 8, 150, 150, 0)); + t.Add(new Temperature("CPU", 0)); + t.Add(new Temperature("VREG", 1)); + t.Add(new Temperature("System", 2)); + f.Add(new Fan("CPU Fan", 0)); + f.Add(new Fan("Power Fan", 1)); + f.Add(new Fan("Chassis Fan", 2)); + break; + default: + v.Add(new Voltage("VCC3V", 0, 150, 150, 0)); + v.Add(new Voltage("CPU VCore", 1)); + v.Add(new Voltage("Voltage #3", 2, true)); + v.Add(new Voltage("Voltage #4", 3, true)); + v.Add(new Voltage("Voltage #5", 4, true)); + v.Add(new Voltage("Voltage #6", 5, true)); + v.Add(new Voltage("Voltage #7", 6, true)); + v.Add(new Voltage("VSB3V", 7, 150, 150, 0)); + v.Add(new Voltage("VBat", 8, 150, 150, 0)); + for (int i = 0; i < superIO.Temperatures.Length; i++) + t.Add(new Temperature("Temperature #" + (i + 1), i)); + for (int i = 0; i < superIO.Fans.Length; i++) + f.Add(new Fan("Fan #" + (i + 1), i)); + break; + } + break; + default: + v.Add(new Voltage("VCC3V", 0, 150, 150, 0)); + v.Add(new Voltage("CPU VCore", 1)); + v.Add(new Voltage("Voltage #3", 2, true)); + v.Add(new Voltage("Voltage #4", 3, true)); + v.Add(new Voltage("Voltage #5", 4, true)); + v.Add(new Voltage("Voltage #6", 5, true)); + v.Add(new Voltage("Voltage #7", 6, true)); + v.Add(new Voltage("VSB3V", 7, 150, 150, 0)); + v.Add(new Voltage("VBat", 8, 150, 150, 0)); + for (int i = 0; i < superIO.Temperatures.Length; i++) + t.Add(new Temperature("Temperature #" + (i + 1), i)); + for (int i = 0; i < superIO.Fans.Length; i++) + f.Add(new Fan("Fan #" + (i + 1), i)); + break; + } break; case Chip.W83627EHF: