Browse Source

Merge branch 'master' into fpga

nfactor-troky
ckolivas 13 years ago
parent
commit
d02660881b
  1. 2
      example.conf
  2. 12
      main.c

2
example.conf

@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
"temp-hysteresis" : "3",
"worksize" : "0",
"donation" : "0.00",
"donation" : "1.00",
"shares" : "0",
"kernel-path" : "/usr/local/bin"
}

12
main.c

@ -1145,7 +1145,7 @@ static char *set_gpu_engine(char *arg) @@ -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) @@ -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) @@ -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) @@ -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;

Loading…
Cancel
Save