Hardware/CPU/GenericCPU.cs
changeset 195 0ee888c485d5
parent 191 6545fa3ae298
child 201 958e9fe8afdf
     1.1 --- a/Hardware/CPU/GenericCPU.cs	Tue Sep 21 10:33:28 2010 +0000
     1.2 +++ b/Hardware/CPU/GenericCPU.cs	Tue Sep 21 20:32:36 2010 +0000
     1.3 @@ -43,7 +43,7 @@
     1.4  using System.Threading;
     1.5  
     1.6  namespace OpenHardwareMonitor.Hardware.CPU {
     1.7 -  internal class GenericCPU : Hardware, IHardware {
     1.8 +  internal class GenericCPU : Hardware {
     1.9  
    1.10      protected readonly CPUID[][] cpuid;
    1.11     
    1.12 @@ -57,13 +57,13 @@
    1.13  
    1.14      protected readonly bool hasTSC;
    1.15      protected readonly bool invariantTSC;
    1.16 +    private readonly double estimatedMaxClock;
    1.17  
    1.18      private ulong lastTimeStampCount;
    1.19      private long lastTime;
    1.20 -    private double maxClock;
    1.21 -    private double estimatedMaxClock;
    1.22 +    private double maxClock;    
    1.23  
    1.24 -    private Vendor vendor;
    1.25 +    private readonly Vendor vendor;
    1.26  
    1.27      private readonly CPULoad cpuLoad;
    1.28      private readonly Sensor totalLoad;
    1.29 @@ -129,7 +129,7 @@
    1.30        lastTime = 0;
    1.31      }
    1.32  
    1.33 -    private double EstimateMaxClock() {
    1.34 +    private static double EstimateMaxClock() {
    1.35        // preload the function
    1.36        EstimateMaxClock(0);
    1.37        EstimateMaxClock(0);
    1.38 @@ -184,7 +184,7 @@
    1.39        StringBuilder r = new StringBuilder();
    1.40  
    1.41        switch (vendor) {
    1.42 -        case Vendor.AMD: r.AppendLine("Intel CPU"); break;
    1.43 +        case Vendor.AMD: r.AppendLine("AMD CPU"); break;
    1.44          case Vendor.Intel: r.AppendLine("Intel CPU"); break;
    1.45          default: r.AppendLine("Generic CPU"); break;
    1.46        }