]> sigrok.org Git - libsigrok.git/commitdiff
sr: MinGW/Mac: No libusb_detach_kernel_driver() support.
authorUwe Hermann <redacted>
Fri, 10 Feb 2012 23:20:23 +0000 (00:20 +0100)
committerUwe Hermann <redacted>
Fri, 10 Feb 2012 23:20:23 +0000 (00:20 +0100)
hardware/common/ezusb.c

index a8a84174f99e18c9872145b9ab6888d01e5e9eed..c2849741c45d7854386887b232eb1a053f177a90 100644 (file)
@@ -96,12 +96,15 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
                return SR_ERR;
        }
 
+/* Neither Windows/MinGW nor Darwin/Mac support these libusb-1.0 calls. */
+#if !defined(_WIN32) && !defined(__APPLE__)
        if (libusb_kernel_driver_active(hdl, 0)) {
                if ((err = libusb_detach_kernel_driver(hdl, 0)) < 0) {
                        sr_warn("failed to detach kernel driver: %d", err);
                        return SR_ERR;
                }
        }
+#endif
 
        if ((err = libusb_set_configuration(hdl, configuration)) < 0) {
                sr_warn("Unable to set configuration: %d", err);