scpi/usbtmc: Implement Rigol DS1000 workaround on any firmware version.

[libsigrok.git] / src / ezusb.c

diff --git a/src/ezusb.c b/src/ezusb.c
index 044b4642705458d9c91b4b0c39b5a109a38a24dc..517e5f72806d35f421624fb48e3e0e3916fe19bf 100644 (file)
--- a/src/ezusb.c
+++ b/src/ezusb.c
@@ -21,13 +21,14 @@
  * Helper functions for the Cypress EZ-USB / FX2 series chips.
  */
 
+#include <config.h>
 #include <libusb.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ezusb"
@@ -57,9 +58,9 @@ SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
        unsigned char buf[4096];
 
        sr_info("Uploading firmware at %s", filename);
-       if ((fw = g_fopen(filename, "rb")) == NULL) {
+       if (!(fw = g_fopen(filename, "rb"))) {
                sr_err("Unable to open firmware file %s for reading: %s",
-                      filename, strerror(errno));
+                      filename, g_strerror(errno));
                return SR_ERR;
        }
 
@@ -102,7 +103,7 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
        }
 
 /*
- * The libusbx darwin backend is broken: it can report a kernel driver being
+ * The libusb Darwin backend is broken: it can report a kernel driver being
  * active, but detaching it always returns an error.
  */
 #if !defined(__APPLE__)