Merge branches 'avalon-dev' and 'master' of github.com:ckolivas/cgminer

cgminer.c

@@ -242,7 +242,7 @@ static char datestamp[40];
 static char blocktime[32];
 struct timeval block_timeval;
 static char best_share[8] = "0";
-double current_diff = 0xFFFFFFFFFFFFFFFF;
+double current_diff = 0xFFFFFFFFFFFFFFFFULL;
 static char block_diff[8];
 uint64_t best_diff = 0;
 
@@ -1123,7 +1123,7 @@ static struct opt_table opt_config_table[] = {
 #ifdef USE_FPGA_SERIAL
 	OPT_WITH_ARG("--scan-serial|-S",
 		     add_serial, NULL, NULL,
-		     "Serial port to probe for FPGA Mining device"),
+		     "Serial port to probe for Icarus FPGA Mining device"),
 #endif
 	OPT_WITH_ARG("--scan-time|-s",
 		     set_int_0_to_9999, opt_show_intval, &opt_scantime,

usbutils.c

@@ -294,6 +294,8 @@ static const char *C_REQUESTQUEJOB_S = "RequestQueJob";
 static const char *C_REQUESTQUEJOBSTATUS_S = "RequestQueJobStatus";
 static const char *C_QUEJOB_S = "QueJob";
 static const char *C_QUEJOBSTATUS_S = "QueJobStatus";
+static const char *C_QUEFLUSH_S = "QueFlush";
+static const char *C_QUEFLUSHREPLY_S = "QueFlushReply";
 
 #ifdef EOL
 #undef EOL
@@ -759,6 +761,8 @@ static void cgusb_check_init()
 		usb_commands[C_REQUESTQUEJOBSTATUS] = C_REQUESTQUEJOBSTATUS_S;
 		usb_commands[C_QUEJOB] = C_QUEJOB_S;
 		usb_commands[C_QUEJOBSTATUS] = C_QUEJOBSTATUS_S;
+		usb_commands[C_QUEFLUSH] = C_QUEFLUSH_S;
+		usb_commands[C_QUEFLUSHREPLY] = C_QUEFLUSHREPLY_S;
 
 		stats_initialised = true;
 	}

usbutils.h

@@ -131,6 +131,8 @@ enum usb_cmds {
 	C_REQUESTQUEJOBSTATUS,
 	C_QUEJOB,
 	C_QUEJOBSTATUS,
+	C_QUEFLUSH,
+	C_QUEFLUSHREPLY,
 	C_MAX
 };
 

util.c

@@ -1429,8 +1429,14 @@ static bool setup_stratum_curl(struct pool *pool)
 
 	mutex_lock(&pool->stratum_lock);
 	pool->stratum_active = false;
-	if (pool->stratum_curl)
+	if (pool->stratum_curl) {
+#if CURL_HAS_KEEPALIVE
 		curl_easy_cleanup(pool->stratum_curl);
+#else
+		/* See above in suspend_stratum */
+		CLOSESOCKET(pool->sock);
+#endif
+	}
 	pool->stratum_curl = curl_easy_init();
 	if (unlikely(!pool->stratum_curl))
 		quit(1, "Failed to curl_easy_init in initiate_stratum");