anycmd %!s(int64=4) %!d(string=hai) anos
pai
achega
529e43111b

+ 8 - 28
src/NTMinerGpus/Gpus/AdlHelper.cs

@@ -285,42 +285,22 @@ namespace NTMiner.Gpus {
                 if (!TryGetAtiGpu(gpuIndex, out ATIGPU atiGpu)) {
                     return;
                 }
-                bool isSetCoreClock = value.GetIsSetCoreClock(gpu);
-                bool isSetMemoryClock = value.GetIsSetMemoryClock(gpu);
-                bool isSetPowerLimit = value.GetIsSetPowerLimit(gpu);
-                bool isSetTempLimit = value.GetIsSetTempLimit(gpu);
                 bool isSetMemoryTimingLevel = value.MemoryTimingLevel != -1;
                 if (atiGpu.OverdriveVersion < 8) {
-                    if (isSetCoreClock) {
-                        SetCoreClockOld(atiGpu, value.CoreClockMHz, value.CoreClockVoltage);
-                    }
-                    if (isSetMemoryClock) {
-                        SetMemoryClockOld(atiGpu, value.MemoryClockMHz, value.MemoryClockVoltage);
-                    }
-                    if (isSetPowerLimit) {
-                        SetPowerLimitOld(atiGpu, value.PowerLimit);
-                    }
-                    if (isSetTempLimit) {
-                        SetTempLimitOld(atiGpu, value.TempLimit);
-                    }
+                    SetCoreClockOld(atiGpu, value.CoreClockMHz, value.CoreClockVoltage);
+                    SetMemoryClockOld(atiGpu, value.MemoryClockMHz, value.MemoryClockVoltage);
+                    SetPowerLimitOld(atiGpu, value.PowerLimit);
+                    SetTempLimitOld(atiGpu, value.TempLimit);
                     if (!value.IgnoreFanSpeed) {
                         SetFanSpeedOld(atiGpu, value.FanSpeed);
                     }
                 }
                 else if (GetOD8CurrentSetting(atiGpu.AdapterIndex, out ADLOD8CurrentSetting aDLOD8CurrentSetting)) {
                     ADLOD8SetSetting odSetSetting = ADLOD8SetSetting.Create();
-                    if (isSetCoreClock) {
-                        SetCoreClockNew(atiGpu, value.CoreClockMHz, value.CoreClockVoltage, ref odSetSetting);
-                    }
-                    if (isSetMemoryClock) {
-                        SetMemoryClockNew(atiGpu, value.MemoryClockMHz, value.MemoryClockVoltage, ref odSetSetting);
-                    }
-                    if (isSetPowerLimit) {
-                        SetPowerLimitNew(value.PowerLimit, ref odSetSetting);
-                    }
-                    if (isSetTempLimit) {
-                        SetTempLimitNew(atiGpu, value.TempLimit, ref odSetSetting);
-                    }
+                    SetCoreClockNew(atiGpu, value.CoreClockMHz, value.CoreClockVoltage, ref odSetSetting);
+                    SetMemoryClockNew(atiGpu, value.MemoryClockMHz, value.MemoryClockVoltage, ref odSetSetting);
+                    SetPowerLimitNew(value.PowerLimit, ref odSetSetting);
+                    SetTempLimitNew(atiGpu, value.TempLimit, ref odSetSetting);
                     if (!value.IgnoreFanSpeed) {
                         SetFanSpeedNew(atiGpu, value.FanSpeed, ref odSetSetting);
                     }

+ 4 - 16
src/NTMinerGpus/Gpus/NvapiHelper.cs

@@ -55,23 +55,11 @@ namespace NTMiner.Gpus {
         #region OverClock
         public void OverClock(IGpu gpu, OverClockValue value) {
             value.Correct(gpu);
-            bool isSetCoreClock = value.GetIsSetCoreClock(gpu);
-            bool isSetMemoryClock = value.GetIsSetMemoryClock(gpu);
-            bool isSetPowerLimit = value.GetIsSetPowerLimit(gpu);
-            bool isSetTempLimit = value.GetIsSetTempLimit(gpu);
             int busId = gpu.GetOverClockId();
-            if (isSetCoreClock) {
-                SetCoreClock(busId, value.CoreClockMHz, value.CoreClockVoltage);
-            }
-            if (isSetMemoryClock) {
-                SetMemoryClock(busId, value.MemoryClockMHz, value.MemoryClockVoltage);
-            }
-            if (isSetPowerLimit) {
-                SetPowerLimit(busId, value.PowerLimit);
-            }
-            if (isSetTempLimit) {
-                SetTempLimit(busId, value.TempLimit);
-            }
+            SetCoreClock(busId, value.CoreClockMHz, value.CoreClockVoltage);
+            SetMemoryClock(busId, value.MemoryClockMHz, value.MemoryClockVoltage);
+            SetPowerLimit(busId, value.PowerLimit);
+            SetTempLimit(busId, value.TempLimit);
             if (!value.IgnoreFanSpeed) {
                 SetFanSpeed(gpu, value.FanSpeed);
             }

+ 0 - 16
src/NTMinerGpus/Gpus/OverClockValue.cs

@@ -61,21 +61,5 @@ namespace NTMiner.Gpus {
                 this.MemoryClockVoltage = 0;
             }
         }
-
-        internal bool GetIsSetCoreClock(IGpu gpu) {
-            return this.CoreClockMHz == 0 || this.CoreClockMHz != gpu.CoreClockDelta || this.CoreClockVoltage != gpu.CoreVoltage;
-        }
-
-        internal bool GetIsSetMemoryClock(IGpu gpu) {
-            return this.MemoryClockMHz == 0 || this.MemoryClockMHz != gpu.MemoryClockDelta || this.MemoryClockVoltage != gpu.MemoryVoltage;
-        }
-
-        internal bool GetIsSetPowerLimit(IGpu gpu) {
-            return this.PowerLimit == 0 || this.PowerLimit != gpu.PowerCapacity;
-        }
-
-        internal bool GetIsSetTempLimit(IGpu gpu) {
-            return this.TempLimit == 0 || this.TempLimit != gpu.TempLimit;
-        }
     }
 }