1.1 --- a/Hardware/Mainboard/SuperIOHardware.cs Sun Jul 04 12:49:16 2010 +0000
1.2 +++ b/Hardware/Mainboard/SuperIOHardware.cs Sun Jul 11 15:52:50 2010 +0000
1.3 @@ -421,23 +421,68 @@
1.4 case Chip.W83627DHGP:
1.5 case Chip.W83667HG:
1.6 case Chip.W83667HGB:
1.7 - v.Add(new Voltage("CPU VCore", 0));
1.8 - v.Add(new Voltage("Voltage #2", 1, true));
1.9 - v.Add(new Voltage("AVCC", 2, 34, 34, 0));
1.10 - v.Add(new Voltage("3VCC", 3, 34, 34, 0));
1.11 - v.Add(new Voltage("Voltage #5", 4, true));
1.12 - v.Add(new Voltage("Voltage #6", 5, true));
1.13 - v.Add(new Voltage("Voltage #7", 6, true));
1.14 - v.Add(new Voltage("3VSB", 7, 34, 34, 0));
1.15 - v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.16 - t.Add(new Temperature("CPU", 0));
1.17 - t.Add(new Temperature("Auxiliary", 1));
1.18 - t.Add(new Temperature("System", 2));
1.19 - f.Add(new Fan("System", 0));
1.20 - f.Add(new Fan("CPU", 1));
1.21 - f.Add(new Fan("Auxiliary", 2));
1.22 - f.Add(new Fan("CPU #2", 3));
1.23 - f.Add(new Fan("Auxiliary #2", 4));
1.24 + switch (manufacturer) {
1.25 + case Manufacturer.ASUS:
1.26 + switch (model) {
1.27 + case Model.P6X58D_E:
1.28 + v.Add(new Voltage("CPU VCore", 0));
1.29 + v.Add(new Voltage("+12V", 1, 11.5f, 1.91f, 0));
1.30 + v.Add(new Voltage("Analog +3.3V", 2, 34, 34, 0));
1.31 + v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
1.32 + v.Add(new Voltage("+5V", 4, 20, 10, 0));
1.33 + v.Add(new Voltage("Voltage #6", 5, true));
1.34 + v.Add(new Voltage("Voltage #7", 6, true));
1.35 + v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
1.36 + v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.37 + t.Add(new Temperature("CPU", 0));
1.38 + t.Add(new Temperature("Motherboard", 2));
1.39 + f.Add(new Fan("Chassis Fan #1", 0));
1.40 + f.Add(new Fan("CPU", 1));
1.41 + f.Add(new Fan("Power", 2));
1.42 + f.Add(new Fan("Chassis Fan #2", 3));
1.43 + f.Add(new Fan("Chassis Fan #3", 4));
1.44 + break;
1.45 + default:
1.46 + v.Add(new Voltage("CPU VCore", 0));
1.47 + v.Add(new Voltage("Voltage #2", 1, true));
1.48 + v.Add(new Voltage("AVCC", 2, 34, 34, 0));
1.49 + v.Add(new Voltage("3VCC", 3, 34, 34, 0));
1.50 + v.Add(new Voltage("Voltage #5", 4, true));
1.51 + v.Add(new Voltage("Voltage #6", 5, true));
1.52 + v.Add(new Voltage("Voltage #7", 6, true));
1.53 + v.Add(new Voltage("3VSB", 7, 34, 34, 0));
1.54 + v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.55 + t.Add(new Temperature("CPU", 0));
1.56 + t.Add(new Temperature("Auxiliary", 1));
1.57 + t.Add(new Temperature("System", 2));
1.58 + f.Add(new Fan("System", 0));
1.59 + f.Add(new Fan("CPU", 1));
1.60 + f.Add(new Fan("Auxiliary", 2));
1.61 + f.Add(new Fan("CPU #2", 3));
1.62 + f.Add(new Fan("Auxiliary #2", 4));
1.63 + break;
1.64 + }
1.65 + break;
1.66 + default:
1.67 + v.Add(new Voltage("CPU VCore", 0));
1.68 + v.Add(new Voltage("Voltage #2", 1, true));
1.69 + v.Add(new Voltage("AVCC", 2, 34, 34, 0));
1.70 + v.Add(new Voltage("3VCC", 3, 34, 34, 0));
1.71 + v.Add(new Voltage("Voltage #5", 4, true));
1.72 + v.Add(new Voltage("Voltage #6", 5, true));
1.73 + v.Add(new Voltage("Voltage #7", 6, true));
1.74 + v.Add(new Voltage("3VSB", 7, 34, 34, 0));
1.75 + v.Add(new Voltage("VBAT", 8, 34, 34, 0));
1.76 + t.Add(new Temperature("CPU", 0));
1.77 + t.Add(new Temperature("Auxiliary", 1));
1.78 + t.Add(new Temperature("System", 2));
1.79 + f.Add(new Fan("System", 0));
1.80 + f.Add(new Fan("CPU", 1));
1.81 + f.Add(new Fan("Auxiliary", 2));
1.82 + f.Add(new Fan("CPU #2", 3));
1.83 + f.Add(new Fan("Auxiliary #2", 4));
1.84 + break;
1.85 + }
1.86 break;
1.87 case Chip.W83627HF:
1.88 case Chip.W83627THF: