Commit d02660881b097aeb4229ba875bd20e1ae9e06e79
2012-01-19T09:46:01
Merge branch 'master' into fpga
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
diff --git a/example.conf b/example.conf
index 645e72c..2a1c6ee 100644
--- a/example.conf
+++ b/example.conf
@@ -40,7 +40,7 @@
"temp-hysteresis" : "3",
"worksize" : "0",
-"donation" : "0.00",
+"donation" : "1.00",
"shares" : "0",
"kernel-path" : "/usr/local/bin"
}
\ No newline at end of file
diff --git a/main.c b/main.c
index de4b27c..dbcfc27 100644
--- a/main.c
+++ b/main.c
@@ -1145,7 +1145,7 @@ static char *set_gpu_engine(char *arg)
if (nextptr == NULL)
return "Invalid parameters for set gpu engine";
get_intrange(nextptr, &val1, &val2);
- if (val1 < 0 || val1 > 9999 || val2 <= 0 || val2 > 9999)
+ if (val1 < 0 || val1 > 9999 || val2 < 0 || val2 > 9999)
return "Invalid value passed to set_gpu_engine";
gpus[device].min_engine = val1;
@@ -1154,7 +1154,7 @@ static char *set_gpu_engine(char *arg)
while ((nextptr = strtok(NULL, ",")) != NULL) {
get_intrange(nextptr, &val1, &val2);
- if (val1 < 0 || val1 > 9999 || val2 <= 0 || val2 > 9999)
+ if (val1 < 0 || val1 > 9999 || val2 < 0 || val2 > 9999)
return "Invalid value passed to set_gpu_engine";
gpus[device].min_engine = val1;
gpus[device].gpu_engine = val2;
@@ -1216,14 +1216,14 @@ static char *set_gpu_memclock(char *arg)
if (nextptr == NULL)
return "Invalid parameters for set gpu memclock";
val = atoi(nextptr);
- if (val <= 0 || val >= 9999)
+ if (val < 0 || val >= 9999)
return "Invalid value passed to set_gpu_memclock";
gpus[device++].gpu_memclock = val;
while ((nextptr = strtok(NULL, ",")) != NULL) {
val = atoi(nextptr);
- if (val <= 0 || val >= 9999)
+ if (val < 0 || val >= 9999)
return "Invalid value passed to set_gpu_memclock";
gpus[device++].gpu_memclock = val;
@@ -1304,14 +1304,14 @@ static char *set_gpu_vddc(char *arg)
if (nextptr == NULL)
return "Invalid parameters for set gpu vddc";
val = atof(nextptr);
- if (val <= 0 || val >= 9999)
+ if (val < 0 || val >= 9999)
return "Invalid value passed to set_gpu_vddc";
gpus[device++].gpu_vddc = val;
while ((nextptr = strtok(NULL, ",")) != NULL) {
val = atof(nextptr);
- if (val <= 0 || val >= 9999)
+ if (val < 0 || val >= 9999)
return "Invalid value passed to set_gpu_vddc";
gpus[device++].gpu_vddc = val;