Merge commit '77b8ce9' into bfgminer

driver-bitfury.c

@@ -173,7 +173,7 @@ tryagain:
 	bitfury->oldjob = inp[0x10];
 	bitfury->desync_counter = 0;
 	
-	if (opt_debug)
+	if (opt_dev_protocol)
 		bitfury_debug_nonce_array(proc, "Init", inp);
 	
 	return true;
@@ -459,7 +459,7 @@ void bitfury_do_io(struct thr_info * const master_thr)
 			goto out;
 		}
 		
-		if (opt_debug)
+		if (opt_dev_protocol)
 			bitfury_debug_nonce_array(proc, "Read", inp);
 		
 		// To avoid dealing with wrap-around entirely, we rotate array so previous active uint32_t is at index 0

mcp2210.c

@@ -221,7 +221,8 @@ bool mcp2210_spi_transfer(struct mcp2210_device * const h, const void * const tx
 				cmd[2] = 0;
 				break;
 			case 0xf8:  // transfer in progress
-				applog(LOG_DEBUG, "%s: SPI transfer rejected temporarily (%d bytes remaining)", __func__, sz);
+				if (opt_dev_protocol)
+					applog(LOG_DEBUG, "%s: SPI transfer rejected temporarily (%d bytes remaining)", __func__, sz);
 				cgsleep_ms(20);
 				goto retry;
 			default: