Browse Source

Merge branch 'uniscan2' into bfgminer

Luke Dashjr 12 years ago
parent
commit
19da8e54d8
4 changed files with 5 additions and 6 deletions
  1. 1 1
      driver-avalon.c
  2. 1 1
      driver-bitforce.c
  3. 2 3
      miner.c
  4. 1 1
      miner.h

+ 1 - 1
driver-avalon.c

@@ -1017,7 +1017,7 @@ static void avalon_shutdown(struct thr_info *thr)
 struct device_drv avalon_drv = {
 	.dname = "avalon",
 	.name = "AVA",
-	.no_allall = true,
+	.lowl_probe_by_name_only = true,
 	.lowl_probe = avalon_lowl_probe,
 	.thread_prepare = avalon_prepare,
 	.minerloop = hash_queued_work,

+ 1 - 1
driver-bitforce.c

@@ -2106,7 +2106,7 @@ static void bitforce_queue_thread_enable(struct thr_info *thr)
 struct device_drv bitforce_queue_api = {
 	.dname = "bitforce_queue",
 	.name = "BFL",
-	.no_allall = true,
+	.lowl_probe_by_name_only = true,
 	.lowl_match = bitforce_lowl_match,
 	.lowl_probe = bitforce_lowl_probe,
 	.minerloop = minerloop_queue,

+ 2 - 3
miner.c

@@ -10508,17 +10508,16 @@ void *probe_device_thread(void *p)
 		{
 			LL_FOREACH2(infolist, info, same_devid_next)
 			{
-				bool allall = false;
 				if (
 #ifdef NEED_BFG_LOWL_VCOM
-					(info->lowl == &lowl_vcom && (allall = !strcasecmp(dname, "all"))) ||
+					(info->lowl == &lowl_vcom && !strcasecmp(dname, "all")) ||
 #endif
 					_probe_device_match(info, dname))
 				{
 					BFG_FOREACH_DRIVER_BY_PRIORITY(dreg, dreg_tmp)
 					{
 						const struct device_drv * const drv = dreg->drv;
-						if (allall && drv->no_allall)
+						if (drv->lowl_probe_by_name_only)
 							continue;
 						if (!drv->lowl_probe)
 							continue;

+ 1 - 1
miner.h

@@ -294,7 +294,7 @@ struct device_drv {
 	const char *dname;
 	const char *name;
 	int8_t probe_priority;
-	bool no_allall;  // Never probe this driver for -S all (without driver name specification)
+	bool lowl_probe_by_name_only;
 	supported_algos_t supported_algos;
 
 	// DRV-global functions