Commit aac848be194e07620581757267a4f717543aab62

Con Kolivas 2014-06-16T01:28:23

Update docs and command displays

diff --git a/ASIC-README b/ASIC-README
index 648142f..6019325 100644
--- a/ASIC-README
+++ b/ASIC-README
@@ -18,6 +18,7 @@ Currently supported devices include:
 - Cointerra
 - Antminer S1
 - BFx2 USB
+- Rockminer R-Box
 
 No COM ports on windows or TTY devices will be used by cgminer as it
 communicates directly with them via USB so it is normal for them to not exist or
@@ -120,6 +121,11 @@ BITMINE A1 devices
 
 Bitmine A1 devices need the --enable-bitmine_A1 compile option set.
 
+
+Rockminer R-Box
+
+Rockminer R-Box devices need the --enable-icarus compile option set.
+
 ---
 GETTING STARTED WITH USB ASICS
 
@@ -240,6 +246,7 @@ ASIC SPECIFIC COMMANDS
 --minion-overheat   Enable directly halting any chip when the status exceeds 100C
 --minion-temp <arg> Set minion chip temperature threshold, single value or comma list, range 120-160 (default: 135C)
 --nfu-bits <arg>    Set nanofury bits for overclocking, range 32-63 (default: 50)
+--rock-freq <arg>   Set RockMiner frequency in MHz, range 125-500 (default: 270)
 
 
 ANTMINER S1 DEVICES
@@ -630,6 +637,13 @@ Set 0 for fields you want to keep untouched to default, e.g.
 --bitmine-a1-options 0:0:400
 to only set SPI clock to 400kHz
 
+
+Rockminer R-Box Devices
+
+--rock-freq <arg>   Set RockMiner frequency in MHz, range 125-500 (default: 270)
+
+Note that only a limited range is likely to be accepted (usually 200-290)
+
 ---
 
 This code is provided entirely free of charge by the programmer in his spare
diff --git a/README b/README
index 55f6b2b..bfbafb6 100644
--- a/README
+++ b/README
@@ -234,6 +234,7 @@ Options for both config file and command line:
 --quiet|-q          Disable logging output, display status and errors
 --quota|-U <arg>    quota;URL combination for server with load-balance strategy quotas
 --real-quiet        Disable all output
+--rock-freq <arg>   Set RockMiner frequency in MHz, range 125-500 (default: 270)
 --rotate <arg>      Change multipool strategy from failover to regularly rotate at N minutes (default: 0)
 --round-robin       Change multipool strategy from failover to round robin on failure
 --scan-time|-s <arg> Upper bound on time spent scanning current work, in seconds (default: -1)
@@ -285,6 +286,7 @@ ASIC only options:
 --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-voltage <arg> Set BitBurner (Avalon) core voltage, in millivolts
+--bitmine-a1-options <ref_clk>:<sys_clk>:<spi_clk>:<max_chip>
 --bxf-temp-target <arg> Set target temperature for BXF devices (default: 82)
 --bxm-bits <arg>    Set BXM bits for overclocking (default: 50)
 --hfa-hash-clock <arg> Set hashfast clock speed (default: 550)
@@ -295,6 +297,7 @@ ASIC only options:
 --hfa-temp-overheat <arg> Set the hashfast overheat throttling temperature (default: 95)
 --hfa-temp-target <arg> Set the hashfast target temperature (0 to disable) (default: 88)
 --klondike-options <arg> Set klondike options clock:temptarget
+--rock-freq <arg>   Set RockMiner frequency in MHz, range 125-500 (default: 270)
 
 See ASIC-README for more information regarding these.
 
@@ -310,7 +313,8 @@ Cgminer should automatically find all of your Avalon ASIC, BFL ASIC, BitForce
 FPGAs, Icarus bitstream FPGAs, Klondike ASIC, ASICMINER usb block erupters,
 KnC ASICs, BaB ASICs, Hashfast ASICs, ModMiner FPGAs, BPMC/BGMC BF1 USB ASICs,
 Bi*fury USB ASICs, Onestring miner USB ASICs, Hexfury USB ASICs, Nanofury USB
-ASICs, Antminer U1/U2/U2+ USB ASICs, Cointerra devices and BFx2 USB ASICs.
+ASICs, Antminer U1/U2/U2+ USB ASICs, Cointerra devices, BFx2 USB ASICs and
+Rockminer R-Box USB ASICs.
 
 ---
 
diff --git a/cgminer.c b/cgminer.c
index 99efb46..b03a44a 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -1063,11 +1063,8 @@ static char *set_null(const char __maybe_unused *arg)
 static struct opt_table opt_config_table[] = {
 #ifdef USE_ICARUS
 	OPT_WITH_ARG("--anu-freq",
-		     set_float_125_to_500, &opt_show_intval, &opt_anu_freq,
+		     set_float_125_to_500, &opt_show_floatval, &opt_anu_freq,
 		     "Set AntminerU1 frequency in MHz, range 125-500"),
-	OPT_WITH_ARG("--rock-freq",
-		     set_float_125_to_500, &opt_show_intval, &opt_rock_freq,
-		     "Set RockMiner frequency in MHz, range 125-500"),
 #endif
 	OPT_WITH_ARG("--api-allow",
 		     opt_set_charp, NULL, &opt_api_allow,
@@ -1420,6 +1417,11 @@ static struct opt_table opt_config_table[] = {
 	OPT_WITH_ARG("--retry-pause",
 		     set_null, NULL, &opt_set_null,
 		     opt_hidden),
+#ifdef USE_ICARUS
+	OPT_WITH_ARG("--rock-freq",
+		     set_float_125_to_500, &opt_show_floatval, &opt_rock_freq,
+		     "Set RockMiner frequency in MHz, range 125-500"),
+#endif
 	OPT_WITH_ARG("--rotate",
 		     set_rotate, NULL, &opt_set_null,
 		     "Change multipool strategy from failover to regularly rotate at N minutes"),