From 049f3d3515e85b65b42ffe087b68f3fde9b45cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=B6ller?= <mmoeller@openhardwaremonitor.org>
Date: Mon, 23 May 2011 18:14:25 +0000
Subject: [PATCH] Added support for the Fintek F71889AD super I/O chip.
 Extended the identification list of mainboard manufacturers.

---
 Hardware/LPC/Chip.cs                  |  2 ++
 Hardware/LPC/LPCIO.cs                 |  8 ++++++++
 Hardware/Mainboard/Manufacturer.cs    |  7 +++++++
 Hardware/Mainboard/SMBIOS.cs          | 22 ++++++++++++++++++++++
 Hardware/Mainboard/SuperIOHardware.cs |  1 +
 Properties/AssemblyVersion.cs         |  4 ++--
 6 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/Hardware/LPC/Chip.cs b/Hardware/LPC/Chip.cs
index 50ced7d..f0430f8 100644
--- a/Hardware/LPC/Chip.cs
+++ b/Hardware/LPC/Chip.cs
@@ -46,6 +46,7 @@ namespace OpenHardwareMonitor.Hardware.LPC {
     F71862 = 0x0601, 
     F71869 = 0x0814,
     F71882 = 0x0541,
+    F71889AD = 0x1005,
     F71889ED = 0x0909,
     F71889F = 0x0723,
 
@@ -82,6 +83,7 @@ namespace OpenHardwareMonitor.Hardware.LPC {
         case Chip.F71862: return "Fintek F71862";
         case Chip.F71869: return "Fintek F71869";
         case Chip.F71882: return "Fintek F71882";
+        case Chip.F71889AD: return "Fintek F71889AD";
         case Chip.F71889ED: return "Fintek F71889ED";
         case Chip.F71889F: return "Fintek F71889F";
 
diff --git a/Hardware/LPC/LPCIO.cs b/Hardware/LPC/LPCIO.cs
index 163f933..240261e 100644
--- a/Hardware/LPC/LPCIO.cs
+++ b/Hardware/LPC/LPCIO.cs
@@ -154,6 +154,13 @@ namespace OpenHardwareMonitor.Hardware.LPC {
               logicalDeviceNumber = FINTEK_HARDWARE_MONITOR_LDN;
               break;
           } break;
+        case 0x10:
+          switch (revision) {
+            case 0x05:
+              chip = Chip.F71889AD;
+              logicalDeviceNumber = FINTEK_HARDWARE_MONITOR_LDN;
+              break;
+          } break;
         case 0x52:
           switch (revision) {
             case 0x17:
@@ -293,6 +300,7 @@ namespace OpenHardwareMonitor.Hardware.LPC {
           case Chip.F71862:
           case Chip.F71869:
           case Chip.F71882:
+          case Chip.F71889AD:
           case Chip.F71889ED:
           case Chip.F71889F:
             if (vendorID != FINTEK_VENDOR_ID) {
diff --git a/Hardware/Mainboard/Manufacturer.cs b/Hardware/Mainboard/Manufacturer.cs
index cf91e01..7180d35 100644
--- a/Hardware/Mainboard/Manufacturer.cs
+++ b/Hardware/Mainboard/Manufacturer.cs
@@ -38,6 +38,8 @@
 namespace OpenHardwareMonitor.Hardware.Mainboard {
 
   internal enum Manufacturer {
+    Alienware,
+    Apple,
     ASRock,
     ASUS,
     Dell,
@@ -46,10 +48,15 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
     EPoX,
     EVGA,
     FIC,
+    Fujitsu,
     Gigabyte,
     HP,
     IBM,
+    Intel,
+    Lenovo,
     MSI,
+    Supermicro,
+    Toshiba,
     XFX,
     Unknown    
   }
diff --git a/Hardware/Mainboard/SMBIOS.cs b/Hardware/Mainboard/SMBIOS.cs
index 2b5af3d..9ae350c 100644
--- a/Hardware/Mainboard/SMBIOS.cs
+++ b/Hardware/Mainboard/SMBIOS.cs
@@ -269,6 +269,10 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
 
       private static Manufacturer GetManufacturer(string name) {               
         switch (name) {
+          case "Alienware":
+            return Manufacturer.Alienware;
+          case "Apple Inc.":
+            return Manufacturer.Apple;
           case "ASRock":
             return Manufacturer.ASRock;
           case "ASUSTeK Computer INC.":
@@ -286,15 +290,32 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
             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;
           case "Hewlett-Packard":
             return  Manufacturer.HP;
           case "IBM":
             return  Manufacturer.IBM;
+          case "Intel":
+          case "Intel Corp.":
+          case "Intel Corporation":
+          case "INTEL Corporation":
+            return Manufacturer.Intel;   
+          case "Lenovo":
+          case "LENOVO":
+            return Manufacturer.Lenovo;
+          case "Micro-Star International":
           case "MICRO-STAR INTERNATIONAL CO., LTD":
           case "MICRO-STAR INTERNATIONAL CO.,LTD":
+          case "MSI":
             return  Manufacturer.MSI;
+          case "Supermicro":
+            return Manufacturer.Supermicro;
+          case "TOSHIBA":
+            return Manufacturer.Toshiba;
           case "XFX":
             return  Manufacturer.XFX;
           case "To be filled by O.E.M.":
@@ -366,6 +387,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
             return Model.X38_DS5;
           case "X58A-UD3R":
             return Model.X58A_UD3R;
+          case "Base Board Product Name":
           case "To be filled by O.E.M.":
             return Model.Unknown;
           default:
diff --git a/Hardware/Mainboard/SuperIOHardware.cs b/Hardware/Mainboard/SuperIOHardware.cs
index e62d621..5e70a03 100644
--- a/Hardware/Mainboard/SuperIOHardware.cs
+++ b/Hardware/Mainboard/SuperIOHardware.cs
@@ -544,6 +544,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
         case Chip.F71862: 
         case Chip.F71869: 
         case Chip.F71882:
+        case Chip.F71889AD: 
         case Chip.F71889ED: 
         case Chip.F71889F:
           switch (manufacturer) {
diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs
index fddc28f..4972047 100644
--- a/Properties/AssemblyVersion.cs
+++ b/Properties/AssemblyVersion.cs
@@ -37,5 +37,5 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.3.2.0")]
-[assembly: AssemblyInformationalVersion("0.3.2 Beta")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.3.2.1")]
+[assembly: AssemblyInformationalVersion("0.3.2.1 Alpha")]
\ No newline at end of file