Commit c17a175e172b5e5acaefedaab2e58026eb29a0fb
2013-04-10T18:39:50
Merge branches 'avalon-dev' and 'master' of github.com:ckolivas/cgminer
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
diff --git a/cgminer.c b/cgminer.c
index 559e22a..98d735f 100644
--- a/cgminer.c
+++ b/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,
diff --git a/usbutils.c b/usbutils.c
index 69bd72e..6b214c8 100644
--- a/usbutils.c
+++ b/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;
}
diff --git a/usbutils.h b/usbutils.h
index 8e34d81..db279ce 100644
--- a/usbutils.h
+++ b/usbutils.h
@@ -131,6 +131,8 @@ enum usb_cmds {
C_REQUESTQUEJOBSTATUS,
C_QUEJOB,
C_QUEJOBSTATUS,
+ C_QUEFLUSH,
+ C_QUEFLUSHREPLY,
C_MAX
};
diff --git a/util.c b/util.c
index 5497e7a..b3cb9c0 100644
--- a/util.c
+++ b/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");