update

cgminer.c

@@ -16,13 +16,6 @@
 #include <curses.h>
 #endif
 
-#ifndef WIN32
-#include <sys/resource.h>
-#else
-#include <winsock2.h>
-#include <windows.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -48,6 +41,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#ifndef WIN32
+#include <sys/resource.h>
+#else
+#include <winsock2.h>
+#include <windows.h>
+#endif
 #include <ccan/opt/opt.h>
 #include <jansson.h>
 #ifdef HAVE_LIBCURL

configure.ac

@@ -64,7 +64,7 @@ AC_FUNC_ALLOCA
 
 have_win32=false
 PTHREAD_FLAGS="-lpthread"
-##LIBZ_LIBS="-lz"
+LIBZ_LIBS="-lz"
 DLOPEN_FLAGS="-ldl"
 WS2_LIBS=""
 MM_LIBS=""
@@ -844,12 +844,6 @@ echo "  curses.TUI...........: $cursesmsg"
 
 
 echo
-if test "x$dragonmint_t1" = xyes; then
-	echo "  DragonMint.T1.Halong.: Enabled"
-else
-        echo "  DragonMint.T1.Halong.: Disabled"
-fi
-
 if test "x$ants1" = xyes; then
 	echo "  Antminer.S1.Bitmain..: Enabled"
 else

driver-avalon.c

@@ -31,7 +31,6 @@
   #endif
 #else
   #include "compat.h"
-  #include <windows.h>
   #include <io.h>
 #endif
 

driver-avalon2.c

@@ -27,7 +27,6 @@
     #define O_CLOEXEC 0
   #endif
 #else
-  #include <windows.h>
   #include <io.h>
 #endif
 

driver-avalon4.h

@@ -14,10 +14,6 @@
 #include "util.h"
 #include "i2c-context.h"
 
-#ifdef WIN32
-#include <windows.h>
-#endif
-
 #ifdef USE_AVALON4
 
 #define AVA4_DEFAULT_FAN_MIN	10 /* % */

driver-avalon8.c

@@ -16,11 +16,8 @@
 #include "crc.h"
 #include "sha2.h"
 #include "hexdump.c"
-#define get_fan_pwm(v)	(AVA8_PWM_MAX - (v) * AVA8_PWM_MAX / 100)
 
-#ifdef WIN32
-#include <windows.h>
-#endif
+#define get_fan_pwm(v)	(AVA8_PWM_MAX - (v) * AVA8_PWM_MAX / 100)
 
 int opt_avalon8_temp_target = AVA8_DEFAULT_TEMP_TARGET;
 

driver-bflsc.c

@@ -23,7 +23,6 @@
 #include "compat.h"
 #include "miner.h"
 #include "usbutils.h"
-#include "uthash.h"
 #include "driver-bflsc.h"
 
 int opt_bflsc_overheat = BFLSC_TEMP_OVERHEAT;

driver-bitforce.c

@@ -24,10 +24,6 @@
 #include "usbutils.h"
 #include "util.h"
 
-#ifdef WIN32
-#include <windows.h>
-#endif /* WIN32 */
-
 #define BITFORCE_IDENTIFY "ZGX"
 #define BITFORCE_IDENTIFY_LEN (sizeof(BITFORCE_IDENTIFY)-1)
 #define BITFORCE_FLASH "ZMX"

driver-blockerupter.c

@@ -15,9 +15,6 @@
 #define O_CLOEXEC 0
 #endif
 #else
-#ifdef WIN32
-#include <windows.h>
-#endif
 #include <io.h>
 #endif
 

driver-spondoolies-sp10.c

@@ -34,10 +34,6 @@
 
 #include "config.h"
 
-#ifdef WIN32
-#include <windows.h>
-#endif
-
 #include "compat.h"
 #include "miner.h"
 #include "driver-spondoolies-sp10-p.h"

driver-spondoolies-sp30.c

@@ -34,10 +34,6 @@
 
 #include "config.h"
 
-#ifdef WIN32
-#include <windows.h>
-#endif
-
 #include "compat.h"
 #include "miner.h"
 #include "driver-spondoolies-sp30-p.h"

usbutils.c

@@ -78,7 +78,6 @@ static cgtimer_t usb11_cgt;
 #define HASHFAST_TIMEOUT_MS 999
 #define HASHRATIO_TIMEOUT_MS 999
 #define BLOCKERUPTER_TIMEOUT_MS 999
-#define COMPAC_TIMEOUT_MS 999
 
 /* The safety timeout we use, cancelling async transfers on windows that fail
  * to timeout on their own. */
@@ -98,7 +97,6 @@ static cgtimer_t usb11_cgt;
 #define HASHFAST_TIMEOUT_MS 500
 #define HASHRATIO_TIMEOUT_MS 200
 #define BLOCKERUPTER_TIMEOUT_MS 300
-#define COMPAC_TIMEOUT_MS 300
 #endif
 
 #define USB_EPS(_intx, _epinfosx) { \

util.c

@@ -1419,6 +1419,7 @@ void cgcond_time(struct timespec *abstime)
 	clock_gettime(CLOCK_REALTIME, abstime);
 }
 
+#ifdef USE_GEKKO
 /* Get CLOCK_REALTIME for display purposes */
 void cgtime_real(struct timeval *tv)
 {
@@ -1427,7 +1428,7 @@ void cgtime_real(struct timeval *tv)
 	tv->tv_sec = tp.tv_sec;
 	tv->tv_usec = tp.tv_nsec / 1000;
 }
-
+#endif
 #ifdef WIN32
 /* Mingw32 has no strsep so create our own custom one  */
 

util.h

@@ -122,7 +122,9 @@ unsigned char *ser_string(char *s, int *slen);
 int thr_info_create(struct thr_info *thr, pthread_attr_t *attr, void *(*start) (void *), void *arg);
 void thr_info_cancel(struct thr_info *thr);
 void cgcond_time(struct timespec *abstime);
+#ifdef USE_GEKKO
 void cgtime_real(struct timeval *tv);
+#endif
 void cgtime(struct timeval *tv);
 void subtime(struct timeval *a, struct timeval *b);
 void addtime(struct timeval *a, struct timeval *b);