sr: rename all sr_device_* functions to sr_dev_*

[libsigrok.git] / hardware / common / ezusb.c

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 058a7a024dbf4271e9b7b04dc2b9ddcb856530b4..56ad5da53bdf2253ede3bb823aef710620a593ad 100644 (file)
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -21,17 +21,16 @@
  * Helper functions for the Cypress EZ-USB / FX2 series chips.
  */
 
-#include <sigrok.h>
-#include <sigrok-internal.h>
 #include <libusb.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include "config.h"
+#include "sigrok.h"
+#include "sigrok-internal.h"
 
-int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
+SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
 {
        int err;
        unsigned char buf[1];
@@ -41,12 +40,13 @@ int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
        err = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR, 0xa0,
                                      0xe600, 0x0000, buf, 1, 100);
        if (err < 0)
-               sr_warn("Unable to send control request: %d", err);
+               sr_err("Unable to send control request: %d", err);
 
        return err;
 }
 
-int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
+SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
+                                  const char *filename)
 {
        FILE *fw;
        int offset, chunksize, err, result;
@@ -54,8 +54,8 @@ int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
 
        sr_info("Uploading firmware at %s", filename);
        if ((fw = g_fopen(filename, "rb")) == NULL) {
-               sr_warn("Unable to open firmware file %s for reading: %s",
-                       filename, strerror(errno));
+               sr_err("Unable to open firmware file %s for reading: %s",
+                      filename, strerror(errno));
                return SR_ERR;
        }
 
@@ -69,7 +69,7 @@ int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
                                              LIBUSB_ENDPOINT_OUT, 0xa0, offset,
                                              0x0000, buf, chunksize, 100);
                if (err < 0) {
-                       sr_warn("Unable to send firmware to device: %d", err);
+                       sr_err("Unable to send firmware to device: %d", err);
                        result = SR_ERR;
                        break;
                }
@@ -82,8 +82,8 @@ int ezusb_install_firmware(libusb_device_handle *hdl, const char *filename)
        return result;
 }
 
-int ezusb_upload_firmware(libusb_device *dev, int configuration,
-                         const char *filename)
+SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
+                                 const char *filename)
 {
        struct libusb_device_handle *hdl;
        int err;
@@ -92,19 +92,22 @@ int ezusb_upload_firmware(libusb_device *dev, int configuration,
                  libusb_get_bus_number(dev), libusb_get_device_address(dev));
 
        if ((err = libusb_open(dev, &hdl)) < 0) {
-               sr_warn("failed to open device: %d", err);
+               sr_err("failed to open device: %d", err);
                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);
+                       sr_err("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);
+               sr_err("Unable to set configuration: %d", err);
                return SR_ERR;
        }