1.1 --- a/Hardware/LPC/F718XX.cs Sat Jun 05 09:40:57 2010 +0000
1.2 +++ b/Hardware/LPC/F718XX.cs Sat Jun 05 11:15:16 2010 +0000
1.3 @@ -64,7 +64,7 @@
1.4 WinRing0.WriteIoPortByte(
1.5 (ushort)(address + ADDRESS_REGISTER_OFFSET), register);
1.6 return WinRing0.ReadIoPortByte((ushort)(address + DATA_REGISTER_OFFSET));
1.7 - }
1.8 + }
1.9
1.10 public F718XX(Chip chip, ushort address) {
1.11 this.address = address;
1.12 @@ -108,7 +108,7 @@
1.13
1.14 for (int i = 0; i < voltages.Length; i++) {
1.15 int value = ReadByte((byte)(VOLTAGE_BASE_REG + i));
1.16 - voltages[i] = 0.001f * (value << 4);
1.17 + voltages[i] = 0.008f * value;
1.18 }
1.19
1.20 for (int i = 0; i < temperatures.Length; i++) {
2.1 --- a/Hardware/Mainboard/Manufacturer.cs Sat Jun 05 09:40:57 2010 +0000
2.2 +++ b/Hardware/Mainboard/Manufacturer.cs Sat Jun 05 11:15:16 2010 +0000
2.3 @@ -35,15 +35,13 @@
2.4
2.5 */
2.6
2.7 -using System;
2.8 -using System.Collections.Generic;
2.9 -
2.10 namespace OpenHardwareMonitor.Hardware.Mainboard {
2.11
2.12 public enum Manufacturer {
2.13 ASUS,
2.14 DFI,
2.15 EPoX,
2.16 + EVGA,
2.17 Gigabyte,
2.18 IBM,
2.19 MSI,
3.1 --- a/Hardware/Mainboard/Model.cs Sat Jun 05 09:40:57 2010 +0000
3.2 +++ b/Hardware/Mainboard/Model.cs Sat Jun 05 11:15:16 2010 +0000
3.3 @@ -1,6 +1,39 @@
3.4 -using System;
3.5 -using System.Collections.Generic;
3.6 -using System.Text;
3.7 +/*
3.8 +
3.9 + Version: MPL 1.1/GPL 2.0/LGPL 2.1
3.10 +
3.11 + The contents of this file are subject to the Mozilla Public License Version
3.12 + 1.1 (the "License"); you may not use this file except in compliance with
3.13 + the License. You may obtain a copy of the License at
3.14 +
3.15 + http://www.mozilla.org/MPL/
3.16 +
3.17 + Software distributed under the License is distributed on an "AS IS" basis,
3.18 + WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
3.19 + for the specific language governing rights and limitations under the License.
3.20 +
3.21 + The Original Code is the Open Hardware Monitor code.
3.22 +
3.23 + The Initial Developer of the Original Code is
3.24 + Michael Möller <m.moeller@gmx.ch>.
3.25 + Portions created by the Initial Developer are Copyright (C) 2009-2010
3.26 + the Initial Developer. All Rights Reserved.
3.27 +
3.28 + Contributor(s):
3.29 +
3.30 + Alternatively, the contents of this file may be used under the terms of
3.31 + either the GNU General Public License Version 2 or later (the "GPL"), or
3.32 + the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
3.33 + in which case the provisions of the GPL or the LGPL are applicable instead
3.34 + of those above. If you wish to allow use of your version of this file only
3.35 + under the terms of either the GPL or the LGPL, and not to allow others to
3.36 + use your version of this file under the terms of the MPL, indicate your
3.37 + decision by deleting the provisions above and replace them with the notice
3.38 + and other provisions required by the GPL or the LGPL. If you do not delete
3.39 + the provisions above, a recipient may use your version of this file under
3.40 + the terms of any one of the MPL, the GPL or the LGPL.
3.41 +
3.42 +*/
3.43
3.44 namespace OpenHardwareMonitor.Hardware.Mainboard {
3.45
3.46 @@ -10,7 +43,10 @@
3.47
3.48 // DFI
3.49 LP_BI_P45_T2RS_Elite,
3.50 - LP_DK_P55_T3eH9,
3.51 + LP_DK_P55_T3eH9,
3.52 +
3.53 + // EVGA
3.54 + X58_SLI_Classified,
3.55
3.56 // Gigabyte
3.57 _965P_S3,
4.1 --- a/Hardware/Mainboard/SMBIOS.cs Sat Jun 05 09:40:57 2010 +0000
4.2 +++ b/Hardware/Mainboard/SMBIOS.cs Sat Jun 05 11:15:16 2010 +0000
4.3 @@ -212,6 +212,8 @@
4.4 manufacturer = Manufacturer.DFI; break;
4.5 case "EPoX COMPUTER CO., LTD":
4.6 manufacturer = Manufacturer.EPoX; break;
4.7 + case "EVGA":
4.8 + manufacturer = Manufacturer.EVGA; break;
4.9 case "Gigabyte Technology Co., Ltd.":
4.10 manufacturer = Manufacturer.Gigabyte; break;
4.11 case "IBM":
4.12 @@ -230,6 +232,8 @@
4.13 model = Model.LP_BI_P45_T2RS_Elite; break;
4.14 case "LP DK P55-T3eH9":
4.15 model = Model.LP_DK_P55_T3eH9; break;
4.16 + case "X58 SLI Classified":
4.17 + model = Model.X58_SLI_Classified; break;
4.18 case "965P-S3":
4.19 model = Model._965P_S3; break;
4.20 case "EP45-DS3R":
5.1 --- a/Hardware/Mainboard/SuperIOHardware.cs Sat Jun 05 09:40:57 2010 +0000
5.2 +++ b/Hardware/Mainboard/SuperIOHardware.cs Sat Jun 05 11:15:16 2010 +0000
5.3 @@ -238,9 +238,9 @@
5.4 break;
5.5
5.6 case Chip.F71858:
5.7 - v.Add(new Voltage("VCC3V", 0));
5.8 - v.Add(new Voltage("VSB3V", 1));
5.9 - v.Add(new Voltage("Battery", 2));
5.10 + v.Add(new Voltage("VCC3V", 0, 150, 150, 0));
5.11 + v.Add(new Voltage("VSB3V", 1, 150, 150, 0));
5.12 + v.Add(new Voltage("Battery", 2, 150, 150, 0));
5.13 for (int i = 0; i < superIO.Temperatures.Length; i++)
5.14 t.Add(new Temperature("Temperature #" + (i + 1), i));
5.15 for (int i = 0; i < superIO.Fans.Length; i++)
5.16 @@ -251,19 +251,59 @@
5.17 case Chip.F71882:
5.18 case Chip.F71889ED:
5.19 case Chip.F71889F:
5.20 - v.Add(new Voltage("VCC3V", 0));
5.21 - v.Add(new Voltage("CPU VCore", 1));
5.22 - v.Add(new Voltage("Voltage #3", 2, true));
5.23 - v.Add(new Voltage("Voltage #4", 3, true));
5.24 - v.Add(new Voltage("Voltage #5", 4, true));
5.25 - v.Add(new Voltage("Voltage #6", 5, true));
5.26 - v.Add(new Voltage("Voltage #7", 6, true));
5.27 - v.Add(new Voltage("VSB3V", 7));
5.28 - v.Add(new Voltage("Battery", 8));
5.29 - for (int i = 0; i < superIO.Temperatures.Length; i++)
5.30 - t.Add(new Temperature("Temperature #" + (i + 1), i));
5.31 - for (int i = 0; i < superIO.Fans.Length; i++)
5.32 - f.Add(new Fan("Fan #" + (i + 1), i));
5.33 + switch (manufacturer) {
5.34 + case Manufacturer.EVGA:
5.35 + switch (model) {
5.36 + case Model.X58_SLI_Classified:
5.37 + v.Add(new Voltage("VCC3V", 0, 150, 150, 0));
5.38 + v.Add(new Voltage("CPU VCore", 1, 47, 100, 0));
5.39 + v.Add(new Voltage("DIMM", 2, 47, 100, 0));
5.40 + v.Add(new Voltage("CPU VTT", 3, 24, 100, 0));
5.41 + v.Add(new Voltage("IOH Vcore", 4, 24, 100, 0));
5.42 + v.Add(new Voltage("+5V", 5, 51, 12, 0));
5.43 + v.Add(new Voltage("+12V", 6, 56, 6.8f, 0));
5.44 + v.Add(new Voltage("3VSB", 7, 150, 150, 0));
5.45 + v.Add(new Voltage("VBat", 8, 150, 150, 0));
5.46 + t.Add(new Temperature("CPU", 0));
5.47 + t.Add(new Temperature("VREG", 1));
5.48 + t.Add(new Temperature("System", 2));
5.49 + f.Add(new Fan("CPU Fan", 0));
5.50 + f.Add(new Fan("Power Fan", 1));
5.51 + f.Add(new Fan("Chassis Fan", 2));
5.52 + break;
5.53 + default:
5.54 + v.Add(new Voltage("VCC3V", 0, 150, 150, 0));
5.55 + v.Add(new Voltage("CPU VCore", 1));
5.56 + v.Add(new Voltage("Voltage #3", 2, true));
5.57 + v.Add(new Voltage("Voltage #4", 3, true));
5.58 + v.Add(new Voltage("Voltage #5", 4, true));
5.59 + v.Add(new Voltage("Voltage #6", 5, true));
5.60 + v.Add(new Voltage("Voltage #7", 6, true));
5.61 + v.Add(new Voltage("VSB3V", 7, 150, 150, 0));
5.62 + v.Add(new Voltage("VBat", 8, 150, 150, 0));
5.63 + for (int i = 0; i < superIO.Temperatures.Length; i++)
5.64 + t.Add(new Temperature("Temperature #" + (i + 1), i));
5.65 + for (int i = 0; i < superIO.Fans.Length; i++)
5.66 + f.Add(new Fan("Fan #" + (i + 1), i));
5.67 + break;
5.68 + }
5.69 + break;
5.70 + default:
5.71 + v.Add(new Voltage("VCC3V", 0, 150, 150, 0));
5.72 + v.Add(new Voltage("CPU VCore", 1));
5.73 + v.Add(new Voltage("Voltage #3", 2, true));
5.74 + v.Add(new Voltage("Voltage #4", 3, true));
5.75 + v.Add(new Voltage("Voltage #5", 4, true));
5.76 + v.Add(new Voltage("Voltage #6", 5, true));
5.77 + v.Add(new Voltage("Voltage #7", 6, true));
5.78 + v.Add(new Voltage("VSB3V", 7, 150, 150, 0));
5.79 + v.Add(new Voltage("VBat", 8, 150, 150, 0));
5.80 + for (int i = 0; i < superIO.Temperatures.Length; i++)
5.81 + t.Add(new Temperature("Temperature #" + (i + 1), i));
5.82 + for (int i = 0; i < superIO.Fans.Length; i++)
5.83 + f.Add(new Fan("Fan #" + (i + 1), i));
5.84 + break;
5.85 + }
5.86 break;
5.87
5.88 case Chip.W83627EHF: