# HG changeset patch
# User moel.mich
# Date 1278883609 0
# Node ID 62162db94359cba1c6222f51414db1c64d5bb241
# Parent  98187e7a08b2a651d1fb174b2cac08ea993b209d
Added a mainboard specific configuration for the ASRock 880GMH/USB3

diff -r 98187e7a08b2 -r 62162db94359 Hardware/Mainboard/Manufacturer.cs
--- a/Hardware/Mainboard/Manufacturer.cs	Sun Jul 11 15:52:50 2010 +0000
+++ b/Hardware/Mainboard/Manufacturer.cs	Sun Jul 11 21:26:49 2010 +0000
@@ -38,6 +38,7 @@
 namespace OpenHardwareMonitor.Hardware.Mainboard {
   
   public enum Manufacturer {
+    ASRock,
     ASUS,
     Dell,
     DFI,
diff -r 98187e7a08b2 -r 62162db94359 Hardware/Mainboard/Model.cs
--- a/Hardware/Mainboard/Model.cs	Sun Jul 11 15:52:50 2010 +0000
+++ b/Hardware/Mainboard/Model.cs	Sun Jul 11 21:26:49 2010 +0000
@@ -38,6 +38,9 @@
 namespace OpenHardwareMonitor.Hardware.Mainboard {
 
   public enum Model {
+    // ASRock
+    _880GMH_USB3,
+
     // ASUS
     Crosshair_III_Formula,
     M2N_SLI_DELUXE,
diff -r 98187e7a08b2 -r 62162db94359 Hardware/Mainboard/SMBIOS.cs
--- a/Hardware/Mainboard/SMBIOS.cs	Sun Jul 11 15:52:50 2010 +0000
+++ b/Hardware/Mainboard/SMBIOS.cs	Sun Jul 11 21:26:49 2010 +0000
@@ -253,6 +253,8 @@
         this.manufacturerName = manufacturerName;
         
         switch (manufacturerName) {
+          case "ASRock":
+            manufacturer = Manufacturer.ASRock; break;
           case "ASUSTeK Computer INC.":
             manufacturer = Manufacturer.ASUS; break;
           case "Dell Inc.":
@@ -288,6 +290,8 @@
         this.productName = productName;
         
         switch (productName) {
+          case "880GMH/USB3":
+            model = Model._880GMH_USB3; break;
           case "Crosshair III Formula":
             model = Model.Crosshair_III_Formula; break;
           case "M2N-SLI DELUXE":
diff -r 98187e7a08b2 -r 62162db94359 Hardware/Mainboard/SuperIOHardware.cs
--- a/Hardware/Mainboard/SuperIOHardware.cs	Sun Jul 11 15:52:50 2010 +0000
+++ b/Hardware/Mainboard/SuperIOHardware.cs	Sun Jul 11 21:26:49 2010 +0000
@@ -411,17 +411,53 @@
           t.Add(new Temperature("CPU", 0));
           t.Add(new Temperature("Auxiliary", 1));
           t.Add(new Temperature("System", 2));
-          f.Add(new Fan("System", 0));
-          f.Add(new Fan("CPU", 1));
-          f.Add(new Fan("Auxiliary", 2));
-          f.Add(new Fan("CPU #2", 3));
-          f.Add(new Fan("Auxiliary #2", 4));
+          f.Add(new Fan("System Fan", 0));
+          f.Add(new Fan("CPU Fan", 1));
+          f.Add(new Fan("Auxiliary Fan", 2));
+          f.Add(new Fan("CPU Fan #2", 3));
+          f.Add(new Fan("Auxiliary Fan #2", 4));
           break;
         case Chip.W83627DHG: 
         case Chip.W83627DHGP:                      
         case Chip.W83667HG:
         case Chip.W83667HGB:
           switch (manufacturer) {
+            case Manufacturer.ASRock:
+              switch (model) {
+                case Model._880GMH_USB3: 
+                  v.Add(new Voltage("CPU VCore", 0));
+                  v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
+                  v.Add(new Voltage("+5V", 5, 15, 7.5f, 0));
+                  v.Add(new Voltage("+12V", 6, 56, 10, 0));
+                  v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
+                  v.Add(new Voltage("VBAT", 8, 34, 34, 0));
+                  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("Power Fan", 2));
+                  break;
+                default:
+                  v.Add(new Voltage("CPU VCore", 0));
+                  v.Add(new Voltage("Voltage #2", 1, true));
+                  v.Add(new Voltage("AVCC", 2, 34, 34, 0));
+                  v.Add(new Voltage("3VCC", 3, 34, 34, 0));
+                  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("3VSB", 7, 34, 34, 0));
+                  v.Add(new Voltage("VBAT", 8, 34, 34, 0));
+                  t.Add(new Temperature("CPU", 0));
+                  t.Add(new Temperature("Auxiliary", 1));
+                  t.Add(new Temperature("System", 2));
+                  f.Add(new Fan("System Fan", 0));
+                  f.Add(new Fan("CPU Fan", 1));
+                  f.Add(new Fan("Auxiliary Fan", 2));
+                  f.Add(new Fan("CPU Fan #2", 3));
+                  f.Add(new Fan("Auxiliary Fan #2", 4));
+                  break;
+              }
+              break;
             case Manufacturer.ASUS:
               switch (model) {
                 case Model.P6X58D_E:
@@ -429,16 +465,17 @@
                   v.Add(new Voltage("+12V", 1, 11.5f, 1.91f, 0));
                   v.Add(new Voltage("Analog +3.3V", 2, 34, 34, 0));
                   v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
-                  v.Add(new Voltage("+5V", 4, 20, 10, 0));
+                  v.Add(new Voltage("+5V", 4, 15, 7.5f, 0));
                   v.Add(new Voltage("Voltage #6", 5, true));
                   v.Add(new Voltage("Voltage #7", 6, true));
                   v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
                   v.Add(new Voltage("VBAT", 8, 34, 34, 0));
                   t.Add(new Temperature("CPU", 0));
+                  t.Add(new Temperature("Auxiliary", 1, true));
                   t.Add(new Temperature("Motherboard", 2));
                   f.Add(new Fan("Chassis Fan #1", 0));
-                  f.Add(new Fan("CPU", 1));
-                  f.Add(new Fan("Power", 2));
+                  f.Add(new Fan("CPU Fan", 1));
+                  f.Add(new Fan("Power Fan", 2));
                   f.Add(new Fan("Chassis Fan #2", 3));
                   f.Add(new Fan("Chassis Fan #3", 4));
                   break;
@@ -455,11 +492,11 @@
                   t.Add(new Temperature("CPU", 0));
                   t.Add(new Temperature("Auxiliary", 1));
                   t.Add(new Temperature("System", 2));
-                  f.Add(new Fan("System", 0));
-                  f.Add(new Fan("CPU", 1));
-                  f.Add(new Fan("Auxiliary", 2));
-                  f.Add(new Fan("CPU #2", 3));
-                  f.Add(new Fan("Auxiliary #2", 4));
+                  f.Add(new Fan("System Fan", 0));
+                  f.Add(new Fan("CPU Fan", 1));
+                  f.Add(new Fan("Auxiliary Fan", 2));
+                  f.Add(new Fan("CPU Fan #2", 3));
+                  f.Add(new Fan("Auxiliary Fan #2", 4));
                   break;
               }
               break;
@@ -476,11 +513,11 @@
               t.Add(new Temperature("CPU", 0));
               t.Add(new Temperature("Auxiliary", 1));
               t.Add(new Temperature("System", 2));
-              f.Add(new Fan("System", 0));
-              f.Add(new Fan("CPU", 1));
-              f.Add(new Fan("Auxiliary", 2));
-              f.Add(new Fan("CPU #2", 3));
-              f.Add(new Fan("Auxiliary #2", 4));
+              f.Add(new Fan("System Fan", 0));
+              f.Add(new Fan("CPU Fan", 1));
+              f.Add(new Fan("Auxiliary Fan", 2));
+              f.Add(new Fan("CPU Fan #2", 3));
+              f.Add(new Fan("Auxiliary Fan #2", 4));
               break;
           } 
           break;
@@ -497,9 +534,9 @@
           t.Add(new Temperature("CPU", 0));
           t.Add(new Temperature("Auxiliary", 1));
           t.Add(new Temperature("System", 2));
-          f.Add(new Fan("System", 0));
-          f.Add(new Fan("CPU", 1));
-          f.Add(new Fan("Auxiliary", 2));
+          f.Add(new Fan("System Fan", 0));
+          f.Add(new Fan("CPU Fan", 1));
+          f.Add(new Fan("Auxiliary Fan", 2));
           break;
         default:
           for (int i = 0; i < superIO.Voltages.Length; i++)
@@ -621,10 +658,15 @@
     private class Temperature {
       public readonly string Name;
       public readonly int Index;
+      public readonly bool Hidden;
 
-      public Temperature(string name, int index) {
+      public Temperature(string name, int index) :
+        this(name, index, false) { }
+
+      public Temperature(string name, int index, bool hidden) {
         this.Name = name;
         this.Index = index;
+        this.Hidden = hidden;
       }
     }