Merge commit '8f76d15' into bfgminer

Conflicts:
	fpgautils.c

adl.h

@@ -21,8 +21,8 @@ void gpu_autotune(int gpu, enum dev_enable *denable);
 void clear_adl(int nDevs);
 #else /* HAVE_ADL */
 #define adl_active (0)
-static inline void init_adl(int nDevs) {}
-static inline void change_gpusettings(int gpu) { }
-static inline void clear_adl(int nDevs) {}
+static inline void init_adl(__maybe_unused int nDevs) {}
+static inline void change_gpusettings(__maybe_unused int gpu) { }
+static inline void clear_adl(__maybe_unused int nDevs) {}
 #endif
 #endif

driver-modminer.c

@@ -164,7 +164,7 @@ fd_set fds;
 	p = strrchr(buf, '=') ?: p;
 	if (p[0] == '=')
 		++p;
-	long fwusercode = strtol(p, &p, 16);
+	unsigned long fwusercode = (unsigned long)strtoll(p, &p, 16);
 	if (p[0] != '\0')
 		bailout(LOG_ERR, "Bad usercode in ModMiner firmware file");
 	if (fwusercode == 0xffffffff)
@@ -197,7 +197,7 @@ fd_set fds;
 	if (6 != write(fd, buf, 6))
 		bailout2(LOG_ERR, "%s %u: Error programming %s (cmd)", modminer->api->name, modminer->device_id, modminer->device_path);
 	status_read("cmd reply");
-	size_t buflen;
+	ssize_t buflen;
 	while (len) {
 		buflen = len < 32 ? len : 32;
 		if (fread(buf, buflen, 1, f) != 1)

driver-opencl.c

@@ -1327,7 +1327,7 @@ out:
 	return NULL;
 }
 #else
-void *reinit_gpu(void *userdata)
+void *reinit_gpu(__maybe_unused void *userdata)
 {
 	return NULL;
 }

fpgautils.c

@@ -36,10 +36,10 @@
 #include "logging.h"
 #include "miner.h"
 
+#ifdef HAVE_LIBUDEV
 char
 serial_autodetect_udev(detectone_func_t detectone, const char*prodname)
 {
-#ifdef HAVE_LIBUDEV
 	if (total_devices == MAX_DEVICES)
 		return 0;
 
@@ -72,10 +72,14 @@ serial_autodetect_udev(detectone_func_t detectone, const char*prodname)
 	udev_unref(udev);
 
 	return found;
+}
 #else
+char
+serial_autodetect_udev(__maybe_unused detectone_func_t detectone, __maybe_unused const char*prodname)
+{
 	return 0;
-#endif
 }
+#endif
 
 char
 serial_autodetect_devserial(detectone_func_t detectone, const char*prodname)
@@ -115,7 +119,7 @@ serial_autodetect_devserial(detectone_func_t detectone, const char*prodname)
 }
 
 char
-_serial_detect(const char*dname, detectone_func_t detectone, autoscan_func_t autoscan, bool force_autoscan)
+_serial_detect(const char*dname, detectone_func_t detectone, autoscan_func_t autoscan, bool forceauto)
 {
 	if (total_devices == MAX_DEVICES)
 		return 0;
@@ -123,7 +127,6 @@ _serial_detect(const char*dname, detectone_func_t detectone, autoscan_func_t aut
 	struct string_elist *iter, *tmp;
 	const char*s, *p;
 	bool inhibitauto = false;
-	bool forceauto = false;
 	char found = 0;
 	size_t dnamel = strlen(dname);
 

miner.c

@@ -3833,7 +3833,7 @@ void *miner_thread(void *userdata)
 	unsigned long long hashes_done = 0;
 	unsigned long long hashes;
 	struct work *work = make_work();
-	unsigned const int request_interval = opt_scantime * 2 / 3 ? : 1;
+	const time_t request_interval = opt_scantime * 2 / 3 ? : 1;
 	unsigned const long request_nonce = MAXTHREADS / 3 * 2;
 	bool requested = false;
 	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);