Browse Source

Merge branch 'bugfix_tgttmp_nodef' into bfgminer

Luke Dashjr 13 years ago
parent
commit
04910121aa
3 changed files with 3 additions and 2 deletions
  1. 1 1
      README
  2. 1 0
      adl.c
  3. 1 1
      miner.c

+ 1 - 1
README

@@ -169,7 +169,7 @@ Options for both config file and command line:
 --syslog            Use system log for output messages (default: standard error)
 --syslog            Use system log for output messages (default: standard error)
 --temp-cutoff <arg> Temperature where a device will be automatically disabled, one value or comma separated list (default: 95)
 --temp-cutoff <arg> Temperature where a device will be automatically disabled, one value or comma separated list (default: 95)
 --temp-hysteresis <arg> Set how much the temperature can fluctuate outside limits when automanaging speeds (default: 3)
 --temp-hysteresis <arg> Set how much the temperature can fluctuate outside limits when automanaging speeds (default: 3)
---temp-target <arg> Target temperature when automatically managing fan and clock speeds (default: 75)
+--temp-target <arg> Target temperature when automatically managing fan and clock speeds
 --text-only|-T      Disable ncurses formatted screen output
 --text-only|-T      Disable ncurses formatted screen output
 --url|-o <arg>      URL for bitcoin JSON-RPC server
 --url|-o <arg>      URL for bitcoin JSON-RPC server
 --user|-u <arg>     Username for bitcoin JSON-RPC server
 --user|-u <arg>     Username for bitcoin JSON-RPC server

+ 1 - 0
adl.c

@@ -44,6 +44,7 @@
 bool adl_active;
 bool adl_active;
 bool opt_reorder = false;
 bool opt_reorder = false;
 
 
+static
 const int opt_targettemp = 75;
 const int opt_targettemp = 75;
 const int opt_overheattemp = 85;
 const int opt_overheattemp = 85;
 static pthread_mutex_t adl_lock;
 static pthread_mutex_t adl_lock;

+ 1 - 1
miner.c

@@ -1235,7 +1235,7 @@ static struct opt_table opt_config_table[] = {
 		     "Overheat temperature when automatically managing fan and GPU speeds, one value or comma separated list"),
 		     "Overheat temperature when automatically managing fan and GPU speeds, one value or comma separated list"),
 #endif
 #endif
 	OPT_WITH_ARG("--temp-target",
 	OPT_WITH_ARG("--temp-target",
-		     set_temp_target, opt_show_intval, &opt_targettemp,
+		     set_temp_target, NULL, NULL,
 		     "Target temperature when automatically managing fan and clock speeds, one value or comma separated list"),
 		     "Target temperature when automatically managing fan and clock speeds, one value or comma separated list"),
 #endif
 #endif
 	OPT_WITHOUT_ARG("--text-only|-T",
 	OPT_WITHOUT_ARG("--text-only|-T",