# HG changeset patch
# User moel.mich
# Date 1264795532 0
# Node ID e5adb0fd49171a57382834ba4d71919c977f7a32
# Parent  39067efce486c22e665c109102e3a81f8ba5ea95
Added additional checks to SMBIOS parsing. New class HexStringArray is for debugging with report data.

diff -r 39067efce486 -r e5adb0fd4917 Hardware/LPC/F71882.cs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Hardware/LPC/F71882.cs	Fri Jan 29 20:05:32 2010 +0000
@@ -0,0 +1,188 @@
+/*
+  
+  Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+  The contents of this file are subject to the Mozilla Public License Version
+  1.1 (the "License"); you may not use this file except in compliance with
+  the License. You may obtain a copy of the License at
+ 
+  http://www.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+  for the specific language governing rights and limitations under the License.
+
+  The Original Code is the Open Hardware Monitor code.
+
+  The Initial Developer of the Original Code is 
+  Michael Möller <m.moeller@gmx.ch>.
+  Portions created by the Initial Developer are Copyright (C) 2009-2010
+  the Initial Developer. All Rights Reserved.
+
+  Contributor(s):
+
+  Alternatively, the contents of this file may be used under the terms of
+  either the GNU General Public License Version 2 or later (the "GPL"), or
+  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+  in which case the provisions of the GPL or the LGPL are applicable instead
+  of those above. If you wish to allow use of your version of this file only
+  under the terms of either the GPL or the LGPL, and not to allow others to
+  use your version of this file under the terms of the MPL, indicate your
+  decision by deleting the provisions above and replace them with the notice
+  and other provisions required by the GPL or the LGPL. If you do not delete
+  the provisions above, a recipient may use your version of this file under
+  the terms of any one of the MPL, the GPL or the LGPL.
+ 
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Text;
+
+namespace OpenHardwareMonitor.Hardware.LPC {
+  public class F71882  : IHardware {
+
+    private string name;
+    private Image icon;
+
+    private ushort address;
+
+    private List<ISensor> active = new List<ISensor>();
+
+    private Sensor[] temperatures;
+    private Sensor[] fans;
+    private Sensor[] voltages;
+    private float[] voltageGains;
+
+    // Hardware Monitor
+    private const byte ADDRESS_REGISTER_OFFSET = 0x05;
+    private const byte DATA_REGISTER_OFFSET = 0x06;
+
+    // Hardware Monitor Registers
+    private const byte VOLTAGE_BASE_REG = 0x20;
+    private const byte TEMPERATURE_BASE_REG = 0x72;
+    private byte[] FAN_TACHOMETER_REG = new byte[] { 0xA0, 0xB0, 0xC0, 0xD0 };
+    
+    private byte ReadByte(byte register) {
+      WinRing0.WriteIoPortByte(
+        (ushort)(address + ADDRESS_REGISTER_OFFSET), register);
+      return WinRing0.ReadIoPortByte((ushort)(address + DATA_REGISTER_OFFSET));
+    }
+
+    public F71882(ushort address) {
+      this.address = address;
+
+      this.name = "Fintek F71882";
+
+      temperatures = new Sensor[3];
+      for (int i = 0; i < temperatures.Length; i++)
+        temperatures[i] = new Sensor("Temperature #" + (i + 1), i,
+          SensorType.Temperature, this);
+
+      fans = new Sensor[4];
+      for (int i = 0; i < fans.Length; i++)
+        fans[i] = new Sensor("Fan #" + (i + 1), i, SensorType.Fan, this);
+
+      voltageGains = new float[] { 1, 0.5f, 1, 1, 1, 1, 1, 1, 1 };
+      voltages = new Sensor[4];
+      voltages[0] = new Sensor("VCC3V", 0, SensorType.Voltage, this);
+      voltages[1] = new Sensor("CPU VCore", 1, SensorType.Voltage, this);      
+      voltages[2] = new Sensor("VSB3V", 7, SensorType.Voltage, this);
+      voltages[3] = new Sensor("Battery", 8, SensorType.Voltage, this);
+
+      this.icon = Utilities.EmbeddedResources.GetImage("chip.png");
+    }
+
+    public string Name {
+      get { return name; }
+    }
+
+    public string Identifier {
+      get { return "/lpc/f71882fg"; }
+    }
+
+    public Image Icon {
+      get { return icon; }
+    }
+
+    public ISensor[] Sensors {
+      get { return active.ToArray(); }
+    }
+
+    public string GetReport() {
+      StringBuilder r = new StringBuilder();
+
+      r.AppendLine("LPC F71882FG");
+      r.AppendLine();
+      r.Append("Base Adress: 0x"); r.AppendLine(address.ToString("X4"));
+      r.AppendLine();
+      r.AppendLine("Hardware Monitor Registers");
+      r.AppendLine();
+
+      r.AppendLine("      00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
+      r.AppendLine();
+      for (int i = 0; i <= 0xF; i++) {
+        r.Append(" "); r.Append((i << 4).ToString("X2")); r.Append("  ");
+        for (int j = 0; j <= 0xF; j++) {
+          r.Append(" ");
+          r.Append(ReadByte((byte)((i << 4) | j)).ToString("X2"));
+        }
+        r.AppendLine();
+      }
+      r.AppendLine();
+      return r.ToString();
+    }
+
+    public void Update() {
+
+      foreach (Sensor sensor in voltages) {
+        int value = ReadByte((byte)(VOLTAGE_BASE_REG + sensor.Index));
+        sensor.Value = voltageGains[sensor.Index] * 0.001f * (value << 4);
+        if (sensor.Value > 0)
+          ActivateSensor(sensor);
+        else
+          DeactivateSensor(sensor);
+      }
+
+      foreach (Sensor sensor in temperatures) {
+        int value = ReadByte((byte)(TEMPERATURE_BASE_REG + 2 * sensor.Index));
+        sensor.Value = value;
+        if (value < 254)
+          ActivateSensor(sensor);
+        else
+          DeactivateSensor(sensor);
+      }
+
+      foreach (Sensor sensor in fans) {
+        int value = ReadByte(FAN_TACHOMETER_REG[sensor.Index]) << 8;
+        value |= ReadByte((byte)(FAN_TACHOMETER_REG[sensor.Index] + 1));
+
+        if (value > 0) {
+          sensor.Value = (value < 0x0fff) ? 1.5e6f / value : 0;
+          ActivateSensor(sensor);
+        } else {
+          DeactivateSensor(sensor);
+        }
+      }      
+    }
+
+    private void ActivateSensor(Sensor sensor) {
+      if (!active.Contains(sensor)) {
+        active.Add(sensor);
+        SensorAdded(sensor);
+      }
+    }
+
+    private void DeactivateSensor(Sensor sensor) {
+      if (active.Contains(sensor)) {
+        active.Remove(sensor);
+        SensorRemoved(sensor);
+      }
+    }
+
+    public event SensorEventHandler SensorAdded;
+    public event SensorEventHandler SensorRemoved;
+
+  }
+}
diff -r 39067efce486 -r e5adb0fd4917 Hardware/LPC/F71882FG.cs
--- a/Hardware/LPC/F71882FG.cs	Fri Jan 29 19:20:44 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +0,0 @@
-/*
-  
-  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-  The contents of this file are subject to the Mozilla Public License Version
-  1.1 (the "License"); you may not use this file except in compliance with
-  the License. You may obtain a copy of the License at
- 
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS" basis,
-  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-  for the specific language governing rights and limitations under the License.
-
-  The Original Code is the Open Hardware Monitor code.
-
-  The Initial Developer of the Original Code is 
-  Michael Möller <m.moeller@gmx.ch>.
-  Portions created by the Initial Developer are Copyright (C) 2009-2010
-  the Initial Developer. All Rights Reserved.
-
-  Contributor(s):
-
-  Alternatively, the contents of this file may be used under the terms of
-  either the GNU General Public License Version 2 or later (the "GPL"), or
-  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-  in which case the provisions of the GPL or the LGPL are applicable instead
-  of those above. If you wish to allow use of your version of this file only
-  under the terms of either the GPL or the LGPL, and not to allow others to
-  use your version of this file under the terms of the MPL, indicate your
-  decision by deleting the provisions above and replace them with the notice
-  and other provisions required by the GPL or the LGPL. If you do not delete
-  the provisions above, a recipient may use your version of this file under
-  the terms of any one of the MPL, the GPL or the LGPL.
- 
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Text;
-
-namespace OpenHardwareMonitor.Hardware.LPC {
-  public class F71882FG  : IHardware {
-
-    private string name;
-    private Image icon;
-
-    private ushort address;
-
-    private List<ISensor> active = new List<ISensor>();
-
-    private Sensor[] temperatures;
-    private Sensor[] fans;
-    private Sensor[] voltages;
-    private float[] voltageGains;
-
-    // Hardware Monitor
-    private const byte ADDRESS_REGISTER_OFFSET = 0x05;
-    private const byte DATA_REGISTER_OFFSET = 0x06;
-
-    // Hardware Monitor Registers
-    private const byte VOLTAGE_BASE_REG = 0x20;
-    private const byte TEMPERATURE_BASE_REG = 0x72;
-    private byte[] FAN_TACHOMETER_REG = new byte[] { 0xA0, 0xB0, 0xC0, 0xD0 };
-    
-    private byte ReadByte(byte register) {
-      WinRing0.WriteIoPortByte(
-        (ushort)(address + ADDRESS_REGISTER_OFFSET), register);
-      return WinRing0.ReadIoPortByte((ushort)(address + DATA_REGISTER_OFFSET));
-    }
-
-    public F71882FG(ushort address) {
-      this.address = address;
-
-      this.name = "Fintek F71882FG";
-
-      temperatures = new Sensor[3];
-      for (int i = 0; i < temperatures.Length; i++)
-        temperatures[i] = new Sensor("Temperature #" + (i + 1), i,
-          SensorType.Temperature, this);
-
-      fans = new Sensor[4];
-      for (int i = 0; i < fans.Length; i++)
-        fans[i] = new Sensor("Fan #" + (i + 1), i, SensorType.Fan, this);
-
-      voltageGains = new float[] { 1, 0.5f, 1, 1, 1, 1, 1, 1, 1 };
-      voltages = new Sensor[4];
-      voltages[0] = new Sensor("VCC3V", 0, SensorType.Voltage, this);
-      voltages[1] = new Sensor("CPU VCore", 1, SensorType.Voltage, this);      
-      voltages[2] = new Sensor("VSB3V", 7, SensorType.Voltage, this);
-      voltages[3] = new Sensor("Battery", 8, SensorType.Voltage, this);
-
-      this.icon = Utilities.EmbeddedResources.GetImage("chip.png");
-    }
-
-    public string Name {
-      get { return name; }
-    }
-
-    public string Identifier {
-      get { return "/lpc/f71882fg"; }
-    }
-
-    public Image Icon {
-      get { return icon; }
-    }
-
-    public ISensor[] Sensors {
-      get { return active.ToArray(); }
-    }
-
-    public string GetReport() {
-      StringBuilder r = new StringBuilder();
-
-      r.AppendLine("LPC F71882FG");
-      r.AppendLine();
-      r.Append("Base Adress: 0x"); r.AppendLine(address.ToString("X4"));
-      r.AppendLine();
-      r.AppendLine("Hardware Monitor Registers");
-      r.AppendLine();
-
-      r.AppendLine("      00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F");
-      r.AppendLine();
-      for (int i = 0; i <= 0xF; i++) {
-        r.Append(" "); r.Append((i << 4).ToString("X2")); r.Append("  ");
-        for (int j = 0; j <= 0xF; j++) {
-          r.Append(" ");
-          r.Append(ReadByte((byte)((i << 4) | j)).ToString("X2"));
-        }
-        r.AppendLine();
-      }
-      r.AppendLine();
-      return r.ToString();
-    }
-
-    public void Update() {
-
-      foreach (Sensor sensor in voltages) {
-        int value = ReadByte((byte)(VOLTAGE_BASE_REG + sensor.Index));
-        sensor.Value = voltageGains[sensor.Index] * 0.001f * (value << 4);
-        if (sensor.Value > 0)
-          ActivateSensor(sensor);
-        else
-          DeactivateSensor(sensor);
-      }
-
-      foreach (Sensor sensor in temperatures) {
-        int value = ReadByte((byte)(TEMPERATURE_BASE_REG + 2 * sensor.Index));
-        sensor.Value = value;
-        if (value < 254)
-          ActivateSensor(sensor);
-        else
-          DeactivateSensor(sensor);
-      }
-
-      foreach (Sensor sensor in fans) {
-        int value = ReadByte(FAN_TACHOMETER_REG[sensor.Index]) << 8;
-        value |= ReadByte((byte)(FAN_TACHOMETER_REG[sensor.Index] + 1));
-
-        if (value > 0) {
-          sensor.Value = (value < 0x0fff) ? 1.5e6f / value : 0;
-          ActivateSensor(sensor);
-        } else {
-          DeactivateSensor(sensor);
-        }
-      }      
-    }
-
-    private void ActivateSensor(Sensor sensor) {
-      if (!active.Contains(sensor)) {
-        active.Add(sensor);
-        SensorAdded(sensor);
-      }
-    }
-
-    private void DeactivateSensor(Sensor sensor) {
-      if (active.Contains(sensor)) {
-        active.Remove(sensor);
-        SensorRemoved(sensor);
-      }
-    }
-
-    public event SensorEventHandler SensorAdded;
-    public event SensorEventHandler SensorRemoved;
-
-  }
-}
diff -r 39067efce486 -r e5adb0fd4917 Hardware/LPC/LPCGroup.cs
--- a/Hardware/LPC/LPCGroup.cs	Fri Jan 29 19:20:44 2010 +0000
+++ b/Hardware/LPC/LPCGroup.cs	Fri Jan 29 20:05:32 2010 +0000
@@ -176,7 +176,7 @@
               break;
             case Chip.F71882FG:  
               if (vendorID == FINTEK_VENDOR_ID)
-                hardware.Add(new F71882FG(address));
+                hardware.Add(new F71882(address));
               break;
             default: break;
           }
diff -r 39067efce486 -r e5adb0fd4917 Hardware/SMBIOS/SMBIOSGroup.cs
--- a/Hardware/SMBIOS/SMBIOSGroup.cs	Fri Jan 29 19:20:44 2010 +0000
+++ b/Hardware/SMBIOS/SMBIOSGroup.cs	Fri Jan 29 20:05:32 2010 +0000
@@ -144,6 +144,14 @@
       private byte[] data;
       private string[] strings;
 
+      protected string GetString(int offset) {
+        if (offset < data.Length && data[offset] > 0 &&
+         data[offset] <= strings.Length)
+          return strings[data[offset] - 1];
+        else
+          return "";
+      }
+
       public Structure(byte type, ushort handle, byte[] data, string[] strings) 
       {
         this.type = type;
@@ -159,18 +167,15 @@
 
     public class BIOSInformation : Structure {
 
-      private string vendor = "";
-      private string version = "";
+      private string vendor;
+      private string version;
 
       public BIOSInformation(byte type, ushort handle, byte[] data,
         string[] strings)
         : base(type, handle, data, strings) {
 
-        if (data[0x04] > 0 && data[0x04] <= strings.Length)
-          vendor = strings[data[0x04] - 1];
-
-        if (data[0x05] > 0 && data[0x05] <= strings.Length)
-          version = strings[data[0x05] - 1];
+        this.vendor = GetString(0x04);
+        this.version = GetString(0x05);
       }
 
       public string Vendor { get { return vendor; } }
@@ -180,18 +185,15 @@
 
     public class BaseBoardInformation : Structure {
 
-      private string manufacturer  = "";
-      private string productName = "";
+      private string manufacturer;
+      private string productName;
 
       public BaseBoardInformation(byte type, ushort handle, byte[] data,
         string[] strings)
         : base(type, handle, data, strings) {
 
-        if (data[0x04] > 0 && data[0x04] <= strings.Length)
-          manufacturer = strings[data[0x04] - 1];
-
-        if (data[0x05] > 0 && data[0x05] <= strings.Length)
-          productName = strings[data[0x05] - 1];
+        this.manufacturer = GetString(0x04);
+        this.productName = GetString(0x05);
       }
 
       public string Manufacturer { get { return manufacturer; } }
diff -r 39067efce486 -r e5adb0fd4917 OpenHardwareMonitor.csproj
--- a/OpenHardwareMonitor.csproj	Fri Jan 29 19:20:44 2010 +0000
+++ b/OpenHardwareMonitor.csproj	Fri Jan 29 20:05:32 2010 +0000
@@ -62,7 +62,7 @@
     <Compile Include="Hardware\HDD\HDDGroup.cs" />
     <Compile Include="Hardware\HDD\SMART.cs" />
     <Compile Include="Hardware\LPC\Chip.cs" />
-    <Compile Include="Hardware\LPC\F71882FG.cs" />
+    <Compile Include="Hardware\LPC\F71882.cs" />
     <Compile Include="Hardware\SMBIOS\SMBIOSGroup.cs" />
     <Compile Include="Hardware\LPC\W83627DHG.cs" />
     <Compile Include="Hardware\ReportWriter.cs" />
@@ -94,6 +94,7 @@
     <Compile Include="Hardware\Nvidia\NVAPI.cs" />
     <Compile Include="Hardware\Nvidia\NvidiaGPU.cs" />
     <Compile Include="Hardware\Nvidia\NvidiaGroup.cs" />
+    <Compile Include="Utilities\HexStringArray.cs" />
     <Compile Include="Utilities\PInvokeDelegateFactory.cs" />
     <Compile Include="GUI\PlotPanel.cs">
       <SubType>UserControl</SubType>
diff -r 39067efce486 -r e5adb0fd4917 Utilities/HexStringArray.cs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Utilities/HexStringArray.cs	Fri Jan 29 20:05:32 2010 +0000
@@ -0,0 +1,60 @@
+/*
+  
+  Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+  The contents of this file are subject to the Mozilla Public License Version
+  1.1 (the "License"); you may not use this file except in compliance with
+  the License. You may obtain a copy of the License at
+ 
+  http://www.mozilla.org/MPL/
+
+  Software distributed under the License is distributed on an "AS IS" basis,
+  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+  for the specific language governing rights and limitations under the License.
+
+  The Original Code is the Open Hardware Monitor code.
+
+  The Initial Developer of the Original Code is 
+  Michael Möller <m.moeller@gmx.ch>.
+  Portions created by the Initial Developer are Copyright (C) 2009-2010
+  the Initial Developer. All Rights Reserved.
+
+  Contributor(s):
+
+  Alternatively, the contents of this file may be used under the terms of
+  either the GNU General Public License Version 2 or later (the "GPL"), or
+  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+  in which case the provisions of the GPL or the LGPL are applicable instead
+  of those above. If you wish to allow use of your version of this file only
+  under the terms of either the GPL or the LGPL, and not to allow others to
+  use your version of this file under the terms of the MPL, indicate your
+  decision by deleting the provisions above and replace them with the notice
+  and other provisions required by the GPL or the LGPL. If you do not delete
+  the provisions above, a recipient may use your version of this file under
+  the terms of any one of the MPL, the GPL or the LGPL.
+ 
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenHardwareMonitor.Utilities {
+  public class HexStringArray {
+
+    private byte[] array;
+
+    public HexStringArray(string input) {
+      List<byte> list = new List<byte>();
+      foreach (string str in input.Split(' ')) {
+        if (str.Trim().Length > 0)
+          list.Add(Convert.ToByte(str, 16));
+      }
+      array = list.ToArray();
+    }
+
+    public byte this[int i] {
+      get { return array[i]; }
+    }
+  }
+}