Browse Source

Merge branch 'master' into usb-dev

nfactor-troky
Con Kolivas 12 years ago
parent
commit
03dff61e54
  1. 2
      README
  2. 9
      cgminer.c

2
README

@ -145,6 +145,7 @@ Options for both config file and command line: @@ -145,6 +145,7 @@ Options for both config file and command line:
--benchmark Run cgminer in benchmark mode - produces no shares
--compact Use compact display without per device statistics
--debug|-D Enable debug output
--disable-rejecting Automatically disable pools that continually reject shares
--expiry|-E <arg> Upper bound on how many seconds after getting work we consider a share from it stale (default: 120)
--failover-only Don't leak work to backup pools when primary pool is lagging
--fix-protocol Do not redirect to a different getwork protocol (eg. stratum)
@ -153,7 +154,6 @@ Options for both config file and command line: @@ -153,7 +154,6 @@ Options for both config file and command line:
--log|-l <arg> Interval in seconds between log output (default: 5)
--monitor|-m <arg> Use custom pipe cmd for output messages
--net-delay Impose small delays in networking to not overload slow routers
--no-pool-disable Do not automatically disable pools that continually reject shares
--no-submit-stale Don't submit shares if they are detected as stale
--pass|-p <arg> Password for bitcoin JSON-RPC server
--per-device-stats Force verbose mode and output per-device statistics

9
cgminer.c

@ -130,7 +130,7 @@ int opt_api_port = 4028; @@ -130,7 +130,7 @@ int opt_api_port = 4028;
bool opt_api_listen;
bool opt_api_network;
bool opt_delaynet;
bool opt_disable_pool = true;
bool opt_disable_pool;
char *opt_icarus_options = NULL;
char *opt_icarus_timing = NULL;
bool opt_worktime;
@ -897,6 +897,9 @@ static struct opt_table opt_config_table[] = { @@ -897,6 +897,9 @@ static struct opt_table opt_config_table[] = {
opt_hidden
#endif
),
OPT_WITHOUT_ARG("--disable-rejecting",
opt_set_bool, &opt_disable_pool,
"Automatically disable pools that continually reject shares"),
#if defined(WANT_CPUMINE) && (defined(HAVE_OPENCL) || defined(USE_FPGA))
OPT_WITHOUT_ARG("--enable-cpu|-C",
opt_set_bool, &opt_usecpu,
@ -995,10 +998,10 @@ static struct opt_table opt_config_table[] = { @@ -995,10 +998,10 @@ static struct opt_table opt_config_table[] = {
#else
opt_hidden
#endif
),
),
OPT_WITHOUT_ARG("--no-pool-disable",
opt_set_invbool, &opt_disable_pool,
"Do not automatically disable pools that continually reject shares"),
opt_hidden),
OPT_WITHOUT_ARG("--no-restart",
opt_set_invbool, &opt_restart,
#ifdef HAVE_OPENCL

Loading…
Cancel
Save