# HG changeset patch
# User moel.mich
# Date 1341263680 0
# Node ID fb8dc26f65a44e30f9b72b1d8a219d96a579bc23
# Parent  e471b1c2b1a66e12674f8fcc343292b02ade6a85
Added mainboard specific configurations for the following Gigabyte mainboards: EX58-UD3R, G41M-Combo, G41MT-S2, G41MT-S2P, GA-MA770T-UD3P, GA-MA785GM-US2H, GA-MA78LM-S2H, GA-MA790X-UD3P, H55-USB3, H55N-USB3, H61M-DS2 REV 1.2, H61M-USB3-B3 REV 2.0, H67A-USB3-B3, P55A-UD3, P67A-UD3-B3, P67A-UD3R-B3, Z68A-D3H-B3, Z68AP-D3, Z68X-UD3H-B3.

diff -r e471b1c2b1a6 -r fb8dc26f65a4 Hardware/Mainboard/Model.cs
--- a/Hardware/Mainboard/Model.cs	Mon Jul 02 12:50:03 2012 +0000
+++ b/Hardware/Mainboard/Model.cs	Mon Jul 02 21:14:40 2012 +0000
@@ -46,17 +46,36 @@
     EP45_DS3R,
     EP45_UD3R,
     EX58_EXTREME,
+    EX58_UD3R,
+    G41M_Combo,
+    G41MT_S2,
+    G41MT_S2P,
     GA_MA770T_UD3,
-    GA_MA785GMT_UD2H,
+    GA_MA770T_UD3P,
+    GA_MA785GM_US2H,
+    GA_MA785GMT_UD2H,    
+    GA_MA78LM_S2H,    
+    GA_MA790X_UD3P,
+    H55_USB3,
+    H55N_USB3,
+    H61M_DS2_REV_1_2,
+    H61M_USB3_B3_REV_2_0,
     H67A_UD3H_B3,
+    H67A_USB3_B3,
     P35_DS3,
-    P35_DS3L,
+    P35_DS3L,    
     P55_UD4,
+    P55A_UD3,
     P55M_UD4,
+    P67A_UD3_B3,
+    P67A_UD3R_B3,
     P67A_UD4_B3,
     P8Z68_V_PRO,
     X38_DS5,
     X58A_UD3R,
+    Z68A_D3H_B3,
+    Z68AP_D3,
+    Z68X_UD3H_B3,
     Z68X_UD7_B3,
 
     // Shuttle
diff -r e471b1c2b1a6 -r fb8dc26f65a4 Hardware/Mainboard/SMBIOS.cs
--- a/Hardware/Mainboard/SMBIOS.cs	Mon Jul 02 12:50:03 2012 +0000
+++ b/Hardware/Mainboard/SMBIOS.cs	Mon Jul 02 21:14:40 2012 +0000
@@ -328,18 +328,18 @@
           case "EPoX COMPUTER CO., LTD":
             return Manufacturer.EPoX;
           case "EVGA":
-            return  Manufacturer.EVGA;
+            return Manufacturer.EVGA;
           case "First International Computer, Inc.":
             return Manufacturer.FIC;
           case "FUJITSU":
           case "FUJITSU SIEMENS":
             return Manufacturer.Fujitsu;
           case "Gigabyte Technology Co., Ltd.":
-            return  Manufacturer.Gigabyte;
+            return Manufacturer.Gigabyte;
           case "Hewlett-Packard":
-            return  Manufacturer.HP;
+            return Manufacturer.HP;
           case "IBM":
-            return  Manufacturer.IBM;
+            return Manufacturer.IBM;
           case "Intel":
           case "Intel Corp.":
           case "Intel Corporation":
@@ -418,20 +418,52 @@
             return Model.EP45_UD3R;
           case "EX58-EXTREME":
             return Model.EX58_EXTREME;
+          case "EX58-UD3R":
+            return Model.EX58_UD3R;
+          case "G41M-Combo":
+            return Model.G41M_Combo;
+          case "G41MT-S2":
+            return Model.G41MT_S2;
+          case "G41MT-S2P":
+            return Model.G41MT_S2P;
           case "GA-MA770T-UD3":
             return Model.GA_MA770T_UD3;
+          case "GA-MA770T-UD3P":
+            return Model.GA_MA770T_UD3P;
+          case "GA-MA785GM-US2H":
+            return Model.GA_MA785GM_US2H;
           case "GA-MA785GMT-UD2H":
             return Model.GA_MA785GMT_UD2H;
+          case "GA-MA78LM-S2H":
+            return Model.GA_MA78LM_S2H;
+          case "GA-MA790X-UD3P":
+            return Model.GA_MA790X_UD3P;
+          case "H55-USB3":
+            return Model.H55_USB3;
+          case "H55N-USB3":
+            return Model.H55N_USB3;
+          case "H61M-DS2 REV 1.2":
+            return Model.H61M_DS2_REV_1_2;
+          case "H61M-USB3-B3 REV 2.0":
+            return Model.H61M_USB3_B3_REV_2_0;
           case "H67A-UD3H-B3":
             return Model.H67A_UD3H_B3;
+          case "H67A-USB3-B3":
+            return Model.H67A_USB3_B3;
           case "P35-DS3":
             return Model.P35_DS3;
           case "P35-DS3L":
             return Model.P35_DS3L;
           case "P55-UD4":
             return Model.P55_UD4;
+          case "P55A-UD3":
+            return Model.P55A_UD3;
           case "P55M-UD4":
             return Model.P55M_UD4;
+          case "P67A-UD3-B3":
+            return Model.P67A_UD3_B3;
+          case "P67A-UD3R-B3":
+            return Model.P67A_UD3R_B3;
           case "P67A-UD4-B3":
             return Model.P67A_UD4_B3;
           case "P8Z68-V PRO":
@@ -440,6 +472,12 @@
             return Model.X38_DS5;
           case "X58A-UD3R":
             return Model.X58A_UD3R;
+          case "Z68A-D3H-B3":
+            return Model.Z68A_D3H_B3;
+          case "Z68AP-D3":
+            return Model.Z68AP_D3;
+          case "Z68X-UD3H-B3":
+            return Model.Z68X_UD3H_B3;
           case "Z68X-UD7-B3":
             return Model.Z68X_UD7_B3;
           case "FH67":
diff -r e471b1c2b1a6 -r fb8dc26f65a4 Hardware/Mainboard/SuperIOHardware.cs
--- a/Hardware/Mainboard/SuperIOHardware.cs	Mon Jul 02 12:50:03 2012 +0000
+++ b/Hardware/Mainboard/SuperIOHardware.cs	Mon Jul 02 21:14:40 2012 +0000
@@ -258,7 +258,7 @@
                   v.Add(new Voltage("DRAM", 1));
                   v.Add(new Voltage("+3.3V", 2));
                   v.Add(new Voltage("+5V", 3, 6.8f, 10));
-                  v.Add(new Voltage("+12V", 7, 27, 9.1f));
+                  v.Add(new Voltage("+12V", 7, 24.3f, 8.2f));
                   v.Add(new Voltage("VBat", 8));
                   t.Add(new Temperature("System", 0));
                   t.Add(new Temperature("CPU", 1));
@@ -272,7 +272,7 @@
                   v.Add(new Voltage("DRAM", 1));
                   v.Add(new Voltage("+3.3V", 2));
                   v.Add(new Voltage("+5V", 3, 6.8f, 10));
-                  v.Add(new Voltage("+12V", 7, 27, 9.1f));
+                  v.Add(new Voltage("+12V", 7, 24.3f, 8.2f));
                   v.Add(new Voltage("VBat", 8));
                   t.Add(new Temperature("System", 0));
                   t.Add(new Temperature("CPU", 1));
@@ -281,7 +281,7 @@
                   f.Add(new Fan("Power Fan", 2));
                   f.Add(new Fan("System Fan #1", 3));
                   break;
-                case Model.EX58_EXTREME: // IT8720F 
+                case Model.EX58_EXTREME: // IT8720F                 
                   v.Add(new Voltage("CPU VCore", 0));
                   v.Add(new Voltage("DRAM", 1));
                   v.Add(new Voltage("+5V", 3, 6.8f, 10));
@@ -300,7 +300,7 @@
                   v.Add(new Voltage("DRAM", 1));
                   v.Add(new Voltage("+3.3V", 2));
                   v.Add(new Voltage("+5V", 3, 6.8f, 10));
-                  v.Add(new Voltage("+12V", 7, 27, 9.1f));
+                  v.Add(new Voltage("+12V", 7, 24.3f, 8.2f));
                   v.Add(new Voltage("VBat", 8));
                   t.Add(new Temperature("System", 0));
                   t.Add(new Temperature("CPU", 1));
@@ -310,12 +310,15 @@
                   f.Add(new Fan("Power Fan", 3));
                   break;
                 case Model.P55_UD4: // IT8720F
-                case Model.P55M_UD4: // IT8720F
+                case Model.P55A_UD3: // IT8720F
+                case Model.P55M_UD4: // IT8720F                
+                case Model.H55_USB3: // IT8720F
+                case Model.EX58_UD3R: // IT8720F 
                   v.Add(new Voltage("CPU VCore", 0));
                   v.Add(new Voltage("DRAM", 1));
                   v.Add(new Voltage("+3.3V", 2));
                   v.Add(new Voltage("+5V", 3, 6.8f, 10));
-                  v.Add(new Voltage("+12V", 5, 27, 9.1f));
+                  v.Add(new Voltage("+12V", 5, 24.3f, 8.2f));
                   v.Add(new Voltage("VBat", 8));
                   t.Add(new Temperature("System", 0));
                   t.Add(new Temperature("CPU", 2));
@@ -324,12 +327,40 @@
                   f.Add(new Fan("Power Fan", 2));
                   f.Add(new Fan("System Fan #1", 3));
                   break;
-                case Model.GA_MA770T_UD3: // IT8720F
+                case Model.H55N_USB3: // IT8720F
                   v.Add(new Voltage("CPU VCore", 0));
                   v.Add(new Voltage("DRAM", 1));
                   v.Add(new Voltage("+3.3V", 2));
                   v.Add(new Voltage("+5V", 3, 6.8f, 10));
-                  v.Add(new Voltage("+12V", 4, 27, 9.1f));
+                  v.Add(new Voltage("+12V", 5, 24.3f, 8.2f));
+                  v.Add(new Voltage("VBat", 8));
+                  t.Add(new Temperature("System", 0));
+                  t.Add(new Temperature("CPU", 2));
+                  f.Add(new Fan("CPU Fan", 0));
+                  f.Add(new Fan("System Fan", 1));
+                  break;
+                case Model.G41M_Combo: // IT8718F
+                case Model.G41MT_S2: // IT8718F
+                case Model.G41MT_S2P: // IT8718F
+                  v.Add(new Voltage("CPU VCore", 0));
+                  v.Add(new Voltage("DRAM", 1));
+                  v.Add(new Voltage("+3.3V", 2));
+                  v.Add(new Voltage("+5V", 3, 6.8f, 10));
+                  v.Add(new Voltage("+12V", 7, 24.3f, 8.2f));
+                  v.Add(new Voltage("VBat", 8));
+                  t.Add(new Temperature("CPU", 2));
+                  f.Add(new Fan("CPU Fan", 0));
+                  f.Add(new Fan("System Fan", 1));
+                  break;
+                case Model.GA_MA770T_UD3: // IT8720F
+                case Model.GA_MA770T_UD3P: // IT8720F
+                case Model.GA_MA78LM_S2H: // IT8718F
+                case Model.GA_MA790X_UD3P: // IT8720F
+                  v.Add(new Voltage("CPU VCore", 0));
+                  v.Add(new Voltage("DRAM", 1));
+                  v.Add(new Voltage("+3.3V", 2));
+                  v.Add(new Voltage("+5V", 3, 6.8f, 10));
+                  v.Add(new Voltage("+12V", 4, 24.3f, 8.2f));
                   v.Add(new Voltage("VBat", 8));
                   t.Add(new Temperature("System", 0));
                   t.Add(new Temperature("CPU", 1));
@@ -338,12 +369,13 @@
                   f.Add(new Fan("System Fan #2", 2));
                   f.Add(new Fan("Power Fan", 3));
                   break;
+                case Model.GA_MA785GM_US2H: // IT8718F
                 case Model.GA_MA785GMT_UD2H: // IT8718F
                   v.Add(new Voltage("CPU VCore", 0));
                   v.Add(new Voltage("DRAM", 1));
                   v.Add(new Voltage("+3.3V", 2));
                   v.Add(new Voltage("+5V", 3, 6.8f, 10));
-                  v.Add(new Voltage("+12V", 4, 27, 9.1f));
+                  v.Add(new Voltage("+12V", 4, 24.3f, 8.2f));
                   v.Add(new Voltage("VBat", 8));
                   t.Add(new Temperature("System", 0));
                   t.Add(new Temperature("CPU", 1));
@@ -356,7 +388,7 @@
                   v.Add(new Voltage("DRAM", 1));
                   v.Add(new Voltage("+3.3V", 2));
                   v.Add(new Voltage("+5V", 3, 6.8f, 10));
-                  v.Add(new Voltage("+12V", 5, 27, 9.1f));
+                  v.Add(new Voltage("+12V", 5, 24.3f, 8.2f));
                   v.Add(new Voltage("VBat", 8));
                   t.Add(new Temperature("System", 0));
                   t.Add(new Temperature("CPU", 1));
