Hardware/Mainboard/SuperIOHardware.cs
changeset 359 30bb76a1da24
parent 357 fb8dc26f65a4
child 368 1036b453f1f6
     1.1 --- a/Hardware/Mainboard/SuperIOHardware.cs	Sun Jul 08 15:24:44 2012 +0000
     1.2 +++ b/Hardware/Mainboard/SuperIOHardware.cs	Sun Jul 08 19:26:00 2012 +0000
     1.3 @@ -353,8 +353,7 @@
     1.4                    f.Add(new Fan("System Fan", 1));
     1.5                    break;
     1.6                  case Model.GA_MA770T_UD3: // IT8720F
     1.7 -                case Model.GA_MA770T_UD3P: // IT8720F
     1.8 -                case Model.GA_MA78LM_S2H: // IT8718F
     1.9 +                case Model.GA_MA770T_UD3P: // IT8720F                
    1.10                  case Model.GA_MA790X_UD3P: // IT8720F
    1.11                    v.Add(new Voltage("CPU VCore", 0));
    1.12                    v.Add(new Voltage("DRAM", 1));
    1.13 @@ -369,6 +368,21 @@
    1.14                    f.Add(new Fan("System Fan #2", 2));
    1.15                    f.Add(new Fan("Power Fan", 3));
    1.16                    break;
    1.17 +                case Model.GA_MA78LM_S2H: // IT8718F
    1.18 +                  v.Add(new Voltage("CPU VCore", 0));
    1.19 +                  v.Add(new Voltage("DRAM", 1));
    1.20 +                  v.Add(new Voltage("+3.3V", 2));
    1.21 +                  v.Add(new Voltage("+5V", 3, 6.8f, 10));
    1.22 +                  v.Add(new Voltage("+12V", 4, 24.3f, 8.2f));
    1.23 +                  v.Add(new Voltage("VBat", 8));
    1.24 +                  t.Add(new Temperature("System", 0));
    1.25 +                  t.Add(new Temperature("CPU", 1));
    1.26 +                  t.Add(new Temperature("VRM", 2));
    1.27 +                  f.Add(new Fan("CPU Fan", 0));
    1.28 +                  f.Add(new Fan("System Fan #1", 1));
    1.29 +                  f.Add(new Fan("System Fan #2", 2));
    1.30 +                  f.Add(new Fan("Power Fan", 3));
    1.31 +                  break;
    1.32                  case Model.GA_MA785GM_US2H: // IT8718F
    1.33                  case Model.GA_MA785GMT_UD2H: // IT8718F
    1.34                    v.Add(new Voltage("CPU VCore", 0));
    1.35 @@ -1005,32 +1019,68 @@
    1.36            }
    1.37            break;
    1.38          case Chip.NCT6779D:
    1.39 -          v.Add(new Voltage("CPU VCore", 0));
    1.40 -          v.Add(new Voltage("Voltage #2", 1, true));
    1.41 -          v.Add(new Voltage("AVCC", 2, 34, 34));
    1.42 -          v.Add(new Voltage("3VCC", 3, 34, 34));
    1.43 -          v.Add(new Voltage("Voltage #5", 4, true));
    1.44 -          v.Add(new Voltage("Voltage #6", 5, true));
    1.45 -          v.Add(new Voltage("Voltage #7", 6, true));
    1.46 -          v.Add(new Voltage("3VSB", 7, 34, 34));
    1.47 -          v.Add(new Voltage("VBAT", 8, 34, 34));
    1.48 -          v.Add(new Voltage("VTT", 9));
    1.49 -          v.Add(new Voltage("Voltage #11", 10, true));
    1.50 -          v.Add(new Voltage("Voltage #12", 11, true));
    1.51 -          v.Add(new Voltage("Voltage #13", 12, true));
    1.52 -          v.Add(new Voltage("Voltage #14", 13, true));
    1.53 -          v.Add(new Voltage("Voltage #15", 14, true));
    1.54 -          t.Add(new Temperature("CPU Core", 0));
    1.55 -          t.Add(new Temperature("Temperature #1", 1));
    1.56 -          t.Add(new Temperature("Temperature #2", 2));
    1.57 -          t.Add(new Temperature("Temperature #3", 3));
    1.58 -          t.Add(new Temperature("Temperature #4", 4));
    1.59 -          t.Add(new Temperature("Temperature #5", 5));
    1.60 -          t.Add(new Temperature("Temperature #6", 6));
    1.61 -          for (int i = 0; i < superIO.Fans.Length; i++)
    1.62 -            f.Add(new Fan("Fan #" + (i + 1), i));
    1.63 -          for (int i = 0; i < superIO.Controls.Length; i++)
    1.64 -            c.Add(new Ctrl("Fan Control #" + (i + 1), i));
    1.65 +          switch (manufacturer) {
    1.66 +            case Manufacturer.ASUS:
    1.67 +              switch (model) {
    1.68 +                case Model.P8Z77_V:
    1.69 +                  v.Add(new Voltage("CPU VCore", 0));
    1.70 +                  v.Add(new Voltage("Voltage #2", 1, true));
    1.71 +                  v.Add(new Voltage("AVCC", 2, 34, 34));
    1.72 +                  v.Add(new Voltage("3VCC", 3, 34, 34));
    1.73 +                  v.Add(new Voltage("Voltage #5", 4, true));
    1.74 +                  v.Add(new Voltage("Voltage #6", 5, true));
    1.75 +                  v.Add(new Voltage("Voltage #7", 6, true));
    1.76 +                  v.Add(new Voltage("3VSB", 7, 34, 34));
    1.77 +                  v.Add(new Voltage("VBAT", 8, 34, 34));
    1.78 +                  v.Add(new Voltage("VTT", 9));
    1.79 +                  v.Add(new Voltage("Voltage #11", 10, true));
    1.80 +                  v.Add(new Voltage("Voltage #12", 11, true));
    1.81 +                  v.Add(new Voltage("Voltage #13", 12, true));
    1.82 +                  v.Add(new Voltage("Voltage #14", 13, true));
    1.83 +                  v.Add(new Voltage("Voltage #15", 14, true));
    1.84 +                  t.Add(new Temperature("CPU Core", 0));
    1.85 +                  t.Add(new Temperature("Auxiliary", 1));
    1.86 +                  t.Add(new Temperature("Motherboard", 2));
    1.87 +                  f.Add(new Fan("Chassis Fan #1", 0));
    1.88 +                  f.Add(new Fan("CPU Fan", 1));
    1.89 +                  f.Add(new Fan("Chassis Fan #2", 2));
    1.90 +                  f.Add(new Fan("Chassis Fan #3", 3));
    1.91 +                  c.Add(new Ctrl("Chassis Fan #1", 0));
    1.92 +                  c.Add(new Ctrl("CPU  Fan", 1));
    1.93 +                  c.Add(new Ctrl("Chassis Fan #2", 2));
    1.94 +                  c.Add(new Ctrl("Chassis Fan #3", 3));
    1.95 +                  break;
    1.96 +              }
    1.97 +              break;
    1.98 +            default:
    1.99 +              v.Add(new Voltage("CPU VCore", 0));
   1.100 +              v.Add(new Voltage("Voltage #2", 1, true));
   1.101 +              v.Add(new Voltage("AVCC", 2, 34, 34));
   1.102 +              v.Add(new Voltage("3VCC", 3, 34, 34));
   1.103 +              v.Add(new Voltage("Voltage #5", 4, true));
   1.104 +              v.Add(new Voltage("Voltage #6", 5, true));
   1.105 +              v.Add(new Voltage("Voltage #7", 6, true));
   1.106 +              v.Add(new Voltage("3VSB", 7, 34, 34));
   1.107 +              v.Add(new Voltage("VBAT", 8, 34, 34));
   1.108 +              v.Add(new Voltage("VTT", 9));
   1.109 +              v.Add(new Voltage("Voltage #11", 10, true));
   1.110 +              v.Add(new Voltage("Voltage #12", 11, true));
   1.111 +              v.Add(new Voltage("Voltage #13", 12, true));
   1.112 +              v.Add(new Voltage("Voltage #14", 13, true));
   1.113 +              v.Add(new Voltage("Voltage #15", 14, true));
   1.114 +              t.Add(new Temperature("CPU Core", 0));
   1.115 +              t.Add(new Temperature("Temperature #1", 1));
   1.116 +              t.Add(new Temperature("Temperature #2", 2));
   1.117 +              t.Add(new Temperature("Temperature #3", 3));
   1.118 +              t.Add(new Temperature("Temperature #4", 4));
   1.119 +              t.Add(new Temperature("Temperature #5", 5));
   1.120 +              t.Add(new Temperature("Temperature #6", 6));
   1.121 +              for (int i = 0; i < superIO.Fans.Length; i++)
   1.122 +                f.Add(new Fan("Fan #" + (i + 1), i));
   1.123 +              for (int i = 0; i < superIO.Controls.Length; i++)
   1.124 +                c.Add(new Ctrl("Fan Control #" + (i + 1), i));
   1.125 +              break;
   1.126 +          }
   1.127            break;
   1.128          default:
   1.129            for (int i = 0; i < superIO.Voltages.Length; i++)