build: Portability fixes.

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

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 6b49645b63b2f9f52f440bf081567c624a8ad1de..044b4642705458d9c91b4b0c39b5a109a38a24dc 100644 (file)
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
@@ -30,14 +30,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "ezusb: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "ezusb"
 
 SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
 {
@@ -50,7 +43,8 @@ SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
        ret = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR, 0xa0,
                                      0xe600, 0x0000, buf, 1, 100);
        if (ret < 0)
-               sr_err("Unable to send control request: %d", ret);
+               sr_err("Unable to send control request: %s.",
+                               libusb_error_name(ret));
 
        return ret;
 }
@@ -79,8 +73,8 @@ SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
                                              LIBUSB_ENDPOINT_OUT, 0xa0, offset,
                                              0x0000, buf, chunksize, 100);
                if (ret < 0) {
-                       sr_err("Unable to send firmware to device: %d",
-                              ret);
+                       sr_err("Unable to send firmware to device: %s.",
+                                       libusb_error_name(ret));
                        result = SR_ERR;
                        break;
                }
@@ -103,22 +97,27 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
                libusb_get_bus_number(dev), libusb_get_device_address(dev));
 
        if ((ret = libusb_open(dev, &hdl)) < 0) {
-               sr_err("failed to open device: %d", ret);
+               sr_err("failed to open device: %s.", libusb_error_name(ret));
                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)) {
+/*
+ * The libusbx darwin backend is broken: it can report a kernel driver being
+ * active, but detaching it always returns an error.
+ */
+#if !defined(__APPLE__)
+       if (libusb_kernel_driver_active(hdl, 0) == 1) {
                if ((ret = libusb_detach_kernel_driver(hdl, 0)) < 0) {
-                       sr_err("failed to detach kernel driver: %d", ret);
+                       sr_err("failed to detach kernel driver: %s",
+                                       libusb_error_name(ret));
                        return SR_ERR;
                }
        }
 #endif
 
        if ((ret = libusb_set_configuration(hdl, configuration)) < 0) {
-               sr_err("Unable to set configuration: %d", ret);
+               sr_err("Unable to set configuration: %s",
+                               libusb_error_name(ret));
                return SR_ERR;
        }