# HG changeset patch # User moel.mich # Date 1287075143 0 # Node ID a950ba30d4dd4e8657f2463b502f58a5cff1bca6 # Parent e51749b206ee67f25cba2b04e77b1265fd64a1db Added a mainboard specific configuration for the ASRock P55 Deluxe. diff -r e51749b206ee -r a950ba30d4dd Hardware/Mainboard/Model.cs --- a/Hardware/Mainboard/Model.cs Mon Oct 11 20:37:37 2010 +0000 +++ b/Hardware/Mainboard/Model.cs Thu Oct 14 16:52:23 2010 +0000 @@ -41,6 +41,7 @@ // ASRock _880GMH_USB3, AOD790GX_128M, + P55_Deluxe, // ASUS Crosshair_III_Formula, diff -r e51749b206ee -r a950ba30d4dd Hardware/Mainboard/SMBIOS.cs --- a/Hardware/Mainboard/SMBIOS.cs Mon Oct 11 20:37:37 2010 +0000 +++ b/Hardware/Mainboard/SMBIOS.cs Thu Oct 14 16:52:23 2010 +0000 @@ -297,6 +297,8 @@ return Model._880GMH_USB3; case "ASRock AOD790GX/128M": return Model.AOD790GX_128M; + case "P55 Deluxe": + return Model.P55_Deluxe; case "Crosshair III Formula": return Model.Crosshair_III_Formula; case "M2N-SLI DELUXE": diff -r e51749b206ee -r a950ba30d4dd Hardware/Mainboard/SuperIOHardware.cs --- a/Hardware/Mainboard/SuperIOHardware.cs Mon Oct 11 20:37:37 2010 +0000 +++ b/Hardware/Mainboard/SuperIOHardware.cs Thu Oct 14 16:52:23 2010 +0000 @@ -50,7 +50,6 @@ private readonly List temperatures = new List(); private readonly List fans = new List(); - public SuperIOHardware(Mainboard mainboard, ISuperIO superIO, Manufacturer manufacturer, Model model, ISettings settings) { @@ -116,6 +115,40 @@ break; } break; + + case Manufacturer.ASRock: + switch (model) { + case Model.P55_Deluxe: // IT8720F + v.Add(new Voltage("CPU VCore", 0)); + v.Add(new Voltage("+3.3V", 2)); + v.Add(new Voltage("+12V", 4, 30, 10)); + v.Add(new Voltage("+5V", 5, 6.8f, 10)); + v.Add(new Voltage("VBat", 8)); + t.Add(new Temperature("CPU", 0)); + t.Add(new Temperature("Motherboard", 1)); + f.Add(new Fan("CPU Fan", 0)); + f.Add(new Fan("Chassis Fan #1", 1)); + // fan channel 2 can connect to 3 different fan headers + // which fan is read is configured with gpio 83-85 + break; + default: + v.Add(new Voltage("CPU VCore", 0)); + v.Add(new Voltage("Voltage #2", 1, true)); + 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("Voltage #8", 7, true)); + v.Add(new Voltage("VBat", 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)); + break; + }; + break; + case Manufacturer.DFI: switch (model) { case Model.LP_BI_P45_T2RS_Elite: // IT8718F @@ -458,10 +491,8 @@ v.Add(new Voltage("VBAT", 8, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Motherboard", 2)); - f.Add(new Fan("Chassis Fan", 0)); - f.Add(new Fan("CPU Fan", 1)); - f.Add(new Fan("NB Fan", 2)); - f.Add(new Fan("Power Fan", 4)); + f.Add(new Fan("CPU Fan", 0)); + f.Add(new Fan("Chassis Fan", 1)); break; default: v.Add(new Voltage("CPU VCore", 0));