Browse Source

klondike - change options to clock and temptarget only

nfactor-troky
Kano 11 years ago
parent
commit
3e93b268fa
  1. 2
      ASIC-README
  2. 1
      README
  3. 2
      cgminer.c
  4. 30
      driver-klondike.c

2
ASIC-README

@ -105,7 +105,7 @@ ASIC SPECIFIC COMMANDS
--bitburner-fury-options <arg> Override avalon-options for BitBurner Fury boards baud:miners:asic:timeout:freq --bitburner-fury-options <arg> Override avalon-options for BitBurner Fury boards baud:miners:asic:timeout:freq
--bitburner-fury-voltage <arg> Set BitBurner Fury core voltage, in millivolts --bitburner-fury-voltage <arg> Set BitBurner Fury core voltage, in millivolts
--bitburner-voltage <arg> Set BitBurner (Avalon) core voltage, in millivolts --bitburner-voltage <arg> Set BitBurner (Avalon) core voltage, in millivolts
--klondike-options <arg> Set klondike options clock:temp1:temp2:fan --klondike-options <arg> Set klondike options clock:temptarget
AVALON AND BITBURNER DEVICES AVALON AND BITBURNER DEVICES

1
README

@ -227,6 +227,7 @@ ASIC only options:
--bitburner-fury-options <arg> Override avalon-options for BitBurner Fury boards baud:miners:asic:timeout:freq --bitburner-fury-options <arg> Override avalon-options for BitBurner Fury boards baud:miners:asic:timeout:freq
--bitburner-fury-voltage <arg> Set BitBurner Fury core voltage, in millivolts --bitburner-fury-voltage <arg> Set BitBurner Fury core voltage, in millivolts
--bitburner-voltage <arg> Set BitBurner (Avalon) core voltage, in millivolts --bitburner-voltage <arg> Set BitBurner (Avalon) core voltage, in millivolts
--klondike-options <arg> Set klondike options clock:temptarget
See ASIC-README for more information regarding these. See ASIC-README for more information regarding these.

2
cgminer.c

@ -1270,7 +1270,7 @@ static struct opt_table opt_config_table[] = {
#ifdef USE_KLONDIKE #ifdef USE_KLONDIKE
OPT_WITH_ARG("--klondike-options", OPT_WITH_ARG("--klondike-options",
set_klondike_options, NULL, NULL, set_klondike_options, NULL, NULL,
"Set klondike options clock:temp1:temp2:fan"), "Set klondike options clock:temptarget"),
#endif #endif
OPT_WITHOUT_ARG("--load-balance", OPT_WITHOUT_ARG("--load-balance",
set_loadbalance, &pool_strategy, set_loadbalance, &pool_strategy,

30
driver-klondike.c

@ -710,32 +710,14 @@ static bool klondike_init(struct cgpu_info *klncgpu)
// boundaries are checked by device, with valid values returned // boundaries are checked by device, with valid values returned
if (opt_klondike_options != NULL) { if (opt_klondike_options != NULL) {
int hashclock, fantarget; int hashclock;
double temp1, temp2; double temptarget;
sscanf(opt_klondike_options, "%d:%lf:%lf:%d", sscanf(opt_klondike_options, "%d:%lf", &hashclock, &temptarget);
&hashclock,
&temp1, &temp2,
&fantarget);
SET_HASHCLOCK(kline.cfg.hashclock, hashclock); SET_HASHCLOCK(kline.cfg.hashclock, hashclock);
kline.cfg.temptarget = cvtCToKln(temp1); kline.cfg.temptarget = cvtCToKln(temptarget);
kline.cfg.tempcritical = cvtCToKln(temp2); kline.cfg.tempcritical = 0; // hard code for old firmware
if (fantarget < 0) { kline.cfg.fantarget = 0xff; // hard code for old firmware
applog(LOG_WARNING,
"%s%i: %s options invalid fantarget < 0 using 0",
klncgpu->drv->name,
klncgpu->device_id,
klncgpu->drv->dname);
fantarget = 0;
} else if (fantarget > 100) {
applog(LOG_WARNING,
"%s%i: %s options invalid fantarget > 100 using 100",
klncgpu->drv->name,
klncgpu->device_id,
klncgpu->drv->dname);
fantarget = 100;
}
kline.cfg.fantarget = (int)(255 * fantarget / 100);
size = sizeof(kline.cfg) - 2; size = sizeof(kline.cfg) - 2;
} }

Loading…
Cancel
Save