# HG changeset patch # User moel.mich # Date 1278863570 0 # Node ID 98187e7a08b2a651d1fb174b2cac08ea993b209d # Parent 76e18684713de0680ac7424b730b61fca8cd76c3 An attempt at adding a mainboard specific configuration for the ASUS P6X58D-E. diff -r 76e18684713d -r 98187e7a08b2 Hardware/LPC/W836XX.cs --- a/Hardware/LPC/W836XX.cs Sun Jul 04 12:49:16 2010 +0000 +++ b/Hardware/LPC/W836XX.cs Sun Jul 11 15:52:50 2010 +0000 @@ -123,7 +123,7 @@ break; case Chip.W83627DHG: case Chip.W83627DHGP: - // do not add temperature sensor registers that read PECI + // note temperature sensor registers that read PECI byte sel = ReadByte(0, TEMPERATURE_SOURCE_SELECT_REG); peciTemperature[0] = (sel & 0x07) != 0; peciTemperature[1] = (sel & 0x70) != 0; diff -r 76e18684713d -r 98187e7a08b2 Hardware/Mainboard/Mainboard.cs --- a/Hardware/Mainboard/Mainboard.cs Sun Jul 04 12:49:16 2010 +0000 +++ b/Hardware/Mainboard/Mainboard.cs Sun Jul 11 15:52:50 2010 +0000 @@ -85,7 +85,7 @@ superIOHardware[i] = new SuperIOHardware(superIO[i], smbios.Board != null ? smbios.Board.Manufacturer : Manufacturer.Unknown, smbios.Board != null ? smbios.Board.Model : - Model.Unknown); + Model.Unknown); } public string Name { diff -r 76e18684713d -r 98187e7a08b2 Hardware/Mainboard/Manufacturer.cs --- a/Hardware/Mainboard/Manufacturer.cs Sun Jul 04 12:49:16 2010 +0000 +++ b/Hardware/Mainboard/Manufacturer.cs Sun Jul 11 15:52:50 2010 +0000 @@ -39,12 +39,16 @@ public enum Manufacturer { ASUS, + Dell, DFI, EPoX, EVGA, + FIC, Gigabyte, + HP, IBM, MSI, + XFX, Unknown } diff -r 76e18684713d -r 98187e7a08b2 Hardware/Mainboard/Model.cs --- a/Hardware/Mainboard/Model.cs Sun Jul 04 12:49:16 2010 +0000 +++ b/Hardware/Mainboard/Model.cs Sun Jul 11 15:52:50 2010 +0000 @@ -43,6 +43,7 @@ M2N_SLI_DELUXE, M4A79XTD_EVO, P5W_DH_Deluxe, + P6X58D_E, // DFI LP_BI_P45_T2RS_Elite, diff -r 76e18684713d -r 98187e7a08b2 Hardware/Mainboard/SMBIOS.cs --- a/Hardware/Mainboard/SMBIOS.cs Sun Jul 04 12:49:16 2010 +0000 +++ b/Hardware/Mainboard/SMBIOS.cs Sun Jul 11 15:52:50 2010 +0000 @@ -255,6 +255,8 @@ switch (manufacturerName) { case "ASUSTeK Computer INC.": manufacturer = Manufacturer.ASUS; break; + case "Dell Inc.": + manufacturer = Manufacturer.Dell; break; case "DFI": case "DFI Inc.": manufacturer = Manufacturer.DFI; break; @@ -262,13 +264,21 @@ manufacturer = Manufacturer.EPoX; break; case "EVGA": manufacturer = Manufacturer.EVGA; break; + case "First International Computer, Inc.": + manufacturer = Manufacturer.FIC; break; case "Gigabyte Technology Co., Ltd.": manufacturer = Manufacturer.Gigabyte; break; + case "Hewlett-Packard": + manufacturer = Manufacturer.HP; break; case "IBM": manufacturer = Manufacturer.IBM; break; case "MICRO-STAR INTERNATIONAL CO., LTD": case "MICRO-STAR INTERNATIONAL CO.,LTD": manufacturer = Manufacturer.MSI; break; + case "XFX": + manufacturer = Manufacturer.XFX; break; + case "To be filled by O.E.M.": + manufacturer = Manufacturer.Unknown; break; default: manufacturer = Manufacturer.Unknown; break; } @@ -286,6 +296,8 @@ model = Model.M4A79XTD_EVO; break; case "P5W DH Deluxe": model = Model.P5W_DH_Deluxe; break; + case "P6X58D-E": + model = Model.P6X58D_E; break; case "LP BI P45-T2RS Elite": model = Model.LP_BI_P45_T2RS_Elite; break; case "LP DK P55-T3eH9": @@ -312,6 +324,8 @@ model = Model.X38_DS5; break; case "X58A-UD3R": model = Model.X58A_UD3R; break; + case "To be filled by O.E.M.": + model = Model.Unknown; break; default: model = Model.Unknown; break; } diff -r 76e18684713d -r 98187e7a08b2 Hardware/Mainboard/SuperIOHardware.cs --- a/Hardware/Mainboard/SuperIOHardware.cs Sun Jul 04 12:49:16 2010 +0000 +++ b/Hardware/Mainboard/SuperIOHardware.cs Sun Jul 11 15:52:50 2010 +0000 @@ -421,23 +421,68 @@ case Chip.W83627DHGP: case Chip.W83667HG: case Chip.W83667HGB: - v.Add(new Voltage("CPU VCore", 0)); - v.Add(new Voltage("Voltage #2", 1, true)); - v.Add(new Voltage("AVCC", 2, 34, 34, 0)); - v.Add(new Voltage("3VCC", 3, 34, 34, 0)); - 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("3VSB", 7, 34, 34, 0)); - v.Add(new Voltage("VBAT", 8, 34, 34, 0)); - t.Add(new Temperature("CPU", 0)); - t.Add(new Temperature("Auxiliary", 1)); - t.Add(new Temperature("System", 2)); - f.Add(new Fan("System", 0)); - f.Add(new Fan("CPU", 1)); - f.Add(new Fan("Auxiliary", 2)); - f.Add(new Fan("CPU #2", 3)); - f.Add(new Fan("Auxiliary #2", 4)); + switch (manufacturer) { + case Manufacturer.ASUS: + switch (model) { + case Model.P6X58D_E: + v.Add(new Voltage("CPU VCore", 0)); + v.Add(new Voltage("+12V", 1, 11.5f, 1.91f, 0)); + v.Add(new Voltage("Analog +3.3V", 2, 34, 34, 0)); + v.Add(new Voltage("+3.3V", 3, 34, 34, 0)); + v.Add(new Voltage("+5V", 4, 20, 10, 0)); + v.Add(new Voltage("Voltage #6", 5, true)); + v.Add(new Voltage("Voltage #7", 6, true)); + v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0)); + v.Add(new Voltage("VBAT", 8, 34, 34, 0)); + t.Add(new Temperature("CPU", 0)); + t.Add(new Temperature("Motherboard", 2)); + f.Add(new Fan("Chassis Fan #1", 0)); + f.Add(new Fan("CPU", 1)); + f.Add(new Fan("Power", 2)); + f.Add(new Fan("Chassis Fan #2", 3)); + f.Add(new Fan("Chassis Fan #3", 4)); + break; + default: + v.Add(new Voltage("CPU VCore", 0)); + v.Add(new Voltage("Voltage #2", 1, true)); + v.Add(new Voltage("AVCC", 2, 34, 34, 0)); + v.Add(new Voltage("3VCC", 3, 34, 34, 0)); + 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("3VSB", 7, 34, 34, 0)); + v.Add(new Voltage("VBAT", 8, 34, 34, 0)); + t.Add(new Temperature("CPU", 0)); + t.Add(new Temperature("Auxiliary", 1)); + t.Add(new Temperature("System", 2)); + f.Add(new Fan("System", 0)); + f.Add(new Fan("CPU", 1)); + f.Add(new Fan("Auxiliary", 2)); + f.Add(new Fan("CPU #2", 3)); + f.Add(new Fan("Auxiliary #2", 4)); + break; + } + break; + default: + v.Add(new Voltage("CPU VCore", 0)); + v.Add(new Voltage("Voltage #2", 1, true)); + v.Add(new Voltage("AVCC", 2, 34, 34, 0)); + v.Add(new Voltage("3VCC", 3, 34, 34, 0)); + 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("3VSB", 7, 34, 34, 0)); + v.Add(new Voltage("VBAT", 8, 34, 34, 0)); + t.Add(new Temperature("CPU", 0)); + t.Add(new Temperature("Auxiliary", 1)); + t.Add(new Temperature("System", 2)); + f.Add(new Fan("System", 0)); + f.Add(new Fan("CPU", 1)); + f.Add(new Fan("Auxiliary", 2)); + f.Add(new Fan("CPU #2", 3)); + f.Add(new Fan("Auxiliary #2", 4)); + break; + } break; case Chip.W83627HF: case Chip.W83627THF: diff -r 76e18684713d -r 98187e7a08b2 Properties/AssemblyInfo.cs --- a/Properties/AssemblyInfo.cs Sun Jul 04 12:49:16 2010 +0000 +++ b/Properties/AssemblyInfo.cs Sun Jul 11 15:52:50 2010 +0000 @@ -69,5 +69,5 @@ // 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.37.0")] -[assembly: AssemblyFileVersion("0.1.37.0")] +[assembly: AssemblyVersion("0.1.37.1")] +[assembly: AssemblyFileVersion("0.1.37.1")]