X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Fcommon%2Fezusb.c;h=044b4642705458d9c91b4b0c39b5a109a38a24dc;hp=3a547a148e46b5f3a7e25397d5b6c19780f9953f;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hpb=45c59c8bdd01954f9214fe7b869d92c55415d109

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index 3a547a14..044b4642 100644
--- 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,18 +30,21 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
+#define LOG_PREFIX "ezusb"
+
 SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
 {
 	int ret;
 	unsigned char buf[1];
 
-	sr_info("ezusb: setting CPU reset mode %s...",
+	sr_info("setting CPU reset mode %s...",
 		set_clear ? "on" : "off");
 	buf[0] = set_clear ? 1 : 0;
 	ret = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR, 0xa0,
 				      0xe600, 0x0000, buf, 1, 100);
 	if (ret < 0)
-		sr_err("ezusb: Unable to send control request: %d", ret);
+		sr_err("Unable to send control request: %s.",
+				libusb_error_name(ret));
 
 	return ret;
 }
@@ -53,9 +56,9 @@ SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
 	int offset, chunksize, ret, result;
 	unsigned char buf[4096];
 
-	sr_info("ezusb: Uploading firmware at %s", filename);
+	sr_info("Uploading firmware at %s", filename);
 	if ((fw = g_fopen(filename, "rb")) == NULL) {
-		sr_err("ezusb: Unable to open firmware file %s for reading: %s",
+		sr_err("Unable to open firmware file %s for reading: %s",
 		       filename, strerror(errno));
 		return SR_ERR;
 	}
@@ -70,16 +73,16 @@ SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
 					      LIBUSB_ENDPOINT_OUT, 0xa0, offset,
 					      0x0000, buf, chunksize, 100);
 		if (ret < 0) {
-			sr_err("ezusb: 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;
 		}
-		sr_info("ezusb: Uploaded %d bytes", chunksize);
+		sr_info("Uploaded %d bytes", chunksize);
 		offset += chunksize;
 	}
 	fclose(fw);
-	sr_info("ezusb: Firmware upload done");
+	sr_info("Firmware upload done");
 
 	return result;
 }
@@ -90,26 +93,31 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 	struct libusb_device_handle *hdl;
 	int ret;
 
-	sr_info("ezusb: uploading firmware to device on %d.%d",
+	sr_info("uploading firmware to device on %d.%d",
 		libusb_get_bus_number(dev), libusb_get_device_address(dev));
 
 	if ((ret = libusb_open(dev, &hdl)) < 0) {
-		sr_err("ezusb: 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("ezusb: 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("ezusb: Unable to set configuration: %d", ret);
+		sr_err("Unable to set configuration: %s",
+				libusb_error_name(ret));
 		return SR_ERR;
 	}