Browse Source

Merge pull request #147 from troky/nfactor

Added algorithm name to "coin" API command. Changed default algo name to "scrypt".
build-mingw
Noel Maersk 11 years ago
parent
commit
2b75a67cdf
  1. 4
      algorithm.c
  2. 2
      api.c
  3. 2
      sgminer.c

4
algorithm.c

@ -17,9 +17,9 @@ void set_algorithm(algorithm_t* algo, const char* newname) {
algo->name[sizeof(algo->name) - 1] = '\0'; algo->name[sizeof(algo->name) - 1] = '\0';
if (strcmp(algo->name, "adaptive-nfactor") == 0) { if (strcmp(algo->name, "adaptive-nfactor") == 0) {
set_algorithm_nfactor(algo, 11); set_algorithm_nfactor(algo, 11);
} else { } else {
set_algorithm_nfactor(algo, 10); set_algorithm_nfactor(algo, 10);
} }
return; return;

2
api.c

@ -2856,7 +2856,7 @@ static void minecoin(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __may
message(io_data, MSG_MINECOIN, 0, NULL, isjson); message(io_data, MSG_MINECOIN, 0, NULL, isjson);
io_open = io_add(io_data, isjson ? COMSTR JSON_MINECOIN : _MINECOIN COMSTR); io_open = io_add(io_data, isjson ? COMSTR JSON_MINECOIN : _MINECOIN COMSTR);
root = api_add_const(root, "Hash Method", SCRYPTSTR, false); root = api_add_string(root, "Hash Method", algorithm->name, false);
cg_rlock(&ch_lock); cg_rlock(&ch_lock);
root = api_add_timeval(root, "Current Block Time", &block_timeval, true); root = api_add_timeval(root, "Current Block Time", &block_timeval, true);

2
sgminer.c

@ -7853,7 +7853,7 @@ int main(int argc, char *argv[])
/* Default algorithm specified in algorithm.c ATM */ /* Default algorithm specified in algorithm.c ATM */
algorithm = (algorithm_t *)alloca(sizeof(algorithm_t)); algorithm = (algorithm_t *)alloca(sizeof(algorithm_t));
set_algorithm(algorithm, "default"); set_algorithm(algorithm, "scrypt");
devcursor = 8; devcursor = 8;
logstart = devcursor + 1; logstart = devcursor + 1;

Loading…
Cancel
Save