Merge branch 'windows' into cuda9

KlausT · Feb 3, 2018 · c5ab738 · c5ab738
2 parents 4de1a6f + 63fbdc1
commit c5ab738
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/README.txt b/README.txt
@@ -1,4 +1,4 @@
-ccMiner release 8.19(KlausT-mod) (January 24st, 2018)
+ccMiner release 8.20(KlausT-mod) (Februar 3rd, 2018)
 ---------------------------------------------------------------
 
 ***************************************************************
@@ -221,7 +221,7 @@ features.
 2017-07-17 v8.10: fix Orbitcoin solo mining (Neoscrypt)
 2017-07-25 v8.11: change some timeout values
                   fix Feathercoin solo mining (Neoscrypt)
-				  show chance to find a block while solo mining
+                  show chance to find a block while solo mining
 2017-08-17 v8.12: fix Myriad-Groestl speed bug
 2017-08-26 v8.13: fix retry bug
                   faster neoscrypt for 1080/1080Ti
@@ -240,12 +240,16 @@ features.
                   show default intensity when not using the -i option
                   add gpu number to the cuda error messages
                   stratum: show reason of auth failure (when supported by the pool)
-				  API is now disabled by default
+                  API is now disabled by default
                   Neoscrypt: Titan Xp fix
                   Windows: fix --background option
                   fixed: send a second share when we find it
                   enable stale share detection
-				  send stale shares when the pool supports it
+                  send stale shares when the pool supports it
+2018-02-03 v8.20: fix crash when using options --ndevs or --help
+                  API: fix possible crash when checking cpu frequency under Linux
+                  fix gpu name bug when using different cards in the same system
+                  add some error messages
 
 >>> AUTHORS <<<
 

diff --git a/ccminer.cpp b/ccminer.cpp
@@ -96,7 +96,9 @@ bool opt_debug_threads = false;
 bool opt_showdiff = true;
 bool opt_hwmonitor = true;
 
-static const char *algo_names[] = {
+static const char *algo_names[] =
+{
+	"invalid",
 	"bitcoin",
 	"blake",
 	"blakecoin",
@@ -153,7 +155,7 @@ int opt_timeout = 120;
 static int opt_scantime = 25;
 static json_t *opt_config = nullptr;
 static const bool opt_time = true;
-enum sha_algos opt_algo;
+enum sha_algos opt_algo = ALGO_INVALID;
 int opt_n_threads = 0;
 int gpu_threads = 1;
 int opt_affinity = -1;
@@ -2201,11 +2203,6 @@ static void parse_arg(int key, char *arg)
 				break;
 			}
 		}
-		if(i == ARRAY_SIZE(algo_names))
-		{
-			printf(usage);
-			exit(EXIT_FAILURE);
-		}
 		break;
 	case 'b':
 		p = strstr(arg, ":");
@@ -2907,6 +2904,11 @@ int main(int argc, char *argv[])
 
 	/* parse command line */
 	parse_cmdline(argc, argv);
+	if(opt_algo == ALGO_INVALID)
+	{
+		applog(LOG_ERR, "Error: no algo or invalid algo");
+		exit(EXIT_FAILURE);
+	}
 
 	if(!opt_n_threads)
 		opt_n_threads = active_gpus;

diff --git a/miner.h b/miner.h
@@ -635,6 +635,7 @@ struct work {
 
 enum sha_algos
 {
+	ALGO_INVALID,
 	ALGO_BITCOIN,
 	ALGO_BLAKE,
 	ALGO_BLAKECOIN,