@@ -443,12 +475,10 @@
               break;
             case Manufacturer.Gigabyte:
               switch (model) {
-                case Model.P67A_UD4_B3: // IT8728F
-                  v.Add(new Voltage("+12V", 0, 100, 10));
-                  v.Add(new Voltage("+5V", 1, 15, 10));
-                  v.Add(new Voltage("Voltage #3", 2, true));
-                  v.Add(new Voltage("Voltage #4", 3, true));
-                  v.Add(new Voltage("Voltage #5", 4, true));
+                case Model.H61M_DS2_REV_1_2: // IT8728F
+                case Model.H61M_USB3_B3_REV_2_0: // IT8728F
+                  v.Add(new Voltage("VTT", 0));
+                  v.Add(new Voltage("+12V", 2, 30.9f, 10));
                   v.Add(new Voltage("CPU VCore", 5));
                   v.Add(new Voltage("DRAM", 6));
                   v.Add(new Voltage("Standby +3.3V", 7, 10, 10));
@@ -456,16 +486,13 @@
                   t.Add(new Temperature("System", 0));
                   t.Add(new Temperature("CPU", 2));
                   f.Add(new Fan("CPU Fan", 0));
-                  f.Add(new Fan("System Fan #2", 1));
-                  f.Add(new Fan("Power Fan", 2));
-                  f.Add(new Fan("System Fan #1", 3));
+                  f.Add(new Fan("System Fan", 1));
                   break;
                 case Model.H67A_UD3H_B3: // IT8728F
+                case Model.H67A_USB3_B3: // IT8728F                
                   v.Add(new Voltage("VTT", 0));
                   v.Add(new Voltage("+5V", 1, 15, 10));
-                  v.Add(new Voltage("+12V", 2, 68, 22));
-                  v.Add(new Voltage("Voltage #4", 3, true));
-                  v.Add(new Voltage("Voltage #5", 4, true));
+                  v.Add(new Voltage("+12V", 2, 30.9f, 10));
                   v.Add(new Voltage("CPU VCore", 5));
                   v.Add(new Voltage("DRAM", 6));
                   v.Add(new Voltage("Standby +3.3V", 7, 10, 10));
@@ -477,11 +504,47 @@
                   f.Add(new Fan("Power Fan", 2));
                   f.Add(new Fan("System Fan #2", 3));
                   break;
+                case Model.Z68A_D3H_B3: // IT8728F
+                  v.Add(new Voltage("VTT", 0));
+                  v.Add(new Voltage("+3.3V", 1, 6.49f, 10));
+                  v.Add(new Voltage("+12V", 2, 30.9f, 10));
+                  v.Add(new Voltage("+5V", 3, 7.15f, 10));
+                  v.Add(new Voltage("CPU VCore", 5));
+                  v.Add(new Voltage("DRAM", 6));
+                  v.Add(new Voltage("Standby +3.3V", 7, 10, 10));
+                  v.Add(new Voltage("VBat", 8, 10, 10));
+                  t.Add(new Temperature("System", 0));
+                  t.Add(new Temperature("CPU", 2));
+                  f.Add(new Fan("CPU Fan", 0));
+                  f.Add(new Fan("System Fan #1", 1));
+                  f.Add(new Fan("Power Fan", 2));
+                  f.Add(new Fan("System Fan #2", 3));
+                  break;
+                case Model.P67A_UD3_B3: // IT8728F
+                case Model.P67A_UD3R_B3: // IT8728F
+                case Model.P67A_UD4_B3: // IT8728F                
+                case Model.Z68AP_D3: // IT8728F
+                case Model.Z68X_UD3H_B3: // IT8728F               
+                  v.Add(new Voltage("VTT", 0));
+                  v.Add(new Voltage("+3.3V", 1, 6.49f, 10));
+                  v.Add(new Voltage("+12V", 2, 30.9f, 10));
+                  v.Add(new Voltage("+5V", 3, 7.15f, 10));
+                  v.Add(new Voltage("CPU VCore", 5));
+                  v.Add(new Voltage("DRAM", 6));
+                  v.Add(new Voltage("Standby +3.3V", 7, 10, 10));
+                  v.Add(new Voltage("VBat", 8, 10, 10));
+                  t.Add(new Temperature("System", 0));
+                  t.Add(new Temperature("CPU", 2));
+                  f.Add(new Fan("CPU Fan", 0));
+                  f.Add(new Fan("System Fan #2", 1));
+                  f.Add(new Fan("Power Fan", 2));
+                  f.Add(new Fan("System Fan #1", 3));
+                  break;                
                 case Model.Z68X_UD7_B3: // IT8728F
                   v.Add(new Voltage("VTT", 0));
-                  v.Add(new Voltage("+3.3V", 1, 13.3f, 20.5f));
-                  v.Add(new Voltage("+12V", 2, 68, 22));
-                  v.Add(new Voltage("+5V", 3, 14.3f, 20));
+                  v.Add(new Voltage("+3.3V", 1, 6.49f, 10));
+                  v.Add(new Voltage("+12V", 2, 30.9f, 10));
+                  v.Add(new Voltage("+5V", 3, 7.15f, 10));
                   v.Add(new Voltage("CPU VCore", 5));
                   v.Add(new Voltage("DRAM", 6));
                   v.Add(new Voltage("Standby +3.3V", 7, 10, 10));