Hardware/Mainboard/SuperIOHardware.cs
changeset 265 961c07a3bd78
parent 257 f4bcb097746d
child 275 35788ddd1825
     1.1 --- a/Hardware/Mainboard/SuperIOHardware.cs	Sat Mar 19 16:13:49 2011 +0000
     1.2 +++ b/Hardware/Mainboard/SuperIOHardware.cs	Sat Mar 19 22:55:05 2011 +0000
     1.3 @@ -16,7 +16,7 @@
     1.4  
     1.5    The Initial Developer of the Original Code is 
     1.6    Michael Möller <m.moeller@gmx.ch>.
     1.7 -  Portions created by the Initial Developer are Copyright (C) 2009-2010
     1.8 +  Portions created by the Initial Developer are Copyright (C) 2009-2011
     1.9    the Initial Developer. All Rights Reserved.
    1.10  
    1.11    Contributor(s):
    1.12 @@ -742,22 +742,64 @@
    1.13            f.Add(new Fan("Auxiliary Fan", 2));
    1.14            break;
    1.15          case Chip.NCT6771F:
    1.16 -          v.Add(new Voltage("CPU VCore", 0));
    1.17 -          v.Add(new Voltage("Voltage #2", 1, true));
    1.18 -          v.Add(new Voltage("AVCC", 2, 34, 34));
    1.19 -          v.Add(new Voltage("3VCC", 3, 34, 34));
    1.20 -          v.Add(new Voltage("Voltage #5", 4, true));
    1.21 -          v.Add(new Voltage("Voltage #6", 5, true));
    1.22 -          v.Add(new Voltage("Voltage #7", 6, true));
    1.23 -          v.Add(new Voltage("3VSB", 7, 34, 34));
    1.24 -          v.Add(new Voltage("VBAT", 8, 34, 34));
    1.25 -          t.Add(new Temperature("CPU", 0));
    1.26 -          t.Add(new Temperature("Auxiliary", 1));
    1.27 -          t.Add(new Temperature("System", 2));
    1.28 -          f.Add(new Fan("System Fan", 0));
    1.29 -          f.Add(new Fan("CPU Fan", 1));
    1.30 -          f.Add(new Fan("Auxiliary Fan", 2));
    1.31 -          f.Add(new Fan("Auxiliary Fan #2", 4));
    1.32 +        case Chip.NCT6776F:
    1.33 +          switch (manufacturer) {
    1.34 +            case Manufacturer.ASUS:
    1.35 +              switch (model) {
    1.36 +                case Model.P8P67_PRO: // NCT6776F
    1.37 +                  v.Add(new Voltage("CPU VCore", 0));
    1.38 +                  v.Add(new Voltage("Voltage #2", 1, true));
    1.39 +                  v.Add(new Voltage("AVCC", 2, 34, 34));
    1.40 +                  v.Add(new Voltage("3VCC", 3, 34, 34));
    1.41 +                  v.Add(new Voltage("Voltage #5", 4, true));
    1.42 +                  v.Add(new Voltage("Voltage #6", 5, true));
    1.43 +                  v.Add(new Voltage("Voltage #7", 6, true));
    1.44 +                  v.Add(new Voltage("3VSB", 7, 34, 34));
    1.45 +                  v.Add(new Voltage("VBAT", 8, 34, 34));
    1.46 +                  t.Add(new Temperature("CPU", 0));
    1.47 +                  t.Add(new Temperature("Auxiliary", 1));
    1.48 +                  t.Add(new Temperature("System", 2));
    1.49 +                  f.Add(new Fan("System Fan", 0));
    1.50 +                  f.Add(new Fan("CPU Fan", 1));
    1.51 +                  f.Add(new Fan("Auxiliary Fan", 2));
    1.52 +                  f.Add(new Fan("Auxiliary Fan #2", 3));
    1.53 +                  f.Add(new Fan("Auxiliary Fan #3", 4));
    1.54 +                  break;
    1.55 +                default:
    1.56 +                  v.Add(new Voltage("CPU VCore", 0));
    1.57 +                  v.Add(new Voltage("Voltage #2", 1, true));
    1.58 +                  v.Add(new Voltage("AVCC", 2, 34, 34));
    1.59 +                  v.Add(new Voltage("3VCC", 3, 34, 34));
    1.60 +                  v.Add(new Voltage("Voltage #5", 4, true));
    1.61 +                  v.Add(new Voltage("Voltage #6", 5, true));
    1.62 +                  v.Add(new Voltage("Voltage #7", 6, true));
    1.63 +                  v.Add(new Voltage("3VSB", 7, 34, 34));
    1.64 +                  v.Add(new Voltage("VBAT", 8, 34, 34));
    1.65 +                  t.Add(new Temperature("CPU", 0));
    1.66 +                  t.Add(new Temperature("Auxiliary", 1));
    1.67 +                  t.Add(new Temperature("System", 2));
    1.68 +                  for (int i = 0; i < superIO.Fans.Length; i++)
    1.69 +                    f.Add(new Fan("Fan #" + (i + 1), i));
    1.70 +                  break;
    1.71 +              }
    1.72 +              break;
    1.73 +            default:
    1.74 +              v.Add(new Voltage("CPU VCore", 0));
    1.75 +              v.Add(new Voltage("Voltage #2", 1, true));
    1.76 +              v.Add(new Voltage("AVCC", 2, 34, 34));
    1.77 +              v.Add(new Voltage("3VCC", 3, 34, 34));
    1.78 +              v.Add(new Voltage("Voltage #5", 4, true));
    1.79 +              v.Add(new Voltage("Voltage #6", 5, true));
    1.80 +              v.Add(new Voltage("Voltage #7", 6, true));
    1.81 +              v.Add(new Voltage("3VSB", 7, 34, 34));
    1.82 +              v.Add(new Voltage("VBAT", 8, 34, 34));
    1.83 +              t.Add(new Temperature("CPU", 0));
    1.84 +              t.Add(new Temperature("Auxiliary", 1));
    1.85 +              t.Add(new Temperature("System", 2));
    1.86 +              for (int i = 0; i < superIO.Fans.Length; i++)
    1.87 +                f.Add(new Fan("Fan #" + (i + 1), i));
    1.88 +              break;
    1.89 +          }
    1.90            break;
    1.91          default:
    1.92            for (int i = 0; i < superIO.Voltages.Length; i++)