|
@@ -6862,7 +6862,7 @@ static void clean_up(void)
|
|
|
#ifdef HAVE_OPENCL
|
|
#ifdef HAVE_OPENCL
|
|
|
clear_adl(nDevs);
|
|
clear_adl(nDevs);
|
|
|
#endif
|
|
#endif
|
|
|
-#ifdef HAVE_LIBUSB
|
|
|
|
|
|
|
+#ifdef USE_USBUTILS
|
|
|
libusb_exit(NULL);
|
|
libusb_exit(NULL);
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
@@ -7483,18 +7483,16 @@ int main(int argc, char *argv[])
|
|
|
initial_args[i] = strdup(argv[i]);
|
|
initial_args[i] = strdup(argv[i]);
|
|
|
initial_args[argc] = NULL;
|
|
initial_args[argc] = NULL;
|
|
|
|
|
|
|
|
-#ifdef HAVE_LIBUSB
|
|
|
|
|
|
|
+#ifdef USE_USBUTILS
|
|
|
int err = libusb_init(NULL);
|
|
int err = libusb_init(NULL);
|
|
|
if (err) {
|
|
if (err) {
|
|
|
fprintf(stderr, "libusb_init() failed err %d", err);
|
|
fprintf(stderr, "libusb_init() failed err %d", err);
|
|
|
fflush(stderr);
|
|
fflush(stderr);
|
|
|
quit(1, "libusb_init() failed");
|
|
quit(1, "libusb_init() failed");
|
|
|
}
|
|
}
|
|
|
-#ifdef USE_USBUTILS
|
|
|
|
|
mutex_init(&cgusb_lock);
|
|
mutex_init(&cgusb_lock);
|
|
|
mutex_init(&cgusbres_lock);
|
|
mutex_init(&cgusbres_lock);
|
|
|
cglock_init(&cgusb_fd_lock);
|
|
cglock_init(&cgusb_fd_lock);
|
|
|
-#endif
|
|
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
mutex_init(&hash_lock);
|
|
mutex_init(&hash_lock);
|