diff --git a/README.txt b/README.txt index 86f982b..0fb31df 100644 --- a/README.txt +++ b/README.txt @@ -176,6 +176,7 @@ features. >>> RELEASE HISTORY <<< Jan. 24th 2015 v1.5.2 + Allow per device intensity, example: -i 20,19.5 Add process CPU priority and affinity mask parameters Intelligent duplicate shares check feature (enabled if needed) api: Fan RPM (windows), Cuda threads count, linux kernel ver. diff --git a/api.cpp b/api.cpp index 6be91be..d2cf041 100644 --- a/api.cpp +++ b/api.cpp @@ -31,7 +31,6 @@ #include #include -#include "compat.h" #include "miner.h" #include "nvml.h" @@ -135,7 +134,7 @@ static void gpustatus(int thr_id) card = device_name[gpuid]; snprintf(buf, sizeof(buf), "GPU=%d;BUS=%hd;CARD=%s;" - "TEMP=%.1f;FAN=%hu;RPM=%hu;FREQ=%d;KHS=%.2f;HWF=%d;I=%.2f;THR=%u|", + "TEMP=%.1f;FAN=%hu;RPM=%hu;FREQ=%d;KHS=%.2f;HWF=%d;I=%.1f;THR=%u|", gpuid, cgpu->gpu_bus, card, cgpu->gpu_temp, cgpu->gpu_fan, cgpu->gpu_fan_rpm, cgpu->gpu_clock, cgpu->khashes, cgpu->hw_errors, cgpu->intensity, cgpu->throughput); @@ -891,4 +890,4 @@ void api_set_throughput(int thr_id, uint32_t throughput) cgpu->intensity += ((float) (throughput-(1U << i)) / (1U << i)); } } -} \ No newline at end of file +} diff --git a/ccminer.cpp b/ccminer.cpp index 80a959b..e85e222 100644 --- a/ccminer.cpp +++ b/ccminer.cpp @@ -40,7 +40,6 @@ #endif #endif -#include "compat.h" #include "miner.h" #ifdef WIN32 diff --git a/compat.h b/compat.h index 55807a3..0b82c4f 100644 --- a/compat.h +++ b/compat.h @@ -41,6 +41,10 @@ static __inline int setpriority(int which, int who, int prio) return -!SetThreadPriority(GetCurrentThread(), prio); } +#ifdef _MSC_VER +#define __func__ __FUNCTION__ +#endif + #endif /* WIN32 */ #endif /* __COMPAT_H__ */ diff --git a/cuda.cpp b/cuda.cpp index 3e2caa5..320eafc 100644 --- a/cuda.cpp +++ b/cuda.cpp @@ -21,10 +21,6 @@ #include "cuda_runtime.h" -#ifdef WIN32 -#include "compat.h" // sleep -#endif - // CUDA Devices on the System int cuda_num_devices() { diff --git a/miner.h b/miner.h index 156b161..da7c9c1 100644 --- a/miner.h +++ b/miner.h @@ -51,6 +51,8 @@ void *alloca (size_t); # endif #endif +#include "compat.h" + #ifdef __INTELLISENSE__ /* should be in stdint.h but... */ typedef __int64 int64_t; diff --git a/util.cpp b/util.cpp index a2e576f..02042f5 100644 --- a/util.cpp +++ b/util.cpp @@ -32,7 +32,6 @@ #include #include #endif -#include "compat.h" #include "miner.h" #include "elist.h"