Rename --scan-serial to --scan

README

@@ -249,6 +249,7 @@ Options for both config file and command line:
 --retries <arg>     Number of times to retry failed submissions before giving up (-1 means never) (default: -1)
 --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|-S <arg>     Configure how to scan for mining devices
 --scan-time|-s <arg> Upper bound on time spent scanning current work, in seconds (default: 60)
 --sched-start <arg> Set a time of day in HH:MM to start mining (a once off without a stop time)
 --sched-stop <arg>  Set a time of day in HH:MM to stop mining (will quit without a start time)
@@ -315,9 +316,6 @@ scrypt only options:
 
 See README.scrypt for more information regarding (non-bitcoin) scrypt mining.
 
-ASIC/FPGA mining device options:
-
---scan-serial|-S <arg> Serial port to probe for mining devices
 
 To use ASICs or FPGAs, you will need to be sure the user BFGMiner is running as
 has appropriate permissions. This varies by operating system.

miner.c

@@ -2017,9 +2017,12 @@ static struct opt_table opt_config_table[] = {
 	OPT_WITHOUT_ARG("--round-robin",
 		     set_rr, &pool_strategy,
 		     "Change multipool strategy from failover to round robin on failure"),
-	OPT_WITH_ARG("--scan-serial|-S",
+	OPT_WITH_ARG("--scan|-S",
 		     add_serial, NULL, NULL,
-		     "Serial port to probe for mining devices"),
+		     "Configure how to scan for mining devices"),
+	OPT_WITH_ARG("--scan-device|--scan-serial|--devscan",
+		     add_serial, NULL, NULL,
+		     opt_hidden),
 	OPT_WITH_ARG("--scan-time|-s",
 		     set_int_0_to_9999, opt_show_intval, &opt_scantime,
 		     "Upper bound on time spent scanning current work, in seconds"),
@@ -6369,7 +6372,7 @@ void write_config(FILE *fcfg)
 	if (opt_socks_proxy && *opt_socks_proxy)
 		fprintf(fcfg, ",\n\"socks-proxy\" : \"%s\"", json_escape(opt_socks_proxy));
 	
-	_write_config_string_elist(fcfg, "scan-serial", scan_devices);
+	_write_config_string_elist(fcfg, "scan", scan_devices);
 	_write_config_string_elist(fcfg, "device", opt_devices_enabled_list);
 	_write_config_string_elist(fcfg, "set-device", opt_set_device_list);