diff --git a/adl.c b/adl.c index 323f1e8a..0470445b 100644 --- a/adl.c +++ b/adl.c @@ -896,7 +896,7 @@ static void fan_autotune(int gpu, int temp, int fanpercent, bool *fan_optimal) void gpu_autotune(int gpu, bool *enable) { - int temp, fanpercent, engine, newengine, twintemp; + int temp, fanpercent, engine, newengine, twintemp = 0; bool fan_optimal = true; struct cgpu_info *cgpu; struct gpu_adl *ga; diff --git a/api.c b/api.c index 59e82072..ed171370 100644 --- a/api.c +++ b/api.c @@ -322,7 +322,7 @@ struct CODES { { SEVERITY_ERR, MSG_MISVAL, PARAM_NONE, "Missing comma after GPU number" }, { SEVERITY_ERR, MSG_NOADL, PARAM_NONE, "ADL is not available" }, { SEVERITY_ERR, MSG_NOGPUADL,PARAM_GPU, "GPU %d does not have ADL" }, - { SEVERITY_ERR, MSG_INVINT, PARAM_STR, "Invalid intensity (%s) - must be '" _DYNAMIC "' or range -10 - 10" }, + { SEVERITY_ERR, MSG_INVINT, PARAM_STR, "Invalid intensity (%s) - must be '" _DYNAMIC "' or range " _MIN_INTENSITY_STR " - " _MAX_INTENSITY_STR }, { SEVERITY_INFO, MSG_GPUINT, PARAM_BOTH, "GPU %d set new intensity to %s" }, { SEVERITY_SUCC, MSG_MINECON, PARAM_NONE, "CGMiner config" }, { SEVERITY_ERR, MSG_GPUMERR, PARAM_BOTH, "Setting GPU %d memoryclock to (%s) reported failure" }, @@ -999,7 +999,7 @@ static void gpuintensity(SOCKETTYPE c, char *param, bool isjson) } else { intensity = atoi(value); - if (intensity < -10 || intensity > 10) { + if (intensity < MIN_INTENSITY || intensity > MAX_INTENSITY) { strcpy(io_buffer, message(MSG_INVINT, 0, value, isjson)); return; } diff --git a/main.c b/main.c index e9f36547..bd57407f 100644 --- a/main.c +++ b/main.c @@ -1452,7 +1452,7 @@ static char *set_intensity(char *arg) else { gpus[device].dynamic = false; val = atoi(nextptr); - if (val < -10 || val > 14) + if (val < MIN_INTENSITY || val > MAX_INTENSITY) return "Invalid value passed to set intensity"; tt = &gpus[device].intensity; *tt = val; @@ -1466,7 +1466,7 @@ static char *set_intensity(char *arg) else { gpus[device].dynamic = false; val = atoi(nextptr); - if (val < -10 || val > 14) + if (val < MIN_INTENSITY || val > MAX_INTENSITY) return "Invalid value passed to set intensity"; tt = &gpus[device].intensity; @@ -1605,7 +1605,7 @@ static struct opt_table opt_config_table[] = { #endif OPT_WITH_ARG("--intensity|-I", set_intensity, NULL, NULL, - "Intensity of GPU scanning (d or -10 -> 14, default: d to maintain desktop interactivity)"), + "Intensity of GPU scanning (d or " _MIN_INTENSITY_STR " -> " _MAX_INTENSITY_STR ", default: d to maintain desktop interactivity)"), OPT_WITH_ARG("--kernel-path|-K", opt_set_charp, opt_show_charp, &opt_kernel_path, "Specify a path to where the kernel .cl files are"), @@ -3721,7 +3721,7 @@ retry: wlogprint("Invalid selection\n"); goto retry; } - intvar = curses_input("Set GPU scan intensity (d or -10 -> 10)"); + intvar = curses_input("Set GPU scan intensity (d or " _MIN_INTENSITY_STR " -> " _MAX_INTENSITY_STR ")"); if (!intvar) { wlogprint("Invalid input\n"); goto retry; @@ -3734,7 +3734,7 @@ retry: } intensity = atoi(intvar); free(intvar); - if (intensity < -10 || intensity > 10) { + if (intensity < MIN_INTENSITY || intensity > MAX_INTENSITY) { wlogprint("Invalid selection\n"); goto retry; } @@ -5742,10 +5742,10 @@ static uint64_t opencl_scanhash(struct thr_info *thr, struct work *work, uint64_ * increase intensity when the system is idle, unless * dynamic is disabled. */ if (gpu_ms_average > 7) { - if (gpu->intensity > -10) + if (gpu->intensity > MIN_INTENSITY) --gpu->intensity; } else if (gpu_ms_average < 3) { - if (gpu->intensity < 10) + if (gpu->intensity < MAX_INTENSITY) ++gpu->intensity; } } diff --git a/miner.h b/miner.h index 777088a4..50060642 100644 --- a/miner.h +++ b/miner.h @@ -545,6 +545,11 @@ extern void api(void); #define MAX_DEVICES 32 #define MAX_POOLS (32) +#define MIN_INTENSITY -10 +#define _MIN_INTENSITY_STR "-10" +#define MAX_INTENSITY 14 +#define _MAX_INTENSITY_STR "14" + extern struct list_head scan_devices; extern int nDevs; extern int opt_n_threads;