Commit 63e31b4d7801d2d00a64744505d4320da18c3c49
2012-01-26T14:00:52
Move intensity range values into miner.h
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
diff --git a/api.c b/api.c
index 59e8207..ed17137 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 e9f3654..569eb49 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 < 10) // Should this be MAX_INTENSITY?
++gpu->intensity;
}
}
diff --git a/miner.h b/miner.h
index 777088a..5006064 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;