From f6616aa63b1c98cf5888c1fe4fe2bce4278be1d9 Mon Sep 17 00:00:00 2001 From: Noel Maersk Date: Mon, 7 Apr 2014 22:43:43 +0300 Subject: [PATCH] config: allow specifying per-pool algorithm with `--algorithm` instead of `--pool-algorithm`. This will probably only work with config file, though, since it relies on json_array_index. --- sgminer.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sgminer.c b/sgminer.c index 47d712fe..28532f5c 100644 --- a/sgminer.c +++ b/sgminer.c @@ -1062,17 +1062,25 @@ static void load_temp_cutoffs() static char *set_algo(const char *arg) { - set_algorithm(opt_algorithm, arg); - applog(LOG_INFO, "Set default algorithm to %s", opt_algorithm->name); + if (json_array_index < 0) { + set_algorithm(opt_algorithm, arg); + applog(LOG_INFO, "Set default algorithm to %s", opt_algorithm->name); + } else { + set_pool_algorithm(arg); + } return NULL; } static char *set_nfactor(const char *arg) { - set_algorithm_nfactor(opt_algorithm, (const uint8_t) atoi(arg)); - applog(LOG_INFO, "Set algorithm N-factor to %d (N to %d)", - opt_algorithm->nfactor, opt_algorithm->n); + if (json_array_index < 0) { + set_algorithm_nfactor(opt_algorithm, (const uint8_t) atoi(arg)); + applog(LOG_INFO, "Set algorithm N-factor to %d (N to %d)", + opt_algorithm->nfactor, opt_algorithm->n); + } else { + set_pool_nfactor(arg); + } return NULL; }