GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-30 16:34:23 +00:00
Code Issues Releases Wiki Activity

Allow writing of multiple kernels to the configuration file.

Browse Source
This commit is contained in:
ckolivas 2012-02-22 20:01:09 +11:00
parent 08db2284e3
commit 994cd77501
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cgminer.c
View File

@ -191,7 +191,6 @@ struct block {
static struct block *blocks = NULL; static struct block *blocks = NULL;
char *opt_kernel = NULL;
char *opt_socks_proxy = NULL; char *opt_socks_proxy = NULL;
static const char def_conf[] = "cgminer.conf"; static const char def_conf[] = "cgminer.conf";
@ -2334,6 +2333,26 @@ void write_config(FILE *fcfg)
for(i = 0; i < nDevs; i++) for(i = 0; i < nDevs; i++)
fprintf(fcfg, "%s%d", i > 0 ? "," : "", gpus[i].adl.targettemp); fprintf(fcfg, "%s%d", i > 0 ? "," : "", gpus[i].adl.targettemp);
#endif #endif
fputs("\",\n\"kernel\" : \"", fcfg);
for(i = 0; i < nDevs; i++) {
fprintf(fcfg, "%s", i > 0 ? "," : "");
switch (gpus[i].kernel) {
case KL_NONE: // Shouldn't happen
break;
case KL_POCLBM:
fprintf(fcfg, "poclbm");
break;
case KL_PHATK:
fprintf(fcfg, "phatk");
break;
case KL_DIAKGCN:
fprintf(fcfg, "diakgcn");
break;
case KL_DIABLO:
fprintf(fcfg, "diablo");
break;
}
}
fputs("\"", fcfg); fputs("\"", fcfg);
#ifdef WANT_CPUMINE #ifdef WANT_CPUMINE
fputs(",\n", fcfg); fputs(",\n", fcfg);
@ -2380,8 +2399,6 @@ void write_config(FILE *fcfg)
if (opt_stderr_cmd && *opt_stderr_cmd) if (opt_stderr_cmd && *opt_stderr_cmd)
fprintf(fcfg, ",\n\"monitor\" : \"%s\"", opt_stderr_cmd); fprintf(fcfg, ",\n\"monitor\" : \"%s\"", opt_stderr_cmd);
#endif // defined(unix) #endif // defined(unix)
if (opt_kernel && *opt_kernel)
fprintf(fcfg, ",\n\"kernel\" : \"%s\"", opt_kernel);
if (opt_kernel_path && *opt_kernel_path) { if (opt_kernel_path && *opt_kernel_path) {
char *kpath = strdup(opt_kernel_path); char *kpath = strdup(opt_kernel_path);
if (kpath[strlen(kpath)-1] == '/') if (kpath[strlen(kpath)-1] == '/')

1
ocl.c
View File

@ -379,6 +379,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
applog(LOG_INFO, "Selecting diablo kernel"); applog(LOG_INFO, "Selecting diablo kernel");
clState->chosen_kernel = KL_DIABLO; clState->chosen_kernel = KL_DIABLO;
} }
gpus[gpu].kernel = clState->chosen_kernel;
} else } else
clState->chosen_kernel = gpus[gpu].kernel; clState->chosen_kernel = gpus[gpu].kernel;