Hardware/CPU/AMD10CPU.cs
changeset 31 c4d1fb76a9e1
parent 26 0e01b63e1fdc
child 42 47385d4fc990
     1.1 --- a/Hardware/CPU/AMD10CPU.cs	Sun Feb 07 19:48:32 2010 +0000
     1.2 +++ b/Hardware/CPU/AMD10CPU.cs	Sun Feb 07 19:53:51 2010 +0000
     1.3 @@ -43,7 +43,7 @@
     1.4  
     1.5  namespace OpenHardwareMonitor.Hardware.CPU {
     1.6    
     1.7 -  public class AMD10CPU : IHardware {
     1.8 +  public class AMD10CPU : Hardware, IHardware {
     1.9      private string name;
    1.10      private Image icon;
    1.11  
    1.12 @@ -53,8 +53,6 @@
    1.13      private Sensor totalLoad;
    1.14      private Sensor[] coreLoads;
    1.15  
    1.16 -    private List<ISensor> active = new List<ISensor>();
    1.17 -
    1.18      private CPULoad cpuLoad;
    1.19  
    1.20      private const ushort PCI_AMD_VENDOR_ID = 0x1022;
    1.21 @@ -107,10 +105,6 @@
    1.22        get { return icon; }
    1.23      }
    1.24  
    1.25 -    public ISensor[] Sensors {
    1.26 -      get { return active.ToArray(); }
    1.27 -    }
    1.28 -
    1.29      public string GetReport() {
    1.30        return null;
    1.31      }
    1.32 @@ -135,25 +129,5 @@
    1.33          totalLoad.Value = cpuLoad.GetTotalLoad();
    1.34        }
    1.35      }
    1.36 -
    1.37 -    private void ActivateSensor(Sensor sensor) {
    1.38 -      if (!active.Contains(sensor)) {
    1.39 -        active.Add(sensor);
    1.40 -        if (SensorAdded != null)
    1.41 -          SensorAdded(sensor);
    1.42 -      }
    1.43 -    }
    1.44 -
    1.45 -    private void DeactivateSensor(Sensor sensor) {
    1.46 -      if (active.Contains(sensor)) {
    1.47 -        active.Remove(sensor);
    1.48 -        if (SensorRemoved != null)
    1.49 -          SensorRemoved(sensor);
    1.50 -      }
    1.51 -    }
    1.52 -
    1.53 -    public event SensorEventHandler SensorAdded;
    1.54 -    public event SensorEventHandler SensorRemoved;
    1.55 -
    1.56    }
    1.57  }