diff -r 420adf504011 -r c4d1fb76a9e1 Hardware/LPC/F718XX.cs --- a/Hardware/LPC/F718XX.cs Sun Feb 07 19:48:32 2010 +0000 +++ b/Hardware/LPC/F718XX.cs Sun Feb 07 19:53:51 2010 +0000 @@ -41,16 +41,10 @@ using System.Text; namespace OpenHardwareMonitor.Hardware.LPC { - public class F718XX : IHardware { + public class F718XX : LPCHardware, IHardware { - private string name; - private Image icon; - - private Chip chip; private ushort address; - private List active = new List(); - private Sensor[] temperatures; private Sensor[] fans; private Sensor[] voltages; @@ -71,18 +65,9 @@ return WinRing0.ReadIoPortByte((ushort)(address + DATA_REGISTER_OFFSET)); } - public F718XX(Chip chip, ushort address) { - this.chip = chip; + public F718XX(Chip chip, ushort address) : base(chip) { this.address = address; - switch (chip) { - case Chip.F71862: name = "Fintek F71862"; break; - case Chip.F71869: name = "Fintek F71869"; break; - case Chip.F71882: name = "Fintek F71882"; break; - case Chip.F71889: name = "Fintek F71889"; break; - default: return; - } - temperatures = new Sensor[3]; for (int i = 0; i < temperatures.Length; i++) temperatures[i] = new Sensor("Temperature #" + (i + 1), i, @@ -98,30 +83,12 @@ 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/" + chip.ToString().ToLower(); } - } - - public Image Icon { - get { return icon; } - } - - public ISensor[] Sensors { - get { return active.ToArray(); } } public string GetReport() { StringBuilder r = new StringBuilder(); - r.AppendLine("LPC F718XX"); + r.AppendLine("LPC " + this.GetType().Name); r.AppendLine(); r.Append("Base Adress: 0x"); r.AppendLine(address.ToString("X4")); r.AppendLine(); @@ -175,25 +142,5 @@ } } } - - private void ActivateSensor(Sensor sensor) { - if (!active.Contains(sensor)) { - active.Add(sensor); - if (SensorAdded != null) - SensorAdded(sensor); - } - } - - private void DeactivateSensor(Sensor sensor) { - if (active.Contains(sensor)) { - active.Remove(sensor); - if (SensorRemoved != null) - SensorRemoved(sensor); - } - } - - public event SensorEventHandler SensorAdded; - public event SensorEventHandler SensorRemoved; - } }